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

package/builder/index.html

@@ -8,7 +8,7 @@
 	<link rel="preconnect" href="https://fonts.gstatic.com" />
 	<link href="https://fonts.googleapis.com/css2?family=Source+Sans+Pro:wght@400;600;700&display=swap"
 		rel="stylesheet" />
-  <script type="module" crossorigin src="/builder/assets/index.a7585108.js"></script>
+  <script type="module" crossorigin src="/builder/assets/index.4f47d591.js"></script>
   <link rel="stylesheet" href="/builder/assets/index.6ebb99b3.css">
 </head>
 

package/dist/automation.js

@@ -18587,11 +18587,12 @@ __export(filters_exports, {
   NoEmptyFilterStrings: () => NoEmptyFilterStrings,
   buildLuceneQuery: () => buildLuceneQuery,
   getValidOperatorsForType: () => getValidOperatorsForType,
+  hasFilters: () => hasFilters,
   luceneLimit: () => luceneLimit,
   luceneSort: () => luceneSort,
   runLuceneQuery: () => runLuceneQuery
 });
-var HBS_REGEX, getValidOperatorsForType, NoEmptyFilterStrings, cleanupQuery, removeKeyNumbering2, buildLuceneQuery, runLuceneQuery, luceneSort, luceneLimit;
+var HBS_REGEX, getValidOperatorsForType, NoEmptyFilterStrings, cleanupQuery, removeKeyNumbering2, buildLuceneQuery, runLuceneQuery, luceneSort, luceneLimit, hasFilters;
 var init_filters = __esm({
   "../shared-core/src/filters.ts"() {
     init_src();
@@ -18857,6 +18858,21 @@ var init_filters = __esm({
       }
       return docs.slice(0, numLimit);
     };
+    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;
+    };
   }
 });
 
@@ -24154,21 +24170,37 @@ var init_googlesheets = __esm({
         }
       }
       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 response2 = [];
           for (let row of filtered2) {
@@ -24226,7 +24258,12 @@ var init_googlesheets = __esm({
         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.");
         }