Skip to content

Commit 6ea831c

Browse files
author
FalkWolsky
committed
Updating Firestore Query to accept "startAt" for Pagination, Adapting Versions for Release
1 parent f243dcc commit 6ea831c

File tree

7 files changed

+8272
-10979
lines changed

7 files changed

+8272
-10979
lines changed

client/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.4.9
1+
2.4.11

client/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "lowcoder-frontend",
3-
"version": "2.4.9",
3+
"version": "2.4.11",
44
"type": "module",
55
"private": true,
66
"workspaces": [

server/api-service/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313

1414
<properties>
15-
<revision>2.4.9</revision>
15+
<revision>2.4.11</revision>
1616
<java.version>17</java.version>
1717
<maven.compiler.source>${java.version}</maven.compiler.source>
1818
<maven.compiler.target>${java.version}</maven.compiler.target>

server/node-service/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "lowcoder-node-server",
3-
"version": "2.4.9",
3+
"version": "2.4.11",
44
"private": true,
55
"engines": {
66
"node": "^14.18.0 || >=16.0.0"

server/node-service/src/plugins/firebase/queryConfig.ts

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -113,24 +113,6 @@ const queryConfig = {
113113
label: "Start at",
114114
type: "textInput",
115115
tooltip: "Start the query at a specific document.",
116-
},
117-
{
118-
key: "endAt",
119-
label: "End at",
120-
type: "textInput",
121-
tooltip: "End the query at a specific document.",
122-
},
123-
{
124-
key: "startAfter",
125-
label: "Start after",
126-
type: "textInput",
127-
tooltip: "Start the query after a specific document.",
128-
},
129-
{
130-
key: "endBefore",
131-
label: "End before",
132-
type: "textInput",
133-
tooltip: "End the query before a specific document.",
134116
}
135117
],
136118
},

server/node-service/src/plugins/firebase/run.ts

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,22 @@ export async function runFirebasePlugin(
8787
const data = await withFirestoreCollection(async (ref) => {
8888
let query;
8989
if (actionData.orderBy) {
90+
console.log("orderBy", actionData.orderBy);
9091
query = ref.orderBy(
9192
actionData.orderBy,
9293
(actionData.orderDirection || "asc") as OrderByDirection
9394
);
9495
}
96+
// Apply startAt if specified (for pagination)
97+
if (actionData.startAt) {
98+
if (Array.isArray(actionData.startAt)) {
99+
// If startAt is an array, pass it as is
100+
query = (query || ref).startAt(...actionData.startAt);
101+
} else {
102+
// If startAt is a single value, use it directly
103+
query = (query || ref).startAt(actionData.startAt);
104+
}
105+
}
95106
if (actionData.limit > 0) {
96107
query = (query || ref).limit(actionData.limit);
97108
}

0 commit comments

Comments
 (0)