From 5622b5b49dbae24d5be739058a5eeeb188b8cb62 Mon Sep 17 00:00:00 2001
From: mertmit <mertmit99@gmail.com>
Date: Mon, 20 Jun 2022 19:30:20 +0300
Subject: [PATCH 1/2] fix: webhook triggers

Signed-off-by: mertmit <mertmit99@gmail.com>
---
 .../spreadsheet/components/EditableCell.vue   | 17 ++++++++-----
 .../editableCell/TimePickerCell.vue           |  3 +--
 .../project/spreadsheet/mixins/cell.js        | 24 +++++++++++++++++++
 3 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/packages/nc-gui/components/project/spreadsheet/components/EditableCell.vue b/packages/nc-gui/components/project/spreadsheet/components/EditableCell.vue
index 321388584f..d9865ed1eb 100644
--- a/packages/nc-gui/components/project/spreadsheet/components/EditableCell.vue
+++ b/packages/nc-gui/components/project/spreadsheet/components/EditableCell.vue
@@ -74,6 +74,7 @@
       v-else-if="isTime"
       v-model="localState"
       v-on="parentListeners"
+      @save="$emit('save')"
     />
 
     <date-time-picker-cell
@@ -95,7 +96,6 @@
       :is-form="isForm"
       :column="column"
       v-on="parentListeners"
-      @input="$emit('save')"
     />
 
     <json-editable-cell
@@ -111,7 +111,6 @@
       v-model="localState"
       :column="column"
       v-on="parentListeners"
-      @input="$emit('save')"
     />
     <set-list-cell
       v-else-if="isSet"
@@ -210,10 +209,10 @@ export default {
         if (val !== this.value) {
           this.changed = true
           this.$emit('input', val)
-          if (this.isAttachment || this.isBoolean || this.isRating || this.isTime || this.isDateTime || this.isDate || this.isDuration) {
-            this.syncData()
-          } else if (!this.isCurrency && !this.isEnum && !this.isSet) {
+          if (this.isAutoSaved) {
             this.syncDataDebounce(this)
+          } else if (!this.isManualSaved) {
+            this.saveData()
           }
         }
       }
@@ -241,7 +240,7 @@ export default {
     // this.$refs.input.focus();
   },
   beforeDestroy() {
-    if (this.changed && !(this.isAttachment || this.isBoolean || this.isRating || this.isTime || this.isDateTime || this.isDuration)) {
+    if (this.changed && this.isAutoSaved) {
       this.changed = false
       this.$emit('change')
     }
@@ -253,6 +252,12 @@ export default {
         this.changed = false
         this.$emit('update')
       }
+    },
+    saveData() {
+      if (this.changed && !this.destroyed) {
+        this.changed = false
+        this.$emit('save')
+      }
     }
   }
 }
diff --git a/packages/nc-gui/components/project/spreadsheet/components/editableCell/TimePickerCell.vue b/packages/nc-gui/components/project/spreadsheet/components/editableCell/TimePickerCell.vue
index cdaa9605c6..86b1f94b7c 100644
--- a/packages/nc-gui/components/project/spreadsheet/components/editableCell/TimePickerCell.vue
+++ b/packages/nc-gui/components/project/spreadsheet/components/editableCell/TimePickerCell.vue
@@ -5,7 +5,7 @@
     </template>
     <div class="d-flex flex-column justify-center" @click.stop>
       <v-time-picker v-model="localState" v-on="parentListeners" />
-      <v-btn small color="primary" @click="$emit('update')">
+      <v-btn small color="primary" @click="$emit('save')">
         <!-- Save -->
         {{ $t('general.save') }}
       </v-btn>
@@ -15,7 +15,6 @@
 
 <script>
 import dayjs from 'dayjs'
