@budibase/server 2.6.19-alpha.50 → 2.6.19-alpha.51

package/dist/query.js

@@ -16912,6 +16912,7 @@ __export(filters_exports, {
   NoEmptyFilterStrings: () => NoEmptyFilterStrings,
   buildLuceneQuery: () => buildLuceneQuery,
   getValidOperatorsForType: () => getValidOperatorsForType,
+  hasFilters: () => hasFilters,
   luceneLimit: () => luceneLimit,
   luceneSort: () => luceneSort,
   runLuceneQuery: () => runLuceneQuery
@@ -17197,6 +17198,21 @@ var luceneLimit = (docs, limit) => {
   }
   return docs.slice(0, numLimit);
 };
+var hasFilters = (query) => {
+  if (!query) {
+    return false;
+  }
+  const skipped = ["allOr"];
+  for (let [key, value] of Object.entries(query)) {
+    if (skipped.includes(key) || typeof value !== "object") {
+      continue;
+    }
+    if (Object.keys(value).length !== 0) {
+      return true;
+    }
+  }
+  return false;
+};
 
 // ../shared-core/src/utils.ts
 var utils_exports3 = {};
@@ -17566,21 +17582,37 @@ var GoogleSheetsIntegration = class {
     }
   }
   async read(query) {
+    var _a, _b, _c, _d;
     try {
       await this.connect();
+      const hasFilters2 = filters_exports.hasFilters(query.filters);
+      const limit = ((_a = query.paginate) == null ? void 0 : _a.limit) || 100;
+      const page = typeof ((_b = query.paginate) == null ? void 0 : _b.page) === "number" ? query.paginate.page : parseInt(((_c = query.paginate) == null ? void 0 : _c.page) || "1");
+      const offset = (page - 1) * limit;
       const sheet = this.client.sheetsByTitle[query.sheet];
       let rows2 = [];
-      if (query.paginate) {
-        const limit = query.paginate.limit || 100;
-        let page = typeof query.paginate.page === "number" ? query.paginate.page : parseInt(query.paginate.page || "1");
+      if (query.paginate && !hasFilters2) {
         rows2 = await sheet.getRows({
           limit,
-          offset: (page - 1) * limit
+          offset
         });
       } else {
         rows2 = await sheet.getRows();
       }
-      const filtered2 = filters_exports.runLuceneQuery(rows2, query.filters);
+      if ((_d = query.filters) == null ? void 0 : _d.equal) {
+        const idFilterKeys = Object.keys(query.filters.equal).filter(
+          (filter2) => filter2.includes(GOOGLE_SHEETS_PRIMARY_KEY)
+        );
+        for (let idFilterKey of idFilterKeys) {
+          const id = query.filters.equal[idFilterKey];
+          delete query.filters.equal[idFilterKey];
+          query.filters.equal[`_${GOOGLE_SHEETS_PRIMARY_KEY}`] = id;
+        }
+      }
+      let filtered2 = filters_exports.runLuceneQuery(rows2, query.filters);
+      if (hasFilters2 && query.paginate) {
+        filtered2 = filtered2.slice(offset, offset + limit);
+      }
       const headerValues = sheet.headerValues;
       let response = [];
       for (let row of filtered2) {
@@ -17638,7 +17670,12 @@ var GoogleSheetsIntegration = class {
     const row = rows2[query.rowIndex];
     if (row) {
       await row.delete();
-      return [{ deleted: query.rowIndex }];
+      return [
+        {
+          deleted: query.rowIndex,
+          [GOOGLE_SHEETS_PRIMARY_KEY]: query.rowIndex
+        }
+      ];
     } else {
       throw new Error("Row does not exist.");
     }