✨ [#4269] Allow static vars to be used as DMN input parameters

open-formulieren · May 8, 2024 · 03ca57f · 03ca57f
1 parent baac689
commit 03ca57f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/src/openforms/js/components/admin/form_design/logic/actions/dmn/DMNParametersForm.js b/src/openforms/js/components/admin/form_design/logic/actions/dmn/DMNParametersForm.js
@@ -1,10 +1,9 @@
 import {parseExpression} from 'feelin';
 import {useFormikContext} from 'formik';
-import React, {useContext} from 'react';
+import React from 'react';
 import {FormattedMessage} from 'react-intl';
 import {useAsync} from 'react-use';
 
-import {FormContext} from 'components/admin/form_design/Context';
 import {DMN_DECISION_DEFINITIONS_PARAMS_LIST} from 'components/admin/form_design/constants';
 import {get} from 'utils/fetch';
 
@@ -104,7 +103,6 @@ const DMNParametersForm = () => {
   const {
     values: {pluginId, decisionDefinitionId, decisionDefinitionVersion},
   } = useFormikContext();
-  const {formVariables} = useContext(FormContext);
 
   const {loading, value: dmnParams = EMPTY_DMN_PARAMS} = useAsync(async () => {
     if (!pluginId || !decisionDefinitionId) {
@@ -131,8 +129,6 @@ const DMNParametersForm = () => {
     };
   }, [pluginId, decisionDefinitionId, decisionDefinitionVersion]);
 
-  const variablesChoices = formVariables.map(variable => [variable.key, variable.name]);
-
   return (
     <div className="mappings">
       <InputsOverview inputClauses={dmnParams.inputClauses} />
@@ -144,8 +140,8 @@ const DMNParametersForm = () => {
         <VariableMapping
           loading={loading}
           mappingName="inputMapping"
-          formVariables={variablesChoices}
           dmnVariables={dmnParams.inputs}
+          includeStaticVariables
         />
       </div>
       <div className="mappings__mapping">
@@ -155,7 +151,6 @@ const DMNParametersForm = () => {
         <VariableMapping
           loading={loading}
           mappingName="outputMapping"
-          formVariables={variablesChoices}
           dmnVariables={dmnParams.outputs}
         />
       </div>

diff --git a/src/openforms/js/components/admin/form_design/logic/actions/dmn/VariableMapping.js b/src/openforms/js/components/admin/form_design/logic/actions/dmn/VariableMapping.js
@@ -9,7 +9,7 @@ import Field from 'components/admin/forms/Field';
 import Select from 'components/admin/forms/Select';
 import VariableSelection from 'components/admin/forms/VariableSelection';
 
-const VariableMapping = ({loading, mappingName, formVariables, dmnVariables}) => {
+const VariableMapping = ({loading, mappingName, dmnVariables, includeStaticVariables = false}) => {
   const intl = useIntl();
   const {getFieldProps, values} = useFormikContext();
 
@@ -51,6 +51,7 @@ const VariableMapping = ({loading, mappingName, formVariables, dmnVariables}) =>
                     >
                       <VariableSelection
                         id={`${mappingName}.${index}.formVariable`}
+                        includeStaticVariables={includeStaticVariables}
                         {...getFieldProps(`${mappingName}.${index}.formVariable`)}
                         aria-label={intl.formatMessage({
                           description: 'Accessible label for (form) variable dropdown',
@@ -103,7 +104,7 @@ const VariableMapping = ({loading, mappingName, formVariables, dmnVariables}) =>
 VariableMapping.propTypes = {
   loading: PropTypes.bool,
   mappingName: PropTypes.string,
-  formVariables: PropTypes.arrayOf(PropTypes.arrayOf(PropTypes.string)),
+  includeStaticVariables: PropTypes.bool,
   dmnVariables: PropTypes.arrayOf(PropTypes.arrayOf(PropTypes.string)),
 };