-import { MysqlUi } from 'nocodb-sdk'
 
 export default {
   name: 'TimePickerCell',
diff --git a/packages/nc-gui/components/project/spreadsheet/mixins/cell.js b/packages/nc-gui/components/project/spreadsheet/mixins/cell.js
index dd900e99e4..414d9ce001 100644
--- a/packages/nc-gui/components/project/spreadsheet/mixins/cell.js
+++ b/packages/nc-gui/components/project/spreadsheet/mixins/cell.js
@@ -70,6 +70,30 @@ export default {
     },
     isDuration() {
       return this.uiDatatype === UITypes.Duration
+    },
+    isAutoSaved() {
+      return [
+        UITypes.SingleLineText,
+        UITypes.LongText,
+        UITypes.PhoneNumber,
+        UITypes.Email,
+        UITypes.URL,
+        UITypes.Number,
+        UITypes.Decimal,
+        UITypes.Percent,
+        UITypes.Duration,
+        UITypes.Count,
+        UITypes.AutoNumber,
+        UITypes.SpecificDBType,
+        UITypes.Geometry
+      ].includes(this.uiDatatype)
+    },
+    isManualSaved() {
+      return [
+        UITypes.Currency,
+        UITypes.Year,
+        UITypes.Time
+      ].includes(this.uiDatatype)
     }
   }
 }

From d10088d1b26d725e3f34fd7a8b61069a447a64a3 Mon Sep 17 00:00:00 2001
From: mertmit <mertmit99@gmail.com>
Date: Wed, 22 Jun 2022 00:07:48 +0300
Subject: [PATCH 2/2] fix: duration webhook trigger

Signed-off-by: mertmit <mertmit99@gmail.com>
---
 .../project/spreadsheet/components/EditableCell.vue |  1 +
 .../components/editableCell/DurationCell.vue        | 13 +++++++++++++
 .../components/project/spreadsheet/mixins/cell.js   |  4 ++--
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/components/project/spreadsheet/components/EditableCell.vue b/packages/nc-gui/components/project/spreadsheet/components/EditableCell.vue
index d9865ed1eb..a1e8974d1c 100644
--- a/packages/nc-gui/components/project/spreadsheet/components/EditableCell.vue
+++ b/packages/nc-gui/components/project/spreadsheet/components/EditableCell.vue
@@ -42,6 +42,7 @@
       :is-form="isForm"
       :column="column"
       :is-locked="isLocked"
+      v-on="parentListeners"
     />
 
     <boolean-cell
diff --git a/packages/nc-gui/components/project/spreadsheet/components/editableCell/DurationCell.vue b/packages/nc-gui/components/project/spreadsheet/components/editableCell/DurationCell.vue
index d39a198c42..c19d2199b3 100644
--- a/packages/nc-gui/components/project/spreadsheet/components/editableCell/DurationCell.vue
+++ b/packages/nc-gui/components/project/spreadsheet/components/editableCell/DurationCell.vue
@@ -7,6 +7,7 @@
       @blur="onBlur"
       @keypress="checkDurationFormat($event)"
       @keydown.enter="isEdited && $emit('input', durationInMS)"
+      v-on="parentListeners"
     >
     <div v-if="showWarningMessage == true" class="duration-warning">
       <!-- TODO: i18n -->
@@ -51,6 +52,18 @@ export default {
     },
     durationType() {
       return this.column?.meta?.duration || 0
+    },
+    parentListeners() {
+      const $listeners = {}
+
+      if (this.$listeners.blur) {
+        $listeners.blur = this.$listeners.blur
+      }
+      if (this.$listeners.focus) {
+        $listeners.focus = this.$listeners.focus
+      }
+
+      return $listeners
     }
   },
   mounted() {
diff --git a/packages/nc-gui/components/project/spreadsheet/mixins/cell.js b/packages/nc-gui/components/project/spreadsheet/mixins/cell.js
index 414d9ce001..a74521150f 100644
--- a/packages/nc-gui/components/project/spreadsheet/mixins/cell.js
+++ b/packages/nc-gui/components/project/spreadsheet/mixins/cell.js
@@ -81,7 +81,6 @@ export default {
         UITypes.Number,
         UITypes.Decimal,
         UITypes.Percent,
-        UITypes.Duration,
         UITypes.Count,
         UITypes.AutoNumber,
         UITypes.SpecificDBType,
@@ -92,7 +91,8 @@ export default {
       return [
         UITypes.Currency,
         UITypes.Year,
-        UITypes.Time
+        UITypes.Time,
+        UITypes.Duration
       ].includes(this.uiDatatype)
     }
   }