From e190f932d82885fbbf259eacc84d5901e4352c80 Mon Sep 17 00:00:00 2001
From: FlaminWrap <lewis.mcrobbie@scarf.org.uk>
Date: Sun, 13 Nov 2022 17:08:23 +0000
Subject: [PATCH 1/2] Commit for enhancement #7604

Added a checkbox to allow the user to disable the default notifications to the following button actions:
* Save row
* Duplicate row
* Trigger automation
* Execute query
* Delete row
Also adjusted buttonActions.js to reflect the behaviour of that checkbox being ticked.
---
 .../actions/DeleteRow.svelte                  |  2 ++
 .../actions/DuplicateRow.svelte               |  2 ++
 .../actions/ExecuteQuery.svelte               |  3 +-
 .../ButtonActionEditor/actions/SaveRow.svelte |  2 ++
 .../actions/TriggerAutomation.svelte          |  2 ++
 packages/client/src/utils/buttonActions.js    | 31 +++++++++++++------
 6 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/DeleteRow.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/DeleteRow.svelte
index 0ca5bfaa76..00e3698524 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/DeleteRow.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/DeleteRow.svelte
@@ -27,6 +27,8 @@
   />
 
   <Label small />
+  <Checkbox text="Do not display default notification" bind:value={parameters.notificationOverride} />
+  <br>
   <Checkbox text="Require confirmation" bind:value={parameters.confirm} />
 
   {#if parameters.confirm}
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/DuplicateRow.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/DuplicateRow.svelte
index db2f79488f..2dc0a1cb19 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/DuplicateRow.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/DuplicateRow.svelte
@@ -95,6 +95,8 @@
     />
 
     <Label small />
+    <Checkbox text="Do not display default notification" bind:value={parameters.notificationOverride} />
+    <br>
     <Checkbox text="Require confirmation" bind:value={parameters.confirm} />
 
     {#if parameters.confirm}
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ExecuteQuery.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ExecuteQuery.svelte
index 6b9efa76d3..9c56d7ce12 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ExecuteQuery.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ExecuteQuery.svelte
@@ -44,7 +44,8 @@
       getOptionLabel={query => query.name}
       getOptionValue={query => query._id}
     />
-
+    <Checkbox text="Do not display default notification" bind:value={parameters.notificationOverride} />
+    <br>
     {#if parameters.queryId}
       <Checkbox text="Require confirmation" bind:value={parameters.confirm} />
 
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/SaveRow.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/SaveRow.svelte
index 433f4bb3c2..69d3eddf04 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/SaveRow.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/SaveRow.svelte
@@ -95,6 +95,8 @@
     />
 
     <Label small />
+    <Checkbox text="Do not display default notification" bind:value={parameters.notificationOverride} />
+    <br>
     <Checkbox text="Require confirmation" bind:value={parameters.confirm} />
 
     {#if parameters.confirm}
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/TriggerAutomation.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/TriggerAutomation.svelte
index 4f661096c5..d9503eddb2 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/TriggerAutomation.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/TriggerAutomation.svelte
@@ -93,6 +93,8 @@
     {/if}
 
     <Label small />
+    <Checkbox text="Do not display default notification" bind:value={parameters.notificationOverride} />
+    <br>
     <Checkbox text="Require confirmation" bind:value={parameters.confirm} />
 
     {#if parameters.confirm}
diff --git a/packages/client/src/utils/buttonActions.js b/packages/client/src/utils/buttonActions.js
index 6fcef37182..7f1578e852 100644
--- a/packages/client/src/utils/buttonActions.js
+++ b/packages/client/src/utils/buttonActions.js
@@ -17,7 +17,7 @@ import { enrichDataBindings } from "./enrichDataBinding"
 import { Helpers } from "@budibase/bbui"
 
 const saveRowHandler = async (action, context) => {
-  const { fields, providerId, tableId } = action.parameters
+  const { fields, providerId, tableId, notificationOverride } = action.parameters
   let payload
   if (providerId) {
     payload = { ...context[providerId] }
@@ -34,7 +34,10 @@ const saveRowHandler = async (action, context) => {
   }
   try {
     const row = await API.saveRow(payload)
-    notificationStore.actions.success("Row saved")
+    
+    if (!notificationOverride){
+      notificationStore.actions.success("Row saved")
+    }
 
     // Refresh related datasources
     await dataSourceStore.actions.invalidateDataSource(row.tableId, {
@@ -49,7 +52,7 @@ const saveRowHandler = async (action, context) => {
 }
 
 const duplicateRowHandler = async (action, context) => {
-  const { fields, providerId, tableId } = action.parameters
+  const { fields, providerId, tableId, notificationOverride } = action.parameters
   if (providerId) {
     let payload = { ...context[providerId] }
     if (fields) {
@@ -64,7 +67,9 @@ const duplicateRowHandler = async (action, context) => {
     delete payload._rev
     try {
       const row = await API.saveRow(payload)
-      notificationStore.actions.success("Row saved")
+      if (!notificationOverride){
+        notificationStore.actions.success("Row saved")
+      }
 
       // Refresh related datasources
       await dataSourceStore.actions.invalidateDataSource(row.tableId, {
@@ -80,11 +85,13 @@ const duplicateRowHandler = async (action, context) => {
 }
 
 const deleteRowHandler = async action => {
-  const { tableId, revId, rowId } = action.parameters
+  const { tableId, revId, rowId, notificationOverride } = action.parameters
   if (tableId && rowId) {
     try {
       await API.deleteRow({ tableId, rowId, revId })
-      notificationStore.actions.success("Row deleted")
+      if (!notificationOverride){
+        notificationStore.actions.success("Row deleted")
+      }
 
       // Refresh related datasources
       await dataSourceStore.actions.invalidateDataSource(tableId, {
@@ -98,14 +105,16 @@ const deleteRowHandler = async action => {
 }
 
 const triggerAutomationHandler = async action => {
-  const { fields } = action.parameters
+  const { fields, notificationOverride } = action.parameters
   if (fields) {
     try {
       await API.triggerAutomation({
         automationId: action.parameters.automationId,
         fields,
       })
-      notificationStore.actions.success("Automation triggered")
+      if (!notificationOverride){
+        notificationStore.actions.success("Automation triggered")
+      }
     } catch (error) {
       // Abort next actions
       return false
@@ -119,7 +128,7 @@ const navigationHandler = action => {
 }
 
 const queryExecutionHandler = async action => {
-  const { datasourceId, queryId, queryParams } = action.parameters
+  const { datasourceId, queryId, queryParams, notificationOverride } = action.parameters
   try {
     const query = await API.fetchQueryDefinition(queryId)
     if (query?.datasourceId == null) {
@@ -135,7 +144,9 @@ const queryExecutionHandler = async action => {
     // Trigger a notification and invalidate the datasource as long as this
     // was not a readable query
     if (!query.readable) {
-      notificationStore.actions.success("Query executed successfully")
+      if (!notificationOverride){
+        notificationStore.actions.success("Query executed successfully")
+      }
       await dataSourceStore.actions.invalidateDataSource(query.datasourceId)
     }
 

From 0859691afebd3a3d45a4e3c65820380690cdb238 Mon Sep 17 00:00:00 2001
From: FlaminWrap <lewis.mcrobbie@scarf.org.uk>
Date: Sun, 13 Nov 2022 17:25:48 +0000
Subject: [PATCH 2/2] Ran yarn lint:fix

Ran yarn lint:fix as I forgot to do that
---
 .../actions/DeleteRow.svelte                  |  7 +++++--
 .../actions/DuplicateRow.svelte               |  7 +++++--
 .../actions/ExecuteQuery.svelte               |  7 +++++--
 .../ButtonActionEditor/actions/SaveRow.svelte |  7 +++++--
 .../actions/TriggerAutomation.svelte          |  7 +++++--
 packages/client/src/utils/buttonActions.js    | 21 +++++++++++--------
 6 files changed, 37 insertions(+), 19 deletions(-)

diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/DeleteRow.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/DeleteRow.svelte
index 00e3698524..109eb9a956 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/DeleteRow.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/DeleteRow.svelte
@@ -27,8 +27,11 @@
   />
 
   <Label small />
-  <Checkbox text="Do not display default notification" bind:value={parameters.notificationOverride} />
-  <br>
+  <Checkbox
+    text="Do not display default notification"
+    bind:value={parameters.notificationOverride}
+  />
+  <br />
   <Checkbox text="Require confirmation" bind:value={parameters.confirm} />
 
   {#if parameters.confirm}
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/DuplicateRow.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/DuplicateRow.svelte
index 2dc0a1cb19..bb253da56a 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/DuplicateRow.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/DuplicateRow.svelte
@@ -95,8 +95,11 @@
     />
 
     <Label small />
-    <Checkbox text="Do not display default notification" bind:value={parameters.notificationOverride} />
-    <br>
+    <Checkbox
+      text="Do not display default notification"
+      bind:value={parameters.notificationOverride}
+    />
+    <br />
     <Checkbox text="Require confirmation" bind:value={parameters.confirm} />
 
     {#if parameters.confirm}
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ExecuteQuery.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ExecuteQuery.svelte
index 9c56d7ce12..443457c048 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ExecuteQuery.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ExecuteQuery.svelte
@@ -44,8 +44,11 @@
       getOptionLabel={query => query.name}
       getOptionValue={query => query._id}
     />
-    <Checkbox text="Do not display default notification" bind:value={parameters.notificationOverride} />
-    <br>
+    <Checkbox
+      text="Do not display default notification"
+      bind:value={parameters.notificationOverride}
+    />
+    <br />
     {#if parameters.queryId}
       <Checkbox text="Require confirmation" bind:value={parameters.confirm} />
 
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/SaveRow.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/SaveRow.svelte
index 69d3eddf04..d16a279c68 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/SaveRow.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/SaveRow.svelte
@@ -95,8 +95,11 @@
     />
 
     <Label small />
-    <Checkbox text="Do not display default notification" bind:value={parameters.notificationOverride} />
-    <br>
+    <Checkbox
+      text="Do not display default notification"
+      bind:value={parameters.notificationOverride}
+    />
+    <br />
     <Checkbox text="Require confirmation" bind:value={parameters.confirm} />
 
     {#if parameters.confirm}
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/TriggerAutomation.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/TriggerAutomation.svelte
index d9503eddb2..21768ac461 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/TriggerAutomation.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/TriggerAutomation.svelte
@@ -93,8 +93,11 @@
     {/if}
 
     <Label small />
-    <Checkbox text="Do not display default notification" bind:value={parameters.notificationOverride} />
-    <br>
+    <Checkbox
+      text="Do not display default notification"
+      bind:value={parameters.notificationOverride}
+    />
+    <br />
     <Checkbox text="Require confirmation" bind:value={parameters.confirm} />
 
     {#if parameters.confirm}
diff --git a/packages/client/src/utils/buttonActions.js b/packages/client/src/utils/buttonActions.js
index 7f1578e852..aed455cbca 100644
--- a/packages/client/src/utils/buttonActions.js
+++ b/packages/client/src/utils/buttonActions.js
@@ -17,7 +17,8 @@ import { enrichDataBindings } from "./enrichDataBinding"
 import { Helpers } from "@budibase/bbui"
 
 const saveRowHandler = async (action, context) => {
-  const { fields, providerId, tableId, notificationOverride } = action.parameters
+  const { fields, providerId, tableId, notificationOverride } =
+    action.parameters
   let payload
   if (providerId) {
     payload = { ...context[providerId] }
@@ -34,8 +35,8 @@ const saveRowHandler = async (action, context) => {
   }
   try {
     const row = await API.saveRow(payload)
-    
-    if (!notificationOverride){
+
+    if (!notificationOverride) {
       notificationStore.actions.success("Row saved")
     }
 
@@ -52,7 +53,8 @@ const saveRowHandler = async (action, context) => {
 }
 
 const duplicateRowHandler = async (action, context) => {
-  const { fields, providerId, tableId, notificationOverride } = action.parameters
+  const { fields, providerId, tableId, notificationOverride } =
+    action.parameters
   if (providerId) {
     let payload = { ...context[providerId] }
     if (fields) {
@@ -67,7 +69,7 @@ const duplicateRowHandler = async (action, context) => {
     delete payload._rev
     try {
       const row = await API.saveRow(payload)
-      if (!notificationOverride){
+      if (!notificationOverride) {
         notificationStore.actions.success("Row saved")
       }
 
@@ -89,7 +91,7 @@ const deleteRowHandler = async action => {
   if (tableId && rowId) {
     try {
       await API.deleteRow({ tableId, rowId, revId })
-      if (!notificationOverride){
+      if (!notificationOverride) {
         notificationStore.actions.success("Row deleted")
       }
 
@@ -112,7 +114,7 @@ const triggerAutomationHandler = async action => {
         automationId: action.parameters.automationId,
         fields,
       })
-      if (!notificationOverride){
+      if (!notificationOverride) {
         notificationStore.actions.success("Automation triggered")
       }
     } catch (error) {
@@ -128,7 +130,8 @@ const navigationHandler = action => {
 }
 
 const queryExecutionHandler = async action => {
-  const { datasourceId, queryId, queryParams, notificationOverride } = action.parameters
+  const { datasourceId, queryId, queryParams, notificationOverride } =
+    action.parameters
   try {
     const query = await API.fetchQueryDefinition(queryId)
     if (query?.datasourceId == null) {
@@ -144,7 +147,7 @@ const queryExecutionHandler = async action => {
     // Trigger a notification and invalidate the datasource as long as this
     // was not a readable query
     if (!query.readable) {
-      if (!notificationOverride){
+      if (!notificationOverride) {
         notificationStore.actions.success("Query executed successfully")
       }
       await dataSourceStore.actions.invalidateDataSource(query.datasourceId)