Updating Firestore Query to accept "startAt" for Pagination, Adapting Versions for Release

FalkWolsky · FalkWolsky · commit 6ea831cfb7b5 · 2024-10-28T20:10:34.000+01:00
diff --git a/client/VERSION b/client/VERSION
@@ -1 +1 @@
-2.4.9
+2.4.11
diff --git a/client/package.json b/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "lowcoder-frontend",
-  "version": "2.4.9",
+  "version": "2.4.11",
   "type": "module",
   "private": true,
   "workspaces": [
diff --git a/server/api-service/pom.xml b/server/api-service/pom.xml
@@ -12,7 +12,7 @@
 
 
 	<properties>
-		<revision>2.4.9</revision>
+		<revision>2.4.11</revision>
 		<java.version>17</java.version>
 		<maven.compiler.source>${java.version}</maven.compiler.source>
 		<maven.compiler.target>${java.version}</maven.compiler.target>
diff --git a/server/node-service/package.json b/server/node-service/package.json
@@ -1,6 +1,6 @@
 {
   "name": "lowcoder-node-server",
-  "version": "2.4.9",
+  "version": "2.4.11",
   "private": true,
   "engines": {
     "node": "^14.18.0 || >=16.0.0"
diff --git a/server/node-service/src/plugins/firebase/queryConfig.ts b/server/node-service/src/plugins/firebase/queryConfig.ts
@@ -113,24 +113,6 @@ const queryConfig = {
               label: "Start at",
               type: "textInput",
               tooltip: "Start the query at a specific document.",
-            },
-            {
-              key: "endAt",
-              label: "End at",
-              type: "textInput",
-              tooltip: "End the query at a specific document.",
-            },
-            {
-              key: "startAfter",
-              label: "Start after",
-              type: "textInput",
-              tooltip: "Start the query after a specific document.",
-            },
-            {
-              key: "endBefore",
-              label: "End before",
-              type: "textInput",
-              tooltip: "End the query before a specific document.",
             }
           ],
         },
diff --git a/server/node-service/src/plugins/firebase/run.ts b/server/node-service/src/plugins/firebase/run.ts
@@ -87,11 +87,22 @@ export async function runFirebasePlugin(
       const data = await withFirestoreCollection(async (ref) => {
         let query;
         if (actionData.orderBy) {
+          console.log("orderBy", actionData.orderBy);
           query = ref.orderBy(
             actionData.orderBy,
             (actionData.orderDirection || "asc") as OrderByDirection
           );
         }
+        // Apply startAt if specified (for pagination)
+        if (actionData.startAt) {
+          if (Array.isArray(actionData.startAt)) {
+              // If startAt is an array, pass it as is
+              query = (query || ref).startAt(...actionData.startAt);
+          } else {
+              // If startAt is a single value, use it directly
+              query = (query || ref).startAt(actionData.startAt);
+          }
+        }
         if (actionData.limit > 0) {
           query = (query || ref).limit(actionData.limit);
         }
diff --git a/server/node-service/yarn.lock b/server/node-service/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "lowcoder-frontend",`
`3`		`- "version": "2.4.9",`
	`3`	`+ "version": "2.4.11",`
`4`	`4`	`"type": "module",`
`5`	`5`	`"private": true,`
`6`	`6`	`"workspaces": [`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "lowcoder-node-server",`
`3`		`- "version": "2.4.9",`
	`3`	`+ "version": "2.4.11",`
`4`	`4`	`"private": true,`
`5`	`5`	`"engines": {`
`6`	`6`	`"node": "^14.18.0 \|\| >=16.0.0"`