From 32738c9bec4cfbd3b2f23e8c00cefbee81c9419e Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Fri, 10 Dec 2021 14:02:49 +0530
Subject: [PATCH] fix: maintain table list order, enable template editor

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../nc-gui/components/templates/editor.vue    |  2 +-
 packages/nc-gui/layouts/default.vue           |  5 ++++-
 .../nocodb/src/lib/noco/meta/NcMetaIOImpl.ts  |  2 --
 .../src/lib/noco/rest/RestApiBuilder.ts       | 19 +++++++++++++------
 4 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/packages/nc-gui/components/templates/editor.vue b/packages/nc-gui/components/templates/editor.vue
index fbee855e05..e441702605 100644
--- a/packages/nc-gui/components/templates/editor.vue
+++ b/packages/nc-gui/components/templates/editor.vue
@@ -468,7 +468,7 @@
                     Click to change gradient
                   </div>-->
                   <template v-if="!excelImport">
-                    <gradient-generator v-model="project.image_url" class=" d-100" />
+                    <gradient-generator v-model="project.image_url" class=" d-100 mt-4" />
 
                     <v-row>
                       <v-col>
diff --git a/packages/nc-gui/layouts/default.vue b/packages/nc-gui/layouts/default.vue
index c5db350e7f..df71712717 100644
--- a/packages/nc-gui/layouts/default.vue
+++ b/packages/nc-gui/layouts/default.vue
@@ -48,7 +48,7 @@
           href="https://docs.nocodb.com"
           target="_blank"
         >Docs</a>
-        <!--        <templates-modal v-if="isDashboard && _isUIAllowed('template-import')" class="align-self-center" />-->
+        <templates-modal v-if="isDashboard && _isUIAllowed('template-import')" v-model="templateModal" class="align-self-center" />
       </v-toolbar-items>
       <!-- <template v-if="!isThisMobile ">
 
@@ -581,9 +581,11 @@ import { copyTextToClipboard } from '@/helpers/xutils'
 import Snackbar from '~/components/snackbar'
 import Language from '~/components/utils/language'
 import Loader from '~/components/loader'
+import TemplatesModal from '~/components/templates/templatesModal'
 
 export default {
   components: {
+    TemplatesModal,
     Loader,
     ReleaseInfo,
     Language,
@@ -596,6 +598,7 @@ export default {
     xTerm
   },
   data: () => ({
+    templateModal: false,
     ghStarText: 'Star',
     swaggerOrGraphiqlUrl: null,
     showScreensaver: false,
diff --git a/packages/nocodb/src/lib/noco/meta/NcMetaIOImpl.ts b/packages/nocodb/src/lib/noco/meta/NcMetaIOImpl.ts
index 13ef3020ce..c35261e215 100644
--- a/packages/nocodb/src/lib/noco/meta/NcMetaIOImpl.ts
+++ b/packages/nocodb/src/lib/noco/meta/NcMetaIOImpl.ts
@@ -234,8 +234,6 @@ export default class NcMetaIOImpl extends NcMetaIO {
       query.select(...args.fields);
     }
 
-    console.log('======', query.toQuery());
-
     return query;
   }
 
diff --git a/packages/nocodb/src/lib/noco/rest/RestApiBuilder.ts b/packages/nocodb/src/lib/noco/rest/RestApiBuilder.ts
index 6706ef277f..005ebe17f8 100644
--- a/packages/nocodb/src/lib/noco/rest/RestApiBuilder.ts
+++ b/packages/nocodb/src/lib/noco/rest/RestApiBuilder.ts
@@ -402,11 +402,14 @@ export class RestApiBuilder extends BaseApiBuilder<Noco> {
         }
       }
 
-      tables = args.tableNames.map(({ tn, _tn }) => ({
-        tn,
-        type: args.type,
-        _tn
-      }));
+      tables = args.tableNames
+        .sort((a, b) => (a.tn || a._tn).localeCompare(b.tn || b._tn))
+        .map(({ tn, _tn }) => ({
+          tn,
+          type: args.type,
+          _tn,
+          order: ++order
+        }));
       tables.push(...relatedTableList.map(t => ({ tn: t })));
     } else {
       tables = (await this.sqlClient.tableList())?.data?.list?.filter(
@@ -416,10 +419,14 @@ export class RestApiBuilder extends BaseApiBuilder<Noco> {
       // enable extra
       tables.push(
         ...(await this.sqlClient.viewList())?.data?.list
+          ?.sort((a, b) =>
+            (a.view_name || a.tn).localeCompare(b.view_name || b.tn)
+          )
           ?.map(v => {
             this.viewsCount++;
             v.type = 'view';
             v.tn = v.view_name;
+            v.order = ++order;
             return v;
           })
           .filter(v => {
@@ -523,7 +530,7 @@ export class RestApiBuilder extends BaseApiBuilder<Noco> {
             this.dbAlias,
             'nc_models',
             {
-              order: ++order,
+              order: table.order || ++order,
               view_order: 1,
               title: table.tn,
               alias: meta._tn,