Resolve activity buttons without tool buttons

mdenet · Feb 9, 2024 · 6082bbe · 6082bbe
1 parent e3c9a11
commit 6082bbe
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/platform/src/Playground.js b/platform/src/Playground.js
@@ -394,17 +394,19 @@ function createPanelForDefinitionId(panel){
             // No activity defined buttons
             newPanel.addButtons( Button.createButtons( panelDefinition.buttons, panel.id));
 
-        } else if (panel.buttons != null && panelDefinition.buttons != null) {
-            // The activity has defined the buttons
+        } else if (panel.buttons != null) {
+            // The activity has defined the buttons, some may be references to buttons defined in the tool spec
             let resolvedButtonConfigs = panel.buttons.map(btn =>{    
                 let resolvedButton;
 
                 if (btn.ref){
-                    // button reference so resolve
-                    resolvedButton= panelDefinition.buttons.find((pdBtn)=> pdBtn.id===btn.ref);
+                    if (panelDefinition.buttons != null) {
+                        // button reference so resolve
+                        resolvedButton = panelDefinition.buttons.find((pdBtn)=> pdBtn.id===btn.ref);
+                    }
                 } else {
                     // activity defined button
-                    resolvedButton= btn;
+                    resolvedButton = btn;
                 }
                 return resolvedButton;
             });