Merge pull request #28 from sartography/bug/browser_lock_on_dmn_selection

Bug/browser lock on dmn selection

bpmn-js-spiffworkflow/app/spiffworkflow/extensions/propertiesPanel/SpiffExtensionSelect.js

@@ -46,9 +46,9 @@ export function SpiffExtensionSelect(props) {
 
   if (
     !(optionType in spiffExtensionOptions) ||
-    spiffExtensionOptions[optionType].length === 0
+    spiffExtensionOptions[optionType] === null
   ) {
-    spiffExtensionOptions[optionType] = [];
+    spiffExtensionOptions[optionType] = null;
     requestOptions(eventBus, element, commandStack, optionType);
   }
   const getOptions = () => {

bpmn-js-spiffworkflow/test/spec/BusinessRulePropsSpec.js

@@ -33,23 +33,21 @@ describe('Business Rule Properties Panel', function () {
     })
   );
 
-  function addOptionsToEventBus(bpmnModeler) {
-    bpmnModeler.on('spiff.dmn_files.requested', (event) => {
-      event.eventBus.fire('spiff.dmn_files.returned', {
-        options: [
-          { label: 'Calculate Pizza Price', value: 'Decision_Pizza_Price' },
-          { label: 'Viking Availability', value: 'Decision_Vikings' },
-          { label: 'Test Decision', value: 'test_decision' },
-        ],
-      });
+
+  const return_files = (event) => {
+    event.eventBus.fire('spiff.dmn_files.returned', {
+      options: [
+        { label: 'Calculate Pizza Price', value: 'Decision_Pizza_Price' },
+        { label: 'Viking Availability', value: 'Decision_Vikings' },
+        { label: 'Test Decision', value: 'test_decision' },
+      ],
     });
   }
 
   it('should display a dropdown to select from available decision tables', async function () {
     const modeler = getBpmnJS();
-    addOptionsToEventBus(modeler);
+    modeler.get('eventBus').once('spiff.dmn_files.requested', return_files);
     expectSelected('business_rule_task');
-
     // THEN - a properties panel exists with a section for editing that script
     const entry = findEntry('extension_spiffworkflow:calledDecisionId', getPropertiesPanel());
     expect(entry, 'No Entry').to.exist;
@@ -60,7 +58,7 @@ describe('Business Rule Properties Panel', function () {
   it('should update the spiffworkflow:calledDecisionId tag when you modify the called decision select box', async function () {
     // IF - a script tag is selected, and you change the script in the properties panel
     const modeler = getBpmnJS();
-    addOptionsToEventBus(modeler);
+    modeler.get('eventBus').once('spiff.dmn_files.requested', return_files);
     const businessRuleTask = await expectSelected('business_rule_task');
     const entry = findEntry('extension_calledDecisionId', getPropertiesPanel());
     const selectList = findSelect(entry);
@@ -85,4 +83,5 @@ describe('Business Rule Properties Panel', function () {
     const element = businessObject.extensionElements.values[0];
     expect(element.value).to.equal('test_decision');
   });
+
 });

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",

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",

spiffworkflow-frontend/src/routes/ProcessModelEditDiagram.tsx

@@ -107,7 +107,6 @@ export default function ProcessModelEditDiagram() {
     };
 
     if (params.file_name) {
-      console.log(`processModelPath: ${processModelPath}`);
       HttpService.makeCallToBackend({
         path: `/${processModelPath}/files/${params.file_name}`,
         successCallback: fileResult,
@@ -689,9 +688,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 +699,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,
       }
@@ -714,9 +711,8 @@ export default function ProcessModelEditDiagram() {
     const file = findFileNameForReferenceId(processId, 'dmn');
     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,
         }