feat: provide variables for input expression

bpmn-io · Aug 3, 2023 · 075c2aa · 075c2aa
1 parent 90099ac
commit 075c2aa
Show file tree

Hide file tree

Showing 6 changed files with 64 additions and 3 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/dmn-js-decision-table/package.json b/packages/dmn-js-decision-table/package.json
@@ -30,6 +30,7 @@
     "inferno-test-utils": "~5.6.2"
   },
   "dependencies": {
+    "@bpmn-io/dmn-variable-resolver": "github:bpmn-io/dmn-variable-resolver",
     "css.escape": "^1.5.1",
     "diagram-js": "^12.0.0",
     "dmn-js-shared": "^14.1.5",

diff --git a/packages/dmn-js-decision-table/src/Editor.js b/packages/dmn-js-decision-table/src/Editor.js
@@ -1,3 +1,5 @@
+import { DmnVariableResolverModule } from '@bpmn-io/dmn-variable-resolver';
+
 import Viewer from './Viewer';
 
 import addRuleModule from './features/add-rule';
@@ -76,7 +78,8 @@ export default class Editor extends Viewer {
       simpleDurationEditModule,
       simpleNumberEditModule,
       simpleStringEditModule,
-      simpleTimeEditModule
+      simpleTimeEditModule,
+      DmnVariableResolverModule
     ];
   }
 

diff --git a/...decision-table/src/features/decision-table-head/editor/components/InputCellContextMenu.js b/...decision-table/src/features/decision-table-head/editor/components/InputCellContextMenu.js
@@ -75,8 +75,10 @@ export default class InputCellContextMenu extends Component {
   }
 
   render() {
+    const variables = this.variableResolver.getVariables(this.props.context.input);
     return (
       <InputEditor
+        variables={ variables }
         label={ this.getValue('label') }
         text={ this.getValue('text') }
         onChange={ this.handleChange } />
@@ -87,6 +89,7 @@ export default class InputCellContextMenu extends Component {
 InputCellContextMenu.$inject = [
   'debounceInput',
   'modeling',
+  'variableResolver',
   'injector'
 ];
 

diff --git a/...s/dmn-js-decision-table/src/features/decision-table-head/editor/components/InputEditor.js b/...s/dmn-js-decision-table/src/features/decision-table-head/editor/components/InputEditor.js
@@ -69,7 +69,9 @@ export default class InputEditor extends Component {
               ].join(' ')
             }
             onInput={ this.handleValue }
-            value={ text || '' } />
+            value={ text || '' }
+            variables={ this.props.variables }
+          />
         </div>
       </div>
     );

diff --git a/packages/dmn-js-shared/src/components/LiteralExpression.js b/packages/dmn-js-shared/src/components/LiteralExpression.js
@@ -15,10 +15,17 @@ export default class LiteralExpression extends Component {
     this.editor = new FeelEditor({
       container: this.node,
       onChange: this.props.onInput,
-      value: this.props.value
+      value: this.props.value,
+      variables: this.props.variables || []
     });
   }
 
+  componentDidUpdate(prevProps) {
+    if (!jsonEqual(prevProps.variables, this.props.variables)) {
+      this.editor.setVariables(this.props.variables);
+    }
+  }
+
   handleMouseEvent = (event) => {
     event.stopPropagation();
   };
@@ -44,3 +51,7 @@ export default class LiteralExpression extends Component {
     );
   }
 }
+
+function jsonEqual(a, b) {
+  return JSON.stringify(a) === JSON.stringify(b);
+}