fix: keep table and view order

Signed-off-by: Pranav C <pranavxc@gmail.com>
3 years ago · 84656d17e2
2 changed files with 12 additions and 6 deletions
--- a/packages/nocodb/src/lib/noco/gql/GqlApiBuilder.ts
+++ b/packages/nocodb/src/lib/noco/gql/GqlApiBuilder.ts
@ -773,9 +773,12 @@ export class GqlApiBuilder extends BaseApiBuilder<Noco> implements XcMetaMgr {

      tables.push(...relatedTableList.map(t => ({ tn: t })));
    } else {
-      tables = (await this.sqlClient.tableList())?.data?.list?.filter(
-        ({ tn }) => !IGNORE_TABLES.includes(tn)
-      );
+      tables = (await this.sqlClient.tableList())?.data?.list
+        ?.filter(({ tn }) => !IGNORE_TABLES.includes(tn))
+        ?.map(t => {
+          t.order = ++order;
+          return t;
+        });

      // enable extra
      tables.push(
--- a/packages/nocodb/src/lib/noco/rest/RestApiBuilder.ts
+++ b/packages/nocodb/src/lib/noco/rest/RestApiBuilder.ts
@ -405,9 +405,12 @@ export class RestApiBuilder extends BaseApiBuilder<Noco> {
        }));
      tables.push(...relatedTableList.map(t => ({ tn: t })));
    } else {
-      tables = (await this.sqlClient.tableList())?.data?.list?.filter(
-        ({ tn }) => !IGNORE_TABLES.includes(tn)
-      );
+      tables = (await this.sqlClient.tableList())?.data?.list
+        ?.filter(({ tn }) => !IGNORE_TABLES.includes(tn))
+        ?.map(t => {
+          t.order = ++order;
+          return t;
+        });

      // enable extra
      tables.push(