From 224d2a195330eef4c6d089ab113dc91361851ddc Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Thu, 1 Aug 2024 13:07:34 +0100
Subject: [PATCH] PR comments.

---
 .../src/sdk/app/rows/search/external.ts       | 17 +++++---------
 .../server/src/sdk/app/rows/search/sqs.ts     | 22 +++++++------------
 2 files changed, 14 insertions(+), 25 deletions(-)

diff --git a/packages/server/src/sdk/app/rows/search/external.ts b/packages/server/src/sdk/app/rows/search/external.ts
index f47f6f7998..9d9f4fde39 100644
--- a/packages/server/src/sdk/app/rows/search/external.ts
+++ b/packages/server/src/sdk/app/rows/search/external.ts
@@ -106,17 +106,12 @@ export async function search(
       paginate: paginateObj as PaginationJson,
       includeSqlRelationships: IncludeRelationship.INCLUDE,
     }
-    const queries: [
-      Promise<ExternalReadRequestReturnType>,
-      Promise<number> | undefined
-    ] = [handleRequest(Operation.READ, tableId, parameters), undefined]
-    if (countRows) {
-      queries[1] = handleRequest(Operation.COUNT, tableId, parameters)
-    }
-    const responses = await Promise.all(queries)
-    let rows = responses[0].rows
-    const rawResponseSize = responses[0].rawResponseSize
-    const totalRows = responses.length > 1 ? responses[1] : undefined
+    const [{ rows, rawResponseSize }, totalRows] = await Promise.all([
+      handleRequest(Operation.READ, tableId, parameters),
+      countRows
+        ? handleRequest(Operation.COUNT, tableId, parameters)
+        : Promise.resolve(undefined),
+    ])
 
     let processed = await outputProcessing<Row[]>(table, rows, {
       preserveLinks: true,
diff --git a/packages/server/src/sdk/app/rows/search/sqs.ts b/packages/server/src/sdk/app/rows/search/sqs.ts
index 9d6bd7e89b..f6154cf70c 100644
--- a/packages/server/src/sdk/app/rows/search/sqs.ts
+++ b/packages/server/src/sdk/app/rows/search/sqs.ts
@@ -332,20 +332,14 @@ export async function search(
   }
 
   try {
-    const queries: Promise<Row[] | number>[] = []
-    queries.push(runSqlQuery(request, allTables, relationships))
-    if (options.countRows) {
-      // get the total count of rows
-      queries.push(
-        runSqlQuery(request, allTables, relationships, {
-          countTotalRows: true,
-        })
-      )
-    }
-    const responses = await Promise.all(queries)
-    let rows = responses[0] as Row[]
-    const totalRows =
-      responses.length > 1 ? (responses[1] as number) : undefined
+    const [rows, totalRows] = await Promise.all([
+      runSqlQuery(request, allTables, relationships),
+      options.countRows
+        ? runSqlQuery(request, allTables, relationships, {
+            countTotalRows: true,
+          })
+        : Promise.resolve(undefined),
+    ])
 
     // process from the format of tableId.column to expected format also
     // make sure JSON columns corrected