updates

Author: michelle0927

components/microsoft_excel/actions/add-row/add-row.mjs

@@ -1,4 +1,7 @@
 import microsoftExcel from "../../microsoft_excel.app.mjs";
+import {
+  parseObject, getColumnLetter,
+} from "../../common/utils.mjs";
 
 export default {
   key: "microsoft_excel-add-row",
@@ -39,23 +42,23 @@ export default {
     },
   },
   async run({ $ }) {
-    const { address } = await this.microsoftExcel.getUsedRange({
+    const {
+      address, columnCount,
+    } = await this.microsoftExcel.getUsedRange({
       $,
       sheetId: this.sheetId,
       worksheet: this.worksheet,
     });
 
     // get next row range
     const match = address.match(/^(.+!)?([A-Z]+)(\d+):([A-Z]+)(\d+)$/);
-    const [
-      , sheet = "",
-      colStart,
-      /* eslint-disable no-unused-vars */
-      rowStart,
-      colEnd,
-    ] = match;
     const nextRow = parseInt(match[5], 10) + 1;
-    const range = `${sheet}${colStart}${nextRow}:${colEnd}${nextRow}`;
+    const values = parseObject(this.values);
+    if (values.length < columnCount) {
+      values.length = columnCount;
+    }
+    const colEnd = getColumnLetter(values.length);
+    const range = `A${nextRow}:${colEnd}${nextRow}`;
 
     // insert range
     await this.microsoftExcel.insertRange({
@@ -76,7 +79,7 @@ export default {
       range,
       data: {
         values: [
-          this.values,
+          values,
         ],
       },
     });

components/microsoft_excel/actions/find-row/find-row.mjs

@@ -57,7 +57,7 @@ export default {
       $,
       sheetId: this.sheetId,
       worksheet: this.worksheet,
-      range: `${this.worksheet}!${this.column}1:${this.column}${rowCount}`,
+      range: `${this.column}1:${this.column}${rowCount}`,
     });
     const values = rangeValues.map((v) => v[0]);
     const index = values.indexOf(this.value);
@@ -72,7 +72,7 @@ export default {
       $,
       sheetId: this.sheetId,
       worksheet: this.worksheet,
-      range: `${this.worksheet}!A${row}:${lastColumn}${row}`,
+      range: `A${row}:${lastColumn}${row}`,
     });
 
     $.export("$summary", `Found value in row ${row}`);

components/microsoft_excel/actions/get-columns/get-columns.mjs

@@ -1,4 +1,5 @@
 import microsoftExcel from "../../microsoft_excel.app.mjs";
+import { parseObject } from "../../common/utils.mjs";
 
 export default {
   key: "microsoft_excel-get-columns",
@@ -46,12 +47,13 @@ export default {
     });
 
     const values = {};
-    for (const column of this.columns) {
+    const columns = parseObject(this.columns);
+    for (const column of columns) {
       const response = await this.microsoftExcel.getRange({
         $,
         sheetId: this.sheetId,
         worksheet: this.worksheet,
-        range: `${this.worksheet}!${column}1:${column}${rowCount}`,
+        range: `${column}1:${column}${rowCount}`,
       });
       values[column] = response.values.map((v) => v[0]);
     }

components/microsoft_excel/actions/get-spreadsheet/get-spreadsheet.mjs

@@ -46,7 +46,7 @@ export default {
         $,
         sheetId: this.sheetId,
         worksheet: this.worksheet,
-        range: `${this.worksheet}!${this.range}`,
+        range: `${this.range}`,
       })
       : await this.microsoftExcel.getUsedRange({
         $,

components/microsoft_excel/actions/update-cell/update-cell.mjs

@@ -48,7 +48,7 @@ export default {
       $,
       sheetId: this.sheetId,
       worksheet: this.worksheet,
-      range: `${this.worksheet}!${this.cell}:${this.cell}`,
+      range: `${this.cell}:${this.cell}`,
       data: {
         values: [
           [

components/microsoft_excel/actions/update-worksheet-tablerow/update-worksheet-tablerow.mjs

@@ -1,4 +1,5 @@
 import microsoftExcel from "../../microsoft_excel.app.mjs";
+import { parseObject } from "../../common/utils.mjs";
 
 export default {
   key: "microsoft_excel-update-worksheet-tablerow",
@@ -49,7 +50,7 @@ export default {
         microsoftExcel,
         "values",
       ],
-      description: "Represents the raw values of the specified range. The data returned could be of type string, number, or a boolean. Cells that contain errors return the error string.",
+      description: "An array of values for the updated row. Each item in the array represents one cell. E.g. `[1, 2, 3]`",
     },
   },
   async run({ $ }) {
@@ -67,7 +68,9 @@ export default {
       tableId,
       rowId,
       data: {
-        values: JSON.parse(values),
+        values: [
+          parseObject(values),
+        ],
       },
     });
 

components/microsoft_excel/common/utils.mjs

@@ -16,3 +16,13 @@ export const parseObject = (obj) => {
   }
   return obj;
 };
+
+export function getColumnLetter(index) {
+  let letter = "";
+  while (index > 0) {
+    const mod = (index - 1) % 26;
+    letter = String.fromCharCode(65 + mod) + letter;
+    index = Math.floor((index - 1) / 26);
+  }
+  return letter;
+}

components/microsoft_excel/microsoft_excel.app.mjs

@@ -176,7 +176,7 @@ export default {
     }) {
       return this._makeRequest({
         method: "PATCH",
-        path: `me/drive/items/${sheetId}/workbook/tables/${tableId}/rows/itemAt(index=${rowId})`,
+        path: `me/drive/items/${sheetId}/workbook/tables/${tableId}/rows/ItemAt(index=${rowId})`,
         ...args,
       });
     },

components/microsoft_excel/sources/common/base-webhook.mjs

@@ -53,13 +53,21 @@ export default {
       this.db.set("deltaToken", token);
     },
     async updateSubscription() {
-      const hookId = this._getHookId();
-      await this.microsoftExcel.updateSubscription({
-        hookId,
+      try {
+        await this.microsoftExcel.deleteHook(this._getHookId("hookId"));
+      } catch {
+        // couldn't find webhook
+      }
+
+      const { id } = await this.microsoftExcel.createHook({
         data: {
+          changeType: "updated",
+          notificationUrl: this.http.endpoint,
+          resource: "me/drive/root",
           expirationDateTime: moment().add(30, "days"),
         },
       });
+      this._setHookId(id);
     },
     path() {
       return this.folderId === "root"

components/microsoft_excel/sources/new-cell-value-changed/new-cell-value-changed.mjs

@@ -39,7 +39,7 @@ export default {
     const response = await this.microsoftExcel.getRange({
       sheetId: this.sheetId,
       worksheet: this.worksheet,
-      range: `${this.worksheet}!${this.cell}:${this.cell}`,
+      range: `${this.cell}:${this.cell}`,
     });
 
     const value = response.values[0][0];