From 1423fe4c842c89d72d9028258d18a06d5a9a0447 Mon Sep 17 00:00:00 2001 From: Dan Date: Wed, 9 Nov 2022 12:03:55 -0500 Subject: [PATCH] fixing up routes for launching editor. Also some fixes in the bpmn-js-spiffworkflow to avoid locking up the browser if no files are available. --- spiffworkflow-frontend/package-lock.json | 8 ++++---- spiffworkflow-frontend/package.json | 2 +- .../src/routes/ProcessModelEditDiagram.tsx | 10 ++++------ 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/spiffworkflow-frontend/package-lock.json b/spiffworkflow-frontend/package-lock.json index 5ee7bda2..42c0fad8 100644 --- a/spiffworkflow-frontend/package-lock.json +++ b/spiffworkflow-frontend/package-lock.json @@ -31,7 +31,7 @@ "bootstrap": "^5.2.0", "bpmn-js": "^9.3.2", "bpmn-js-properties-panel": "^1.10.0", - "bpmn-js-spiffworkflow": "sartography/bpmn-js-spiffworkflow#feature/more_launch_buttons_and_dropdowns", + "bpmn-js-spiffworkflow": "sartography/bpmn-js-spiffworkflow#main", "craco": "^0.0.3", "date-fns": "^2.28.0", "diagram-js": "^8.5.0", @@ -7485,7 +7485,7 @@ }, "node_modules/bpmn-js-spiffworkflow": { "version": "0.0.8", - "resolved": "git+ssh://git@github.com/sartography/bpmn-js-spiffworkflow.git#84593aee1ead7328efdc7da03ab3c9cd34364496", + "resolved": "git+ssh://git@github.com/sartography/bpmn-js-spiffworkflow.git#24c2cc36067adf8fed75990c6bf4a1a67bc9122b", "license": "MIT", "dependencies": { "inherits": "^2.0.4", @@ -35755,8 +35755,8 @@ } }, "bpmn-js-spiffworkflow": { - "version": "git+ssh://git@github.com/sartography/bpmn-js-spiffworkflow.git#84593aee1ead7328efdc7da03ab3c9cd34364496", - "from": "bpmn-js-spiffworkflow@sartography/bpmn-js-spiffworkflow#feature/more_launch_buttons_and_dropdowns", + "version": "git+ssh://git@github.com/sartography/bpmn-js-spiffworkflow.git#24c2cc36067adf8fed75990c6bf4a1a67bc9122b", + "from": "bpmn-js-spiffworkflow@sartography/bpmn-js-spiffworkflow#main", "requires": { "inherits": "^2.0.4", "inherits-browser": "^0.0.1", diff --git a/spiffworkflow-frontend/package.json b/spiffworkflow-frontend/package.json index 37f9e345..92ba23aa 100644 --- a/spiffworkflow-frontend/package.json +++ b/spiffworkflow-frontend/package.json @@ -26,7 +26,7 @@ "bootstrap": "^5.2.0", "bpmn-js": "^9.3.2", "bpmn-js-properties-panel": "^1.10.0", - "bpmn-js-spiffworkflow": "sartography/bpmn-js-spiffworkflow#feature/more_launch_buttons_and_dropdowns", + "bpmn-js-spiffworkflow": "sartography/bpmn-js-spiffworkflow#main", "craco": "^0.0.3", "date-fns": "^2.28.0", "diagram-js": "^8.5.0", diff --git a/spiffworkflow-frontend/src/routes/ProcessModelEditDiagram.tsx b/spiffworkflow-frontend/src/routes/ProcessModelEditDiagram.tsx index ede6d85c..050a312f 100644 --- a/spiffworkflow-frontend/src/routes/ProcessModelEditDiagram.tsx +++ b/spiffworkflow-frontend/src/routes/ProcessModelEditDiagram.tsx @@ -689,9 +689,8 @@ export default function ProcessModelEditDiagram() { const file = findFileNameForReferenceId(processId, 'bpmn'); if (file) { const path = generatePath( - '/admin/process-models/:process_group_id/:process_model_id/files/:file_name', + '/admin/process-models/:process_model_id/files/:file_name', { - process_group_id: params.process_group_id, process_model_id: params.process_model_id, file_name: file.name, } @@ -701,9 +700,8 @@ export default function ProcessModelEditDiagram() { }; const onLaunchJsonEditor = (fileName: string) => { const path = generatePath( - '/admin/process-models/:process_group_id/:process_model_id/form/:file_name', + '/admin/process-models/:process_model_id/files/:file_name', { - process_group_id: params.process_group_id, process_model_id: params.process_model_id, file_name: fileName, } @@ -713,10 +711,10 @@ export default function ProcessModelEditDiagram() { const onLaunchDmnEditor = (processId: string) => { const file = findFileNameForReferenceId(processId, 'dmn'); if (file) { + console.log() const path = generatePath( - '/admin/process-models/:process_group_id/:process_model_id/files/:file_name', + '/admin/process-models/:process_model_id/files/:file_name', { - process_group_id: params.process_group_id, process_model_id: params.process_model_id, file_name: file.name, }