Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move metadata variable options to separate tab in JSON dump plugin #5091

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions src/openforms/js/compiled-lang/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -3221,6 +3221,12 @@
"value": "Internal name/title of the form"
}
],
"RdpPRD": [
{
"type": 0,
"value": "Base"
}
],
"RfbS0v": [
{
"type": 0,
Expand Down Expand Up @@ -5155,6 +5161,12 @@
"value": "Attachment informatieobjecttype"
}
],
"iNoavD": [
{
"type": 0,
"value": "Extra"
}
],
"iOADkJ": [
{
"type": 0,
Expand Down
12 changes: 12 additions & 0 deletions src/openforms/js/compiled-lang/nl.json
Original file line number Diff line number Diff line change
Expand Up @@ -3234,6 +3234,12 @@
"value": "Interne naam van het formulier voor onderscheid in overzichten"
}
],
"RdpPRD": [
{
"type": 0,
"value": "Base"
}
],
"RfbS0v": [
{
"type": 0,
Expand Down Expand Up @@ -5173,6 +5179,12 @@
"value": "Informatieobjecttype bijlagen"
}
],
"iNoavD": [
{
"type": 0,
"value": "Extra"
}
],
"iOADkJ": [
{
"type": 0,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import PropTypes from 'prop-types';
import React, {useContext} from 'react';
import {FormattedMessage} from 'react-intl';
import {TabList, TabPanel, Tabs} from 'react-tabs';

import Tab from 'components/admin/form_design/Tab';
import Fieldset from 'components/admin/forms/Fieldset';
import ModalOptionsConfiguration from 'components/admin/forms/ModalOptionsConfiguration';
import {
Expand Down Expand Up @@ -52,25 +54,44 @@ const JSONDumpOptionsForm = ({name, label, schema, formData, onChange}) => {
modalSize="large"
>
<ValidationErrorsProvider errors={relevantErrors}>
<Fieldset>
<ServiceSelect options={serviceOptions} />
<Path />
<Variables />
</Fieldset>
<Tabs>
<TabList>
<Tab>
<FormattedMessage
defaultMessage="Base"
description="JSON dump registration options 'Base' tab label"
/>
</Tab>
<Tab>
<FormattedMessage
defaultMessage="Extra"
description="JSON dump registration options 'Extra' tab label"
/>
</Tab>
</TabList>

<Fieldset
title={
<FormattedMessage
description="Metadata variables fieldset title"
defaultMessage="Metadata variables"
/>
}
collapsible
initialCollapsed
>
<FixedMetadataVariables />
<AdditionalMetadataVariables />
</Fieldset>
<TabPanel>
<Fieldset>
<ServiceSelect options={serviceOptions} />
<Path />
<Variables />
</Fieldset>
</TabPanel>

<TabPanel>
<Fieldset
title={
<FormattedMessage
description="Metadata variables fieldset title"
defaultMessage="Metadata variables"
/>
}
>
<FixedMetadataVariables />
<AdditionalMetadataVariables />
</Fieldset>
</TabPanel>
</Tabs>
</ValidationErrorsProvider>
</ModalOptionsConfiguration>
);
Expand Down
10 changes: 10 additions & 0 deletions src/openforms/js/lang/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -1584,6 +1584,11 @@
"description": "Form name field help text",
"originalDefault": "Internal name/title of the form"
},
"RdpPRD": {
"defaultMessage": "Base",
"description": "JSON dump registration options 'Base' tab label",
"originalDefault": "Base"
},
"RfbS0v": {
"defaultMessage": "Language",
"description": "Readable label for the language",
Expand Down Expand Up @@ -2459,6 +2464,11 @@
"description": "Objects API registration options \"Attachment informatieobjecttype\" label",
"originalDefault": "Attachment informatieobjecttype"
},
"iNoavD": {
"defaultMessage": "Extra",
"description": "JSON dump registration options 'Extra' tab label",
"originalDefault": "Extra"
},
"iQblZd": {
"defaultMessage": "Variables that are already included.",
"description": "JSON registration options 'fixedMetadataVariables' helpText",
Expand Down
10 changes: 10 additions & 0 deletions src/openforms/js/lang/nl.json
Original file line number Diff line number Diff line change
Expand Up @@ -1599,6 +1599,11 @@
"description": "Form name field help text",
"originalDefault": "Internal name/title of the form"
},
"RdpPRD": {
"defaultMessage": "Base",
"description": "JSON dump registration options 'Base' tab label",
"originalDefault": "Base"
},
"RfbS0v": {
"defaultMessage": "Taal",
"description": "Readable label for the language",
Expand Down Expand Up @@ -2480,6 +2485,11 @@
"description": "Objects API registration options \"Attachment informatieobjecttype\" label",
"originalDefault": "Attachment informatieobjecttype"
},
"iNoavD": {
"defaultMessage": "Extra",
"description": "JSON dump registration options 'Extra' tab label",
"originalDefault": "Extra"
},
"iQblZd": {
"defaultMessage": "Variables that are already included.",
"description": "JSON registration options 'fixedMetadataVariables' helpText",
Expand Down
Loading