Merge pull request #4359 from kishanprmr/google-sheet

fix(google-sheets): Add row count condition in case of manual row deletion.
activepieces · Apr 6, 2024 · 1744ce8 · 1744ce8
2 parents 59040ed + 1df7605
commit 1744ce8
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 8 deletions.
diff --git a/packages/pieces/community/google-sheets/package.json b/packages/pieces/community/google-sheets/package.json
@@ -1,4 +1,4 @@
 {
   "name": "@activepieces/piece-google-sheets",
-  "version": "0.9.0"
+  "version": "0.9.1"
 }
diff --git a/packages/pieces/community/google-sheets/src/lib/actions/insert-row.action.ts b/packages/pieces/community/google-sheets/src/lib/actions/insert-row.action.ts
@@ -25,7 +25,7 @@ export const insertRowAction = createAction({
       required: false,
     }),
     first_row_headers: Property.Checkbox({
-      displayName: 'Are the First row Headers?',
+      displayName: 'Does the first row contain headers?',
       description: 'If the first row is headers',
       required: true,
       defaultValue: false,

diff --git a/packages/pieces/community/google-sheets/src/lib/actions/update-row.ts b/packages/pieces/community/google-sheets/src/lib/actions/update-row.ts
@@ -22,7 +22,7 @@ export const updateRowAction = createAction({
       required: true,
     }),
     first_row_headers: Property.Checkbox({
-      displayName: 'Are the First row Headers?',
+      displayName: 'Does the first row contain headers?',
       description: 'If the first row is headers',
       required: true,
       defaultValue: false,

diff --git a/packages/pieces/community/google-sheets/src/lib/triggers/new-row-added-webhook.ts b/packages/pieces/community/google-sheets/src/lib/triggers/new-row-added-webhook.ts
@@ -19,7 +19,8 @@ export const newRowAddedTrigger = createTrigger({
   description: 'Triggers when a new row is added to bottom of a spreadsheet.',
   props: {
     info: Property.MarkDown({
-      value: 'Please note that there might be a delay of up to 3 minutes for the trigger to be fired, due to a delay from Google.'
+      value:
+        'Please note that there might be a delay of up to 3 minutes for the trigger to be fired, due to a delay from Google.',
     }),
     spreadsheet_id: googleSheetsCommon.spreadsheet_id,
     sheet_id: googleSheetsCommon.sheet_id,
@@ -79,7 +80,7 @@ export const newRowAddedTrigger = createTrigger({
 
     // fetch old row count for worksheet
     const oldRowCount = (await context.store.get(
-      `${context.propsValue.sheet_id}`
+      `${sheet_id}`
     )) as number;
 
     // fetch current row count for worksheet
@@ -96,7 +97,11 @@ export const newRowAddedTrigger = createTrigger({
     const currentRowCount = currentRowValues.length;
 
     // if no new rows return
-    if (oldRowCount === currentRowCount) {
+    if (oldRowCount >= currentRowCount) {
+      if(oldRowCount > currentRowCount) {
+        // Some rows were deleted
+        await context.store.put(`${sheet_id}`, currentRowCount);
+      }
       return [];
     }
 
@@ -162,7 +167,9 @@ export const newRowAddedTrigger = createTrigger({
     );
 
     // transform row values
-    const transformedRowValues = transformWorkSheetValues(currentSheetValues, 0).slice(-5).reverse();
+    const transformedRowValues = transformWorkSheetValues(currentSheetValues, 0)
+      .slice(-5)
+      .reverse();
 
     return transformedRowValues;
   },
@@ -287,4 +294,4 @@ function hashObject(obj: Record<string, unknown>): string {
   const hash = crypto.createHash('sha256');
   hash.update(JSON.stringify(obj));
   return hash.digest('hex');
-}
+}