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

package/dist/index.js

@@ -19730,11 +19730,12 @@ __export(filters_exports, {
   NoEmptyFilterStrings: () => NoEmptyFilterStrings2,
   buildLuceneQuery: () => buildLuceneQuery,
   getValidOperatorsForType: () => getValidOperatorsForType,
+  hasFilters: () => hasFilters,
   luceneLimit: () => luceneLimit,
   luceneSort: () => luceneSort,
   runLuceneQuery: () => runLuceneQuery
 });
-var HBS_REGEX, getValidOperatorsForType, NoEmptyFilterStrings2, cleanupQuery, removeKeyNumbering2, buildLuceneQuery, runLuceneQuery, luceneSort, luceneLimit;
+var HBS_REGEX, getValidOperatorsForType, NoEmptyFilterStrings2, cleanupQuery, removeKeyNumbering2, buildLuceneQuery, runLuceneQuery, luceneSort, luceneLimit, hasFilters;
 var init_filters = __esm({
   "../shared-core/src/filters.ts"() {
     init_src();
@@ -20000,6 +20001,21 @@ var init_filters = __esm({
       }
       return docs.slice(0, numLimit);
     };
+    hasFilters = (query3) => {
+      if (!query3) {
+        return false;
+      }
+      const skipped = ["allOr"];
+      for (let [key, value] of Object.entries(query3)) {
+        if (skipped.includes(key) || typeof value !== "object") {
+          continue;
+        }
+        if (Object.keys(value).length !== 0) {
+          return true;
+        }
+      }
+      return false;
+    };
   }
 });
 
@@ -29384,21 +29400,37 @@ var init_googlesheets = __esm({
         }
       }
       async read(query3) {
+        var _a2, _b2, _c, _d;
         try {
           await this.connect();
+          const hasFilters2 = filters_exports.hasFilters(query3.filters);
+          const limit = ((_a2 = query3.paginate) == null ? void 0 : _a2.limit) || 100;
+          const page = typeof ((_b2 = query3.paginate) == null ? void 0 : _b2.page) === "number" ? query3.paginate.page : parseInt(((_c = query3.paginate) == null ? void 0 : _c.page) || "1");
+          const offset = (page - 1) * limit;
           const sheet = this.client.sheetsByTitle[query3.sheet];
           let rows2 = [];
-          if (query3.paginate) {
-            const limit = query3.paginate.limit || 100;
-            let page = typeof query3.paginate.page === "number" ? query3.paginate.page : parseInt(query3.paginate.page || "1");
+          if (query3.paginate && !hasFilters2) {
             rows2 = await sheet.getRows({
               limit,
-              offset: (page - 1) * limit
+              offset
             });
           } else {
             rows2 = await sheet.getRows();
           }
-          const filtered2 = filters_exports.runLuceneQuery(rows2, query3.filters);
+          if ((_d = query3.filters) == null ? void 0 : _d.equal) {
+            const idFilterKeys = Object.keys(query3.filters.equal).filter(
+              (filter2) => filter2.includes(GOOGLE_SHEETS_PRIMARY_KEY)
+            );
+            for (let idFilterKey of idFilterKeys) {
+              const id = query3.filters.equal[idFilterKey];
+              delete query3.filters.equal[idFilterKey];
+              query3.filters.equal[`_${GOOGLE_SHEETS_PRIMARY_KEY}`] = id;
+            }
+          }
+          let filtered2 = filters_exports.runLuceneQuery(rows2, query3.filters);
+          if (hasFilters2 && query3.paginate) {
+            filtered2 = filtered2.slice(offset, offset + limit);
+          }
           const headerValues = sheet.headerValues;
           let response2 = [];
           for (let row2 of filtered2) {
@@ -29456,7 +29488,12 @@ var init_googlesheets = __esm({
         const row2 = rows2[query3.rowIndex];
         if (row2) {
           await row2.delete();
-          return [{ deleted: query3.rowIndex }];
+          return [
+            {
+              deleted: query3.rowIndex,
+              [GOOGLE_SHEETS_PRIMARY_KEY]: query3.rowIndex
+            }
+          ];
         } else {
           throw new Error("Row does not exist.");
         }
@@ -31163,7 +31200,6 @@ var init_websocket2 = __esm({
         this.initialise().then(() => {
           this.io.on("connection", async (socket) => {
             socket.on("Heartbeat" /* Heartbeat */, async () => {
-              console.log(socket.data.email, "heartbeat received");
               await this.extendSessionTTL(socket.data.sessionId);
             });
             socket.on("disconnect", async () => {