Merge pull request #14271 from Budibase/dean-fixes

Reduce automation store updates and API fetches
Budibase · Jul 30, 2024 · d1d0eae · d1d0eae
2 parents 17c96f7 + 32ba04c
commit d1d0eae
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/packages/builder/src/stores/builder/automations.js b/packages/builder/src/stores/builder/automations.js
@@ -87,8 +87,6 @@ const automationActions = store => ({
       disabled: false,
     }
     const response = await store.actions.save(automation)
-    await store.actions.fetch()
-    store.actions.select(response._id)
     return response
   },
   duplicate: async automation => {
@@ -98,33 +96,36 @@ const automationActions = store => ({
       _id: undefined,
       _ref: undefined,
     })
-    await store.actions.fetch()
-    store.actions.select(response._id)
     return response
   },
   save: async automation => {
     const response = await API.updateAutomation(automation)
 
     await store.actions.fetch()
+    store.actions.select(response._id)
     return response.automation
   },
   delete: async automation => {
     await API.deleteAutomation({
       automationId: automation?._id,
       automationRev: automation?._rev,
     })
+
     store.update(state => {
       // Remove the automation
       state.automations = state.automations.filter(
         x => x._id !== automation._id
       )
+
       // Select a new automation if required
       if (automation._id === state.selectedAutomationId) {
-        store.actions.select(state.automations[0]?._id)
+        state.selectedAutomationId = state.automations[0]?._id || null
       }
+
+      // Clear out automationDisplayData for the automation
+      delete state.automationDisplayData[automation._id]
       return state
     })
-    await store.actions.fetch()
   },
   toggleDisabled: async automationId => {
     let automation
@@ -381,7 +382,7 @@ export const selectedAutomation = derived(automationStore, $automationStore => {
 export const selectedAutomationDisplayData = derived(
   [automationStore, selectedAutomation],
   ([$automationStore, $selectedAutomation]) => {
-    if (!$selectedAutomation._id) {
+    if (!$selectedAutomation?._id) {
       return null
     }
     return $automationStore.automationDisplayData[$selectedAutomation._id]