@budibase/server 2.7.7-alpha.2 → 2.7.7-alpha.4

package/dist/index.js

@@ -20025,11 +20025,39 @@ var init_filters = __esm({
 // ../shared-core/src/utils.ts
 var utils_exports5 = {};
 __export(utils_exports5, {
+  parallelForeach: () => parallelForeach,
   unreachable: () => unreachable
 });
 function unreachable(value, message = `No such case in exhaustive switch: ${value}`) {
   throw new Error(message);
 }
+async function parallelForeach(items, task, maxConcurrency) {
+  const promises = [];
+  let index2 = 0;
+  const processItem = async (item) => {
+    try {
+      await task(item);
+    } finally {
+      processNext();
+    }
+  };
+  const processNext = () => {
+    if (index2 >= items.length) {
+      return;
+    }
+    const item = items[index2];
+    index2++;
+    const promise = processItem(item);
+    promises.push(promise);
+    if (promises.length >= maxConcurrency) {
+      Promise.race(promises).then(processNext);
+    } else {
+      processNext();
+    }
+  };
+  processNext();
+  await Promise.all(promises);
+}
 var init_utils13 = __esm({
   "../shared-core/src/utils.ts"() {
   }
@@ -26486,7 +26514,8 @@ var init_postgres = __esm({
         try {
           await this.openConnection();
           const columnsResponse = await this.client.query(this.COLUMNS_SQL);
-          return columnsResponse.rows.map((row2) => row2.table_name);
+          const names = columnsResponse.rows.map((row2) => row2.table_name);
+          return [...new Set(names)];
         } finally {
           await this.closeConnection();
         }
@@ -29158,7 +29187,6 @@ var init_googlesheets = __esm({
       }
       async testConnection() {
         try {
-          await setupCreationAuth(this.config);
           await this.connect();
           return { connected: true };
         } catch (e) {
@@ -29210,6 +29238,7 @@ var init_googlesheets = __esm({
       async connect() {
         var _a2;
         try {
+          await setupCreationAuth(this.config);
           let googleConfig = await configs_exports.getGoogleDatasourceConfig();
           if (!googleConfig) {
             throw new HTTPError("Google config not found", 400);
@@ -29260,21 +29289,22 @@ var init_googlesheets = __esm({
         return table2;
       }
       async buildSchema(datasourceId, entities) {
-        if (!this.config.auth) {
-          return;
-        }
         await this.connect();
         const sheets = this.client.sheetsByIndex;
         const tables = {};
-        for (let sheet of sheets) {
-          await sheet.getRows();
-          const id = buildExternalTableId(datasourceId, sheet.title);
-          tables[sheet.title] = this.getTableSchema(
-            sheet.title,
-            sheet.headerValues,
-            id
-          );
-        }
+        await utils_exports5.parallelForeach(
+          sheets,
+          async (sheet) => {
+            await sheet.getRows({ limit: 0, offset: 0 });
+            const id = buildExternalTableId(datasourceId, sheet.title);
+            tables[sheet.title] = this.getTableSchema(
+              sheet.title,
+              sheet.headerValues,
+              id
+            );
+          },
+          10
+        );
         const final = finaliseExternalTables(tables, entities);
         this.tables = final.tables;
         this.schemaErrors = final.errors;
@@ -34686,6 +34716,19 @@ async function buildSchemaHelper(datasource2) {
   }
   return { tables: connector.tables, error: error2 };
 }
+async function buildFilteredSchema(datasource2, filter2) {
+  let { tables, error: error2 } = await buildSchemaHelper(datasource2);
+  let finalTables = tables;
+  if (filter2) {
+    finalTables = {};
+    for (let key in tables) {
+      if (filter2.some((filter3) => filter3.toLowerCase() === key.toLowerCase())) {
+        finalTables[key] = tables[key];
+      }
+    }
+  }
+  return { tables: finalTables, error: error2 };
+}
 async function fetch22(ctx) {
   const db2 = context_exports.getAppDB();
   const internalTables = await db2.allDocs(
@@ -34740,37 +34783,24 @@ async function information(ctx) {
   }
   const tableNames = await connector.getTableNames();
   ctx.body = {
-    tableNames
+    tableNames: tableNames.sort()
   };
 }
 async function buildSchemaFromDb(ctx) {
   const db2 = context_exports.getAppDB();
-  const datasource2 = await sdk_default.datasources.get(ctx.params.datasourceId);
   const tablesFilter = ctx.request.body.tablesFilter;
-  let { tables, error: error2 } = await buildSchemaHelper(datasource2);
-  if (tablesFilter) {
-    if (!datasource2.entities) {
-      datasource2.entities = {};
-    }
-    for (let key in tables) {
-      if (tablesFilter.some(
-        (filter2) => filter2.toLowerCase() === key.toLowerCase()
-      )) {
-        datasource2.entities[key] = tables[key];
-      }
-    }
-  } else {
-    datasource2.entities = tables;
-  }
+  const datasource2 = await sdk_default.datasources.get(ctx.params.datasourceId);
+  const { tables, error: error2 } = await buildFilteredSchema(datasource2, tablesFilter);
+  datasource2.entities = tables;
   setDefaultDisplayColumns(datasource2);
   const dbResp = await db2.put(datasource2);
   datasource2._rev = dbResp.rev;
   const cleanedDatasource = await sdk_default.datasources.removeSecretSingle(datasource2);
-  const response2 = { datasource: cleanedDatasource };
+  const res = { datasource: cleanedDatasource };
   if (error2) {
-    response2.error = error2;
+    res.error = error2;
   }
-  ctx.body = response2;
+  ctx.body = res;
 }
 function setDefaultDisplayColumns(datasource2) {
   for (let entity of Object.values(datasource2.entities || {})) {
@@ -34844,6 +34874,7 @@ async function save13(ctx) {
   const db2 = context_exports.getAppDB();
   const plus = ctx.request.body.datasource.plus;
   const fetchSchema = ctx.request.body.fetchSchema;
+  const tablesFilter = ctx.request.body.tablesFilter;
   const datasource2 = {
     _id: generateDatasourceID({ plus }),
     ...ctx.request.body.datasource,
@@ -34851,7 +34882,10 @@ async function save13(ctx) {
   };
   let schemaError = null;
   if (fetchSchema) {
-    const { tables, error: error2 } = await buildSchemaHelper(datasource2);
+    const { tables, error: error2 } = await buildFilteredSchema(
+      datasource2,
+      tablesFilter
+    );
     schemaError = error2;
     datasource2.entities = tables;
     setDefaultDisplayColumns(datasource2);
@@ -37799,6 +37833,8 @@ function process2(updateCb) {
     } catch (err) {
       if ((err == null ? void 0 : err.status) === 404) {
         return;
+      } else if ((err == null ? void 0 : err.status) === 409) {
+        return;
       } else {
         logging_exports.logAlert("Failed to perform user/group app sync", err);
       }