@budibase/frontend-core 3.20.6 → 3.20.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "3.20.6",
+  "version": "3.20.7",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
@@ -17,5 +17,5 @@
     "shortid": "2.2.15",
     "socket.io-client": "^4.7.5"
   },
-  "gitHead": "91ae7d82b9b1311754548f1447db8039b592f6b9"
+  "gitHead": "517230cd7ff9c137e3b121ef73c9f7726df4eeb1"
 }

package/src/api/workspaceApps.ts

@@ -1,4 +1,5 @@
 import {
+  DuplicateWorkspaceAppResponse,
   FetchWorkspaceAppResponse,
   FindWorkspaceAppResponse,
   InsertWorkspaceAppRequest,
@@ -14,6 +15,7 @@ export interface WorkspaceAppEndpoints {
   create: (
     workspaceApp: InsertWorkspaceAppRequest
   ) => Promise<InsertWorkspaceAppResponse>
+  duplicate: (id: string) => Promise<DuplicateWorkspaceAppResponse>
   update: (
     workspaceApp: UpdateWorkspaceAppRequest
   ) => Promise<UpdateWorkspaceAppResponse>
@@ -39,6 +41,11 @@ export const buildWorkspaceAppEndpoints = (
       body: workspaceApp,
     })
   },
+  duplicate: async id => {
+    return await API.post({
+      url: `/api/workspaceApp/${id}/duplicate`,
+    })
+  },
   update: async workspaceApp => {
     return await API.put({
       url: `/api/workspaceApp/${workspaceApp._id}`,

package/src/components/grid/stores/conditions.ts

@@ -48,12 +48,17 @@ export const deriveStores = (context: StoreContext): ConditionDerivedStore => {
 
       // Add button conditions
       if ($props.buttons) {
-        for (let button of $props.buttons) {
+        for (
+          let buttonIndex = 0;
+          buttonIndex < $props.buttons.length;
+          buttonIndex++
+        ) {
+          const button = $props.buttons[buttonIndex]
           for (let condition of button.conditions || []) {
             newConditions.push({
               ...condition,
               target: "button",
-              buttonIndex: $props.buttons.indexOf(button),
+              buttonIndex,
             })
           }
         }
@@ -161,14 +166,30 @@ const evaluateConditions = (
 
   // Add dynamic button conditions from getRowConditions
   if ($props.buttons) {
-    for (let button of $props.buttons) {
-      if (button.getRowConditions) {
-        const dynamicConditions = button.getRowConditions(row) || []
+    for (
+      let buttonIndex = 0;
+      buttonIndex < $props.buttons.length;
+      buttonIndex++
+    ) {
+      const button = $props.buttons[buttonIndex]
+      if (!button.getRowConditions) {
+        continue
+      }
+
+      const dynamicConditions = button.getRowConditions(row) || []
+      if (dynamicConditions.length) {
+        allConditions = allConditions.filter(condition => {
+          return !(
+            condition.target === "button" &&
+            condition.buttonIndex === buttonIndex
+          )
+        })
+
         for (let condition of dynamicConditions) {
           allConditions.push({
             ...condition,
             target: "button",
-            buttonIndex: $props.buttons.indexOf(button),
+            buttonIndex,
           })
         }
       }