diff --git a/spiffworkflow-backend/src/spiffworkflow_backend/routes/process_api_blueprint.py b/spiffworkflow-backend/src/spiffworkflow_backend/routes/process_api_blueprint.py index 7c7643bf9..f2ffec20f 100644 --- a/spiffworkflow-backend/src/spiffworkflow_backend/routes/process_api_blueprint.py +++ b/spiffworkflow-backend/src/spiffworkflow_backend/routes/process_api_blueprint.py @@ -1069,12 +1069,13 @@ def task_show(process_instance_id: int, task_id: str) -> flask.wrappers.Response ) if ui_form_contents: task.form_ui_schema = ui_form_contents - elif task.type == "Manual Task": - if task.properties and task.data: - if task.properties["instructionsForEndUser"]: - task.properties["instructionsForEndUser"] = render_jinja_template( - task.properties["instructionsForEndUser"], task.data - ) + + if task.properties and task.data and "instructionsForEndUser" in task.properties: + print(f"task.properties['instructionsForEndUser']: {task.properties['instructionsForEndUser']}") + if task.properties["instructionsForEndUser"]: + task.properties["instructionsForEndUser"] = render_jinja_template( + task.properties["instructionsForEndUser"], task.data + ) return make_response(jsonify(task), 200) diff --git a/spiffworkflow-frontend/package-lock.json b/spiffworkflow-frontend/package-lock.json index 7eb07fb02..eb5462b96 100644 --- a/spiffworkflow-frontend/package-lock.json +++ b/spiffworkflow-frontend/package-lock.json @@ -11,7 +11,6 @@ "@babel/core": "^7.18.10", "@babel/plugin-transform-react-jsx": "^7.18.6", "@babel/preset-react": "^7.18.6", - "@bpmn-io/properties-panel": "^0.19.0", "@carbon/react": "^1.16.0", "@ginkgo-bioworks/react-json-schema-form-builder": "^2.9.0", "@monaco-editor/react": "^4.4.5", @@ -28,13 +27,13 @@ "axios": "^0.27.2", "bootstrap": "^5.2.0", "bpmn-js": "^9.3.2", - "bpmn-js-properties-panel": "^1.5.0", + "bpmn-js-properties-panel": "^1.10.0", "bpmn-js-spiffworkflow": "sartography/bpmn-js-spiffworkflow#main", "craco": "^0.0.3", "date-fns": "^2.28.0", "diagram-js": "^8.5.0", "dmn-js": "^12.2.0", - "dmn-js-properties-panel": "^1.1.0", + "dmn-js-properties-panel": "^1.1", "dmn-js-shared": "^12.1.1", "jwt-decode": "^3.1.2", "keycloak-js": "^18.0.1", @@ -2040,49 +2039,96 @@ "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==" }, "node_modules/@bpmn-io/element-templates-validator": { - "version": "0.9.0", - "resolved": "https://registry.npmjs.org/@bpmn-io/element-templates-validator/-/element-templates-validator-0.9.0.tgz", - "integrity": "sha512-oS5eaXPKxl5bV8x4dJYPCWJpWMumr16TTS39S1oJEh/bKke/nhMBuhsk6wWCp7+G3jWWDkUcS1jGAAaKtvQneA==", + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/@bpmn-io/element-templates-validator/-/element-templates-validator-0.11.0.tgz", + "integrity": "sha512-4eZCPLuWf1N4lL8jIKZjWgwLJ2IUTgkQ4VDnfbDiSvjGJqHaLA4XBcC5smvb8Q/MqsJFxWZumolJJb1h7gt39Q==", "dependencies": { - "@camunda/element-templates-json-schema": "^0.10.0", - "@camunda/zeebe-element-templates-json-schema": "^0.5.0", + "@camunda/element-templates-json-schema": "^0.10.1", + "@camunda/zeebe-element-templates-json-schema": "^0.6.0", "json-source-map": "^0.6.1", - "min-dash": "^3.8.1" + "min-dash": "^4.0.0" } }, + "node_modules/@bpmn-io/element-templates-validator/node_modules/min-dash": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/min-dash/-/min-dash-4.0.0.tgz", + "integrity": "sha512-piIvVJ/nxuA4+LpnYIzF6oCtRvdtDvQJteSC+H768H2UvPKFKIt5oiJnUVtr0ZdchneXTcvUZ91vIrvWVIN0AA==" + }, "node_modules/@bpmn-io/extract-process-variables": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/@bpmn-io/extract-process-variables/-/extract-process-variables-0.5.1.tgz", - "integrity": "sha512-Kx0zknI9GRli1EDkgmkUV34cKYsqppsgbcnfrSaT2Tmh7CGXEo8b6UzuGFlZtCZt4488UxjP7UhdrONTt5Si/A==", + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/@bpmn-io/extract-process-variables/-/extract-process-variables-0.6.0.tgz", + "integrity": "sha512-vq4jwGXDO11jwQgj9lvpVxVxjnRAz4C4TqPnhromcsllH5iRBrUNtBKgK0c/RWxiEGNTBhTYm19sP+LN1UcLWA==", "dependencies": { - "min-dash": "^3.8.1" + "min-dash": "^4.0.0" } }, + "node_modules/@bpmn-io/extract-process-variables/node_modules/min-dash": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/min-dash/-/min-dash-4.0.0.tgz", + "integrity": "sha512-piIvVJ/nxuA4+LpnYIzF6oCtRvdtDvQJteSC+H768H2UvPKFKIt5oiJnUVtr0ZdchneXTcvUZ91vIrvWVIN0AA==" + }, "node_modules/@bpmn-io/feel-editor": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/@bpmn-io/feel-editor/-/feel-editor-0.2.0.tgz", - "integrity": "sha512-R85p56nFxffNp0fStNxz561EXJmcTdVZL7NyVhuB3qKS/mt4thuvK1B43YnXKdLx8WessjsbHzjvWkbCYZRWkQ==", + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/@bpmn-io/feel-editor/-/feel-editor-0.4.1.tgz", + "integrity": "sha512-+UGpofI09xGxs1Rr/1V3NLeNSfeKrIGcWvwDY5M3xb4tP6nOQfwqmQA1761Wni9fl3RuLzf6gOx7vGWeQ7afIA==", + "peer": true, "dependencies": { - "@codemirror/autocomplete": "^6.0.3", + "@codemirror/autocomplete": "^6.1.1", "@codemirror/commands": "^6.0.0", "@codemirror/language": "^6.0.0", "@codemirror/lint": "^6.0.0", "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.0.0", "@lezer/highlight": "^1.0.0", - "lezer-feel": "^0.4.0" + "lang-feel": "^0.0.3", + "lezer-feel": "^0.14.1", + "min-dom": "^4.0.1" + } + }, + "node_modules/@bpmn-io/feel-editor/node_modules/min-dash": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/min-dash/-/min-dash-4.0.0.tgz", + "integrity": "sha512-piIvVJ/nxuA4+LpnYIzF6oCtRvdtDvQJteSC+H768H2UvPKFKIt5oiJnUVtr0ZdchneXTcvUZ91vIrvWVIN0AA==", + "peer": true + }, + "node_modules/@bpmn-io/feel-editor/node_modules/min-dom": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/min-dom/-/min-dom-4.0.3.tgz", + "integrity": "sha512-5zQyCMe8rtGiDIRjfGeqnF2YPJ7OAPFdJQeC7MakHais3dh4VG4PV2a0FacziKTzJjYK5qnPKm2sq1wSXB1wTQ==", + "peer": true, + "dependencies": { + "component-event": "^0.1.4", + "domify": "^1.4.1", + "min-dash": "^4.0.0" } }, "node_modules/@bpmn-io/properties-panel": { - "version": "0.19.0", - "resolved": "https://registry.npmjs.org/@bpmn-io/properties-panel/-/properties-panel-0.19.0.tgz", - "integrity": "sha512-cw+MfA2gpCBsa9Q0+JT3Gc7OvR1NGXuyQj4yOk5QoQHNzxuIMNuz6EX2NvDsCrf0oSzc9z0FapbzDuJB+DSC1g==", + "version": "0.23.0", + "resolved": "https://registry.npmjs.org/@bpmn-io/properties-panel/-/properties-panel-0.23.0.tgz", + "integrity": "sha512-K/KHAf/XEhTPEeVmMdj9j6Al8XLz0eVdTBfKbyvAgSCbq4GVrEU/ylJVRyZo4KGRhj4O4AUo1zaal8pyhaAxdg==", + "peer": true, "dependencies": { - "@bpmn-io/feel-editor": "0.2.0", + "@bpmn-io/feel-editor": "0.4.1", "classnames": "^2.3.1", - "diagram-js": "^8.1.2", - "min-dash": "^3.7.0", - "min-dom": "^3.1.3" + "min-dash": "^4.0.0", + "min-dom": "^4.0.3" + } + }, + "node_modules/@bpmn-io/properties-panel/node_modules/min-dash": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/min-dash/-/min-dash-4.0.0.tgz", + "integrity": "sha512-piIvVJ/nxuA4+LpnYIzF6oCtRvdtDvQJteSC+H768H2UvPKFKIt5oiJnUVtr0ZdchneXTcvUZ91vIrvWVIN0AA==", + "peer": true + }, + "node_modules/@bpmn-io/properties-panel/node_modules/min-dom": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/min-dom/-/min-dom-4.0.3.tgz", + "integrity": "sha512-5zQyCMe8rtGiDIRjfGeqnF2YPJ7OAPFdJQeC7MakHais3dh4VG4PV2a0FacziKTzJjYK5qnPKm2sq1wSXB1wTQ==", + "peer": true, + "dependencies": { + "component-event": "^0.1.4", + "domify": "^1.4.1", + "min-dash": "^4.0.0" } }, "node_modules/@camunda/element-templates-json-schema": { @@ -2091,9 +2137,9 @@ "integrity": "sha512-sw8RNecjQgY7tX26PMLRJGNX/2QCnlwCvZfxQWh606qlJZsLbpvEbvfgIGCRoYlHYTlsP6PxVcWYx5LPo7yisg==" }, "node_modules/@camunda/zeebe-element-templates-json-schema": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/@camunda/zeebe-element-templates-json-schema/-/zeebe-element-templates-json-schema-0.5.0.tgz", - "integrity": "sha512-BVHVl4cuK9LxL1eDSdWs8AzuZd981/+CPkw7xlwcB1Xkn6Di8E2iRbDUCBhOIqkahjJYq957nVtbM6jlqXX5qw==" + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/@camunda/zeebe-element-templates-json-schema/-/zeebe-element-templates-json-schema-0.6.0.tgz", + "integrity": "sha512-qawIFM52lp1hW2vWrHaX8ywguZsp2olE0DRTHUY+KWH5GwszZwGWECP3tji1KVih2TasQyf28kcQVh8TeQ6dAg==" }, "node_modules/@carbon/colors": { "version": "11.7.0", @@ -2228,9 +2274,10 @@ } }, "node_modules/@codemirror/autocomplete": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.1.0.tgz", - "integrity": "sha512-wtO4O5WDyXhhCd4q4utDIDZxnQfmJ++3dGBCG9LMtI79+92OcA1DVk/n7BEupKmjIr8AzvptDz7YQ9ud6OkU+A==", + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.3.0.tgz", + "integrity": "sha512-4jEvh3AjJZTDKazd10J6ZsCIqaYxDMCeua5ouQxY8hlFIml+nr7le0SgBhT3SIytFBmdzPK3AUhXGuW3T79nVg==", + "peer": true, "dependencies": { "@codemirror/language": "^6.0.0", "@codemirror/state": "^6.0.0", @@ -2245,9 +2292,10 @@ } }, "node_modules/@codemirror/commands": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/@codemirror/commands/-/commands-6.1.0.tgz", - "integrity": "sha512-qCj2YqmbBjj0P1iumnlL5lBqZvJPzT+t2UvgjcaXErp5ZvMqFRVgQyrEfdXX6SX5UcvcHKBjXqno+MkUp0aYvQ==", + "version": "6.1.2", + "resolved": "https://registry.npmjs.org/@codemirror/commands/-/commands-6.1.2.tgz", + "integrity": "sha512-sO3jdX1s0pam6lIdeSJLMN3DQ6mPEbM4yLvyKkdqtmd/UDwhXA5+AwFJ89rRXm6vTeOXBsE5cAmlos/t7MJdgg==", + "peer": true, "dependencies": { "@codemirror/language": "^6.0.0", "@codemirror/state": "^6.0.0", @@ -2256,9 +2304,10 @@ } }, "node_modules/@codemirror/language": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.2.1.tgz", - "integrity": "sha512-MC3svxuvIj0MRpFlGHxLS6vPyIdbTr2KKPEW46kCoCXw2ktb4NTkpkPBI/lSP/FoNXLCBJ0mrnUi1OoZxtpW1Q==", + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.3.0.tgz", + "integrity": "sha512-6jOE5DEt6sKD46SXhn3xPbBehn+l48ACcA6Uxs2k+E2YNH9XGF5WdGMTYr2DlggfK4h0QZBK6zEb5S7lkTriWA==", + "peer": true, "dependencies": { "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.0.0", @@ -2272,6 +2321,7 @@ "version": "6.0.0", "resolved": "https://registry.npmjs.org/@codemirror/lint/-/lint-6.0.0.tgz", "integrity": "sha512-nUUXcJW1Xp54kNs+a1ToPLK8MadO0rMTnJB8Zk4Z8gBdrN0kqV7uvUraU/T2yqg+grDNR38Vmy/MrhQN/RgwiA==", + "peer": true, "dependencies": { "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.0.0", @@ -2279,14 +2329,16 @@ } }, "node_modules/@codemirror/state": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.1.1.tgz", - "integrity": "sha512-2s+aXsxmAwnR3Rd+JDHPG/1lw0YsA9PEwl7Re88gHJHGfxyfEzKBmsN4rr53RyPIR4lzbbhJX0DCq0WlqlBIRw==" + "version": "6.1.2", + "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.1.2.tgz", + "integrity": "sha512-Mxff85Hp5va+zuj+H748KbubXjrinX/k28lj43H14T2D0+4kuvEFIEIO7hCEcvBT8ubZyIelt9yGOjj2MWOEQA==", + "peer": true }, "node_modules/@codemirror/view": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.2.0.tgz", - "integrity": "sha512-3emW1symh+GoteFMBPsltjmF790U/trouLILATh3JodbF/z98HvcQh2g3+H6dfNIHx16uNonsAF4mNzVr1TJNA==", + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.4.0.tgz", + "integrity": "sha512-Kv32b6Tn7QVwFbj/EDswTLSocjk5kgggF6zzBFAL4o4hZ/vmtFD155+EjH1pVlbfoDyVC2M6SedPsMrwYscgNg==", + "peer": true, "dependencies": { "@codemirror/state": "^6.0.0", "style-mod": "^4.0.0", @@ -4248,14 +4300,16 @@ "integrity": "sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A==" }, "node_modules/@lezer/common": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@lezer/common/-/common-1.0.0.tgz", - "integrity": "sha512-ohydQe+Hb+w4oMDvXzs8uuJd2NoA3D8YDcLiuDsLqH+yflDTPEpgCsWI3/6rH5C3BAedtH1/R51dxENldQceEA==" + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@lezer/common/-/common-1.0.1.tgz", + "integrity": "sha512-8TR5++Q/F//tpDsLd5zkrvEX5xxeemafEaek7mUp7Y+bI8cKQXdSqhzTOBaOogETcMOVr0pT3BBPXp13477ciw==", + "peer": true }, "node_modules/@lezer/highlight": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@lezer/highlight/-/highlight-1.0.0.tgz", - "integrity": "sha512-nsCnNtim90UKsB5YxoX65v3GEIw3iCHw9RM2DtdgkiqAbKh9pCdvi8AWNwkYf10Lu6fxNhXPpkpHbW6mihhvJA==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@lezer/highlight/-/highlight-1.1.2.tgz", + "integrity": "sha512-CAun1WR1glxG9ZdOokTZwXbcwB7PXkIEyZRUMFBVwSrhTcogWq634/ByNImrkUnQhjju6xsIaOBIxvcRJtplXQ==", + "peer": true, "dependencies": { "@lezer/common": "^1.0.0" } @@ -4264,6 +4318,7 @@ "version": "1.2.3", "resolved": "https://registry.npmjs.org/@lezer/lr/-/lr-1.2.3.tgz", "integrity": "sha512-qpB7rBzH8f6Mzjv2AVZRahcm+2Cf7nbIH++uXbvVOL1yIRvVWQ3HAM/saeBLCyz/togB7LGo76qdJYL1uKQlqA==", + "peer": true, "dependencies": { "@lezer/common": "^1.0.0" } @@ -7333,42 +7388,58 @@ } }, "node_modules/bpmn-js-properties-panel": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/bpmn-js-properties-panel/-/bpmn-js-properties-panel-1.5.0.tgz", - "integrity": "sha512-0VAPk6xK/u+GepjGjt8HAXtBa2ab5o4Dkn5II8UgnFMoQThpvrsLras3vh1il8j/2vPhngAsfiA8z7Y9nJ6/Hw==", + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/bpmn-js-properties-panel/-/bpmn-js-properties-panel-1.10.0.tgz", + "integrity": "sha512-Vu6YTS70zGS8aCGUuiABfR5JmpEpq2xZuQ1qGHMpwQcf2Mu7k7GXaaWlHv8qwzIBIPddpTdpWQJBvVMPBw834g==", "dependencies": { - "@bpmn-io/element-templates-validator": "^0.9.0", - "@bpmn-io/extract-process-variables": "^0.5.0", + "@bpmn-io/element-templates-validator": "^0.11.0", + "@bpmn-io/extract-process-variables": "^0.6.0", "array-move": "^3.0.1", "classnames": "^2.3.1", "ids": "^1.0.0", - "min-dash": "^3.8.1", - "min-dom": "^3.1.3", + "min-dash": "^4.0.0", + "min-dom": "^4.0.3", "preact-markup": "^2.1.1", "semver-compare": "^1.0.0" }, "peerDependencies": { - "@bpmn-io/properties-panel": "0.19.x", - "bpmn-js": "8.x || 9.x", - "camunda-bpmn-js-behaviors": "0.1.x", - "diagram-js": "7.x || 8.x" + "@bpmn-io/properties-panel": ">= 0.21", + "bpmn-js": ">= 8", + "camunda-bpmn-js-behaviors": ">= 0.2", + "diagram-js": ">= 7" + } + }, + "node_modules/bpmn-js-properties-panel/node_modules/min-dash": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/min-dash/-/min-dash-4.0.0.tgz", + "integrity": "sha512-piIvVJ/nxuA4+LpnYIzF6oCtRvdtDvQJteSC+H768H2UvPKFKIt5oiJnUVtr0ZdchneXTcvUZ91vIrvWVIN0AA==" + }, + "node_modules/bpmn-js-properties-panel/node_modules/min-dom": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/min-dom/-/min-dom-4.0.3.tgz", + "integrity": "sha512-5zQyCMe8rtGiDIRjfGeqnF2YPJ7OAPFdJQeC7MakHais3dh4VG4PV2a0FacziKTzJjYK5qnPKm2sq1wSXB1wTQ==", + "dependencies": { + "component-event": "^0.1.4", + "domify": "^1.4.1", + "min-dash": "^4.0.0" } }, "node_modules/bpmn-js-spiffworkflow": { "version": "0.0.8", - "resolved": "git+ssh://git@github.com/sartography/bpmn-js-spiffworkflow.git#9c0da02406ecbc51cfd7fd1ed1f2f311101d9987", + "resolved": "git+ssh://git@github.com/sartography/bpmn-js-spiffworkflow.git#999ea7e4c0e5157546625fbd7b1eb5cc8a79c0c0", "license": "MIT", "dependencies": { - "@bpmn-io/properties-panel": "^0.19.0", - "bpmn-js": "^9.4.0", - "bpmn-js-properties-panel": "^1.5.0", - "diagram-js": "^8.5.0", "inherits": "^2.0.4", "inherits-browser": "^0.0.1", "min-dash": "^3.8.1", "min-dom": "^3.2.1", "moddle": "^5.0.3", "tiny-svg": "^2.2.3" + }, + "peerDependencies": { + "bpmn-js": "*", + "bpmn-js-properties-panel": "*", + "diagram-js": "*" } }, "node_modules/bpmn-moddle": { @@ -7722,32 +7793,31 @@ } }, "node_modules/camunda-bpmn-js-behaviors": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/camunda-bpmn-js-behaviors/-/camunda-bpmn-js-behaviors-0.1.1.tgz", - "integrity": "sha512-8hRxOuOgd9fEWFZ7rfB+TpxYnXm9uGJ2xjmZdCUBSKqF8yEbtDPRO3/NUJIf1YT7iHK+lYJaG4S+wRbbZX7wEw==", + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/camunda-bpmn-js-behaviors/-/camunda-bpmn-js-behaviors-0.3.0.tgz", + "integrity": "sha512-isD424Lwgh4+v3IWDnqLkkA/oIQcwFHQ6TmxUYBNuF5WshO25a2u/6SgAtBiWpg2xqjD5x8zi5/0JWr/Yp7WEg==", "peer": true, "dependencies": { "ids": "^1.0.0", - "min-dash": "^3.7.0" + "min-dash": "^4.0.0" }, "peerDependencies": { - "bpmn-js": "9.x", - "camunda-bpmn-moddle": "6.x", - "zeebe-bpmn-moddle": "0.12.x" + "bpmn-js": ">= 9", + "camunda-bpmn-moddle": ">= 7", + "zeebe-bpmn-moddle": ">= 0.15" } }, + "node_modules/camunda-bpmn-js-behaviors/node_modules/min-dash": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/min-dash/-/min-dash-4.0.0.tgz", + "integrity": "sha512-piIvVJ/nxuA4+LpnYIzF6oCtRvdtDvQJteSC+H768H2UvPKFKIt5oiJnUVtr0ZdchneXTcvUZ91vIrvWVIN0AA==", + "peer": true + }, "node_modules/camunda-bpmn-moddle": { - "version": "6.1.2", - "resolved": "https://registry.npmjs.org/camunda-bpmn-moddle/-/camunda-bpmn-moddle-6.1.2.tgz", - "integrity": "sha512-DfhOTeq8oN01cB5sLE6Rq34/9xGD15/Y14pEM+YBIjgvV6Rclh+BgIa/2aRMm8An4Kc/itm2tECYiDr8p/FyTQ==", - "peer": true, - "dependencies": { - "min-dash": "^3.8.1" - }, - "peerDependencies": { - "bpmn-js": "^6.x || ^7.x || ^8.x || ^9.x", - "diagram-js": "^5.x || ^6.x || ^7.x || ^8.x" - } + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/camunda-bpmn-moddle/-/camunda-bpmn-moddle-7.0.1.tgz", + "integrity": "sha512-Br8Diu6roMpziHdpl66Dhnm0DTnCFMrSD9zwLV08LpD52QA0UsXxU87XfHf08HjuB7ly0Hd1bvajZRpf9hbmYQ==", + "peer": true }, "node_modules/caniuse-api": { "version": "3.0.0", @@ -8793,7 +8863,8 @@ "node_modules/crelt": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/crelt/-/crelt-1.0.5.tgz", - "integrity": "sha512-+BO9wPPi+DWTDcNYhr/W90myha8ptzftZT+LwcmUbbok0rcP/fequmFYCw8NMoH7pkAZQzU78b3kYrlua5a9eA==" + "integrity": "sha512-+BO9wPPi+DWTDcNYhr/W90myha8ptzftZT+LwcmUbbok0rcP/fequmFYCw8NMoH7pkAZQzU78b3kYrlua5a9eA==", + "peer": true }, "node_modules/cross-spawn": { "version": "7.0.3", @@ -9775,16 +9846,17 @@ } }, "node_modules/dmn-js-properties-panel": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/dmn-js-properties-panel/-/dmn-js-properties-panel-1.1.0.tgz", - "integrity": "sha512-IclTOU4O3zTRPVvhgGl2TOayVUPPmGqHGyF/OwahE3qKwwMTqwfyZCE73bkqAiQbhunH6qjPWmGWE7vpH4OvVQ==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/dmn-js-properties-panel/-/dmn-js-properties-panel-1.2.1.tgz", + "integrity": "sha512-bHWH8z5v7KpjrJ/PJ/ZU/RDlZhEiFnxAOYSkjmmXDbpZ6FKmtTxcC/UenWmqFQhMoACxDHrmajt/owRHt8t3uw==", "dependencies": { + "diagram-js": "^8.9.0", "min-dash": "^3.8.1", "min-dom": "^3.1.3" }, "peerDependencies": { - "@bpmn-io/properties-panel": "0.11.x || 0.12.x || 0.13.x || 0.14.x || 0.15.x", - "dmn-js": "11.x || 12.x" + "@bpmn-io/properties-panel": ">=0.11.0 <=0.23.x", + "dmn-js": "11.x || 12.x || 13.x" } }, "node_modules/dmn-js-shared": { @@ -18228,6 +18300,20 @@ "node": ">= 8" } }, + "node_modules/lang-feel": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/lang-feel/-/lang-feel-0.0.3.tgz", + "integrity": "sha512-YEs49jXQfLetXUr4Sj+pq9kcwHyNFcEYiXvm/bRvQyUwVfUEAHQdeFneqw+5zGeDuKDgIGxawXVs7uysXaLrjQ==", + "peer": true, + "dependencies": { + "@codemirror/autocomplete": "^6.0.0", + "@codemirror/language": "^6.0.0", + "@codemirror/state": "^6.0.0", + "@codemirror/view": "^6.0.0", + "@lezer/common": "^1.0.0", + "lezer-feel": "^0.14.1" + } + }, "node_modules/language-subtag-registry": { "version": "0.3.22", "resolved": "https://registry.npmjs.org/language-subtag-registry/-/language-subtag-registry-0.3.22.tgz", @@ -18271,24 +18357,13 @@ } }, "node_modules/lezer-feel": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/lezer-feel/-/lezer-feel-0.4.0.tgz", - "integrity": "sha512-yd+AWsOE4NGVeW4x50HXUA9dKs9MUa7H8PATPNEmBiXKfIijPlC6+FEy8OLjOzb4b9y9pPPpAqnZ2/kvLmvZVw==", + "version": "0.14.1", + "resolved": "https://registry.npmjs.org/lezer-feel/-/lezer-feel-0.14.1.tgz", + "integrity": "sha512-sfpzZvAtObFon74XiFp1L8pS1FminnfM8JAm4S2Kxk7Wk8qYe7crjJdhHqju/MKl9dV5s44NHDhbq5tCDWMTlw==", + "peer": true, "dependencies": { - "@lezer/lr": "^0.16.0" - } - }, - "node_modules/lezer-feel/node_modules/@lezer/common": { - "version": "0.16.1", - "resolved": "https://registry.npmjs.org/@lezer/common/-/common-0.16.1.tgz", - "integrity": "sha512-qPmG7YTZ6lATyTOAWf8vXE+iRrt1NJd4cm2nJHK+v7X9TsOF6+HtuU/ctaZy2RCrluxDb89hI6KWQ5LfQGQWuA==" - }, - "node_modules/lezer-feel/node_modules/@lezer/lr": { - "version": "0.16.3", - "resolved": "https://registry.npmjs.org/@lezer/lr/-/lr-0.16.3.tgz", - "integrity": "sha512-pau7um4eAw94BEuuShUIeQDTf3k4Wt6oIUOYxMmkZgDHdqtIcxWND4LRxi8nI9KuT4I1bXQv67BCapkxt7Ywqw==", - "dependencies": { - "@lezer/common": "^0.16.0" + "@lezer/highlight": "^1.0.0", + "@lezer/lr": "^1.2.3" } }, "node_modules/lilconfig": { @@ -25661,7 +25736,8 @@ "node_modules/style-mod": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/style-mod/-/style-mod-4.0.0.tgz", - "integrity": "sha512-OPhtyEjyyN9x3nhPsu76f52yUGXiZcgvsrFVtvTkyGRQJ0XK+GPc6ov1z+lRpbeabka+MYEQxOYRnt5nF30aMw==" + "integrity": "sha512-OPhtyEjyyN9x3nhPsu76f52yUGXiZcgvsrFVtvTkyGRQJ0XK+GPc6ov1z+lRpbeabka+MYEQxOYRnt5nF30aMw==", + "peer": true }, "node_modules/style-to-object": { "version": "0.3.0", @@ -28183,7 +28259,8 @@ "node_modules/w3c-keyname": { "version": "2.2.6", "resolved": "https://registry.npmjs.org/w3c-keyname/-/w3c-keyname-2.2.6.tgz", - "integrity": "sha512-f+fciywl1SJEniZHD6H+kUO8gOnwIr7f4ijKA6+ZvJFjeGi1r4PDLl53Ayud9O/rk64RqgoQine0feoeOU0kXg==" + "integrity": "sha512-f+fciywl1SJEniZHD6H+kUO8gOnwIr7f4ijKA6+ZvJFjeGi1r4PDLl53Ayud9O/rk64RqgoQine0feoeOU0kXg==", + "peer": true }, "node_modules/w3c-xmlserializer": { "version": "3.0.0", @@ -29607,9 +29684,9 @@ } }, "node_modules/zeebe-bpmn-moddle": { - "version": "0.12.2", - "resolved": "https://registry.npmjs.org/zeebe-bpmn-moddle/-/zeebe-bpmn-moddle-0.12.2.tgz", - "integrity": "sha512-5oMdxaApO3msNEP+RxVapyWxuIHBNwi9WTVoCV99x/SAEuCK+VDYZloa9MCG4DX3dbuXUWA0VpzP4YJ+oNTapg==", + "version": "0.15.0", + "resolved": "https://registry.npmjs.org/zeebe-bpmn-moddle/-/zeebe-bpmn-moddle-0.15.0.tgz", + "integrity": "sha512-cgn6bjkjrtOGcRumrgWnT1J93wTKmnFlSGGuwGXjF7pOksPF28ssbKiwKVMU6IXHnBDIVLQdf8fVNZn7JiBtQQ==", "peer": true }, "node_modules/zwitch": { @@ -30947,49 +31024,104 @@ "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==" }, "@bpmn-io/element-templates-validator": { - "version": "0.9.0", - "resolved": "https://registry.npmjs.org/@bpmn-io/element-templates-validator/-/element-templates-validator-0.9.0.tgz", - "integrity": "sha512-oS5eaXPKxl5bV8x4dJYPCWJpWMumr16TTS39S1oJEh/bKke/nhMBuhsk6wWCp7+G3jWWDkUcS1jGAAaKtvQneA==", + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/@bpmn-io/element-templates-validator/-/element-templates-validator-0.11.0.tgz", + "integrity": "sha512-4eZCPLuWf1N4lL8jIKZjWgwLJ2IUTgkQ4VDnfbDiSvjGJqHaLA4XBcC5smvb8Q/MqsJFxWZumolJJb1h7gt39Q==", "requires": { - "@camunda/element-templates-json-schema": "^0.10.0", - "@camunda/zeebe-element-templates-json-schema": "^0.5.0", + "@camunda/element-templates-json-schema": "^0.10.1", + "@camunda/zeebe-element-templates-json-schema": "^0.6.0", "json-source-map": "^0.6.1", - "min-dash": "^3.8.1" + "min-dash": "^4.0.0" + }, + "dependencies": { + "min-dash": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/min-dash/-/min-dash-4.0.0.tgz", + "integrity": "sha512-piIvVJ/nxuA4+LpnYIzF6oCtRvdtDvQJteSC+H768H2UvPKFKIt5oiJnUVtr0ZdchneXTcvUZ91vIrvWVIN0AA==" + } } }, "@bpmn-io/extract-process-variables": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/@bpmn-io/extract-process-variables/-/extract-process-variables-0.5.1.tgz", - "integrity": "sha512-Kx0zknI9GRli1EDkgmkUV34cKYsqppsgbcnfrSaT2Tmh7CGXEo8b6UzuGFlZtCZt4488UxjP7UhdrONTt5Si/A==", + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/@bpmn-io/extract-process-variables/-/extract-process-variables-0.6.0.tgz", + "integrity": "sha512-vq4jwGXDO11jwQgj9lvpVxVxjnRAz4C4TqPnhromcsllH5iRBrUNtBKgK0c/RWxiEGNTBhTYm19sP+LN1UcLWA==", "requires": { - "min-dash": "^3.8.1" + "min-dash": "^4.0.0" + }, + "dependencies": { + "min-dash": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/min-dash/-/min-dash-4.0.0.tgz", + "integrity": "sha512-piIvVJ/nxuA4+LpnYIzF6oCtRvdtDvQJteSC+H768H2UvPKFKIt5oiJnUVtr0ZdchneXTcvUZ91vIrvWVIN0AA==" + } } }, "@bpmn-io/feel-editor": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/@bpmn-io/feel-editor/-/feel-editor-0.2.0.tgz", - "integrity": "sha512-R85p56nFxffNp0fStNxz561EXJmcTdVZL7NyVhuB3qKS/mt4thuvK1B43YnXKdLx8WessjsbHzjvWkbCYZRWkQ==", + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/@bpmn-io/feel-editor/-/feel-editor-0.4.1.tgz", + "integrity": "sha512-+UGpofI09xGxs1Rr/1V3NLeNSfeKrIGcWvwDY5M3xb4tP6nOQfwqmQA1761Wni9fl3RuLzf6gOx7vGWeQ7afIA==", + "peer": true, "requires": { - "@codemirror/autocomplete": "^6.0.3", + "@codemirror/autocomplete": "^6.1.1", "@codemirror/commands": "^6.0.0", "@codemirror/language": "^6.0.0", "@codemirror/lint": "^6.0.0", "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.0.0", "@lezer/highlight": "^1.0.0", - "lezer-feel": "^0.4.0" + "lang-feel": "^0.0.3", + "lezer-feel": "^0.14.1", + "min-dom": "^4.0.1" + }, + "dependencies": { + "min-dash": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/min-dash/-/min-dash-4.0.0.tgz", + "integrity": "sha512-piIvVJ/nxuA4+LpnYIzF6oCtRvdtDvQJteSC+H768H2UvPKFKIt5oiJnUVtr0ZdchneXTcvUZ91vIrvWVIN0AA==", + "peer": true + }, + "min-dom": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/min-dom/-/min-dom-4.0.3.tgz", + "integrity": "sha512-5zQyCMe8rtGiDIRjfGeqnF2YPJ7OAPFdJQeC7MakHais3dh4VG4PV2a0FacziKTzJjYK5qnPKm2sq1wSXB1wTQ==", + "peer": true, + "requires": { + "component-event": "^0.1.4", + "domify": "^1.4.1", + "min-dash": "^4.0.0" + } + } } }, "@bpmn-io/properties-panel": { - "version": "0.19.0", - "resolved": "https://registry.npmjs.org/@bpmn-io/properties-panel/-/properties-panel-0.19.0.tgz", - "integrity": "sha512-cw+MfA2gpCBsa9Q0+JT3Gc7OvR1NGXuyQj4yOk5QoQHNzxuIMNuz6EX2NvDsCrf0oSzc9z0FapbzDuJB+DSC1g==", + "version": "0.23.0", + "resolved": "https://registry.npmjs.org/@bpmn-io/properties-panel/-/properties-panel-0.23.0.tgz", + "integrity": "sha512-K/KHAf/XEhTPEeVmMdj9j6Al8XLz0eVdTBfKbyvAgSCbq4GVrEU/ylJVRyZo4KGRhj4O4AUo1zaal8pyhaAxdg==", + "peer": true, "requires": { - "@bpmn-io/feel-editor": "0.2.0", + "@bpmn-io/feel-editor": "0.4.1", "classnames": "^2.3.1", - "diagram-js": "^8.1.2", - "min-dash": "^3.7.0", - "min-dom": "^3.1.3" + "min-dash": "^4.0.0", + "min-dom": "^4.0.3" + }, + "dependencies": { + "min-dash": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/min-dash/-/min-dash-4.0.0.tgz", + "integrity": "sha512-piIvVJ/nxuA4+LpnYIzF6oCtRvdtDvQJteSC+H768H2UvPKFKIt5oiJnUVtr0ZdchneXTcvUZ91vIrvWVIN0AA==", + "peer": true + }, + "min-dom": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/min-dom/-/min-dom-4.0.3.tgz", + "integrity": "sha512-5zQyCMe8rtGiDIRjfGeqnF2YPJ7OAPFdJQeC7MakHais3dh4VG4PV2a0FacziKTzJjYK5qnPKm2sq1wSXB1wTQ==", + "peer": true, + "requires": { + "component-event": "^0.1.4", + "domify": "^1.4.1", + "min-dash": "^4.0.0" + } + } } }, "@camunda/element-templates-json-schema": { @@ -30998,9 +31130,9 @@ "integrity": "sha512-sw8RNecjQgY7tX26PMLRJGNX/2QCnlwCvZfxQWh606qlJZsLbpvEbvfgIGCRoYlHYTlsP6PxVcWYx5LPo7yisg==" }, "@camunda/zeebe-element-templates-json-schema": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/@camunda/zeebe-element-templates-json-schema/-/zeebe-element-templates-json-schema-0.5.0.tgz", - "integrity": "sha512-BVHVl4cuK9LxL1eDSdWs8AzuZd981/+CPkw7xlwcB1Xkn6Di8E2iRbDUCBhOIqkahjJYq957nVtbM6jlqXX5qw==" + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/@camunda/zeebe-element-templates-json-schema/-/zeebe-element-templates-json-schema-0.6.0.tgz", + "integrity": "sha512-qawIFM52lp1hW2vWrHaX8ywguZsp2olE0DRTHUY+KWH5GwszZwGWECP3tji1KVih2TasQyf28kcQVh8TeQ6dAg==" }, "@carbon/colors": { "version": "11.7.0", @@ -31121,9 +31253,10 @@ } }, "@codemirror/autocomplete": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.1.0.tgz", - "integrity": "sha512-wtO4O5WDyXhhCd4q4utDIDZxnQfmJ++3dGBCG9LMtI79+92OcA1DVk/n7BEupKmjIr8AzvptDz7YQ9ud6OkU+A==", + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.3.0.tgz", + "integrity": "sha512-4jEvh3AjJZTDKazd10J6ZsCIqaYxDMCeua5ouQxY8hlFIml+nr7le0SgBhT3SIytFBmdzPK3AUhXGuW3T79nVg==", + "peer": true, "requires": { "@codemirror/language": "^6.0.0", "@codemirror/state": "^6.0.0", @@ -31132,9 +31265,10 @@ } }, "@codemirror/commands": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/@codemirror/commands/-/commands-6.1.0.tgz", - "integrity": "sha512-qCj2YqmbBjj0P1iumnlL5lBqZvJPzT+t2UvgjcaXErp5ZvMqFRVgQyrEfdXX6SX5UcvcHKBjXqno+MkUp0aYvQ==", + "version": "6.1.2", + "resolved": "https://registry.npmjs.org/@codemirror/commands/-/commands-6.1.2.tgz", + "integrity": "sha512-sO3jdX1s0pam6lIdeSJLMN3DQ6mPEbM4yLvyKkdqtmd/UDwhXA5+AwFJ89rRXm6vTeOXBsE5cAmlos/t7MJdgg==", + "peer": true, "requires": { "@codemirror/language": "^6.0.0", "@codemirror/state": "^6.0.0", @@ -31143,9 +31277,10 @@ } }, "@codemirror/language": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.2.1.tgz", - "integrity": "sha512-MC3svxuvIj0MRpFlGHxLS6vPyIdbTr2KKPEW46kCoCXw2ktb4NTkpkPBI/lSP/FoNXLCBJ0mrnUi1OoZxtpW1Q==", + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.3.0.tgz", + "integrity": "sha512-6jOE5DEt6sKD46SXhn3xPbBehn+l48ACcA6Uxs2k+E2YNH9XGF5WdGMTYr2DlggfK4h0QZBK6zEb5S7lkTriWA==", + "peer": true, "requires": { "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.0.0", @@ -31159,6 +31294,7 @@ "version": "6.0.0", "resolved": "https://registry.npmjs.org/@codemirror/lint/-/lint-6.0.0.tgz", "integrity": "sha512-nUUXcJW1Xp54kNs+a1ToPLK8MadO0rMTnJB8Zk4Z8gBdrN0kqV7uvUraU/T2yqg+grDNR38Vmy/MrhQN/RgwiA==", + "peer": true, "requires": { "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.0.0", @@ -31166,14 +31302,16 @@ } }, "@codemirror/state": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.1.1.tgz", - "integrity": "sha512-2s+aXsxmAwnR3Rd+JDHPG/1lw0YsA9PEwl7Re88gHJHGfxyfEzKBmsN4rr53RyPIR4lzbbhJX0DCq0WlqlBIRw==" + "version": "6.1.2", + "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.1.2.tgz", + "integrity": "sha512-Mxff85Hp5va+zuj+H748KbubXjrinX/k28lj43H14T2D0+4kuvEFIEIO7hCEcvBT8ubZyIelt9yGOjj2MWOEQA==", + "peer": true }, "@codemirror/view": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.2.0.tgz", - "integrity": "sha512-3emW1symh+GoteFMBPsltjmF790U/trouLILATh3JodbF/z98HvcQh2g3+H6dfNIHx16uNonsAF4mNzVr1TJNA==", + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.4.0.tgz", + "integrity": "sha512-Kv32b6Tn7QVwFbj/EDswTLSocjk5kgggF6zzBFAL4o4hZ/vmtFD155+EjH1pVlbfoDyVC2M6SedPsMrwYscgNg==", + "peer": true, "requires": { "@codemirror/state": "^6.0.0", "style-mod": "^4.0.0", @@ -32615,14 +32753,16 @@ "integrity": "sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A==" }, "@lezer/common": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@lezer/common/-/common-1.0.0.tgz", - "integrity": "sha512-ohydQe+Hb+w4oMDvXzs8uuJd2NoA3D8YDcLiuDsLqH+yflDTPEpgCsWI3/6rH5C3BAedtH1/R51dxENldQceEA==" + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@lezer/common/-/common-1.0.1.tgz", + "integrity": "sha512-8TR5++Q/F//tpDsLd5zkrvEX5xxeemafEaek7mUp7Y+bI8cKQXdSqhzTOBaOogETcMOVr0pT3BBPXp13477ciw==", + "peer": true }, "@lezer/highlight": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@lezer/highlight/-/highlight-1.0.0.tgz", - "integrity": "sha512-nsCnNtim90UKsB5YxoX65v3GEIw3iCHw9RM2DtdgkiqAbKh9pCdvi8AWNwkYf10Lu6fxNhXPpkpHbW6mihhvJA==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@lezer/highlight/-/highlight-1.1.2.tgz", + "integrity": "sha512-CAun1WR1glxG9ZdOokTZwXbcwB7PXkIEyZRUMFBVwSrhTcogWq634/ByNImrkUnQhjju6xsIaOBIxvcRJtplXQ==", + "peer": true, "requires": { "@lezer/common": "^1.0.0" } @@ -32631,6 +32771,7 @@ "version": "1.2.3", "resolved": "https://registry.npmjs.org/@lezer/lr/-/lr-1.2.3.tgz", "integrity": "sha512-qpB7rBzH8f6Mzjv2AVZRahcm+2Cf7nbIH++uXbvVOL1yIRvVWQ3HAM/saeBLCyz/togB7LGo76qdJYL1uKQlqA==", + "peer": true, "requires": { "@lezer/common": "^1.0.0" } @@ -34937,29 +35078,42 @@ } }, "bpmn-js-properties-panel": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/bpmn-js-properties-panel/-/bpmn-js-properties-panel-1.5.0.tgz", - "integrity": "sha512-0VAPk6xK/u+GepjGjt8HAXtBa2ab5o4Dkn5II8UgnFMoQThpvrsLras3vh1il8j/2vPhngAsfiA8z7Y9nJ6/Hw==", + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/bpmn-js-properties-panel/-/bpmn-js-properties-panel-1.10.0.tgz", + "integrity": "sha512-Vu6YTS70zGS8aCGUuiABfR5JmpEpq2xZuQ1qGHMpwQcf2Mu7k7GXaaWlHv8qwzIBIPddpTdpWQJBvVMPBw834g==", "requires": { - "@bpmn-io/element-templates-validator": "^0.9.0", - "@bpmn-io/extract-process-variables": "^0.5.0", + "@bpmn-io/element-templates-validator": "^0.11.0", + "@bpmn-io/extract-process-variables": "^0.6.0", "array-move": "^3.0.1", "classnames": "^2.3.1", "ids": "^1.0.0", - "min-dash": "^3.8.1", - "min-dom": "^3.1.3", + "min-dash": "^4.0.0", + "min-dom": "^4.0.3", "preact-markup": "^2.1.1", "semver-compare": "^1.0.0" + }, + "dependencies": { + "min-dash": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/min-dash/-/min-dash-4.0.0.tgz", + "integrity": "sha512-piIvVJ/nxuA4+LpnYIzF6oCtRvdtDvQJteSC+H768H2UvPKFKIt5oiJnUVtr0ZdchneXTcvUZ91vIrvWVIN0AA==" + }, + "min-dom": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/min-dom/-/min-dom-4.0.3.tgz", + "integrity": "sha512-5zQyCMe8rtGiDIRjfGeqnF2YPJ7OAPFdJQeC7MakHais3dh4VG4PV2a0FacziKTzJjYK5qnPKm2sq1wSXB1wTQ==", + "requires": { + "component-event": "^0.1.4", + "domify": "^1.4.1", + "min-dash": "^4.0.0" + } + } } }, "bpmn-js-spiffworkflow": { - "version": "git+ssh://git@github.com/sartography/bpmn-js-spiffworkflow.git#9c0da02406ecbc51cfd7fd1ed1f2f311101d9987", + "version": "git+ssh://git@github.com/sartography/bpmn-js-spiffworkflow.git#999ea7e4c0e5157546625fbd7b1eb5cc8a79c0c0", "from": "bpmn-js-spiffworkflow@sartography/bpmn-js-spiffworkflow#main", "requires": { - "@bpmn-io/properties-panel": "^0.19.0", - "bpmn-js": "^9.4.0", - "bpmn-js-properties-panel": "^1.5.0", - "diagram-js": "^8.5.0", "inherits": "^2.0.4", "inherits-browser": "^0.0.1", "min-dash": "^3.8.1", @@ -35237,23 +35391,28 @@ "integrity": "sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==" }, "camunda-bpmn-js-behaviors": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/camunda-bpmn-js-behaviors/-/camunda-bpmn-js-behaviors-0.1.1.tgz", - "integrity": "sha512-8hRxOuOgd9fEWFZ7rfB+TpxYnXm9uGJ2xjmZdCUBSKqF8yEbtDPRO3/NUJIf1YT7iHK+lYJaG4S+wRbbZX7wEw==", + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/camunda-bpmn-js-behaviors/-/camunda-bpmn-js-behaviors-0.3.0.tgz", + "integrity": "sha512-isD424Lwgh4+v3IWDnqLkkA/oIQcwFHQ6TmxUYBNuF5WshO25a2u/6SgAtBiWpg2xqjD5x8zi5/0JWr/Yp7WEg==", "peer": true, "requires": { "ids": "^1.0.0", - "min-dash": "^3.7.0" + "min-dash": "^4.0.0" + }, + "dependencies": { + "min-dash": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/min-dash/-/min-dash-4.0.0.tgz", + "integrity": "sha512-piIvVJ/nxuA4+LpnYIzF6oCtRvdtDvQJteSC+H768H2UvPKFKIt5oiJnUVtr0ZdchneXTcvUZ91vIrvWVIN0AA==", + "peer": true + } } }, "camunda-bpmn-moddle": { - "version": "6.1.2", - "resolved": "https://registry.npmjs.org/camunda-bpmn-moddle/-/camunda-bpmn-moddle-6.1.2.tgz", - "integrity": "sha512-DfhOTeq8oN01cB5sLE6Rq34/9xGD15/Y14pEM+YBIjgvV6Rclh+BgIa/2aRMm8An4Kc/itm2tECYiDr8p/FyTQ==", - "peer": true, - "requires": { - "min-dash": "^3.8.1" - } + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/camunda-bpmn-moddle/-/camunda-bpmn-moddle-7.0.1.tgz", + "integrity": "sha512-Br8Diu6roMpziHdpl66Dhnm0DTnCFMrSD9zwLV08LpD52QA0UsXxU87XfHf08HjuB7ly0Hd1bvajZRpf9hbmYQ==", + "peer": true }, "caniuse-api": { "version": "3.0.0", @@ -36080,7 +36239,8 @@ "crelt": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/crelt/-/crelt-1.0.5.tgz", - "integrity": "sha512-+BO9wPPi+DWTDcNYhr/W90myha8ptzftZT+LwcmUbbok0rcP/fequmFYCw8NMoH7pkAZQzU78b3kYrlua5a9eA==" + "integrity": "sha512-+BO9wPPi+DWTDcNYhr/W90myha8ptzftZT+LwcmUbbok0rcP/fequmFYCw8NMoH7pkAZQzU78b3kYrlua5a9eA==", + "peer": true }, "cross-spawn": { "version": "7.0.3", @@ -36837,10 +36997,11 @@ } }, "dmn-js-properties-panel": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/dmn-js-properties-panel/-/dmn-js-properties-panel-1.1.0.tgz", - "integrity": "sha512-IclTOU4O3zTRPVvhgGl2TOayVUPPmGqHGyF/OwahE3qKwwMTqwfyZCE73bkqAiQbhunH6qjPWmGWE7vpH4OvVQ==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/dmn-js-properties-panel/-/dmn-js-properties-panel-1.2.1.tgz", + "integrity": "sha512-bHWH8z5v7KpjrJ/PJ/ZU/RDlZhEiFnxAOYSkjmmXDbpZ6FKmtTxcC/UenWmqFQhMoACxDHrmajt/owRHt8t3uw==", "requires": { + "diagram-js": "^8.9.0", "min-dash": "^3.8.1", "min-dom": "^3.1.3" } @@ -43209,6 +43370,20 @@ "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.5.tgz", "integrity": "sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ==" }, + "lang-feel": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/lang-feel/-/lang-feel-0.0.3.tgz", + "integrity": "sha512-YEs49jXQfLetXUr4Sj+pq9kcwHyNFcEYiXvm/bRvQyUwVfUEAHQdeFneqw+5zGeDuKDgIGxawXVs7uysXaLrjQ==", + "peer": true, + "requires": { + "@codemirror/autocomplete": "^6.0.0", + "@codemirror/language": "^6.0.0", + "@codemirror/state": "^6.0.0", + "@codemirror/view": "^6.0.0", + "@lezer/common": "^1.0.0", + "lezer-feel": "^0.14.1" + } + }, "language-subtag-registry": { "version": "0.3.22", "resolved": "https://registry.npmjs.org/language-subtag-registry/-/language-subtag-registry-0.3.22.tgz", @@ -43243,26 +43418,13 @@ } }, "lezer-feel": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/lezer-feel/-/lezer-feel-0.4.0.tgz", - "integrity": "sha512-yd+AWsOE4NGVeW4x50HXUA9dKs9MUa7H8PATPNEmBiXKfIijPlC6+FEy8OLjOzb4b9y9pPPpAqnZ2/kvLmvZVw==", + "version": "0.14.1", + "resolved": "https://registry.npmjs.org/lezer-feel/-/lezer-feel-0.14.1.tgz", + "integrity": "sha512-sfpzZvAtObFon74XiFp1L8pS1FminnfM8JAm4S2Kxk7Wk8qYe7crjJdhHqju/MKl9dV5s44NHDhbq5tCDWMTlw==", + "peer": true, "requires": { - "@lezer/lr": "^0.16.0" - }, - "dependencies": { - "@lezer/common": { - "version": "0.16.1", - "resolved": "https://registry.npmjs.org/@lezer/common/-/common-0.16.1.tgz", - "integrity": "sha512-qPmG7YTZ6lATyTOAWf8vXE+iRrt1NJd4cm2nJHK+v7X9TsOF6+HtuU/ctaZy2RCrluxDb89hI6KWQ5LfQGQWuA==" - }, - "@lezer/lr": { - "version": "0.16.3", - "resolved": "https://registry.npmjs.org/@lezer/lr/-/lr-0.16.3.tgz", - "integrity": "sha512-pau7um4eAw94BEuuShUIeQDTf3k4Wt6oIUOYxMmkZgDHdqtIcxWND4LRxi8nI9KuT4I1bXQv67BCapkxt7Ywqw==", - "requires": { - "@lezer/common": "^0.16.0" - } - } + "@lezer/highlight": "^1.0.0", + "@lezer/lr": "^1.2.3" } }, "lilconfig": { @@ -48543,7 +48705,8 @@ "style-mod": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/style-mod/-/style-mod-4.0.0.tgz", - "integrity": "sha512-OPhtyEjyyN9x3nhPsu76f52yUGXiZcgvsrFVtvTkyGRQJ0XK+GPc6ov1z+lRpbeabka+MYEQxOYRnt5nF30aMw==" + "integrity": "sha512-OPhtyEjyyN9x3nhPsu76f52yUGXiZcgvsrFVtvTkyGRQJ0XK+GPc6ov1z+lRpbeabka+MYEQxOYRnt5nF30aMw==", + "peer": true }, "style-to-object": { "version": "0.3.0", @@ -50474,7 +50637,8 @@ "w3c-keyname": { "version": "2.2.6", "resolved": "https://registry.npmjs.org/w3c-keyname/-/w3c-keyname-2.2.6.tgz", - "integrity": "sha512-f+fciywl1SJEniZHD6H+kUO8gOnwIr7f4ijKA6+ZvJFjeGi1r4PDLl53Ayud9O/rk64RqgoQine0feoeOU0kXg==" + "integrity": "sha512-f+fciywl1SJEniZHD6H+kUO8gOnwIr7f4ijKA6+ZvJFjeGi1r4PDLl53Ayud9O/rk64RqgoQine0feoeOU0kXg==", + "peer": true }, "w3c-xmlserializer": { "version": "3.0.0", @@ -51604,9 +51768,9 @@ "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==" }, "zeebe-bpmn-moddle": { - "version": "0.12.2", - "resolved": "https://registry.npmjs.org/zeebe-bpmn-moddle/-/zeebe-bpmn-moddle-0.12.2.tgz", - "integrity": "sha512-5oMdxaApO3msNEP+RxVapyWxuIHBNwi9WTVoCV99x/SAEuCK+VDYZloa9MCG4DX3dbuXUWA0VpzP4YJ+oNTapg==", + "version": "0.15.0", + "resolved": "https://registry.npmjs.org/zeebe-bpmn-moddle/-/zeebe-bpmn-moddle-0.15.0.tgz", + "integrity": "sha512-cgn6bjkjrtOGcRumrgWnT1J93wTKmnFlSGGuwGXjF7pOksPF28ssbKiwKVMU6IXHnBDIVLQdf8fVNZn7JiBtQQ==", "peer": true }, "zwitch": { diff --git a/spiffworkflow-frontend/package.json b/spiffworkflow-frontend/package.json index c48ffca0a..edb914b12 100644 --- a/spiffworkflow-frontend/package.json +++ b/spiffworkflow-frontend/package.json @@ -6,7 +6,6 @@ "@babel/core": "^7.18.10", "@babel/plugin-transform-react-jsx": "^7.18.6", "@babel/preset-react": "^7.18.6", - "@bpmn-io/properties-panel": "^0.19.0", "@carbon/react": "^1.16.0", "@ginkgo-bioworks/react-json-schema-form-builder": "^2.9.0", "@monaco-editor/react": "^4.4.5", @@ -23,13 +22,13 @@ "axios": "^0.27.2", "bootstrap": "^5.2.0", "bpmn-js": "^9.3.2", - "bpmn-js-properties-panel": "^1.5.0", + "bpmn-js-properties-panel": "^1.10.0", "bpmn-js-spiffworkflow": "sartography/bpmn-js-spiffworkflow#main", "craco": "^0.0.3", "date-fns": "^2.28.0", "diagram-js": "^8.5.0", "dmn-js": "^12.2.0", - "dmn-js-properties-panel": "^1.1.0", + "dmn-js-properties-panel": "^1.1", "dmn-js-shared": "^12.1.1", "jwt-decode": "^3.1.2", "keycloak-js": "^18.0.1", @@ -61,9 +60,6 @@ "@carbon/react": { "react": "^18.2.0", "react-dom": "^18.2.0" - }, - "dmn-js-properties-panel": { - "@bpmn-io/properties-panel": "^0.19.0" } }, "scripts": { diff --git a/spiffworkflow-frontend/src/components/ReactDiagramEditor.tsx b/spiffworkflow-frontend/src/components/ReactDiagramEditor.tsx index c8b079f39..9728e7d50 100644 --- a/spiffworkflow-frontend/src/components/ReactDiagramEditor.tsx +++ b/spiffworkflow-frontend/src/components/ReactDiagramEditor.tsx @@ -177,11 +177,16 @@ export default function ReactDiagramEditor({ }); } - function handleLaunchScriptEditor(element: any) { + function handleLaunchScriptEditor( + element: any, + script: string, + scriptType: string, + eventBus: any + ) { if (onLaunchScriptEditor) { setPerformingXmlUpdates(true); const modeling = diagramModeler.get('modeling'); - onLaunchScriptEditor(element, modeling); + onLaunchScriptEditor(element, script, scriptType, eventBus, modeling); } } @@ -199,12 +204,12 @@ export default function ReactDiagramEditor({ setDiagramModelerState(diagramModeler); - diagramModeler.on('launch.script.editor', (event: any) => { - const { error, element } = event; + diagramModeler.on('script.editor.launch', (event: any) => { + const { error, element, scriptType, script, eventBus } = event; if (error) { console.log(error); } - handleLaunchScriptEditor(element); + handleLaunchScriptEditor(element, script, scriptType, eventBus); }); // 'element.hover', diff --git a/spiffworkflow-frontend/src/routes/ProcessModelEditDiagram.tsx b/spiffworkflow-frontend/src/routes/ProcessModelEditDiagram.tsx index 9ca0754ab..787db12c3 100644 --- a/spiffworkflow-frontend/src/routes/ProcessModelEditDiagram.tsx +++ b/spiffworkflow-frontend/src/routes/ProcessModelEditDiagram.tsx @@ -19,7 +19,9 @@ export default function ProcessModelEditDiagram() { const [showFileNameEditor, setShowFileNameEditor] = useState(false); const handleShowFileNameEditor = () => setShowFileNameEditor(true); - const [scriptText, setScriptText] = useState(''); + const [scriptText, setScriptText] = useState(''); + const [scriptType, setScriptType] = useState(''); + const [scriptEventBus, setScriptEventBus] = useState(null); const [scriptModeling, setScriptModeling] = useState(null); const [scriptElement, setScriptElement] = useState(null); const [showScriptEditor, setShowScriptEditor] = useState(false); @@ -276,25 +278,39 @@ export default function ProcessModelEditDiagram() { } }; - const onLaunchScriptEditor = (element: any, modeling: any) => { - setScriptText(element.businessObject.script || ''); + const onLaunchScriptEditor = ( + element: any, + script: string, + scriptTypeString: string, + eventBus: any, + modeling: any + ) => { + // TODO: modeling is only needed for script unit tests. + // we should update this to act like updating scripts + // where we pass an event to bpmn-js setScriptModeling(modeling); + + setScriptText(script || ''); + setScriptType(scriptTypeString); + setScriptEventBus(eventBus); setScriptElement(element); setScriptUnitTestElementWithIndex(0, element); handleShowScriptEditor(); }; const handleScriptEditorClose = () => { + scriptEventBus.fire('script.editor.update', { + scriptType, + script: scriptText, + element: scriptElement, + }); + resetUnitTextResult(); setShowScriptEditor(false); }; const handleEditorScriptChange = (value: any) => { setScriptText(value); - (scriptModeling as any).updateProperties(scriptElement, { - scriptFormat: 'python', - script: value, - }); }; const handleEditorScriptTestUnitInputChange = (value: any) => { diff --git a/spiffworkflow-frontend/src/routes/TaskShow.tsx b/spiffworkflow-frontend/src/routes/TaskShow.tsx index 97bb5d3c4..47bd0f043 100644 --- a/spiffworkflow-frontend/src/routes/TaskShow.tsx +++ b/spiffworkflow-frontend/src/routes/TaskShow.tsx @@ -145,7 +145,7 @@ export default function TaskShow() { const instructionsElement = (taskToUse: any) => { let instructions = ''; - if (taskToUse.type === 'Manual Task') { + if (taskToUse.properties.instructionsForEndUser) { instructions = taskToUse.properties.instructionsForEndUser; } return (