feat: implement script component (viewer)

Related to #1102
bpmn-io · Apr 4, 2024 · 5246779 · 5246779
1 parent 601ec7c
commit 5246779
Show file tree

Hide file tree

Showing 11 changed files with 237 additions and 54 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/form-js-viewer/assets/form-js-base.css b/packages/form-js-viewer/assets/form-js-base.css
@@ -1203,6 +1203,10 @@
   margin-right: 4px;
 }
 
+.fjs-container .fjs-sandbox-iframe-container {
+  display: none;
+}
+
 /**
 * Flatpickr style adjustments
 */

diff --git a/packages/form-js-viewer/package.json b/packages/form-js-viewer/package.json
@@ -45,6 +45,7 @@
   },
   "dependencies": {
     "@carbon/grid": "^11.11.0",
+    "@jetbrains/websandbox": "^1.0.10",
     "big.js": "^6.2.1",
     "classnames": "^2.3.1",
     "didi": "^10.0.1",
@@ -56,7 +57,8 @@
     "lodash": "^4.5.0",
     "marked": "^12.0.1",
     "min-dash": "^4.2.1",
-    "preact": "^10.5.14"
+    "preact": "^10.5.14",
+    "uuid": "^9.0.1"
   },
   "sideEffects": [
     "*.css"

diff --git a/packages/form-js-viewer/rollup.config.js b/packages/form-js-viewer/rollup.config.js
@@ -58,6 +58,7 @@ export default [
       'flatpickr',
       'marked',
       '@carbon/grid',
+      '@jetbrains/websandbox',
       'feelers',
       'dompurify'
     ],

diff --git a/packages/form-js-viewer/src/Form.js b/packages/form-js-viewer/src/Form.js
@@ -446,42 +446,44 @@ export class Form {
     const pathRegistry = this.get('pathRegistry');
     const formData = this._getState().data;
 
-    function collectSubmitDataRecursively(submitData, formField, indexes) {
-      const { disabled, type } = formField;
+    function collectSubmitDataRecursively(submitData, field, indexes) {
+      const { disabled, type } = field;
       const { config: fieldConfig } = formFields.get(type);
 
       // (1) Process keyed fields
-      if (!disabled && fieldConfig.keyed) {
-        const valuePath = pathRegistry.getValuePath(formField, { indexes });
+      const isSubmittedKeyedField = fieldConfig.keyed && !disabled && !(fieldConfig.allowDoNotSubmit && field.doNotSubmit);
+
+      if (isSubmittedKeyedField) {
+        const valuePath = pathRegistry.getValuePath(field, { indexes });
         const value = get(formData, valuePath);
         set(submitData, valuePath, value);
       }
 
       // (2) Process parents
-      if (!Array.isArray(formField.components)) {
+      if (!Array.isArray(field.components)) {
         return;
       }
 
       // (3a) Recurse repeatable parents both across the indexes of repetition and the children
-      if (fieldConfig.repeatable && formField.isRepeating) {
+      if (fieldConfig.repeatable && field.isRepeating) {
 
-        const valueData = get(formData, pathRegistry.getValuePath(formField, { indexes }));
+        const valueData = get(formData, pathRegistry.getValuePath(field, { indexes }));
 
         if (!Array.isArray(valueData)) {
           return;
         }
 
         valueData.forEach((_, index) => {
-          formField.components.forEach((component) => {
-            collectSubmitDataRecursively(submitData, component, { ...indexes, [formField.id]: index });
+          field.components.forEach((component) => {
+            collectSubmitDataRecursively(submitData, component, { ...indexes, [field.id]: index });
           });
         });
 
         return;
       }
 
       // (3b) Recurse non-repeatable parents only across the children
-      formField.components.forEach((component) => collectSubmitDataRecursively(submitData, component, indexes));
+      field.components.forEach((component) => collectSubmitDataRecursively(submitData, component, indexes));
     }
 
     const workingSubmitData = {};

diff --git a/packages/form-js-viewer/src/render/components/form-fields/ExpressionField.js b/packages/form-js-viewer/src/render/components/form-fields/ExpressionField.js
@@ -40,8 +40,9 @@ export function ExpressionField(props) {
 ExpressionField.config = {
   type,
   label: 'Expression',
-  group: 'basic-input',
+  group: 'advanced',
   keyed: true,
+  allowDoNotSubmit: true,
   escapeGridRender: true,
   create: (options = {}) => ({
     computeOn: 'change',