From f9c0a2504196fc35b9fe649a95e8ad2ff6a6b5a9 Mon Sep 17 00:00:00 2001
From: Naman Anand <iamnamananand996@gmail.com>
Date: Thu, 14 Apr 2022 04:27:10 +0530
Subject: [PATCH 01/27] #1675 scroll filter initial fix

---
 .../components/project/spreadsheet/components/columnFilter.vue  | 2 +-
 .../components/project/spreadsheet/components/sortListMenu.vue  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/components/project/spreadsheet/components/columnFilter.vue b/packages/nc-gui/components/project/spreadsheet/components/columnFilter.vue
index 2296f175d1..41fea60ed3 100644
--- a/packages/nc-gui/components/project/spreadsheet/components/columnFilter.vue
+++ b/packages/nc-gui/components/project/spreadsheet/components/columnFilter.vue
@@ -1,7 +1,7 @@
 <template>
   <div
     class="backgroundColor pa-2"
-    style="width:530px"
+    style="width:530px; max-height: 500px; overflow-y:scroll;"
   >
     <div class="grid" @click.stop>
       <template v-for="(filter,i) in filters" dense>
diff --git a/packages/nc-gui/components/project/spreadsheet/components/sortListMenu.vue b/packages/nc-gui/components/project/spreadsheet/components/sortListMenu.vue
index 22ca85db5b..ba85f9cb34 100644
--- a/packages/nc-gui/components/project/spreadsheet/components/sortListMenu.vue
+++ b/packages/nc-gui/components/project/spreadsheet/components/sortListMenu.vue
@@ -27,7 +27,7 @@
         </v-btn>
       </v-badge>
     </template>
-    <div class="backgroundColor pa-2" style="min-width: 330px">
+    <div class="backgroundColor pa-2" style="min-width: 330px; max-height: 500px; overflow-y:scroll;">
       <div class="sort-grid" @click.stop>
         <template v-for="(sort,i) in sortList" dense>
           <v-icon :key="i + 'icon'" class="nc-sort-item-remove-btn" small @click.stop="sortList.splice(i,1)">

From fea32b7da8d2ba24f9a5341477e7d47ef07a9870 Mon Sep 17 00:00:00 2001
From: Naman Anand <iamnamananand996@gmail.com>
Date: Thu, 14 Apr 2022 04:38:10 +0530
Subject: [PATCH 02/27] #1675 common css for filter dropdown

---
 packages/nc-gui/assets/style/style.css        | 72 +++++++++----------
 .../spreadsheet/components/columnFilter.vue   |  4 +-
 .../spreadsheet/components/sortListMenu.vue   |  2 +-
 3 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/packages/nc-gui/assets/style/style.css b/packages/nc-gui/assets/style/style.css
index cdf119f2e5..2bfc3505f3 100644
--- a/packages/nc-gui/assets/style/style.css
+++ b/packages/nc-gui/assets/style/style.css
@@ -114,23 +114,18 @@ html {
   overflow: hidden;
 }
 
-
 [v-cloak] {
   display: none !important;
 }
 
-
 .v-btn {
   margin: 0 2px;
 }
 
-
-
 html {
   overflow-y: auto !important;
 }
 
-
 /* nested expansion panel bug  */
 
 .v-expansion-panel-header {
@@ -141,7 +136,6 @@ html {
   min-height: 64px !important;
 }
 
-
 /* Table validation message */
 /*table .v-input__control {*/
 /*  position: relative;*/
@@ -152,13 +146,11 @@ html {
 /*  bottom: -4px;*/
 /*}*/
 
-
 /*table edit dialog buttons*/
 .v-small-dialog__actions button span {
   font-weight: bolder;
 }
 
-
 /*resizer*/
 
 .vertical-resizer {
@@ -219,15 +211,25 @@ html {
   background: linear-gradient(180deg, black, rgb(55, 55, 55));
 }
 
-
 .yellow-orange-gradient {
-  background: -moz-linear-gradient(left, rgba(241, 231, 103, 1) 0%, rgba(254, 182, 69, 1) 100%);
-  background: -webkit-linear-gradient(left, rgba(241, 231, 103, 1) 0%, rgba(254, 182, 69, 1) 100%);
-  background: linear-gradient(to right, rgba(241, 231, 103, 1) 0%, rgba(254, 182, 69, 1) 100%);
+  background: -moz-linear-gradient(
+    left,
+    rgba(241, 231, 103, 1) 0%,
+    rgba(254, 182, 69, 1) 100%
+  );
+  background: -webkit-linear-gradient(
+    left,
+    rgba(241, 231, 103, 1) 0%,
+    rgba(254, 182, 69, 1) 100%
+  );
+  background: linear-gradient(
+    to right,
+    rgba(241, 231, 103, 1) 0%,
+    rgba(254, 182, 69, 1) 100%
+  );
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f1e767', endColorstr='#feb645', GradientType=1);
 }
 
-
 .white-gradient {
   background: linear-gradient(45deg, white, lightskyblue);
 }
@@ -248,7 +250,6 @@ html {
   background: linear-gradient(70deg, #fcbb07, #fcbb07);
 }
 
-
 .img-animation {
   animation-name: vibrate;
   animation-duration: 1.5s;
@@ -262,7 +263,6 @@ html {
 
 @keyframes vibrate {
   0% {
-
     transform: translateY(10px);
   }
   100% {
@@ -270,26 +270,21 @@ html {
   }
 }
 
-
 .search-overlay .v-overlay__content {
   height: 100%;
   width: 100%;
-
 }
 
-
 /* Draggable tree hover color */
 
 .theme--dark .vtl-tree-node:hover {
   background-color: rgb(94, 94, 94) !important;
 }
 
-
 .theme--light .vtl-tree-node:hover {
   background-color: rgb(240, 240, 240) !important;
 }
 
-
 /*vue tree list icon font */
 
 /*.sql-query-treeview .vtl-icon-folder:before {*/
@@ -309,56 +304,61 @@ html {
 
 /*}*/
 
-.sql-query-treeview .vtl-tree-node .vtl-caret{
-  width:1rem;
+.sql-query-treeview .vtl-tree-node .vtl-caret {
+  width: 1rem;
 }
-.sql-query-treeview .vtl-tree-node{
+.sql-query-treeview .vtl-tree-node {
   padding-top: 5px !important;
   padding-bottom: 5px !important;
 }
-.sql-query-treeview .custom-run-icon{}
-
+.sql-query-treeview .custom-run-icon {
+}
 
 .sql-editor .v-expansion-panel-header {
   min-height: 36px !important;
-  padding:  0 0 0  10px;
+  padding: 0 0 0 10px;
 }
 .sql-editor .v-expansion-panel-header--active {
   min-height: 40px !important;
 }
 
-
 .api-client .v-expansion-panel-header {
   min-height: 36px !important;
-  padding:  0 0 0  10px;
+  padding: 0 0 0 10px;
 }
 .api-client .v-expansion-panel-header--active {
   min-height: 40px !important;
 }
-.api-treeview .vtl-node-content{
+.api-treeview .vtl-node-content {
   max-width: calc(100% - 44px);
 }
 /* for expansion panel content wrapper */
-.expansion-wrap-0 .v-expansion-panel-content__wrap{
+.expansion-wrap-0 .v-expansion-panel-content__wrap {
   padding: 0;
 }
 
-.sql-query-treeview .vtl-operation{
-  margin-left: 2px !important;;
+.sql-query-treeview .vtl-operation {
+  margin-left: 2px !important;
 }
-.sql-query-treeview .vtl-tree-node{
+.sql-query-treeview .vtl-tree-node {
   display: flex;
 }
 
-.sql-query-treeview .vtl-node-content{
+.sql-query-treeview .vtl-node-content {
   flex-grow: 1;
 }
 
-
 .ignore-height-style table .v-input__control {
   height: auto !important;
 }
 
-.cursor-pointer{
+.cursor-pointer {
   cursor: pointer;
 }
+
+
+/* sorting and filter */
+.menu-filter-dropdown {
+  max-height: 500px;
+  overflow-y: scroll;
+}
diff --git a/packages/nc-gui/components/project/spreadsheet/components/columnFilter.vue b/packages/nc-gui/components/project/spreadsheet/components/columnFilter.vue
index 41fea60ed3..d8e2168270 100644
--- a/packages/nc-gui/components/project/spreadsheet/components/columnFilter.vue
+++ b/packages/nc-gui/components/project/spreadsheet/components/columnFilter.vue
@@ -1,7 +1,7 @@
 <template>
   <div
-    class="backgroundColor pa-2"
-    style="width:530px; max-height: 500px; overflow-y:scroll;"
+    class="backgroundColor pa-2 menu-filter-dropdown"
+    style="width:530px;"
   >
     <div class="grid" @click.stop>
       <template v-for="(filter,i) in filters" dense>
diff --git a/packages/nc-gui/components/project/spreadsheet/components/sortListMenu.vue b/packages/nc-gui/components/project/spreadsheet/components/sortListMenu.vue
index ba85f9cb34..1da6315b86 100644
--- a/packages/nc-gui/components/project/spreadsheet/components/sortListMenu.vue
+++ b/packages/nc-gui/components/project/spreadsheet/components/sortListMenu.vue
@@ -27,7 +27,7 @@
         </v-btn>
       </v-badge>
     </template>
-    <div class="backgroundColor pa-2" style="min-width: 330px; max-height: 500px; overflow-y:scroll;">
+    <div class="backgroundColor pa-2 menu-filter-dropdown" style="min-width: 330px;">
       <div class="sort-grid" @click.stop>
         <template v-for="(sort,i) in sortList" dense>
           <v-icon :key="i + 'icon'" class="nc-sort-item-remove-btn" small @click.stop="sortList.splice(i,1)">

From c3b87e04fd8b67f28cbdba796b61e52abcaf73e4 Mon Sep 17 00:00:00 2001
From: Naman Anand <iamnamananand996@gmail.com>
Date: Sat, 16 Apr 2022 23:05:55 +0530
Subject: [PATCH 03/27] #1675 add class after resolve merge conflicts

---
 .../components/project/spreadsheet/components/columnFilter.vue  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nc-gui/components/project/spreadsheet/components/columnFilter.vue b/packages/nc-gui/components/project/spreadsheet/components/columnFilter.vue
index 9fa27de812..4ebdda8658 100644
--- a/packages/nc-gui/components/project/spreadsheet/components/columnFilter.vue
+++ b/packages/nc-gui/components/project/spreadsheet/components/columnFilter.vue
@@ -1,6 +1,6 @@
 <template>
   <div
-    class="backgroundColor pa-2"
+    class="backgroundColor pa-2 menu-filter-dropdown"
     :style="{ width: nested ? '100%' : '530px' }"
   >
     <div class="grid" @click.stop>

From 0bc9e2de09612771d849183772b7f316e53d7f86 Mon Sep 17 00:00:00 2001
From: Naman Anand <iamnamananand996@gmail.com>
Date: Mon, 18 Apr 2022 01:06:59 +0530
Subject: [PATCH 04/27] #1675 revert some extra formattin

---
 packages/nc-gui/assets/style/style.css        |  67 ++--
 .../spreadsheet/components/columnFilter.vue   | 356 ++++++++----------
 .../spreadsheet/components/sortListMenu.vue   |   2 +-
 3 files changed, 198 insertions(+), 227 deletions(-)

diff --git a/packages/nc-gui/assets/style/style.css b/packages/nc-gui/assets/style/style.css
index 2bfc3505f3..88675ce354 100644
--- a/packages/nc-gui/assets/style/style.css
+++ b/packages/nc-gui/assets/style/style.css
@@ -114,18 +114,23 @@ html {
   overflow: hidden;
 }
 
+
 [v-cloak] {
   display: none !important;
 }
 
+
 .v-btn {
   margin: 0 2px;
 }
 
+
+
 html {
   overflow-y: auto !important;
 }
 
+
 /* nested expansion panel bug  */
 
 .v-expansion-panel-header {
@@ -136,6 +141,7 @@ html {
   min-height: 64px !important;
 }
 
+
 /* Table validation message */
 /*table .v-input__control {*/
 /*  position: relative;*/
@@ -146,11 +152,13 @@ html {
 /*  bottom: -4px;*/
 /*}*/
 
+
 /*table edit dialog buttons*/
 .v-small-dialog__actions button span {
   font-weight: bolder;
 }
 
+
 /*resizer*/
 
 .vertical-resizer {
@@ -211,25 +219,15 @@ html {
   background: linear-gradient(180deg, black, rgb(55, 55, 55));
 }
 
+
 .yellow-orange-gradient {
-  background: -moz-linear-gradient(
-    left,
-    rgba(241, 231, 103, 1) 0%,
-    rgba(254, 182, 69, 1) 100%
-  );
-  background: -webkit-linear-gradient(
-    left,
-    rgba(241, 231, 103, 1) 0%,
-    rgba(254, 182, 69, 1) 100%
-  );
-  background: linear-gradient(
-    to right,
-    rgba(241, 231, 103, 1) 0%,
-    rgba(254, 182, 69, 1) 100%
-  );
+  background: -moz-linear-gradient(left, rgba(241, 231, 103, 1) 0%, rgba(254, 182, 69, 1) 100%);
+  background: -webkit-linear-gradient(left, rgba(241, 231, 103, 1) 0%, rgba(254, 182, 69, 1) 100%);
+  background: linear-gradient(to right, rgba(241, 231, 103, 1) 0%, rgba(254, 182, 69, 1) 100%);
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f1e767', endColorstr='#feb645', GradientType=1);
 }
 
+
 .white-gradient {
   background: linear-gradient(45deg, white, lightskyblue);
 }
@@ -250,6 +248,7 @@ html {
   background: linear-gradient(70deg, #fcbb07, #fcbb07);
 }
 
+
 .img-animation {
   animation-name: vibrate;
   animation-duration: 1.5s;
@@ -263,6 +262,7 @@ html {
 
 @keyframes vibrate {
   0% {
+
     transform: translateY(10px);
   }
   100% {
@@ -270,21 +270,26 @@ html {
   }
 }
 
+
 .search-overlay .v-overlay__content {
   height: 100%;
   width: 100%;
+
 }
 
+
 /* Draggable tree hover color */
 
 .theme--dark .vtl-tree-node:hover {
   background-color: rgb(94, 94, 94) !important;
 }
 
+
 .theme--light .vtl-tree-node:hover {
   background-color: rgb(240, 240, 240) !important;
 }
 
+
 /*vue tree list icon font */
 
 /*.sql-query-treeview .vtl-icon-folder:before {*/
@@ -304,55 +309,57 @@ html {
 
 /*}*/
 
-.sql-query-treeview .vtl-tree-node .vtl-caret {
-  width: 1rem;
+.sql-query-treeview .vtl-tree-node .vtl-caret{
+  width:1rem;
 }
-.sql-query-treeview .vtl-tree-node {
+.sql-query-treeview .vtl-tree-node{
   padding-top: 5px !important;
   padding-bottom: 5px !important;
 }
-.sql-query-treeview .custom-run-icon {
-}
+.sql-query-treeview .custom-run-icon{}
+
 
 .sql-editor .v-expansion-panel-header {
   min-height: 36px !important;
-  padding: 0 0 0 10px;
+  padding:  0 0 0  10px;
 }
 .sql-editor .v-expansion-panel-header--active {
   min-height: 40px !important;
 }
 
+
 .api-client .v-expansion-panel-header {
   min-height: 36px !important;
-  padding: 0 0 0 10px;
+  padding:  0 0 0  10px;
 }
 .api-client .v-expansion-panel-header--active {
   min-height: 40px !important;
 }
-.api-treeview .vtl-node-content {
+.api-treeview .vtl-node-content{
   max-width: calc(100% - 44px);
 }
 /* for expansion panel content wrapper */
-.expansion-wrap-0 .v-expansion-panel-content__wrap {
+.expansion-wrap-0 .v-expansion-panel-content__wrap{
   padding: 0;
 }
 
-.sql-query-treeview .vtl-operation {
-  margin-left: 2px !important;
+.sql-query-treeview .vtl-operation{
+  margin-left: 2px !important;;
 }
-.sql-query-treeview .vtl-tree-node {
+.sql-query-treeview .vtl-tree-node{
   display: flex;
 }
 
-.sql-query-treeview .vtl-node-content {
+.sql-query-treeview .vtl-node-content{
   flex-grow: 1;
 }
 
+
 .ignore-height-style table .v-input__control {
   height: auto !important;
 }
 
-.cursor-pointer {
+.cursor-pointer{
   cursor: pointer;
 }
 
@@ -361,4 +368,4 @@ html {
 .menu-filter-dropdown {
   max-height: 500px;
   overflow-y: scroll;
-}
+}
\ No newline at end of file
diff --git a/packages/nc-gui/components/project/spreadsheet/components/columnFilter.vue b/packages/nc-gui/components/project/spreadsheet/components/columnFilter.vue
index 4ebdda8658..36b21c513d 100644
--- a/packages/nc-gui/components/project/spreadsheet/components/columnFilter.vue
+++ b/packages/nc-gui/components/project/spreadsheet/components/columnFilter.vue
@@ -1,32 +1,27 @@
 <template>
   <div
     class="backgroundColor pa-2 menu-filter-dropdown"
-    :style="{ width: nested ? '100%' : '530px' }"
+    :style="{width:nested ? '100%' : '530px'}"
   >
     <div class="grid" @click.stop>
-      <template v-for="(filter, i) in filters" dense>
+      <template v-for="(filter,i) in filters" dense>
         <template v-if="filter.status !== 'delete'">
-          <div
-            v-if="filter.is_group"
-            :key="i"
-            style="grid-column: span 4; padding: 6px"
-            class="elevation-4"
-          >
-            <div class="d-flex" style="gap: 6px; padding: 0 6px">
+          <div v-if="filter.is_group" :key="i" style="grid-column: span 4; padding:6px" class="elevation-4 ">
+            <div class="d-flex" style="gap:6px; padding: 0 6px">
               <v-icon
                 v-if="!filter.readOnly"
                 :key="i + '_3'"
                 small
                 class="nc-filter-item-remove-btn"
-                @click.stop="deleteFilter(filter, i)"
+                @click.stop="deleteFilter(filter,i)"
               >
                 mdi-close-box
               </v-icon>
               <span v-else :key="i + '_1'" />
               <v-select
                 v-model="filter.logical_op"
-                class="flex-shrink-1 flex-grow-0 elevation-0 caption"
-                :items="['and', 'or']"
+                class="flex-shrink-1 flex-grow-0 elevation-0 caption "
+                :items="['and' ,'or']"
                 solo
                 flat
                 dense
@@ -35,7 +30,7 @@
                 @click.stop
                 @change="saveOrUpdate(filter, i)"
               >
-                <template #item="{ item }">
+                <template #item="{item}">
                   <span class="caption font-weight-regular">{{ item }}</span>
                 </template>
               </v-select>
@@ -61,7 +56,7 @@
               :key="i + '_3'"
               small
               class="nc-filter-item-remove-btn"
-              @click.stop="deleteFilter(filter, i)"
+              @click.stop="deleteFilter(filter,i)"
             >
               mdi-close-box
             </v-icon>
@@ -70,15 +65,14 @@
               v-if="!i"
               :key="i + '_2'"
               class="caption d-flex align-center"
-              >{{ $t("labels.where") }}</span
-            >
+            >{{ $t('labels.where') }}</span>
 
             <v-select
               v-else
               :key="i + '_4'"
               v-model="filter.logical_op"
-              class="flex-shrink-1 flex-grow-0 elevation-0 caption"
-              :items="['and', 'or']"
+              class="flex-shrink-1 flex-grow-0 elevation-0 caption "
+              :items="['and' ,'or']"
               solo
               flat
               dense
@@ -87,7 +81,7 @@
               @click.stop
               @change="filterUpdateCondition(filter, i)"
             >
-              <template #item="{ item }">
+              <template #item="{item}">
                 <span class="caption font-weight-regular">{{ item }}</span>
               </template>
             </v-select>
@@ -108,7 +102,7 @@
               @click.stop
               @change="saveOrUpdate(filter, i)"
             >
-              <template #item="{ item }">
+              <template #item="{item}">
                 <span
                   :class="`caption font-weight-regular nc-filter-fld-${item.title}`"
                 >
@@ -119,12 +113,12 @@
             <v-select
               :key="'k' + i"
               v-model="filter.comparison_op"
-              class="flex-shrink-1 flex-grow-0 caption nc-filter-operation-select"
+              class="flex-shrink-1 flex-grow-0 caption  nc-filter-operation-select"
               :items="filterComparisonOp(filter)"
               :placeholder="$t('labels.operation')"
               solo
               flat
-              style="max-width: 120px"
+              style="max-width:120px"
               dense
               :disabled="filter.readOnly"
               hide-details
@@ -132,18 +126,11 @@
               @click.stop
               @change="filterUpdateCondition(filter, i)"
             >
-              <template #item="{ item }">
+              <template #item="{item}">
                 <span class="caption font-weight-regular">{{ item.text }}</span>
               </template>
             </v-select>
-            <span
-              v-if="
-                ['null', 'notnull', 'empty', 'notempty'].includes(
-                  filter.comparison_op
-                )
-              "
-              :key="'span' + i"
-            />
+            <span v-if="['null', 'notnull', 'empty', 'notempty'].includes(filter.comparison_op)" :key="'span' + i" />
             <v-checkbox
               v-else-if="types[filter.field] === 'boolean'"
               :key="i + '_7'"
@@ -170,20 +157,26 @@
       </template>
     </div>
 
-    <v-btn small class="elevation-0 grey--text my-3" @click.stop="addFilter">
-      <v-icon small color="grey"> mdi-plus </v-icon>
+    <v-btn
+      small
+      class="elevation-0 grey--text my-3"
+      @click.stop="addFilter"
+    >
+      <v-icon small color="grey">
+        mdi-plus
+      </v-icon>
       <!-- Add Filter -->
-      {{ $t("activity.addFilter") }}
+      {{ $t('activity.addFilter') }}
     </v-btn>
     <slot />
   </div>
 </template>
 
 <script>
-import { UITypes } from "~/components/project/spreadsheet/helpers/uiTypes";
+import { UITypes } from '~/components/project/spreadsheet/helpers/uiTypes'
 
 export default {
-  name: "ColumnFilter",
+  name: 'ColumnFilter',
   props: {
     fieldList: [Array],
     meta: Object,
@@ -192,298 +185,269 @@ export default {
     viewId: String,
     shared: Boolean,
     webHook: Boolean,
-    hookId: String,
+    hookId: String
   },
   data: () => ({
     filters: [],
     opList: [
-      "is equal",
-      "is not equal",
-      "is like",
-      "is not like",
+      'is equal', 'is not equal', 'is like', 'is not like',
       // 'is empty', 'is not empty',
-      "is null",
-      "is not null",
-      ">",
-      "<",
-      ">=",
-      "<=",
+      'is null', 'is not null',
+      '>',
+      '<',
+      '>=',
+      '<='
     ],
     comparisonOp: [
       {
-        text: "is equal",
-        value: "eq",
+        text: 'is equal',
+        value: 'eq'
       },
       {
-        text: "is not equal",
-        value: "neq",
+        text: 'is not equal',
+        value: 'neq'
       },
       {
-        text: "is like",
-        value: "like",
+        text: 'is like',
+        value: 'like'
       },
       {
-        text: "is not like",
-        value: "nlike",
+        text: 'is not like',
+        value: 'nlike'
       },
       {
-        text: "is empty",
-        value: "empty",
-        ignoreVal: true,
+        text: 'is empty',
+        value: 'empty',
+        ignoreVal: true
       },
       {
-        text: "is not empty",
-        value: "notempty",
-        ignoreVal: true,
+        text: 'is not empty',
+        value: 'notempty',
+        ignoreVal: true
       },
       {
-        text: "is null",
-        value: "null",
-        ignoreVal: true,
+        text: 'is null',
+        value: 'null',
+        ignoreVal: true
       },
       {
-        text: "is not null",
-        value: "notnull",
-        ignoreVal: true,
+        text: 'is not null',
+        value: 'notnull',
+        ignoreVal: true
       },
       {
-        text: ">",
-        value: "gt",
+        text: '>',
+        value: 'gt'
       },
       {
-        text: "<",
-        value: "lt",
+        text: '<',
+        value: 'lt'
       },
       {
-        text: ">=",
-        value: "gte",
+        text: '>=',
+        value: 'gte'
       },
       {
-        text: "<=",
-        value: "lte",
-      },
-    ],
+        text: '<=',
+        value: 'lte'
+      }
+    ]
   }),
   computed: {
     columnsById() {
-      return (this.columns || []).reduce((o, c) => ({ ...o, [c.id]: c }), {});
+      return (this.columns || []).reduce((o, c) => ({ ...o, [c.id]: c }), {})
     },
     autoApply() {
-      return this.$store.state.windows.autoApplyFilter && !this.webHook;
+      return this.$store.state.windows.autoApplyFilter && !this.webHook
     },
     columns() {
-      return (
-        this.meta &&
-        this.meta.columns.filter((c) => c && (!c.colOptions || !c.system))
-      );
+      return (this.meta && this.meta.columns.filter(c => c && (!c.colOptions || !c.system)))
     },
     types() {
       if (!this.meta || !this.meta.columns || !this.meta.columns.length) {
-        return {};
+        return {}
       }
 
       return this.meta.columns.reduce((obj, col) => {
         switch (col.uidt) {
           case UITypes.Number:
           case UITypes.Decimal:
-            obj[col.title] = obj[col.column_name] = "number";
-            break;
+            obj[col.title] = obj[col.column_name] = 'number'
+            break
           case UITypes.Checkbox:
-            obj[col.title] = obj[col.column_name] = "boolean";
-            break;
+            obj[col.title] = obj[col.column_name] = 'boolean'
+            break
           default:
-            break;
+            break
         }
-        return obj;
-      }, {});
-    },
+        return obj
+      }, {})
+    }
   },
   watch: {
     async viewId(v) {
       if (v) {
-        await this.loadFilter();
+        await this.loadFilter()
       }
     },
     filters: {
       handler(v) {
-        this.$emit(
-          "input",
-          v &&
-            v.filter((f) => (f.fk_column_id && f.comparison_op) || f.is_group)
-        );
+        this.$emit('input', v && v.filter(f => (f.fk_column_id && f.comparison_op) || f.is_group))
       },
-      deep: true,
-    },
+      deep: true
+    }
   },
   created() {
-    this.loadFilter();
+    this.loadFilter()
   },
   methods: {
     filterComparisonOp(f) {
       return this.comparisonOp.filter((op) => {
-        if (
-          f &&
-          f.fk_column_id &&
-          this.columnsById[f.fk_column_id] &&
-          this.columnsById[f.fk_column_id].uidt ===
-            UITypes.LinkToAnotherRecord &&
+        if (f && f.fk_column_id && this.columnsById[f.fk_column_id] &&
+          this.columnsById[f.fk_column_id].uidt === UITypes.LinkToAnotherRecord &&
           this.columnsById[f.fk_column_id].uidt === UITypes.Lookup
         ) {
-          return !["notempty", "empty", "notnull", "null"].includes(op.value);
+          return ![
+            'notempty',
+            'empty',
+            'notnull',
+            'null'
+          ].includes(op.value)
         }
-        return true;
-      });
+        return true
+      })
     },
     async applyChanges(nested = false, { hookId } = {}) {
       for (const [i, filter] of Object.entries(this.filters)) {
-        if (filter.status === "delete") {
+        if (filter.status === 'delete') {
           if (this.hookId || hookId) {
-            await this.$api.dbTableFilter.delete(filter.id);
+            await this.$api.dbTableFilter.delete(filter.id)
           } else {
-            await this.$api.dbTableFilter.delete(filter.id);
+            await this.$api.dbTableFilter.delete(filter.id)
           }
-        } else if (filter.status === "update") {
+        } else if (filter.status === 'update') {
           if (filter.id) {
             if (this.hookId || hookId) {
               await this.$api.dbTableFilter.update(filter.id, {
                 ...filter,
-                fk_parent_id: this.parentId,
-              });
+                fk_parent_id: this.parentId
+              })
             } else {
               await this.$api.dbTableFilter.update(filter.id, {
                 ...filter,
-                fk_parent_id: this.parentId,
-              });
+                fk_parent_id: this.parentId
+              })
             }
           } else if (this.hookId || hookId) {
-            this.$set(
-              this.filters,
-              i,
-              await this.$api.dbTableWebhookFilter.create(
-                this.hookId || hookId,
-                {
-                  ...filter,
-                  fk_parent_id: this.parentId,
-                }
-              )
-            );
+            this.$set(this.filters, i, (await this.$api.dbTableWebhookFilter.create(this.hookId || hookId, {
+              ...filter,
+              fk_parent_id: this.parentId
+            })))
           } else {
-            this.$set(
-              this.filters,
-              i,
-              await this.$api.dbTableFilter.create(this.viewId, {
-                ...filter,
-                fk_parent_id: this.parentId,
-              })
-            );
+            this.$set(this.filters, i, (await this.$api.dbTableFilter.create(this.viewId, {
+              ...filter,
+              fk_parent_id: this.parentId
+            })))
           }
         }
       }
       if (this.$refs.nestedFilter) {
         for (const nestedFilter of this.$refs.nestedFilter) {
-          await nestedFilter.applyChanges(true);
+          await nestedFilter.applyChanges(true)
         }
       }
-      this.loadFilter();
-      if (!nested) {
-        this.$emit("updated");
-      }
+      this.loadFilter()
+      if (!nested) { this.$emit('updated') }
     },
     async loadFilter() {
-      let filters = [];
-      if (this.viewId && this._isUIAllowed("filterSync")) {
+      let filters = []
+      if (this.viewId && this._isUIAllowed('filterSync')) {
         filters = this.parentId
-          ? await this.$api.dbTableFilter.childrenRead(this.parentId)
-          : await this.$api.dbTableFilter.read(this.viewId);
+          ? (await this.$api.dbTableFilter.childrenRead(this.parentId))
+          : (await this.$api.dbTableFilter.read(this.viewId))
       }
-      if (this.hookId && this._isUIAllowed("filterSync")) {
+      if (this.hookId && this._isUIAllowed('filterSync')) {
         filters = this.parentId
-          ? await this.$api.dbTableFilter.childrenRead(this.parentId)
-          : await this.$api.dbTableWebhookFilter.read(this.hookId);
+          ? (await this.$api.dbTableFilter.childrenRead(this.parentId))
+          : (await this.$api.dbTableWebhookFilter.read(this.hookId))
       }
 
-      this.filters = filters;
+      this.filters = filters
     },
     addFilter() {
       this.filters.push({
         fk_column_id: null,
-        comparison_op: "eq",
-        value: "",
-        status: "update",
-        logical_op: "and",
-      });
-      this.filters = this.filters.slice();
-      this.$tele.emit(`filter:add:trigger:${this.filters.length}`);
+        comparison_op: 'eq',
+        value: '',
+        status: 'update',
+        logical_op: 'and'
+      })
+      this.filters = this.filters.slice()
+      this.$tele.emit(`filter:add:trigger:${this.filters.length}`)
     },
     addFilterGroup() {
       this.filters.push({
         parentId: this.parentId,
         is_group: true,
-        status: "update",
-      });
-      this.filters = this.filters.slice();
-      const index = this.filters.length - 1;
-      this.saveOrUpdate(this.filters[index], index);
+        status: 'update'
+      })
+      this.filters = this.filters.slice()
+      const index = this.filters.length - 1
+      this.saveOrUpdate(this.filters[index], index)
     },
     filterUpdateCondition(filter, i) {
-      this.saveOrUpdate(filter, i);
-      this.$tele.emit(
-        `filter:condition:${filter.logical_op}:${filter.comparison_op}`
-      );
+      this.saveOrUpdate(filter, i)
+      this.$tele.emit(`filter:condition:${filter.logical_op}:${filter.comparison_op}`)
     },
     async saveOrUpdate(filter, i) {
-      if (this.shared || !this._isUIAllowed("filterSync")) {
+      if (this.shared || !this._isUIAllowed('filterSync')) {
         // this.$emit('input', this.filters.filter(f => f.fk_column_id && f.comparison_op))
-        this.$emit("updated");
+        this.$emit('updated')
       } else if (!this.autoApply) {
-        filter.status = "update";
+        filter.status = 'update'
       } else if (filter.id) {
         await this.$api.dbTableFilter.update(filter.id, {
           ...filter,
-          fk_parent_id: this.parentId,
-        });
+          fk_parent_id: this.parentId
+        })
 
-        this.$emit("updated");
+        this.$emit('updated')
       } else {
-        this.$set(
-          this.filters,
-          i,
-          await this.$api.dbTableFilter.create(this.viewId, {
-            ...filter,
-            fk_parent_id: this.parentId,
-          })
-        );
+        this.$set(this.filters, i, (await this.$api.dbTableFilter.create(this.viewId, {
+          ...filter,
+          fk_parent_id: this.parentId
+        })))
 
-        this.$emit("updated");
+        this.$emit('updated')
       }
     },
     async deleteFilter(filter, i) {
-      if (this.shared || !this._isUIAllowed("filterSync")) {
-        this.filters.splice(i, 1);
-        this.$emit("updated");
+      if (this.shared || !this._isUIAllowed('filterSync')) {
+        this.filters.splice(i, 1)
+        this.$emit('updated')
       } else if (filter.id) {
         if (!this.autoApply) {
-          this.$set(filter, "status", "delete");
+          this.$set(filter, 'status', 'delete')
         } else {
-          await this.$api.dbTableFilter.delete(filter.id);
-          await this.loadFilter();
-          this.$emit("updated");
+          await this.$api.dbTableFilter.delete(filter.id)
+          await this.loadFilter()
+          this.$emit('updated')
         }
       } else {
-        this.filters.splice(i, 1);
-        this.$emit("updated");
+        this.filters.splice(i, 1)
+        this.$emit('updated')
       }
-      this.$tele.emit("filter:delete");
-    },
-  },
-};
+      this.$tele.emit('filter:delete')
+    }
+  }
+}
 </script>
 
 <style scoped>
 .grid {
   display: grid;
-  grid-template-columns: 22px 80px auto auto auto;
+  grid-template-columns:22px 80px auto auto auto;
   column-gap: 6px;
-  row-gap: 6px;
+  row-gap: 6px
 }
 </style>
diff --git a/packages/nc-gui/components/project/spreadsheet/components/sortListMenu.vue b/packages/nc-gui/components/project/spreadsheet/components/sortListMenu.vue
index 951350834d..c3fc46bc26 100644
--- a/packages/nc-gui/components/project/spreadsheet/components/sortListMenu.vue
+++ b/packages/nc-gui/components/project/spreadsheet/components/sortListMenu.vue
@@ -28,7 +28,7 @@
         </v-btn>
       </v-badge>
     </template>
-    <div class="backgroundColor pa-2 menu-filter-dropdown" style="min-width: 330px;">
+    <div class="backgroundColor pa-2 menu-filter-dropdown" style="min-width: 330px">
       <div class="sort-grid" @click.stop>
         <template v-for="(sort,i) in sortList||[]" dense>
           <v-icon :key="i + 'icon'" class="nc-sort-item-remove-btn" small @click.stop="deleteSort(sort)">

From 0016015941ea74d0039c64e9b4544c26798a0758 Mon Sep 17 00:00:00 2001
From: Naman Anand <iamnamananand996@gmail.com>
Date: Mon, 18 Apr 2022 21:06:28 +0530
Subject: [PATCH 05/27] #1675 css changes

---
 packages/nc-gui/assets/style/style.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nc-gui/assets/style/style.css b/packages/nc-gui/assets/style/style.css
index 88675ce354..b3fa43aa70 100644
--- a/packages/nc-gui/assets/style/style.css
+++ b/packages/nc-gui/assets/style/style.css
@@ -367,5 +367,5 @@ html {
 /* sorting and filter */
 .menu-filter-dropdown {
   max-height: 500px;
-  overflow-y: scroll;
+  overflow-y: auto;
 }
\ No newline at end of file

From 776aafbc15ef8e49cd9063a5bc73fc99eb86e0f1 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Mon, 18 Apr 2022 23:23:30 +0530
Subject: [PATCH 06/27] fix: send invite email

re #1751

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../src/lib/noco/meta/api/projectUserApis.ts  | 50 +++++++++++++++----
 1 file changed, 41 insertions(+), 9 deletions(-)

diff --git a/packages/nocodb/src/lib/noco/meta/api/projectUserApis.ts b/packages/nocodb/src/lib/noco/meta/api/projectUserApis.ts
index ef49ce723e..b80efdad20 100644
--- a/packages/nocodb/src/lib/noco/meta/api/projectUserApis.ts
+++ b/packages/nocodb/src/lib/noco/meta/api/projectUserApis.ts
@@ -10,6 +10,9 @@ import { Tele } from 'nc-help';
 import Audit from '../../../noco-models/Audit';
 import NocoCache from '../../../noco-cache/NocoCache';
 import { CacheGetType, CacheScope } from '../../../utils/globals';
+import * as ejs from 'ejs';
+import NcPluginMgrv2 from '../helpers/NcPluginMgrv2';
+import Noco from '../../Noco';
 
 async function userList(req, res) {
   res.json({
@@ -112,15 +115,12 @@ async function userInvite(req, res, next): Promise<any> {
         // in case of single user check for smtp failure
         // and send back token if failed
         if (
-          emails.length === 1
-          // todo: email
-          // &&
-          // !(await sendInviteEmail(email, invite_token, req))
+          emails.length === 1 &&
+          !(await sendInviteEmail(email, invite_token, req))
         ) {
           return res.json({ invite_token, email });
         } else {
-          // todo: email
-          // sendInviteEmail(email, invite_token, req);
+          sendInviteEmail(email, invite_token, req);
         }
       } catch (e) {
         console.log(e);
@@ -209,7 +209,6 @@ async function projectUserDelete(req, res): Promise<any> {
       NcError.forbidden('Insufficient privilege to delete a owner user.');
   }
 
-  // await this.users.where('id', req.params.id).del();
   await ProjectUser.delete(project_id, req.params.userId);
   res.json({
     msg: 'success'
@@ -233,8 +232,7 @@ async function resendInvite(req, res, next): Promise<any> {
     invite_token_expires: new Date(Date.now() + 24 * 60 * 60 * 1000)
   });
 
-  // todo:
-  // await sendInviteEmail(user.email, invite_token, req);
+  await sendInviteEmail(user.email, invite_token, req);
 
   Audit.insert({
     op_type: 'AUTHENTICATION',
@@ -248,6 +246,40 @@ async function resendInvite(req, res, next): Promise<any> {
   res.json({ msg: 'success' });
 }
 
+async function sendInviteEmail(email, token, req): Promise<any> {
+  try {
+    const template = (await import('./userApi/ui/emailTemplates/invite'))
+      .default;
+
+    const emailAdapter = await NcPluginMgrv2.emailAdapter();
+
+    if (emailAdapter) {
+      await emailAdapter.mailSend({
+        to: email,
+        subject: 'Verify email',
+        html: ejs.render(template, {
+          signupLink: `${req.ncSiteUrl}${
+            Noco.getConfig()?.dashboardPath
+          }#/user/authentication/signup/${token}`,
+          projectName: req.body?.projectName,
+          roles: (req.body?.roles || '')
+            .split(',')
+            .map(r => r.replace(/^./, m => m.toUpperCase()))
+            .join(', '),
+          adminEmail: req.session?.passport?.user?.email
+        })
+      });
+      return true;
+    }
+  } catch (e) {
+    console.log(
+      'Warning : `mailSend` failed, Please configure emailClient configuration.',
+      e.message
+    );
+    throw e;
+  }
+}
+
 const router = Router({ mergeParams: true });
 router.get(
   '/api/v1/db/meta/projects/:projectId/users',

From 9516f3b0184f98701b1aad868d652bcd8651a89f Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Mon, 18 Apr 2022 23:30:05 +0530
Subject: [PATCH 07/27] refactor: map resend-invite api

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nocodb/src/lib/noco/meta/api/projectUserApis.ts | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/nocodb/src/lib/noco/meta/api/projectUserApis.ts b/packages/nocodb/src/lib/noco/meta/api/projectUserApis.ts
index b80efdad20..878f02c4e8 100644
--- a/packages/nocodb/src/lib/noco/meta/api/projectUserApis.ts
+++ b/packages/nocodb/src/lib/noco/meta/api/projectUserApis.ts
@@ -216,8 +216,7 @@ async function projectUserDelete(req, res): Promise<any> {
 }
 
 // todo: map api
-// @ts-ignore
-async function resendInvite(req, res, next): Promise<any> {
+async function projectUserInviteResend(req, res): Promise<any> {
   const user = await User.get(req.params.userId);
 
   if (!user) {
@@ -297,4 +296,8 @@ router.delete(
   '/api/v1/db/meta/projects/:projectId/users/:userId',
   ncMetaAclMw(projectUserDelete, 'projectUserDelete')
 );
+router.post(
+  '/api/v1/db/meta/projects/:projectId/users/:userId/resend-invite',
+  ncMetaAclMw(projectUserInviteResend, 'projectUserInviteResend')
+);
 export default router;

From 3c8ce60c7211d8ddf443dde2a17712d636120bea Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Tue, 19 Apr 2022 13:48:08 +0800
Subject: [PATCH 08/27] chore: add types to sendInviteEmail

Signed-off-by: Wing-Kam Wong <wingkwong.code@gmail.com>
---
 packages/nocodb/src/lib/noco/meta/api/projectUserApis.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/nocodb/src/lib/noco/meta/api/projectUserApis.ts b/packages/nocodb/src/lib/noco/meta/api/projectUserApis.ts
index 878f02c4e8..33861b893a 100644
--- a/packages/nocodb/src/lib/noco/meta/api/projectUserApis.ts
+++ b/packages/nocodb/src/lib/noco/meta/api/projectUserApis.ts
@@ -245,7 +245,11 @@ async function projectUserInviteResend(req, res): Promise<any> {
   res.json({ msg: 'success' });
 }
 
-async function sendInviteEmail(email, token, req): Promise<any> {
+async function sendInviteEmail(
+  email: string,
+  token: string,
+  req: any
+): Promise<any> {
   try {
     const template = (await import('./userApi/ui/emailTemplates/invite'))
       .default;

From 78ad00e9c726cb3e9edb9f18107752c8b58c572f Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Tue, 19 Apr 2022 15:49:07 +0800
Subject: [PATCH 09/27] fix: skip if email plugin is not set

Signed-off-by: Wing-Kam Wong <wingkwong.code@gmail.com>
---
 packages/nocodb/src/lib/noco/meta/helpers/NcPluginMgrv2.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/nocodb/src/lib/noco/meta/helpers/NcPluginMgrv2.ts b/packages/nocodb/src/lib/noco/meta/helpers/NcPluginMgrv2.ts
index dd321d8071..dd070d8d67 100644
--- a/packages/nocodb/src/lib/noco/meta/helpers/NcPluginMgrv2.ts
+++ b/packages/nocodb/src/lib/noco/meta/helpers/NcPluginMgrv2.ts
@@ -134,6 +134,8 @@ class NcPluginMgrv2 {
       active: true
     });
 
+    if (!pluginData) return null;
+
     const pluginConfig = defaultPlugins.find(
       c => c.title === pluginData.title && c.category === PluginCategory.EMAIL
     );

From fe8bb9aa57286c6a8414abb6f1093857142cc0b7 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Tue, 19 Apr 2022 15:49:28 +0800
Subject: [PATCH 10/27] chore: remove TODO tag

Signed-off-by: Wing-Kam Wong <wingkwong.code@gmail.com>
---
 packages/nocodb/src/lib/noco/meta/api/projectUserApis.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/nocodb/src/lib/noco/meta/api/projectUserApis.ts b/packages/nocodb/src/lib/noco/meta/api/projectUserApis.ts
index 33861b893a..a6f299cda3 100644
--- a/packages/nocodb/src/lib/noco/meta/api/projectUserApis.ts
+++ b/packages/nocodb/src/lib/noco/meta/api/projectUserApis.ts
@@ -215,7 +215,6 @@ async function projectUserDelete(req, res): Promise<any> {
   });
 }
 
-// todo: map api
 async function projectUserInviteResend(req, res): Promise<any> {
   const user = await User.get(req.params.userId);
 

From 49d4d3ce97d3c2a15a3dc6f5fe786ddbae2cb445 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Tue, 19 Apr 2022 15:49:50 +0800
Subject: [PATCH 11/27] fix: add missing resent invite api

Signed-off-by: Wing-Kam Wong <wingkwong.code@gmail.com>
---
 packages/nocodb-sdk/src/lib/Api.ts | 23 +++++++++++++++
 scripts/sdk/swagger.json           | 47 +++++++++++++++++++++++++++++-
 2 files changed, 69 insertions(+), 1 deletion(-)

diff --git a/packages/nocodb-sdk/src/lib/Api.ts b/packages/nocodb-sdk/src/lib/Api.ts
index ebd9e89a0d..a8dbeb7f4f 100644
--- a/packages/nocodb-sdk/src/lib/Api.ts
+++ b/packages/nocodb-sdk/src/lib/Api.ts
@@ -1063,6 +1063,29 @@ export class Api<
         format: 'json',
         ...params,
       }),
+
+    /**
+     * @description Resend Invitation to a specific user
+     *
+     * @tags Auth
+     * @name ProjectUserResendInvite
+     * @request POST:/api/v1/db/meta/projects/{projectId}/users/{userId}/resend-invite
+     * @response `200` `any` OK
+     */
+    projectUserResendInvite: (
+      projectId: string,
+      userId: string,
+      data: any,
+      params: RequestParams = {}
+    ) =>
+      this.request<any, any>({
+        path: `/api/v1/db/meta/projects/${projectId}/users/${userId}/resend-invite`,
+        method: 'POST',
+        body: data,
+        type: ContentType.Json,
+        format: 'json',
+        ...params,
+      }),
   };
   project = {
     /**
diff --git a/scripts/sdk/swagger.json b/scripts/sdk/swagger.json
index 42971ea634..d63ba0e38d 100644
--- a/scripts/sdk/swagger.json
+++ b/scripts/sdk/swagger.json
@@ -4821,6 +4821,51 @@
           }
         ]
       }
+    },
+    "/api/v1/db/meta/projects/{projectId}/users/{userId}/resend-invite": {
+      "parameters": [
+        {
+          "schema": {
+            "type": "string"
+          },
+          "name": "projectId",
+          "in": "path",
+          "required": true
+        },
+        {
+          "schema": {
+            "type": "string"
+          },
+          "name": "userId",
+          "in": "path",
+          "required": true
+        }
+      ],
+      "post": {
+        "summary": "",
+        "operationId": "auth-project-user-resend-invite",
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {}
+              }
+            }
+          }
+        },
+        "tags": [
+          "Auth"
+        ],
+        "description": "Resend Invitation to a specific user",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {}
+            }
+          }
+        }
+      }
     }
   },
   "components": {
@@ -7718,4 +7763,4 @@
       }
     }
   }
-}
+}
\ No newline at end of file

From 0190eafdf5ae5b9cf3b55042b526ee2557a87759 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Tue, 19 Apr 2022 15:54:40 +0800
Subject: [PATCH 12/27] fix: line break issue on share invitation link page

Signed-off-by: Wing-Kam Wong <wingkwong.code@gmail.com>
---
 packages/nc-gui/components/auth/shareOrInviteModal.vue | 7 ++-----
 packages/nc-gui/components/auth/userManagement.vue     | 7 ++-----
 packages/nc-gui/lang/da.json                           | 2 +-
 packages/nc-gui/lang/de.json                           | 2 +-
 packages/nc-gui/lang/en.json                           | 2 +-
 packages/nc-gui/lang/es.json                           | 2 +-
 packages/nc-gui/lang/fi.json                           | 2 +-
 packages/nc-gui/lang/fr.json                           | 2 +-
 packages/nc-gui/lang/id.json                           | 2 +-
 packages/nc-gui/lang/it_IT.json                        | 2 +-
 packages/nc-gui/lang/iw.json                           | 2 +-
 packages/nc-gui/lang/ko.json                           | 2 +-
 packages/nc-gui/lang/no.json                           | 2 +-
 packages/nc-gui/lang/pt.json                           | 2 +-
 packages/nc-gui/lang/pt_BR.json                        | 2 +-
 packages/nc-gui/lang/sv.json                           | 2 +-
 packages/nc-gui/lang/th.json                           | 2 +-
 packages/nc-gui/lang/uk.json                           | 2 +-
 packages/nc-gui/lang/vi.json                           | 2 +-
 19 files changed, 21 insertions(+), 27 deletions(-)

diff --git a/packages/nc-gui/components/auth/shareOrInviteModal.vue b/packages/nc-gui/components/auth/shareOrInviteModal.vue
index 4a649e7f39..49a08afd66 100644
--- a/packages/nc-gui/components/auth/shareOrInviteModal.vue
+++ b/packages/nc-gui/components/auth/shareOrInviteModal.vue
@@ -44,11 +44,8 @@
             </v-alert>
 
             <p class="caption grey--text mt-3">
-              {{ $t('msg.info.userInviteNoSMTP') }}
-              <!-- Looks like you have not configured mailer yet! <br>Please copy above -->
-              <!-- invite -->
-              <!-- link and send it to -->
-              {{ invite_token && (invite_token.email || invite_token.emails && invite_token.emails.join(', ')) }}.
+              <!-- Looks like you have not configured mailer yet! <br> Please copy above invite link and send it to -->
+              <pre>{{ $t('msg.info.userInviteNoSMTP') }} {{ invite_token && (invite_token.email || invite_token.emails && invite_token.emails.join(', ')) }}.</pre>
             </p>
 
             <div class="text-right">
diff --git a/packages/nc-gui/components/auth/userManagement.vue b/packages/nc-gui/components/auth/userManagement.vue
index efa8fbd42c..5ceecfb81a 100644
--- a/packages/nc-gui/components/auth/userManagement.vue
+++ b/packages/nc-gui/components/auth/userManagement.vue
@@ -323,11 +323,8 @@
               </v-alert>
 
               <p class="caption grey--text mt-3">
-                {{ $t('msg.info.userInviteNoSMTP') }}
-                <!-- Looks like you have not configured mailer yet! <br>Please copy above -->
-                <!-- invite -->
-                <!-- link and send it to -->
-                {{ invite_token && (invite_token.email || invite_token.emails && invite_token.emails.join(', ')) }}.
+                <!-- Looks like you have not configured mailer yet! <br> Please copy above invite link and send it to -->
+                <pre>{{ $t('msg.info.userInviteNoSMTP') }} {{ invite_token && (invite_token.email || invite_token.emails && invite_token.emails.join(', ')) }}.</pre>
               </p>
 
               <div class="text-right">
diff --git a/packages/nc-gui/lang/da.json b/packages/nc-gui/lang/da.json
index b99b9f0a78..2c45731d8f 100644
--- a/packages/nc-gui/lang/da.json
+++ b/packages/nc-gui/lang/da.json
@@ -406,7 +406,7 @@
       "deleteProject": "Ønsker du at slette projektet?",
       "shareBasePrivate": "Generer offentligt delbart readonly base",
       "shareBasePublic": "Enhver på internettet med dette link kan se",
-      "userInviteNoSMTP": "Ser ud som om du ikke har konfigureret mailer endnu! \\ n Kopier venligst ovenstående invitation link og send det til",
+      "userInviteNoSMTP": "Ser ud som om du ikke har konfigureret mailer endnu!\nKopier venligst ovenstående invitation link og send det til",
       "dragDropHide": "Træk og slip felter her for at skjule",
       "formInput": "Indtast formularindgangsmærke",
       "formHelpText": "Tilføj nogle hjælpetekst",
diff --git a/packages/nc-gui/lang/de.json b/packages/nc-gui/lang/de.json
index 3dc8b66dec..7d5749e0a2 100644
--- a/packages/nc-gui/lang/de.json
+++ b/packages/nc-gui/lang/de.json
@@ -406,7 +406,7 @@
       "deleteProject": "Möchten Sie das Projekt löschen?",
       "shareBasePrivate": "Öffentlich freigegebene Nur-Lese-Datenbank generieren",
       "shareBasePublic": "Für Jeden im Internet mit diesem Link sichtbar",
-      "userInviteNoSMTP": "Es sieht so aus, als hätten Sie den Mailer noch nicht konfiguriert! \\ n Bitte kopieren Sie den obigen Einladungs-Link und senden Sie ihn an",
+      "userInviteNoSMTP": "Es sieht so aus, als hätten Sie den Mailer noch nicht konfiguriert!\nBitte kopieren Sie den obigen Einladungs-Link und senden Sie ihn an",
       "dragDropHide": "Ziehen Sie die Felder hierher, um sie zu verstecken",
       "formInput": "Formularbezeichnung eingeben",
       "formHelpText": "Einen Hilfs-Text hinzufügen",
diff --git a/packages/nc-gui/lang/en.json b/packages/nc-gui/lang/en.json
index 6da3e4cf80..0e00168f9f 100644
--- a/packages/nc-gui/lang/en.json
+++ b/packages/nc-gui/lang/en.json
@@ -406,7 +406,7 @@
       "deleteProject": "Do you want to delete the project?",
       "shareBasePrivate": "Generate publicly shareable readonly base",
       "shareBasePublic": "Anyone on the internet with this link can view",
-      "userInviteNoSMTP": "Looks like you have not configured mailer yet! \\n Please copy above invite link and send it to",
+      "userInviteNoSMTP": "Looks like you have not configured mailer yet!\nPlease copy above invite link and send it to",
       "dragDropHide": "Drag and drop fields here to hide",
       "formInput": "Enter form input label",
       "formHelpText": "Add some help text",
diff --git a/packages/nc-gui/lang/es.json b/packages/nc-gui/lang/es.json
index 3a48c98610..745885dbf0 100644
--- a/packages/nc-gui/lang/es.json
+++ b/packages/nc-gui/lang/es.json
@@ -406,7 +406,7 @@
       "deleteProject": "¿Quieres eliminar el proyecto?",
       "shareBasePrivate": "Generar una base de sólo lectura compartible públicamente",
       "shareBasePublic": "Cualquier persona en Internet con este enlace puede ver",
-      "userInviteNoSMTP": "¡Parece que aún no has configurado Mailer! \\ n Por favor, copia el link de invitación de arriba y envíalo a",
+      "userInviteNoSMTP": "¡Parece que aún no has configurado Mailer!\nPor favor, copia el link de invitación de arriba y envíalo a",
       "dragDropHide": "Arrastra y suelta los campos a ocultar aquí",
       "formInput": "Ingrese la etiqueta de entrada del formulario",
       "formHelpText": "Añade algo de texto de ayuda",
diff --git a/packages/nc-gui/lang/fi.json b/packages/nc-gui/lang/fi.json
index 7774dc268d..61a18ccf5d 100644
--- a/packages/nc-gui/lang/fi.json
+++ b/packages/nc-gui/lang/fi.json
@@ -406,7 +406,7 @@
       "deleteProject": "Haluatko poistaa projektin?",
       "shareBasePrivate": "Luo julkisesti jakattava Readonly Base",
       "shareBasePublic": "Jokainen Internetissä tällä linkillä voi tarkastella",
-      "userInviteNoSMTP": "Näyttää siltä, ​​ettet ole määrittänyt sähköpostia! \\ n Kopioi yllä kutsun linkki ja lähetä se",
+      "userInviteNoSMTP": "Näyttää siltä, ​​ettet ole määrittänyt sähköpostia!\nKopioi yllä kutsun linkki ja lähetä se",
       "dragDropHide": "Vedä ja pudota kentät täällä piiloutumaan",
       "formInput": "Anna lomakkeen syöttömerkki",
       "formHelpText": "Lisää joitain ohjeita",
diff --git a/packages/nc-gui/lang/fr.json b/packages/nc-gui/lang/fr.json
index e2767ae966..6a69fca103 100644
--- a/packages/nc-gui/lang/fr.json
+++ b/packages/nc-gui/lang/fr.json
@@ -406,7 +406,7 @@
       "deleteProject": "Voulez-vous supprimer le projet ?",
       "shareBasePrivate": "Générer une base partagée en lecture seule",
       "shareBasePublic": "Toute personne avec ce lien peut consulter",
-      "userInviteNoSMTP": "On dirait que vous n'avez pas encore configuré Mailer! \\ n Merci de copier-coller le lien d'invitation ci-dessous et l'envoyer à",
+      "userInviteNoSMTP": "On dirait que vous n'avez pas encore configuré Mailer!\nMerci de copier-coller le lien d'invitation ci-dessous et l'envoyer à",
       "dragDropHide": "Glisser et déposer des champs ici pour masquer",
       "formInput": "Entrer le libelé du formulaire",
       "formHelpText": "Ajouter du texte d'assitance",
diff --git a/packages/nc-gui/lang/id.json b/packages/nc-gui/lang/id.json
index daf72071bf..492ebd2ee1 100644
--- a/packages/nc-gui/lang/id.json
+++ b/packages/nc-gui/lang/id.json
@@ -406,7 +406,7 @@
       "deleteProject": "Apakah Anda ingin menghapus proyek?",
       "shareBasePrivate": "Menghasilkan basis readonly yang dapat dibagikan secara publik",
       "shareBasePublic": "Siapa pun di Internet dengan tautan ini dapat dilihat",
-      "userInviteNoSMTP": "Sepertinya Anda belum mengonfigurasi mailer! \\ n Harap salin tautan undangan di atas dan kirimkan ke",
+      "userInviteNoSMTP": "Sepertinya Anda belum mengonfigurasi mailer!\nHarap salin tautan undangan di atas dan kirimkan ke",
       "dragDropHide": "Seret dan jatuhkan bidang di sini untuk bersembunyi",
       "formInput": "Masukkan label input formulir",
       "formHelpText": "Tambahkan beberapa teks bantuan",
diff --git a/packages/nc-gui/lang/it_IT.json b/packages/nc-gui/lang/it_IT.json
index 7b2794914a..a74dfa80b0 100644
--- a/packages/nc-gui/lang/it_IT.json
+++ b/packages/nc-gui/lang/it_IT.json
@@ -406,7 +406,7 @@
       "deleteProject": "Vuoi cancellare il progetto?",
       "shareBasePrivate": "Genera base readonly condivisibile pubblicamente condivisa",
       "shareBasePublic": "Chiunque su Internet con questo link può visualizzare",
-      "userInviteNoSMTP": "Sembra che non abbia ancora configurato mailer! \\ n Si prega di copiare sopra Invita link e invialo a",
+      "userInviteNoSMTP": "Sembra che non abbia ancora configurato mailer!\nSi prega di copiare sopra Invita link e invialo a",
       "dragDropHide": "Trascina e rilascia i campi qui per nascondersi",
       "formInput": "Inserisci l'etichetta di input del modulo",
       "formHelpText": "Aggiungi un po 'di testo di aiuto",
diff --git a/packages/nc-gui/lang/iw.json b/packages/nc-gui/lang/iw.json
index 3eeb0ed33d..5d9bb95537 100644
--- a/packages/nc-gui/lang/iw.json
+++ b/packages/nc-gui/lang/iw.json
@@ -406,7 +406,7 @@
       "deleteProject": "האם ברצונך למחוק את הפרויקט?",
       "shareBasePrivate": "ליצור בסיס שיתוף פעולה לציבור",
       "shareBasePublic": "כל אחד באינטרנט עם קישור זה יכול להציג",
-      "userInviteNoSMTP": "נראה כאילו לא הגדרת מיילר עדיין! \\ N אנא העתק מעל הזמנת קישור ולשלוח אותו",
+      "userInviteNoSMTP": "נראה כאילו לא הגדרת מיילר עדיין!\nאנא העתק מעל הזמנת קישור ולשלוח אותו",
       "dragDropHide": "גרור ושחרר שדות כאן כדי להסתיר",
       "formInput": "הזן תווית קלט טופס",
       "formHelpText": "הוסף טקסט עזרה",
diff --git a/packages/nc-gui/lang/ko.json b/packages/nc-gui/lang/ko.json
index 1b575fe9b0..3a2289723a 100644
--- a/packages/nc-gui/lang/ko.json
+++ b/packages/nc-gui/lang/ko.json
@@ -406,7 +406,7 @@
       "deleteProject": "프로젝트를 삭제 하시겠습니까?",
       "shareBasePrivate": "공개적으로 공유 할 수있는 ReadOnly Base를 생성합니다",
       "shareBasePublic": "이 링크가있는 인터넷의 모든 사람은 볼 수 있습니다",
-      "userInviteNoSMTP": "아직 메일러를 구성하지 않은 것처럼 보입니다! \\ n 초대장 링크를 복사하여 보냅니다.",
+      "userInviteNoSMTP": "아직 메일러를 구성하지 않은 것처럼 보입니다!\n초대장 링크를 복사하여 보냅니다.",
       "dragDropHide": "여기에서 필드를 드래그 앤 드롭하십시오",
       "formInput": "양식 입력 레이블을 입력하십시오",
       "formHelpText": "도움말 텍스트를 추가하십시오",
diff --git a/packages/nc-gui/lang/no.json b/packages/nc-gui/lang/no.json
index 0bd7f595a2..2ec0c7e3d8 100644
--- a/packages/nc-gui/lang/no.json
+++ b/packages/nc-gui/lang/no.json
@@ -406,7 +406,7 @@
       "deleteProject": "Ønsker du å slette prosjektet?",
       "shareBasePrivate": "Generer offentlig delbar readonly base",
       "shareBasePublic": "Alle på Internett med denne lenken kan se",
-      "userInviteNoSMTP": "Ser ut som om du ikke har konfigurert mailer ennå! \\ n Vennligst kopier over Inviter Link og send den til",
+      "userInviteNoSMTP": "Ser ut som om du ikke har konfigurert mailer ennå!\nVennligst kopier over Inviter Link og send den til",
       "dragDropHide": "Dra og slipp felt her for å skjule",
       "formInput": "Skriv inn skjema inngangsetikett",
       "formHelpText": "Legg til litt hjelpetekst",
diff --git a/packages/nc-gui/lang/pt.json b/packages/nc-gui/lang/pt.json
index a204de5d89..d4d489e815 100644
--- a/packages/nc-gui/lang/pt.json
+++ b/packages/nc-gui/lang/pt.json
@@ -406,7 +406,7 @@
       "deleteProject": "Você quer excluir o projeto?",
       "shareBasePrivate": "Gerar base readonly compartilhável publicamente",
       "shareBasePublic": "Qualquer pessoa na internet com este link pode ver",
-      "userInviteNoSMTP": "Parece que você ainda não configurou o mailer! \\ n por favor copie o link acima do convite e envie-o para",
+      "userInviteNoSMTP": "Parece que você ainda não configurou o mailer!\npor favor copie o link acima do convite e envie-o para",
       "dragDropHide": "Arraste e solte os campos aqui para se esconder",
       "formInput": "Digite a etiqueta de entrada do formulário",
       "formHelpText": "Adicione um texto de ajuda",
diff --git a/packages/nc-gui/lang/pt_BR.json b/packages/nc-gui/lang/pt_BR.json
index 54c13efae1..3627b0df5d 100644
--- a/packages/nc-gui/lang/pt_BR.json
+++ b/packages/nc-gui/lang/pt_BR.json
@@ -406,7 +406,7 @@
       "deleteProject": "Você quer excluir o projeto?",
       "shareBasePrivate": "Gerar base readonly compartilhável publicamente",
       "shareBasePublic": "Qualquer pessoa na internet com este link pode ver",
-      "userInviteNoSMTP": "Parece que você ainda não configurou o mailer! \\ n por favor copie o link acima do convite e envie-o para",
+      "userInviteNoSMTP": "Parece que você ainda não configurou o mailer!\npor favor copie o link acima do convite e envie-o para",
       "dragDropHide": "Arraste e solte os campos aqui para se esconder",
       "formInput": "Digite a etiqueta de entrada do formulário",
       "formHelpText": "Adicione um texto de ajuda",
diff --git a/packages/nc-gui/lang/sv.json b/packages/nc-gui/lang/sv.json
index a986fae372..abcec5f18f 100644
--- a/packages/nc-gui/lang/sv.json
+++ b/packages/nc-gui/lang/sv.json
@@ -406,7 +406,7 @@
       "deleteProject": "Vill du radera projektet?",
       "shareBasePrivate": "Generera offentligt delbar readonly base",
       "shareBasePublic": "Någon på internet med den här länken kan visa",
-      "userInviteNoSMTP": "Det verkar som om du inte har konfigurerat Mailer än! \\ n Vänligen kopiera ovanför bjudningslänk och skicka den till",
+      "userInviteNoSMTP": "Det verkar som om du inte har konfigurerat Mailer än!\nVänligen kopiera ovanför bjudningslänk och skicka den till",
       "dragDropHide": "Dra och släpp fält här för att dölja",
       "formInput": "Ange formulärinmatningslabel",
       "formHelpText": "Lägg till lite hjälptext",
diff --git a/packages/nc-gui/lang/th.json b/packages/nc-gui/lang/th.json
index bdc1962808..72323bb29c 100644
--- a/packages/nc-gui/lang/th.json
+++ b/packages/nc-gui/lang/th.json
@@ -406,7 +406,7 @@
       "deleteProject": "คุณต้องการลบโครงการหรือไม่",
       "shareBasePrivate": "สร้างฐาน Readonly ที่ใช้ร่วมกันได้อย่างเปิดเผย",
       "shareBasePublic": "ทุกคนบนอินเทอร์เน็ตด้วยลิงค์นี้สามารถดูได้",
-      "userInviteNoSMTP": "ดูเหมือนว่าคุณยังไม่ได้กำหนดค่าเมล! \\ n โปรดคัดลอกลิงก์เชิญด้านบนและส่งไปที่",
+      "userInviteNoSMTP": "ดูเหมือนว่าคุณยังไม่ได้กำหนดค่าเมล!\nโปรดคัดลอกลิงก์เชิญด้านบนและส่งไปที่",
       "dragDropHide": "ลากและวางฟิลด์ที่นี่เพื่อซ่อน",
       "formInput": "ป้อนป้ายชื่ออินพุตแบบฟอร์ม",
       "formHelpText": "เพิ่มข้อความช่วยเหลือบางอย่าง",
diff --git a/packages/nc-gui/lang/uk.json b/packages/nc-gui/lang/uk.json
index 2219460f0c..42a51612c5 100644
--- a/packages/nc-gui/lang/uk.json
+++ b/packages/nc-gui/lang/uk.json
@@ -406,7 +406,7 @@
       "deleteProject": "Ви хочете видалити проект?",
       "shareBasePrivate": "Генерувати загальнодоступну групою",
       "shareBasePublic": "Будь-хто в Інтернеті за допомогою цього посилання може переглядати",
-      "userInviteNoSMTP": "Схоже, ви ще не налаштували Mailer! \\ n Будь ласка, скопіюйте вище посилання на запрошення і надішліть його",
+      "userInviteNoSMTP": "Схоже, ви ще не налаштували Mailer!\nБудь ласка, скопіюйте вище посилання на запрошення і надішліть його",
       "dragDropHide": "Перетягніть поля тут, щоб приховати",
       "formInput": "Введіть етикетку введення форми",
       "formHelpText": "Додайте деякий текст довідки",
diff --git a/packages/nc-gui/lang/vi.json b/packages/nc-gui/lang/vi.json
index 912edd1cac..f8acd20ca8 100644
--- a/packages/nc-gui/lang/vi.json
+++ b/packages/nc-gui/lang/vi.json
@@ -406,7 +406,7 @@
       "deleteProject": "Bạn có muốn xóa dự án?",
       "shareBasePrivate": "Tạo cơ sở chỉ đọc chia sẻ công khai",
       "shareBasePublic": "Bất cứ ai trên Internet với liên kết này có thể xem",
-      "userInviteNoSMTP": "Có vẻ như bạn chưa định cấu hình Mailer! \\ n Vui lòng sao chép liên kết mời trên và gửi nó đến",
+      "userInviteNoSMTP": "Có vẻ như bạn chưa định cấu hình Mailer!\nVui lòng sao chép liên kết mời trên và gửi nó đến",
       "dragDropHide": "Kéo và thả các trường ở đây để ẩn",
       "formInput": "Nhập nhãn đầu vào Mẫu",
       "formHelpText": "Thêm một số văn bản trợ giúp",

From c43d4b79e42d35423b97f44e35d9d16616391d0e Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Tue, 19 Apr 2022 16:55:03 +0800
Subject: [PATCH 13/27] fix: switch to new API

Signed-off-by: Wing-Kam Wong <wingkwong.code@gmail.com>
---
 packages/nc-gui/components/auth/userManagement.vue | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/packages/nc-gui/components/auth/userManagement.vue b/packages/nc-gui/components/auth/userManagement.vue
index 5ceecfb81a..e2f1126266 100644
--- a/packages/nc-gui/components/auth/userManagement.vue
+++ b/packages/nc-gui/components/auth/userManagement.vue
@@ -612,16 +612,7 @@ export default {
     },
     async resendInvite(id) {
       try {
-        await this.$axios.post('/admin/resendInvite/' + id, {
-          projectName: this.$store.getters['project/GtrProjectName']
-        }, {
-          headers: {
-            'xc-auth': this.$store.state.users.token
-          },
-          params: {
-            project_id: this.$route.params.project_id
-          }
-        })
+        await this.$api.auth.projectUserResendInvite(this.$route.params.project_id, id)
         this.$toast.success('Invite email sent successfully').goAway(3000)
         await this.loadUsers()
       } catch (e) {

From bec52ac6c2bed0c76761fa090a3ef7b5e776e2a9 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Tue, 19 Apr 2022 16:55:51 +0800
Subject: [PATCH 14/27] refactor: show useful message when no email plugin is
 configured

Signed-off-by: Wing-Kam Wong <wingkwong.code@gmail.com>
---
 .../src/lib/noco/meta/api/projectUserApis.ts       | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/packages/nocodb/src/lib/noco/meta/api/projectUserApis.ts b/packages/nocodb/src/lib/noco/meta/api/projectUserApis.ts
index a6f299cda3..6e4423f08d 100644
--- a/packages/nocodb/src/lib/noco/meta/api/projectUserApis.ts
+++ b/packages/nocodb/src/lib/noco/meta/api/projectUserApis.ts
@@ -9,10 +9,11 @@ import User from '../../../noco-models/User';
 import { Tele } from 'nc-help';
 import Audit from '../../../noco-models/Audit';
 import NocoCache from '../../../noco-cache/NocoCache';
-import { CacheGetType, CacheScope } from '../../../utils/globals';
+import { CacheGetType, CacheScope, MetaTable } from '../../../utils/globals';
 import * as ejs from 'ejs';
 import NcPluginMgrv2 from '../helpers/NcPluginMgrv2';
 import Noco from '../../Noco';
+import { PluginCategory } from 'nocodb-sdk';
 
 async function userList(req, res) {
   res.json({
@@ -230,6 +231,17 @@ async function projectUserInviteResend(req, res): Promise<any> {
     invite_token_expires: new Date(Date.now() + 24 * 60 * 60 * 1000)
   });
 
+  const pluginData = await Noco.ncMeta.metaGet2(null, null, MetaTable.PLUGIN, {
+    category: PluginCategory.EMAIL,
+    active: true
+  });
+
+  if (!pluginData) {
+    NcError.badRequest(
+      `No Email Plugin is found. Please go to App Store to configure first or copy the invitation URL to users instead.`
+    );
+  }
+
   await sendInviteEmail(user.email, invite_token, req);
 
   Audit.insert({

From 0d87dd159c23d516fc55df6712d0d835643d16d0 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Tue, 19 Apr 2022 17:43:19 +0800
Subject: [PATCH 15/27] docs: add projectUserResendInvite

Signed-off-by: Wing-Kam Wong <wingkwong.code@gmail.com>
---
 packages/noco-docs/content/en/developer-resources/rest-apis.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/noco-docs/content/en/developer-resources/rest-apis.md b/packages/noco-docs/content/en/developer-resources/rest-apis.md
index 7998fd33ae..a5434926f1 100644
--- a/packages/noco-docs/content/en/developer-resources/rest-apis.md
+++ b/packages/noco-docs/content/en/developer-resources/rest-apis.md
@@ -70,6 +70,7 @@ Here's the overview of all APIs. For the details, please check out <a href="http
 | Meta | Post | auth | projectUserAdd | /api/v1/db/meta/projects/{projectId}/users |
 | Meta | Patch | auth | projectUserUpdate | /api/v1/db/meta/projects/{projectId}/users/{userId} |
 | Meta | Delete| auth | projectUserRemove | /api/v1/db/meta/projects/{projectId}/users/{userId} |
+| Meta | Post | auth | projectUserResendInvite | /api/v1/db/meta/projects/{projectId}/users/{userId}/resend-invite |
 | Meta | Post | dbTable | create | /api/v1/db/meta/projects/{projectId}/tables |
 | Meta | Get | dbTable | list | /api/v1/db/meta/projects/{projectId}/tables |
 | Meta | Post | dbTableColumn | create | /api/v1/db/meta/tables/{tableId}/columns |

From 75fbede5d24819aa7b7fd51e3a859f007d5e28b0 Mon Sep 17 00:00:00 2001
From: pranavxc <pranavxc@users.noreply.github.com>
Date: Tue, 19 Apr 2022 19:19:06 +0000
Subject: [PATCH 16/27] [create-pull-request] automated change

Signed-off-by: GitHub <noreply@github.com>
---
 packages/nc-gui/package-lock.json     |  6 +++---
 packages/nc-gui/package.json          |  2 +-
 packages/nc-lib-gui/package.json      |  2 +-
 packages/nocodb-sdk/package-lock.json |  2 +-
 packages/nocodb-sdk/package.json      |  2 +-
 packages/nocodb/package-lock.json     | 14 +++++++-------
 packages/nocodb/package.json          |  6 +++---
 7 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/packages/nc-gui/package-lock.json b/packages/nc-gui/package-lock.json
index 7569cd6e54..e8e0d04a01 100644
--- a/packages/nc-gui/package-lock.json
+++ b/packages/nc-gui/package-lock.json
@@ -7876,9 +7876,9 @@
       }
     },
     "nocodb-sdk": {
-      "version": "0.90.3",
-      "resolved": "https://registry.npmjs.org/nocodb-sdk/-/nocodb-sdk-0.90.3.tgz",
-      "integrity": "sha512-qoQbuSIb/5qYyldZjtwZY6eZaQWzL/Z9pfsM+Aw8HivsyIqRLboKCAVEr6gJf/QToro49NEzjgisKMeX/YLB+w==",
+      "version": "0.90.4",
+      "resolved": "https://registry.npmjs.org/nocodb-sdk/-/nocodb-sdk-0.90.4.tgz",
+      "integrity": "sha512-I4NrpUjVWnzNwjOO3ymDrIpSbXpVivzCfjny46LGKInmfLu2gutblsaw6tV0Jsv6LIFRPri+1rWqjtDH20bVnA==",
       "requires": {
         "axios": "^0.21.1",
         "jsep": "^0.4.0"
diff --git a/packages/nc-gui/package.json b/packages/nc-gui/package.json
index 00b95392eb..d96af19fbb 100644
--- a/packages/nc-gui/package.json
+++ b/packages/nc-gui/package.json
@@ -29,7 +29,7 @@
     "monaco-editor": "^0.19.3",
     "monaco-themes": "^0.2.5",
     "nano-assign": "^1.0.1",
-    "nocodb-sdk": "0.90.3",
+    "nocodb-sdk": "0.90.4",
     "nuxt": "^2.14.0",
     "odometer": "^0.4.8",
     "papaparse": "^5.3.1",
diff --git a/packages/nc-lib-gui/package.json b/packages/nc-lib-gui/package.json
index c3f425cacf..1323a3d78a 100644
--- a/packages/nc-lib-gui/package.json
+++ b/packages/nc-lib-gui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nc-lib-gui",
-  "version": "0.90.3",
+  "version": "0.90.4",
   "description": "> TODO: description",
   "author": "“pranavxc” <pranavxc@gmail.com>",
   "homepage": "https://gitlab.com/xgenecloud-ts/xgenecloud-ts#readme",
diff --git a/packages/nocodb-sdk/package-lock.json b/packages/nocodb-sdk/package-lock.json
index dfbb5fbe2c..3644d29bde 100644
--- a/packages/nocodb-sdk/package-lock.json
+++ b/packages/nocodb-sdk/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "nocodb-sdk",
-  "version": "0.90.3",
+  "version": "0.90.4",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/packages/nocodb-sdk/package.json b/packages/nocodb-sdk/package.json
index bac8ef71b2..422da41420 100644
--- a/packages/nocodb-sdk/package.json
+++ b/packages/nocodb-sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nocodb-sdk",
-  "version": "0.90.3",
+  "version": "0.90.4",
   "description": "NocoDB SDK",
   "main": "build/main/index.js",
   "typings": "build/main/index.d.ts",
diff --git a/packages/nocodb/package-lock.json b/packages/nocodb/package-lock.json
index 88a76aa874..caa14fc783 100644
--- a/packages/nocodb/package-lock.json
+++ b/packages/nocodb/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "nocodb",
-  "version": "0.90.3",
+  "version": "0.90.4",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -12483,9 +12483,9 @@
       }
     },
     "nc-lib-gui": {
-      "version": "0.90.3",
-      "resolved": "https://registry.npmjs.org/nc-lib-gui/-/nc-lib-gui-0.90.3.tgz",
-      "integrity": "sha512-3ii6JGz0OV5c04GmR+61ToOnKsLR9pE08VJsmDPod7pOt15uDtL8yYrJBuqHi3NmPkEhm86FtNOT6TXFdE9dzg==",
+      "version": "0.90.4",
+      "resolved": "https://registry.npmjs.org/nc-lib-gui/-/nc-lib-gui-0.90.4.tgz",
+      "integrity": "sha512-BXtAqZeAKocFZPa32C17s+/WBvcPUnUk+PUP/ASa5BqTT2dJ/e3zXGku45Jc0w2gVnKAwFpk2ZWLaQ0Yl25LPQ==",
       "requires": {
         "axios": "^0.19.2",
         "body-parser": "^1.19.0",
@@ -12592,9 +12592,9 @@
       "dev": true
     },
     "nocodb-sdk": {
-      "version": "0.90.3",
-      "resolved": "https://registry.npmjs.org/nocodb-sdk/-/nocodb-sdk-0.90.3.tgz",
-      "integrity": "sha512-qoQbuSIb/5qYyldZjtwZY6eZaQWzL/Z9pfsM+Aw8HivsyIqRLboKCAVEr6gJf/QToro49NEzjgisKMeX/YLB+w==",
+      "version": "0.90.4",
+      "resolved": "https://registry.npmjs.org/nocodb-sdk/-/nocodb-sdk-0.90.4.tgz",
+      "integrity": "sha512-I4NrpUjVWnzNwjOO3ymDrIpSbXpVivzCfjny46LGKInmfLu2gutblsaw6tV0Jsv6LIFRPri+1rWqjtDH20bVnA==",
       "requires": {
         "axios": "^0.21.1",
         "jsep": "^0.4.0"
diff --git a/packages/nocodb/package.json b/packages/nocodb/package.json
index 8f15276f46..52bd40eb35 100644
--- a/packages/nocodb/package.json
+++ b/packages/nocodb/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nocodb",
-  "version": "0.90.3",
+  "version": "0.90.4",
   "description": "NocoDB",
   "main": "dist/bundle.js",
   "repository": "https://github.com/nocodb/nocodb",
@@ -151,10 +151,10 @@
     "nanoid": "^3.1.20",
     "nc-common": "0.0.6",
     "nc-help": "^0.2.44",
-    "nc-lib-gui": "0.90.3",
+    "nc-lib-gui": "0.90.4",
     "nc-plugin": "^0.1.1",
     "ncp": "^2.0.0",
-    "nocodb-sdk": "0.90.3",
+    "nocodb-sdk": "0.90.4",
     "nodemailer": "^6.4.10",
     "ora": "^4.0.4",
     "os-locale": "^5.0.0",

From 412053039e84251293557b1b98036437266e61de Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Wed, 20 Apr 2022 01:35:36 +0530
Subject: [PATCH 17/27] 0.90.5 Pre-release (#1774)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore(deps): bump minimist

Bumps [minimist](https://github.com/substack/minimist) from 1.2.5 to 1.2.6.
- [Release notes](https://github.com/substack/minimist/releases)
- [Commits](https://github.com/substack/minimist/compare/1.2.5...1.2.6)

---
updated-dependencies:
- dependency-name: minimist
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

* chore(deps): bump async from 2.6.3 to 2.6.4 in /packages/noco-docs-prev

Bumps [async](https://github.com/caolan/async) from 2.6.3 to 2.6.4.
- [Release notes](https://github.com/caolan/async/releases)
- [Changelog](https://github.com/caolan/async/blob/v2.6.4/CHANGELOG.md)
- [Commits](https://github.com/caolan/async/compare/v2.6.3...v2.6.4)

---
updated-dependencies:
- dependency-name: async
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

* chore(deps): bump async from 2.6.3 to 2.6.4 in /packages/noco-docs

Bumps [async](https://github.com/caolan/async) from 2.6.3 to 2.6.4.
- [Release notes](https://github.com/caolan/async/releases)
- [Changelog](https://github.com/caolan/async/blob/v2.6.4/CHANGELOG.md)
- [Commits](https://github.com/caolan/async/compare/v2.6.3...v2.6.4)

---
updated-dependencies:
- dependency-name: async
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

* chore(deps): bump async from 2.6.3 to 2.6.4 in /packages/nc-plugin

Bumps [async](https://github.com/caolan/async) from 2.6.3 to 2.6.4.
- [Release notes](https://github.com/caolan/async/releases)
- [Changelog](https://github.com/caolan/async/blob/v2.6.4/CHANGELOG.md)
- [Commits](https://github.com/caolan/async/compare/v2.6.3...v2.6.4)

---
updated-dependencies:
- dependency-name: async
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

* chore(deps): bump async from 2.6.3 to 2.6.4 in /packages/nc-cli

Bumps [async](https://github.com/caolan/async) from 2.6.3 to 2.6.4.
- [Release notes](https://github.com/caolan/async/releases)
- [Changelog](https://github.com/caolan/async/blob/v2.6.4/CHANGELOG.md)
- [Commits](https://github.com/caolan/async/compare/v2.6.3...v2.6.4)

---
updated-dependencies:
- dependency-name: async
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

* chore(deps): bump async from 2.6.3 to 2.6.4 in /packages/noco-i18n

Bumps [async](https://github.com/caolan/async) from 2.6.3 to 2.6.4.
- [Release notes](https://github.com/caolan/async/releases)
- [Changelog](https://github.com/caolan/async/blob/v2.6.4/CHANGELOG.md)
- [Commits](https://github.com/caolan/async/compare/v2.6.3...v2.6.4)

---
updated-dependencies:
- dependency-name: async
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

* chore(deps): bump async from 2.6.3 to 2.6.4 in /packages/noco-blog

Bumps [async](https://github.com/caolan/async) from 2.6.3 to 2.6.4.
- [Release notes](https://github.com/caolan/async/releases)
- [Changelog](https://github.com/caolan/async/blob/v2.6.4/CHANGELOG.md)
- [Commits](https://github.com/caolan/async/compare/v2.6.3...v2.6.4)

---
updated-dependencies:
- dependency-name: async
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

* chore(deps): bump async from 2.6.3 to 2.6.4 in /packages/nocodb-sdk

Bumps [async](https://github.com/caolan/async) from 2.6.3 to 2.6.4.
- [Release notes](https://github.com/caolan/async/releases)
- [Changelog](https://github.com/caolan/async/blob/v2.6.4/CHANGELOG.md)
- [Commits](https://github.com/caolan/async/compare/v2.6.3...v2.6.4)

---
updated-dependencies:
- dependency-name: async
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

* chore(deps): bump minimist from 1.2.5 to 1.2.6 in /packages/nocodb

Bumps [minimist](https://github.com/substack/minimist) from 1.2.5 to 1.2.6.
- [Release notes](https://github.com/substack/minimist/releases)
- [Commits](https://github.com/substack/minimist/compare/1.2.5...1.2.6)

---
updated-dependencies:
- dependency-name: minimist
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

* refactor: i18n zh_CN corrections

Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com>

* refactor: use SqlFactory from nocodb-sdk package (#1750)

Signed-off-by: Pranav C <pranavxc@gmail.com>

* fix: refer parent table referenced column in filter query(BT)

re #1756

Signed-off-by: Pranav C <pranavxc@gmail.com>

* fix: wrap nested add update query select part to avoid issue when referencing same table

Signed-off-by: Pranav C <pranavxc@gmail.com>

* chore(deps): bump async in /packages/nc-migrator-archived

Bumps [async](https://github.com/caolan/async) from 2.6.2 to 2.6.4.
- [Release notes](https://github.com/caolan/async/releases)
- [Changelog](https://github.com/caolan/async/blob/v2.6.4/CHANGELOG.md)
- [Commits](https://github.com/caolan/async/compare/v2.6.2...v2.6.4)

---
updated-dependencies:
- dependency-name: async
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

* docs: update README.md [skip ci]

* docs: update .all-contributorsrc [skip ci]

* docs: add info related to {orgs} and swagger ui

Signed-off-by: Wing-Kam Wong <wingkwong.code@gmail.com>

* Fix - Migration bugs (#1771)

* fix: handle formula parse error in formula migration

re #1760

Signed-off-by: Pranav C <pranavxc@gmail.com>

* fix: avoid project user insertion if corresponding project or user is missing

re #1760

Signed-off-by: Pranav C <pranavxc@gmail.com>

* fix: skip shared views if view_name/model_name is empty or missing

re #1760

Signed-off-by: Pranav C <pranavxc@gmail.com>

* fix: migration down statement correction

Signed-off-by: Pranav C <pranavxc@gmail.com>

* fix(migration): split alter table statement into multiple statements to support MSSQL

re #1764

Signed-off-by: Pranav C <pranavxc@gmail.com>

* refactor: add null check in upgrader

Signed-off-by: Pranav C <pranavxc@gmail.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Raju Udava <86527202+dstala@users.noreply.github.com>
Co-authored-by: աɨռɢӄաօռɢ <wingkwong.code@gmail.com>
Co-authored-by: navi <oof1lab@gmail.com>
Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
---
 .all-contributorsrc                           |    9 +
 README.md                                     |    1 +
 packages/nc-cli/package-lock.json             |   12 +-
 .../project/functionTab/functionQuery.vue     |    5 +-
 .../project/spreadsheet/public/xcForm.vue     |    5 +-
 .../project/spreadsheet/public/xcTable.vue    |    5 +-
 .../nc-gui/components/project/sqlClient.vue   |    4 +-
 .../components/project/tableTabs/columns.vue  |    4 +-
 packages/nc-gui/helpers/sqlUi/MssqlUi.js      | 1224 ----------
 packages/nc-gui/helpers/sqlUi/MysqlUi.js      | 1262 -----------
 packages/nc-gui/helpers/sqlUi/OracleUi.js     |  746 -------
 packages/nc-gui/helpers/sqlUi/PgUi.js         | 1851 ----------------
 packages/nc-gui/helpers/sqlUi/SqlUiFactory.js |   59 -
 packages/nc-gui/helpers/sqlUi/SqliteUi.js     | 1004 ---------
 packages/nc-gui/helpers/sqlUi/index.js        |    6 -
 packages/nc-gui/lang/zh_CN.json               |   50 +-
 .../nc-migrator-archived/package-lock.json    |   18 +-
 packages/nc-plugin/package-lock.json          |    6 +-
 packages/noco-blog/package-lock.json          |    6 +-
 packages/noco-docs-prev/package-lock.json     |   12 +-
 .../en/developer-resources/rest-apis.md       |    8 +
 packages/noco-docs/package-lock.json          |   12 +-
 packages/noco-i18n/package-lock.json          |    6 +-
 packages/nocodb-sdk/package-lock.json         |    6 +-
 packages/nocodb/package-lock.json             |    6 +-
 packages/nocodb/src/__tests__/restv2.test.ts  |    2 +-
 .../lib/dataMapper/lib/sql/BaseModelSqlv2.ts  |   24 +-
 .../src/lib/dataMapper/lib/sql/conditionV2.ts |   17 +-
 .../sql/formulav2/formulaQueryBuilderv2.ts    |    2 +-
 .../src/lib/dataMapper/lib/sql/sortV2.ts      |    3 +-
 packages/nocodb/src/lib/noco-models/Column.ts |    3 +-
 packages/nocodb/src/lib/noco-models/Filter.ts |    3 +-
 .../nocodb/src/lib/noco-models/GalleryView.ts |    3 +-
 .../nocodb/src/lib/noco-models/HookFilter.ts  |    3 +-
 packages/nocodb/src/lib/noco-models/Model.ts  |   10 +-
 .../src/lib/noco/common/BaseApiBuilder.ts     |    2 +-
 .../nocodb/src/lib/noco/meta/NcMetaMgr.ts     |    2 +-
 .../src/lib/noco/meta/api/columnApis.ts       |    4 +-
 .../src/lib/noco/meta/api/metaDiffApis.ts     |    3 +-
 .../src/lib/noco/meta/api/projectApis.ts      |    3 +-
 .../meta/api/publicApis/publicMetaApis.ts     |    3 +-
 .../noco/meta/handlersv2/ncCreateLookup.ts    |    2 +-
 .../src/lib/noco/migrationsv2/nc_011.ts       |   49 +-
 .../nc_012_alter_column_data_types.ts         |   20 +-
 .../jobs/ncProjectUpgraderV2_0090000.ts       |   66 +-
 .../sqlMgr/code/models/xc/BaseModelXcMeta.ts  |    2 +-
 packages/nocodb/src/lib/sqlUi/MssqlUi.ts      | 1341 -----------
 packages/nocodb/src/lib/sqlUi/MysqlUi.ts      | 1282 -----------
 packages/nocodb/src/lib/sqlUi/OracleUi.ts     |  947 --------
 packages/nocodb/src/lib/sqlUi/PgUi.ts         | 1970 -----------------
 packages/nocodb/src/lib/sqlUi/SqlUiFactory.ts |   70 -
 packages/nocodb/src/lib/sqlUi/SqliteUi.ts     | 1114 ----------
 packages/nocodb/src/lib/sqlUi/UITypes.ts      |   39 -
 packages/nocodb/src/lib/sqlUi/index.ts        |    8 -
 .../lib/templateParser/NcTemplateParser.ts    |    6 +-
 .../regenFiles/package-lock.json              |    6 +-
 56 files changed, 236 insertions(+), 13100 deletions(-)
 delete mode 100644 packages/nc-gui/helpers/sqlUi/MssqlUi.js
 delete mode 100644 packages/nc-gui/helpers/sqlUi/MysqlUi.js
 delete mode 100644 packages/nc-gui/helpers/sqlUi/OracleUi.js
 delete mode 100644 packages/nc-gui/helpers/sqlUi/PgUi.js
 delete mode 100644 packages/nc-gui/helpers/sqlUi/SqlUiFactory.js
 delete mode 100644 packages/nc-gui/helpers/sqlUi/SqliteUi.js
 delete mode 100644 packages/nc-gui/helpers/sqlUi/index.js
 delete mode 100644 packages/nocodb/src/lib/sqlUi/MssqlUi.ts
 delete mode 100644 packages/nocodb/src/lib/sqlUi/MysqlUi.ts
 delete mode 100644 packages/nocodb/src/lib/sqlUi/OracleUi.ts
 delete mode 100644 packages/nocodb/src/lib/sqlUi/PgUi.ts
 delete mode 100644 packages/nocodb/src/lib/sqlUi/SqlUiFactory.ts
 delete mode 100644 packages/nocodb/src/lib/sqlUi/SqliteUi.ts
 delete mode 100644 packages/nocodb/src/lib/sqlUi/UITypes.ts
 delete mode 100644 packages/nocodb/src/lib/sqlUi/index.ts

diff --git a/.all-contributorsrc b/.all-contributorsrc
index d4b7c470a6..afb6d1d813 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -711,6 +711,15 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "zprial",
+      "name": "zprial",
+      "avatar_url": "https://avatars.githubusercontent.com/u/33095380?v=4",
+      "profile": "https://github.com/zprial",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 7,
diff --git a/README.md b/README.md
index fd4af9aa40..52d84a4080 100644
--- a/README.md
+++ b/README.md
@@ -440,6 +440,7 @@ Our mission is to provide the most powerful no-code interface for databases whic
   </tr>
   <tr>
     <td align="center"><a href="https://github.com/RobinFrcd"><img src="https://avatars.githubusercontent.com/u/29704178?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Robin Fourcade</b></sub></a><br /><a href="https://github.com/nocodb/nocodb/commits?author=RobinFrcd" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/zprial"><img src="https://avatars.githubusercontent.com/u/33095380?v=4?s=100" width="100px;" alt=""/><br /><sub><b>zprial</b></sub></a><br /><a href="https://github.com/nocodb/nocodb/commits?author=zprial" title="Code">💻</a></td>
   </tr>
 </table>
 
diff --git a/packages/nc-cli/package-lock.json b/packages/nc-cli/package-lock.json
index 0f17d3e380..7edacb0e6b 100644
--- a/packages/nc-cli/package-lock.json
+++ b/packages/nc-cli/package-lock.json
@@ -1617,9 +1617,9 @@
       }
     },
     "node_modules/async": {
-      "version": "2.6.3",
-      "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
-      "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
+      "version": "2.6.4",
+      "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz",
+      "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==",
       "dependencies": {
         "lodash": "^4.17.14"
       }
@@ -17464,9 +17464,9 @@
       "dev": true
     },
     "async": {
-      "version": "2.6.3",
-      "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
-      "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
+      "version": "2.6.4",
+      "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz",
+      "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==",
       "requires": {
         "lodash": "^4.17.14"
       }
diff --git a/packages/nc-gui/components/project/functionTab/functionQuery.vue b/packages/nc-gui/components/project/functionTab/functionQuery.vue
index de24498e43..3a43b6e286 100644
--- a/packages/nc-gui/components/project/functionTab/functionQuery.vue
+++ b/packages/nc-gui/components/project/functionTab/functionQuery.vue
@@ -73,11 +73,10 @@
 <script>
 import { mapGetters, mapActions } from 'vuex'
 
+import { SqlUiFactory } from 'nocodb-sdk'
 import MonacoEditor from '../../monaco/Monaco'
 import dlgLabelSubmitCancel from '../../utils/dlgLabelSubmitCancel'
 
-import { SqlUI } from '../../../helpers/sqlUi/SqlUiFactory'
-
 export default {
   components: { MonacoEditor, dlgLabelSubmitCancel },
   data() {
@@ -244,7 +243,7 @@ export default {
   },
   watch: {},
   created() {
-    this.sqlUi = SqlUI.create(this.nodes.dbConnection)
+    this.sqlUi = SqlUiFactory.create(this.nodes.dbConnection)
   },
   mounted() {
     this.loadFunction()
diff --git a/packages/nc-gui/components/project/spreadsheet/public/xcForm.vue b/packages/nc-gui/components/project/spreadsheet/public/xcForm.vue
index 73d9929a68..bada0f2b1a 100644
--- a/packages/nc-gui/components/project/spreadsheet/public/xcForm.vue
+++ b/packages/nc-gui/components/project/spreadsheet/public/xcForm.vue
@@ -229,13 +229,12 @@
 
 import { validationMixin } from 'vuelidate'
 import { required, minLength } from 'vuelidate/lib/validators'
-import { ErrorMessages, isVirtualCol, RelationTypes, UITypes } from 'nocodb-sdk'
+import { ErrorMessages, isVirtualCol, RelationTypes, UITypes, SqlUiFactory } from 'nocodb-sdk'
 import form from '../mixins/form'
 import VirtualHeaderCell from '../components/virtualHeaderCell'
 import HeaderCell from '../components/headerCell'
 import VirtualCell from '../components/virtualCell'
 import EditableCell from '../components/editableCell'
-import { SqlUI } from '../../../../helpers/sqlUi'
 
 export default {
   name: 'XcForm',
@@ -273,7 +272,7 @@ export default {
 
     sqlUiLoc() {
       // todo: replace with correct client
-      return this.client && SqlUI.create({ client: this.client })
+      return this.client && SqlUiFactory.create({ client: this.client })
     }
   },
   watch: {
diff --git a/packages/nc-gui/components/project/spreadsheet/public/xcTable.vue b/packages/nc-gui/components/project/spreadsheet/public/xcTable.vue
index 744ed79552..96c6958cdf 100644
--- a/packages/nc-gui/components/project/spreadsheet/public/xcTable.vue
+++ b/packages/nc-gui/components/project/spreadsheet/public/xcTable.vue
@@ -125,14 +125,13 @@
 <script>
 /* eslint-disable camelcase */
 
-import { ErrorMessages } from 'nocodb-sdk'
+import { ErrorMessages, SqlUiFactory } from 'nocodb-sdk'
 import spreadsheet from '../mixins/spreadsheet'
 import ApiFactory from '../apis/apiFactory'
 import FieldsMenu from '../components/fieldsMenu'
 import SortListMenu from '../components/sortListMenu'
 import ColumnFilterMenu from '../components/columnFilterMenu'
 import XcGridView from '../views/xcGridView'
-import { SqlUI } from '@/helpers/sqlUi'
 import CsvExportImport from '~/components/project/spreadsheet/components/moreActions'
 
 export default {
@@ -247,7 +246,7 @@ export default {
     },
     sqlUi() {
       // todo: replace with correct client
-      return SqlUI.create({ client: this.client })
+      return SqlUiFactory.create({ client: this.client })
     },
     queryParams() {
       return {
diff --git a/packages/nc-gui/components/project/sqlClient.vue b/packages/nc-gui/components/project/sqlClient.vue
index 7a569d1a8a..08566c103c 100644
--- a/packages/nc-gui/components/project/sqlClient.vue
+++ b/packages/nc-gui/components/project/sqlClient.vue
@@ -325,11 +325,11 @@ import { VueTreeList, Tree, TreeNode } from 'vue-tree-list'
 import { Splitpanes, Pane } from 'splitpanes'
 import sqlRightClickOptions from '../../helpers/sqlRightClickOptions'
 import dlgLabelSubmitCancel from '../utils/dlgLabelSubmitCancel.vue'
-import { SqlUI } from '../../helpers/sqlUi/SqlUiFactory'
 
 import Utils from '../../helpers/Utils'
 
 import MonacoSqlEditor from '../monaco/MonacoSqlEditor'
+import {SqlUiFactory} from "nocodb-sdk";
 
 export default {
   components: {
@@ -447,7 +447,7 @@ export default {
       console.log('Failed to load previously opened query collections', e)
     }
 
-    this.sqlUi = SqlUI.create(this.nodes.dbConnection)
+    this.sqlUi = SqlUiFactory.create(this.nodes.dbConnection)
     console.log('------------', this.nodes)
     this.editors = this.$store.state.sqlClient.editors.map(editor => ({ ...editor }))
     this.checkClipboardForQuery(this.$store.state.sqlClient.clipboardQuery)
diff --git a/packages/nc-gui/components/project/tableTabs/columns.vue b/packages/nc-gui/components/project/tableTabs/columns.vue
index 182575b037..034699fd2b 100644
--- a/packages/nc-gui/components/project/tableTabs/columns.vue
+++ b/packages/nc-gui/components/project/tableTabs/columns.vue
@@ -709,10 +709,10 @@
 <script>
 import { mapGetters, mapActions } from 'vuex'
 import JSON5 from 'json5'
+import { SqlUiFactory } from 'nocodb-sdk'
 import addRelationDlg from '../dlgs/dlgAddRelation.vue'
 import dlgLabelSubmitCancel from '../../utils/dlgLabelSubmitCancel.vue'
 
-import { SqlUI } from '../../../helpers/sqlUi/SqlUiFactory'
 import jsonToColumn from './columnActions/jsonToColumn'
 import uiTypes from '@/components/project/spreadsheet/helpers/uiTypes'
 
@@ -1271,7 +1271,7 @@ export default {
   },
   watch: {},
   async created() {
-    this.sqlUi = SqlUI.create(this.nodes.dbConnection)
+    this.sqlUi = SqlUiFactory.create(this.nodes.dbConnection)
 
     try {
       this.loading = true
diff --git a/packages/nc-gui/helpers/sqlUi/MssqlUi.js b/packages/nc-gui/helpers/sqlUi/MssqlUi.js
deleted file mode 100644
index f68231635f..0000000000
--- a/packages/nc-gui/helpers/sqlUi/MssqlUi.js
+++ /dev/null
@@ -1,1224 +0,0 @@
-const dbTypes = [
-  'bigint',
-  'binary',
-  'bit',
-  'char',
-  'date',
-  'datetime',
-  'datetime2',
-  'datetimeoffset',
-  'decimal',
-  'float',
-  'geography',
-  'geometry',
-  'heirarchyid',
-  'image',
-  'int',
-  'money',
-  'nchar',
-  'ntext',
-  'numeric',
-  'nvarchar',
-  'real',
-  'json',
-  'smalldatetime',
-  'smallint',
-  'smallmoney',
-  'sql_variant',
-  'sysname',
-  'text',
-  'time',
-  'timestamp',
-  'tinyint',
-  'uniqueidentifier',
-  'varbinary',
-  'xml',
-  'varchar'
-]
-
-export class MssqlUi {
-  static getNewTableColumns() {
-    return [
-      {
-        column_name: 'id',
-        dt: 'int',
-        dtx: 'integer',
-        ct: 'int(11)',
-        nrqd: false,
-        rqd: true,
-        ck: false,
-        pk: true,
-        un: false,
-        ai: true,
-        cdf: null,
-        clen: null,
-        np: null,
-        ns: 0,
-        dtxp: '',
-        dtxs: '',
-        altered: 1,
-        uidt: 'ID',
-        uip: '',
-        uicn: ''
-      },
-      {
-        column_name: 'title',
-        dt: 'varchar',
-        dtx: 'specificType',
-        ct: 'varchar(45)',
-        nrqd: true,
-        rqd: false,
-        ck: false,
-        pk: false,
-        un: false,
-        ai: false,
-        cdf: null,
-        clen: 45,
-        np: null,
-        ns: null,
-        dtxp: '45',
-        dtxs: '',
-        altered: 1,
-        uidt: 'SingleLineText',
-        uip: '',
-        uicn: ''
-      },
-      {
-        column_name: 'created_at',
-        dt: 'datetime',
-        dtx: 'specificType',
-        ct: 'varchar(45)',
-        nrqd: true,
-        rqd: false,
-        ck: false,
-        pk: false,
-        un: false,
-        ai: false,
-        cdf: 'GETDATE()',
-        clen: 45,
-        np: null,
-        ns: null,
-        dtxp: '',
-        dtxs: '',
-        altered: 1,
-        uidt: 'CreateTime',
-        uip: '',
-        uicn: ''
-      },
-      {
-        column_name: 'updated_at',
-        dt: 'datetime',
-        dtx: 'specificType',
-        ct: 'varchar(45)',
-        nrqd: true,
-        rqd: false,
-        ck: false,
-        pk: false,
-        un: false,
-        ai: false,
-        cdf: 'GETDATE()',
-        clen: 45,
-        np: null,
-        ns: null,
-        dtxp: '',
-        dtxs: '',
-        altered: 1,
-        uidt: 'LastModifiedTime',
-        uip: '',
-        uicn: ''
-      }
-    ]
-  }
-
-  static getNewColumn(suffix) {
-    return {
-      cn: 'title' + suffix,
-      dt: 'int',
-      dtx: 'specificType',
-      ct: 'integer(11)',
-      nrqd: true,
-      rqd: false,
-      ck: false,
-      pk: false,
-      un: false,
-      ai: false,
-      cdf: null,
-      clen: 45,
-      np: null,
-      ns: null,
-      // data_type_x_specific: ' ',
-      dtxp: '',
-      dtxs: ' ',
-      altered: 1,
-      uidt: 'Number',
-      uip: '',
-      uicn: ''
-    }
-  }
-
-  static getDefaultLengthForDatatype(type) {
-    switch (type) {
-      case 'bigint':
-        return ''
-
-      case 'binary':
-        return ''
-
-      case 'bit':
-        return ''
-
-      case 'char':
-        return ''
-
-      case 'date':
-        return ''
-
-      case 'datetime':
-        return ''
-
-      case 'datetime2':
-        return ''
-
-      case 'datetimeoffset':
-        return ''
-
-      case 'decimal':
-        return ''
-
-      case 'float':
-        return ''
-
-      case 'geography':
-        return ''
-
-      case 'geometry':
-        return ''
-
-      case 'heirarchyid':
-        return ''
-
-      case 'image':
-        return ''
-
-      case 'int':
-        return ''
-
-      case 'money':
-        return ''
-
-      case 'nchar':
-        return ''
-
-      case 'ntext':
-        return ''
-
-      case 'numeric':
-        return ''
-
-      case 'nvarchar':
-        return ''
-
-      case 'real':
-        return ''
-
-      case 'json':
-        return ''
-
-      case 'smalldatetime':
-        return ''
-
-      case 'smallint':
-        return ''
-
-      case 'smallmoney':
-        return ''
-
-      case 'sql_variant':
-        return ''
-
-      case 'sysname':
-        return ''
-
-      case 'text':
-        return ''
-
-      case 'time':
-        return ''
-
-      case 'timestamp':
-        return ''
-
-      case 'tinyint':
-        return ''
-
-      case 'uniqueidentifier':
-        return ''
-
-      case 'varbinary':
-        return ''
-
-      case 'xml':
-        return ''
-
-      case 'varchar':
-        return ''
-
-      default:
-        return ''
-    }
-  }
-
-  static getDefaultLengthIsDisabled(type) {
-    switch (type) {
-      case 'bigint':
-      case 'binary':
-      case 'bit':
-      case 'char':
-      case 'date':
-      case 'datetime':
-      case 'datetime2':
-      case 'datetimeoffset':
-      case 'decimal':
-      case 'float':
-      case 'geography':
-      case 'geometry':
-      case 'heirarchyid':
-      case 'image':
-      case 'int':
-      case 'money':
-      case 'nchar':
-      case 'ntext':
-      case 'numeric':
-      case 'nvarchar':
-      case 'real':
-      case 'json':
-      case 'smalldatetime':
-      case 'smallint':
-      case 'smallmoney':
-      case 'sql_variant':
-      case 'sysname':
-      case 'text':
-      case 'time':
-      case 'timestamp':
-      case 'tinyint':
-      case 'uniqueidentifier':
-      case 'varbinary':
-      case 'xml':
-        return true
-
-      case 'varchar':
-        return false
-
-      default:
-        return true
-    }
-  }
-
-  static getDefaultValueForDatatype(type) {
-    switch (type) {
-      case 'bigint':
-        return 'eg: '
-
-      case 'binary':
-        return 'eg: '
-
-      case 'bit':
-        return 'eg: '
-
-      case 'char':
-        return 'eg: '
-
-      case 'date':
-        return 'eg: '
-
-      case 'datetime':
-        return 'eg: '
-
-      case 'datetime2':
-        return 'eg: '
-
-      case 'datetimeoffset':
-        return 'eg: '
-
-      case 'decimal':
-        return 'eg: '
-
-      case 'float':
-        return 'eg: '
-
-      case 'geography':
-        return 'eg: '
-
-      case 'geometry':
-        return 'eg: '
-
-      case 'heirarchyid':
-        return 'eg: '
-
-      case 'image':
-        return 'eg: '
-
-      case 'int':
-        return 'eg: '
-
-      case 'money':
-        return 'eg: '
-
-      case 'nchar':
-        return 'eg: '
-
-      case 'ntext':
-        return 'eg: '
-
-      case 'numeric':
-        return 'eg: '
-
-      case 'nvarchar':
-        return 'eg: '
-
-      case 'real':
-        return 'eg: '
-
-      case 'json':
-        return 'eg: '
-
-      case 'smalldatetime':
-        return 'eg: '
-
-      case 'smallint':
-        return 'eg: '
-
-      case 'smallmoney':
-        return 'eg: '
-
-      case 'sql_variant':
-        return 'eg: '
-
-      case 'sysname':
-        return 'eg: '
-
-      case 'text':
-        return 'eg: '
-
-      case 'time':
-        return 'eg: '
-
-      case 'timestamp':
-        return 'eg: '
-
-      case 'tinyint':
-        return 'eg: '
-
-      case 'uniqueidentifier':
-        return 'eg: '
-
-      case 'varbinary':
-        return 'eg: '
-
-      case 'xml':
-        return 'eg: '
-
-      case 'varchar':
-        return 'eg: '
-
-      default:
-        return ''
-    }
-  }
-
-  static getDefaultScaleForDatatype(type) {
-    switch (type) {
-      case 'bigint':
-        return ''
-
-      case 'binary':
-        return ''
-
-      case 'bit':
-        return ''
-
-      case 'char':
-        return ''
-
-      case 'date':
-        return ''
-
-      case 'datetime':
-        return ''
-
-      case 'datetime2':
-        return ''
-
-      case 'datetimeoffset':
-        return ''
-
-      case 'decimal':
-        return ''
-
-      case 'float':
-        return ''
-
-      case 'geography':
-        return ''
-
-      case 'geometry':
-        return ''
-
-      case 'heirarchyid':
-        return ''
-
-      case 'image':
-        return ''
-
-      case 'int':
-        return ''
-
-      case 'money':
-        return ''
-
-      case 'nchar':
-        return ''
-
-      case 'ntext':
-        return ''
-
-      case 'numeric':
-        return ''
-
-      case 'nvarchar':
-        return ''
-
-      case 'real':
-        return ''
-
-      case 'json':
-        return ''
-
-      case 'smalldatetime':
-        return ''
-
-      case 'smallint':
-        return ''
-
-      case 'smallmoney':
-        return ''
-
-      case 'sql_variant':
-        return ''
-
-      case 'sysname':
-        return ''
-
-      case 'text':
-        return ''
-
-      case 'time':
-        return ''
-
-      case 'timestamp':
-        return ''
-
-      case 'tinyint':
-        return ''
-
-      case 'uniqueidentifier':
-        return ''
-
-      case 'varbinary':
-        return ''
-
-      case 'xml':
-        return ''
-
-      case 'varchar':
-        return ''
-
-      default:
-        return ''
-    }
-  }
-
-  static colPropAIDisabled(col, columns) {
-    // console.log(col);
-    if (col.dt === 'int4' ||
-      col.dt === 'integer' ||
-      col.dt === 'bigint' ||
-      col.dt === 'smallint') {
-      for (let i = 0; i < columns.length; ++i) {
-        if (columns[i].column_name !== col.column_name && columns[i].ai) {
-          return true
-        }
-      }
-      return false
-    } else {
-      return true
-    }
-  }
-
-  static colPropUNDisabled(col) {
-    // console.log(col);
-    return true
-    // if (col.dt === 'int' ||
-    //   col.dt === 'tinyint' ||
-    //   col.dt === 'smallint' ||
-    //   col.dt === 'mediumint' ||
-    //   col.dt === 'bigint') {
-    //   return false;
-    // } else {
-    //   return true;
-    // }
-  }
-
-  static onCheckboxChangeAI(col) {
-    if (col.dt === 'int' || col.dt === 'bigint' || col.dt === 'smallint' || col.dt === 'tinyint') {
-      col.altered = col.altered || 2
-    }
-  }
-
-  static showScale(columnObj) {
-    return false
-  }
-
-  static removeUnsigned(columns) {
-    for (let i = 0; i < columns.length; ++i) {
-      if (columns[i].altered === 1 && (!(columns[i].dt === 'int' ||
-        columns[i].dt === 'bigint' ||
-        columns[i].dt === 'tinyint' ||
-        columns[i].dt === 'smallint' ||
-        columns[i].dt === 'mediumint'))) {
-        columns[i].un = false
-        console.log('>> resetting unsigned value', columns[i].column_name)
-      }
-    }
-  }
-
-  static columnEditable(colObj) {
-    return colObj.table_name !== '_evolutions' || colObj.table_name !== 'nc_evolutions'
-  }
-
-  static extractFunctionName(query) {
-    const reg = /^\s*CREATE\s+(?:OR\s+REPLACE\s*)?\s*FUNCTION\s+(?:[\w\d_]+\.)?([\w_\d]+)/i
-    const match = query.match(reg)
-    return match && match[1]
-  }
-
-  static extractProcedureName(query) {
-    const reg = /^\s*CREATE\s+(?:OR\s+REPLACE\s*)?\s*PROCEDURE\s+(?:[\w\d_]+\.)?([\w_\d]+)/i
-    const match = query.match(reg)
-    return match && match[1]
-  }
-
-  static handleRawOutput(result, headers) {
-    if (Array.isArray(result) && result[0]) {
-      const keys = Object.keys(result[0])
-      // set headers before settings result
-      for (let i = 0; i < keys.length; i++) {
-        const text = keys[i]
-        headers.push({ text, value: text, sortable: false })
-      }
-    } else if (result === undefined) {
-      headers.push({ text: 'Message', value: 'message', sortable: false })
-      result = [{ message: 'Success' }]
-    }
-    return result
-  }
-
-  static splitQueries(query) {
-    /***
-     * we are splitting based on semicolon
-     * there are mechanism to escape semicolon within single/double quotes(string)
-     */
-    return query.match(/\b("[^"]*;[^"]*"|'[^']*;[^']*'|[^;])*;/g)
-  }
-
-  /**
-   * if sql statement is SELECT - it limits to a number
-   * @param args
-   * @returns {string|*}
-   */
-  sanitiseQuery(args) {
-    let q = args.query.trim().split(';')
-
-    if (q[0].startsWith('Select')) {
-      q = q[0] + ` LIMIT 0,${args.limit ? args.limit : 100};`
-    } else if (q[0].startsWith('select')) {
-      q = q[0] + ` LIMIT 0,${args.limit ? args.limit : 100};`
-    } else if (q[0].startsWith('SELECT')) {
-      q = q[0] + ` LIMIT 0,${args.limit ? args.limit : 100};`
-    } else {
-      return args.query
-    }
-
-    return q
-  }
-
-  static getColumnsFromJson(json, table_name) {
-    const columns = []
-
-    try {
-      if (typeof json === 'object' && !Array.isArray(json)) {
-        const keys = Object.keys(json)
-        for (let i = 0; i < keys.length; ++i) {
-          const column = {
-            dp: null,
-            table_name,
-            cn: keys[i],
-            cno: keys[i],
-            np: 10,
-            ns: 0,
-            clen: null,
-            cop: 1,
-            pk: false,
-            nrqd: false,
-            rqd: false,
-            un: false,
-            ct: 'int(11) unsigned',
-            ai: false,
-            unique: false,
-            cdf: null,
-            cc: '',
-            csn: null,
-            dtx: 'specificType',
-            dtxp: null,
-            dtxs: 0,
-            altered: 1
-          }
-
-          switch (typeof json[keys[i]]) {
-            case 'number':
-              if (Number.isInteger(json[keys[i]])) {
-                if (MssqlUi.isValidTimestamp(keys[i], json[keys[i]])) {
-                  Object.assign(column, {
-                    dt: 'timestamp'
-                  })
-                } else {
-                  Object.assign(column, {
-                    dt: 'int',
-                    np: 10,
-                    ns: 0
-                  })
-                }
-              } else {
-                Object.assign(column, {
-                  dt: 'float',
-                  np: 10,
-                  ns: 2,
-                  dtxp: '11',
-                  dtxs: 2
-                })
-              }
-              break
-            case 'string':
-              if (MssqlUi.isValidDate(json[keys[i]])) {
-                Object.assign(column, {
-                  dt: 'datetime'
-                })
-              } else if (json[keys[i]].length <= 255) {
-                Object.assign(column, {
-                  dt: 'varchar',
-                  np: 255,
-                  ns: 0,
-                  dtxp: '255'
-                })
-              } else {
-                Object.assign(column, {
-                  dt: 'text'
-                })
-              }
-              break
-            case 'boolean':
-              Object.assign(column, {
-                dt: 'bit',
-                np: null,
-                ns: 0
-              })
-              break
-            case 'object':
-              Object.assign(column, {
-                dt: 'varchar',
-                np: 255,
-                ns: 0,
-                dtxp: '255'
-              })
-              break
-            default:
-              break
-          }
-          columns.push(column)
-        }
-      }
-    } catch (e) {
-      console.log('Error in getColumnsFromJson', e)
-    }
-
-    return columns
-  }
-
-  static isValidTimestamp(key, value) {
-    if (typeof value !== 'number') { return false }
-    return new Date(value).getTime() > 0 && /(?:_|(?=A))[aA]t$/.test(key)
-  }
-
-  static isValidDate(value) {
-    return new Date(value).getTime() > 0
-  }
-
-  static onCheckboxChangeAU(col) {
-    console.log(col)
-    // if (1) {
-    col.altered = col.altered || 2
-    // }
-
-    // if (!col.ai) {
-    //   col.dtx = 'specificType'
-    // } else {
-    //   col.dtx = ''
-    // }
-  }
-
-  static colPropAuDisabled(col) {
-    if (col.altered !== 1) { return true }
-
-    switch (col.dt) {
-      case 'date':
-      case 'datetime':
-      case 'datetime2':
-      case 'datetimeoffset':
-      case 'time':
-      case 'timestamp':
-        return false
-
-      default:
-        return true
-    }
-  }
-
-  static getAbstractType(col) {
-    switch ((col.dt || col.dt).toLowerCase()) {
-      case 'smallint':
-      case 'bit':
-      case 'tinyint':
-      case 'int':
-        return 'integer'
-
-      case 'bigint':
-      case 'binary':
-      case 'char':
-        return 'string'
-
-      case 'date':
-        return 'date'
-      case 'datetime':
-      case 'datetime2':
-      case 'smalldatetime':
-      case 'datetimeoffset':
-        return 'datetime'
-      case 'decimal':
-      case 'float':
-        return 'float'
-
-      case 'geography':
-      case 'geometry':
-      case 'heirarchyid':
-      case 'image':
-        return 'string'
-
-      case 'money':
-      case 'nchar':
-        return 'string'
-
-      case 'ntext':
-        return 'text'
-      case 'numeric':
-        return 'float'
-      case 'nvarchar':
-        return 'string'
-      case 'real':
-        return 'float'
-
-      case 'json':
-        return 'json'
-
-      case 'smallmoney':
-      case 'sql_variant':
-      case 'sysname':
-        return 'string'
-      case 'text':
-        return 'text'
-      case 'time':
-        return 'time'
-      case 'timestamp':
-        return 'timestamp'
-
-      case 'uniqueidentifier':
-      case 'varbinary':
-      case 'xml':
-        return 'string'
-      case 'varchar':
-        return 'string'
-    }
-  }
-
-  static getUIType(col) {
-    switch (this.getAbstractType(col)) {
-      case 'integer':
-        return 'Number'
-      case 'boolean':
-        return 'Checkbox'
-      case 'float':
-        return 'Decimal'
-      case 'date':
-        return 'Date'
-      case 'datetime':
-        return 'CreateTime'
-      case 'time':
-        return 'Time'
-      case 'year':
-        return 'Year'
-      case 'string':
-        return 'SingleLineText'
-      case 'text':
-        return 'LongText'
-      case 'blob':
-        return 'Attachment'
-      case 'enum':
-        return 'SingleSelect'
-      case 'set':
-        return 'MultiSelect'
-      case 'json':
-        return 'LongText'
-    }
-  }
-
-  static getDataTypeForUiType(col) {
-    const colProp = {}
-    switch (col.uidt) {
-      case 'ID':
-        colProp.dt = 'int'
-        colProp.pk = true
-        colProp.un = true
-        colProp.ai = true
-        colProp.rqd = true
-        break
-      case 'ForeignKey':
-        colProp.dt = 'varchar'
-        break
-      case 'SingleLineText':
-        colProp.dt = 'varchar'
-        break
-      case 'LongText':
-        colProp.dt = 'text'
-        break
-      case 'Attachment':
-        colProp.dt = 'text'
-        break
-      case 'Checkbox':
-        colProp.dt = 'tinyint'
-        colProp.dtxp = 1
-        break
-      case 'MultiSelect':
-        colProp.dt = 'text'
-        break
-      case 'SingleSelect':
-        colProp.dt = 'text'
-        break
-      case 'Collaborator':
-        colProp.dt = 'varchar'
-        break
-      case 'Date':
-        colProp.dt = 'varchar'
-
-        break
-      case 'Year':
-        colProp.dt = 'int'
-        break
-      case 'Time':
-        colProp.dt = 'time'
-        break
-      case 'PhoneNumber':
-        colProp.dt = 'varchar'
-        colProp.validate = { func: ['isMobilePhone'], args: [''], msg: ['Validation failed : Invalid Mobile Format'] }
-        break
-      case 'Email':
-        colProp.dt = 'varchar'
-        colProp.validate = { func: ['isEmail'], args: [''], msg: ['Validation failed : Invalid Email Format'] }
-        break
-      case 'URL':
-        colProp.dt = 'varchar'
-        colProp.validate = { func: ['isURL'], args: [''], msg: ['Validation failed : Invalid URL Format'] }
-        break
-      case 'Number':
-        colProp.dt = 'int'
-        break
-      case 'Decimal':
-        colProp.dt = 'decimal'
-        break
-      case 'Currency':
-        colProp.dt = 'decimal'
-        colProp.validate = { func: ['isCurrency'], args: [''], msg: ['Validation failed : Invalid Currency Format'] }
-        break
-      case 'Percent':
-        colProp.dt = 'double'
-        break
-      case 'Duration':
-        colProp.dt = 'int'
-        break
-      case 'Rating':
-        colProp.dt = 'float'
-        break
-      case 'Formula':
-        colProp.dt = 'varchar'
-        break
-      case 'Rollup':
-        colProp.dt = 'varchar'
-        break
-      case 'Count':
-        colProp.dt = 'int'
-        break
-      case 'Lookup':
-        colProp.dt = 'varchar'
-        break
-      case 'DateTime':
-        colProp.dt = 'datetimeoffset'
-        break
-      case 'CreateTime':
-        colProp.dt = 'datetime'
-        break
-      case 'LastModifiedTime':
-        colProp.dt = 'datetime'
-        break
-      case 'AutoNumber':
-        colProp.dt = 'int'
-        break
-      case 'Barcode':
-        colProp.dt = 'varchar'
-        break
-      case 'Button':
-        colProp.dt = 'varchar'
-        break
-      default:
-        colProp.dt = 'varchar'
-        break
-    }
-    return colProp
-  }
-
-  static getDataTypeListForUiType(col) {
-    switch (col.uidt) {
-      case 'ID':
-      case 'ForeignKey':
-        return dbTypes
-
-      case 'SingleLineText':
-      case 'LongText':
-      case 'Attachment':
-      case 'Collaborator':
-        return [
-          'char',
-          'ntext',
-          'text',
-          'varchar',
-          'nvarchar'
-        ]
-
-      case 'JSON' :
-        return ['text', 'ntext']
-
-      case 'Checkbox':
-        return [
-          'bigint',
-          'bit',
-          'int',
-          'tinyint'
-        ]
-
-      case 'MultiSelect':
-        return [
-          'text', 'ntext'
-        ]
-
-      case 'SingleSelect':
-        return [
-          'text',
-          'ntext'
-        ]
-
-      case 'Year':
-        return ['int']
-
-      case 'Time':
-        return ['time']
-
-      case 'PhoneNumber':
-      case 'Email':
-        return [
-          'varchar'
-        ]
-
-      case 'URL':
-        return [
-          'varchar',
-          'text'
-        ]
-
-      case 'Number':
-        return [
-          'int',
-          'bigint',
-          'bit',
-          'decimal',
-          'float',
-          'numeric',
-          'real',
-          'smallint',
-          'tinyint'
-        ]
-
-      case 'Decimal':
-        return [
-
-          'decimal',
-          'float'
-        ]
-
-      case 'Currency':
-        return [
-          'int',
-          'bigint',
-          'bit',
-          'decimal',
-          'float',
-          'numeric',
-          'real',
-          'smallint',
-          'tinyint']
-
-      case 'Percent':
-        return [
-          'int',
-          'bigint',
-          'bit',
-          'decimal',
-          'float',
-          'numeric',
-          'real',
-          'smallint',
-          'tinyint'
-        ]
-
-      case 'Duration':
-        return [
-          'int',
-          'bigint',
-          'bit',
-          'decimal',
-          'float',
-          'numeric',
-          'real',
-          'smallint',
-          'tinyint']
-
-      case 'Rating':
-        return [
-          'int',
-          'bigint',
-          'bit',
-          'decimal',
-          'float',
-          'numeric',
-          'real',
-          'smallint',
-          'tinyint']
-
-      case 'Formula':
-        return [
-          'text',
-          'ntext',
-          'varchar',
-          'nvarchar'
-        ]
-
-      case 'Rollup':
-        return [
-          'varchar'
-        ]
-
-      case 'Count':
-        return [
-          'int',
-          'bigint',
-          'smallint',
-          'tinyint'
-        ]
-
-      case 'Lookup':
-        return [
-          'varchar'
-        ]
-
-      case 'Date':
-        return [
-          'date'
-
-        ]
-
-      case 'DateTime':
-      case 'CreateTime':
-      case 'LastModifiedTime':
-        return [
-          'datetimeoffset',
-          'datetime2'
-          // 'datetime'
-        ]
-
-      case 'AutoNumber':
-        return [
-          'int',
-          'bigint',
-          'smallint',
-          'tinyint'
-        ]
-
-      case 'Barcode':
-        return ['varchar']
-
-      case 'Geometry':
-        return [
-
-          'geometry'
-        ]
-
-      case 'Button':
-      default:
-        return dbTypes
-    }
-  }
-
-  static getUnsupportedFnList() {
-    return []
-  }
-}
-
-// module.exports = PgUiHelp;
-/**
- * @copyright Copyright (c) 2021, Xgene Cloud Ltd
- *
- * @author Naveen MR <oof1lab@gmail.com>
- * @author Pranav C Balan <pranavxc@gmail.com>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
diff --git a/packages/nc-gui/helpers/sqlUi/MysqlUi.js b/packages/nc-gui/helpers/sqlUi/MysqlUi.js
deleted file mode 100644
index a39c8cdd25..0000000000
--- a/packages/nc-gui/helpers/sqlUi/MysqlUi.js
+++ /dev/null
@@ -1,1262 +0,0 @@
-const dbTypes = [
-  'int',
-  'smallint',
-  'mediumint',
-  'bigint',
-  'bit',
-  'boolean',
-  'float',
-  'decimal',
-  'double',
-  'serial',
-  'tinyint',
-  'date',
-  'datetime',
-  'timestamp',
-  'time',
-  'year',
-  'char',
-  'varchar',
-  'nchar',
-  'text',
-  'tinytext',
-  'mediumtext',
-  'longtext',
-  'binary',
-  'varbinary',
-  'blob',
-  'tinyblob',
-  'mediumblob',
-  'longblob',
-  'enum',
-  'set',
-  'geometry',
-  'point',
-  'linestring',
-  'polygon',
-  'multipoint',
-  'multilinestring',
-  'multipolygon',
-  'json'
-]
-
-export class MysqlUi {
-  static getNewTableColumns() {
-    return [
-      {
-        column_name: 'id',
-        dt: 'int',
-        dtx: 'integer',
-        ct: 'int(11)',
-        nrqd: false,
-        rqd: true,
-        ck: false,
-        pk: true,
-        un: true,
-        ai: true,
-        cdf: null,
-        clen: null,
-        np: 11,
-        ns: 0,
-        dtxp: '11',
-        dtxs: '',
-        altered: 1,
-        uidt: 'ID',
-        uip: '',
-        uicn: ''
-      },
-      {
-        column_name: 'title',
-        dt: 'varchar',
-        dtx: 'specificType',
-        ct: 'varchar(45)',
-        nrqd: true,
-        rqd: false,
-        ck: false,
-        pk: false,
-        un: false,
-        ai: false,
-        cdf: null,
-        clen: 45,
-        np: null,
-        ns: null,
-        dtxp: '45',
-        dtxs: '',
-        altered: 1,
-        uidt: 'SingleLineText',
-        uip: '',
-        uicn: ''
-      },
-      {
-        column_name: 'created_at',
-        dt: 'timestamp',
-        dtx: 'specificType',
-        ct: 'varchar(45)',
-        nrqd: true,
-        rqd: false,
-        ck: false,
-        pk: false,
-        un: false,
-        ai: false,
-        cdf: 'CURRENT_TIMESTAMP',
-        clen: 45,
-        np: null,
-        ns: null,
-        dtxp: '',
-        dtxs: '',
-        altered: 1,
-        uidt: 'CreateTime',
-        uip: '',
-        uicn: ''
-      },
-      {
-        column_name: 'updated_at',
-        dt: 'timestamp',
-        dtx: 'specificType',
-        ct: 'varchar(45)',
-        nrqd: true,
-        rqd: false,
-        ck: false,
-        pk: false,
-        un: false,
-        ai: false,
-        cdf: 'CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP',
-        clen: 45,
-        np: null,
-        ns: null,
-        dtxp: '',
-        dtxs: '',
-        altered: 1,
-        uidt: 'LastModifiedTime',
-        uip: '',
-        uicn: ''
-      }
-    ]
-  }
-
-  static getNewColumn(suffix) {
-    return {
-      column_name: 'title' + suffix,
-      dt: 'int',
-      dtx: 'specificType',
-      ct: 'integer(11)',
-      nrqd: true,
-      rqd: false,
-      ck: false,
-      pk: false,
-      un: false,
-      ai: false,
-      cdf: null,
-      clen: 45,
-      np: null,
-      ns: null,
-      // data_type_x_specific: ' ',
-      dtxp: '11',
-      dtxs: ' ',
-      altered: 1,
-      uidt: 'Number',
-      uip: '',
-      uicn: ''
-    }
-  }
-
-  static getDefaultLengthForDatatype(type) {
-    switch (type) {
-      case 'int':
-        return 11
-
-      case 'tinyint':
-        return 1
-
-      case 'smallint':
-        return 5
-
-      case 'mediumint':
-        return 9
-
-      case 'bigint':
-        return 20
-
-      case 'bit':
-        return 64
-
-      case 'boolean':
-        return ''
-
-      case 'float':
-        return 12
-
-      case 'decimal':
-        return 10
-
-      case 'double':
-        return 22
-
-      case 'serial':
-        return 20
-
-      case 'date':
-        return ''
-
-      case 'datetime':
-      case 'timestamp':
-        return 6
-
-      case 'time':
-        return ''
-
-      case 'year':
-        return ''
-
-      case 'char':
-        return 255
-
-      case 'varchar':
-        return 255
-
-      case 'nchar':
-        return 255
-
-      case 'text':
-        return ''
-
-      case 'tinytext':
-        return ''
-
-      case 'mediumtext':
-        return ''
-
-      case 'longtext':
-        return ''
-
-      case 'binary':
-        return 255
-
-      case 'varbinary':
-        return 65500
-
-      case 'blob':
-        return ''
-
-      case 'tinyblob':
-        return ''
-
-      case 'mediumblob':
-        return ''
-
-      case 'longblob':
-        return ''
-
-      case 'enum':
-        return '\'a\',\'b\''
-
-      case 'set':
-        return '\'a\',\'b\''
-
-      case 'geometry':
-        return ''
-      case 'point':
-        return ''
-      case 'linestring':
-        return ''
-      case 'polygon':
-        return ''
-      case 'multipoint':
-        return ''
-      case 'multilinestring':
-        return ''
-      case 'multipolygon':
-        return ''
-      case 'json':
-        return ''
-    }
-  }
-
-  static getDefaultLengthIsDisabled(type) {
-    switch (type) {
-      case 'int':
-      case 'tinyint':
-      case 'smallint':
-      case 'mediumint':
-      case 'bigint':
-      case 'float':
-      case 'decimal':
-      case 'double':
-      case 'serial':
-      case 'datetime':
-      case 'timestamp':
-      case 'char':
-      case 'varchar':
-      case 'nchar':
-      case 'binary':
-      case 'varbinary':
-      case 'enum':
-      case 'set':
-      case 'geometry':
-      case 'point':
-      case 'linestring':
-      case 'polygon':
-      case 'multipoint':
-      case 'multilinestring':
-      case 'multipolygon':
-      case 'json':
-      case 'bit':
-        return false
-
-      case 'boolean':
-      case 'date':
-      case 'time':
-      case 'year':
-      case 'text':
-      case 'tinytext':
-      case 'mediumtext':
-      case 'longtext':
-      case 'blob':
-      case 'tinyblob':
-      case 'mediumblob':
-      case 'longblob':
-        return true
-    }
-  }
-
-  static getDefaultValueForDatatype(type) {
-    switch (type) {
-      case 'int':
-        return 'eg : ' + 10
-
-      case 'tinyint':
-        return 'eg : ' + 1
-
-      case 'smallint':
-        return 'eg : ' + 10
-
-      case 'mediumint':
-        return 'eg : ' + 10
-
-      case 'bigint':
-        return 'eg : ' + 100
-
-      case 'bit':
-        return 'eg : ' + 1
-
-      case 'boolean':
-        return 'eg : ' + 1
-
-      case 'float':
-        return 'eg : ' + 10.0
-
-      case 'decimal':
-        return 'eg : ' + 10.0
-
-      case 'double':
-        return 'eg : ' + 10.0
-
-      case 'serial':
-        return 'eg : ' + 100
-
-      case 'date':
-        return 'eg : ' + '2020-09-09'
-
-      case 'datetime':
-        return 'eg : ' + 'now()\n\nCURRENT_TIMESTAMP\n\nCURRENT_TIMESTAMP on update CURRENT_TIMESTAMP\n\n1992-10-12 00:00:00'
-
-      case 'timestamp':
-        return 'eg : ' + 'now()\n\nCURRENT_TIMESTAMP\n\nCURRENT_TIMESTAMP on update CURRENT_TIMESTAMP\n\n1992-10-12 00:00:00'
-
-      case 'time':
-        return 'eg : ' + '00:00:00'
-
-      case 'year':
-        return 'eg : ' + '2020'
-
-      case 'char':
-        return 'eg : ' + 'a'
-
-      case 'varchar':
-        return 'eg : ' + 'hey'
-
-      case 'nchar':
-        return 'eg : ' + 'hey'
-
-      case 'text':
-        return 'eg : ' + 'hey'
-
-      case 'tinytext':
-        return 'eg : ' + 'hey'
-
-      case 'mediumtext':
-        return 'eg : ' + 'hey'
-
-      case 'longtext':
-        return 'eg : ' + 'hey'
-
-      case 'binary':
-        return 'eg : ' + 1
-
-      case 'varbinary':
-        return 'eg : ' + 'hey'
-
-      case 'blob':
-        return 'eg : ' + 'hey'
-
-      case 'tinyblob':
-        return 'eg : ' + 'hey'
-
-      case 'mediumblob':
-        return 'eg : ' + 'hey'
-
-      case 'longblob':
-        return 'eg : ' + 'hey'
-
-      case 'enum':
-        return 'eg : ' + 'a'
-
-      case 'set':
-        return 'eg : ' + 'a'
-
-      case 'geometry':
-        return 'geometry can\'t have default value'
-
-      case 'point':
-        return 'point can\'t have default value'
-
-      case 'linestring':
-        return 'linestring can\'t have default value'
-
-      case 'polygon':
-        return 'polygon can\'t have default value'
-
-      case 'multipoint':
-        return 'multipoint can\'t have default value'
-
-      case 'multilinestring':
-        return 'multilinestring can\'t have default value'
-
-      case 'multipolygon':
-        return 'multipolygon can\'t have default value'
-
-      case 'json':
-        return 'JSON can\'t have default value'
-    }
-  }
-
-  static getDefaultScaleForDatatype(type) {
-    switch (type) {
-      case 'int':
-        return ' '
-
-      case 'tinyint':
-        return ' '
-
-      case 'smallint':
-        return ' '
-
-      case 'mediumint':
-        return ' '
-
-      case 'bigint':
-        return ' '
-
-      case 'bit':
-        return ' '
-
-      case 'boolean':
-        return ' '
-
-      case 'float':
-        return '2'
-
-      case 'decimal':
-        return '2'
-
-      case 'double':
-        return '2'
-
-      case 'serial':
-        return ' '
-
-      case 'date':
-      case 'datetime':
-      case 'timestamp':
-        return ' '
-
-      case 'time':
-        return ' '
-
-      case 'year':
-        return ' '
-
-      case 'char':
-        return ' '
-
-      case 'varchar':
-        return ' '
-
-      case 'nchar':
-        return ' '
-
-      case 'text':
-        return ' '
-
-      case 'tinytext':
-        return ' '
-
-      case 'mediumtext':
-        return ' '
-
-      case 'longtext':
-        return ' '
-
-      case 'binary':
-        return ' '
-
-      case 'varbinary':
-        return ' '
-
-      case 'blob':
-        return ' '
-
-      case 'tinyblob':
-        return ' '
-
-      case 'mediumblob':
-        return ' '
-
-      case 'longblob':
-        return ' '
-
-      case 'enum':
-        return ' '
-
-      case 'set':
-        return ' '
-
-      case 'geometry':
-        return ' '
-      case 'point':
-        return ' '
-      case 'linestring':
-        return ' '
-      case 'polygon':
-        return ' '
-      case 'multipoint':
-        return ' '
-      case 'multilinestring':
-        return ' '
-      case 'multipolygon':
-        return ' '
-      case 'json':
-        return ' '
-    }
-  }
-
-  static colPropAIDisabled(col, columns) {
-    // console.log(col);
-    if (col.dt === 'int' ||
-      col.dt === 'tinyint' ||
-      col.dt === 'bigint' ||
-      col.dt === 'smallint') {
-      for (let i = 0; i < columns.length; ++i) {
-        if (columns[i].column_name !== col.column_name && columns[i].ai) {
-          return true
-        }
-      }
-      return false
-    } else {
-      return true
-    }
-  }
-
-  static colPropUNDisabled(col) {
-    // console.log(col);
-    if (col.dt === 'int' ||
-      col.dt === 'tinyint' ||
-      col.dt === 'smallint' ||
-      col.dt === 'mediumint' ||
-      col.dt === 'bigint') {
-      return false
-    } else {
-      return true
-    }
-  }
-
-  static onCheckboxChangeAI(col) {
-    console.log(col)
-    if (col.dt === 'int' || col.dt === 'bigint' || col.dt === 'smallint' || col.dt === 'tinyint') {
-      col.altered = col.altered || 2
-    }
-  }
-
-  static onCheckboxChangeAU(col) {
-    console.log(col)
-    col.altered = col.altered || 2
-  }
-
-  static showScale(columnObj) {
-    return (columnObj.dt === 'float' ||
-      columnObj.dt === 'decimal' ||
-      columnObj.dt === 'double' ||
-      columnObj.dt === 'real')
-  }
-
-  static removeUnsigned(columns) {
-    for (let i = 0; i < columns.length; ++i) {
-      if (columns[i].altered === 1 && (!(columns[i].dt === 'int' ||
-        columns[i].dt === 'bigint' ||
-        columns[i].dt === 'tinyint' ||
-        columns[i].dt === 'smallint' ||
-        columns[i].dt === 'mediumint'))) {
-        columns[i].un = false
-        console.log('>> resetting unsigned value', columns[i].column_name)
-      }
-      console.log(columns[i].column_name)
-    }
-  }
-
-  static columnEditable(colObj) {
-    return colObj.table_name !== '_evolutions' || colObj.table_name !== 'nc_evolutions'
-  }
-
-  static extractFunctionName(query) {
-    const reg = /^\s*CREATE\s+.*?(?:OR\s+REPLACE\s*)?\s*FUNCTION\s+(?:`?[\w\d_]+`?\.)?`?([\w_\d]+)`?/i
-    const match = query.match(reg)
-    return match && match[1]
-  }
-
-  static extractProcedureName(query) {
-    const reg = /^\s*CREATE.*?\s+(?:OR\s+REPLACE\s*)?\s*PROCEDURE\s+(?:[\w\d_]+\.)?([\w_\d]+)/i
-    const match = query.match(reg)
-    return match && match[1]
-  }
-
-  static handleRawOutput(result, headers) {
-    result = result[0] ? result[0] : []
-    if (Array.isArray(result) && result[0]) {
-      const keys = Object.keys(result[0])
-      // set headers before settings result
-      for (let i = 0; i < keys.length; i++) {
-        const text = keys[i]
-        headers.push({ text, value: text, sortable: false })
-      }
-    } else {
-      const keys = Object.keys(result)
-      for (let i = 0; i < keys.length; i++) {
-        const text = keys[i]
-        if (typeof text !== 'function') { headers.push({ text, value: text, sortable: false }) }
-      }
-      result = [result]
-    }
-    return result
-  }
-
-  static splitQueries(query) {
-    /***
-     * we are splitting based on semicolon
-     * there are mechanism to escape semicolon within single/double quotes(string)
-     */
-    return query.match(/\b("[^"]*;[^"]*"|'[^']*;[^']*'|[^;])*;/g)
-  }
-
-  /**
-   * if sql statement is SELECT - it limits to a number
-   * @param args
-   * @returns {string|*}
-   */
-  static sanitiseQuery(args) {
-    let q = args.query.trim().split(';')
-
-    if (q[0].startsWith('Select')) {
-      q = q[0] + ` LIMIT 0,${args.limit ? args.limit : 100};`
-    } else if (q[0].startsWith('select')) {
-      q = q[0] + ` LIMIT 0,${args.limit ? args.limit : 100};`
-    } else if (q[0].startsWith('SELECT')) {
-      q = q[0] + ` LIMIT 0,${args.limit ? args.limit : 100};`
-    } else {
-      return args.query
-    }
-
-    return q
-  }
-
-  static getColumnsFromJson(json, tn) {
-    const columns = []
-
-    try {
-      if (typeof json === 'object' && !Array.isArray(json)) {
-        const keys = Object.keys(json)
-        for (let i = 0; i < keys.length; ++i) {
-          const column = {
-            dp: null,
-            tn,
-            cn: keys[i],
-            cno: keys[i],
-            np: 10,
-            ns: 0,
-            clen: null,
-            cop: 1,
-            pk: false,
-            nrqd: false,
-            rqd: false,
-            un: false,
-            ct: 'int(11) unsigned',
-            ai: false,
-            unique: false,
-            cdf: null,
-            cc: '',
-            csn: null,
-            dtx: 'specificType',
-            dtxp: null,
-            dtxs: 0,
-            altered: 1
-          }
-
-          switch (typeof json[keys[i]]) {
-            case 'number':
-              if (Number.isInteger(json[keys[i]])) {
-                if (MysqlUi.isValidTimestamp(keys[i], json[keys[i]])) {
-                  Object.assign(column, {
-                    dt: 'timestamp'
-                  })
-                } else {
-                  Object.assign(column, {
-                    dt: 'int',
-                    np: 10,
-                    ns: 0
-                  })
-                }
-              } else {
-                Object.assign(column, {
-                  dt: 'float',
-                  np: 10,
-                  ns: 2,
-                  dtxp: '11',
-                  dtxs: 2
-                })
-              }
-              break
-            case 'string':
-              if (MysqlUi.isValidDate(json[keys[i]])) {
-                Object.assign(column, {
-                  dt: 'datetime'
-                })
-              } else if (json[keys[i]].length <= 255) {
-                Object.assign(column, {
-                  dt: 'varchar',
-                  np: 255,
-                  ns: 0,
-                  dtxp: '255'
-                })
-              } else {
-                Object.assign(column, {
-                  dt: 'text'
-                })
-              }
-              break
-            case 'boolean':
-              Object.assign(column, {
-                dt: 'boolean',
-                np: 3,
-                ns: 0
-              })
-              break
-            case 'object':
-              Object.assign(column, {
-                dt: 'json',
-                np: 3,
-                ns: 0
-              })
-              break
-            default:
-              break
-          }
-          columns.push(column)
-        }
-      }
-    } catch (e) {
-      console.log('Error in getColumnsFromJson', e)
-    }
-
-    return columns
-  }
-
-  static isValidTimestamp(key, value) {
-    if (typeof value !== 'number') { return false }
-    return new Date(value).getTime() > 0 && /(?:_|(?=A))[aA]t$/.test(key)
-  }
-
-  static isValidDate(value) {
-    return new Date(value).getTime() > 0
-  }
-
-  static colPropAuDisabled(col) {
-    return true
-  }
-
-  static getUIType(col) {
-    switch (this.getAbstractType(col)) {
-      case 'integer':
-        return 'Number'
-      case 'boolean':
-        return 'Checkbox'
-      case 'float':
-        return 'Decimal'
-      case 'date':
-        return 'Date'
-      case 'datetime':
-        return 'DateTime'
-      case 'time':
-        return 'Time'
-      case 'year':
-        return 'Year'
-      case 'string':
-        return 'SingleLineText'
-      case 'text':
-        return 'LongText'
-      case 'blob':
-        return 'Attachment'
-      case 'enum':
-        return 'SingleSelect'
-      case 'set':
-        return 'MultiSelect'
-      case 'json':
-        return 'LongText'
-    }
-  }
-
-  static getAbstractType(col) {
-    switch (col.dt.toLowerCase()) {
-      case 'int':
-      case 'smallint':
-      case 'mediumint':
-      case 'bit':
-        return 'integer'
-
-      case 'boolean':
-        return 'boolean'
-
-      case 'float':
-      case 'decimal':
-      case 'double':
-      case 'serial':
-        return 'float'
-      case 'tinyint':
-        // eslint-disable-next-line eqeqeq
-        if (col.dtxp == '1') {
-          return 'boolean'
-        } else {
-          return 'integer'
-        }
-      case 'date':
-        return 'date'
-      case 'datetime':
-      case 'timestamp':
-        return 'datetime'
-      case 'time':
-        return 'time'
-      case 'year':
-        return 'year'
-      case 'char':
-      case 'varchar':
-      case 'nchar':
-        return 'string'
-      case 'text':
-      case 'tinytext':
-      case 'mediumtext':
-      case 'longtext':
-        return 'text'
-
-      // todo: use proper type
-      case 'binary':
-        return 'string'
-      case 'varbinary':
-        return 'text'
-
-      case 'blob':
-      case 'tinyblob':
-      case 'mediumblob':
-      case 'longblob':
-        return 'blob'
-
-      case 'enum':
-        return 'enum'
-      case 'set':
-        return 'set'
-
-      case 'bigint':
-      case 'geometry':
-      case 'point':
-      case 'linestring':
-      case 'polygon':
-      case 'multipoint':
-      case 'multilinestring':
-      case 'multipolygon':
-        return 'string'
-
-      case 'json':
-        return 'json'
-    }
-  }
-
-  static getDataTypeForUiType(col) {
-    const colProp = {}
-    switch (col.uidt) {
-      case 'ID':
-        colProp.dt = 'int'
-        colProp.pk = true
-        colProp.un = true
-        colProp.ai = true
-        colProp.rqd = true
-        break
-      case 'ForeignKey':
-        colProp.dt = 'varchar'
-        break
-      case 'SingleLineText':
-        colProp.dt = 'varchar'
-        break
-      case 'LongText':
-        colProp.dt = 'text'
-        break
-      case 'Attachment':
-        colProp.dt = 'text'
-        break
-      case 'Checkbox':
-        colProp.dt = 'tinyint'
-        colProp.dtxp = 1
-        break
-      case 'MultiSelect':
-        colProp.dt = 'set'
-        break
-      case 'SingleSelect':
-        colProp.dt = 'enum'
-        break
-      case 'Collaborator':
-        colProp.dt = 'varchar'
-        break
-      case 'Date':
-        colProp.dt = 'varchar'
-
-        break
-      case 'Year':
-        colProp.dt = 'year'
-        break
-      case 'Time':
-        colProp.dt = 'time'
-        break
-      case 'PhoneNumber':
-        colProp.dt = 'varchar'
-        colProp.validate = {
-          func: ['isMobilePhone'],
-          args: [''],
-          msg: ['Validation failed : Invalid Mobile Format ({cn})']
-        }
-        break
-      case 'Email':
-        colProp.dt = 'varchar'
-        colProp.validate = { func: ['isEmail'], args: [''], msg: ['Validation failed : Invalid Email Format ({cn})'] }
-        break
-      case 'URL':
-        colProp.dt = 'varchar'
-        colProp.validate = { func: ['isURL'], args: [''], msg: ['Validation failed : Invalid URL Format ({cn})'] }
-        break
-      case 'Number':
-        colProp.dt = 'int'
-        break
-      case 'Decimal':
-        colProp.dt = 'decimal'
-        break
-      case 'Currency':
-        colProp.dt = 'decimal'
-        colProp.validate = { func: ['isCurrency'], args: [''], msg: ['Validation failed : Invalid Currency Format'] }
-        break
-      case 'Percent':
-        colProp.dt = 'double'
-        break
-      case 'Duration':
-        colProp.dt = 'int'
-        break
-      case 'Rating':
-        colProp.dt = 'float'
-        break
-      case 'Formula':
-        colProp.dt = 'varchar'
-        break
-      case 'Rollup':
-        colProp.dt = 'varchar'
-        break
-      case 'Count':
-        colProp.dt = 'int'
-        break
-      case 'Lookup':
-        colProp.dt = 'varchar'
-        break
-      case 'DateTime':
-        colProp.dt = 'datetime'
-        break
-      case 'CreateTime':
-        colProp.dt = 'datetime'
-        break
-      case 'LastModifiedTime':
-        colProp.dt = 'datetime'
-        break
-      case 'AutoNumber':
-        colProp.dt = 'int'
-        break
-      case 'Barcode':
-        colProp.dt = 'varchar'
-        break
-      case 'Button':
-        colProp.dt = 'varchar'
-        break
-      case 'JSON':
-        colProp.dt = 'json'
-        break
-      default:
-        colProp.dt = 'varchar'
-        break
-    }
-    return colProp
-  }
-
-  static getDataTypeListForUiType(col) {
-    switch (col.uidt) {
-      case 'ID':
-      case 'ForeignKey':
-        return dbTypes
-
-      case 'SingleLineText':
-      case 'LongText':
-      case 'Collaborator':
-        return [
-          'char',
-          'varchar',
-          'nchar',
-          'text',
-          'tinytext',
-          'mediumtext',
-          'longtext'
-        ]
-
-      case 'Attachment':
-        return [
-          'json',
-          'char',
-          'varchar',
-          'nchar',
-          'text',
-          'tinytext',
-          'mediumtext',
-          'longtext'
-        ]
-
-      case 'JSON':
-        return [
-          'json',
-          'text',
-          'tinytext',
-          'mediumtext',
-          'longtext'
-        ]
-
-      case 'Checkbox':
-        return [
-          'int',
-          'smallint',
-          'mediumint',
-          'bigint',
-          'bit',
-          'boolean',
-          'serial',
-          'tinyint'
-        ]
-
-      case 'MultiSelect':
-        return ['set', 'text',
-          'tinytext',
-          'mediumtext',
-          'longtext']
-
-      case 'SingleSelect':
-        return ['enum', 'text',
-          'tinytext',
-          'mediumtext',
-          'longtext']
-
-      case 'Year':
-        return ['year']
-
-      case 'Time':
-        return ['time']
-
-      case 'PhoneNumber':
-      case 'Email':
-        return [
-          'varchar'
-        ]
-
-      case 'URL':
-        return [
-          'text',
-          'tinytext',
-          'mediumtext',
-          'longtext',
-          'varchar'
-        ]
-
-      case 'Number':
-        return [
-          'int',
-          'smallint',
-          'mediumint',
-          'bigint',
-          'bit',
-          'float',
-          'decimal',
-          'double',
-          'serial'
-        ]
-
-      case 'Decimal':
-        return [
-          'float',
-          'decimal',
-          'double',
-          'serial'
-        ]
-
-      case 'Currency':
-        return ['decimal',
-          'float',
-          'double',
-          'serial', 'int',
-          'smallint',
-          'mediumint',
-          'bigint',
-          'bit']
-
-      case 'Percent':
-        return ['decimal',
-          'float',
-          'double',
-          'serial', 'int',
-          'smallint',
-          'mediumint',
-          'bigint',
-          'bit']
-
-      case 'Duration':
-        return ['decimal',
-          'float',
-          'double',
-          'serial', 'int',
-          'smallint',
-          'mediumint',
-          'bigint',
-          'bit']
-
-      case 'Rating':
-        return ['decimal',
-          'float',
-          'double',
-          'serial', 'int',
-          'smallint',
-          'mediumint',
-          'bigint',
-          'bit']
-
-      case 'Formula':
-        return [
-          'char',
-          'varchar',
-          'nchar',
-          'text',
-          'tinytext',
-          'mediumtext',
-          'longtext'
-        ]
-
-      case 'Rollup':
-        return ['varchar']
-
-      case 'Count':
-        return [
-          'int',
-          'smallint',
-          'mediumint',
-          'bigint',
-          'serial']
-
-      case 'Lookup':
-        return ['varchar']
-
-      case 'Date':
-        return [
-          'date',
-          'datetime',
-          'timestamp',
-          'varchar'
-        ]
-
-      case 'DateTime':
-      case 'CreateTime':
-      case 'LastModifiedTime':
-        return [
-          'datetime',
-          'timestamp',
-          'varchar'
-        ]
-
-      case 'AutoNumber':
-        return [
-          'int',
-          'smallint',
-          'mediumint',
-          'bigint']
-
-      case 'Barcode':
-        return ['varchar']
-
-      case 'Geometry':
-        return [
-          'geometry',
-          'point',
-          'linestring',
-          'polygon',
-          'multipoint',
-          'multilinestring',
-          'multipolygon'
-        ]
-
-      case 'Button':
-      default:
-        return dbTypes
-    }
-  }
-
-  static getUnsupportedFnList() {
-    return []
-  }
-}
-
-// module.exports = MysqlUiHelp;
-/**
- * @copyright Copyright (c) 2021, Xgene Cloud Ltd
- *
- * @author Naveen MR <oof1lab@gmail.com>
- * @author Pranav C Balan <pranavxc@gmail.com>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
diff --git a/packages/nc-gui/helpers/sqlUi/OracleUi.js b/packages/nc-gui/helpers/sqlUi/OracleUi.js
deleted file mode 100644
index 26907db192..0000000000
--- a/packages/nc-gui/helpers/sqlUi/OracleUi.js
+++ /dev/null
@@ -1,746 +0,0 @@
-export class OracleUi {
-  static getNewTableColumns() {
-    return [
-      {
-        column_name: 'id',
-        dt: 'integer',
-        dtx: 'integer',
-        ct: 'int(11)',
-        nrqd: false,
-        rqd: true,
-        ck: false,
-        pk: true,
-        un: false,
-        ai: false,
-        cdf: null,
-        clen: null,
-        np: null,
-        ns: null,
-        dtxp: '',
-        dtxs: '',
-        altered: 1,
-        uidt: 'ID',
-        uip: '',
-        uicn: ''
-      },
-      {
-        column_name: 'title',
-        dt: 'varchar',
-        dtx: 'specificType',
-        ct: 'varchar(45)',
-        nrqd: true,
-        rqd: false,
-        ck: false,
-        pk: false,
-        un: false,
-        ai: false,
-        cdf: null,
-        clen: 45,
-        np: null,
-        ns: null,
-        dtxp: '45',
-        dtxs: '',
-        altered: 1,
-        uidt: 'SingleLineText',
-        uip: '',
-        uicn: ''
-      }
-    ]
-  }
-
-  static getNewColumn(suffix) {
-    return {
-      column_name: 'title' + suffix,
-      dt: 'integer',
-      dtx: 'specificType',
-      ct: 'integer(11)',
-      nrqd: true,
-      rqd: false,
-      ck: false,
-      pk: false,
-      un: false,
-      ai: false,
-      cdf: null,
-      clen: 45,
-      np: null,
-      ns: null,
-      // data_type_x_specific: ' ',
-      dtxp: '11',
-      dtxs: ' ',
-      altered: 1,
-      uidt: 'Number',
-      uip: '',
-      uicn: ''
-    }
-  }
-
-
-
-  static getDefaultLengthForDatatype(type) {
-    switch (type) {
-      default:
-        return ''
-    }
-  }
-
-  static getDefaultLengthIsDisabled(type) {
-    switch (type) {
-      case 'integer':
-        return true
-      case 'bfile':
-      case 'binary rowid':
-      case 'binary double':
-      case 'binary_float':
-      case 'blob':
-      case 'canoical':
-      case 'cfile':
-      case 'char':
-      case 'clob':
-      case 'content pointer':
-      case 'contigous array':
-      case 'date':
-      case 'decimal':
-      case 'double precision':
-      case 'float':
-      case 'interval day to second':
-      case 'interval year to month':
-      case 'lob pointer':
-      case 'long':
-      case 'long raw':
-      case 'named collection':
-      case 'named object':
-      case 'nchar':
-      case 'nclob':
-      case 'number':
-      case 'nvarchar2':
-      case 'octet':
-      case 'oid':
-      case 'pointer':
-      case 'raw':
-      case 'real':
-      case 'ref':
-      case 'ref cursor':
-      case 'rowid':
-      case 'signed binary integer':
-      case 'smallint':
-      case 'table':
-      case 'time':
-      case 'time with tz':
-      case 'timestamp':
-      case 'timestamp with local time zone':
-      case 'timestamp with local tz':
-      case 'timestamp with timezone':
-      case 'timestamp with tz':
-      case 'unsigned binary integer':
-      case 'urowid':
-      case 'varchar':
-      case 'varchar2':
-      case 'varray':
-      case 'varying array':
-        return false
-    }
-  }
-
-  static getDefaultValueForDatatype(type) {
-    switch (type) {
-      default:
-        return ''
-    }
-  }
-
-  static getDefaultScaleForDatatype(type) {
-    switch (type) {
-      case 'integer':
-      case 'bfile':
-      case 'binary rowid':
-      case 'binary double':
-      case 'binary_float':
-      case 'blob':
-      case 'canoical':
-      case 'cfile':
-      case 'char':
-      case 'clob':
-      case 'content pointer':
-      case 'contigous array':
-      case 'date':
-      case 'decimal':
-      case 'double precision':
-      case 'float':
-      case 'interval day to second':
-      case 'interval year to month':
-      case 'lob pointer':
-      case 'long':
-      case 'long raw':
-      case 'named collection':
-      case 'named object':
-      case 'nchar':
-      case 'nclob':
-      case 'number':
-      case 'nvarchar2':
-      case 'octet':
-      case 'oid':
-      case 'pointer':
-      case 'raw':
-      case 'real':
-      case 'ref':
-      case 'ref cursor':
-      case 'rowid':
-      case 'signed binary integer':
-      case 'smallint':
-      case 'table':
-      case 'time':
-      case 'time with tz':
-      case 'timestamp':
-      case 'timestamp with local time zone':
-      case 'timestamp with local tz':
-      case 'timestamp with timezone':
-      case 'timestamp with tz':
-      case 'unsigned binary integer':
-      case 'urowid':
-      case 'varchar':
-      case 'varchar2':
-      case 'varray':
-      case 'varying array':
-        return ' '
-    }
-  }
-
-  static colPropAIDisabled(col, columns) {
-    // console.log(col);
-    if (col.dt === 'int4' ||
-      col.dt === 'integer' ||
-      col.dt === 'bigint' ||
-      col.dt === 'smallint') {
-      for (let i = 0; i < columns.length; ++i) {
-        if (columns[i].column_name !== col.column_name && columns[i].ai) {
-          return true
-        }
-      }
-      return false
-    } else {
-      return true
-    }
-  }
-
-  static colPropUNDisabled(col) {
-    return true
-  }
-
-  static onCheckboxChangeAI(col) {
-    console.log(col)
-    if (col.dt === 'int' || col.dt === 'bigint' || col.dt === 'smallint' || col.dt === 'tinyint') {
-      col.altered = col.altered || 2
-    }
-  }
-
-  static showScale(columnObj) {
-    return false
-  }
-
-  static removeUnsigned(columns) {
-    for (let i = 0; i < columns.length; ++i) {
-      if (columns[i].altered === 1 && (!(columns[i].dt === 'int' ||
-        columns[i].dt === 'bigint' ||
-        columns[i].dt === 'tinyint' ||
-        columns[i].dt === 'smallint' ||
-        columns[i].dt === 'mediumint'))) {
-        columns[i].un = false
-        console.log('>> resetting unsigned value', columns[i].column_name)
-      }
-      console.log(columns[i].column_name)
-    }
-  }
-
-  static columnEditable(colObj) {
-    return colObj.table_name !== '_evolutions' || colObj.table_name !== 'nc_evolutions'
-  }
-
-  static extractFunctionName(query) {
-    const reg = /^\s*CREATE\s+(?:OR\s+REPLACE\s*)?\s*FUNCTION\s+(?:[\w\d_]+\.)?([\w_\d]+)/i
-    const match = query.match(reg)
-    return match && match[1]
-  }
-
-  static extractProcedureName(query) {
-    const reg = /^\s*CREATE\s+(?:OR\s+REPLACE\s*)?\s*PROCEDURE\s+(?:[\w\d_]+\.)?([\w_\d]+)/i
-    const match = query.match(reg)
-    return match && match[1]
-  }
-
-  static splitQueries(query) {
-    /***
-     * we are splitting based on semicolon
-     * there are mechanism to escape semicolon within single/double quotes(string)
-     */
-    return query.match(/\b("[^"]*;[^"]*"|'[^']*;[^']*'|[^;])*;/g)
-  }
-
-  static onCheckboxChangeAU(col) {
-    console.log(col)
-    col.altered = col.altered || 2
-  }
-
-  /**
-   * if sql statement is SELECT - it limits to a number
-   * @param args
-   * @returns {string|*}
-   */
-  sanitiseQuery(args) {
-    let q = args.query.trim().split(';')
-
-    if (q[0].startsWith('Select')) {
-      q = q[0] + ` LIMIT 0,${args.limit ? args.limit : 100};`
-    } else if (q[0].startsWith('select')) {
-      q = q[0] + ` LIMIT 0,${args.limit ? args.limit : 100};`
-    } else if (q[0].startsWith('SELECT')) {
-      q = q[0] + ` LIMIT 0,${args.limit ? args.limit : 100};`
-    } else {
-      return args.query
-    }
-
-    return q
-  }
-
-  getColumnsFromJson(json, tn) {
-    const columns = []
-
-    try {
-      if (typeof json === 'object' && !Array.isArray(json)) {
-        const keys = Object.keys(json)
-
-        for (let i = 0; i < keys.length; ++i) {
-          switch (typeof json[keys[i]]) {
-            case 'number':
-              if (Number.isInteger(json[keys[i]])) {
-                columns.push({
-                  dp: null,
-                  tn,
-                  column_name: keys[i],
-                  cno: keys[i],
-                  dt: 'int',
-                  np: 10,
-                  ns: 0,
-                  clen: null,
-                  cop: 1,
-                  pk: false,
-                  nrqd: false,
-                  rqd: false,
-                  un: false,
-                  ct: 'int(11) unsigned',
-                  ai: false,
-                  unique: false,
-                  cdf: null,
-                  cc: '',
-                  csn: null,
-                  dtx: 'specificType',
-                  dtxp: '11',
-                  dtxs: 0,
-                  altered: 1
-                })
-              } else {
-                columns.push({
-                  dp: null,
-                  tn,
-                  column_name: keys[i],
-                  cno: keys[i],
-                  dt: 'float',
-                  np: 10,
-                  ns: 2,
-                  clen: null,
-                  cop: 1,
-                  pk: false,
-                  nrqd: false,
-                  rqd: false,
-                  un: false,
-                  ct: 'int(11) unsigned',
-                  ai: false,
-                  unique: false,
-                  cdf: null,
-                  cc: '',
-                  csn: null,
-                  dtx: 'specificType',
-                  dtxp: '11',
-                  dtxs: 2,
-                  altered: 1
-                })
-              }
-
-              break
-
-            case 'string':
-
-              if (json[keys[i]].length <= 255) {
-                columns.push({
-                  dp: null,
-                  tn,
-                  column_name: keys[i],
-                  cno: keys[i],
-                  dt: 'varchar',
-                  np: 45,
-                  ns: 0,
-                  clen: null,
-                  cop: 1,
-                  pk: false,
-                  nrqd: false,
-                  rqd: false,
-                  un: false,
-                  ct: 'int(11) unsigned',
-                  ai: false,
-                  unique: false,
-                  cdf: null,
-                  cc: '',
-                  csn: null,
-                  dtx: 'specificType',
-                  dtxp: '45',
-                  dtxs: 0,
-                  altered: 1
-                })
-              } else {
-                columns.push({
-                  dp: null,
-                  tn,
-                  column_name: keys[i],
-                  cno: keys[i],
-                  dt: 'text',
-                  np: null,
-                  ns: 0,
-                  clen: null,
-                  cop: 1,
-                  pk: false,
-                  nrqd: false,
-                  rqd: false,
-                  un: false,
-                  ct: 'int(11) unsigned',
-                  ai: false,
-                  unique: false,
-                  cdf: null,
-                  cc: '',
-                  csn: null,
-                  dtx: 'specificType',
-                  dtxp: null,
-                  dtxs: 0,
-                  altered: 1
-                })
-              }
-
-              break
-
-            case 'boolean':
-              columns.push({
-                dp: null,
-                tn,
-                column_name: keys[i],
-                cno: keys[i],
-                dt: 'boolean',
-                np: 3,
-                ns: 0,
-                clen: null,
-                cop: 1,
-                pk: false,
-                nrqd: false,
-                rqd: false,
-                un: false,
-                ct: 'int(11) unsigned',
-                ai: false,
-                unique: false,
-                cdf: null,
-                cc: '',
-                csn: null,
-                dtx: 'specificType',
-                dtxp: '1',
-                dtxs: 0,
-                altered: 1
-              })
-              break
-
-            case 'object':
-              columns.push({
-                dp: null,
-                tn,
-                column_name: keys[i],
-                cno: keys[i],
-                dt: 'json',
-                np: 3,
-                ns: 0,
-                clen: null,
-                cop: 1,
-                pk: false,
-                nrqd: false,
-                rqd: false,
-                un: false,
-                ct: 'int(11) unsigned',
-                ai: false,
-                unique: false,
-                cdf: null,
-                cc: '',
-                csn: null,
-                dtx: 'specificType',
-                dtxp: null,
-                dtxs: 0,
-                altered: 1
-              })
-              break
-
-            default:
-              break
-          }
-        }
-      }
-    } catch (e) {
-      console.log('Error in getColumnsFromJson', e)
-    }
-    return columns
-  }
-
-  static colPropAuDisabled(col) {
-    return true
-  }
-
-  static getAbstractType(col) {
-    switch ((col.dt || col.dt).toLowerCase()) {
-      case 'integer':
-        return 'integer'
-      case 'bfile':
-      case 'binary rowid':
-      case 'binary double':
-      case 'binary_float':
-        return 'string'
-      case 'blob':
-        return 'blob'
-      case 'canoical':
-      case 'cfile':
-      case 'char':
-      case 'clob':
-      case 'content pointer':
-      case 'contigous array':
-        return 'string'
-      case 'date':
-        return 'date'
-      case 'decimal':
-      case 'double precision':
-      case 'float':
-        return 'float'
-      case 'interval day to second':
-      case 'interval year to month':
-        return 'string'
-      case 'lob pointer':
-        return 'string'
-      case 'long':
-        return 'integer'
-      case 'long raw':
-        return 'string'
-      case 'named collection':
-      case 'named object':
-      case 'nchar':
-      case 'nclob':
-        return 'string'
-      case 'nvarchar2':
-      case 'octet':
-      case 'oid':
-      case 'pointer':
-      case 'raw':
-        return 'string'
-      case 'real':
-      case 'number':
-        return 'float'
-      case 'ref':
-      case 'ref cursor':
-      case 'rowid':
-      case 'signed binary integer':
-        return 'string'
-      case 'smallint':
-        return 'integer'
-      case 'table':
-        return 'string'
-      case 'time':
-      case 'time with tz':
-        return 'time'
-      case 'timestamp':
-      case 'timestamp with local time zone':
-      case 'timestamp with local tz':
-      case 'timestamp with timezone':
-      case 'timestamp with tz':
-        return 'datetime'
-      case 'unsigned binary integer':
-      case 'urowid':
-      case 'varchar':
-      case 'varchar2':
-        return 'string'
-      case 'varray':
-      case 'varying array':
-        return 'string'
-    }
-  }
-
-  static getUIType(col) {
-    switch (this.getAbstractType(col)) {
-      case 'integer':
-        return 'Number'
-      case 'boolean':
-        return 'Checkbox'
-      case 'float':
-        return 'Decimal'
-      case 'date':
-        return 'Date'
-      case 'datetime':
-        return 'CreateTime'
-      case 'time':
-        return 'Time'
-      case 'year':
-        return 'Year'
-      case 'string':
-        return 'SingleLineText'
-      case 'text':
-        return 'LongText'
-      case 'blob':
-        return 'Attachment'
-      case 'enum':
-        return 'SingleSelect'
-      case 'set':
-        return 'MultiSelect'
-      case 'json':
-        return 'LongText'
-    }
-  }
-
-  static getDataTypeForUiType(col) {
-    const colProp = {}
-    switch (col.uidt) {
-      case 'ID':
-        colProp.dt = 'integer'
-        colProp.pk = true
-        colProp.un = true
-        colProp.ai = true
-        colProp.rqd = true
-        break
-      case 'ForeignKey':
-        colProp.dt = 'varchar'
-        break
-      case 'SingleLineText':
-        colProp.dt = 'varchar'
-        break
-      case 'LongText':
-        colProp.dt = 'clob'
-        break
-      case 'Attachment':
-        colProp.dt = 'clob'
-        break
-      case 'Checkbox':
-        colProp.dt = 'tinyint'
-        colProp.dtxp = 1
-        break
-      case 'MultiSelect':
-        colProp.dt = 'varchar2'
-        break
-      case 'SingleSelect':
-        colProp.dt = 'varchar2'
-        break
-      case 'Collaborator':
-        colProp.dt = 'varchar'
-        break
-      case 'Date':
-        colProp.dt = 'varchar'
-
-        break
-      case 'Year':
-        colProp.dt = 'year'
-        break
-      case 'Time':
-        colProp.dt = 'time'
-        break
-      case 'PhoneNumber':
-        colProp.dt = 'varchar'
-        colProp.validate = { func: ['isMobilePhone'], args: [''], msg: ['Validation failed : Invalid Mobile Format'] }
-        break
-      case 'Email':
-        colProp.dt = 'varchar'
-        colProp.validate = { func: ['isEmail'], args: [''], msg: ['Validation failed : Invalid Email Format'] }
-        break
-      case 'URL':
-        colProp.dt = 'varchar'
-        colProp.validate = { func: ['isURL'], args: [''], msg: ['Validation failed : Invalid URL Format'] }
-        break
-      case 'Number':
-        colProp.dt = 'integer'
-        break
-      case 'Decimal':
-        colProp.dt = 'decimal'
-        break
-      case 'Currency':
-        colProp.dt = 'decimal'
-        colProp.validate = { func: ['isCurrency'], args: [''], msg: ['Validation failed : Invalid Currency Format'] }
-        break
-      case 'Percent':
-        colProp.dt = 'double'
-        break
-      case 'Duration':
-        colProp.dt = 'integer'
-        break
-      case 'Rating':
-        colProp.dt = 'float'
-        break
-      case 'Formula':
-        colProp.dt = 'varchar'
-        break
-      case 'Rollup':
-        colProp.dt = 'varchar'
-        break
-      case 'Count':
-        colProp.dt = 'integer'
-        break
-      case 'Lookup':
-        colProp.dt = 'varchar'
-        break
-      case 'DateTime':
-        colProp.dt = 'timestamp'
-        break
-      case 'CreateTime':
-        colProp.dt = 'timestamp'
-        break
-      case 'LastModifiedTime':
-        colProp.dt = 'timestamp'
-        break
-      case 'AutoNumber':
-        colProp.dt = 'integer'
-        break
-      case 'Barcode':
-        colProp.dt = 'varchar'
-        break
-      case 'Button':
-        colProp.dt = 'varchar'
-        break
-      default:
-        colProp.dt = 'varchar'
-        break
-    }
-    return colProp
-  }
-
-  static getUnsupportedFnList() {
-    return []
-  }
-}
-
-// module.exports = PgUiHelp;
-/**
- * @copyright Copyright (c) 2021, Xgene Cloud Ltd
- *
- * @author Naveen MR <oof1lab@gmail.com>
- * @author Pranav C Balan <pranavxc@gmail.com>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
diff --git a/packages/nc-gui/helpers/sqlUi/PgUi.js b/packages/nc-gui/helpers/sqlUi/PgUi.js
deleted file mode 100644
index a9f5a7d84c..0000000000
--- a/packages/nc-gui/helpers/sqlUi/PgUi.js
+++ /dev/null
@@ -1,1851 +0,0 @@
-const dbTypes = [
-  'int',
-  'integer',
-  'bigint',
-  'bigserial',
-  'char',
-  'int2',
-  'int4',
-  'int8',
-  'int4range',
-  'int8range',
-  'serial',
-  'serial2',
-  'serial8',
-  'character',
-  'bit',
-  'bool',
-  'boolean',
-  'date',
-  'double precision',
-  'event_trigger',
-  'fdw_handler',
-  'float4',
-  'float8',
-  'uuid',
-  'smallint',
-  'smallserial',
-  'character varying',
-  'text',
-  'real',
-  'time',
-  'time without time zone',
-  'timestamp',
-  'timestamp without time zone',
-  'timestamptz',
-  'timestamp with time zone',
-  'timetz',
-  'time with time zone',
-  'daterange',
-  'json',
-  'jsonb',
-  'gtsvector',
-  'index_am_handler',
-  'anyenum',
-  'anynonarray',
-  'anyrange',
-  'box',
-  'bpchar',
-  'bytea',
-  'cid',
-  'cidr',
-  'circle',
-  'cstring',
-  'inet',
-  'internal',
-  'interval',
-  'language_handler',
-  'line',
-  'lsec',
-  'macaddr',
-  'money',
-  'name',
-  'numeric',
-  'numrange',
-  'oid',
-  'opaque',
-  'path',
-  'pg_ddl_command',
-  'pg_lsn',
-  'pg_node_tree',
-  'point',
-  'polygon',
-  'record',
-  'refcursor',
-  'regclass',
-  'regconfig',
-  'regdictionary',
-  'regnamespace',
-  'regoper',
-  'regoperator',
-  'regproc',
-  'regpreocedure',
-  'regrole',
-  'regtype',
-  'reltime',
-  'smgr',
-  'tid',
-  'tinterval',
-  'trigger',
-  'tsm_handler',
-  'tsquery',
-  'tsrange',
-  'tstzrange',
-  'tsvector',
-  'txid_snapshot',
-  'unknown',
-  'void',
-  'xid',
-  'xml']
-
-export class PgUi {
-  static getNewTableColumns() {
-    return [
-      {
-        cn: 'id',
-        dt: 'int4',
-        dtx: 'integer',
-        ct: 'int(11)',
-        nrqd: false,
-        rqd: true,
-        ck: false,
-        pk: true,
-        un: false,
-        ai: true,
-        cdf: null,
-        clen: null,
-        np: 11,
-        ns: 0,
-        dtxp: '11',
-        dtxs: '',
-        altered: 1,
-        uidt: 'ID',
-        uip: '',
-        uicn: ''
-      },
-      {
-        cn: 'title',
-        dt: 'character varying',
-        dtx: 'specificType',
-        ct: 'varchar(45)',
-        nrqd: true,
-        rqd: false,
-        ck: false,
-        pk: false,
-        un: false,
-        ai: false,
-        cdf: null,
-        clen: 45,
-        np: null,
-        ns: null,
-        dtxp: '45',
-        dtxs: '',
-        altered: 1,
-        uidt: 'SingleLineText',
-        uip: '',
-        uicn: ''
-      },
-      {
-        cn: 'created_at',
-        dt: 'timestamp',
-        dtx: 'specificType',
-        ct: 'varchar(45)',
-        nrqd: true,
-        rqd: false,
-        ck: false,
-        pk: false,
-        un: false,
-        ai: false,
-        cdf: 'now()',
-        clen: 45,
-        np: null,
-        ns: null,
-        dtxp: '',
-        dtxs: '',
-        altered: 1,
-        uidt: 'CreateTime',
-        uip: '',
-        uicn: ''
-      },
-      {
-        cn: 'updated_at',
-        dt: 'timestamp',
-        dtx: 'specificType',
-        ct: 'varchar(45)',
-        nrqd: true,
-        rqd: false,
-        ck: false,
-        pk: false,
-        un: false,
-        ai: false,
-        au: true,
-        cdf: 'now()',
-        clen: 45,
-        np: null,
-        ns: null,
-        dtxp: '',
-        dtxs: '',
-        altered: 1,
-        uidt: 'LastModifiedTime',
-        uip: '',
-        uicn: ''
-      }
-    ]
-  }
-
-  static getNewColumn(suffix) {
-    return {
-      cn: 'title' + suffix,
-      dt: 'int4',
-      dtx: 'specificType',
-      ct: 'integer(11)',
-      nrqd: true,
-      rqd: false,
-      ck: false,
-      pk: false,
-      un: false,
-      ai: false,
-      cdf: null,
-      clen: 45,
-      np: null,
-      ns: null,
-      // data_type_x_specific: ' ',
-      dtxp: '11',
-      dtxs: ' ',
-      altered: 1,
-      uidt: 'Number',
-      uip: '',
-      uicn: ''
-    }
-  }
-
-
-  static getDefaultLengthForDatatype(type) {
-    switch (type) {
-      case 'int':
-        return ''
-
-      case 'tinyint':
-        return ''
-
-      case 'smallint':
-        return ''
-
-      case 'mediumint':
-        return ''
-
-      case 'bigint':
-        return ''
-
-      case 'bit':
-        return ''
-
-      case 'boolean':
-        return ''
-
-      case 'float':
-        return ''
-
-      case 'decimal':
-        return ''
-
-      case 'double':
-        return ''
-
-      case 'serial':
-        return ''
-
-      case 'date':
-        return ''
-
-      case 'datetime':
-      case 'timestamp':
-        return ''
-
-      case 'time':
-        return ''
-
-      case 'year':
-        return ''
-
-      case 'char':
-        return ''
-
-      case 'varchar':
-        return ''
-
-      case 'nchar':
-        return ''
-
-      case 'text':
-        return ''
-
-      case 'tinytext':
-        return ''
-
-      case 'mediumtext':
-        return ''
-
-      case 'longtext':
-        return ''
-
-      case 'binary':
-        return ''
-
-      case 'varbinary':
-        return ''
-
-      case 'blob':
-        return ''
-
-      case 'tinyblob':
-        return ''
-
-      case 'mediumblob':
-        return ''
-
-      case 'longblob':
-        return ''
-
-      case 'enum':
-        return ''
-
-      case 'set':
-        return ''
-
-      case 'geometry':
-        return ''
-      case 'point':
-        return ''
-      case 'linestring':
-        return ''
-      case 'polygon':
-        return ''
-      case 'multipoint':
-        return ''
-      case 'multilinestring':
-        return ''
-      case 'multipolygon':
-        return ''
-      case 'json':
-        return ''
-    }
-  }
-
-  static getDefaultLengthIsDisabled(type) {
-    switch (type) {
-      case 'anyenum':
-      case 'anynonarray':
-      case 'anyrange':
-      case 'bigint':
-      case 'bigserial':
-      case 'bit':
-      case 'bool':
-      case 'box':
-      case 'bpchar':
-      case 'bytea':
-      case 'char':
-      case 'character':
-      case 'cid':
-      case 'cidr':
-      case 'circle':
-      case 'cstring':
-      case 'date':
-      case 'daterange':
-      case 'double precision':
-      case 'event_trigger':
-      case 'fdw_handler':
-      case 'float4':
-      case 'float8':
-      case 'gtsvector':
-      case 'index_am_handler':
-      case 'inet':
-      case 'int':
-      case 'int2':
-      case 'int4':
-      case 'int8':
-      case 'int4range':
-      case 'int8range':
-      case 'integer':
-      case 'internal':
-      case 'interval':
-      case 'jsonb':
-      case 'language_handler':
-      case 'line':
-      case 'lsec':
-      case 'macaddr':
-      case 'money':
-      case 'name':
-      case 'numeric':
-      case 'numrange':
-      case 'oid':
-      case 'opaque':
-      case 'path':
-      case 'pg_ddl_command':
-      case 'pg_lsn':
-      case 'pg_node_tree':
-      case 'real':
-      case 'record':
-      case 'refcursor':
-      case 'regclass':
-      case 'regconfig':
-      case 'regdictionary':
-      case 'regnamespace':
-      case 'regoper':
-      case 'regoperator':
-      case 'regproc':
-      case 'regpreocedure':
-      case 'regrole':
-      case 'regtype':
-      case 'reltime':
-      case 'serial':
-      case 'serial2':
-      case 'serial8':
-      case 'smallint':
-      case 'smallserial':
-      case 'smgr':
-      case 'text':
-      case 'tid':
-      case 'time':
-      case 'time without time zone':
-      case 'timestamp':
-      case 'timestamp without time zone':
-      case 'timestamptz':
-      case 'timestamp with time zone':
-      case 'timetz':
-      case 'time with time zone':
-      case 'tinterval':
-      case 'trigger':
-      case 'tsm_handler':
-      case 'tsquery':
-      case 'tsrange':
-      case 'tstzrange':
-      case 'tsvector':
-      case 'txid_snapshot':
-      case 'unknown':
-      case 'void':
-      case 'xid':
-      case 'xml':
-      case 'character varying':
-      case 'tinyint':
-      case 'mediumint':
-      case 'float':
-      case 'decimal':
-      case 'double':
-      case 'boolean':
-      case 'datetime':
-      case 'uuid':
-      case 'year':
-      case 'varchar':
-      case 'nchar':
-      case 'tinytext':
-      case 'mediumtext':
-      case 'longtext':
-      case 'binary':
-      case 'varbinary':
-      case 'blob':
-      case 'tinyblob':
-      case 'mediumblob':
-      case 'longblob':
-      case 'enum':
-      case 'set':
-      case 'geometry':
-      case 'point':
-      case 'linestring':
-      case 'polygon':
-      case 'multipoint':
-      case 'multilinestring':
-      case 'multipolygon':
-      case 'json':
-        return true
-    }
-  }
-
-  static getDefaultValueForDatatype(type) {
-    switch (type) {
-      case 'anyenum':
-        return 'eg: '
-
-      case 'anynonarray':
-        return 'eg: '
-
-      case 'anyrange':
-        return 'eg: '
-
-      case 'bigint':
-        return 'eg: '
-
-      case 'bigserial':
-        return 'eg: '
-
-      case 'bit':
-        return 'eg: '
-
-      case 'bool':
-        return 'eg: '
-
-      case 'box':
-        return 'eg: '
-
-      case 'bpchar':
-        return 'eg: '
-
-      case 'bytea':
-        return 'eg: '
-
-      case 'char':
-        return "eg: 'T'"
-
-      case 'character':
-        return "eg: 'sample'"
-
-      case 'cid':
-        return 'eg: '
-
-      case 'cidr':
-        return 'eg: '
-
-      case 'circle':
-        return 'eg: '
-
-      case 'cstring':
-        return 'eg: '
-
-      case 'date':
-        return "eg: '2020-09-09'"
-
-      case 'daterange':
-        return 'eg: '
-
-      case 'double precision':
-        return 'eg: 1.2'
-
-      case 'event_trigger':
-        return 'eg: '
-
-      case 'fdw_handler':
-        return 'eg: '
-
-      case 'float4':
-        return 'eg: 1.2'
-
-      case 'float8':
-        return 'eg: 1.2'
-
-      case 'gtsvector':
-        return 'eg: '
-
-      case 'index_am_handler':
-        return 'eg: '
-
-      case 'inet':
-        return 'eg: '
-
-      case 'int':
-        return 'eg: '
-
-      case 'int2':
-        return 'eg: '
-
-      case 'int4':
-        return 'eg: '
-
-      case 'int8':
-        return 'eg: '
-
-      case 'int4range':
-        return 'eg: '
-
-      case 'int8range':
-        return 'eg: '
-
-      case 'integer':
-        return 'eg: '
-
-      case 'internal':
-        return 'eg: '
-
-      case 'interval':
-        return 'eg: '
-
-      case 'json':
-        return 'eg: '
-
-      case 'jsonb':
-        return 'eg: '
-
-      case 'language_handler':
-        return 'eg: '
-
-      case 'line':
-        return 'eg: '
-
-      case 'lsec':
-        return 'eg: '
-
-      case 'macaddr':
-        return 'eg: '
-
-      case 'money':
-        return 'eg: '
-
-      case 'name':
-        return 'eg: '
-
-      case 'numeric':
-        return 'eg: '
-
-      case 'numrange':
-        return 'eg: '
-
-      case 'oid':
-        return 'eg: '
-
-      case 'opaque':
-        return 'eg: '
-
-      case 'path':
-        return 'eg: '
-
-      case 'pg_ddl_command':
-        return 'eg: '
-
-      case 'pg_lsn':
-        return 'eg: '
-
-      case 'pg_node_tree':
-        return 'eg: '
-
-      case 'point':
-        return 'eg: '
-
-      case 'polygon':
-        return 'eg: '
-
-      case 'real':
-        return 'eg: 1.2'
-
-      case 'record':
-        return 'eg: '
-
-      case 'refcursor':
-        return 'eg: '
-
-      case 'regclass':
-        return 'eg: '
-
-      case 'regconfig':
-        return 'eg: '
-
-      case 'regdictionary':
-        return 'eg: '
-
-      case 'regnamespace':
-        return 'eg: '
-
-      case 'regoper':
-        return 'eg: '
-
-      case 'regoperator':
-        return 'eg: '
-
-      case 'regproc':
-        return 'eg: '
-
-      case 'regpreocedure':
-        return 'eg: '
-
-      case 'regrole':
-        return 'eg: '
-
-      case 'regtype':
-        return 'eg: '
-
-      case 'reltime':
-        return 'eg: '
-
-      case 'serial':
-        return 'eg: '
-
-      case 'serial2':
-        return 'eg: '
-
-      case 'serial8':
-        return 'eg: '
-
-      case 'smallint':
-        return 'eg: '
-
-      case 'smallserial':
-        return 'eg: '
-
-      case 'smgr':
-        return 'eg: '
-
-      case 'text':
-        return "eg: 'sample text'"
-
-      case 'tid':
-        return 'eg: '
-
-      case 'time':
-        return "eg: now()\n\n'04:05:06.789'"
-
-      case 'time without time zone':
-        return "eg: now()\n\n'04:05:06.789'"
-
-      case 'timestamp':
-        return "eg: now()\n\n'2016-06-22 19:10:25-07'"
-
-      case 'timestamp without time zone':
-        return "eg: now()\n\n'2016-06-22 19:10:25-07'"
-
-      case 'timestamptz':
-        return "eg: timezone('America/New_York','2016-06-01 00:00')\n\nnow()\n\n'2016-06-22 19:10:25-07'"
-
-      case 'timestamp with time zone':
-        return "eg: now()\n\n'2016-06-22 19:10:25-07'"
-
-      case 'timetz':
-        return 'eg: now()'
-
-      case 'time with time zone':
-        return 'eg: now()'
-
-      case 'tinterval':
-        return 'eg: '
-
-      case 'trigger':
-        return 'eg: '
-
-      case 'tsm_handler':
-        return 'eg: '
-
-      case 'tsquery':
-        return 'eg: '
-
-      case 'tsrange':
-        return 'eg: '
-
-      case 'tstzrange':
-        return 'eg: '
-
-      case 'tsvector':
-        return 'eg: '
-
-      case 'txid_snapshot':
-        return 'eg: '
-
-      case 'unknown':
-        return 'eg: '
-
-      case 'void':
-        return 'eg: '
-
-      case 'xid':
-        return 'eg: '
-
-      case 'xml':
-        return 'eg: '
-
-      case 'character varying':
-        return "eg: 'sample text'"
-
-      case 'tinyint':
-        return 'eg: '
-
-      case 'mediumint':
-        return 'eg: '
-
-      case 'float':
-        return 'eg: '
-
-      case 'decimal':
-        return 'eg: '
-
-      case 'double':
-        return 'eg: 1.2'
-
-      case 'boolean':
-        return 'eg: true\n\nfalse'
-
-      case 'datetime':
-        return 'eg: '
-
-      case 'uuid':
-        return 'eg: '
-
-      case 'year':
-        return 'eg: '
-
-      case 'varchar':
-        return 'eg: '
-
-      case 'nchar':
-        return 'eg: '
-
-      case 'tinytext':
-        return 'eg: '
-
-      case 'mediumtext':
-        return 'eg: '
-
-      case 'longtext':
-        return 'eg: '
-
-      case 'binary':
-        return 'eg: '
-
-      case 'varbinary':
-        return 'eg: '
-
-      case 'blob':
-        return 'eg: '
-
-      case 'tinyblob':
-        return 'eg: '
-
-      case 'mediumblob':
-        return 'eg: '
-
-      case 'longblob':
-        return 'eg: '
-
-      case 'enum':
-        return 'eg: '
-
-      case 'set':
-        return 'eg: '
-
-      case 'geometry':
-        return 'eg: '
-
-      case 'linestring':
-        return 'eg: '
-
-      case 'multipoint':
-        return 'eg: '
-
-      case 'multilinestring':
-        return 'eg: '
-
-      case 'multipolygon':
-        return 'eg: '
-    }
-  }
-
-  static getDefaultScaleForDatatype(type) {
-    switch (type) {
-      case 'int':
-        return ' '
-
-      case 'tinyint':
-        return ' '
-
-      case 'smallint':
-        return ' '
-
-      case 'mediumint':
-        return ' '
-
-      case 'bigint':
-        return ' '
-
-      case 'bit':
-        return ' '
-
-      case 'boolean':
-        return ' '
-
-      case 'float':
-        return '2'
-
-      case 'decimal':
-        return '2'
-
-      case 'double':
-        return '2'
-
-      case 'serial':
-        return ' '
-
-      case 'date':
-      case 'datetime':
-      case 'timestamp':
-        return ' '
-
-      case 'time':
-        return ' '
-
-      case 'year':
-        return ' '
-
-      case 'char':
-        return ' '
-
-      case 'varchar':
-        return ' '
-
-      case 'nchar':
-        return ' '
-
-      case 'text':
-        return ' '
-
-      case 'tinytext':
-        return ' '
-
-      case 'mediumtext':
-        return ' '
-
-      case 'longtext':
-        return ' '
-
-      case 'binary':
-        return ' '
-
-      case 'varbinary':
-        return ' '
-
-      case 'blob':
-        return ' '
-
-      case 'tinyblob':
-        return ' '
-
-      case 'mediumblob':
-        return ' '
-
-      case 'longblob':
-        return ' '
-
-      case 'enum':
-        return ' '
-
-      case 'set':
-        return ' '
-
-      case 'geometry':
-        return ' '
-      case 'point':
-        return ' '
-      case 'linestring':
-        return ' '
-      case 'polygon':
-        return ' '
-      case 'multipoint':
-        return ' '
-      case 'multilinestring':
-        return ' '
-      case 'multipolygon':
-        return ' '
-      case 'json':
-        return ' '
-    }
-  }
-
-  static colPropAIDisabled(col, columns) {
-    // console.log(col);
-    if (col.dt === 'int4' ||
-      col.dt === 'integer' ||
-      col.dt === 'bigint' ||
-      col.dt === 'smallint') {
-      for (let i = 0; i < columns.length; ++i) {
-        if (columns[i].column_name !== col.column_name && columns[i].ai) {
-          return true
-        }
-      }
-      return false
-    } else {
-      return true
-    }
-  }
-
-  static colPropUNDisabled(col) {
-    // console.log(col);
-    return true
-    // if (col.dt === 'int' ||
-    //   col.dt === 'tinyint' ||
-    //   col.dt === 'smallint' ||
-    //   col.dt === 'mediumint' ||
-    //   col.dt === 'bigint') {
-    //   return false;
-    // } else {
-    //   return true;
-    // }
-  }
-
-  static onCheckboxChangeAI(col) {
-    console.log(col)
-    if (col.dt === 'int' || col.dt === 'bigint' || col.dt === 'smallint' || col.dt === 'tinyint') {
-      col.altered = col.altered || 2
-    }
-
-    // if (!col.ai) {
-    //   col.dtx = 'specificType'
-    // } else {
-    //   col.dtx = ''
-    // }
-  }
-
-  static onCheckboxChangeAU(col) {
-    console.log(col)
-    // if (1) {
-    col.altered = col.altered || 2
-    // }
-    if (col.au) {
-      col.cdf = 'now()'
-    }
-
-    // if (!col.ai) {
-    //   col.dtx = 'specificType'
-    // } else {
-    //   col.dtx = ''
-    // }
-  }
-
-  static showScale(columnObj) {
-    return false
-  }
-
-  static removeUnsigned(columns) {
-    for (let i = 0; i < columns.length; ++i) {
-      if (columns[i].altered === 1 && (!(columns[i].dt === 'int' ||
-        columns[i].dt === 'bigint' ||
-        columns[i].dt === 'tinyint' ||
-        columns[i].dt === 'smallint' ||
-        columns[i].dt === 'mediumint'))) {
-        columns[i].un = false
-        console.log('>> resetting unsigned value', columns[i].column_name)
-      }
-    }
-  }
-
-  static columnEditable(colObj) {
-    return colObj.table_name !== '_evolutions' || colObj.table_name !== 'nc_evolutions'
-  }
-
-  static extractFunctionName(query) {
-    const reg = /^\s*CREATE\s+(?:OR\s+REPLACE\s*)?\s*FUNCTION\s+(?:[\w\d_]+\.)?([\w_\d]+)/i
-    const match = query.match(reg)
-    return match && match[1]
-  }
-
-  static extractProcedureName(query) {
-    const reg = /^\s*CREATE\s+(?:OR\s+REPLACE\s*)?\s*PROCEDURE\s+(?:[\w\d_]+\.)?([\w_\d]+)/i
-    const match = query.match(reg)
-    return match && match[1]
-  }
-
-  static handleRawOutput(result, headers) {
-    if (['DELETE', 'INSERT', 'UPDATE'].includes(result.command.toUpperCase())) {
-      headers.push({ text: 'Row count', value: 'rowCount', sortable: false })
-      result = [{
-        rowCount: result.rowCount
-      }]
-    } else {
-      result = result.rows
-      if (Array.isArray(result) && result[0]) {
-        const keys = Object.keys(result[0])
-        // set headers before settings result
-        for (let i = 0; i < keys.length; i++) {
-          const text = keys[i]
-          headers.push({ text, value: text, sortable: false })
-        }
-      }
-    }
-    return result
-  }
-
-  static splitQueries(query) {
-    /***
-     * we are splitting based on semicolon
-     * there are mechanism to escape semicolon within single/double quotes(string)
-     */
-    return query.match(/\b("[^"]*;[^"]*"|'[^']*;[^']*'|[^;])*;/g)
-  }
-
-  /**
-   * if sql statement is SELECT - it limits to a number
-   * @param args
-   * @returns {string|*}
-   */
-  sanitiseQuery(args) {
-    let q = args.query.trim().split(';')
-
-    if (q[0].startsWith('Select')) {
-      q = q[0] + ` LIMIT 0,${args.limit ? args.limit : 100};`
-    } else if (q[0].startsWith('select')) {
-      q = q[0] + ` LIMIT 0,${args.limit ? args.limit : 100};`
-    } else if (q[0].startsWith('SELECT')) {
-      q = q[0] + ` LIMIT 0,${args.limit ? args.limit : 100};`
-    } else {
-      return args.query
-    }
-
-    return q
-  }
-
-  static getColumnsFromJson(json, tn) {
-    const columns = []
-
-    try {
-      if (typeof json === 'object' && !Array.isArray(json)) {
-        const keys = Object.keys(json)
-        for (let i = 0; i < keys.length; ++i) {
-          const column = {
-            dp: null,
-            tn,
-            cn: keys[i],
-            cno: keys[i],
-            np: 10,
-            ns: 0,
-            clen: null,
-            cop: 1,
-            pk: false,
-            nrqd: false,
-            rqd: false,
-            un: false,
-            ct: 'int(11) unsigned',
-            ai: false,
-            unique: false,
-            cdf: null,
-            cc: '',
-            csn: null,
-            dtx: 'specificType',
-            dtxp: null,
-            dtxs: 0,
-            altered: 1
-          }
-
-          switch (typeof json[keys[i]]) {
-            case 'number':
-              if (Number.isInteger(json[keys[i]])) {
-                if (PgUi.isValidTimestamp(keys[i], json[keys[i]])) {
-                  Object.assign(column, {
-                    dt: 'timestamp'
-                  })
-                } else {
-                  Object.assign(column, {
-                    dt: 'int',
-                    np: 10,
-                    ns: 0
-                  })
-                }
-              } else {
-                Object.assign(column, {
-                  dt: 'float4',
-                  np: null,
-                  ns: null,
-                  dtxp: null,
-                  dtxs: null
-                })
-              }
-              break
-            case 'string':
-              if (PgUi.isValidDate(json[keys[i]])) {
-                Object.assign(column, {
-                  dt: 'date'
-                })
-              } else if (json[keys[i]].length <= 255) {
-                Object.assign(column, {
-                  dt: 'character varying',
-                  np: null,
-                  ns: 0,
-                  dtxp: null
-                })
-              } else {
-                Object.assign(column, {
-                  dt: 'text'
-                })
-              }
-              break
-            case 'boolean':
-              Object.assign(column, {
-                dt: 'boolean',
-                np: 3,
-                ns: 0
-              })
-              break
-            case 'object':
-              Object.assign(column, {
-                dt: 'json',
-                np: 3,
-                ns: 0
-              })
-              break
-            default:
-              break
-          }
-          columns.push(column)
-        }
-      }
-    } catch (e) {
-      console.log('Error in getColumnsFromJson', e)
-    }
-
-    return columns
-  }
-
-  static isValidTimestamp(key, value) {
-    if (typeof value !== 'number') { return false }
-    return new Date(value).getTime() > 0 && /(?:_|(?=A))[aA]t$/.test(key)
-  }
-
-  static isValidDate(value) {
-    return new Date(value).getTime() > 0
-  }
-
-  static colPropAuDisabled(col) {
-    if (col.altered !== 1) { return true }
-
-    switch (col.dt) {
-      case 'time':
-      case 'time without time zone':
-      case 'timestamp':
-      case 'timestamp without time zone':
-      case 'timestamptz':
-      case 'timestamp with time zone':
-      case 'timetz':
-      case 'time with time zone':
-        return false
-      default:
-        return true
-    }
-  }
-
-  static getAbstractType(col) {
-    switch ((col.dt || col.dt).toLowerCase()) {
-      case 'anyenum':
-        return 'enum'
-      case 'anynonarray':
-      case 'anyrange':
-        return 'string'
-
-      case 'bit':
-        return 'integer'
-      case 'bigint':
-      case 'bigserial':
-        return 'string'
-
-      case 'bool':
-        return 'boolean'
-
-      case 'box':
-      case 'bpchar':
-      case 'bytea':
-      case 'char':
-      case 'character':
-        return 'string'
-
-      case 'cid':
-      case 'cidr':
-      case 'circle':
-      case 'cstring':
-        return 'string'
-
-      case 'date':
-        return 'date'
-      case 'daterange':
-        return 'string'
-      case 'double precision':
-        return 'string'
-
-      case 'event_trigger':
-      case 'fdw_handler':
-        return 'string'
-
-      case 'float4':
-      case 'float8':
-        return 'float'
-
-      case 'gtsvector':
-      case 'index_am_handler':
-      case 'inet':
-        return 'string'
-
-      case 'int':
-      case 'int2':
-      case 'int4':
-      case 'int8':
-      case 'integer':
-        return 'integer'
-      case 'int4range':
-      case 'int8range':
-      case 'internal':
-      case 'interval':
-        return 'string'
-      case 'jsonb':
-        return 'string'
-
-      case 'language_handler':
-      case 'line':
-      case 'lsec':
-      case 'macaddr':
-      case 'money':
-      case 'name':
-      case 'numeric':
-      case 'numrange':
-      case 'oid':
-      case 'opaque':
-      case 'path':
-      case 'pg_ddl_command':
-      case 'pg_lsn':
-      case 'pg_node_tree':
-      case 'point':
-      case 'polygon':
-        return 'string'
-      case 'real':
-        return 'float'
-      case 'record':
-      case 'refcursor':
-      case 'regclass':
-      case 'regconfig':
-      case 'regdictionary':
-      case 'regnamespace':
-      case 'regoper':
-      case 'regoperator':
-      case 'regproc':
-      case 'regpreocedure':
-      case 'regrole':
-      case 'regtype':
-      case 'reltime':
-        return 'string'
-      case 'serial':
-      case 'serial2':
-      case 'serial8':
-      case 'smallint':
-      case 'smallserial':
-        return 'integer'
-      case 'smgr':
-        return 'string'
-      case 'text':
-        return 'text'
-      case 'tid':
-        return 'string'
-      case 'time':
-      case 'time without time zone':
-        return 'time'
-      case 'timestamp':
-      case 'timestamp without time zone':
-      case 'timestamptz':
-      case 'timestamp with time zone':
-        return 'datetime'
-      case 'timetz':
-      case 'time with time zone':
-        return 'time'
-
-      case 'tinterval':
-      case 'trigger':
-      case 'tsm_handler':
-      case 'tsquery':
-      case 'tsrange':
-      case 'tstzrange':
-      case 'tsvector':
-      case 'txid_snapshot':
-      case 'unknown':
-      case 'void':
-      case 'xid':
-      case 'character varying':
-      case 'xml':
-        return 'string'
-
-      case 'tinyint':
-      case 'mediumint':
-        return 'integer'
-
-      case 'float':
-      case 'decimal':
-      case 'double':
-        return 'float'
-      case 'boolean':
-        return 'boolean'
-      case 'datetime':
-        return 'datetime'
-
-      case 'uuid':
-      case 'year':
-      case 'varchar':
-      case 'nchar':
-        return 'string'
-      case 'tinytext':
-      case 'mediumtext':
-      case 'longtext':
-        return 'text'
-      case 'binary':
-      case 'varbinary':
-        return 'string'
-      case 'blob':
-      case 'tinyblob':
-      case 'mediumblob':
-      case 'longblob':
-        return 'blob'
-      case 'enum':
-        return 'enum'
-      case 'set':
-        return 'set'
-      case 'geometry':
-      case 'linestring':
-      case 'multipoint':
-      case 'multilinestring':
-      case 'multipolygon':
-        return 'string'
-      case 'json':
-        return 'json'
-    }
-  }
-
-  static getUIType(col) {
-    switch (this.getAbstractType(col)) {
-      case 'integer':
-        return 'Number'
-      case 'boolean':
-        return 'Checkbox'
-      case 'float':
-        return 'Decimal'
-      case 'date':
-        return 'Date'
-      case 'datetime':
-        return 'CreateTime'
-      case 'time':
-        return 'Time'
-      case 'year':
-        return 'Year'
-      case 'string':
-        return 'SingleLineText'
-      case 'text':
-        return 'LongText'
-      case 'blob':
-        return 'Attachment'
-      case 'enum':
-        return 'SingleSelect'
-      case 'set':
-        return 'MultiSelect'
-      case 'json':
-        return 'LongText'
-    }
-  }
-
-  static getDataTypeForUiType(col) {
-    const colProp = {}
-    switch (col.uidt) {
-      case 'ID':
-        colProp.dt = 'int4'
-        colProp.pk = true
-        colProp.un = true
-        colProp.ai = true
-        colProp.rqd = true
-        break
-      case 'ForeignKey':
-        colProp.dt = 'character varying'
-        break
-      case 'SingleLineText':
-        colProp.dt = 'character varying'
-        break
-      case 'LongText':
-        colProp.dt = 'text'
-        break
-      case 'Attachment':
-        colProp.dt = 'text'
-        break
-      case 'Checkbox':
-        colProp.dt = 'bool'
-        break
-      case 'MultiSelect':
-        colProp.dt = 'text'
-        break
-      case 'SingleSelect':
-        colProp.dt = 'text'
-        break
-      case 'Collaborator':
-        colProp.dt = 'character varying'
-        break
-      case 'Date':
-        colProp.dt = 'date'
-
-        break
-      case 'Year':
-        colProp.dt = 'int'
-        break
-      case 'Time':
-        colProp.dt = 'time'
-        break
-      case 'PhoneNumber':
-        colProp.dt = 'character varying'
-        colProp.validate = { func: ['isMobilePhone'], args: [''], msg: ['Validation failed : Invalid Mobile Format'] }
-        break
-      case 'Email':
-        colProp.dt = 'character varying'
-        colProp.validate = { func: ['isEmail'], args: [''], msg: ['Validation failed : Invalid Email Format'] }
-        break
-      case 'URL':
-        colProp.dt = 'character varying'
-        colProp.validate = { func: ['isURL'], args: [''], msg: ['Validation failed : Invalid URL Format'] }
-        break
-      case 'Number':
-        colProp.dt = 'int8'
-        break
-      case 'Decimal':
-        colProp.dt = 'decimal'
-        break
-      case 'Currency':
-        colProp.dt = 'decimal'
-        colProp.validate = { func: ['isCurrency'], args: [''], msg: ['Validation failed : Invalid Currency Format'] }
-        break
-      case 'Percent':
-        colProp.dt = 'float8'
-        break
-      case 'Duration':
-        colProp.dt = 'int8'
-        break
-      case 'Rating':
-        colProp.dt = 'float8'
-        break
-      case 'Formula':
-        colProp.dt = 'character varying'
-        break
-      case 'Rollup':
-        colProp.dt = 'character varying'
-        break
-      case 'Count':
-        colProp.dt = 'int8'
-        break
-      case 'Lookup':
-        colProp.dt = 'character varying'
-        break
-      case 'DateTime':
-        colProp.dt = 'timestamp'
-        break
-      case 'CreateTime':
-        colProp.dt = 'timestamp'
-        break
-      case 'LastModifiedTime':
-        colProp.dt = 'timestamp'
-        break
-      case 'AutoNumber':
-        colProp.dt = 'int'
-        break
-      case 'Barcode':
-        colProp.dt = 'character varying'
-        break
-      case 'Button':
-        colProp.dt = 'character varying'
-        break
-      case 'JSON':
-        colProp.dt = 'json'
-        break
-      default:
-        colProp.dt = 'character varying'
-        break
-    }
-    return colProp
-  }
-
-  static getDataTypeListForUiType(col) {
-    switch (col.uidt) {
-      case 'ID':
-      case 'ForeignKey':
-        return dbTypes
-
-      case 'SingleLineText':
-      case 'LongText':
-      case 'Collaborator':
-        return [
-          'char',
-          'character',
-          'character varying',
-          'text'
-        ]
-
-      case 'Attachment':
-        return [
-          'json',
-          'char',
-          'character',
-          'character varying',
-          'text'
-        ]
-
-      case 'JSON':
-        return [
-          'json',
-          'text'
-        ]
-      case 'Checkbox':
-        return [
-          'bit',
-          'bool',
-          'int2',
-          'int4',
-          'int8',
-          'boolean',
-          'smallint',
-          'int',
-          'integer',
-          'bigint',
-          'bigserial',
-          'char',
-          'int4range',
-          'int8range',
-          'serial',
-          'serial2',
-          'serial8'
-        ]
-
-      case 'MultiSelect':
-        return [
-          'text'
-        ]
-
-      case 'SingleSelect':
-        return [
-          'text'
-        ]
-
-      case 'Year':
-        return ['int']
-
-      case 'Time':
-        return ['time',
-          'time without time zone',
-          'timestamp',
-          'timestamp without time zone',
-          'timestamptz',
-          'timestamp with time zone',
-          'timetz',
-          'time with time zone']
-
-      case 'PhoneNumber':
-      case 'Email':
-        return [
-          'character varying'
-        ]
-
-      case 'URL':
-        return [
-          'character varying',
-          'text'
-        ]
-
-      case 'Number':
-        return [
-          'int',
-          'integer',
-          'bigint',
-          'bigserial',
-          'int2',
-          'int4',
-          'int8',
-          'numeric',
-          'serial',
-          'serial2',
-          'serial8',
-          'double precision',
-          'float4',
-          'float8',
-          'smallint',
-          'smallserial'
-        ]
-
-      case 'Decimal':
-        return [
-          'double precision',
-          'numeric',
-          'float4',
-          'float8'
-        ]
-
-      case 'Currency':
-        return [
-          'int',
-          'integer',
-          'bigint',
-          'bigserial',
-          'int2',
-          'int4',
-          'int8',
-          'numeric',
-          'serial',
-          'serial2',
-          'serial8',
-          'double precision',
-          'money', 'float4',
-          'float8'
-        ]
-
-      case 'Percent':
-        return [
-          'int',
-          'integer',
-          'bigint',
-          'bigserial',
-          'int2',
-          'int4',
-          'int8',
-          'numeric',
-          'serial',
-          'serial2',
-          'serial8',
-          'double precision',
-          'float4',
-          'float8',
-          'smallint',
-          'smallserial'
-        ]
-
-      case 'Duration':
-        return [
-          'int',
-          'integer',
-          'bigint',
-          'bigserial',
-          'int2',
-          'int4',
-          'int8',
-          'numeric',
-          'serial',
-          'serial2',
-          'serial8',
-          'double precision',
-          'float4',
-          'float8',
-          'smallint',
-          'smallserial'
-        ]
-
-      case 'Rating':
-        return [
-          'int',
-          'integer',
-          'bigint',
-          'bigserial',
-          'int2',
-          'int4',
-          'int8',
-          'numeric',
-          'serial',
-          'serial2',
-          'serial8',
-          'double precision',
-          'float4',
-          'float8',
-          'smallint',
-          'smallserial'
-        ]
-
-      case 'Formula':
-        return [
-          'text',
-          'character varying'
-        ]
-
-      case 'Rollup':
-        return [
-          'character varying'
-        ]
-
-      case 'Count':
-        return [
-          'int',
-          'integer',
-          'bigint',
-          'bigserial',
-          'int2',
-          'int4',
-          'int8',
-          'serial',
-          'serial2',
-          'serial8',
-          'smallint',
-          'smallserial'
-        ]
-
-      case 'Lookup':
-        return [
-          'character varying'
-        ]
-
-      case 'Date':
-        return [
-          'date',
-          'timestamp',
-          'timestamp without time zone',
-          'timestamptz',
-          'timestamp with time zone'
-        ]
-
-      case 'DateTime':
-      case 'CreateTime':
-      case 'LastModifiedTime':
-        return [
-          'timestamp',
-          'timestamp without time zone',
-          'timestamptz',
-          'timestamp with time zone'
-        ]
-
-      case 'AutoNumber':
-        return [
-          'int',
-          'integer',
-          'bigint',
-          'bigserial',
-          'int2',
-          'int4',
-          'int8',
-          'serial',
-          'serial2',
-          'serial8',
-          'smallint',
-          'smallserial'
-        ]
-
-      case 'Barcode':
-        return ['character varying']
-
-      case 'Geometry':
-        return [
-          'polygon',
-          'point',
-          'circle',
-          'box',
-          'line',
-          'lseg',
-          'path',
-          'circle'
-        ]
-
-      case 'Button':
-      default:
-        return dbTypes
-    }
-  }
-
-  static getUnsupportedFnList() {
-    return []
-  }
-}
-
-// module.exports = PgUiHelp;
-/**
- * @copyright Copyright (c) 2021, Xgene Cloud Ltd
- *
- * @author Naveen MR <oof1lab@gmail.com>
- * @author Pranav C Balan <pranavxc@gmail.com>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
diff --git a/packages/nc-gui/helpers/sqlUi/SqlUiFactory.js b/packages/nc-gui/helpers/sqlUi/SqlUiFactory.js
deleted file mode 100644
index e1986a6f48..0000000000
--- a/packages/nc-gui/helpers/sqlUi/SqlUiFactory.js
+++ /dev/null
@@ -1,59 +0,0 @@
-import { MysqlUi } from './MysqlUi'
-import { PgUi } from './PgUi'
-import { MssqlUi } from './MssqlUi'
-import { OracleUi } from './OracleUi'
-import { SqliteUi } from './SqliteUi'
-
-// import {YugabyteUi} from "./YugabyteUi";
-// import {TidbUi} from "./TidbUi";
-// import {VitessUi} from "./VitessUi";
-
-export class SqlUI {
-  static create(connectionConfig) {
-    if (connectionConfig.client === 'mysql' || connectionConfig.client === 'mysql2') {
-      // if (connectionConfig.meta.dbtype === "tidb")
-      //   return Tidb;
-      // if (connectionConfig.meta.dbtype === "vitess")
-      //   return Vitess;
-
-      console.log('- - - -In Mysql UI')
-
-      return MysqlUi
-    }
-
-    if (connectionConfig.client === 'sqlite3') { return SqliteUi }
-    if (connectionConfig.client === 'mssql') { return MssqlUi }
-    if (connectionConfig.client === 'oracledb') { return OracleUi }
-
-    if (connectionConfig.client === 'pg') {
-      // if (connectionConfig.meta.dbtype === "yugabyte")
-      //   return Yugabyte;
-      return PgUi
-    }
-
-    throw new Error('Database not supported')
-  }
-}
-
-/**
- * @copyright Copyright (c) 2021, Xgene Cloud Ltd
- *
- * @author Naveen MR <oof1lab@gmail.com>
- * @author Pranav C Balan <pranavxc@gmail.com>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
diff --git a/packages/nc-gui/helpers/sqlUi/SqliteUi.js b/packages/nc-gui/helpers/sqlUi/SqliteUi.js
deleted file mode 100644
index d81f12edf0..0000000000
--- a/packages/nc-gui/helpers/sqlUi/SqliteUi.js
+++ /dev/null
@@ -1,1004 +0,0 @@
-const dbTypes = [
-  'int',
-  'integer',
-  'tinyint',
-  'smallint',
-  'mediumint',
-  'bigint',
-  'int2',
-  'int8',
-  'character',
-  'blob sub_type text',
-  'blob',
-  'real',
-  'double',
-  'double precision',
-  'float',
-  'numeric',
-  'boolean',
-  'date',
-  'datetime',
-  'text',
-  'varchar',
-  'timestamp'
-]
-
-export class SqliteUi {
-  static getNewTableColumns() {
-    return [
-      {
-        column_name: 'id',
-        dt: 'integer',
-        dtx: 'integer',
-        ct: 'int(11)',
-        nrqd: false,
-        rqd: true,
-        ck: false,
-        pk: true,
-        un: false,
-        ai: true,
-        cdf: null,
-        clen: null,
-        np: null,
-        ns: 0,
-        dtxp: '',
-        dtxs: '',
-        altered: 1,
-        uidt: 'ID',
-        uip: '',
-        uicn: ''
-      },
-      {
-        column_name: 'title',
-        dt: 'varchar',
-        dtx: 'specificType',
-        ct: 'varchar',
-        nrqd: true,
-        rqd: false,
-        ck: false,
-        pk: false,
-        un: false,
-        ai: false,
-        cdf: null,
-        clen: 45,
-        np: null,
-        ns: null,
-        dtxp: '',
-        dtxs: '',
-        altered: 1,
-        uidt: 'SingleLineText',
-        uip: '',
-        uicn: ''
-      },
-      {
-        column_name: 'created_at',
-        dt: 'datetime',
-        dtx: 'specificType',
-        ct: 'varchar',
-        nrqd: true,
-        rqd: false,
-        ck: false,
-        pk: false,
-        un: false,
-        ai: false,
-        cdf: 'CURRENT_TIMESTAMP',
-        clen: 45,
-        np: null,
-        ns: null,
-        dtxp: '',
-        dtxs: '',
-        altered: 1,
-        uidt: 'CreateTime',
-        uip: '',
-        uicn: ''
-      },
-      {
-        column_name: 'updated_at',
-        dt: 'datetime',
-        dtx: 'specificType',
-        ct: 'varchar',
-        nrqd: true,
-        rqd: false,
-        ck: false,
-        pk: false,
-        un: false,
-        ai: false,
-        cdf: 'CURRENT_TIMESTAMP',
-        clen: 45,
-        np: null,
-        ns: null,
-        dtxp: '',
-        dtxs: '',
-        altered: 1,
-        uidt: 'LastModifiedTime',
-        uip: '',
-        uicn: ''
-      }
-    ]
-  }
-
-  static getNewColumn(suffix) {
-    return {
-      column_name: 'title' + suffix,
-      dt: 'integer',
-      dtx: 'specificType',
-      ct: 'integer(11)',
-      nrqd: true,
-      rqd: false,
-      ck: false,
-      pk: false,
-      un: false,
-      ai: false,
-      cdf: null,
-      clen: 45,
-      np: null,
-      ns: null,
-      // data_type_x_specific: ' ',
-      dtxp: '',
-      dtxs: ' ',
-      altered: 1,
-      uidt: 'Number',
-      uip: '',
-      uicn: ''
-    }
-  }
-
-  static getDefaultLengthForDatatype(type) {
-    switch (type) {
-      case 'int':
-        return ''
-
-      case 'tinyint':
-        return ''
-
-      case 'smallint':
-        return ''
-
-      case 'mediumint':
-        return ''
-
-      case 'bigint':
-        return ''
-
-      case 'bit':
-        return ''
-
-      case 'boolean':
-        return ''
-
-      case 'float':
-        return ''
-
-      case 'decimal':
-        return ''
-
-      case 'double':
-        return ''
-
-      case 'serial':
-        return ''
-
-      case 'date':
-        return ''
-
-      case 'datetime':
-      case 'timestamp':
-        return ''
-
-      case 'time':
-        return ''
-
-      case 'year':
-        return ''
-
-      case 'char':
-        return ''
-
-      case 'varchar':
-        return ''
-
-      case 'nchar':
-        return ''
-
-      case 'text':
-        return ''
-
-      case 'tinytext':
-        return ''
-
-      case 'mediumtext':
-        return ''
-
-      case 'longtext':
-        return ''
-
-      case 'binary':
-        return ''
-
-      case 'varbinary':
-        return ''
-
-      case 'blob':
-        return ''
-
-      case 'tinyblob':
-        return ''
-
-      case 'mediumblob':
-        return ''
-
-      case 'longblob':
-        return ''
-
-      case 'enum':
-        return ''
-
-      case 'set':
-        return ''
-
-      case 'geometry':
-        return ''
-      case 'point':
-        return ''
-      case 'linestring':
-        return ''
-      case 'polygon':
-        return ''
-      case 'multipoint':
-        return ''
-      case 'multilinestring':
-        return ''
-      case 'multipolygon':
-        return ''
-      case 'json':
-        return ''
-    }
-  }
-
-  static getDefaultLengthIsDisabled(type) {
-    switch (type) {
-      case 'integer':
-      case 'blob':
-      case 'real':
-      case 'numeric':
-        return true
-
-      case 'text':
-        return false
-    }
-  }
-
-  static getDefaultValueForDatatype(type) {
-    switch (type) {
-      case 'integer':
-        return 'eg : ' + 10
-
-      case 'text':
-        return 'eg : hey'
-
-      case 'numeric':
-        return 'eg : ' + 10
-
-      case 'real':
-        return 'eg : ' + 10.0
-
-      case 'blob':
-        return 'eg : ' + 100
-    }
-  }
-
-  static getDefaultScaleForDatatype(type) {
-    switch (type) {
-      case 'integer':
-        return ' '
-
-      case 'text':
-        return ' '
-
-      case 'numeric':
-        return ' '
-
-      case 'real':
-        return ' '
-
-      case 'blob':
-        return ' '
-    }
-  }
-
-  static colPropAIDisabled(col, columns) {
-    // console.log(col);
-    if (col.dt === 'integer') {
-      for (let i = 0; i < columns.length; ++i) {
-        if (columns[i].column_name !== col.column_name && columns[i].ai) {
-          return true
-        }
-      }
-      return false
-    } else {
-      return true
-    }
-  }
-
-  static colPropUNDisabled(col) {
-    // console.log(col);
-    return true
-    // if (col.dt === 'int' ||
-    //   col.dt === 'tinyint' ||
-    //   col.dt === 'smallint' ||
-    //   col.dt === 'mediumint' ||
-    //   col.dt === 'bigint') {
-    //   return false;
-    // } else {
-    //   return true;
-    // }
-  }
-
-  static onCheckboxChangeAI(col) {
-    console.log(col)
-    if (col.dt === 'int' || col.dt === 'bigint' || col.dt === 'smallint' || col.dt === 'tinyint') {
-      col.altered = col.altered || 2
-    }
-
-    // if (!col.ai) {
-    //   col.dtx = 'specificType'
-    // } else {
-    //   col.dtx = ''
-    // }
-  }
-
-  static showScale(columnObj) {
-    return false
-  }
-
-  static removeUnsigned(columns) {
-    for (let i = 0; i < columns.length; ++i) {
-      if (columns[i].altered === 1 && (!(columns[i].dt === 'int' ||
-        columns[i].dt === 'bigint' ||
-        columns[i].dt === 'tinyint' ||
-        columns[i].dt === 'smallint' ||
-        columns[i].dt === 'mediumint'))) {
-        columns[i].un = false
-        console.log('>> resetting unsigned value', columns[i].column_name)
-      }
-      console.log(columns[i].column_name)
-    }
-  }
-
-  static extractFunctionName(query) {
-    const reg = /^\s*CREATE\s+(?:OR\s+REPLACE\s*)?\s*FUNCTION\s+(?:[\w\d_]+\.)?([\w_\d]+)/i
-    const match = query.match(reg)
-    return match && match[1]
-  }
-
-  static extractProcedureName(query) {
-    const reg = /^\s*CREATE\s+(?:OR\s+REPLACE\s*)?\s*PROCEDURE\s+(?:[\w\d_]+\.)?([\w_\d]+)/i
-    const match = query.match(reg)
-    return match && match[1]
-  }
-
-  static columnEditable(colObj) {
-    return true // colObj.altered === 1;
-  }
-
-  static handleRawOutput(result, headers) {
-    console.log(result)
-    if (Array.isArray(result) && result[0]) {
-      const keys = Object.keys(result[0])
-      // set headers before settings result
-      for (let i = 0; i < keys.length; i++) {
-        const text = keys[i]
-        headers.push({ text, value: text, sortable: false })
-      }
-    }
-    return result
-  }
-
-  static splitQueries(query) {
-    /***
-     * we are splitting based on semicolon
-     * there are mechanism to escape semicolon within single/double quotes(string)
-     */
-    return query.match(/\b("[^"]*;[^"]*"|'[^']*;[^']*'|[^;])*;/g)
-  }
-
-  /**
-   * if sql statement is SELECT - it limits to a number
-   * @param args
-   * @returns {string|*}
-   */
-  sanitiseQuery(args) {
-    let q = args.query.trim().split(';')
-
-    if (q[0].startsWith('Select')) {
-      q = q[0] + ` LIMIT 0,${args.limit ? args.limit : 100};`
-    } else if (q[0].startsWith('select')) {
-      q = q[0] + ` LIMIT 0,${args.limit ? args.limit : 100};`
-    } else if (q[0].startsWith('SELECT')) {
-      q = q[0] + ` LIMIT 0,${args.limit ? args.limit : 100};`
-    } else {
-      return args.query
-    }
-
-    return q
-  }
-
-  static getColumnsFromJson(json, tn) {
-    const columns = []
-
-    try {
-      if (typeof json === 'object' && !Array.isArray(json)) {
-        const keys = Object.keys(json)
-        for (let i = 0; i < keys.length; ++i) {
-          const column = {
-            dp: null,
-            tn,
-            column_name: keys[i],
-            cno: keys[i],
-            np: null,
-            ns: null,
-            clen: null,
-            cop: 1,
-            pk: false,
-            nrqd: false,
-            rqd: false,
-            un: false,
-            ct: 'int(11) unsigned',
-            ai: false,
-            unique: false,
-            cdf: null,
-            cc: '',
-            csn: null,
-            dtx: 'specificType',
-            dtxp: null,
-            dtxs: 0,
-            altered: 1
-          }
-
-          switch (typeof json[keys[i]]) {
-            case 'number':
-              if (Number.isInteger(json[keys[i]])) {
-                if (SqliteUi.isValidTimestamp(keys[i], json[keys[i]])) {
-                  Object.assign(column, {
-                    dt: 'timestamp'
-                  })
-                } else {
-                  Object.assign(column, {
-                    dt: 'integer'
-                  })
-                }
-              } else {
-                Object.assign(column, {
-                  dt: 'real'
-                })
-              }
-              break
-            case 'string':
-              // if (SqliteUi.isValidDate(json[keys[i]])) {
-              //   Object.assign(column, {
-              //     "dt": "datetime"
-              //   });
-              // } else
-              if (json[keys[i]].length <= 255) {
-                Object.assign(column, {
-                  dt: 'varchar'
-                })
-              } else {
-                Object.assign(column, {
-                  dt: 'text'
-                })
-              }
-              break
-            case 'boolean':
-              Object.assign(column, {
-                dt: 'integer'
-              })
-              break
-            case 'object':
-              Object.assign(column, {
-                dt: 'text',
-                np: null,
-                dtxp: null
-              })
-              break
-            default:
-              break
-          }
-          columns.push(column)
-        }
-      }
-    } catch (e) {
-      console.log('Error in getColumnsFromJson', e)
-    }
-
-    return columns
-  }
-
-  static isValidTimestamp(key, value) {
-    if (typeof value !== 'number') {
-      return false
-    }
-    return new Date(value).getTime() > 0 && /(?:_|(?=A))[aA]t$/.test(key)
-  }
-
-  static isValidDate(value) {
-    return new Date(value).getTime() > 0
-  }
-
-  static onCheckboxChangeAU(col) {
-    console.log(col)
-    // if (1) {
-    col.altered = col.altered || 2
-    // }
-
-    // if (!col.ai) {
-    //   col.dtx = 'specificType'
-    // } else {
-    //   col.dtx = ''
-    // }
-  }
-
-  static colPropAuDisabled(col) {
-    if (col.altered !== 1) {
-      return true
-    }
-
-    switch (col.dt) {
-      case 'date':
-      case 'datetime':
-      case 'timestamp':
-      case 'time':
-        return false
-
-      default :
-        return true
-    }
-  }
-
-  static getAbstractType(col) {
-    switch ((col.dt || col.dt).toLowerCase()) {
-      case 'date':
-        return 'date'
-      case 'datetime':
-      case 'timestamp':
-        return 'datetime'
-      case 'integer':
-      case 'int':
-      case 'tinyint':
-      case 'smallint':
-      case 'mediumint':
-      case 'int2':
-      case 'int8':
-        return 'integer'
-      case 'text':
-        return 'text'
-      case 'boolean':
-        return 'boolean'
-      case 'real':
-      case 'double':
-      case 'double precision':
-      case 'float':
-      case 'numeric':
-        return 'float'
-
-      case 'blob sub_type text':
-      case 'blob':
-        return 'blob'
-
-      case 'bigint':
-      case 'character':
-      case 'varchar':
-        return 'string'
-    }
-  }
-
-  static getUIType(col) {
-    switch (this.getAbstractType(col)) {
-      case 'integer':
-        return 'Number'
-      case 'boolean':
-        return 'Checkbox'
-      case 'float':
-        return 'Decimal'
-      case 'date':
-        return 'Date'
-      case 'datetime':
-        return 'CreateTime'
-      case 'time':
-        return 'Time'
-      case 'year':
-        return 'Year'
-      case 'string':
-        return 'SingleLineText'
-      case 'text':
-        return 'LongText'
-      case 'blob':
-        return 'Attachment'
-      case 'enum':
-        return 'SingleSelect'
-      case 'set':
-        return 'MultiSelect'
-      case 'json':
-        return 'LongText'
-    }
-  }
-
-  static getDataTypeForUiType(col) {
-    const colProp = {}
-    switch (col.uidt) {
-      case 'ID':
-        colProp.dt = 'integer'
-        colProp.pk = true
-        colProp.un = true
-        colProp.ai = true
-        colProp.rqd = true
-        break
-      case 'ForeignKey':
-        colProp.dt = 'varchar'
-        break
-      case 'SingleLineText':
-        colProp.dt = 'varchar'
-        break
-      case 'LongText':
-        colProp.dt = 'text'
-        break
-      case 'Attachment':
-        colProp.dt = 'text'
-        break
-      case 'Checkbox':
-        // colProp.dt = 'tinyint';
-        // colProp.dtxp = 1;
-        colProp.dt = 'boolean'
-        break
-      case 'MultiSelect':
-        colProp.dt = 'text'
-        break
-      case 'SingleSelect':
-        colProp.dt = 'text'
-        break
-      case 'Collaborator':
-        colProp.dt = 'varchar'
-        break
-      case 'Date':
-        colProp.dt = 'date'
-
-        break
-      case 'Year':
-        colProp.dt = 'year'
-        break
-      case 'Time':
-        colProp.dt = 'time'
-        break
-      case 'PhoneNumber':
-        colProp.dt = 'varchar'
-        colProp.validate = { func: ['isMobilePhone'], args: [''], msg: ['Validation failed : Invalid Mobile Format'] }
-        break
-      case 'Email':
-        colProp.dt = 'varchar'
-        colProp.validate = { func: ['isEmail'], args: [''], msg: ['Validation failed : Invalid Email Format'] }
-        break
-      case 'URL':
-        colProp.dt = 'varchar'
-        colProp.validate = { func: ['isURL'], args: [''], msg: ['Validation failed : Invalid URL Format'] }
-        break
-      case 'Number':
-        colProp.dt = 'integer'
-        break
-      case 'Decimal':
-        colProp.dt = 'decimal'
-        break
-      case 'Currency':
-        colProp.dt = 'double precision'
-        colProp.validate = { func: ['isCurrency'], args: [''], msg: ['Validation failed : Invalid Currency Format'] }
-        break
-      case 'Percent':
-        colProp.dt = 'double'
-        break
-      case 'Duration':
-        colProp.dt = 'integer'
-        break
-      case 'Rating':
-        colProp.dt = 'float'
-        break
-      case 'Formula':
-        colProp.dt = 'varchar'
-        break
-      case 'Rollup':
-        colProp.dt = 'varchar'
-        break
-      case 'Count':
-        colProp.dt = 'integer'
-        break
-      case 'Lookup':
-        colProp.dt = 'varchar'
-        break
-      case 'DateTime':
-        colProp.dt = 'datetime'
-        break
-      case 'CreateTime':
-        colProp.dt = 'datetime'
-        break
-      case 'LastModifiedTime':
-        colProp.dt = 'datetime'
-        break
-      case 'AutoNumber':
-        colProp.dt = 'integer'
-        break
-      case 'Barcode':
-        colProp.dt = 'varchar'
-        break
-      case 'Button':
-        colProp.dt = 'varchar'
-        break
-      case 'JSON':
-        colProp.dt = 'text'
-        break
-      default:
-        colProp.dt = 'varchar'
-        break
-    }
-    return colProp
-  }
-
-  static getDataTypeListForUiType(col) {
-    switch (col.uidt) {
-      case 'ID':
-      case 'ForeignKey':
-        return dbTypes
-
-      case 'SingleLineText':
-      case 'LongText':
-      case 'Attachment':
-      case 'Collaborator':
-        return [
-          'character',
-          'text',
-          'varchar'
-        ]
-
-      case 'Checkbox':
-        return [
-          'int',
-          'integer',
-          'tinyint',
-          'smallint',
-          'mediumint',
-          'bigint',
-          'int2',
-          'int8',
-          'boolean'
-        ]
-
-      case 'MultiSelect':
-        return [
-          'text',
-          'varchar'
-        ]
-
-      case 'SingleSelect':
-        return [
-          'text',
-          'varchar'
-        ]
-
-      case 'Year':
-        return ['int', 'integer',
-          'tinyint',
-          'smallint',
-          'mediumint',
-          'bigint',
-          'int2',
-          'int8']
-
-      case 'Time':
-        return [
-          'int',
-          'integer',
-          'tinyint',
-          'smallint',
-          'mediumint',
-          'bigint',
-          'int2',
-          'int8']
-
-      case 'PhoneNumber':
-      case 'Email':
-        return [
-          'varchar',
-          'text'
-        ]
-
-      case 'URL':
-        return [
-          'varchar',
-          'text'
-        ]
-
-      case 'Number':
-        return [
-          'int',
-          'integer',
-          'tinyint',
-          'smallint',
-          'mediumint',
-          'bigint',
-          'int2',
-          'int8',
-          'numeric',
-          'real',
-          'double',
-          'double precision',
-          'float'
-        ]
-
-      case 'Decimal':
-        return [
-          'real',
-          'double',
-          'double precision',
-          'float',
-          'numeric'
-        ]
-
-      case 'Currency':
-        return [
-          'real',
-          'double',
-          'double precision',
-          'float',
-          'int',
-          'integer',
-          'tinyint',
-          'smallint',
-          'mediumint',
-          'bigint',
-          'int2',
-          'int8',
-          'numeric']
-
-      case 'Percent':
-        return [
-          'real',
-          'double',
-          'double precision',
-          'float',
-          'int',
-          'integer',
-          'tinyint',
-          'smallint',
-          'mediumint',
-          'bigint',
-          'int2',
-          'int8',
-          'numeric'
-        ]
-
-      case 'Duration':
-        return [
-          'int',
-          'integer',
-          'tinyint',
-          'smallint',
-          'mediumint',
-          'bigint',
-          'int2',
-          'int8']
-
-      case 'Rating':
-        return [
-          'real',
-          'double',
-          'double precision',
-          'float',
-          'int',
-          'integer',
-          'tinyint',
-          'smallint',
-          'mediumint',
-          'bigint',
-          'int2',
-          'int8',
-          'numeric']
-
-      case 'Formula':
-        return [
-          'text',
-          'varchar'
-        ]
-
-      case 'Rollup':
-        return [
-          'varchar'
-        ]
-
-      case 'Count':
-        return [
-          'int',
-          'integer',
-          'tinyint',
-          'smallint',
-          'mediumint',
-          'bigint',
-          'int2',
-          'int8'
-        ]
-
-      case 'Lookup':
-        return [
-          'varchar'
-        ]
-
-      case 'Date':
-        return [
-          'date',
-          'varchar'
-        ]
-
-      case 'DateTime':
-      case 'CreateTime':
-      case 'LastModifiedTime':
-        return [
-          'datetime',
-          'timestamp'
-        ]
-
-      case 'AutoNumber':
-        return [
-          'int',
-          'integer',
-          'tinyint',
-          'smallint',
-          'mediumint',
-          'bigint',
-          'int2',
-          'int8'
-        ]
-
-      case 'Barcode':
-        return ['varchar']
-
-      case 'Geometry':
-        return [
-          'text'
-        ]
-      case 'JSON':
-        return [
-          'text'
-        ]
-
-      case 'Button':
-      default:
-        return dbTypes
-    }
-  }
-
-  static getUnsupportedFnList() {
-    return [
-      'LOG', 'EXP', 'POWER', 'SQRT'
-    ]
-  }
-}
-
-// module.exports = PgUiHelp;
-/**
- * @copyright Copyright (c) 2021, Xgene Cloud Ltd
- *
- * @author Naveen MR <oof1lab@gmail.com>
- * @author Pranav C Balan <pranavxc@gmail.com>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
diff --git a/packages/nc-gui/helpers/sqlUi/index.js b/packages/nc-gui/helpers/sqlUi/index.js
deleted file mode 100644
index 3107af314a..0000000000
--- a/packages/nc-gui/helpers/sqlUi/index.js
+++ /dev/null
@@ -1,6 +0,0 @@
-export * from './MysqlUi'
-export * from './PgUi'
-export * from './MssqlUi'
-export * from './OracleUi'
-export * from './SqliteUi'
-export * from './SqlUiFactory'
diff --git a/packages/nc-gui/lang/zh_CN.json b/packages/nc-gui/lang/zh_CN.json
index 9866753f85..69c9648add 100644
--- a/packages/nc-gui/lang/zh_CN.json
+++ b/packages/nc-gui/lang/zh_CN.json
@@ -1,6 +1,6 @@
 {
   "general": {
-    "home": "家",
+    "home": "首页",
     "load": "加载",
     "open": "打开",
     "close": "关闭",
@@ -26,7 +26,7 @@
     "show": "展示",
     "hide": "隐藏",
     "showAll": "显示所有",
-    "hideAll": "全部藏起来",
+    "hideAll": "隐藏全部",
     "showMore": "显示更多",
     "showOptions": "显示选项",
     "hideOptions": "隐藏选项",
@@ -48,7 +48,7 @@
     "more": "更多的",
     "less": "较少的",
     "event": "事件",
-    "condition": "健康）状况",
+    "condition": "条件",
     "after": "后",
     "before": "前",
     "search": "搜索",
@@ -59,11 +59,11 @@
   "objects": {
     "project": "项目",
     "projects": "项目",
-    "table": "桌子",
-    "tables": "桌子",
-    "field": "场地",
-    "fields": "领域",
-    "column": "柱子",
+    "table": "表格",
+    "tables": "表格",
+    "field": "字段",
+    "fields": "字段",
+    "column": "列",
     "columns": "列",
     "page": "页",
     "pages": "页面",
@@ -71,7 +71,7 @@
     "records": "记录",
     "webhook": "Webhook.",
     "webhooks": "Webhooks.",
-    "view": "看法",
+    "view": "视图",
     "views": "视图",
     "viewType": {
       "grid": "表格",
@@ -94,10 +94,10 @@
   },
   "datatype": {
     "ID": "ID",
-    "ForeignKey": "外钥匙",
+    "ForeignKey": "外键",
     "SingleLineText": "单行文本",
-    "LongText": "长篇文章",
-    "Attachment": "依恋",
+    "LongText": "长文本",
+    "Attachment": "附件",
     "Checkbox": "复选框",
     "MultiSelect": "多选",
     "SingleSelect": "单个选择",
@@ -116,9 +116,9 @@
     "Rating": "评分",
     "Formula": "公式",
     "Rollup": "卷起",
-    "Count": "数数",
-    "Lookup": "抬头",
-    "DateTime": "约会时间",
+    "Count": "计数",
+    "Lookup": "查找",
+    "DateTime": "日期时间",
     "CreateTime": "创建时间",
     "LastModifiedTime": "最后修改时间",
     "AutoNumber": "自动编号",
@@ -191,19 +191,19 @@
     "password": "密码",
     "action": "行动",
     "actions": "行动",
-    "operation": "手术",
+    "operation": "操作",
     "operationType": "操作类型",
     "operationSubType": "操作子类型",
     "description": "描述",
     "authentication": "验证",
     "token": "令牌",
-    "where": "在哪里",
+    "where": "where",
     "cache": "缓存",
     "chat": "聊天",
     "email": "电子邮件",
     "storage": "贮存",
     "uiAcl": "UI-ACL",
-    "models": "楷模",
+    "models": "模型",
     "syncState": "同步状态",
     "created": "创造了",
     "sqlOutput": "SQL输出",
@@ -231,14 +231,14 @@
     },
     "docReference": "文件参考文献",
     "selectUserRole": "选择用户角色",
-    "childTable": "儿童表",
-    "childColumn": "儿童专栏",
+    "childTable": "子表",
+    "childColumn": "子列",
     "onUpdate": "更新",
-    "onDelete": "在删除"
+    "onDelete": "删除"
   },
   "activity": {
     "createProject": "创建项目",
-    "importProject": "进口项目",
+    "importProject": "导入项目",
     "searchProject": "搜索项目",
     "editProject": "编辑项目",
     "stopProject": "停止项目",
@@ -265,7 +265,7 @@
       "projInfo": "复制项目信息",
       "themes": "主题"
     },
-    "sort": "种类",
+    "sort": "排序",
     "addSort": "添加排序选项",
     "filter": "筛选",
     "addFilter": "添加过滤器",
@@ -338,7 +338,7 @@
     "testDbConn": "测试数据库链接",
     "removeDbFromEnv": "从环境中删除数据库",
     "editConnJson": "编辑链接JSON",
-    "sponsorUs": "赞助美国",
+    "sponsorUs": "赞助我们",
     "sendEmail": "发送邮件"
   },
   "tooltip": {
@@ -422,7 +422,7 @@
       "showBlankForm": "5秒后显示空白表格",
       "emailForm": "发电子邮件给我",
       "showSysFields": "显示系统字段",
-      "filterAutoApply": "自动申请",
+      "filterAutoApply": "自动应用",
       "showMessage": "显示此消息",
       "viewNotShared": "当前视图不共享！",
       "showAllViews": "显示此表的所有共享视图",
diff --git a/packages/nc-migrator-archived/package-lock.json b/packages/nc-migrator-archived/package-lock.json
index ebe9eed31f..28e35cd7be 100644
--- a/packages/nc-migrator-archived/package-lock.json
+++ b/packages/nc-migrator-archived/package-lock.json
@@ -272,6 +272,15 @@
       "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==",
       "dev": true
     },
+    "async": {
+      "version": "2.6.4",
+      "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz",
+      "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==",
+      "dev": true,
+      "requires": {
+        "lodash": "^4.17.14"
+      }
+    },
     "atob": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
@@ -2844,15 +2853,6 @@
           "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
           "dev": true
         },
-        "async": {
-          "version": "2.6.2",
-          "resolved": false,
-          "integrity": "sha512-H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg==",
-          "dev": true,
-          "requires": {
-            "lodash": "^4.17.11"
-          }
-        },
         "balanced-match": {
           "version": "1.0.0",
           "resolved": false,
diff --git a/packages/nc-plugin/package-lock.json b/packages/nc-plugin/package-lock.json
index 96f17061b1..394618b5f6 100644
--- a/packages/nc-plugin/package-lock.json
+++ b/packages/nc-plugin/package-lock.json
@@ -1176,9 +1176,9 @@
       "dev": true
     },
     "async": {
-      "version": "2.6.3",
-      "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
-      "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
+      "version": "2.6.4",
+      "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz",
+      "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==",
       "dev": true,
       "requires": {
         "lodash": "^4.17.14"
diff --git a/packages/noco-blog/package-lock.json b/packages/noco-blog/package-lock.json
index dd3df37591..05a95ff26b 100644
--- a/packages/noco-blog/package-lock.json
+++ b/packages/noco-blog/package-lock.json
@@ -3275,9 +3275,9 @@
       "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c="
     },
     "async": {
-      "version": "2.6.3",
-      "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
-      "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
+      "version": "2.6.4",
+      "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz",
+      "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==",
       "requires": {
         "lodash": "^4.17.14"
       }
diff --git a/packages/noco-docs-prev/package-lock.json b/packages/noco-docs-prev/package-lock.json
index f65451b685..0b4965758b 100644
--- a/packages/noco-docs-prev/package-lock.json
+++ b/packages/noco-docs-prev/package-lock.json
@@ -4103,9 +4103,9 @@
       }
     },
     "node_modules/async": {
-      "version": "2.6.3",
-      "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
-      "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
+      "version": "2.6.4",
+      "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz",
+      "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==",
       "dependencies": {
         "lodash": "^4.17.14"
       }
@@ -20089,9 +20089,9 @@
       "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c="
     },
     "async": {
-      "version": "2.6.3",
-      "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
-      "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
+      "version": "2.6.4",
+      "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz",
+      "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==",
       "requires": {
         "lodash": "^4.17.14"
       }
diff --git a/packages/noco-docs/content/en/developer-resources/rest-apis.md b/packages/noco-docs/content/en/developer-resources/rest-apis.md
index 7998fd33ae..6988d17b52 100644
--- a/packages/noco-docs/content/en/developer-resources/rest-apis.md
+++ b/packages/noco-docs/content/en/developer-resources/rest-apis.md
@@ -11,6 +11,14 @@ Once you've created the schemas, you can manipulate the data or invoke actions u
 
 Here's the overview of all APIs. For the details, please check out <a href="https://all-apis.nocodb.com/" target="_blank">NocoDB API Documentation</a>.
 
+<alert type="danger">
+Swagger UI has been removed from GUI and may be supported in the future release.
+</alert>
+
+<alert type="success">
+Currently, the default value for {orgs} is <b>noco</b>. Users will be able to change it in the future release.
+</alert>
+
 ### Auth APIs
 
 | Category | Method | Tag | Function Name | Path |
diff --git a/packages/noco-docs/package-lock.json b/packages/noco-docs/package-lock.json
index 3df4d32790..6647d34ac9 100644
--- a/packages/noco-docs/package-lock.json
+++ b/packages/noco-docs/package-lock.json
@@ -4103,9 +4103,9 @@
       }
     },
     "node_modules/async": {
-      "version": "2.6.3",
-      "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
-      "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
+      "version": "2.6.4",
+      "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz",
+      "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==",
       "dependencies": {
         "lodash": "^4.17.14"
       }
@@ -20089,9 +20089,9 @@
       "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c="
     },
     "async": {
-      "version": "2.6.3",
-      "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
-      "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
+      "version": "2.6.4",
+      "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz",
+      "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==",
       "requires": {
         "lodash": "^4.17.14"
       }
diff --git a/packages/noco-i18n/package-lock.json b/packages/noco-i18n/package-lock.json
index b24cb7fd09..0534c88b81 100644
--- a/packages/noco-i18n/package-lock.json
+++ b/packages/noco-i18n/package-lock.json
@@ -2416,9 +2416,9 @@
       "dev": true
     },
     "async": {
-      "version": "2.6.3",
-      "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
-      "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
+      "version": "2.6.4",
+      "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz",
+      "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==",
       "dev": true,
       "requires": {
         "lodash": "^4.17.14"
diff --git a/packages/nocodb-sdk/package-lock.json b/packages/nocodb-sdk/package-lock.json
index 3644d29bde..1251ff9fb2 100644
--- a/packages/nocodb-sdk/package-lock.json
+++ b/packages/nocodb-sdk/package-lock.json
@@ -1176,9 +1176,9 @@
       "dev": true
     },
     "async": {
-      "version": "2.6.3",
-      "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
-      "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
+      "version": "2.6.4",
+      "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz",
+      "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==",
       "dev": true,
       "requires": {
         "lodash": "^4.17.14"
diff --git a/packages/nocodb/package-lock.json b/packages/nocodb/package-lock.json
index caa14fc783..751a8287a1 100644
--- a/packages/nocodb/package-lock.json
+++ b/packages/nocodb/package-lock.json
@@ -11606,9 +11606,9 @@
       }
     },
     "minimist": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
+      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="
     },
     "minimist-options": {
       "version": "3.0.2",
diff --git a/packages/nocodb/src/__tests__/restv2.test.ts b/packages/nocodb/src/__tests__/restv2.test.ts
index b0d6917251..8030f98883 100644
--- a/packages/nocodb/src/__tests__/restv2.test.ts
+++ b/packages/nocodb/src/__tests__/restv2.test.ts
@@ -5,7 +5,7 @@ import request from 'supertest';
 
 import { Noco } from '../lib';
 import NcConfigFactory from '../lib/utils/NcConfigFactory';
-import UITypes from '../lib/sqlUi/UITypes';
+import { UITypes } from 'nocodb-sdk';
 
 const knex = require('knex');
 
diff --git a/packages/nocodb/src/lib/dataMapper/lib/sql/BaseModelSqlv2.ts b/packages/nocodb/src/lib/dataMapper/lib/sql/BaseModelSqlv2.ts
index cf1d836dbb..4130bf2ff9 100644
--- a/packages/nocodb/src/lib/dataMapper/lib/sql/BaseModelSqlv2.ts
+++ b/packages/nocodb/src/lib/dataMapper/lib/sql/BaseModelSqlv2.ts
@@ -4,7 +4,6 @@ import _ from 'lodash';
 import Model from '../../../noco-models/Model';
 import { XKnex } from '../..';
 import LinkToAnotherRecordColumn from '../../../noco-models/LinkToAnotherRecordColumn';
-import UITypes from '../../../sqlUi/UITypes';
 import RollupColumn from '../../../noco-models/RollupColumn';
 import LookupColumn from '../../../noco-models/LookupColumn';
 import DataLoader from 'dataloader';
@@ -25,6 +24,7 @@ import {
   isSystemColumn,
   RelationTypes,
   SortType,
+  UITypes,
   ViewTypes
 } from 'nocodb-sdk';
 import formSubmissionEmailTemplate from '../../../noco/common/formSubmissionEmailTemplate';
@@ -1864,10 +1864,13 @@ class BaseModelSqlv2 {
         {
           await this.dbDriver(childTable.table_name)
             .update({
-              [childColumn.column_name]: this.dbDriver(parentTable.table_name)
-                .select(parentColumn.column_name)
-                .where(_wherePk(parentTable.primaryKeys, rowId))
-                .first()
+              [childColumn.column_name]: this.dbDriver.from(
+                this.dbDriver(parentTable.table_name)
+                  .select(parentColumn.column_name)
+                  .where(_wherePk(parentTable.primaryKeys, rowId))
+                  .first()
+                  .as('___cn_alias')
+              )
             })
             .where(_wherePk(childTable.primaryKeys, childId));
         }
@@ -1876,10 +1879,13 @@ class BaseModelSqlv2 {
         {
           await this.dbDriver(childTable.table_name)
             .update({
-              [childColumn.column_name]: this.dbDriver(parentTable.table_name)
-                .select(parentColumn.column_name)
-                .where(_wherePk(parentTable.primaryKeys, childId))
-                .first()
+              [childColumn.column_name]: this.dbDriver.from(
+                this.dbDriver(parentTable.table_name)
+                  .select(parentColumn.column_name)
+                  .where(_wherePk(parentTable.primaryKeys, childId))
+                  .first()
+                  .as('___cn_alias')
+              )
             })
             .where(_wherePk(childTable.primaryKeys, rowId));
         }
diff --git a/packages/nocodb/src/lib/dataMapper/lib/sql/conditionV2.ts b/packages/nocodb/src/lib/dataMapper/lib/sql/conditionV2.ts
index 960b0f4ae1..3f2152c0c3 100644
--- a/packages/nocodb/src/lib/dataMapper/lib/sql/conditionV2.ts
+++ b/packages/nocodb/src/lib/dataMapper/lib/sql/conditionV2.ts
@@ -1,5 +1,4 @@
 import Filter from '../../../noco-models/Filter';
-import UITypes from '../../../sqlUi/UITypes';
 import LinkToAnotherRecordColumn from '../../../noco-models/LinkToAnotherRecordColumn';
 import { QueryBuilder } from 'knex';
 import { XKnex } from '../..';
@@ -9,7 +8,7 @@ import genRollupSelectv2 from './genRollupSelectv2';
 import RollupColumn from '../../../noco-models/RollupColumn';
 import formulaQueryBuilderv2 from './formulav2/formulaQueryBuilderv2';
 import FormulaColumn from '../../../noco-models/FormulaColumn';
-import { RelationTypes } from 'nocodb-sdk';
+import { RelationTypes, UITypes } from 'nocodb-sdk';
 // import LookupColumn from '../../../noco-models/LookupColumn';
 
 export default async function conditionV2(
@@ -111,7 +110,7 @@ const parseConditionV2 = async (
         };
       } else if (colOptions.type === RelationTypes.BELONGS_TO) {
         const selectQb = knex(parentModel.table_name).select(
-          childColumn.column_name
+          parentColumn.column_name
         );
         (
           await parseConditionV2(
@@ -324,7 +323,7 @@ async function generateLookupCondition(
     const parentModel = await parentColumn.getModel();
     await parentModel.getColumns();
 
-    if (relationColumnOptions.type === 'hm') {
+    if (relationColumnOptions.type === RelationTypes.HAS_MANY) {
       qb = knex(`${childModel.table_name} as ${alias}`);
 
       qb.select(`${alias}.${childColumn.column_name}`);
@@ -348,7 +347,7 @@ async function generateLookupCondition(
           qbP.whereNotIn(parentColumn.column_name, qb);
         else qbP.whereIn(parentColumn.column_name, qb);
       };
-    } else if (relationColumnOptions.type === 'bt') {
+    } else if (relationColumnOptions.type === RelationTypes.BELONGS_TO) {
       qb = knex(`${parentModel.table_name} as ${alias}`);
       qb.select(`${alias}.${childColumn.column_name}`);
 
@@ -440,7 +439,7 @@ async function nestedConditionJoin(
     await parentModel.getColumns();
     {
       switch (relationColOptions.type) {
-        case 'hm':
+        case RelationTypes.HAS_MANY:
           {
             qb.join(
               `${childModel.table_name} as ${relAlias}`,
@@ -449,7 +448,7 @@ async function nestedConditionJoin(
             );
           }
           break;
-        case 'bt':
+        case RelationTypes.BELONGS_TO:
           {
             qb.join(
               `${parentModel.table_name} as ${relAlias}`,
@@ -493,7 +492,7 @@ async function nestedConditionJoin(
       );
     } else {
       switch (relationColOptions.type) {
-        case 'hm':
+        case RelationTypes.HAS_MANY:
           {
             (
               await parseConditionV2(
@@ -509,7 +508,7 @@ async function nestedConditionJoin(
             )(qb);
           }
           break;
-        case 'bt':
+        case RelationTypes.BELONGS_TO:
           {
             (
               await parseConditionV2(
diff --git a/packages/nocodb/src/lib/dataMapper/lib/sql/formulav2/formulaQueryBuilderv2.ts b/packages/nocodb/src/lib/dataMapper/lib/sql/formulav2/formulaQueryBuilderv2.ts
index 632b32f33f..56f0d8227a 100644
--- a/packages/nocodb/src/lib/dataMapper/lib/sql/formulav2/formulaQueryBuilderv2.ts
+++ b/packages/nocodb/src/lib/dataMapper/lib/sql/formulav2/formulaQueryBuilderv2.ts
@@ -1,13 +1,13 @@
 import jsep from 'jsep';
 import mapFunctionName from '../mapFunctionName';
 import Model from '../../../../noco-models/Model';
-import UITypes from '../../../../sqlUi/UITypes';
 import genRollupSelectv2 from '../genRollupSelectv2';
 import RollupColumn from '../../../../noco-models/RollupColumn';
 import FormulaColumn from '../../../../noco-models/FormulaColumn';
 import { XKnex } from '../../..';
 import LinkToAnotherRecordColumn from '../../../../noco-models/LinkToAnotherRecordColumn';
 import LookupColumn from '../../../../noco-models/LookupColumn';
+import { UITypes } from 'nocodb-sdk';
 
 // todo: switch function based on database
 
diff --git a/packages/nocodb/src/lib/dataMapper/lib/sql/sortV2.ts b/packages/nocodb/src/lib/dataMapper/lib/sql/sortV2.ts
index c99faa87be..d8a395d8b2 100644
--- a/packages/nocodb/src/lib/dataMapper/lib/sql/sortV2.ts
+++ b/packages/nocodb/src/lib/dataMapper/lib/sql/sortV2.ts
@@ -1,14 +1,13 @@
 import { QueryBuilder } from 'knex';
 import { XKnex } from '../..';
 import Sort from '../../../noco-models/Sort';
-import UITypes from '../../../sqlUi/UITypes';
 import LinkToAnotherRecordColumn from '../../../noco-models/LinkToAnotherRecordColumn';
 import genRollupSelectv2 from './genRollupSelectv2';
 import RollupColumn from '../../../noco-models/RollupColumn';
 import LookupColumn from '../../../noco-models/LookupColumn';
 import formulaQueryBuilderv2 from './formulav2/formulaQueryBuilderv2';
 import FormulaColumn from '../../../noco-models/FormulaColumn';
-import { RelationTypes } from 'nocodb-sdk';
+import { RelationTypes, UITypes } from 'nocodb-sdk';
 
 export default async function sortV2(
   sortList: Sort[],
diff --git a/packages/nocodb/src/lib/noco-models/Column.ts b/packages/nocodb/src/lib/noco-models/Column.ts
index f4e6cb1c3d..04c47bf901 100644
--- a/packages/nocodb/src/lib/noco-models/Column.ts
+++ b/packages/nocodb/src/lib/noco-models/Column.ts
@@ -1,4 +1,3 @@
-import UITypes from '../sqlUi/UITypes';
 import FormulaColumn from './FormulaColumn';
 import LinkToAnotherRecordColumn from './LinkToAnotherRecordColumn';
 import LookupColumn from './LookupColumn';
@@ -7,7 +6,7 @@ import SingleSelectColumn from './SingleSelectColumn';
 import MultiSelectColumn from './MultiSelectColumn';
 import Model from './Model';
 import NocoCache from '../noco-cache/NocoCache';
-import { ColumnType } from 'nocodb-sdk';
+import { ColumnType, UITypes } from 'nocodb-sdk';
 import {
   CacheDelDirection,
   CacheGetType,
diff --git a/packages/nocodb/src/lib/noco-models/Filter.ts b/packages/nocodb/src/lib/noco-models/Filter.ts
index 3f930bfac6..b5376e9e18 100644
--- a/packages/nocodb/src/lib/noco-models/Filter.ts
+++ b/packages/nocodb/src/lib/noco-models/Filter.ts
@@ -1,7 +1,6 @@
 import Noco from '../../lib/noco/Noco';
 import Model from './Model';
 import Column from './Column';
-import UITypes from '../sqlUi/UITypes';
 import {
   CacheDelDirection,
   CacheGetType,
@@ -9,7 +8,7 @@ import {
   MetaTable
 } from '../utils/globals';
 import View from './View';
-import { FilterType } from 'nocodb-sdk';
+import { FilterType, UITypes } from 'nocodb-sdk';
 import NocoCache from '../noco-cache/NocoCache';
 
 export default class Filter {
diff --git a/packages/nocodb/src/lib/noco-models/GalleryView.ts b/packages/nocodb/src/lib/noco-models/GalleryView.ts
index 48ae957108..3fdbe7581b 100644
--- a/packages/nocodb/src/lib/noco-models/GalleryView.ts
+++ b/packages/nocodb/src/lib/noco-models/GalleryView.ts
@@ -1,8 +1,7 @@
 import Noco from '../noco/Noco';
 import { CacheGetType, CacheScope, MetaTable } from '../utils/globals';
-import { GalleryColumnType, GalleryType } from 'nocodb-sdk';
+import { GalleryColumnType, GalleryType, UITypes } from 'nocodb-sdk';
 import View from './View';
-import UITypes from '../sqlUi/UITypes';
 import NocoCache from '../noco-cache/NocoCache';
 
 export default class GalleryView implements GalleryType {
diff --git a/packages/nocodb/src/lib/noco-models/HookFilter.ts b/packages/nocodb/src/lib/noco-models/HookFilter.ts
index dabd174884..04946df456 100644
--- a/packages/nocodb/src/lib/noco-models/HookFilter.ts
+++ b/packages/nocodb/src/lib/noco-models/HookFilter.ts
@@ -1,7 +1,6 @@
 import Noco from '../../lib/noco/Noco';
 import Model from './Model';
 import Column from './Column';
-import UITypes from '../sqlUi/UITypes';
 import {
   CacheDelDirection,
   CacheGetType,
@@ -9,7 +8,7 @@ import {
   MetaTable
 } from '../utils/globals';
 import View from './View';
-import { FilterType } from 'nocodb-sdk';
+import { FilterType, UITypes } from 'nocodb-sdk';
 import NocoCache from '../noco-cache/NocoCache';
 
 export default class Filter {
diff --git a/packages/nocodb/src/lib/noco-models/Model.ts b/packages/nocodb/src/lib/noco-models/Model.ts
index 5203e4aaec..e919ab6005 100644
--- a/packages/nocodb/src/lib/noco-models/Model.ts
+++ b/packages/nocodb/src/lib/noco-models/Model.ts
@@ -8,9 +8,9 @@ import {
   ModelTypes,
   TableReqType,
   TableType,
+  UITypes,
   ViewTypes
 } from 'nocodb-sdk';
-import UITypes from '../sqlUi/UITypes';
 import {
   CacheDelDirection,
   CacheGetType,
@@ -425,12 +425,8 @@ export default class Model implements TableType {
     );
     await ncMeta.metaDelete(null, null, MetaTable.MODELS, this.id);
 
-    await NocoCache.del(
-      `${CacheScope.MODEL}:${this.project_id}:${this.id}`
-    );
-    await NocoCache.del(
-      `${CacheScope.MODEL}:${this.project_id}:${this.title}`
-    );
+    await NocoCache.del(`${CacheScope.MODEL}:${this.project_id}:${this.id}`);
+    await NocoCache.del(`${CacheScope.MODEL}:${this.project_id}:${this.title}`);
     return true;
   }
 
diff --git a/packages/nocodb/src/lib/noco/common/BaseApiBuilder.ts b/packages/nocodb/src/lib/noco/common/BaseApiBuilder.ts
index e822927af2..29cb78a069 100644
--- a/packages/nocodb/src/lib/noco/common/BaseApiBuilder.ts
+++ b/packages/nocodb/src/lib/noco/common/BaseApiBuilder.ts
@@ -32,7 +32,7 @@ import ncModelsOrderUpgrader from './jobs/ncModelsOrderUpgrader';
 import ncParentModelTitleUpgrader from './jobs/ncParentModelTitleUpgrader';
 import ncRemoveDuplicatedRelationRows from './jobs/ncRemoveDuplicatedRelationRows';
 import xcMetaDiffSync from './handlers/xcMetaDiffSync';
-import UITypes from '../../sqlUi/UITypes';
+import { UITypes } from 'nocodb-sdk';
 
 const log = debug('nc:api:base');
 
diff --git a/packages/nocodb/src/lib/noco/meta/NcMetaMgr.ts b/packages/nocodb/src/lib/noco/meta/NcMetaMgr.ts
index 53b50e0929..5fa391d0c9 100644
--- a/packages/nocodb/src/lib/noco/meta/NcMetaMgr.ts
+++ b/packages/nocodb/src/lib/noco/meta/NcMetaMgr.ts
@@ -37,9 +37,9 @@ import { packageVersion } from 'nc-help';
 import NcMetaIO, { META_TABLES } from './NcMetaIO';
 import { promisify } from 'util';
 import NcTemplateParser from '../../templateParser/NcTemplateParser';
-import UITypes from '../../sqlUi/UITypes';
 import { defaultConnectionConfig } from '../../utils/NcConfigFactory';
 import xcMetaDiff from './handlers/xcMetaDiff';
+import { UITypes } from 'nocodb-sdk';
 const randomID = customAlphabet('1234567890abcdefghijklmnopqrstuvwxyz_', 10);
 const XC_PLUGIN_DET = 'XC_PLUGIN_DET';
 
diff --git a/packages/nocodb/src/lib/noco/meta/api/columnApis.ts b/packages/nocodb/src/lib/noco/meta/api/columnApis.ts
index 4b1d8dc84d..36165f98d4 100644
--- a/packages/nocodb/src/lib/noco/meta/api/columnApis.ts
+++ b/packages/nocodb/src/lib/noco/meta/api/columnApis.ts
@@ -1,6 +1,5 @@
 import { Request, Response, Router } from 'express';
 import Model from '../../../noco-models/Model';
-import UITypes from '../../../sqlUi/UITypes';
 import ProjectMgrv2 from '../../../sqlMgr/v2/ProjectMgrv2';
 import Base from '../../../noco-models/Base';
 import Column from '../../../noco-models/Column';
@@ -20,7 +19,8 @@ import {
   isVirtualCol,
   LinkToAnotherRecordType,
   RelationTypes,
-  TableType
+  TableType,
+  UITypes
 } from 'nocodb-sdk';
 import Audit from '../../../noco-models/Audit';
 import SqlMgrv2 from '../../../sqlMgr/v2/SqlMgrv2';
diff --git a/packages/nocodb/src/lib/noco/meta/api/metaDiffApis.ts b/packages/nocodb/src/lib/noco/meta/api/metaDiffApis.ts
index b1a3c5909f..d1b03a5f87 100644
--- a/packages/nocodb/src/lib/noco/meta/api/metaDiffApis.ts
+++ b/packages/nocodb/src/lib/noco/meta/api/metaDiffApis.ts
@@ -4,7 +4,7 @@ import ncMetaAclMw from '../helpers/ncMetaAclMw';
 import Model from '../../../noco-models/Model';
 import Project from '../../../noco-models/Project';
 import NcConnectionMgrv2 from '../../common/NcConnectionMgrv2';
-import { isVirtualCol, ModelTypes, RelationTypes } from 'nocodb-sdk';
+import { isVirtualCol, ModelTypes, RelationTypes, UITypes } from 'nocodb-sdk';
 import { Router } from 'express';
 import Base from '../../../noco-models/Base';
 import ModelXcMetaFactory from '../../../sqlMgr/code/models/xc/ModelXcMetaFactory';
@@ -13,7 +13,6 @@ import LinkToAnotherRecordColumn from '../../../noco-models/LinkToAnotherRecordC
 import { getUniqueColumnAliasName } from '../helpers/getUniqueName';
 import NcHelp from '../../../utils/NcHelp';
 import getTableNameAlias, { getColumnNameAlias } from '../helpers/getTableName';
-import UITypes from '../../../sqlUi/UITypes';
 import mapDefaultPrimaryValue from '../helpers/mapDefaultPrimaryValue';
 import { Tele } from 'nc-help';
 import getColumnUiType from '../helpers/getColumnUiType';
diff --git a/packages/nocodb/src/lib/noco/meta/api/projectApis.ts b/packages/nocodb/src/lib/noco/meta/api/projectApis.ts
index a35bba442a..67bab8f3f6 100644
--- a/packages/nocodb/src/lib/noco/meta/api/projectApis.ts
+++ b/packages/nocodb/src/lib/noco/meta/api/projectApis.ts
@@ -1,6 +1,6 @@
 import { Request, Response } from 'express';
 import Project from '../../../noco-models/Project';
-import { ModelTypes, ProjectListType } from 'nocodb-sdk';
+import { ModelTypes, ProjectListType, UITypes } from 'nocodb-sdk';
 
 import { PagedResponseImpl } from '../helpers/PagedResponse';
 import syncMigration from '../helpers/syncMigration';
@@ -11,7 +11,6 @@ import NcHelp from '../../../utils/NcHelp';
 import Base from '../../../noco-models/Base';
 import NcConnectionMgrv2 from '../../common/NcConnectionMgrv2';
 import getTableNameAlias, { getColumnNameAlias } from '../helpers/getTableName';
-import UITypes from '../../../sqlUi/UITypes';
 import LinkToAnotherRecordColumn from '../../../noco-models/LinkToAnotherRecordColumn';
 import ncMetaAclMw from '../helpers/ncMetaAclMw';
 import ProjectUser from '../../../noco-models/ProjectUser';
diff --git a/packages/nocodb/src/lib/noco/meta/api/publicApis/publicMetaApis.ts b/packages/nocodb/src/lib/noco/meta/api/publicApis/publicMetaApis.ts
index 35a8f71c83..1516c07405 100644
--- a/packages/nocodb/src/lib/noco/meta/api/publicApis/publicMetaApis.ts
+++ b/packages/nocodb/src/lib/noco/meta/api/publicApis/publicMetaApis.ts
@@ -2,8 +2,7 @@ import { Request, Response, Router } from 'express';
 import catchError, { NcError } from '../../helpers/catchError';
 import View from '../../../../noco-models/View';
 import Model from '../../../../noco-models/Model';
-import UITypes from '../../../../sqlUi/UITypes';
-import { ErrorMessages, LinkToAnotherRecordType } from 'nocodb-sdk';
+import { ErrorMessages, LinkToAnotherRecordType, UITypes } from 'nocodb-sdk';
 import Column from '../../../../noco-models/Column';
 import Base from '../../../../noco-models/Base';
 import Project from '../../../../noco-models/Project';
diff --git a/packages/nocodb/src/lib/noco/meta/handlersv2/ncCreateLookup.ts b/packages/nocodb/src/lib/noco/meta/handlersv2/ncCreateLookup.ts
index eb7550b839..b49d5b1f83 100644
--- a/packages/nocodb/src/lib/noco/meta/handlersv2/ncCreateLookup.ts
+++ b/packages/nocodb/src/lib/noco/meta/handlersv2/ncCreateLookup.ts
@@ -1,6 +1,6 @@
 import { NcContextV2 } from '../NcMetaMgrv2';
 import Column from '../../../noco-models/Column';
-import UITypes from '../../../sqlUi/UITypes';
+import { UITypes } from 'nocodb-sdk';
 
 export default async function(this: NcContextV2, { args }: any) {
   if (
diff --git a/packages/nocodb/src/lib/noco/migrationsv2/nc_011.ts b/packages/nocodb/src/lib/noco/migrationsv2/nc_011.ts
index 56afd1c8cd..846c85ef2b 100644
--- a/packages/nocodb/src/lib/noco/migrationsv2/nc_011.ts
+++ b/packages/nocodb/src/lib/noco/migrationsv2/nc_011.ts
@@ -878,27 +878,38 @@ const up = async knex => {
 };
 
 const down = async knex => {
-  // todo: update order based on relation and add missing drop statements
-  // TODO : delete relations
-  await knex.schema.dropTable(MetaTable.PROJECT);
-  await knex.schema.dropTable(MetaTable.BASES);
-  await knex.schema.dropTable(MetaTable.MODELS);
-  await knex.schema.dropTable(MetaTable.COLUMNS);
-  await knex.schema.dropTable(MetaTable.COL_RELATIONS);
-  await knex.schema.dropTable(MetaTable.COL_RELATIONS);
-  await knex.schema.dropTable(MetaTable.FILTER_EXP);
-  await knex.schema.dropTable(MetaTable.SORT);
-  await knex.schema.dropTable(MetaTable.SHARED_VIEWS);
-  await knex.schema.dropTable(MetaTable.FORM_VIEW);
-  await knex.schema.dropTable(MetaTable.FORM_VIEW_COLUMNS);
-  await knex.schema.dropTable(MetaTable.GALLERY_VIEW);
-  await knex.schema.dropTable(MetaTable.GALLERY_VIEW_COLUMNS);
-  await knex.schema.dropTable(MetaTable.KANBAN_VIEW);
+  await knex.schema.dropTable(MetaTable.MODEL_ROLE_VISIBILITY);
+  await knex.schema.dropTable(MetaTable.PLUGIN);
+  await knex.schema.dropTable(MetaTable.AUDIT);
+  await knex.schema.dropTable(MetaTable.TEAM_USERS);
+  await knex.schema.dropTable(MetaTable.TEAMS);
+  await knex.schema.dropTable(MetaTable.ORGS);
+  await knex.schema.dropTable(MetaTable.PROJECT_USERS);
+  await knex.schema.dropTable(MetaTable.USERS);
   await knex.schema.dropTable(MetaTable.KANBAN_VIEW_COLUMNS);
-
-  await knex.schema.dropTable(MetaTable.COL_LOOKUP);
-  await knex.schema.dropTable(MetaTable.COL_FORMULA);
+  await knex.schema.dropTable(MetaTable.KANBAN_VIEW);
+  await knex.schema.dropTable(MetaTable.GRID_VIEW_COLUMNS);
+  await knex.schema.dropTable(MetaTable.GRID_VIEW);
+  await knex.schema.dropTable(MetaTable.GALLERY_VIEW_COLUMNS);
+  await knex.schema.dropTable(MetaTable.GALLERY_VIEW);
+  await knex.schema.dropTable(MetaTable.FORM_VIEW_COLUMNS);
+  await knex.schema.dropTable(MetaTable.FORM_VIEW);
+  await knex.schema.dropTable(MetaTable.SHARED_VIEWS);
+  await knex.schema.dropTable(MetaTable.SORT);
+  await knex.schema.dropTable(MetaTable.FILTER_EXP);
+  await knex.schema.dropTable(MetaTable.HOOK_LOGS);
+  await knex.schema.dropTable(MetaTable.HOOKS);
   await knex.schema.dropTable(MetaTable.VIEWS);
+  await knex.schema.dropTable(MetaTable.COL_FORMULA);
+  await knex.schema.dropTable(MetaTable.COL_ROLLUP);
+  await knex.schema.dropTable(MetaTable.COL_LOOKUP);
+  await knex.schema.dropTable(MetaTable.COL_SELECT_OPTIONS);
+  await knex.schema.dropTable(MetaTable.COL_RELATIONS);
+  await knex.schema.dropTable(MetaTable.COLUMN_VALIDATIONS);
+  await knex.schema.dropTable(MetaTable.COLUMNS);
+  await knex.schema.dropTable(MetaTable.MODELS);
+  await knex.schema.dropTable(MetaTable.BASES);
+  await knex.schema.dropTable(MetaTable.PROJECT);
 };
 
 export { up, down };
diff --git a/packages/nocodb/src/lib/noco/migrationsv2/nc_012_alter_column_data_types.ts b/packages/nocodb/src/lib/noco/migrationsv2/nc_012_alter_column_data_types.ts
index 6f643cba0f..1e6c965aa9 100644
--- a/packages/nocodb/src/lib/noco/migrationsv2/nc_012_alter_column_data_types.ts
+++ b/packages/nocodb/src/lib/noco/migrationsv2/nc_012_alter_column_data_types.ts
@@ -5,22 +5,34 @@ const up = async (knex: Knex) => {
   if (knex.client.config.client !== 'sqlite3') {
     await knex.schema.alterTable(MetaTable.COLUMNS, table => {
       table.text('cdf').alter();
+    });
+    await knex.schema.alterTable(MetaTable.COLUMNS, table => {
       table.text('dtxp').alter();
+    });
+    await knex.schema.alterTable(MetaTable.COLUMNS, table => {
       table.text('cc').alter();
+    });
+    await knex.schema.alterTable(MetaTable.COLUMNS, table => {
       table.text('ct').alter();
     });
   }
 };
 
 const down = async knex => {
-  await knex.schema.alterTable(MetaTable.COLUMNS, table => {
-    if (knex.client.config.client !== 'sqlite3') {
+  if (knex.client.config.client !== 'sqlite3') {
+    await knex.schema.alterTable(MetaTable.COLUMNS, table => {
       table.string('cdf').alter();
+    });
+    await knex.schema.alterTable(MetaTable.COLUMNS, table => {
       table.string('dtxp').alter();
+    });
+    await knex.schema.alterTable(MetaTable.COLUMNS, table => {
       table.string('cc').alter();
+    });
+    await knex.schema.alterTable(MetaTable.COLUMNS, table => {
       table.string('ct').alter();
-    }
-  });
+    });
+  }
 };
 
 export { up, down };
diff --git a/packages/nocodb/src/lib/noco/upgrader/jobs/ncProjectUpgraderV2_0090000.ts b/packages/nocodb/src/lib/noco/upgrader/jobs/ncProjectUpgraderV2_0090000.ts
index d65745b0c5..11b87feb59 100644
--- a/packages/nocodb/src/lib/noco/upgrader/jobs/ncProjectUpgraderV2_0090000.ts
+++ b/packages/nocodb/src/lib/noco/upgrader/jobs/ncProjectUpgraderV2_0090000.ts
@@ -4,10 +4,9 @@ import User from '../../../noco-models/User';
 import Project from '../../../noco-models/Project';
 import ProjectUser from '../../../noco-models/ProjectUser';
 import Model from '../../../noco-models/Model';
-import { ModelTypes, ViewTypes } from 'nocodb-sdk';
+import { ModelTypes, UITypes, ViewTypes } from 'nocodb-sdk';
 import Column from '../../../noco-models/Column';
 import LinkToAnotherRecordColumn from '../../../noco-models/LinkToAnotherRecordColumn';
-import UITypes from '../../../sqlUi/UITypes';
 import NcHelp from '../../../utils/NcHelp';
 import { substituteColumnAliasWithIdInFormula } from '../../meta/helpers/formulaHelpers';
 import RollupColumn from '../../../noco-models/RollupColumn';
@@ -44,9 +43,9 @@ export default async function(ctx: NcUpgraderCtx) {
     await projectBuilder.init();
   }
 
-  await migrateUsers(ncMeta);
+  const usersObj = await migrateUsers(ncMeta);
   const projectsObj = await migrateProjects(ncMeta);
-  await migrateProjectUsers(ncMeta);
+  await migrateProjectUsers(projectsObj, usersObj, ncMeta);
   const migrationCtx = await migrateProjectModels(ncMeta);
 
   await migrateUIAcl(migrationCtx, ncMeta);
@@ -59,12 +58,13 @@ export default async function(ctx: NcUpgraderCtx) {
 
 async function migrateUsers(ncMeta = Noco.ncMeta) {
   const users = await ncMeta.metaList(null, null, 'xc_users');
-  const userList: User[] = [];
+  const userObj: { [id: string]: User } = {};
 
   for (const user of users) {
-    userList.push(await User.insert(user, ncMeta));
+    const user1 = await User.insert(user, ncMeta);
+    userObj[user1.id] = user1;
   }
-  return userList;
+  return userObj;
 }
 
 async function migrateProjects(
@@ -102,10 +102,20 @@ async function migrateProjects(
   return projectsObj;
 }
 
-async function migrateProjectUsers(ncMeta = Noco.ncMeta) {
+async function migrateProjectUsers(
+  projectsObj: { [p: string]: Project },
+  usersObj: { [p: string]: User },
+  ncMeta = Noco.ncMeta
+) {
   const projectUsers = await ncMeta.metaList(null, null, 'nc_projects_users');
 
   for (const projectUser of projectUsers) {
+    // skip if project is missing
+    if (!(projectUser.project_id in projectsObj)) continue;
+
+    // skip if user is missing
+    if (!(projectUser.user_id in usersObj)) continue;
+
     await ProjectUser.insert(
       {
         project_id: projectUser.project_id,
@@ -200,6 +210,7 @@ interface Formulav1 {
   formula: {
     value: string;
     tree: any;
+    error: string[] | string;
   };
 }
 
@@ -650,10 +661,20 @@ async function migrateProjectModels(
               const colBody: any = {
                 _cn: columnMeta._cn
               };
-              colBody.formula = await substituteColumnAliasWithIdInFormula(
-                columnMeta.formula.value,
-                await model.getColumns(ncMeta)
-              );
+              if (columnMeta?.formula?.error?.length) {
+                colBody.error = Array.isArray(columnMeta.formula.error)
+                  ? columnMeta.formula.error.join(',')
+                  : columnMeta.formula.error;
+              } else {
+                try {
+                  colBody.formula = await substituteColumnAliasWithIdInFormula(
+                    columnMeta.formula.value,
+                    await model.getColumns(ncMeta)
+                  );
+                } catch {
+                  colBody.error = 'Invalid formula';
+                }
+              }
               colBody.formula_raw = columnMeta.formula.value;
               const column = await Column.insert(
                 {
@@ -1085,21 +1106,28 @@ async function migrateSharedViews(ctx: MigrateCtxV1, ncMeta: any) {
 
   for (const sharedView of sharedViews) {
     let fk_view_id;
+
+    // if missing view name or model name skip the shared view migration
+    if (!sharedView.view_name || !sharedView.model_name) continue;
+
     if (sharedView.view_type !== 'table' && sharedView.view_type !== 'view') {
       fk_view_id =
-        ctx.objViewRef[sharedView.project_id][sharedView.model_name][
+        ctx.objViewRef[sharedView.project_id]?.[sharedView.model_name]?.[
           sharedView.view_name
-        ].id;
+        ]?.id;
     } else {
       fk_view_id =
-        ctx.objViewRef[sharedView.project_id][sharedView.model_name][
-          ctx.objModelRef[sharedView.project_id][sharedView.model_name].title
-        ].id ||
-        ctx.objViewRef[sharedView.project_id][sharedView.model_name][
+        ctx.objViewRef[sharedView.project_id]?.[sharedView.model_name]?.[
+          ctx.objModelRef[sharedView.project_id]?.[sharedView.model_name]?.title
+        ]?.id ||
+        ctx.objViewRef[sharedView.project_id]?.[sharedView.model_name]?.[
           sharedView.model_name
-        ].id;
+        ]?.id;
     }
 
+    // if view id missing skip shared view migration
+    if (!fk_view_id) continue;
+
     await View.update(
       fk_view_id,
       {
diff --git a/packages/nocodb/src/lib/sqlMgr/code/models/xc/BaseModelXcMeta.ts b/packages/nocodb/src/lib/sqlMgr/code/models/xc/BaseModelXcMeta.ts
index 2a055d6c85..05a97f1c61 100644
--- a/packages/nocodb/src/lib/sqlMgr/code/models/xc/BaseModelXcMeta.ts
+++ b/packages/nocodb/src/lib/sqlMgr/code/models/xc/BaseModelXcMeta.ts
@@ -1,6 +1,6 @@
 import BaseRender from '../../BaseRender';
-import UITypes from '../../../../sqlUi/UITypes';
 import mapDefaultPrimaryValue from '../../../../noco/meta/helpers/mapDefaultPrimaryValue';
+import { UITypes } from 'nocodb-sdk';
 
 abstract class BaseModelXcMeta extends BaseRender {
   protected abstract _getAbstractType(column: any): any;
diff --git a/packages/nocodb/src/lib/sqlUi/MssqlUi.ts b/packages/nocodb/src/lib/sqlUi/MssqlUi.ts
deleted file mode 100644
index 14287e2f49..0000000000
--- a/packages/nocodb/src/lib/sqlUi/MssqlUi.ts
+++ /dev/null
@@ -1,1341 +0,0 @@
-const dbTypes = [
-  'bigint',
-  'binary',
-  'bit',
-  'char',
-  'date',
-  'datetime',
-  'datetime2',
-  'datetimeoffset',
-  'decimal',
-  'float',
-  'geography',
-  'geometry',
-  'heirarchyid',
-  'image',
-  'int',
-  'money',
-  'nchar',
-  'ntext',
-  'numeric',
-  'nvarchar',
-  'real',
-  'json',
-  'smalldatetime',
-  'smallint',
-  'smallmoney',
-  'sql_variant',
-  'sysname',
-  'text',
-  'time',
-  'timestamp',
-  'tinyint',
-  'uniqueidentifier',
-  'varbinary',
-  'xml',
-  'varchar'
-];
-
-export class MssqlUi {
-  static getNewTableColumns() {
-    return [
-      {
-        column_name: 'id',
-        dt: 'int',
-        dtx: 'integer',
-        ct: 'int(11)',
-        nrqd: false,
-        rqd: true,
-        ck: false,
-        pk: true,
-        un: false,
-        ai: true,
-        cdf: null,
-        clen: null,
-        np: null,
-        ns: 0,
-        dtxp: '',
-        dtxs: '',
-        altered: 1,
-        uidt: 'ID',
-        uip: '',
-        uicn: ''
-      },
-      {
-        column_name: 'title',
-        dt: 'varchar',
-        dtx: 'specificType',
-        ct: 'varchar(45)',
-        nrqd: true,
-        rqd: false,
-        ck: false,
-        pk: false,
-        un: false,
-        ai: false,
-        cdf: null,
-        clen: 45,
-        np: null,
-        ns: null,
-        dtxp: '45',
-        dtxs: '',
-        altered: 1,
-        uidt: 'SingleLineText',
-        uip: '',
-        uicn: ''
-      },
-      {
-        column_name: 'created_at',
-        dt: 'datetime',
-        dtx: 'specificType',
-        ct: 'varchar(45)',
-        nrqd: true,
-        rqd: false,
-        ck: false,
-        pk: false,
-        un: false,
-        ai: false,
-        cdf: 'GETDATE()',
-        clen: 45,
-        np: null,
-        ns: null,
-        dtxp: '',
-        dtxs: '',
-        altered: 1,
-        uidt: 'CreateTime',
-        uip: '',
-        uicn: ''
-      },
-      {
-        column_name: 'updated_at',
-        dt: 'datetime',
-        dtx: 'specificType',
-        ct: 'varchar(45)',
-        nrqd: true,
-        rqd: false,
-        ck: false,
-        pk: false,
-        un: false,
-        ai: false,
-        cdf: 'GETDATE()',
-        clen: 45,
-        np: null,
-        ns: null,
-        dtxp: '',
-        dtxs: '',
-        altered: 1,
-        uidt: 'LastModifiedTime',
-        uip: '',
-        uicn: ''
-      }
-    ];
-  }
-
-  static getNewColumn(suffix) {
-    return {
-      column_name: 'title' + suffix,
-      dt: 'int',
-      dtx: 'specificType',
-      ct: 'integer(11)',
-      nrqd: true,
-      rqd: false,
-      ck: false,
-      pk: false,
-      un: false,
-      ai: false,
-      cdf: null,
-      clen: 45,
-      np: null,
-      ns: null,
-      // data_type_x_specific: ' ',
-      dtxp: '',
-      dtxs: ' ',
-      altered: 1,
-      uidt: 'Number',
-      uip: '',
-      uicn: ''
-    };
-  }
-
-  // static getDefaultLengthForDatatype(type) {
-  //   switch (type) {
-  //     case "int":
-  //       return 11;
-  //       break;
-  //     case "tinyint":
-  //       return 1;
-  //       break;
-  //     case "smallint":
-  //       return 5;
-  //       break;
-  //
-  //     case "mediumint":
-  //       return 9;
-  //       break;
-  //     case "bigint":
-  //       return 20;
-  //       break;
-  //     case "bit":
-  //       return 64;
-  //       break;
-  //     case "boolean":
-  //       return '';
-  //       break;
-  //     case "float":
-  //       return 12;
-  //       break;
-  //     case "decimal":
-  //       return 10;
-  //       break;
-  //     case "double":
-  //       return 22;
-  //       break;
-  //     case "serial":
-  //       return 20;
-  //       break;
-  //     case "date":
-  //       return '';
-  //       break;
-  //     case "datetime":
-  //     case "timestamp":
-  //       return 6;
-  //       break;
-  //     case "time":
-  //       return '';
-  //       break;
-  //     case "year":
-  //       return '';
-  //       break;
-  //     case "char":
-  //       return 255;
-  //       break;
-  //     case "varchar":
-  //       return 45;
-  //       break;
-  //     case "nchar":
-  //       return 255;
-  //       break;
-  //     case "text":
-  //       return '';
-  //       break;
-  //     case "tinytext":
-  //       return '';
-  //       break;
-  //     case "mediumtext":
-  //       return '';
-  //       break;
-  //     case "longtext":
-  //       return ''
-  //       break;
-  //     case "binary":
-  //       return 255;
-  //       break;
-  //     case "varbinary":
-  //       return 65500;
-  //       break;
-  //     case "blob":
-  //       return '';
-  //       break;
-  //     case "tinyblob":
-  //       return '';
-  //       break;
-  //     case "mediumblob":
-  //       return '';
-  //       break;
-  //     case "longblob":
-  //       return '';
-  //       break;
-  //     case "enum":
-  //       return '\'a\',\'b\'';
-  //       break;
-  //     case "set":
-  //       return '\'a\',\'b\'';
-  //       break;
-  //     case "geometry":
-  //       return '';
-  //     case "point":
-  //       return '';
-  //     case "linestring":
-  //       return '';
-  //     case "polygon":
-  //       return '';
-  //     case "multipoint":
-  //       return '';
-  //     case "multilinestring":
-  //       return '';
-  //     case "multipolygon":
-  //       return '';
-  //     case "json":
-  //       return ''
-  //       break;
-  //
-  //   }
-  //
-  // }
-
-  static getDefaultLengthForDatatype(type) {
-    switch (type) {
-      case 'bigint':
-        return '';
-
-      case 'binary':
-        return '';
-
-      case 'bit':
-        return '';
-
-      case 'char':
-        return '';
-
-      case 'date':
-        return '';
-
-      case 'datetime':
-        return '';
-
-      case 'datetime2':
-        return '';
-
-      case 'datetimeoffset':
-        return '';
-
-      case 'decimal':
-        return '';
-
-      case 'float':
-        return '';
-
-      case 'geography':
-        return '';
-
-      case 'geometry':
-        return '';
-
-      case 'heirarchyid':
-        return '';
-
-      case 'image':
-        return '';
-
-      case 'int':
-        return '';
-
-      case 'money':
-        return '';
-
-      case 'nchar':
-        return '';
-
-      case 'ntext':
-        return '';
-
-      case 'numeric':
-        return '';
-
-      case 'nvarchar':
-        return '';
-
-      case 'real':
-        return '';
-
-      case 'json':
-        return '';
-
-      case 'smalldatetime':
-        return '';
-
-      case 'smallint':
-        return '';
-
-      case 'smallmoney':
-        return '';
-
-      case 'sql_variant':
-        return '';
-
-      case 'sysname':
-        return '';
-
-      case 'text':
-        return '';
-
-      case 'time':
-        return '';
-
-      case 'timestamp':
-        return '';
-
-      case 'tinyint':
-        return '';
-
-      case 'uniqueidentifier':
-        return '';
-
-      case 'varbinary':
-        return '';
-
-      case 'xml':
-        return '';
-
-      case 'varchar':
-        return '';
-
-      default:
-        return '';
-    }
-  }
-
-  static getDefaultLengthIsDisabled(type) {
-    switch (type) {
-      case 'bigint':
-      case 'binary':
-      case 'bit':
-      case 'char':
-      case 'date':
-      case 'datetime':
-      case 'datetime2':
-      case 'datetimeoffset':
-      case 'decimal':
-      case 'float':
-      case 'geography':
-      case 'geometry':
-      case 'heirarchyid':
-      case 'image':
-      case 'int':
-      case 'money':
-      case 'nchar':
-      case 'ntext':
-      case 'numeric':
-      case 'nvarchar':
-      case 'real':
-      case 'json':
-      case 'smalldatetime':
-      case 'smallint':
-      case 'smallmoney':
-      case 'sql_variant':
-      case 'sysname':
-      case 'text':
-      case 'time':
-      case 'timestamp':
-      case 'tinyint':
-      case 'uniqueidentifier':
-      case 'varbinary':
-      case 'xml':
-        return true;
-
-      case 'varchar':
-        return false;
-
-      default:
-        return true;
-    }
-  }
-
-  static getDefaultValueForDatatype(type) {
-    switch (type) {
-      case 'bigint':
-        return 'eg: ';
-
-      case 'binary':
-        return 'eg: ';
-
-      case 'bit':
-        return 'eg: ';
-
-      case 'char':
-        return 'eg: ';
-
-      case 'date':
-        return 'eg: ';
-
-      case 'datetime':
-        return 'eg: ';
-
-      case 'datetime2':
-        return 'eg: ';
-
-      case 'datetimeoffset':
-        return 'eg: ';
-
-      case 'decimal':
-        return 'eg: ';
-
-      case 'float':
-        return 'eg: ';
-
-      case 'geography':
-        return 'eg: ';
-
-      case 'geometry':
-        return 'eg: ';
-
-      case 'heirarchyid':
-        return 'eg: ';
-
-      case 'image':
-        return 'eg: ';
-
-      case 'int':
-        return 'eg: ';
-
-      case 'money':
-        return 'eg: ';
-
-      case 'nchar':
-        return 'eg: ';
-
-      case 'ntext':
-        return 'eg: ';
-
-      case 'numeric':
-        return 'eg: ';
-
-      case 'nvarchar':
-        return 'eg: ';
-
-      case 'real':
-        return 'eg: ';
-
-      case 'json':
-        return 'eg: ';
-
-      case 'smalldatetime':
-        return 'eg: ';
-
-      case 'smallint':
-        return 'eg: ';
-
-      case 'smallmoney':
-        return 'eg: ';
-
-      case 'sql_variant':
-        return 'eg: ';
-
-      case 'sysname':
-        return 'eg: ';
-
-      case 'text':
-        return 'eg: ';
-
-      case 'time':
-        return 'eg: ';
-
-      case 'timestamp':
-        return 'eg: ';
-
-      case 'tinyint':
-        return 'eg: ';
-
-      case 'uniqueidentifier':
-        return 'eg: ';
-
-      case 'varbinary':
-        return 'eg: ';
-
-      case 'xml':
-        return 'eg: ';
-
-      case 'varchar':
-        return 'eg: ';
-
-      default:
-        return '';
-    }
-  }
-
-  static getDefaultScaleForDatatype(type) {
-    switch (type) {
-      case 'bigint':
-        return '';
-
-      case 'binary':
-        return '';
-
-      case 'bit':
-        return '';
-
-      case 'char':
-        return '';
-
-      case 'date':
-        return '';
-
-      case 'datetime':
-        return '';
-
-      case 'datetime2':
-        return '';
-
-      case 'datetimeoffset':
-        return '';
-
-      case 'decimal':
-        return '';
-
-      case 'float':
-        return '';
-
-      case 'geography':
-        return '';
-
-      case 'geometry':
-        return '';
-
-      case 'heirarchyid':
-        return '';
-
-      case 'image':
-        return '';
-
-      case 'int':
-        return '';
-
-      case 'money':
-        return '';
-
-      case 'nchar':
-        return '';
-
-      case 'ntext':
-        return '';
-
-      case 'numeric':
-        return '';
-
-      case 'nvarchar':
-        return '';
-
-      case 'real':
-        return '';
-
-      case 'json':
-        return '';
-
-      case 'smalldatetime':
-        return '';
-
-      case 'smallint':
-        return '';
-
-      case 'smallmoney':
-        return '';
-
-      case 'sql_variant':
-        return '';
-
-      case 'sysname':
-        return '';
-
-      case 'text':
-        return '';
-
-      case 'time':
-        return '';
-
-      case 'timestamp':
-        return '';
-
-      case 'tinyint':
-        return '';
-
-      case 'uniqueidentifier':
-        return '';
-
-      case 'varbinary':
-        return '';
-
-      case 'xml':
-        return '';
-
-      case 'varchar':
-        return '';
-
-      default:
-        return '';
-    }
-  }
-
-  static colPropAIDisabled(col, columns) {
-    // console.log(col);
-    if (
-      col.dt === 'int4' ||
-      col.dt === 'integer' ||
-      col.dt === 'bigint' ||
-      col.dt === 'smallint'
-    ) {
-      for (let i = 0; i < columns.length; ++i) {
-        if (columns[i].cn !== col.cn && columns[i].ai) {
-          return true;
-        }
-      }
-      return false;
-    } else {
-      return true;
-    }
-  }
-
-  static colPropUNDisabled(_col) {
-    // console.log(col);
-    return true;
-    // if (col.dt === 'int' ||
-    //   col.dt === 'tinyint' ||
-    //   col.dt === 'smallint' ||
-    //   col.dt === 'mediumint' ||
-    //   col.dt === 'bigint') {
-    //   return false;
-    // } else {
-    //   return true;
-    // }
-  }
-
-  static onCheckboxChangeAI(col) {
-    console.log(col);
-    if (
-      col.dt === 'int' ||
-      col.dt === 'bigint' ||
-      col.dt === 'smallint' ||
-      col.dt === 'tinyint'
-    ) {
-      col.altered = col.altered || 2;
-    }
-
-    // if (!col.ai) {
-    //   col.dtx = 'specificType'
-    // } else {
-    //   col.dtx = ''
-    // }
-  }
-
-  static showScale(_columnObj) {
-    return false;
-  }
-
-  static removeUnsigned(columns) {
-    for (let i = 0; i < columns.length; ++i) {
-      if (
-        columns[i].altered === 1 &&
-        !(
-          columns[i].dt === 'int' ||
-          columns[i].dt === 'bigint' ||
-          columns[i].dt === 'tinyint' ||
-          columns[i].dt === 'smallint' ||
-          columns[i].dt === 'mediumint'
-        )
-      ) {
-        columns[i].un = false;
-        console.log('>> resetting unsigned value', columns[i].cn);
-      }
-      console.log(columns[i].cn);
-    }
-  }
-
-  static columnEditable(colObj) {
-    return colObj.tn !== '_evolutions' || colObj.tn !== 'nc_evolutions';
-  }
-
-  static extractFunctionName(query) {
-    const reg = /^\s*CREATE\s+(?:OR\s+REPLACE\s*)?\s*FUNCTION\s+(?:[\w\d_]+\.)?([\w_\d]+)/i;
-    const match = query.match(reg);
-    return match && match[1];
-  }
-
-  static extractProcedureName(query) {
-    const reg = /^\s*CREATE\s+(?:OR\s+REPLACE\s*)?\s*PROCEDURE\s+(?:[\w\d_]+\.)?([\w_\d]+)/i;
-    const match = query.match(reg);
-    return match && match[1];
-  }
-
-  static handleRawOutput(result, headers) {
-    console.log(result);
-
-    if (Array.isArray(result) && result[0]) {
-      const keys = Object.keys(result[0]);
-      // set headers before settings result
-      for (let i = 0; i < keys.length; i++) {
-        const text = keys[i];
-        headers.push({ text, value: text, sortable: false });
-      }
-    } else if (result === undefined) {
-      headers.push({ text: 'Message', value: 'message', sortable: false });
-      result = [{ message: 'Success' }];
-    }
-    return result;
-  }
-
-  static splitQueries(query) {
-    /***
-     * we are splitting based on semicolon
-     * there are mechanism to escape semicolon within single/double quotes(string)
-     */
-    return query.match(/\b("[^"]*;[^"]*"|'[^']*;[^']*'|[^;])*;/g);
-  }
-
-  /**
-   * if sql statement is SELECT - it limits to a number
-   * @param args
-   * @returns {string|*}
-   */
-  sanitiseQuery(args) {
-    let q = args.query.trim().split(';');
-
-    if (q[0].startsWith('Select')) {
-      q = q[0] + ` LIMIT 0,${args.limit ? args.limit : 100};`;
-    } else if (q[0].startsWith('select')) {
-      q = q[0] + ` LIMIT 0,${args.limit ? args.limit : 100};`;
-    } else if (q[0].startsWith('SELECT')) {
-      q = q[0] + ` LIMIT 0,${args.limit ? args.limit : 100};`;
-    } else {
-      return args.query;
-    }
-
-    return q;
-  }
-
-  static getColumnsFromJson(json, tn) {
-    const columns = [];
-
-    try {
-      if (typeof json === 'object' && !Array.isArray(json)) {
-        const keys = Object.keys(json);
-        for (let i = 0; i < keys.length; ++i) {
-          const column = {
-            dp: null,
-            tn,
-            column_name: keys[i],
-            cno: keys[i],
-            np: 10,
-            ns: 0,
-            clen: null,
-            cop: 1,
-            pk: false,
-            nrqd: false,
-            rqd: false,
-            un: false,
-            ct: 'int(11) unsigned',
-            ai: false,
-            unique: false,
-            cdf: null,
-            cc: '',
-            csn: null,
-            dtx: 'specificType',
-            dtxp: null,
-            dtxs: 0,
-            altered: 1
-          };
-
-          switch (typeof json[keys[i]]) {
-            case 'number':
-              if (Number.isInteger(json[keys[i]])) {
-                if (MssqlUi.isValidTimestamp(keys[i], json[keys[i]])) {
-                  Object.assign(column, {
-                    dt: 'timestamp'
-                  });
-                } else {
-                  Object.assign(column, {
-                    dt: 'int',
-                    np: 10,
-                    ns: 0
-                  });
-                }
-              } else {
-                Object.assign(column, {
-                  dt: 'float',
-                  np: 10,
-                  ns: 2,
-                  dtxp: '11',
-                  dtxs: 2
-                });
-              }
-              break;
-            case 'string':
-              if (MssqlUi.isValidDate(json[keys[i]])) {
-                Object.assign(column, {
-                  dt: 'datetime'
-                });
-              } else if (json[keys[i]].length <= 255) {
-                Object.assign(column, {
-                  dt: 'varchar',
-                  np: 255,
-                  ns: 0,
-                  dtxp: '255'
-                });
-              } else {
-                Object.assign(column, {
-                  dt: 'text'
-                });
-              }
-              break;
-            case 'boolean':
-              Object.assign(column, {
-                dt: 'bit',
-                np: null,
-                ns: 0
-              });
-              break;
-            case 'object':
-              Object.assign(column, {
-                dt: 'varchar',
-                np: 255,
-                ns: 0,
-                dtxp: '255'
-              });
-              break;
-            default:
-              break;
-          }
-          columns.push(column);
-        }
-      }
-    } catch (e) {
-      console.log('Error in getColumnsFromJson', e);
-    }
-
-    return columns;
-  }
-
-  static isValidTimestamp(key, value) {
-    if (typeof value !== 'number') {
-      return false;
-    }
-    return new Date(value).getTime() > 0 && /(?:_|(?=A))[aA]t$/.test(key);
-  }
-
-  static isValidDate(value) {
-    return new Date(value).getTime() > 0;
-  }
-
-  static onCheckboxChangeAU(col) {
-    console.log(col);
-    // if (1) {
-    col.altered = col.altered || 2;
-    // }
-
-    // if (!col.ai) {
-    //   col.dtx = 'specificType'
-    // } else {
-    //   col.dtx = ''
-    // }
-  }
-
-  static colPropAuDisabled(col) {
-    if (col.altered !== 1) {
-      return true;
-    }
-
-    switch (col.dt) {
-      case 'date':
-      case 'datetime':
-      case 'datetime2':
-      case 'datetimeoffset':
-      case 'time':
-      case 'timestamp':
-        return false;
-
-      default:
-        return true;
-    }
-  }
-
-  static getAbstractType(col): any {
-    switch ((col.dt || col.dt).toLowerCase()) {
-      case 'smallint':
-      case 'bit':
-      case 'tinyint':
-      case 'int':
-        return 'integer';
-
-      case 'bigint':
-      case 'binary':
-      case 'char':
-        return 'string';
-
-      case 'date':
-        return 'date';
-      case 'datetime':
-      case 'datetime2':
-      case 'smalldatetime':
-      case 'datetimeoffset':
-        return 'datetime';
-      case 'decimal':
-      case 'float':
-        return 'float';
-
-      case 'geography':
-      case 'geometry':
-      case 'heirarchyid':
-      case 'image':
-        return 'string';
-
-      case 'money':
-      case 'nchar':
-        return 'string';
-
-      case 'ntext':
-        return 'text';
-      case 'numeric':
-        return 'float';
-      case 'nvarchar':
-        return 'string';
-      case 'real':
-        return 'float';
-
-      case 'json':
-        return 'json';
-
-      case 'smallmoney':
-      case 'sql_variant':
-      case 'sysname':
-        return 'string';
-      case 'text':
-        return 'text';
-      case 'time':
-        return 'time';
-      case 'timestamp':
-        return 'timestamp';
-
-      case 'uniqueidentifier':
-      case 'varbinary':
-      case 'xml':
-        return 'string';
-      case 'varchar':
-        return 'string';
-    }
-    return 'string';
-  }
-
-  static getUIType(col): any {
-    switch (this.getAbstractType(col)) {
-      case 'integer':
-        return 'Number';
-      case 'boolean':
-        return 'Checkbox';
-      case 'float':
-        return 'Decimal';
-      case 'date':
-        return 'Date';
-      case 'datetime':
-        return 'CreateTime';
-      case 'time':
-        return 'Time';
-      case 'year':
-        return 'Year';
-      case 'string':
-        return 'SingleLineText';
-      case 'text':
-        return 'LongText';
-      case 'blob':
-        return 'Attachment';
-      case 'enum':
-        return 'SingleSelect';
-      case 'set':
-        return 'MultiSelect';
-      case 'json':
-        return 'LongText';
-    }
-  }
-
-  static getDataTypeForUiType(
-    col
-  ): {
-    dt: string;
-    [key: string]: any;
-  } {
-    const colProp: any = {};
-    switch (col.uidt) {
-      case 'ID':
-        colProp.dt = 'int';
-        colProp.pk = true;
-        colProp.un = true;
-        colProp.ai = true;
-        colProp.rqd = true;
-        break;
-      case 'ForeignKey':
-        colProp.dt = 'varchar';
-        break;
-      case 'SingleLineText':
-        colProp.dt = 'varchar';
-        break;
-      case 'LongText':
-        colProp.dt = 'text';
-        break;
-      case 'Attachment':
-        colProp.dt = 'text';
-        break;
-      case 'Checkbox':
-        colProp.dt = 'tinyint';
-        colProp.dtxp = 1;
-        break;
-      case 'MultiSelect':
-        colProp.dt = 'text';
-        break;
-      case 'SingleSelect':
-        colProp.dt = 'text';
-        break;
-      case 'Collaborator':
-        colProp.dt = 'varchar';
-        break;
-      case 'Date':
-        colProp.dt = 'varchar';
-
-        break;
-      case 'Year':
-        colProp.dt = 'int';
-        break;
-      case 'Time':
-        colProp.dt = 'time';
-        break;
-      case 'PhoneNumber':
-        colProp.dt = 'varchar';
-        colProp.validate = {
-          func: ['isMobilePhone'],
-          args: [''],
-          msg: ['Validation failed : Invalid Mobile Format']
-        };
-        break;
-      case 'Email':
-        colProp.dt = 'varchar';
-        colProp.validate = {
-          func: ['isEmail'],
-          args: [''],
-          msg: ['Validation failed : Invalid Email Format']
-        };
-        break;
-      case 'URL':
-        colProp.dt = 'varchar';
-        colProp.validate = {
-          func: ['isURL'],
-          args: [''],
-          msg: ['Validation failed : Invalid URL Format']
-        };
-        break;
-      case 'Number':
-        colProp.dt = 'int';
-        break;
-      case 'Decimal':
-        colProp.dt = 'decimal';
-        break;
-      case 'Currency':
-        colProp.dt = 'decimal';
-        colProp.validate = {
-          func: ['isCurrency'],
-          args: [''],
-          msg: ['Validation failed : Invalid Currency Format']
-        };
-        break;
-      case 'Percent':
-        colProp.dt = 'double';
-        break;
-      case 'Duration':
-        colProp.dt = 'int';
-        break;
-      case 'Rating':
-        colProp.dt = 'float';
-        break;
-      case 'Formula':
-        colProp.dt = 'varchar';
-        break;
-      case 'Rollup':
-        colProp.dt = 'varchar';
-        break;
-      case 'Count':
-        colProp.dt = 'int';
-        break;
-      case 'Lookup':
-        colProp.dt = 'varchar';
-        break;
-      case 'DateTime':
-        colProp.dt = 'datetimeoffset';
-        break;
-      case 'CreateTime':
-        colProp.dt = 'datetime';
-        break;
-      case 'LastModifiedTime':
-        colProp.dt = 'datetime';
-        break;
-      case 'AutoNumber':
-        colProp.dt = 'int';
-        break;
-      case 'Barcode':
-        colProp.dt = 'varchar';
-        break;
-      case 'Button':
-        colProp.dt = 'varchar';
-        break;
-      default:
-        colProp.dt = 'varchar';
-        break;
-    }
-    return colProp;
-  }
-
-  static getDataTypeListForUiType(col) {
-    switch (col.uidt) {
-      case 'ID':
-      case 'ForeignKey':
-        return dbTypes;
-
-      case 'SingleLineText':
-      case 'LongText':
-      case 'Attachment':
-      case 'Collaborator':
-        return ['char', 'ntext', 'text', 'varchar', 'nvarchar'];
-
-      case 'JSON':
-        return ['text', 'ntext'];
-
-      case 'Checkbox':
-        return ['bigint', 'bit', 'int', 'tinyint'];
-
-      case 'MultiSelect':
-        return ['text', 'ntext'];
-
-      case 'SingleSelect':
-        return ['text', 'ntext'];
-
-      case 'Year':
-        return ['int'];
-
-      case 'Time':
-        return ['time'];
-
-      case 'PhoneNumber':
-      case 'Email':
-        return ['varchar'];
-
-      case 'URL':
-        return ['varchar', 'text'];
-
-      case 'Number':
-        return [
-          'int',
-          'bigint',
-          'bit',
-          'decimal',
-          'float',
-          'numeric',
-          'real',
-          'smallint',
-          'tinyint'
-        ];
-
-      case 'Decimal':
-        return ['decimal', 'float'];
-
-      case 'Currency':
-        return [
-          'int',
-          'bigint',
-          'bit',
-          'decimal',
-          'float',
-          'numeric',
-          'real',
-          'smallint',
-          'tinyint'
-        ];
-
-      case 'Percent':
-        return [
-          'int',
-          'bigint',
-          'bit',
-          'decimal',
-          'float',
-          'numeric',
-          'real',
-          'smallint',
-          'tinyint'
-        ];
-
-      case 'Duration':
-        return [
-          'int',
-          'bigint',
-          'bit',
-          'decimal',
-          'float',
-          'numeric',
-          'real',
-          'smallint',
-          'tinyint'
-        ];
-
-      case 'Rating':
-        return [
-          'int',
-          'bigint',
-          'bit',
-          'decimal',
-          'float',
-          'numeric',
-          'real',
-          'smallint',
-          'tinyint'
-        ];
-
-      case 'Formula':
-        return ['text', 'ntext', 'varchar', 'nvarchar'];
-
-      case 'Rollup':
-        return ['varchar'];
-
-      case 'Count':
-        return ['int', 'bigint', 'smallint', 'tinyint'];
-
-      case 'Lookup':
-        return ['varchar'];
-
-      case 'Date':
-        return ['date'];
-
-      case 'DateTime':
-      case 'CreateTime':
-      case 'LastModifiedTime':
-        return [
-          'datetimeoffset',
-          'datetime2'
-          // 'datetime'
-        ];
-
-      case 'AutoNumber':
-        return ['int', 'bigint', 'smallint', 'tinyint'];
-
-      case 'Barcode':
-        return ['varchar'];
-
-      case 'Geometry':
-        return ['geometry'];
-
-      case 'Button':
-      default:
-        return dbTypes;
-    }
-  }
-
-  static getUnsupportedFnList() {
-    return [];
-  }
-}
-
-// module.exports = PgUiHelp;
-/**
- * @copyright Copyright (c) 2021, Xgene Cloud Ltd
- *
- * @author Naveen MR <oof1lab@gmail.com>
- * @author Pranav C Balan <pranavxc@gmail.com>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
diff --git a/packages/nocodb/src/lib/sqlUi/MysqlUi.ts b/packages/nocodb/src/lib/sqlUi/MysqlUi.ts
deleted file mode 100644
index e9058a04d6..0000000000
--- a/packages/nocodb/src/lib/sqlUi/MysqlUi.ts
+++ /dev/null
@@ -1,1282 +0,0 @@
-const dbTypes = [
-  'int',
-  'smallint',
-  'mediumint',
-  'bigint',
-  'bit',
-  'boolean',
-  'float',
-  'decimal',
-  'double',
-  'serial',
-  'tinyint',
-  'date',
-  'datetime',
-  'timestamp',
-  'time',
-  'year',
-  'char',
-  'varchar',
-  'nchar',
-  'text',
-  'tinytext',
-  'mediumtext',
-  'longtext',
-  'binary',
-  'varbinary',
-  'blob',
-  'tinyblob',
-  'mediumblob',
-  'longblob',
-  'enum',
-  'set',
-  'geometry',
-  'point',
-  'linestring',
-  'polygon',
-  'multipoint',
-  'multilinestring',
-  'multipolygon',
-  'json'
-];
-
-export class MysqlUi {
-  static getNewTableColumns(): any[] {
-    return [
-      {
-        column_name: 'id',
-        dt: 'int',
-        dtx: 'integer',
-        ct: 'int(11)',
-        nrqd: false,
-        rqd: true,
-        ck: false,
-        pk: true,
-        un: true,
-        ai: true,
-        cdf: null,
-        clen: null,
-        np: 11,
-        ns: 0,
-        dtxp: '11',
-        dtxs: '',
-        altered: 1,
-        uidt: 'ID',
-        uip: '',
-        uicn: ''
-      },
-      {
-        column_name: 'title',
-        dt: 'varchar',
-        dtx: 'specificType',
-        ct: 'varchar(45)',
-        nrqd: true,
-        rqd: false,
-        ck: false,
-        pk: false,
-        un: false,
-        ai: false,
-        cdf: null,
-        clen: 45,
-        np: null,
-        ns: null,
-        dtxp: '45',
-        dtxs: '',
-        altered: 1,
-        uidt: 'SingleLineText',
-        uip: '',
-        uicn: ''
-      },
-      {
-        column_name: 'created_at',
-        dt: 'timestamp',
-        dtx: 'specificType',
-        ct: 'varchar(45)',
-        nrqd: true,
-        rqd: false,
-        ck: false,
-        pk: false,
-        un: false,
-        ai: false,
-        cdf: 'CURRENT_TIMESTAMP',
-        clen: 45,
-        np: null,
-        ns: null,
-        dtxp: '',
-        dtxs: '',
-        altered: 1,
-        uidt: 'CreateTime',
-        uip: '',
-        uicn: ''
-      },
-      {
-        column_name: 'updated_at',
-        dt: 'timestamp',
-        dtx: 'specificType',
-        ct: 'varchar(45)',
-        nrqd: true,
-        rqd: false,
-        ck: false,
-        pk: false,
-        un: false,
-        ai: false,
-        cdf: 'CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP',
-        clen: 45,
-        np: null,
-        ns: null,
-        dtxp: '',
-        dtxs: '',
-        altered: 1,
-        uidt: 'LastModifiedTime',
-        uip: '',
-        uicn: ''
-      }
-    ];
-  }
-
-  static getNewColumn(suffix) {
-    return {
-      column_name: 'title' + suffix,
-      dt: 'int',
-      dtx: 'specificType',
-      ct: 'integer(11)',
-      nrqd: true,
-      rqd: false,
-      ck: false,
-      pk: false,
-      un: false,
-      ai: false,
-      cdf: null,
-      clen: 45,
-      np: null,
-      ns: null,
-      // data_type_x_specific: ' ',
-      dtxp: '11',
-      dtxs: ' ',
-      altered: 1,
-      uidt: 'Number',
-      uip: '',
-      uicn: ''
-    };
-  }
-
-  static getDefaultLengthForDatatype(type): any {
-    switch (type) {
-      case 'int':
-        return 11;
-
-      case 'tinyint':
-        return 1;
-
-      case 'smallint':
-        return 5;
-
-      case 'mediumint':
-        return 9;
-
-      case 'bigint':
-        return 20;
-
-      case 'bit':
-        return 64;
-
-      case 'boolean':
-        return '';
-
-      case 'float':
-        return 12;
-
-      case 'decimal':
-        return 10;
-
-      case 'double':
-        return 22;
-
-      case 'serial':
-        return 20;
-
-      case 'date':
-        return '';
-
-      case 'datetime':
-      case 'timestamp':
-        return 6;
-
-      case 'time':
-        return '';
-
-      case 'year':
-        return '';
-
-      case 'char':
-        return 255;
-
-      case 'varchar':
-        return 255;
-
-      case 'nchar':
-        return 255;
-
-      case 'text':
-        return '';
-
-      case 'tinytext':
-        return '';
-
-      case 'mediumtext':
-        return '';
-
-      case 'longtext':
-        return '';
-
-      case 'binary':
-        return 255;
-
-      case 'varbinary':
-        return 65500;
-
-      case 'blob':
-        return '';
-
-      case 'tinyblob':
-        return '';
-
-      case 'mediumblob':
-        return '';
-
-      case 'longblob':
-        return '';
-
-      case 'enum':
-        return "'a','b'";
-
-      case 'set':
-        return "'a','b'";
-
-      case 'geometry':
-        return '';
-      case 'point':
-        return '';
-      case 'linestring':
-        return '';
-      case 'polygon':
-        return '';
-      case 'multipoint':
-        return '';
-      case 'multilinestring':
-        return '';
-      case 'multipolygon':
-        return '';
-      case 'json':
-        return '';
-    }
-  }
-
-  static getDefaultLengthIsDisabled(type): any {
-    switch (type) {
-      case 'int':
-      case 'tinyint':
-      case 'smallint':
-      case 'mediumint':
-      case 'bigint':
-      case 'float':
-      case 'decimal':
-      case 'double':
-      case 'serial':
-      case 'datetime':
-      case 'timestamp':
-      case 'char':
-      case 'varchar':
-      case 'nchar':
-      case 'binary':
-      case 'varbinary':
-      case 'enum':
-      case 'set':
-      case 'geometry':
-      case 'point':
-      case 'linestring':
-      case 'polygon':
-      case 'multipoint':
-      case 'multilinestring':
-      case 'multipolygon':
-      case 'json':
-      case 'bit':
-        return false;
-
-      case 'boolean':
-      case 'date':
-      case 'time':
-      case 'year':
-      case 'text':
-      case 'tinytext':
-      case 'mediumtext':
-      case 'longtext':
-      case 'blob':
-      case 'tinyblob':
-      case 'mediumblob':
-      case 'longblob':
-        return true;
-    }
-  }
-
-  static getDefaultValueForDatatype(type): any {
-    switch (type) {
-      case 'int':
-        return 'eg : ' + 10;
-
-      case 'tinyint':
-        return 'eg : ' + 1;
-
-      case 'smallint':
-        return 'eg : ' + 10;
-
-      case 'mediumint':
-        return 'eg : ' + 10;
-
-      case 'bigint':
-        return 'eg : ' + 100;
-
-      case 'bit':
-        return 'eg : ' + 1;
-
-      case 'boolean':
-        return 'eg : ' + 1;
-
-      case 'float':
-        return 'eg : ' + 10.0;
-
-      case 'decimal':
-        return 'eg : ' + 10.0;
-
-      case 'double':
-        return 'eg : ' + 10.0;
-
-      case 'serial':
-        return 'eg : ' + 100;
-
-      case 'date':
-        return 'eg : ' + '2020-09-09';
-
-      case 'datetime':
-        return (
-          'eg : ' +
-          'now()\n\nCURRENT_TIMESTAMP\n\nCURRENT_TIMESTAMP on update CURRENT_TIMESTAMP\n\n1992-10-12 00:00:00'
-        );
-
-      case 'timestamp':
-        return (
-          'eg : ' +
-          'now()\n\nCURRENT_TIMESTAMP\n\nCURRENT_TIMESTAMP on update CURRENT_TIMESTAMP\n\n1992-10-12 00:00:00'
-        );
-
-      case 'time':
-        return 'eg : ' + '00:00:00';
-
-      case 'year':
-        return 'eg : ' + '2020';
-
-      case 'char':
-        return 'eg : ' + 'a';
-
-      case 'varchar':
-        return 'eg : ' + 'hey';
-
-      case 'nchar':
-        return 'eg : ' + 'hey';
-
-      case 'text':
-        return 'eg : ' + 'hey';
-
-      case 'tinytext':
-        return 'eg : ' + 'hey';
-
-      case 'mediumtext':
-        return 'eg : ' + 'hey';
-
-      case 'longtext':
-        return 'eg : ' + 'hey';
-
-      case 'binary':
-        return 'eg : ' + 1;
-
-      case 'varbinary':
-        return 'eg : ' + 'hey';
-
-      case 'blob':
-        return 'eg : ' + 'hey';
-
-      case 'tinyblob':
-        return 'eg : ' + 'hey';
-
-      case 'mediumblob':
-        return 'eg : ' + 'hey';
-
-      case 'longblob':
-        return 'eg : ' + 'hey';
-
-      case 'enum':
-        return 'eg : ' + 'a';
-
-      case 'set':
-        return 'eg : ' + 'a';
-
-      case 'geometry':
-        return "geometry can't have default value";
-
-      case 'point':
-        return "point can't have default value";
-
-      case 'linestring':
-        return "linestring can't have default value";
-
-      case 'polygon':
-        return "polygon can't have default value";
-
-      case 'multipoint':
-        return "multipoint can't have default value";
-
-      case 'multilinestring':
-        return "multilinestring can't have default value";
-
-      case 'multipolygon':
-        return "multipolygon can't have default value";
-
-      case 'json':
-        return "JSON can't have default value";
-    }
-  }
-
-  static getDefaultScaleForDatatype(type): any {
-    switch (type) {
-      case 'int':
-        return ' ';
-
-      case 'tinyint':
-        return ' ';
-
-      case 'smallint':
-        return ' ';
-
-      case 'mediumint':
-        return ' ';
-
-      case 'bigint':
-        return ' ';
-
-      case 'bit':
-        return ' ';
-
-      case 'boolean':
-        return ' ';
-
-      case 'float':
-        return '2';
-
-      case 'decimal':
-        return '2';
-
-      case 'double':
-        return '2';
-
-      case 'serial':
-        return ' ';
-
-      case 'date':
-      case 'datetime':
-      case 'timestamp':
-        return ' ';
-
-      case 'time':
-        return ' ';
-
-      case 'year':
-        return ' ';
-
-      case 'char':
-        return ' ';
-
-      case 'varchar':
-        return ' ';
-
-      case 'nchar':
-        return ' ';
-
-      case 'text':
-        return ' ';
-
-      case 'tinytext':
-        return ' ';
-
-      case 'mediumtext':
-        return ' ';
-
-      case 'longtext':
-        return ' ';
-
-      case 'binary':
-        return ' ';
-
-      case 'varbinary':
-        return ' ';
-
-      case 'blob':
-        return ' ';
-
-      case 'tinyblob':
-        return ' ';
-
-      case 'mediumblob':
-        return ' ';
-
-      case 'longblob':
-        return ' ';
-
-      case 'enum':
-        return ' ';
-
-      case 'set':
-        return ' ';
-
-      case 'geometry':
-        return ' ';
-      case 'point':
-        return ' ';
-      case 'linestring':
-        return ' ';
-      case 'polygon':
-        return ' ';
-      case 'multipoint':
-        return ' ';
-      case 'multilinestring':
-        return ' ';
-      case 'multipolygon':
-        return ' ';
-      case 'json':
-        return ' ';
-    }
-  }
-
-  static colPropAIDisabled(col, columns) {
-    // console.log(col);
-    if (
-      col.dt === 'int' ||
-      col.dt === 'tinyint' ||
-      col.dt === 'bigint' ||
-      col.dt === 'smallint'
-    ) {
-      for (let i = 0; i < columns.length; ++i) {
-        if (columns[i].cn !== col.cn && columns[i].ai) {
-          return true;
-        }
-      }
-      return false;
-    } else {
-      return true;
-    }
-  }
-
-  static colPropUNDisabled(col) {
-    // console.log(col);
-    if (
-      col.dt === 'int' ||
-      col.dt === 'tinyint' ||
-      col.dt === 'smallint' ||
-      col.dt === 'mediumint' ||
-      col.dt === 'bigint'
-    ) {
-      return false;
-    } else {
-      return true;
-    }
-  }
-
-  static onCheckboxChangeAI(col) {
-    console.log(col);
-    if (
-      col.dt === 'int' ||
-      col.dt === 'bigint' ||
-      col.dt === 'smallint' ||
-      col.dt === 'tinyint'
-    ) {
-      col.altered = col.altered || 2;
-    }
-
-    // if (!col.ai) {
-    //   col.dtx = 'specificType'
-    // } else {
-    //   col.dtx = ''
-    // }
-  }
-
-  static onCheckboxChangeAU(col) {
-    console.log(col);
-    // if (1) {
-    col.altered = col.altered || 2;
-    // }
-
-    // if (!col.ai) {
-    //   col.dtx = 'specificType'
-    // } else {
-    //   col.dtx = ''
-    // }
-  }
-
-  static showScale(columnObj) {
-    return (
-      columnObj.dt === 'float' ||
-      columnObj.dt === 'decimal' ||
-      columnObj.dt === 'double' ||
-      columnObj.dt === 'real'
-    );
-  }
-
-  static removeUnsigned(columns) {
-    for (let i = 0; i < columns.length; ++i) {
-      if (
-        columns[i].altered === 1 &&
-        !(
-          columns[i].dt === 'int' ||
-          columns[i].dt === 'bigint' ||
-          columns[i].dt === 'tinyint' ||
-          columns[i].dt === 'smallint' ||
-          columns[i].dt === 'mediumint'
-        )
-      ) {
-        columns[i].un = false;
-        console.log('>> resetting unsigned value', columns[i].cn);
-      }
-      console.log(columns[i].cn);
-    }
-  }
-
-  static columnEditable(colObj) {
-    return colObj.tn !== '_evolutions' || colObj.tn !== 'nc_evolutions';
-  }
-
-  static extractFunctionName(query) {
-    const reg = /^\s*CREATE\s+.*?(?:OR\s+REPLACE\s*)?\s*FUNCTION\s+(?:`?[\w\d_]+`?\.)?`?([\w_\d]+)`?/i;
-    const match = query.match(reg);
-    return match && match[1];
-  }
-
-  static extractProcedureName(query) {
-    const reg = /^\s*CREATE.*?\s+(?:OR\s+REPLACE\s*)?\s*PROCEDURE\s+(?:[\w\d_]+\.)?([\w_\d]+)/i;
-    const match = query.match(reg);
-    return match && match[1];
-  }
-
-  static handleRawOutput(result, headers) {
-    result = result[0] ? result[0] : [];
-    if (Array.isArray(result) && result[0]) {
-      const keys = Object.keys(result[0]);
-      // set headers before settings result
-      for (let i = 0; i < keys.length; i++) {
-        const text = keys[i];
-        headers.push({ text, value: text, sortable: false });
-      }
-    } else {
-      const keys = Object.keys(result);
-      for (let i = 0; i < keys.length; i++) {
-        const text = keys[i];
-        if (typeof text !== 'function') {
-          headers.push({ text, value: text, sortable: false });
-        }
-      }
-      result = [result];
-    }
-    return result;
-  }
-
-  static splitQueries(query) {
-    /***
-     * we are splitting based on semicolon
-     * there are mechanism to escape semicolon within single/double quotes(string)
-     */
-    return query.match(/\b("[^"]*;[^"]*"|'[^']*;[^']*'|[^;])*;/g);
-  }
-
-  /**
-   * if sql statement is SELECT - it limits to a number
-   * @param args
-   * @returns {string|*}
-   */
-  static sanitiseQuery(args) {
-    let q = args.query.trim().split(';');
-
-    if (q[0].startsWith('Select')) {
-      q = q[0] + ` LIMIT 0,${args.limit ? args.limit : 100};`;
-    } else if (q[0].startsWith('select')) {
-      q = q[0] + ` LIMIT 0,${args.limit ? args.limit : 100};`;
-    } else if (q[0].startsWith('SELECT')) {
-      q = q[0] + ` LIMIT 0,${args.limit ? args.limit : 100};`;
-    } else {
-      return args.query;
-    }
-
-    return q;
-  }
-
-  static getColumnsFromJson(json, tn) {
-    const columns = [];
-
-    try {
-      if (typeof json === 'object' && !Array.isArray(json)) {
-        const keys = Object.keys(json);
-        for (let i = 0; i < keys.length; ++i) {
-          const column = {
-            dp: null,
-            tn,
-            column_name: keys[i],
-            cno: keys[i],
-            np: 10,
-            ns: 0,
-            clen: null,
-            cop: 1,
-            pk: false,
-            nrqd: false,
-            rqd: false,
-            un: false,
-            ct: 'int(11) unsigned',
-            ai: false,
-            unique: false,
-            cdf: null,
-            cc: '',
-            csn: null,
-            dtx: 'specificType',
-            dtxp: null,
-            dtxs: 0,
-            altered: 1
-          };
-
-          switch (typeof json[keys[i]]) {
-            case 'number':
-              if (Number.isInteger(json[keys[i]])) {
-                if (MysqlUi.isValidTimestamp(keys[i], json[keys[i]])) {
-                  Object.assign(column, {
-                    dt: 'timestamp'
-                  });
-                } else {
-                  Object.assign(column, {
-                    dt: 'int',
-                    np: 10,
-                    ns: 0
-                  });
-                }
-              } else {
-                Object.assign(column, {
-                  dt: 'float',
-                  np: 10,
-                  ns: 2,
-                  dtxp: '11',
-                  dtxs: 2
-                });
-              }
-              break;
-            case 'string':
-              if (MysqlUi.isValidDate(json[keys[i]])) {
-                Object.assign(column, {
-                  dt: 'datetime'
-                });
-              } else if (json[keys[i]].length <= 255) {
-                Object.assign(column, {
-                  dt: 'varchar',
-                  np: 255,
-                  ns: 0,
-                  dtxp: '255'
-                });
-              } else {
-                Object.assign(column, {
-                  dt: 'text'
-                });
-              }
-              break;
-            case 'boolean':
-              Object.assign(column, {
-                dt: 'boolean',
-                np: 3,
-                ns: 0
-              });
-              break;
-            case 'object':
-              Object.assign(column, {
-                dt: 'json',
-                np: 3,
-                ns: 0
-              });
-              break;
-            default:
-              break;
-          }
-          columns.push(column);
-        }
-      }
-    } catch (e) {
-      console.log('Error in getColumnsFromJson', e);
-    }
-
-    return columns;
-  }
-
-  static isValidTimestamp(key, value) {
-    if (typeof value !== 'number') {
-      return false;
-    }
-    return new Date(value).getTime() > 0 && /(?:_|(?=A))[aA]t$/.test(key);
-  }
-
-  static isValidDate(value) {
-    return new Date(value).getTime() > 0;
-  }
-
-  static colPropAuDisabled(_col) {
-    return true;
-  }
-
-  static getUIType(col): any {
-    switch (this.getAbstractType(col)) {
-      case 'integer':
-        return 'Number';
-      case 'boolean':
-        return 'Checkbox';
-      case 'float':
-        return 'Decimal';
-      case 'date':
-        return 'Date';
-      case 'datetime':
-        return 'DateTime';
-      case 'time':
-        return 'Time';
-      case 'year':
-        return 'Year';
-      case 'string':
-        return 'SingleLineText';
-      case 'text':
-        return 'LongText';
-      case 'blob':
-        return 'Attachment';
-      case 'enum':
-        return 'SingleSelect';
-      case 'set':
-        return 'MultiSelect';
-      case 'json':
-        return 'LongText';
-    }
-  }
-
-  static getAbstractType(col): any {
-    switch (col.dt.toLowerCase()) {
-      case 'int':
-      case 'smallint':
-      case 'mediumint':
-      case 'bit':
-        return 'integer';
-
-      case 'boolean':
-        return 'boolean';
-
-      case 'float':
-      case 'decimal':
-      case 'double':
-      case 'serial':
-        return 'float';
-      case 'tinyint':
-        if (col.dtxp == '1') {
-          return 'boolean';
-        } else {
-          return 'integer';
-        }
-      case 'date':
-        return 'date';
-      case 'datetime':
-      case 'timestamp':
-        return 'datetime';
-      case 'time':
-        return 'time';
-      case 'year':
-        return 'year';
-      case 'char':
-      case 'varchar':
-      case 'nchar':
-        return 'string';
-      case 'text':
-      case 'tinytext':
-      case 'mediumtext':
-      case 'longtext':
-        return 'text';
-
-      // todo: use proper type
-      case 'binary':
-        return 'string';
-      case 'varbinary':
-        return 'text';
-
-      case 'blob':
-      case 'tinyblob':
-      case 'mediumblob':
-      case 'longblob':
-        return 'blob';
-
-      case 'enum':
-        return 'enum';
-      case 'set':
-        return 'set';
-
-      case 'bigint':
-      case 'geometry':
-      case 'point':
-      case 'linestring':
-      case 'polygon':
-      case 'multipoint':
-      case 'multilinestring':
-      case 'multipolygon':
-        return 'string';
-
-      case 'json':
-        return 'json';
-    }
-  }
-
-  static getDataTypeForUiType(col) {
-    const colProp: any = {};
-    switch (col.uidt) {
-      case 'ID':
-        colProp.dt = 'int';
-        colProp.pk = true;
-        colProp.un = true;
-        colProp.ai = true;
-        colProp.rqd = true;
-        break;
-      case 'ForeignKey':
-        colProp.dt = 'varchar';
-        break;
-      case 'SingleLineText':
-        colProp.dt = 'varchar';
-        break;
-      case 'LongText':
-        colProp.dt = 'text';
-        break;
-      case 'Attachment':
-        colProp.dt = 'text';
-        break;
-      case 'Checkbox':
-        colProp.dt = 'tinyint';
-        colProp.dtxp = 1;
-        break;
-      case 'MultiSelect':
-        colProp.dt = 'set';
-        break;
-      case 'SingleSelect':
-        colProp.dt = 'enum';
-        break;
-      case 'Collaborator':
-        colProp.dt = 'varchar';
-        break;
-      case 'Date':
-        colProp.dt = 'varchar';
-
-        break;
-      case 'Year':
-        colProp.dt = 'year';
-        break;
-      case 'Time':
-        colProp.dt = 'time';
-        break;
-      case 'PhoneNumber':
-        colProp.dt = 'varchar';
-        colProp.validate = {
-          func: ['isMobilePhone'],
-          args: [''],
-          msg: ['Validation failed : Invalid Mobile Format ({cn})']
-        };
-        break;
-      case 'Email':
-        colProp.dt = 'varchar';
-        colProp.validate = {
-          func: ['isEmail'],
-          args: [''],
-          msg: ['Validation failed : Invalid Email Format ({cn})']
-        };
-        break;
-      case 'URL':
-        colProp.dt = 'varchar';
-        colProp.validate = {
-          func: ['isURL'],
-          args: [''],
-          msg: ['Validation failed : Invalid URL Format ({cn})']
-        };
-        break;
-      case 'Number':
-        colProp.dt = 'bigint';
-        break;
-      case 'Decimal':
-        colProp.dt = 'decimal';
-        break;
-      case 'Currency':
-        colProp.dt = 'decimal';
-        colProp.validate = {
-          func: ['isCurrency'],
-          args: [''],
-          msg: ['Validation failed : Invalid Currency Format']
-        };
-        break;
-      case 'Percent':
-        colProp.dt = 'double';
-        break;
-      case 'Duration':
-        colProp.dt = 'int';
-        break;
-      case 'Rating':
-        colProp.dt = 'float';
-        break;
-      case 'Formula':
-        colProp.dt = 'varchar';
-        break;
-      case 'Rollup':
-        colProp.dt = 'varchar';
-        break;
-      case 'Count':
-        colProp.dt = 'int';
-        break;
-      case 'Lookup':
-        colProp.dt = 'varchar';
-        break;
-      case 'DateTime':
-        colProp.dt = 'datetime';
-        break;
-      case 'CreateTime':
-        colProp.dt = 'datetime';
-        break;
-      case 'LastModifiedTime':
-        colProp.dt = 'datetime';
-        break;
-      case 'AutoNumber':
-        colProp.dt = 'int';
-        break;
-      case 'Barcode':
-        colProp.dt = 'varchar';
-        break;
-      case 'Button':
-        colProp.dt = 'varchar';
-        break;
-      case 'JSON':
-        colProp.dt = 'json';
-        break;
-      default:
-        colProp.dt = 'varchar';
-        break;
-    }
-    return colProp;
-  }
-
-  static getDataTypeListForUiType(col) {
-    switch (col.uidt) {
-      case 'ID':
-      case 'ForeignKey':
-        return dbTypes;
-
-      case 'SingleLineText':
-      case 'LongText':
-      case 'Collaborator':
-        return [
-          'char',
-          'varchar',
-          'nchar',
-          'text',
-          'tinytext',
-          'mediumtext',
-          'longtext'
-        ];
-
-      case 'Attachment':
-        return [
-          'json',
-          'char',
-          'varchar',
-          'nchar',
-          'text',
-          'tinytext',
-          'mediumtext',
-          'longtext'
-        ];
-
-      case 'JSON':
-        return ['json', 'text', 'tinytext', 'mediumtext', 'longtext'];
-
-      case 'Checkbox':
-        return [
-          'int',
-          'smallint',
-          'mediumint',
-          'bigint',
-          'bit',
-          'boolean',
-          'serial',
-          'tinyint'
-        ];
-
-      case 'MultiSelect':
-        return ['set', 'text', 'tinytext', 'mediumtext', 'longtext'];
-
-      case 'SingleSelect':
-        return ['enum', 'text', 'tinytext', 'mediumtext', 'longtext'];
-
-      case 'Year':
-        return ['year'];
-
-      case 'Time':
-        return ['time'];
-
-      case 'PhoneNumber':
-      case 'Email':
-        return ['varchar'];
-
-      case 'URL':
-        return ['text', 'tinytext', 'mediumtext', 'longtext', 'varchar'];
-
-      case 'Number':
-        return [
-          'int',
-          'smallint',
-          'mediumint',
-          'bigint',
-          'bit',
-          'float',
-          'decimal',
-          'double',
-          'serial'
-        ];
-
-      case 'Decimal':
-        return ['float', 'decimal', 'double', 'serial'];
-
-      case 'Currency':
-        return [
-          'decimal',
-          'float',
-          'double',
-          'serial',
-          'int',
-          'smallint',
-          'mediumint',
-          'bigint',
-          'bit'
-        ];
-
-      case 'Percent':
-        return [
-          'decimal',
-          'float',
-          'double',
-          'serial',
-          'int',
-          'smallint',
-          'mediumint',
-          'bigint',
-          'bit'
-        ];
-
-      case 'Duration':
-        return [
-          'decimal',
-          'float',
-          'double',
-          'serial',
-          'int',
-          'smallint',
-          'mediumint',
-          'bigint',
-          'bit'
-        ];
-
-      case 'Rating':
-        return [
-          'decimal',
-          'float',
-          'double',
-          'serial',
-          'int',
-          'smallint',
-          'mediumint',
-          'bigint',
-          'bit'
-        ];
-
-      case 'Formula':
-        return [
-          'char',
-          'varchar',
-          'nchar',
-          'text',
-          'tinytext',
-          'mediumtext',
-          'longtext'
-        ];
-
-      case 'Rollup':
-        return ['varchar'];
-
-      case 'Count':
-        return ['int', 'smallint', 'mediumint', 'bigint', 'serial'];
-
-      case 'Lookup':
-        return ['varchar'];
-
-      case 'Date':
-        return ['date', 'datetime', 'timestamp', 'varchar'];
-
-      case 'DateTime':
-      case 'CreateTime':
-      case 'LastModifiedTime':
-        return ['datetime', 'timestamp', 'varchar'];
-
-      case 'AutoNumber':
-        return ['int', 'smallint', 'mediumint', 'bigint'];
-
-      case 'Barcode':
-        return ['varchar'];
-
-      case 'Geometry':
-        return [
-          'geometry',
-          'point',
-          'linestring',
-          'polygon',
-          'multipoint',
-          'multilinestring',
-          'multipolygon'
-        ];
-
-      case 'Button':
-      default:
-        return dbTypes;
-    }
-  }
-
-  static getUnsupportedFnList() {
-    return [];
-  }
-}
-
-// module.exports = MysqlUiHelp;
-/**
- * @copyright Copyright (c) 2021, Xgene Cloud Ltd
- *
- * @author Naveen MR <oof1lab@gmail.com>
- * @author Pranav C Balan <pranavxc@gmail.com>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
diff --git a/packages/nocodb/src/lib/sqlUi/OracleUi.ts b/packages/nocodb/src/lib/sqlUi/OracleUi.ts
deleted file mode 100644
index 5ba2cd1b20..0000000000
--- a/packages/nocodb/src/lib/sqlUi/OracleUi.ts
+++ /dev/null
@@ -1,947 +0,0 @@
-export class OracleUi {
-  static getNewTableColumns(): any[] {
-    return [
-      {
-        column_name: 'id',
-        dt: 'integer',
-        dtx: 'integer',
-        ct: 'int(11)',
-        nrqd: false,
-        rqd: true,
-        ck: false,
-        pk: true,
-        un: false,
-        ai: false,
-        cdf: null,
-        clen: null,
-        np: null,
-        ns: null,
-        dtxp: '',
-        dtxs: '',
-        altered: 1,
-        uidt: 'ID',
-        uip: '',
-        uicn: ''
-      },
-      {
-        column_name: 'title',
-        dt: 'varchar',
-        dtx: 'specificType',
-        ct: 'varchar(45)',
-        nrqd: true,
-        rqd: false,
-        ck: false,
-        pk: false,
-        un: false,
-        ai: false,
-        cdf: null,
-        clen: 45,
-        np: null,
-        ns: null,
-        dtxp: '45',
-        dtxs: '',
-        altered: 1,
-        uidt: 'SingleLineText',
-        uip: '',
-        uicn: ''
-      }
-      // {
-      //  column_name:"created_at",
-      //   dt: "timestamp",
-      //   dtx: "specificType",
-      //   ct: "varchar(45)",
-      //   nrqd: true,
-      //   rqd: false,
-      //   ck: false,
-      //   pk: false,
-      //   un: false,
-      //   ai: false,
-      //   cdf: 'CURRENT_TIMESTAMP',
-      //   clen: 45,
-      //   np: null,
-      //   ns: null,
-      //   dtxp: '',
-      //   dtxs: ''
-      // },
-      // {
-      //  column_name:"updated_at",
-      //   dt: "timestamp",
-      //   dtx: "specificType",
-      //   ct: "varchar(45)",
-      //   nrqd: true,
-      //   rqd: false,
-      //   ck: false,
-      //   pk: false,
-      //   un: false,
-      //   ai: false,
-      //   cdf: 'CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP',
-      //   clen: 45,
-      //   np: null,
-      //   ns: null,
-      //   dtxp: '',
-      //   dtxs: ''
-      // }
-    ];
-  }
-
-  static getNewColumn(suffix) {
-    return {
-      column_name: 'title' + suffix,
-      dt: 'integer',
-      dtx: 'specificType',
-      ct: 'integer(11)',
-      nrqd: true,
-      rqd: false,
-      ck: false,
-      pk: false,
-      un: false,
-      ai: false,
-      cdf: null,
-      clen: 45,
-      np: null,
-      ns: null,
-      // data_type_x_specific: ' ',
-      dtxp: '11',
-      dtxs: ' ',
-      altered: 1,
-      uidt: 'Number',
-      uip: '',
-      uicn: ''
-    };
-  }
-
-  // static getDefaultLengthForDatatype(type) {
-  //   switch (type) {
-  //     case "int":
-  //       return 11;
-  //       break;
-  //     case "tinyint":
-  //       return 1;
-  //       break;
-  //     case "smallint":
-  //       return 5;
-  //       break;
-  //
-  //     case "mediumint":
-  //       return 9;
-  //       break;
-  //     case "bigint":
-  //       return 20;
-  //       break;
-  //     case "bit":
-  //       return 64;
-  //       break;
-  //     case "boolean":
-  //       return '';
-  //       break;
-  //     case "float":
-  //       return 12;
-  //       break;
-  //     case "decimal":
-  //       return 10;
-  //       break;
-  //     case "double":
-  //       return 22;
-  //       break;
-  //     case "serial":
-  //       return 20;
-  //       break;
-  //     case "date":
-  //       return '';
-  //       break;
-  //     case "datetime":
-  //     case "timestamp":
-  //       return 6;
-  //       break;
-  //     case "time":
-  //       return '';
-  //       break;
-  //     case "year":
-  //       return '';
-  //       break;
-  //     case "char":
-  //       return 255;
-  //       break;
-  //     case "varchar":
-  //       return 45;
-  //       break;
-  //     case "nchar":
-  //       return 255;
-  //       break;
-  //     case "text":
-  //       return '';
-  //       break;
-  //     case "tinytext":
-  //       return '';
-  //       break;
-  //     case "mediumtext":
-  //       return '';
-  //       break;
-  //     case "longtext":
-  //       return ''
-  //       break;
-  //     case "binary":
-  //       return 255;
-  //       break;
-  //     case "varbinary":
-  //       return 65500;
-  //       break;
-  //     case "blob":
-  //       return '';
-  //       break;
-  //     case "tinyblob":
-  //       return '';
-  //       break;
-  //     case "mediumblob":
-  //       return '';
-  //       break;
-  //     case "longblob":
-  //       return '';
-  //       break;
-  //     case "enum":
-  //       return '\'a\',\'b\'';
-  //       break;
-  //     case "set":
-  //       return '\'a\',\'b\'';
-  //       break;
-  //     case "geometry":
-  //       return '';
-  //     case "point":
-  //       return '';
-  //     case "linestring":
-  //       return '';
-  //     case "polygon":
-  //       return '';
-  //     case "multipoint":
-  //       return '';
-  //     case "multilinestring":
-  //       return '';
-  //     case "multipolygon":
-  //       return '';
-  //     case "json":
-  //       return ''
-  //       break;
-  //
-  //   }
-  //
-  // }
-
-  static getDefaultLengthForDatatype(type) {
-    switch (type) {
-      default:
-        return '';
-    }
-  }
-
-  static getDefaultLengthIsDisabled(type): any {
-    switch (type) {
-      case 'integer':
-        return true;
-      case 'bfile':
-      case 'binary rowid':
-      case 'binary double':
-      case 'binary_float':
-      case 'blob':
-      case 'canoical':
-      case 'cfile':
-      case 'char':
-      case 'clob':
-      case 'content pointer':
-      case 'contigous array':
-      case 'date':
-      case 'decimal':
-      case 'double precision':
-      case 'float':
-      case 'interval day to second':
-      case 'interval year to month':
-      case 'lob pointer':
-      case 'long':
-      case 'long raw':
-      case 'named collection':
-      case 'named object':
-      case 'nchar':
-      case 'nclob':
-      case 'number':
-      case 'nvarchar2':
-      case 'octet':
-      case 'oid':
-      case 'pointer':
-      case 'raw':
-      case 'real':
-      case 'ref':
-      case 'ref cursor':
-      case 'rowid':
-      case 'signed binary integer':
-      case 'smallint':
-      case 'table':
-      case 'time':
-      case 'time with tz':
-      case 'timestamp':
-      case 'timestamp with local time zone':
-      case 'timestamp with local tz':
-      case 'timestamp with timezone':
-      case 'timestamp with tz':
-      case 'unsigned binary integer':
-      case 'urowid':
-      case 'varchar':
-      case 'varchar2':
-      case 'varray':
-      case 'varying array':
-        return false;
-    }
-  }
-
-  static getDefaultValueForDatatype(type) {
-    switch (type) {
-      default:
-        return '';
-    }
-  }
-
-  static getDefaultScaleForDatatype(type): any {
-    switch (type) {
-      case 'integer':
-      case 'bfile':
-      case 'binary rowid':
-      case 'binary double':
-      case 'binary_float':
-      case 'blob':
-      case 'canoical':
-      case 'cfile':
-      case 'char':
-      case 'clob':
-      case 'content pointer':
-      case 'contigous array':
-      case 'date':
-      case 'decimal':
-      case 'double precision':
-      case 'float':
-      case 'interval day to second':
-      case 'interval year to month':
-      case 'lob pointer':
-      case 'long':
-      case 'long raw':
-      case 'named collection':
-      case 'named object':
-      case 'nchar':
-      case 'nclob':
-      case 'number':
-      case 'nvarchar2':
-      case 'octet':
-      case 'oid':
-      case 'pointer':
-      case 'raw':
-      case 'real':
-      case 'ref':
-      case 'ref cursor':
-      case 'rowid':
-      case 'signed binary integer':
-      case 'smallint':
-      case 'table':
-      case 'time':
-      case 'time with tz':
-      case 'timestamp':
-      case 'timestamp with local time zone':
-      case 'timestamp with local tz':
-      case 'timestamp with timezone':
-      case 'timestamp with tz':
-      case 'unsigned binary integer':
-      case 'urowid':
-      case 'varchar':
-      case 'varchar2':
-      case 'varray':
-      case 'varying array':
-        return ' ';
-    }
-  }
-
-  static colPropAIDisabled(col, columns) {
-    // console.log(col);
-    if (
-      col.dt === 'int4' ||
-      col.dt === 'integer' ||
-      col.dt === 'bigint' ||
-      col.dt === 'smallint'
-    ) {
-      for (let i = 0; i < columns.length; ++i) {
-        if (columns[i].cn !== col.cn && columns[i].ai) {
-          return true;
-        }
-      }
-      return false;
-    } else {
-      return true;
-    }
-  }
-
-  static colPropUNDisabled(_col) {
-    // console.log(col);
-    return true;
-    // if (col.dt === 'int' ||
-    //   col.dt === 'tinyint' ||
-    //   col.dt === 'smallint' ||
-    //   col.dt === 'mediumint' ||
-    //   col.dt === 'bigint') {
-    //   return false;
-    // } else {
-    //   return true;
-    // }
-  }
-
-  static onCheckboxChangeAI(col) {
-    console.log(col);
-    if (
-      col.dt === 'int' ||
-      col.dt === 'bigint' ||
-      col.dt === 'smallint' ||
-      col.dt === 'tinyint'
-    ) {
-      col.altered = col.altered || 2;
-    }
-
-    // if (!col.ai) {
-    //   col.dtx = 'specificType'
-    // } else {
-    //   col.dtx = ''
-    // }
-  }
-
-  static showScale(_columnObj) {
-    return false;
-  }
-
-  static removeUnsigned(columns) {
-    for (let i = 0; i < columns.length; ++i) {
-      if (
-        columns[i].altered === 1 &&
-        !(
-          columns[i].dt === 'int' ||
-          columns[i].dt === 'bigint' ||
-          columns[i].dt === 'tinyint' ||
-          columns[i].dt === 'smallint' ||
-          columns[i].dt === 'mediumint'
-        )
-      ) {
-        columns[i].un = false;
-        console.log('>> resetting unsigned value', columns[i].cn);
-      }
-      console.log(columns[i].cn);
-    }
-  }
-
-  static columnEditable(colObj) {
-    return colObj.tn !== '_evolutions' || colObj.tn !== 'nc_evolutions';
-  }
-
-  static extractFunctionName(query) {
-    const reg = /^\s*CREATE\s+(?:OR\s+REPLACE\s*)?\s*FUNCTION\s+(?:[\w\d_]+\.)?([\w_\d]+)/i;
-    const match = query.match(reg);
-    return match && match[1];
-  }
-
-  static extractProcedureName(query) {
-    const reg = /^\s*CREATE\s+(?:OR\s+REPLACE\s*)?\s*PROCEDURE\s+(?:[\w\d_]+\.)?([\w_\d]+)/i;
-    const match = query.match(reg);
-    return match && match[1];
-  }
-
-  static splitQueries(query) {
-    /***
-     * we are splitting based on semicolon
-     * there are mechanism to escape semicolon within single/double quotes(string)
-     */
-    return query.match(/\b("[^"]*;[^"]*"|'[^']*;[^']*'|[^;])*;/g);
-  }
-
-  static onCheckboxChangeAU(col) {
-    console.log(col);
-    // if (1) {
-    col.altered = col.altered || 2;
-    // }
-
-    // if (!col.ai) {
-    //   col.dtx = 'specificType'
-    // } else {
-    //   col.dtx = ''
-    // }
-  }
-
-  /**
-   * if sql statement is SELECT - it limits to a number
-   * @param args
-   * @returns {string|*}
-   */
-  sanitiseQuery(args) {
-    let q = args.query.trim().split(';');
-
-    if (q[0].startsWith('Select')) {
-      q = q[0] + ` LIMIT 0,${args.limit ? args.limit : 100};`;
-    } else if (q[0].startsWith('select')) {
-      q = q[0] + ` LIMIT 0,${args.limit ? args.limit : 100};`;
-    } else if (q[0].startsWith('SELECT')) {
-      q = q[0] + ` LIMIT 0,${args.limit ? args.limit : 100};`;
-    } else {
-      return args.query;
-    }
-
-    return q;
-  }
-
-  getColumnsFromJson(json, tn) {
-    const columns = [];
-
-    try {
-      if (typeof json === 'object' && !Array.isArray(json)) {
-        const keys = Object.keys(json);
-
-        for (let i = 0; i < keys.length; ++i) {
-          switch (typeof json[keys[i]]) {
-            case 'number':
-              if (Number.isInteger(json[keys[i]])) {
-                columns.push({
-                  dp: null,
-                  tn,
-                  cn: keys[i],
-                  cno: keys[i],
-                  dt: 'int',
-                  np: 10,
-                  ns: 0,
-                  clen: null,
-                  cop: 1,
-                  pk: false,
-                  nrqd: false,
-                  rqd: false,
-                  un: false,
-                  ct: 'int(11) unsigned',
-                  ai: false,
-                  unique: false,
-                  cdf: null,
-                  cc: '',
-                  csn: null,
-                  dtx: 'specificType',
-                  dtxp: '11',
-                  dtxs: 0,
-                  altered: 1
-                });
-              } else {
-                columns.push({
-                  dp: null,
-                  tn,
-                  cn: keys[i],
-                  cno: keys[i],
-                  dt: 'float',
-                  np: 10,
-                  ns: 2,
-                  clen: null,
-                  cop: 1,
-                  pk: false,
-                  nrqd: false,
-                  rqd: false,
-                  un: false,
-                  ct: 'int(11) unsigned',
-                  ai: false,
-                  unique: false,
-                  cdf: null,
-                  cc: '',
-                  csn: null,
-                  dtx: 'specificType',
-                  dtxp: '11',
-                  dtxs: 2,
-                  altered: 1
-                });
-              }
-
-              break;
-
-            case 'string':
-              if (json[keys[i]].length <= 255) {
-                columns.push({
-                  dp: null,
-                  tn,
-                  cn: keys[i],
-                  cno: keys[i],
-                  dt: 'varchar',
-                  np: 45,
-                  ns: 0,
-                  clen: null,
-                  cop: 1,
-                  pk: false,
-                  nrqd: false,
-                  rqd: false,
-                  un: false,
-                  ct: 'int(11) unsigned',
-                  ai: false,
-                  unique: false,
-                  cdf: null,
-                  cc: '',
-                  csn: null,
-                  dtx: 'specificType',
-                  dtxp: '45',
-                  dtxs: 0,
-                  altered: 1
-                });
-              } else {
-                columns.push({
-                  dp: null,
-                  tn,
-                  cn: keys[i],
-                  cno: keys[i],
-                  dt: 'text',
-                  np: null,
-                  ns: 0,
-                  clen: null,
-                  cop: 1,
-                  pk: false,
-                  nrqd: false,
-                  rqd: false,
-                  un: false,
-                  ct: 'int(11) unsigned',
-                  ai: false,
-                  unique: false,
-                  cdf: null,
-                  cc: '',
-                  csn: null,
-                  dtx: 'specificType',
-                  dtxp: null,
-                  dtxs: 0,
-                  altered: 1
-                });
-              }
-
-              break;
-
-            case 'boolean':
-              columns.push({
-                dp: null,
-                tn,
-                cn: keys[i],
-                cno: keys[i],
-                dt: 'boolean',
-                np: 3,
-                ns: 0,
-                clen: null,
-                cop: 1,
-                pk: false,
-                nrqd: false,
-                rqd: false,
-                un: false,
-                ct: 'int(11) unsigned',
-                ai: false,
-                unique: false,
-                cdf: null,
-                cc: '',
-                csn: null,
-                dtx: 'specificType',
-                dtxp: '1',
-                dtxs: 0,
-                altered: 1
-              });
-              break;
-
-            case 'object':
-              columns.push({
-                dp: null,
-                tn,
-                cn: keys[i],
-                cno: keys[i],
-                dt: 'json',
-                np: 3,
-                ns: 0,
-                clen: null,
-                cop: 1,
-                pk: false,
-                nrqd: false,
-                rqd: false,
-                un: false,
-                ct: 'int(11) unsigned',
-                ai: false,
-                unique: false,
-                cdf: null,
-                cc: '',
-                csn: null,
-                dtx: 'specificType',
-                dtxp: null,
-                dtxs: 0,
-                altered: 1
-              });
-              break;
-
-            default:
-              break;
-          }
-        }
-      }
-    } catch (e) {
-      console.log('Error in getColumnsFromJson', e);
-    }
-    return columns;
-  }
-
-  static colPropAuDisabled(_col) {
-    return true;
-  }
-
-  static getAbstractType(col): any {
-    switch ((col.dt || col.dt).toLowerCase()) {
-      case 'integer':
-        return 'integer';
-      case 'bfile':
-      case 'binary rowid':
-      case 'binary double':
-      case 'binary_float':
-        return 'string';
-      case 'blob':
-        return 'blob';
-      case 'canoical':
-      case 'cfile':
-      case 'char':
-      case 'clob':
-      case 'content pointer':
-      case 'contigous array':
-        return 'string';
-      case 'date':
-        return 'date';
-      case 'decimal':
-      case 'double precision':
-      case 'float':
-        return 'float';
-      case 'interval day to second':
-      case 'interval year to month':
-        return 'string';
-      case 'lob pointer':
-        return 'string';
-      case 'long':
-        return 'integer';
-      case 'long raw':
-        return 'string';
-      case 'named collection':
-      case 'named object':
-      case 'nchar':
-      case 'nclob':
-        return 'string';
-      case 'nvarchar2':
-      case 'octet':
-      case 'oid':
-      case 'pointer':
-      case 'raw':
-        return 'string';
-      case 'real':
-      case 'number':
-        return 'float';
-      case 'ref':
-      case 'ref cursor':
-      case 'rowid':
-      case 'signed binary integer':
-        return 'string';
-      case 'smallint':
-        return 'integer';
-      case 'table':
-        return 'string';
-      case 'time':
-      case 'time with tz':
-        return 'time';
-      case 'timestamp':
-      case 'timestamp with local time zone':
-      case 'timestamp with local tz':
-      case 'timestamp with timezone':
-      case 'timestamp with tz':
-        return 'datetime';
-      case 'unsigned binary integer':
-      case 'urowid':
-      case 'varchar':
-      case 'varchar2':
-        return 'string';
-      case 'varray':
-      case 'varying array':
-        return 'string';
-    }
-  }
-
-  static getUIType(col): any {
-    switch (this.getAbstractType(col)) {
-      case 'integer':
-        return 'Number';
-      case 'boolean':
-        return 'Checkbox';
-      case 'float':
-        return 'Decimal';
-      case 'date':
-        return 'Date';
-      case 'datetime':
-        return 'CreateTime';
-      case 'time':
-        return 'Time';
-      case 'year':
-        return 'Year';
-      case 'string':
-        return 'SingleLineText';
-      case 'text':
-        return 'LongText';
-      case 'blob':
-        return 'Attachment';
-      case 'enum':
-        return 'SingleSelect';
-      case 'set':
-        return 'MultiSelect';
-      case 'json':
-        return 'LongText';
-    }
-  }
-
-  static getDataTypeForUiType(col) {
-    const colProp: any = {};
-    switch (col.uidt) {
-      case 'ID':
-        colProp.dt = 'integer';
-        colProp.pk = true;
-        colProp.un = true;
-        colProp.ai = true;
-        colProp.rqd = true;
-        break;
-      case 'ForeignKey':
-        colProp.dt = 'varchar';
-        break;
-      case 'SingleLineText':
-        colProp.dt = 'varchar';
-        break;
-      case 'LongText':
-        colProp.dt = 'clob';
-        break;
-      case 'Attachment':
-        colProp.dt = 'clob';
-        break;
-      case 'Checkbox':
-        colProp.dt = 'tinyint';
-        colProp.dtxp = 1;
-        break;
-      case 'MultiSelect':
-        colProp.dt = 'varchar2';
-        break;
-      case 'SingleSelect':
-        colProp.dt = 'varchar2';
-        break;
-      case 'Collaborator':
-        colProp.dt = 'varchar';
-        break;
-      case 'Date':
-        colProp.dt = 'varchar';
-
-        break;
-      case 'Year':
-        colProp.dt = 'year';
-        break;
-      case 'Time':
-        colProp.dt = 'time';
-        break;
-      case 'PhoneNumber':
-        colProp.dt = 'varchar';
-        colProp.validate = {
-          func: ['isMobilePhone'],
-          args: [''],
-          msg: ['Validation failed : Invalid Mobile Format']
-        };
-        break;
-      case 'Email':
-        colProp.dt = 'varchar';
-        colProp.validate = {
-          func: ['isEmail'],
-          args: [''],
-          msg: ['Validation failed : Invalid Email Format']
-        };
-        break;
-      case 'URL':
-        colProp.dt = 'varchar';
-        colProp.validate = {
-          func: ['isURL'],
-          args: [''],
-          msg: ['Validation failed : Invalid URL Format']
-        };
-        break;
-      case 'Number':
-        colProp.dt = 'integer';
-        break;
-      case 'Decimal':
-        colProp.dt = 'decimal';
-        break;
-      case 'Currency':
-        colProp.dt = 'decimal';
-        colProp.validate = {
-          func: ['isCurrency'],
-          args: [''],
-          msg: ['Validation failed : Invalid Currency Format']
-        };
-        break;
-      case 'Percent':
-        colProp.dt = 'double';
-        break;
-      case 'Duration':
-        colProp.dt = 'integer';
-        break;
-      case 'Rating':
-        colProp.dt = 'float';
-        break;
-      case 'Formula':
-        colProp.dt = 'varchar';
-        break;
-      case 'Rollup':
-        colProp.dt = 'varchar';
-        break;
-      case 'Count':
-        colProp.dt = 'integer';
-        break;
-      case 'Lookup':
-        colProp.dt = 'varchar';
-        break;
-      case 'DateTime':
-        colProp.dt = 'timestamp';
-        break;
-      case 'CreateTime':
-        colProp.dt = 'timestamp';
-        break;
-      case 'LastModifiedTime':
-        colProp.dt = 'timestamp';
-        break;
-      case 'AutoNumber':
-        colProp.dt = 'integer';
-        break;
-      case 'Barcode':
-        colProp.dt = 'varchar';
-        break;
-      case 'Button':
-        colProp.dt = 'varchar';
-        break;
-      default:
-        colProp.dt = 'varchar';
-        break;
-    }
-    return colProp;
-  }
-
-  static getUnsupportedFnList() {
-    return [];
-  }
-}
-
-// module.exports = PgUiHelp;
-/**
- * @copyright Copyright (c) 2021, Xgene Cloud Ltd
- *
- * @author Naveen MR <oof1lab@gmail.com>
- * @author Pranav C Balan <pranavxc@gmail.com>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
diff --git a/packages/nocodb/src/lib/sqlUi/PgUi.ts b/packages/nocodb/src/lib/sqlUi/PgUi.ts
deleted file mode 100644
index 07748df594..0000000000
--- a/packages/nocodb/src/lib/sqlUi/PgUi.ts
+++ /dev/null
@@ -1,1970 +0,0 @@
-const dbTypes = [
-  'int',
-  'integer',
-  'bigint',
-  'bigserial',
-  'char',
-  'int2',
-  'int4',
-  'int8',
-  'int4range',
-  'int8range',
-  'serial',
-  'serial2',
-  'serial8',
-  'character',
-  'bit',
-  'bool',
-  'boolean',
-  'date',
-  'double precision',
-  'event_trigger',
-  'fdw_handler',
-  'float4',
-  'float8',
-  'uuid',
-  'smallint',
-  'smallserial',
-  'character varying',
-  'text',
-  'real',
-  'time',
-  'time without time zone',
-  'timestamp',
-  'timestamp without time zone',
-  'timestamptz',
-  'timestamp with time zone',
-  'timetz',
-  'time with time zone',
-  'daterange',
-  'json',
-  'jsonb',
-  'gtsvector',
-  'index_am_handler',
-  'anyenum',
-  'anynonarray',
-  'anyrange',
-  'box',
-  'bpchar',
-  'bytea',
-  'cid',
-  'cidr',
-  'circle',
-  'cstring',
-  'inet',
-  'internal',
-  'interval',
-  'language_handler',
-  'line',
-  'lsec',
-  'macaddr',
-  'money',
-  'name',
-  'numeric',
-  'numrange',
-  'oid',
-  'opaque',
-  'path',
-  'pg_ddl_command',
-  'pg_lsn',
-  'pg_node_tree',
-  'point',
-  'polygon',
-  'record',
-  'refcursor',
-  'regclass',
-  'regconfig',
-  'regdictionary',
-  'regnamespace',
-  'regoper',
-  'regoperator',
-  'regproc',
-  'regpreocedure',
-  'regrole',
-  'regtype',
-  'reltime',
-  'smgr',
-  'tid',
-  'tinterval',
-  'trigger',
-  'tsm_handler',
-  'tsquery',
-  'tsrange',
-  'tstzrange',
-  'tsvector',
-  'txid_snapshot',
-  'unknown',
-  'void',
-  'xid',
-  'xml'
-];
-
-export class PgUi {
-  static getNewTableColumns() {
-    return [
-      {
-        column_name: 'id',
-        dt: 'int4',
-        dtx: 'integer',
-        ct: 'int(11)',
-        nrqd: false,
-        rqd: true,
-        ck: false,
-        pk: true,
-        un: false,
-        ai: true,
-        cdf: null,
-        clen: null,
-        np: 11,
-        ns: 0,
-        dtxp: '11',
-        dtxs: '',
-        altered: 1,
-        uidt: 'ID',
-        uip: '',
-        uicn: ''
-      },
-      {
-        column_name: 'title',
-        dt: 'character varying',
-        dtx: 'specificType',
-        ct: 'varchar(45)',
-        nrqd: true,
-        rqd: false,
-        ck: false,
-        pk: false,
-        un: false,
-        ai: false,
-        cdf: null,
-        clen: 45,
-        np: null,
-        ns: null,
-        dtxp: '45',
-        dtxs: '',
-        altered: 1,
-        uidt: 'SingleLineText',
-        uip: '',
-        uicn: ''
-      },
-      {
-        column_name: 'created_at',
-        dt: 'timestamp',
-        dtx: 'specificType',
-        ct: 'varchar(45)',
-        nrqd: true,
-        rqd: false,
-        ck: false,
-        pk: false,
-        un: false,
-        ai: false,
-        cdf: 'now()',
-        clen: 45,
-        np: null,
-        ns: null,
-        dtxp: '',
-        dtxs: '',
-        altered: 1,
-        uidt: 'CreateTime',
-        uip: '',
-        uicn: ''
-      },
-      {
-        column_name: 'updated_at',
-        dt: 'timestamp',
-        dtx: 'specificType',
-        ct: 'varchar(45)',
-        nrqd: true,
-        rqd: false,
-        ck: false,
-        pk: false,
-        un: false,
-        ai: false,
-        au: true,
-        cdf: 'now()',
-        clen: 45,
-        np: null,
-        ns: null,
-        dtxp: '',
-        dtxs: '',
-        altered: 1,
-        uidt: 'LastModifiedTime',
-        uip: '',
-        uicn: ''
-      }
-    ];
-  }
-
-  static getNewColumn(suffix) {
-    return {
-      column_name: 'title' + suffix,
-      dt: 'int4',
-      dtx: 'specificType',
-      ct: 'integer(11)',
-      nrqd: true,
-      rqd: false,
-      ck: false,
-      pk: false,
-      un: false,
-      ai: false,
-      cdf: null,
-      clen: 45,
-      np: null,
-      ns: null,
-      // data_type_x_specific: ' ',
-      dtxp: '11',
-      dtxs: ' ',
-      altered: 1,
-      uidt: 'Number',
-      uip: '',
-      uicn: ''
-    };
-  }
-
-  // static getDefaultLengthForDatatype(type) {
-  //   switch (type) {
-  //     case "int":
-  //       return 11;
-  //       break;
-  //     case "tinyint":
-  //       return 1;
-  //       break;
-  //     case "smallint":
-  //       return 5;
-  //       break;
-  //
-  //     case "mediumint":
-  //       return 9;
-  //       break;
-  //     case "bigint":
-  //       return 20;
-  //       break;
-  //     case "bit":
-  //       return 64;
-  //       break;
-  //     case "boolean":
-  //       return '';
-  //       break;
-  //     case "float":
-  //       return 12;
-  //       break;
-  //     case "decimal":
-  //       return 10;
-  //       break;
-  //     case "double":
-  //       return 22;
-  //       break;
-  //     case "serial":
-  //       return 20;
-  //       break;
-  //     case "date":
-  //       return '';
-  //       break;
-  //     case "datetime":
-  //     case "timestamp":
-  //       return 6;
-  //       break;
-  //     case "time":
-  //       return '';
-  //       break;
-  //     case "year":
-  //       return '';
-  //       break;
-  //     case "char":
-  //       return 255;
-  //       break;
-  //     case "varchar":
-  //       return 45;
-  //       break;
-  //     case "nchar":
-  //       return 255;
-  //       break;
-  //     case "text":
-  //       return '';
-  //       break;
-  //     case "tinytext":
-  //       return '';
-  //       break;
-  //     case "mediumtext":
-  //       return '';
-  //       break;
-  //     case "longtext":
-  //       return ''
-  //       break;
-  //     case "binary":
-  //       return 255;
-  //       break;
-  //     case "varbinary":
-  //       return 65500;
-  //       break;
-  //     case "blob":
-  //       return '';
-  //       break;
-  //     case "tinyblob":
-  //       return '';
-  //       break;
-  //     case "mediumblob":
-  //       return '';
-  //       break;
-  //     case "longblob":
-  //       return '';
-  //       break;
-  //     case "enum":
-  //       return '\'a\',\'b\'';
-  //       break;
-  //     case "set":
-  //       return '\'a\',\'b\'';
-  //       break;
-  //     case "geometry":
-  //       return '';
-  //     case "point":
-  //       return '';
-  //     case "linestring":
-  //       return '';
-  //     case "polygon":
-  //       return '';
-  //     case "multipoint":
-  //       return '';
-  //     case "multilinestring":
-  //       return '';
-  //     case "multipolygon":
-  //       return '';
-  //     case "json":
-  //       return ''
-  //       break;
-  //
-  //   }
-  //
-  // }
-
-  static getDefaultLengthForDatatype(type): any {
-    switch (type) {
-      case 'int':
-        return '';
-
-      case 'tinyint':
-        return '';
-
-      case 'smallint':
-        return '';
-
-      case 'mediumint':
-        return '';
-
-      case 'bigint':
-        return '';
-
-      case 'bit':
-        return '';
-
-      case 'boolean':
-        return '';
-
-      case 'float':
-        return '';
-
-      case 'decimal':
-        return '';
-
-      case 'double':
-        return '';
-
-      case 'serial':
-        return '';
-
-      case 'date':
-        return '';
-
-      case 'datetime':
-      case 'timestamp':
-        return '';
-
-      case 'time':
-        return '';
-
-      case 'year':
-        return '';
-
-      case 'char':
-        return '';
-
-      case 'varchar':
-        return '';
-
-      case 'nchar':
-        return '';
-
-      case 'text':
-        return '';
-
-      case 'tinytext':
-        return '';
-
-      case 'mediumtext':
-        return '';
-
-      case 'longtext':
-        return '';
-
-      case 'binary':
-        return '';
-
-      case 'varbinary':
-        return '';
-
-      case 'blob':
-        return '';
-
-      case 'tinyblob':
-        return '';
-
-      case 'mediumblob':
-        return '';
-
-      case 'longblob':
-        return '';
-
-      case 'enum':
-        return '';
-
-      case 'set':
-        return '';
-
-      case 'geometry':
-        return '';
-      case 'point':
-        return '';
-      case 'linestring':
-        return '';
-      case 'polygon':
-        return '';
-      case 'multipoint':
-        return '';
-      case 'multilinestring':
-        return '';
-      case 'multipolygon':
-        return '';
-      case 'json':
-        return '';
-    }
-  }
-
-  static getDefaultLengthIsDisabled(type): any {
-    switch (type) {
-      case 'anyenum':
-      case 'anynonarray':
-      case 'anyrange':
-      case 'bigint':
-      case 'bigserial':
-      case 'bit':
-      case 'bool':
-      case 'box':
-      case 'bpchar':
-      case 'bytea':
-      case 'char':
-      case 'character':
-      case 'cid':
-      case 'cidr':
-      case 'circle':
-      case 'cstring':
-      case 'date':
-      case 'daterange':
-      case 'double precision':
-      case 'event_trigger':
-      case 'fdw_handler':
-      case 'float4':
-      case 'float8':
-      case 'gtsvector':
-      case 'index_am_handler':
-      case 'inet':
-      case 'int':
-      case 'int2':
-      case 'int4':
-      case 'int8':
-      case 'int4range':
-      case 'int8range':
-      case 'integer':
-      case 'internal':
-      case 'interval':
-      case 'jsonb':
-      case 'language_handler':
-      case 'line':
-      case 'lsec':
-      case 'macaddr':
-      case 'money':
-      case 'name':
-      case 'numeric':
-      case 'numrange':
-      case 'oid':
-      case 'opaque':
-      case 'path':
-      case 'pg_ddl_command':
-      case 'pg_lsn':
-      case 'pg_node_tree':
-      case 'real':
-      case 'record':
-      case 'refcursor':
-      case 'regclass':
-      case 'regconfig':
-      case 'regdictionary':
-      case 'regnamespace':
-      case 'regoper':
-      case 'regoperator':
-      case 'regproc':
-      case 'regpreocedure':
-      case 'regrole':
-      case 'regtype':
-      case 'reltime':
-      case 'serial':
-      case 'serial2':
-      case 'serial8':
-      case 'smallint':
-      case 'smallserial':
-      case 'smgr':
-      case 'text':
-      case 'tid':
-      case 'time':
-      case 'time without time zone':
-      case 'timestamp':
-      case 'timestamp without time zone':
-      case 'timestamptz':
-      case 'timestamp with time zone':
-      case 'timetz':
-      case 'time with time zone':
-      case 'tinterval':
-      case 'trigger':
-      case 'tsm_handler':
-      case 'tsquery':
-      case 'tsrange':
-      case 'tstzrange':
-      case 'tsvector':
-      case 'txid_snapshot':
-      case 'unknown':
-      case 'void':
-      case 'xid':
-      case 'xml':
-      case 'character varying':
-      case 'tinyint':
-      case 'mediumint':
-      case 'float':
-      case 'decimal':
-      case 'double':
-      case 'boolean':
-      case 'datetime':
-      case 'uuid':
-      case 'year':
-      case 'varchar':
-      case 'nchar':
-      case 'tinytext':
-      case 'mediumtext':
-      case 'longtext':
-      case 'binary':
-      case 'varbinary':
-      case 'blob':
-      case 'tinyblob':
-      case 'mediumblob':
-      case 'longblob':
-      case 'enum':
-      case 'set':
-      case 'geometry':
-      case 'point':
-      case 'linestring':
-      case 'polygon':
-      case 'multipoint':
-      case 'multilinestring':
-      case 'multipolygon':
-      case 'json':
-        return true;
-    }
-  }
-
-  static getDefaultValueForDatatype(type): any {
-    switch (type) {
-      case 'anyenum':
-        return 'eg: ';
-
-      case 'anynonarray':
-        return 'eg: ';
-
-      case 'anyrange':
-        return 'eg: ';
-
-      case 'bigint':
-        return 'eg: ';
-
-      case 'bigserial':
-        return 'eg: ';
-
-      case 'bit':
-        return 'eg: ';
-
-      case 'bool':
-        return 'eg: ';
-
-      case 'box':
-        return 'eg: ';
-
-      case 'bpchar':
-        return 'eg: ';
-
-      case 'bytea':
-        return 'eg: ';
-
-      case 'char':
-        return 'eg: ';
-
-      case 'character':
-        return "eg: 'sample'";
-
-      case 'cid':
-        return 'eg: ';
-
-      case 'cidr':
-        return 'eg: ';
-
-      case 'circle':
-        return 'eg: ';
-
-      case 'cstring':
-        return 'eg: ';
-
-      case 'date':
-        return "eg: '2020-09-09'";
-
-      case 'daterange':
-        return 'eg: ';
-
-      case 'double precision':
-        return 'eg: 1.2';
-
-      case 'event_trigger':
-        return 'eg: ';
-
-      case 'fdw_handler':
-        return 'eg: ';
-
-      case 'float4':
-        return 'eg: 1.2';
-
-      case 'float8':
-        return 'eg: 1.2';
-
-      case 'gtsvector':
-        return 'eg: ';
-
-      case 'index_am_handler':
-        return 'eg: ';
-
-      case 'inet':
-        return 'eg: ';
-
-      case 'int':
-        return 'eg: ';
-
-      case 'int2':
-        return 'eg: ';
-
-      case 'int4':
-        return 'eg: ';
-
-      case 'int8':
-        return 'eg: ';
-
-      case 'int4range':
-        return 'eg: ';
-
-      case 'int8range':
-        return 'eg: ';
-
-      case 'integer':
-        return 'eg: ';
-
-      case 'internal':
-        return 'eg: ';
-
-      case 'interval':
-        return 'eg: ';
-
-      case 'json':
-        return 'eg: ';
-
-      case 'jsonb':
-        return 'eg: ';
-
-      case 'language_handler':
-        return 'eg: ';
-
-      case 'line':
-        return 'eg: ';
-
-      case 'lsec':
-        return 'eg: ';
-
-      case 'macaddr':
-        return 'eg: ';
-
-      case 'money':
-        return 'eg: ';
-
-      case 'name':
-        return 'eg: ';
-
-      case 'numeric':
-        return 'eg: ';
-
-      case 'numrange':
-        return 'eg: ';
-
-      case 'oid':
-        return 'eg: ';
-
-      case 'opaque':
-        return 'eg: ';
-
-      case 'path':
-        return 'eg: ';
-
-      case 'pg_ddl_command':
-        return 'eg: ';
-
-      case 'pg_lsn':
-        return 'eg: ';
-
-      case 'pg_node_tree':
-        return 'eg: ';
-
-      case 'point':
-        return 'eg: ';
-
-      case 'polygon':
-        return 'eg: ';
-
-      case 'real':
-        return 'eg: 1.2';
-
-      case 'record':
-        return 'eg: ';
-
-      case 'refcursor':
-        return 'eg: ';
-
-      case 'regclass':
-        return 'eg: ';
-
-      case 'regconfig':
-        return 'eg: ';
-
-      case 'regdictionary':
-        return 'eg: ';
-
-      case 'regnamespace':
-        return 'eg: ';
-
-      case 'regoper':
-        return 'eg: ';
-
-      case 'regoperator':
-        return 'eg: ';
-
-      case 'regproc':
-        return 'eg: ';
-
-      case 'regpreocedure':
-        return 'eg: ';
-
-      case 'regrole':
-        return 'eg: ';
-
-      case 'regtype':
-        return 'eg: ';
-
-      case 'reltime':
-        return 'eg: ';
-
-      case 'serial':
-        return 'eg: ';
-
-      case 'serial2':
-        return 'eg: ';
-
-      case 'serial8':
-        return 'eg: ';
-
-      case 'smallint':
-        return 'eg: ';
-
-      case 'smallserial':
-        return 'eg: ';
-
-      case 'smgr':
-        return 'eg: ';
-
-      case 'text':
-        return "eg: 'sample text'";
-
-      case 'tid':
-        return 'eg: ';
-
-      case 'time':
-        return "eg: now()\n\n'04:05:06.789'";
-
-      case 'time without time zone':
-        return "eg: now()\n\n'04:05:06.789'";
-
-      case 'timestamp':
-        return "eg: now()\n\n'2016-06-22 19:10:25-07'";
-
-      case 'timestamp without time zone':
-        return "eg: now()\n\n'2016-06-22 19:10:25-07'";
-
-      case 'timestamptz':
-        return "eg: timezone('America/New_York','2016-06-01 00:00')\n\nnow()\n\n'2016-06-22 19:10:25-07'";
-
-      case 'timestamp with time zone':
-        return "eg: now()\n\n'2016-06-22 19:10:25-07'";
-
-      case 'timetz':
-        return 'eg: now()';
-
-      case 'time with time zone':
-        return 'eg: now()';
-
-      case 'tinterval':
-        return 'eg: ';
-
-      case 'trigger':
-        return 'eg: ';
-
-      case 'tsm_handler':
-        return 'eg: ';
-
-      case 'tsquery':
-        return 'eg: ';
-
-      case 'tsrange':
-        return 'eg: ';
-
-      case 'tstzrange':
-        return 'eg: ';
-
-      case 'tsvector':
-        return 'eg: ';
-
-      case 'txid_snapshot':
-        return 'eg: ';
-
-      case 'unknown':
-        return 'eg: ';
-
-      case 'void':
-        return 'eg: ';
-
-      case 'xid':
-        return 'eg: ';
-
-      case 'xml':
-        return 'eg: ';
-
-      case 'character varying':
-        return 'eg: ';
-
-      case 'tinyint':
-        return 'eg: ';
-
-      case 'mediumint':
-        return 'eg: ';
-
-      case 'float':
-        return 'eg: ';
-
-      case 'decimal':
-        return 'eg: ';
-
-      case 'double':
-        return 'eg: 1.2';
-
-      case 'boolean':
-        return 'eg: true\n\nfalse';
-
-      case 'datetime':
-        return 'eg: ';
-
-      case 'uuid':
-        return 'eg: ';
-
-      case 'year':
-        return 'eg: ';
-
-      case 'varchar':
-        return 'eg: ';
-
-      case 'nchar':
-        return 'eg: ';
-
-      case 'tinytext':
-        return 'eg: ';
-
-      case 'mediumtext':
-        return 'eg: ';
-
-      case 'longtext':
-        return 'eg: ';
-
-      case 'binary':
-        return 'eg: ';
-
-      case 'varbinary':
-        return 'eg: ';
-
-      case 'blob':
-        return 'eg: ';
-
-      case 'tinyblob':
-        return 'eg: ';
-
-      case 'mediumblob':
-        return 'eg: ';
-
-      case 'longblob':
-        return 'eg: ';
-
-      case 'enum':
-        return 'eg: ';
-
-      case 'set':
-        return 'eg: ';
-
-      case 'geometry':
-        return 'eg: ';
-
-      case 'linestring':
-        return 'eg: ';
-
-      case 'multipoint':
-        return 'eg: ';
-
-      case 'multilinestring':
-        return 'eg: ';
-
-      case 'multipolygon':
-        return 'eg: ';
-    }
-  }
-
-  static getDefaultScaleForDatatype(type): any {
-    switch (type) {
-      case 'int':
-        return ' ';
-
-      case 'tinyint':
-        return ' ';
-
-      case 'smallint':
-        return ' ';
-
-      case 'mediumint':
-        return ' ';
-
-      case 'bigint':
-        return ' ';
-
-      case 'bit':
-        return ' ';
-
-      case 'boolean':
-        return ' ';
-
-      case 'float':
-        return '2';
-
-      case 'decimal':
-        return '2';
-
-      case 'double':
-        return '2';
-
-      case 'serial':
-        return ' ';
-
-      case 'date':
-      case 'datetime':
-      case 'timestamp':
-        return ' ';
-
-      case 'time':
-        return ' ';
-
-      case 'year':
-        return ' ';
-
-      case 'char':
-        return ' ';
-
-      case 'varchar':
-        return ' ';
-
-      case 'nchar':
-        return ' ';
-
-      case 'text':
-        return ' ';
-
-      case 'tinytext':
-        return ' ';
-
-      case 'mediumtext':
-        return ' ';
-
-      case 'longtext':
-        return ' ';
-
-      case 'binary':
-        return ' ';
-
-      case 'varbinary':
-        return ' ';
-
-      case 'blob':
-        return ' ';
-
-      case 'tinyblob':
-        return ' ';
-
-      case 'mediumblob':
-        return ' ';
-
-      case 'longblob':
-        return ' ';
-
-      case 'enum':
-        return ' ';
-
-      case 'set':
-        return ' ';
-
-      case 'geometry':
-        return ' ';
-      case 'point':
-        return ' ';
-      case 'linestring':
-        return ' ';
-      case 'polygon':
-        return ' ';
-      case 'multipoint':
-        return ' ';
-      case 'multilinestring':
-        return ' ';
-      case 'multipolygon':
-        return ' ';
-      case 'json':
-        return ' ';
-    }
-  }
-
-  static colPropAIDisabled(col, columns) {
-    // console.log(col);
-    if (
-      col.dt === 'int4' ||
-      col.dt === 'integer' ||
-      col.dt === 'bigint' ||
-      col.dt === 'smallint'
-    ) {
-      for (let i = 0; i < columns.length; ++i) {
-        if (columns[i].cn !== col.cn && columns[i].ai) {
-          return true;
-        }
-      }
-      return false;
-    } else {
-      return true;
-    }
-  }
-
-  static colPropUNDisabled(_col) {
-    // console.log(col);
-    return true;
-    // if (col.dt === 'int' ||
-    //   col.dt === 'tinyint' ||
-    //   col.dt === 'smallint' ||
-    //   col.dt === 'mediumint' ||
-    //   col.dt === 'bigint') {
-    //   return false;
-    // } else {
-    //   return true;
-    // }
-  }
-
-  static onCheckboxChangeAI(col) {
-    console.log(col);
-    if (
-      col.dt === 'int' ||
-      col.dt === 'bigint' ||
-      col.dt === 'smallint' ||
-      col.dt === 'tinyint'
-    ) {
-      col.altered = col.altered || 2;
-    }
-
-    // if (!col.ai) {
-    //   col.dtx = 'specificType'
-    // } else {
-    //   col.dtx = ''
-    // }
-  }
-
-  static onCheckboxChangeAU(col) {
-    console.log(col);
-    // if (1) {
-    col.altered = col.altered || 2;
-    // }
-    if (col.au) {
-      col.cdf = 'now()';
-    }
-
-    // if (!col.ai) {
-    //   col.dtx = 'specificType'
-    // } else {
-    //   col.dtx = ''
-    // }
-  }
-
-  static showScale(_columnObj) {
-    return false;
-  }
-
-  static removeUnsigned(columns) {
-    for (let i = 0; i < columns.length; ++i) {
-      if (
-        columns[i].altered === 1 &&
-        !(
-          columns[i].dt === 'int' ||
-          columns[i].dt === 'bigint' ||
-          columns[i].dt === 'tinyint' ||
-          columns[i].dt === 'smallint' ||
-          columns[i].dt === 'mediumint'
-        )
-      ) {
-        columns[i].un = false;
-        console.log('>> resetting unsigned value', columns[i].cn);
-      }
-      console.log(columns[i].cn);
-    }
-  }
-
-  static columnEditable(colObj) {
-    return colObj.tn !== '_evolutions' || colObj.tn !== 'nc_evolutions';
-  }
-
-  static extractFunctionName(query) {
-    const reg = /^\s*CREATE\s+(?:OR\s+REPLACE\s*)?\s*FUNCTION\s+(?:[\w\d_]+\.)?([\w_\d]+)/i;
-    const match = query.match(reg);
-    return match && match[1];
-  }
-
-  static extractProcedureName(query) {
-    const reg = /^\s*CREATE\s+(?:OR\s+REPLACE\s*)?\s*PROCEDURE\s+(?:[\w\d_]+\.)?([\w_\d]+)/i;
-    const match = query.match(reg);
-    return match && match[1];
-  }
-
-  static handleRawOutput(result, headers) {
-    if (['DELETE', 'INSERT', 'UPDATE'].includes(result.command.toUpperCase())) {
-      headers.push({ text: 'Row count', value: 'rowCount', sortable: false });
-      result = [
-        {
-          rowCount: result.rowCount
-        }
-      ];
-    } else {
-      result = result.rows;
-      if (Array.isArray(result) && result[0]) {
-        const keys = Object.keys(result[0]);
-        // set headers before settings result
-        for (let i = 0; i < keys.length; i++) {
-          const text = keys[i];
-          headers.push({ text, value: text, sortable: false });
-        }
-      }
-    }
-    return result;
-  }
-
-  static splitQueries(query) {
-    /***
-     * we are splitting based on semicolon
-     * there are mechanism to escape semicolon within single/double quotes(string)
-     */
-    return query.match(/\b("[^"]*;[^"]*"|'[^']*;[^']*'|[^;])*;/g);
-  }
-
-  /**
-   * if sql statement is SELECT - it limits to a number
-   * @param args
-   * @returns {string|*}
-   */
-  sanitiseQuery(args) {
-    let q = args.query.trim().split(';');
-
-    if (q[0].startsWith('Select')) {
-      q = q[0] + ` LIMIT 0,${args.limit ? args.limit : 100};`;
-    } else if (q[0].startsWith('select')) {
-      q = q[0] + ` LIMIT 0,${args.limit ? args.limit : 100};`;
-    } else if (q[0].startsWith('SELECT')) {
-      q = q[0] + ` LIMIT 0,${args.limit ? args.limit : 100};`;
-    } else {
-      return args.query;
-    }
-
-    return q;
-  }
-
-  static getColumnsFromJson(json, tn) {
-    const columns = [];
-
-    try {
-      if (typeof json === 'object' && !Array.isArray(json)) {
-        const keys = Object.keys(json);
-        for (let i = 0; i < keys.length; ++i) {
-          const column = {
-            dp: null,
-            tn,
-            column_name: keys[i],
-            cno: keys[i],
-            np: 10,
-            ns: 0,
-            clen: null,
-            cop: 1,
-            pk: false,
-            nrqd: false,
-            rqd: false,
-            un: false,
-            ct: 'int(11) unsigned',
-            ai: false,
-            unique: false,
-            cdf: null,
-            cc: '',
-            csn: null,
-            dtx: 'specificType',
-            dtxp: null,
-            dtxs: 0,
-            altered: 1
-          };
-
-          switch (typeof json[keys[i]]) {
-            case 'number':
-              if (Number.isInteger(json[keys[i]])) {
-                if (PgUi.isValidTimestamp(keys[i], json[keys[i]])) {
-                  Object.assign(column, {
-                    dt: 'timestamp'
-                  });
-                } else {
-                  Object.assign(column, {
-                    dt: 'int',
-                    np: 10,
-                    ns: 0
-                  });
-                }
-              } else {
-                Object.assign(column, {
-                  dt: 'float4',
-                  np: null,
-                  ns: null,
-                  dtxp: null,
-                  dtxs: null
-                });
-              }
-              break;
-            case 'string':
-              if (PgUi.isValidDate(json[keys[i]])) {
-                Object.assign(column, {
-                  dt: 'date'
-                });
-              } else if (json[keys[i]].length <= 255) {
-                Object.assign(column, {
-                  dt: 'character varying',
-                  np: null,
-                  ns: 0,
-                  dtxp: null
-                });
-              } else {
-                Object.assign(column, {
-                  dt: 'text'
-                });
-              }
-              break;
-            case 'boolean':
-              Object.assign(column, {
-                dt: 'boolean',
-                np: 3,
-                ns: 0
-              });
-              break;
-            case 'object':
-              Object.assign(column, {
-                dt: 'json',
-                np: 3,
-                ns: 0
-              });
-              break;
-            default:
-              break;
-          }
-          columns.push(column);
-        }
-      }
-    } catch (e) {
-      console.log('Error in getColumnsFromJson', e);
-    }
-
-    return columns;
-  }
-
-  static isValidTimestamp(key, value) {
-    if (typeof value !== 'number') {
-      return false;
-    }
-    return new Date(value).getTime() > 0 && /(?:_|(?=A))[aA]t$/.test(key);
-  }
-
-  static isValidDate(value) {
-    return new Date(value).getTime() > 0;
-  }
-
-  static colPropAuDisabled(col) {
-    if (col.altered !== 1) {
-      return true;
-    }
-
-    switch (col.dt) {
-      case 'time':
-      case 'time without time zone':
-      case 'timestamp':
-      case 'timestamp without time zone':
-      case 'timestamptz':
-      case 'timestamp with time zone':
-      case 'timetz':
-      case 'time with time zone':
-        return false;
-      default:
-        return true;
-    }
-  }
-
-  static getAbstractType(col): any {
-    switch ((col.dt || col.dt).toLowerCase()) {
-      case 'anyenum':
-        return 'enum';
-      case 'anynonarray':
-      case 'anyrange':
-        return 'string';
-
-      case 'bit':
-        return 'integer';
-      case 'bigint':
-      case 'bigserial':
-        return 'string';
-
-      case 'bool':
-        return 'boolean';
-
-      case 'box':
-      case 'bpchar':
-      case 'bytea':
-      case 'char':
-      case 'character':
-        return 'string';
-
-      case 'cid':
-      case 'cidr':
-      case 'circle':
-      case 'cstring':
-        return 'string';
-
-      case 'date':
-        return 'date';
-      case 'daterange':
-        return 'string';
-      case 'double precision':
-        return 'string';
-
-      case 'event_trigger':
-      case 'fdw_handler':
-        return 'string';
-
-      case 'float4':
-      case 'float8':
-        return 'float';
-
-      case 'gtsvector':
-      case 'index_am_handler':
-      case 'inet':
-        return 'string';
-
-      case 'int':
-      case 'int2':
-      case 'int4':
-      case 'int8':
-      case 'integer':
-        return 'integer';
-      case 'int4range':
-      case 'int8range':
-      case 'internal':
-      case 'interval':
-        return 'string';
-      case 'jsonb':
-        return 'string';
-
-      case 'language_handler':
-      case 'line':
-      case 'lsec':
-      case 'macaddr':
-      case 'money':
-      case 'name':
-      case 'numeric':
-      case 'numrange':
-      case 'oid':
-      case 'opaque':
-      case 'path':
-      case 'pg_ddl_command':
-      case 'pg_lsn':
-      case 'pg_node_tree':
-      case 'point':
-      case 'polygon':
-        return 'string';
-      case 'real':
-        return 'float';
-      case 'record':
-      case 'refcursor':
-      case 'regclass':
-      case 'regconfig':
-      case 'regdictionary':
-      case 'regnamespace':
-      case 'regoper':
-      case 'regoperator':
-      case 'regproc':
-      case 'regpreocedure':
-      case 'regrole':
-      case 'regtype':
-      case 'reltime':
-        return 'string';
-      case 'serial':
-      case 'serial2':
-      case 'serial8':
-      case 'smallint':
-      case 'smallserial':
-        return 'integer';
-      case 'smgr':
-        return 'string';
-      case 'text':
-        return 'text';
-      case 'tid':
-        return 'string';
-      case 'time':
-      case 'time without time zone':
-        return 'time';
-      case 'timestamp':
-      case 'timestamp without time zone':
-      case 'timestamptz':
-      case 'timestamp with time zone':
-        return 'datetime';
-      case 'timetz':
-      case 'time with time zone':
-        return 'time';
-
-      case 'tinterval':
-      case 'trigger':
-      case 'tsm_handler':
-      case 'tsquery':
-      case 'tsrange':
-      case 'tstzrange':
-      case 'tsvector':
-      case 'txid_snapshot':
-      case 'unknown':
-      case 'void':
-      case 'xid':
-      case 'character varying':
-      case 'xml':
-        return 'string';
-
-      case 'tinyint':
-      case 'mediumint':
-        return 'integer';
-
-      case 'float':
-      case 'decimal':
-      case 'double':
-        return 'float';
-      case 'boolean':
-        return 'boolean';
-      case 'datetime':
-        return 'datetime';
-
-      case 'uuid':
-      case 'year':
-      case 'varchar':
-      case 'nchar':
-        return 'string';
-      case 'tinytext':
-      case 'mediumtext':
-      case 'longtext':
-        return 'text';
-      case 'binary':
-      case 'varbinary':
-        return 'string';
-      case 'blob':
-      case 'tinyblob':
-      case 'mediumblob':
-      case 'longblob':
-        return 'blob';
-      case 'enum':
-        return 'enum';
-      case 'set':
-        return 'set';
-      case 'geometry':
-      case 'linestring':
-      case 'multipoint':
-      case 'multilinestring':
-      case 'multipolygon':
-        return 'string';
-      case 'json':
-        return 'json';
-    }
-  }
-
-  static getUIType(col): any {
-    switch (this.getAbstractType(col)) {
-      case 'integer':
-        return 'Number';
-      case 'boolean':
-        return 'Checkbox';
-      case 'float':
-        return 'Decimal';
-      case 'date':
-        return 'Date';
-      case 'datetime':
-        return 'CreateTime';
-      case 'time':
-        return 'Time';
-      case 'year':
-        return 'Year';
-      case 'string':
-        return 'SingleLineText';
-      case 'text':
-        return 'LongText';
-      case 'blob':
-        return 'Attachment';
-      case 'enum':
-        return 'SingleSelect';
-      case 'set':
-        return 'MultiSelect';
-      case 'json':
-        return 'LongText';
-    }
-  }
-
-  static getDataTypeForUiType(col) {
-    const colProp: any = {};
-    switch (col.uidt) {
-      case 'ID':
-        colProp.dt = 'int4';
-        colProp.pk = true;
-        colProp.un = true;
-        colProp.ai = true;
-        colProp.rqd = true;
-        break;
-      case 'ForeignKey':
-        colProp.dt = 'character varying';
-        break;
-      case 'SingleLineText':
-        colProp.dt = 'character varying';
-        break;
-      case 'LongText':
-        colProp.dt = 'text';
-        break;
-      case 'Attachment':
-        colProp.dt = 'text';
-        break;
-      case 'Checkbox':
-        colProp.dt = 'bool';
-        break;
-      case 'MultiSelect':
-        colProp.dt = 'text';
-        break;
-      case 'SingleSelect':
-        colProp.dt = 'text';
-        break;
-      case 'Collaborator':
-        colProp.dt = 'character varying';
-        break;
-      case 'Date':
-        colProp.dt = 'date';
-
-        break;
-      case 'Year':
-        colProp.dt = 'int';
-        break;
-      case 'Time':
-        colProp.dt = 'time';
-        break;
-      case 'PhoneNumber':
-        colProp.dt = 'character varying';
-        colProp.validate = {
-          func: ['isMobilePhone'],
-          args: [''],
-          msg: ['Validation failed : Invalid Mobile Format']
-        };
-        break;
-      case 'Email':
-        colProp.dt = 'character varying';
-        colProp.validate = {
-          func: ['isEmail'],
-          args: [''],
-          msg: ['Validation failed : Invalid Email Format']
-        };
-        break;
-      case 'URL':
-        colProp.dt = 'character varying';
-        colProp.validate = {
-          func: ['isURL'],
-          args: [''],
-          msg: ['Validation failed : Invalid URL Format']
-        };
-        break;
-      case 'Number':
-        colProp.dt = 'bigint';
-        break;
-      case 'Decimal':
-        colProp.dt = 'decimal';
-        break;
-      case 'Currency':
-        colProp.dt = 'decimal';
-        colProp.validate = {
-          func: ['isCurrency'],
-          args: [''],
-          msg: ['Validation failed : Invalid Currency Format']
-        };
-        break;
-      case 'Percent':
-        colProp.dt = 'float8';
-        break;
-      case 'Duration':
-        colProp.dt = 'int8';
-        break;
-      case 'Rating':
-        colProp.dt = 'float8';
-        break;
-      case 'Formula':
-        colProp.dt = 'character varying';
-        break;
-      case 'Rollup':
-        colProp.dt = 'character varying';
-        break;
-      case 'Count':
-        colProp.dt = 'int8';
-        break;
-      case 'Lookup':
-        colProp.dt = 'character varying';
-        break;
-      case 'DateTime':
-        colProp.dt = 'timestamp';
-        break;
-      case 'CreateTime':
-        colProp.dt = 'timestamp';
-        break;
-      case 'LastModifiedTime':
-        colProp.dt = 'timestamp';
-        break;
-      case 'AutoNumber':
-        colProp.dt = 'int';
-        break;
-      case 'Barcode':
-        colProp.dt = 'character varying';
-        break;
-      case 'Button':
-        colProp.dt = 'character varying';
-        break;
-      case 'JSON':
-        colProp.dt = 'json';
-        break;
-      default:
-        colProp.dt = 'character varying';
-        break;
-    }
-    return colProp;
-  }
-
-  static getDataTypeListForUiType(col) {
-    switch (col.uidt) {
-      case 'ID':
-      case 'ForeignKey':
-        return dbTypes;
-
-      case 'SingleLineText':
-      case 'LongText':
-      case 'Collaborator':
-        return ['char', 'character', 'character varying', 'text'];
-
-      case 'Attachment':
-        return ['json', 'char', 'character', 'character varying', 'text'];
-
-      case 'JSON':
-        return ['json', 'text'];
-      case 'Checkbox':
-        return [
-          'bit',
-          'bool',
-          'int2',
-          'int4',
-          'int8',
-          'boolean',
-          'smallint',
-          'int',
-          'integer',
-          'bigint',
-          'bigserial',
-          'char',
-          'int4range',
-          'int8range',
-          'serial',
-          'serial2',
-          'serial8'
-        ];
-
-      case 'MultiSelect':
-        return ['text'];
-
-      case 'SingleSelect':
-        return ['text'];
-
-      case 'Year':
-        return ['int'];
-
-      case 'Time':
-        return [
-          'time',
-          'time without time zone',
-          'timestamp',
-          'timestamp without time zone',
-          'timestamptz',
-          'timestamp with time zone',
-          'timetz',
-          'time with time zone'
-        ];
-
-      case 'PhoneNumber':
-      case 'Email':
-        return ['character varying'];
-
-      case 'URL':
-        return ['character varying', 'text'];
-
-      case 'Number':
-        return [
-          'int',
-          'integer',
-          'bigint',
-          'bigserial',
-          'int2',
-          'int4',
-          'int8',
-          'serial',
-          'serial2',
-          'serial8',
-          'double precision',
-          'float4',
-          'float8',
-          'smallint',
-          'smallserial',
-          'numeric'
-        ];
-
-      case 'Decimal':
-        return ['double precision', 'float4', 'float8', 'numeric'];
-
-      case 'Currency':
-        return [
-          'int',
-          'integer',
-          'bigint',
-          'bigserial',
-          'int2',
-          'int4',
-          'int8',
-          'serial',
-          'serial2',
-          'serial8',
-          'double precision',
-          'money',
-          'float4',
-          'float8',
-          'numeric'
-        ];
-
-      case 'Percent':
-        return [
-          'int',
-          'integer',
-          'bigint',
-          'bigserial',
-          'int2',
-          'int4',
-          'int8',
-          'serial',
-          'serial2',
-          'serial8',
-          'double precision',
-          'float4',
-          'float8',
-          'smallint',
-          'smallserial',
-          'numeric'
-        ];
-
-      case 'Duration':
-        return [
-          'int',
-          'integer',
-          'bigint',
-          'bigserial',
-          'int2',
-          'int4',
-          'int8',
-          'serial',
-          'serial2',
-          'serial8',
-          'double precision',
-          'float4',
-          'float8',
-          'smallint',
-          'smallserial',
-          'numeric'
-        ];
-
-      case 'Rating':
-        return [
-          'int',
-          'integer',
-          'bigint',
-          'bigserial',
-          'int2',
-          'int4',
-          'int8',
-          'serial',
-          'serial2',
-          'serial8',
-          'double precision',
-          'float4',
-          'float8',
-          'smallint',
-          'smallserial',
-          'numeric'
-        ];
-
-      case 'Formula':
-        return ['text', 'character varying'];
-
-      case 'Rollup':
-        return ['character varying'];
-
-      case 'Count':
-        return [
-          'int',
-          'integer',
-          'bigint',
-          'bigserial',
-          'int2',
-          'int4',
-          'int8',
-          'serial',
-          'serial2',
-          'serial8',
-          'smallint',
-          'smallserial'
-        ];
-
-      case 'Lookup':
-        return ['character varying'];
-
-      case 'Date':
-        return [
-          'date',
-          'timestamp',
-          'timestamp without time zone',
-          'timestamptz',
-          'timestamp with time zone'
-        ];
-
-      case 'DateTime':
-      case 'CreateTime':
-      case 'LastModifiedTime':
-        return [
-          'timestamp',
-          'timestamp without time zone',
-          'timestamptz',
-          'timestamp with time zone'
-        ];
-
-      case 'AutoNumber':
-        return [
-          'int',
-          'integer',
-          'bigint',
-          'bigserial',
-          'int2',
-          'int4',
-          'int8',
-          'serial',
-          'serial2',
-          'serial8',
-          'smallint',
-          'smallserial'
-        ];
-
-      case 'Barcode':
-        return ['character varying'];
-
-      case 'Geometry':
-        return [
-          'polygon',
-          'point',
-          'circle',
-          'box',
-          'line',
-          'lseg',
-          'path',
-          'circle'
-        ];
-
-      case 'Button':
-      default:
-        return dbTypes;
-    }
-  }
-
-  static getUnsupportedFnList() {
-    return [];
-  }
-}
-
-// module.exports = PgUiHelp;
-/**
- * @copyright Copyright (c) 2021, Xgene Cloud Ltd
- *
- * @author Naveen MR <oof1lab@gmail.com>
- * @author Pranav C Balan <pranavxc@gmail.com>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
diff --git a/packages/nocodb/src/lib/sqlUi/SqlUiFactory.ts b/packages/nocodb/src/lib/sqlUi/SqlUiFactory.ts
deleted file mode 100644
index 48af9073bf..0000000000
--- a/packages/nocodb/src/lib/sqlUi/SqlUiFactory.ts
+++ /dev/null
@@ -1,70 +0,0 @@
-import { MysqlUi } from './MysqlUi';
-import { PgUi } from './PgUi';
-import { MssqlUi } from './MssqlUi';
-import { OracleUi } from './OracleUi';
-import { SqliteUi } from './SqliteUi';
-
-// import {YugabyteUi} from "./YugabyteUi";
-// import {TidbUi} from "./TidbUi";
-// import {VitessUi} from "./VitessUi";
-
-export class SqlUiFactory {
-  static create(connectionConfig) {
-    // connectionConfig.meta = connectionConfig.meta || {};
-    // connectionConfig.meta.dbtype = connectionConfig.meta.dbtype || "";
-    if (
-      connectionConfig.client === 'mysql' ||
-      connectionConfig.client === 'mysql2'
-    ) {
-      // if (connectionConfig.meta.dbtype === "tidb")
-      //   return Tidb;
-      // if (connectionConfig.meta.dbtype === "vitess")
-      //   return Vitess;
-
-      console.log('- - - -In Mysql UI');
-
-      return MysqlUi;
-    }
-
-    if (connectionConfig.client === 'sqlite3') {
-      return SqliteUi;
-    }
-    if (connectionConfig.client === 'mssql') {
-      return MssqlUi;
-    }
-    if (connectionConfig.client === 'oracledb') {
-      return OracleUi;
-    }
-
-    if (connectionConfig.client === 'pg') {
-      // if (connectionConfig.meta.dbtype === "yugabyte")
-      //   return Yugabyte;
-      return PgUi;
-    }
-
-    throw new Error('Database not supported');
-  }
-}
-
-/**
- * @copyright Copyright (c) 2021, Xgene Cloud Ltd
- *
- * @author Naveen MR <oof1lab@gmail.com>
- * @author Pranav C Balan <pranavxc@gmail.com>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
diff --git a/packages/nocodb/src/lib/sqlUi/SqliteUi.ts b/packages/nocodb/src/lib/sqlUi/SqliteUi.ts
deleted file mode 100644
index 356b26917d..0000000000
--- a/packages/nocodb/src/lib/sqlUi/SqliteUi.ts
+++ /dev/null
@@ -1,1114 +0,0 @@
-const dbTypes = [
-  'int',
-  'integer',
-  'tinyint',
-  'smallint',
-  'mediumint',
-  'bigint',
-  'int2',
-  'int8',
-  'character',
-  'blob sub_type text',
-  'blob',
-  'real',
-  'double',
-  'double precision',
-  'float',
-  'numeric',
-  'boolean',
-  'date',
-  'datetime',
-  'text',
-  'varchar',
-  'timestamp'
-];
-
-export class SqliteUi {
-  static getNewTableColumns() {
-    return [
-      {
-        column_name: 'id',
-        dt: 'integer',
-        dtx: 'integer',
-        ct: 'int(11)',
-        nrqd: false,
-        rqd: true,
-        ck: false,
-        pk: true,
-        un: false,
-        ai: true,
-        cdf: null,
-        clen: null,
-        np: null,
-        ns: 0,
-        dtxp: '',
-        dtxs: '',
-        altered: 1,
-        uidt: 'ID',
-        uip: '',
-        uicn: ''
-      },
-      {
-        column_name: 'title',
-        dt: 'varchar',
-        dtx: 'specificType',
-        ct: 'varchar',
-        nrqd: true,
-        rqd: false,
-        ck: false,
-        pk: false,
-        un: false,
-        ai: false,
-        cdf: null,
-        clen: 45,
-        np: null,
-        ns: null,
-        dtxp: '',
-        dtxs: '',
-        altered: 1,
-        uidt: 'SingleLineText',
-        uip: '',
-        uicn: ''
-      },
-      {
-        column_name: 'created_at',
-        dt: 'datetime',
-        dtx: 'specificType',
-        ct: 'varchar',
-        nrqd: true,
-        rqd: false,
-        ck: false,
-        pk: false,
-        un: false,
-        ai: false,
-        cdf: 'CURRENT_TIMESTAMP',
-        clen: 45,
-        np: null,
-        ns: null,
-        dtxp: '',
-        dtxs: '',
-        altered: 1,
-        uidt: 'CreateTime',
-        uip: '',
-        uicn: ''
-      },
-      {
-        column_name: 'updated_at',
-        dt: 'datetime',
-        dtx: 'specificType',
-        ct: 'varchar',
-        nrqd: true,
-        rqd: false,
-        ck: false,
-        pk: false,
-        un: false,
-        ai: false,
-        cdf: 'CURRENT_TIMESTAMP',
-        clen: 45,
-        np: null,
-        ns: null,
-        dtxp: '',
-        dtxs: '',
-        altered: 1,
-        uidt: 'LastModifiedTime',
-        uip: '',
-        uicn: ''
-      }
-    ];
-  }
-
-  static getNewColumn(suffix) {
-    return {
-      column_name: 'title' + suffix,
-      dt: 'integer',
-      dtx: 'specificType',
-      ct: 'integer(11)',
-      nrqd: true,
-      rqd: false,
-      ck: false,
-      pk: false,
-      un: false,
-      ai: false,
-      cdf: null,
-      clen: 45,
-      np: null,
-      ns: null,
-      // data_type_x_specific: ' ',
-      dtxp: '',
-      dtxs: ' ',
-      altered: 1,
-      uidt: 'Number',
-      uip: '',
-      uicn: ''
-    };
-  }
-
-  // static getDefaultLengthForDatatype(type) {
-  //   switch (type) {
-  //     case "int":
-  //       return 11;
-  //       break;
-  //     case "tinyint":
-  //       return 1;
-  //       break;
-  //     case "smallint":
-  //       return 5;
-  //       break;
-  //
-  //     case "mediumint":
-  //       return 9;
-  //       break;
-  //     case "bigint":
-  //       return 20;
-  //       break;
-  //     case "bit":
-  //       return 64;
-  //       break;
-  //     case "boolean":
-  //       return '';
-  //       break;
-  //     case "float":
-  //       return 12;
-  //       break;
-  //     case "decimal":
-  //       return 10;
-  //       break;
-  //     case "double":
-  //       return 22;
-  //       break;
-  //     case "serial":
-  //       return 20;
-  //       break;
-  //     case "date":
-  //       return '';
-  //       break;
-  //     case "datetime":
-  //     case "timestamp":
-  //       return 6;
-  //       break;
-  //     case "time":
-  //       return '';
-  //       break;
-  //     case "year":
-  //       return '';
-  //       break;
-  //     case "char":
-  //       return 255;
-  //       break;
-  //     case "varchar":
-  //       return 45;
-  //       break;
-  //     case "nchar":
-  //       return 255;
-  //       break;
-  //     case "text":
-  //       return '';
-  //       break;
-  //     case "tinytext":
-  //       return '';
-  //       break;
-  //     case "mediumtext":
-  //       return '';
-  //       break;
-  //     case "longtext":
-  //       return ''
-  //       break;
-  //     case "binary":
-  //       return 255;
-  //       break;
-  //     case "varbinary":
-  //       return 65500;
-  //       break;
-  //     case "blob":
-  //       return '';
-  //       break;
-  //     case "tinyblob":
-  //       return '';
-  //       break;
-  //     case "mediumblob":
-  //       return '';
-  //       break;
-  //     case "longblob":
-  //       return '';
-  //       break;
-  //     case "enum":
-  //       return '\'a\',\'b\'';
-  //       break;
-  //     case "set":
-  //       return '\'a\',\'b\'';
-  //       break;
-  //     case "geometry":
-  //       return '';
-  //     case "point":
-  //       return '';
-  //     case "linestring":
-  //       return '';
-  //     case "polygon":
-  //       return '';
-  //     case "multipoint":
-  //       return '';
-  //     case "multilinestring":
-  //       return '';
-  //     case "multipolygon":
-  //       return '';
-  //     case "json":
-  //       return ''
-  //       break;
-  //
-  //   }
-  //
-  // }
-
-  static getDefaultLengthForDatatype(type) {
-    switch (type) {
-      case 'int':
-        return '';
-
-      case 'tinyint':
-        return '';
-
-      case 'smallint':
-        return '';
-
-      case 'mediumint':
-        return '';
-
-      case 'bigint':
-        return '';
-
-      case 'bit':
-        return '';
-
-      case 'boolean':
-        return '';
-
-      case 'float':
-        return '';
-
-      case 'decimal':
-        return '';
-
-      case 'double':
-        return '';
-
-      case 'serial':
-        return '';
-
-      case 'date':
-        return '';
-
-      case 'datetime':
-      case 'timestamp':
-        return '';
-
-      case 'time':
-        return '';
-
-      case 'year':
-        return '';
-
-      case 'char':
-        return '';
-
-      case 'varchar':
-        return '';
-
-      case 'nchar':
-        return '';
-
-      case 'text':
-        return '';
-
-      case 'tinytext':
-        return '';
-
-      case 'mediumtext':
-        return '';
-
-      case 'longtext':
-        return '';
-
-      case 'binary':
-        return '';
-
-      case 'varbinary':
-        return '';
-
-      case 'blob':
-        return '';
-
-      case 'tinyblob':
-        return '';
-
-      case 'mediumblob':
-        return '';
-
-      case 'longblob':
-        return '';
-
-      case 'enum':
-        return '';
-
-      case 'set':
-        return '';
-
-      case 'geometry':
-        return '';
-      case 'point':
-        return '';
-      case 'linestring':
-        return '';
-      case 'polygon':
-        return '';
-      case 'multipoint':
-        return '';
-      case 'multilinestring':
-        return '';
-      case 'multipolygon':
-        return '';
-      case 'json':
-        return '';
-    }
-    return '';
-  }
-
-  static getDefaultLengthIsDisabled(type): any {
-    switch (type) {
-      case 'integer':
-      case 'blob':
-      case 'real':
-      case 'numeric':
-        return true;
-
-      case 'text':
-        return false;
-    }
-  }
-
-  static getDefaultValueForDatatype(type): any {
-    switch (type) {
-      case 'integer':
-        return 'eg : ' + 10;
-
-      case 'text':
-        return 'eg : hey';
-
-      case 'numeric':
-        return 'eg : ' + 10;
-
-      case 'real':
-        return 'eg : ' + 10.0;
-
-      case 'blob':
-        return 'eg : ' + 100;
-    }
-  }
-
-  static getDefaultScaleForDatatype(type): any {
-    switch (type) {
-      case 'integer':
-        return ' ';
-
-      case 'text':
-        return ' ';
-
-      case 'numeric':
-        return ' ';
-
-      case 'real':
-        return ' ';
-
-      case 'blob':
-        return ' ';
-    }
-  }
-
-  static colPropAIDisabled(col, columns) {
-    // console.log(col);
-    if (col.dt === 'integer') {
-      for (let i = 0; i < columns.length; ++i) {
-        if (columns[i].cn !== col.cn && columns[i].ai) {
-          return true;
-        }
-      }
-      return false;
-    } else {
-      return true;
-    }
-  }
-
-  static colPropUNDisabled(_col) {
-    // console.log(col);
-    return true;
-    // if (col.dt === 'int' ||
-    //   col.dt === 'tinyint' ||
-    //   col.dt === 'smallint' ||
-    //   col.dt === 'mediumint' ||
-    //   col.dt === 'bigint') {
-    //   return false;
-    // } else {
-    //   return true;
-    // }
-  }
-
-  static onCheckboxChangeAI(col) {
-    console.log(col);
-    if (
-      col.dt === 'int' ||
-      col.dt === 'bigint' ||
-      col.dt === 'smallint' ||
-      col.dt === 'tinyint'
-    ) {
-      col.altered = col.altered || 2;
-    }
-
-    // if (!col.ai) {
-    //   col.dtx = 'specificType'
-    // } else {
-    //   col.dtx = ''
-    // }
-  }
-
-  static showScale(_columnObj) {
-    return false;
-  }
-
-  static removeUnsigned(columns) {
-    for (let i = 0; i < columns.length; ++i) {
-      if (
-        columns[i].altered === 1 &&
-        !(
-          columns[i].dt === 'int' ||
-          columns[i].dt === 'bigint' ||
-          columns[i].dt === 'tinyint' ||
-          columns[i].dt === 'smallint' ||
-          columns[i].dt === 'mediumint'
-        )
-      ) {
-        columns[i].un = false;
-        console.log('>> resetting unsigned value', columns[i].cn);
-      }
-      console.log(columns[i].cn);
-    }
-  }
-
-  static extractFunctionName(query) {
-    const reg = /^\s*CREATE\s+(?:OR\s+REPLACE\s*)?\s*FUNCTION\s+(?:[\w\d_]+\.)?([\w_\d]+)/i;
-    const match = query.match(reg);
-    return match && match[1];
-  }
-
-  static extractProcedureName(query) {
-    const reg = /^\s*CREATE\s+(?:OR\s+REPLACE\s*)?\s*PROCEDURE\s+(?:[\w\d_]+\.)?([\w_\d]+)/i;
-    const match = query.match(reg);
-    return match && match[1];
-  }
-
-  static columnEditable(_colObj) {
-    return true; // colObj.altered === 1;
-  }
-
-  static handleRawOutput(result, headers) {
-    console.log(result);
-    if (Array.isArray(result) && result[0]) {
-      const keys = Object.keys(result[0]);
-      // set headers before settings result
-      for (let i = 0; i < keys.length; i++) {
-        const text = keys[i];
-        headers.push({ text, value: text, sortable: false });
-      }
-    }
-    return result;
-  }
-
-  static splitQueries(query) {
-    /***
-     * we are splitting based on semicolon
-     * there are mechanism to escape semicolon within single/double quotes(string)
-     */
-    return query.match(/\b("[^"]*;[^"]*"|'[^']*;[^']*'|[^;])*;/g);
-  }
-
-  /**
-   * if sql statement is SELECT - it limits to a number
-   * @param args
-   * @returns {string|*}
-   */
-  sanitiseQuery(args) {
-    let q = args.query.trim().split(';');
-
-    if (q[0].startsWith('Select')) {
-      q = q[0] + ` LIMIT 0,${args.limit ? args.limit : 100};`;
-    } else if (q[0].startsWith('select')) {
-      q = q[0] + ` LIMIT 0,${args.limit ? args.limit : 100};`;
-    } else if (q[0].startsWith('SELECT')) {
-      q = q[0] + ` LIMIT 0,${args.limit ? args.limit : 100};`;
-    } else {
-      return args.query;
-    }
-
-    return q;
-  }
-
-  static getColumnsFromJson(json, tn) {
-    const columns = [];
-
-    try {
-      if (typeof json === 'object' && !Array.isArray(json)) {
-        const keys = Object.keys(json);
-        for (let i = 0; i < keys.length; ++i) {
-          const column = {
-            dp: null,
-            tn,
-            column_name: keys[i],
-            cno: keys[i],
-            np: null,
-            ns: null,
-            clen: null,
-            cop: 1,
-            pk: false,
-            nrqd: false,
-            rqd: false,
-            un: false,
-            ct: 'int(11) unsigned',
-            ai: false,
-            unique: false,
-            cdf: null,
-            cc: '',
-            csn: null,
-            dtx: 'specificType',
-            dtxp: null,
-            dtxs: 0,
-            altered: 1
-          };
-
-          switch (typeof json[keys[i]]) {
-            case 'number':
-              if (Number.isInteger(json[keys[i]])) {
-                if (SqliteUi.isValidTimestamp(keys[i], json[keys[i]])) {
-                  Object.assign(column, {
-                    dt: 'timestamp'
-                  });
-                } else {
-                  Object.assign(column, {
-                    dt: 'integer'
-                  });
-                }
-              } else {
-                Object.assign(column, {
-                  dt: 'real'
-                });
-              }
-              break;
-            case 'string':
-              // if (SqliteUi.isValidDate(json[keys[i]])) {
-              //   Object.assign(column, {
-              //     "dt": "datetime"
-              //   });
-              // } else
-              if (json[keys[i]].length <= 255) {
-                Object.assign(column, {
-                  dt: 'varchar'
-                });
-              } else {
-                Object.assign(column, {
-                  dt: 'text'
-                });
-              }
-              break;
-            case 'boolean':
-              Object.assign(column, {
-                dt: 'integer'
-              });
-              break;
-            case 'object':
-              Object.assign(column, {
-                dt: 'text',
-                np: null,
-                dtxp: null
-              });
-              break;
-            default:
-              break;
-          }
-          columns.push(column);
-        }
-      }
-    } catch (e) {
-      console.log('Error in getColumnsFromJson', e);
-    }
-
-    return columns;
-  }
-
-  static isValidTimestamp(key, value) {
-    if (typeof value !== 'number') {
-      return false;
-    }
-    return new Date(value).getTime() > 0 && /(?:_|(?=A))[aA]t$/.test(key);
-  }
-
-  static isValidDate(value) {
-    return new Date(value).getTime() > 0;
-  }
-
-  static onCheckboxChangeAU(col) {
-    console.log(col);
-    // if (1) {
-    col.altered = col.altered || 2;
-    // }
-
-    // if (!col.ai) {
-    //   col.dtx = 'specificType'
-    // } else {
-    //   col.dtx = ''
-    // }
-  }
-
-  static colPropAuDisabled(col) {
-    if (col.altered !== 1) {
-      return true;
-    }
-
-    switch (col.dt) {
-      case 'date':
-      case 'datetime':
-      case 'timestamp':
-      case 'time':
-        return false;
-
-      default:
-        return true;
-    }
-  }
-
-  static getAbstractType(col): any {
-    switch ((col.dt || col.dt).toLowerCase()) {
-      case 'date':
-        return 'date';
-      case 'datetime':
-      case 'timestamp':
-        return 'datetime';
-      case 'integer':
-      case 'int':
-      case 'tinyint':
-      case 'smallint':
-      case 'mediumint':
-      case 'int2':
-      case 'int8':
-        return 'integer';
-      case 'text':
-        return 'text';
-      case 'boolean':
-        return 'boolean';
-      case 'real':
-      case 'double':
-      case 'double precision':
-      case 'float':
-      case 'numeric':
-        return 'float';
-
-      case 'blob sub_type text':
-      case 'blob':
-        return 'blob';
-
-      case 'bigint':
-      case 'character':
-      case 'varchar':
-        return 'string';
-    }
-    return 'string';
-  }
-
-  static getUIType(col): any {
-    switch (this.getAbstractType(col)) {
-      case 'integer':
-        return 'Number';
-      case 'boolean':
-        return 'Checkbox';
-      case 'float':
-        return 'Decimal';
-      case 'date':
-        return 'Date';
-      case 'datetime':
-        return 'CreateTime';
-      case 'time':
-        return 'Time';
-      case 'year':
-        return 'Year';
-      case 'string':
-        return 'SingleLineText';
-      case 'text':
-        return 'LongText';
-      case 'blob':
-        return 'Attachment';
-      case 'enum':
-        return 'SingleSelect';
-      case 'set':
-        return 'MultiSelect';
-      case 'json':
-        return 'LongText';
-    }
-  }
-
-  static getDataTypeForUiType(col) {
-    const colProp: any = {};
-    switch (col.uidt) {
-      case 'ID':
-        colProp.dt = 'integer';
-        colProp.pk = true;
-        colProp.un = true;
-        colProp.ai = true;
-        colProp.rqd = true;
-        break;
-      case 'ForeignKey':
-        colProp.dt = 'varchar';
-        break;
-      case 'SingleLineText':
-        colProp.dt = 'varchar';
-        break;
-      case 'LongText':
-        colProp.dt = 'text';
-        break;
-      case 'Attachment':
-        colProp.dt = 'text';
-        break;
-      case 'Checkbox':
-        // colProp.dt = 'tinyint';
-        // colProp.dtxp = 1;
-        colProp.dt = 'boolean';
-        break;
-      case 'MultiSelect':
-        colProp.dt = 'text';
-        break;
-      case 'SingleSelect':
-        colProp.dt = 'text';
-        break;
-      case 'Collaborator':
-        colProp.dt = 'varchar';
-        break;
-      case 'Date':
-        colProp.dt = 'date';
-
-        break;
-      case 'Year':
-        colProp.dt = 'year';
-        break;
-      case 'Time':
-        colProp.dt = 'time';
-        break;
-      case 'PhoneNumber':
-        colProp.dt = 'varchar';
-        colProp.validate = {
-          func: ['isMobilePhone'],
-          args: [''],
-          msg: ['Validation failed : Invalid Mobile Format']
-        };
-        break;
-      case 'Email':
-        colProp.dt = 'varchar';
-        colProp.validate = {
-          func: ['isEmail'],
-          args: [''],
-          msg: ['Validation failed : Invalid Email Format']
-        };
-        break;
-      case 'URL':
-        colProp.dt = 'varchar';
-        colProp.validate = {
-          func: ['isURL'],
-          args: [''],
-          msg: ['Validation failed : Invalid URL Format']
-        };
-        break;
-      case 'Number':
-        colProp.dt = 'integer';
-        break;
-      case 'Decimal':
-        colProp.dt = 'decimal';
-        break;
-      case 'Currency':
-        colProp.dt = 'double precision';
-        colProp.validate = {
-          func: ['isCurrency'],
-          args: [''],
-          msg: ['Validation failed : Invalid Currency Format']
-        };
-        break;
-      case 'Percent':
-        colProp.dt = 'double';
-        break;
-      case 'Duration':
-        colProp.dt = 'integer';
-        break;
-      case 'Rating':
-        colProp.dt = 'float';
-        break;
-      case 'Formula':
-        colProp.dt = 'varchar';
-        break;
-      case 'Rollup':
-        colProp.dt = 'varchar';
-        break;
-      case 'Count':
-        colProp.dt = 'integer';
-        break;
-      case 'Lookup':
-        colProp.dt = 'varchar';
-        break;
-      case 'DateTime':
-        colProp.dt = 'datetime';
-        break;
-      case 'CreateTime':
-        colProp.dt = 'datetime';
-        break;
-      case 'LastModifiedTime':
-        colProp.dt = 'datetime';
-        break;
-      case 'AutoNumber':
-        colProp.dt = 'integer';
-        break;
-      case 'Barcode':
-        colProp.dt = 'varchar';
-        break;
-      case 'Button':
-        colProp.dt = 'varchar';
-        break;
-      case 'JSON':
-        colProp.dt = 'text';
-        break;
-      default:
-        colProp.dt = 'varchar';
-        break;
-    }
-    return colProp;
-  }
-
-  static getDataTypeListForUiType(col) {
-    switch (col.uidt) {
-      case 'ID':
-      case 'ForeignKey':
-        return dbTypes;
-
-      case 'SingleLineText':
-      case 'LongText':
-      case 'Attachment':
-      case 'Collaborator':
-        return ['character', 'text', 'varchar'];
-
-      case 'Checkbox':
-        return [
-          'int',
-          'integer',
-          'tinyint',
-          'smallint',
-          'mediumint',
-          'bigint',
-          'int2',
-          'int8',
-          'boolean'
-        ];
-
-      case 'MultiSelect':
-        return ['text', 'varchar'];
-
-      case 'SingleSelect':
-        return ['text', 'varchar'];
-
-      case 'Year':
-        return [
-          'int',
-          'integer',
-          'tinyint',
-          'smallint',
-          'mediumint',
-          'bigint',
-          'int2',
-          'int8'
-        ];
-
-      case 'Time':
-        return [
-          'int',
-          'integer',
-          'tinyint',
-          'smallint',
-          'mediumint',
-          'bigint',
-          'int2',
-          'int8'
-        ];
-
-      case 'PhoneNumber':
-      case 'Email':
-        return ['varchar', 'text'];
-
-      case 'URL':
-        return ['varchar', 'text'];
-
-      case 'Number':
-        return [
-          'int',
-          'integer',
-          'tinyint',
-          'smallint',
-          'mediumint',
-          'bigint',
-          'int2',
-          'int8',
-          'numeric',
-          'real',
-          'double',
-          'double precision',
-          'float'
-        ];
-
-      case 'Decimal':
-        return ['real', 'double', 'double precision', 'float', 'numeric'];
-
-      case 'Currency':
-        return [
-          'real',
-          'double',
-          'double precision',
-          'float',
-          'int',
-          'integer',
-          'tinyint',
-          'smallint',
-          'mediumint',
-          'bigint',
-          'int2',
-          'int8',
-          'numeric'
-        ];
-
-      case 'Percent':
-        return [
-          'real',
-          'double',
-          'double precision',
-          'float',
-          'int',
-          'integer',
-          'tinyint',
-          'smallint',
-          'mediumint',
-          'bigint',
-          'int2',
-          'int8',
-          'numeric'
-        ];
-
-      case 'Duration':
-        return [
-          'int',
-          'integer',
-          'tinyint',
-          'smallint',
-          'mediumint',
-          'bigint',
-          'int2',
-          'int8'
-        ];
-
-      case 'Rating':
-        return [
-          'real',
-          'double',
-          'double precision',
-          'float',
-          'int',
-          'integer',
-          'tinyint',
-          'smallint',
-          'mediumint',
-          'bigint',
-          'int2',
-          'int8',
-          'numeric'
-        ];
-
-      case 'Formula':
-        return ['text', 'varchar'];
-
-      case 'Rollup':
-        return ['varchar'];
-
-      case 'Count':
-        return [
-          'int',
-          'integer',
-          'tinyint',
-          'smallint',
-          'mediumint',
-          'bigint',
-          'int2',
-          'int8'
-        ];
-
-      case 'Lookup':
-        return ['varchar'];
-
-      case 'Date':
-        return ['date', 'varchar'];
-
-      case 'DateTime':
-      case 'CreateTime':
-      case 'LastModifiedTime':
-        return ['datetime', 'timestamp'];
-
-      case 'AutoNumber':
-        return [
-          'int',
-          'integer',
-          'tinyint',
-          'smallint',
-          'mediumint',
-          'bigint',
-          'int2',
-          'int8'
-        ];
-
-      case 'Barcode':
-        return ['varchar'];
-
-      case 'Geometry':
-        return ['text'];
-      case 'JSON':
-        return ['text'];
-
-      case 'Button':
-      default:
-        return dbTypes;
-    }
-  }
-
-  static getUnsupportedFnList() {
-    return ['LOG', 'EXP', 'POWER', 'SQRT'];
-  }
-}
-
-// module.exports = PgUiHelp;
-/**
- * @copyright Copyright (c) 2021, Xgene Cloud Ltd
- *
- * @author Naveen MR <oof1lab@gmail.com>
- * @author Pranav C Balan <pranavxc@gmail.com>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
diff --git a/packages/nocodb/src/lib/sqlUi/UITypes.ts b/packages/nocodb/src/lib/sqlUi/UITypes.ts
deleted file mode 100644
index 7607c36711..0000000000
--- a/packages/nocodb/src/lib/sqlUi/UITypes.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-enum UITypes {
-  ID = 'ID',
-  LinkToAnotherRecord = 'LinkToAnotherRecord',
-  ForeignKey = 'ForeignKey',
-  Lookup = 'Lookup',
-  SingleLineText = 'SingleLineText',
-  LongText = 'LongText',
-  Attachment = 'Attachment',
-  Checkbox = 'Checkbox',
-  MultiSelect = 'MultiSelect',
-  SingleSelect = 'SingleSelect',
-  Collaborator = 'Collaborator',
-  Date = 'Date',
-  Year = 'Year',
-  Time = 'Time',
-  PhoneNumber = 'PhoneNumber',
-  Email = 'Email',
-  URL = 'URL',
-  Number = 'Number',
-  Decimal = 'Decimal',
-  Currency = 'Currency',
-  Percent = 'Percent',
-  Duration = 'Duration',
-  Rating = 'Rating',
-  Formula = 'Formula',
-  Rollup = 'Rollup',
-  Count = 'Count',
-  DateTime = 'DateTime',
-  CreateTime = 'CreateTime',
-  LastModifiedTime = 'LastModifiedTime',
-  AutoNumber = 'AutoNumber',
-  Geometry = 'Geometry',
-  JSON = 'JSON',
-  SpecificDBType = 'SpecificDBType',
-  Barcode = 'Barcode',
-  Button = 'Button'
-}
-
-export default UITypes;
diff --git a/packages/nocodb/src/lib/sqlUi/index.ts b/packages/nocodb/src/lib/sqlUi/index.ts
deleted file mode 100644
index 57d4af6936..0000000000
--- a/packages/nocodb/src/lib/sqlUi/index.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-// todo: move to a common library
-
-export * from './MysqlUi';
-export * from './PgUi';
-export * from './MssqlUi';
-export * from './OracleUi';
-export * from './SqliteUi';
-export * from './SqlUiFactory';
diff --git a/packages/nocodb/src/lib/templateParser/NcTemplateParser.ts b/packages/nocodb/src/lib/templateParser/NcTemplateParser.ts
index 21421e5a4c..c2175f8a89 100644
--- a/packages/nocodb/src/lib/templateParser/NcTemplateParser.ts
+++ b/packages/nocodb/src/lib/templateParser/NcTemplateParser.ts
@@ -4,9 +4,9 @@ import {
   OracleUi,
   PgUi,
   SqliteUi,
-  SqlUiFactory
-} from '../sqlUi';
-import UITypes from '../sqlUi/UITypes';
+  SqlUiFactory,
+  UITypes
+} from 'nocodb-sdk';
 
 export default class NcTemplateParser {
   sqlUi:
diff --git a/scripts/cypress/fixtures/sqlite-sakila/regenFiles/package-lock.json b/scripts/cypress/fixtures/sqlite-sakila/regenFiles/package-lock.json
index c8af2c7be0..9b67631722 100644
--- a/scripts/cypress/fixtures/sqlite-sakila/regenFiles/package-lock.json
+++ b/scripts/cypress/fixtures/sqlite-sakila/regenFiles/package-lock.json
@@ -460,9 +460,9 @@
       }
     },
     "minimist": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
+      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="
     },
     "minipass": {
       "version": "2.9.0",

From 686648f7f3601bb8a0dd1cea42bfa5c91af92bd7 Mon Sep 17 00:00:00 2001
From: pranavxc <pranavxc@users.noreply.github.com>
Date: Tue, 19 Apr 2022 20:27:40 +0000
Subject: [PATCH 18/27] [create-pull-request] automated change

Signed-off-by: GitHub <noreply@github.com>
---
 packages/nc-gui/package-lock.json     |  6 +++---
 packages/nc-gui/package.json          |  2 +-
 packages/nc-lib-gui/package.json      |  2 +-
 packages/nocodb-sdk/package-lock.json |  2 +-
 packages/nocodb-sdk/package.json      |  2 +-
 packages/nocodb/package-lock.json     | 14 +++++++-------
 packages/nocodb/package.json          |  6 +++---
 7 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/packages/nc-gui/package-lock.json b/packages/nc-gui/package-lock.json
index e8e0d04a01..9eb1c8a803 100644
--- a/packages/nc-gui/package-lock.json
+++ b/packages/nc-gui/package-lock.json
@@ -7876,9 +7876,9 @@
       }
     },
     "nocodb-sdk": {
-      "version": "0.90.4",
-      "resolved": "https://registry.npmjs.org/nocodb-sdk/-/nocodb-sdk-0.90.4.tgz",
-      "integrity": "sha512-I4NrpUjVWnzNwjOO3ymDrIpSbXpVivzCfjny46LGKInmfLu2gutblsaw6tV0Jsv6LIFRPri+1rWqjtDH20bVnA==",
+      "version": "0.90.5",
+      "resolved": "https://registry.npmjs.org/nocodb-sdk/-/nocodb-sdk-0.90.5.tgz",
+      "integrity": "sha512-5H2nuVvt9n2DTQs9NMKtooGBXPpGjPoHIy6szXb+feigE2N8QPZNNt3YgpK9QaEG6mTpr04kXgCvFp0QsgV6Xg==",
       "requires": {
         "axios": "^0.21.1",
         "jsep": "^0.4.0"
diff --git a/packages/nc-gui/package.json b/packages/nc-gui/package.json
index d96af19fbb..b8fa48268e 100644
--- a/packages/nc-gui/package.json
+++ b/packages/nc-gui/package.json
@@ -29,7 +29,7 @@
     "monaco-editor": "^0.19.3",
     "monaco-themes": "^0.2.5",
     "nano-assign": "^1.0.1",
-    "nocodb-sdk": "0.90.4",
+    "nocodb-sdk": "0.90.5",
     "nuxt": "^2.14.0",
     "odometer": "^0.4.8",
     "papaparse": "^5.3.1",
diff --git a/packages/nc-lib-gui/package.json b/packages/nc-lib-gui/package.json
index 1323a3d78a..094d32021d 100644
--- a/packages/nc-lib-gui/package.json
+++ b/packages/nc-lib-gui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nc-lib-gui",
-  "version": "0.90.4",
+  "version": "0.90.5",
   "description": "> TODO: description",
   "author": "“pranavxc” <pranavxc@gmail.com>",
   "homepage": "https://gitlab.com/xgenecloud-ts/xgenecloud-ts#readme",
diff --git a/packages/nocodb-sdk/package-lock.json b/packages/nocodb-sdk/package-lock.json
index 1251ff9fb2..e8af491f42 100644
--- a/packages/nocodb-sdk/package-lock.json
+++ b/packages/nocodb-sdk/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "nocodb-sdk",
-  "version": "0.90.4",
+  "version": "0.90.5",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/packages/nocodb-sdk/package.json b/packages/nocodb-sdk/package.json
index 422da41420..e139884fc1 100644
--- a/packages/nocodb-sdk/package.json
+++ b/packages/nocodb-sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nocodb-sdk",
-  "version": "0.90.4",
+  "version": "0.90.5",
   "description": "NocoDB SDK",
   "main": "build/main/index.js",
   "typings": "build/main/index.d.ts",
diff --git a/packages/nocodb/package-lock.json b/packages/nocodb/package-lock.json
index 751a8287a1..460ae44548 100644
--- a/packages/nocodb/package-lock.json
+++ b/packages/nocodb/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "nocodb",
-  "version": "0.90.4",
+  "version": "0.90.5",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -12483,9 +12483,9 @@
       }
     },
     "nc-lib-gui": {
-      "version": "0.90.4",
-      "resolved": "https://registry.npmjs.org/nc-lib-gui/-/nc-lib-gui-0.90.4.tgz",
-      "integrity": "sha512-BXtAqZeAKocFZPa32C17s+/WBvcPUnUk+PUP/ASa5BqTT2dJ/e3zXGku45Jc0w2gVnKAwFpk2ZWLaQ0Yl25LPQ==",
+      "version": "0.90.5",
+      "resolved": "https://registry.npmjs.org/nc-lib-gui/-/nc-lib-gui-0.90.5.tgz",
+      "integrity": "sha512-P/6LXq6xcHx+hpwXeN87zPHUeQXPUut8Rje2WfpF0uMhth+pBZAT7qpeBOu7fpp8YjzZd6YZ2w3jM1DiJDhuzw==",
       "requires": {
         "axios": "^0.19.2",
         "body-parser": "^1.19.0",
@@ -12592,9 +12592,9 @@
       "dev": true
     },
     "nocodb-sdk": {
-      "version": "0.90.4",
-      "resolved": "https://registry.npmjs.org/nocodb-sdk/-/nocodb-sdk-0.90.4.tgz",
-      "integrity": "sha512-I4NrpUjVWnzNwjOO3ymDrIpSbXpVivzCfjny46LGKInmfLu2gutblsaw6tV0Jsv6LIFRPri+1rWqjtDH20bVnA==",
+      "version": "0.90.5",
+      "resolved": "https://registry.npmjs.org/nocodb-sdk/-/nocodb-sdk-0.90.5.tgz",
+      "integrity": "sha512-5H2nuVvt9n2DTQs9NMKtooGBXPpGjPoHIy6szXb+feigE2N8QPZNNt3YgpK9QaEG6mTpr04kXgCvFp0QsgV6Xg==",
       "requires": {
         "axios": "^0.21.1",
         "jsep": "^0.4.0"
diff --git a/packages/nocodb/package.json b/packages/nocodb/package.json
index 52bd40eb35..46ca219b9a 100644
--- a/packages/nocodb/package.json
+++ b/packages/nocodb/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nocodb",
-  "version": "0.90.4",
+  "version": "0.90.5",
   "description": "NocoDB",
   "main": "dist/bundle.js",
   "repository": "https://github.com/nocodb/nocodb",
@@ -151,10 +151,10 @@
     "nanoid": "^3.1.20",
     "nc-common": "0.0.6",
     "nc-help": "^0.2.44",
-    "nc-lib-gui": "0.90.4",
+    "nc-lib-gui": "0.90.5",
     "nc-plugin": "^0.1.1",
     "ncp": "^2.0.0",
-    "nocodb-sdk": "0.90.4",
+    "nocodb-sdk": "0.90.5",
     "nodemailer": "^6.4.10",
     "ora": "^4.0.4",
     "os-locale": "^5.0.0",

From 3604074ae55cc7650bd8b3ca22fed71fb1e3bc77 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Wed, 20 Apr 2022 13:20:52 +0800
Subject: [PATCH 19/27] fix: unsafe repository issue. ref: #1785

Signed-off-by: Wing-Kam Wong <wingkwong.code@gmail.com>
---
 .github/workflows/sync-to-develop.yml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/.github/workflows/sync-to-develop.yml b/.github/workflows/sync-to-develop.yml
index e3c327f3ae..28a770b963 100644
--- a/.github/workflows/sync-to-develop.yml
+++ b/.github/workflows/sync-to-develop.yml
@@ -9,16 +9,11 @@ jobs:
   sync-to-develop:
     runs-on: ubuntu-latest
     steps:
-      # See https://github.com/actions/checkout/issues/766
-      - name: Workaround for unsafe repository issue
-        run: |
-          git config --global --add safe.directory ${GITHUB_WORKSPACE}
- 
       - name: Checkout
         uses: actions/checkout@v1
 
       - name: Merge from master to develop
-        uses: robotology/gh-action-nightly-merge@v1.3.1
+        uses: wingkwong/gh-action-nightly-merge@master
         with:
           stable_branch: 'master'
           development_branch: 'develop'

From 28ce0243a6e74b08a27a2a2286ea2c1d087632e5 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Wed, 20 Apr 2022 13:44:04 +0800
Subject: [PATCH 20/27] fix: use alias instead of _cn

Signed-off-by: Wing-Kam Wong <wingkwong.code@gmail.com>
---
 .../nc-gui/components/project/spreadsheet/mixins/spreadsheet.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nc-gui/components/project/spreadsheet/mixins/spreadsheet.js b/packages/nc-gui/components/project/spreadsheet/mixins/spreadsheet.js
index 232e44db7c..5688a09f44 100644
--- a/packages/nc-gui/components/project/spreadsheet/mixins/spreadsheet.js
+++ b/packages/nc-gui/components/project/spreadsheet/mixins/spreadsheet.js
@@ -145,7 +145,7 @@ export default {
     concatenatedXWhere() {
       let where = ''
       if (this.searchField && this.searchQuery.trim()) {
-        const col = this.availableColumns.find(({ _cn }) => _cn === this.searchField) || this.availableColumns[0]
+        const col = this.availableColumns.find(({ alias }) => alias === this.searchField) || this.availableColumns[0]
         // bigint values are displayed in string format in UI
         // when searching bigint values, the operator should be 'eq' instead of 'like'
         if (['text', 'string'].includes(this.sqlUi.getAbstractType(col)) && col.dt !== 'bigint') {

From 67f1b23d9398611640be1641e9c04a19feede952 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Wed, 20 Apr 2022 14:04:07 +0800
Subject: [PATCH 21/27] fix: disable clear in locked view

Signed-off-by: Wing-Kam Wong <wingkwong.code@gmail.com>
---
 .../nc-gui/components/project/spreadsheet/rowsXcDataTable.vue   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nc-gui/components/project/spreadsheet/rowsXcDataTable.vue b/packages/nc-gui/components/project/spreadsheet/rowsXcDataTable.vue
index ecced020c8..8387f30852 100644
--- a/packages/nc-gui/components/project/spreadsheet/rowsXcDataTable.vue
+++ b/packages/nc-gui/components/project/spreadsheet/rowsXcDataTable.vue
@@ -591,7 +591,7 @@
             </span>
           </v-list-item>
         </template>
-        <template v-if="rowContextMenu.col && !rowContextMenu.col.rqd && !rowContextMenu.col.virtual">
+        <template v-if="isEditable && !isLocked && rowContextMenu.col && !rowContextMenu.col.rqd && !rowContextMenu.col.virtual">
           <v-tooltip bottom>
             <template #activator="{on}">
               <v-list-item v-t="['record:right-click:clear']" v-on="on" @click="clearCellValue">

From e66174947b21fb0ac82331ca9b91dfa19654e859 Mon Sep 17 00:00:00 2001
From: Naman Anand <iamnamananand996@gmail.com>
Date: Wed, 20 Apr 2022 12:15:26 +0530
Subject: [PATCH 22/27] #1781 add event prevent on from submit

---
 .../project/spreadsheet/components/editVirtualColumn.vue        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nc-gui/components/project/spreadsheet/components/editVirtualColumn.vue b/packages/nc-gui/components/project/spreadsheet/components/editVirtualColumn.vue
index 11a1157a34..0eefe50e34 100644
--- a/packages/nc-gui/components/project/spreadsheet/components/editVirtualColumn.vue
+++ b/packages/nc-gui/components/project/spreadsheet/components/editVirtualColumn.vue
@@ -6,7 +6,7 @@
     style="overflow: auto"
     class=" card nc-col-create-or-edit-card"
   >
-    <v-form v-model="valid">
+    <v-form v-model="valid" @submit.prevent="save">
       <v-container fluid @click.stop.prevent>
         <v-row>
           <v-col cols="12">

From 6075b1c9080c2074c551693f9157ceeb8d94272e Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Wed, 20 Apr 2022 16:05:27 +0800
Subject: [PATCH 23/27] fix: not showing lookup & rollup in form view

Signed-off-by: Wing-Kam Wong <wingkwong.code@gmail.com>
---
 .../nc-gui/components/project/spreadsheet/views/formView.vue    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nc-gui/components/project/spreadsheet/views/formView.vue b/packages/nc-gui/components/project/spreadsheet/views/formView.vue
index d0df0fb086..ceb4ca9af4 100644
--- a/packages/nc-gui/components/project/spreadsheet/views/formView.vue
+++ b/packages/nc-gui/components/project/spreadsheet/views/formView.vue
@@ -580,7 +580,7 @@ export default {
     },
     columns: {
       get() {
-        return this.fields.filter(f => f.show).sort((a, b) => a.order - b.order)
+        return this.fields.filter(f => f.show && f.uidt != UITypes.Rollup && f.uidt != UITypes.Lookup).sort((a, b) => a.order - b.order)
       },
       set(v) {
       }

From 7b40a1387afd7c0af8486d749e286f92af175a7f Mon Sep 17 00:00:00 2001
From: "allcontributors[bot]"
 <46447321+allcontributors[bot]@users.noreply.github.com>
Date: Wed, 20 Apr 2022 08:12:08 +0000
Subject: [PATCH 24/27] docs: update README.md [skip ci]

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 5416a2244d..68be3f0069 100644
--- a/README.md
+++ b/README.md
@@ -442,6 +442,7 @@ Our mission is to provide the most powerful no-code interface for databases whic
     <td align="center"><a href="https://github.com/RobinFrcd"><img src="https://avatars.githubusercontent.com/u/29704178?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Robin Fourcade</b></sub></a><br /><a href="https://github.com/nocodb/nocodb/commits?author=RobinFrcd" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/zprial"><img src="https://avatars.githubusercontent.com/u/33095380?v=4?s=100" width="100px;" alt=""/><br /><sub><b>zprial</b></sub></a><br /><a href="https://github.com/nocodb/nocodb/commits?author=zprial" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/nilsreichardt"><img src="https://avatars.githubusercontent.com/u/24459435?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nils Reichardt</b></sub></a><br /><a href="https://github.com/nocodb/nocodb/commits?author=nilsreichardt" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/iamnamananand996"><img src="https://avatars.githubusercontent.com/u/31537362?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Naman Anand</b></sub></a><br /><a href="https://github.com/nocodb/nocodb/commits?author=iamnamananand996" title="Code">💻</a></td>
   </tr>
 </table>
 

From 6c217964b368e397dd5e925f7fe43fb44afac266 Mon Sep 17 00:00:00 2001
From: "allcontributors[bot]"
 <46447321+allcontributors[bot]@users.noreply.github.com>
Date: Wed, 20 Apr 2022 08:12:09 +0000
Subject: [PATCH 25/27] docs: update .all-contributorsrc [skip ci]

---
 .all-contributorsrc | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/.all-contributorsrc b/.all-contributorsrc
index bfbb10622a..e4c3fe1355 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -729,6 +729,15 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "iamnamananand996",
+      "name": "Naman Anand",
+      "avatar_url": "https://avatars.githubusercontent.com/u/31537362?v=4",
+      "profile": "https://github.com/iamnamananand996",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 7,

From 180accda2af0c5e62dd83048d5f121d0b413c320 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Wed, 20 Apr 2022 17:53:29 +0800
Subject: [PATCH 26/27] chore: fix lint

Signed-off-by: Wing-Kam Wong <wingkwong.code@gmail.com>
---
 .../components/importantAnnouncement.vue      |  2 +-
 .../project/appStore/inputs/checkboxField.vue |  2 +-
 .../nc-gui/components/project/auditTab/db.vue |  1 -
 .../components/editColumn/lookupOptions.vue   |  1 -
 .../spreadsheet/components/editableCell.vue   |  7 +-
 .../importExport/columnMappingModal.vue       |  4 +-
 .../spreadsheet/components/moreActions.vue    |  8 +-
 .../project/spreadsheet/helpers/imageExt.js   | 28 +++----
 .../project/tableTabs/aclTsFileDbChild.vue    |  1 -
 packages/nc-gui/components/templates/help.vue | 17 +++--
 packages/nc-gui/components/trialExpired.vue   |  1 -
 packages/nc-gui/helpers/index.js              | 41 +++++-----
 packages/nc-gui/layouts/default.vue           |  2 +-
 packages/nc-gui/layouts/public.vue            |  3 +-
 packages/nc-gui/pages/projects/index.vue      |  2 -
 packages/nc-gui/plugins/i18n.js               | 74 +++++++++----------
 packages/nc-gui/store/app.js                  |  4 +-
 packages/nc-gui/xc.js                         |  1 -
 18 files changed, 95 insertions(+), 104 deletions(-)

diff --git a/packages/nc-gui/components/importantAnnouncement.vue b/packages/nc-gui/components/importantAnnouncement.vue
index c330badf46..169cf98357 100644
--- a/packages/nc-gui/components/importantAnnouncement.vue
+++ b/packages/nc-gui/components/importantAnnouncement.vue
@@ -67,7 +67,7 @@ export default {
       set(val) {
         return this.$store.commit('app/MutHiddenAnnouncement', val ? null : true)
       }
-    },
+    }
   },
   mounted() {
     setTimeout(() => {
diff --git a/packages/nc-gui/components/project/appStore/inputs/checkboxField.vue b/packages/nc-gui/components/project/appStore/inputs/checkboxField.vue
index 5d46f03fd8..f888e9b86b 100644
--- a/packages/nc-gui/components/project/appStore/inputs/checkboxField.vue
+++ b/packages/nc-gui/components/project/appStore/inputs/checkboxField.vue
@@ -28,7 +28,7 @@ export default {
       const $listeners = {}
       return $listeners
     }
-  },
+  }
 }
 </script>
 
diff --git a/packages/nc-gui/components/project/auditTab/db.vue b/packages/nc-gui/components/project/auditTab/db.vue
index c81e720e48..a3f2be0387 100644
--- a/packages/nc-gui/components/project/auditTab/db.vue
+++ b/packages/nc-gui/components/project/auditTab/db.vue
@@ -407,7 +407,6 @@ export default {
     },
     async migrationUp(steps = 99999999999) {
       try {
-
         await this.$store.dispatch('sqlMgr/ActSqlOp', [null, 'migrationsUp', {
           env: this.nodes.env,
           dbAlias: this.nodes.dbAlias,
diff --git a/packages/nc-gui/components/project/spreadsheet/components/editColumn/lookupOptions.vue b/packages/nc-gui/components/project/spreadsheet/components/editColumn/lookupOptions.vue
index 42e32fe734..0606047029 100644
--- a/packages/nc-gui/components/project/spreadsheet/components/editColumn/lookupOptions.vue
+++ b/packages/nc-gui/components/project/spreadsheet/components/editColumn/lookupOptions.vue
@@ -78,7 +78,6 @@ export default {
       }))
 
       return refTables
-
     },
     columnList() {
       return ((
diff --git a/packages/nc-gui/components/project/spreadsheet/components/editableCell.vue b/packages/nc-gui/components/project/spreadsheet/components/editableCell.vue
index 99d8563efa..21430fea29 100644
--- a/packages/nc-gui/components/project/spreadsheet/components/editableCell.vue
+++ b/packages/nc-gui/components/project/spreadsheet/components/editableCell.vue
@@ -184,10 +184,8 @@ export default {
           this.$emit('input', val)
           if (this.isAttachment || this.isEnum || this.isBoolean || this.isSet || this.isTime || this.isDateTime || this.isDate) {
             this.syncData()
-          } else {
-            if (!this.isCurrency) {
-              this.syncDataDebounce(this)
-            }
+          } else if (!this.isCurrency) {
+            this.syncDataDebounce(this)
           }
         }
       }
@@ -206,7 +204,6 @@ export default {
         $listeners.cancel = this.$listeners.cancel
       }
 
-
       return $listeners
     }
 
diff --git a/packages/nc-gui/components/project/spreadsheet/components/importExport/columnMappingModal.vue b/packages/nc-gui/components/project/spreadsheet/components/importExport/columnMappingModal.vue
index a22b1edce3..a2ff286336 100644
--- a/packages/nc-gui/components/project/spreadsheet/components/importExport/columnMappingModal.vue
+++ b/packages/nc-gui/components/project/spreadsheet/components/importExport/columnMappingModal.vue
@@ -154,8 +154,8 @@ export default {
       // check if the input contains null value for a required column
       if (v.pk ? !v.ai && !v.cdf : !v.cdf && v.rqd) {
         if (this.parsedCsv && this.parsedCsv.data && this.parsedCsv.data.slice(0, 500)
-        .some(r => r[row.sourceCn] === null || r[row.sourceCn] === undefined || r[row.sourceCn] === "" )) {
-          return `null value violates not-null constraint`
+          .some(r => r[row.sourceCn] === null || r[row.sourceCn] === undefined || r[row.sourceCn] === '')) {
+          return 'null value violates not-null constraint'
         }
       }
 
diff --git a/packages/nc-gui/components/project/spreadsheet/components/moreActions.vue b/packages/nc-gui/components/project/spreadsheet/components/moreActions.vue
index b8be60b14e..117e289e3b 100644
--- a/packages/nc-gui/components/project/spreadsheet/components/moreActions.vue
+++ b/packages/nc-gui/components/project/spreadsheet/components/moreActions.vue
@@ -309,10 +309,10 @@ export default {
             return res
           }, {}))
           await this.$api.dbTableRow.bulkCreate(
-              'noco', 
-              this.projectName,
-              this.meta.title,
-              batchData
+            'noco',
+            this.projectName,
+            this.meta.title,
+            batchData
           )
           progress += batchData.length
           this.$store.commit('loader/MutMessage', `Importing data : ${progress}/${data.length}`)
diff --git a/packages/nc-gui/components/project/spreadsheet/helpers/imageExt.js b/packages/nc-gui/components/project/spreadsheet/helpers/imageExt.js
index 1f2af2c856..dfb4a5f7ef 100644
--- a/packages/nc-gui/components/project/spreadsheet/helpers/imageExt.js
+++ b/packages/nc-gui/components/project/spreadsheet/helpers/imageExt.js
@@ -1,22 +1,22 @@
 const imageExt = [
-  "jpeg",
-  "gif",
-  "png",
-  "png",
-  "svg",
-  "bmp",
-  "ico",
-  "jpg",
-  "webp",
-];
+  'jpeg',
+  'gif',
+  'png',
+  'png',
+  'svg',
+  'bmp',
+  'ico',
+  'jpg',
+  'webp'
+]
 
-export default imageExt;
+export default imageExt
 
 const isImage = (name) => {
-  return imageExt.some((e) => name.toLowerCase().endsWith(`.${e}`));
-};
+  return imageExt.some(e => name.toLowerCase().endsWith(`.${e}`))
+}
 
-export { isImage };
+export { isImage }
 /**
  * @copyright Copyright (c) 2021, Xgene Cloud Ltd
  *
diff --git a/packages/nc-gui/components/project/tableTabs/aclTsFileDbChild.vue b/packages/nc-gui/components/project/tableTabs/aclTsFileDbChild.vue
index 33dd6fddd1..3a477f9b17 100644
--- a/packages/nc-gui/components/project/tableTabs/aclTsFileDbChild.vue
+++ b/packages/nc-gui/components/project/tableTabs/aclTsFileDbChild.vue
@@ -341,7 +341,6 @@ export default {
     },
     async save() {
       try {
-
         await this.$store.dispatch('sqlMgr/ActSqlOp', [null, 'xcRoutesPolicyUpdate', {
           env: this.nodes.env,
           dbAlias: this.nodes.dbAlias,
diff --git a/packages/nc-gui/components/templates/help.vue b/packages/nc-gui/components/templates/help.vue
index 208744be31..06a193e09d 100644
--- a/packages/nc-gui/components/templates/help.vue
+++ b/packages/nc-gui/components/templates/help.vue
@@ -39,38 +39,39 @@ export default {
         description: 'Add tables',
         mac: '<kbd>Command</kbd> + <kbd>Control</kbd> + <kbd>T</kbd>',
         windows: '<kbd>Alt</kbd> + <kbd>Shift</kbd> + <kbd>T</kbd>'
-      },{
+      }, {
         description: 'Add columns',
         mac: '<kbd>Command</kbd> + <kbd>Control</kbd> + <kbd>C</kbd>',
         windows: '<kbd>Alt</kbd> + <kbd>Shift</kbd> + <kbd>C</kbd>'
-      },{
+      }, {
         description: 'Add new column row',
         mac: '<kbd>Command</kbd> + <kbd>Control</kbd> + <kbd>A</kbd>',
         windows: '<kbd>Alt</kbd> + <kbd>Shift</kbd> + <kbd>A</kbd>'
-      },{
+      }, {
         description: 'Table navigation',
         mac: '<kbd>Command</kbd> + <kbd>Control</kbd> + <kbd>Arrow Down</kbd> <br>AND<br> <kbd>Command</kbd> + <kbd>Control</kbd> + <kbd>Arrow Up</kbd>',
         windows: '<kbd>Alt</kbd> + <kbd>Shift</kbd> + <kbd>Arrow Down</kbd> <br>AND<br> <kbd>Alt</kbd> + <kbd>Shift</kbd> + <kbd>Arrow Up</kbd>'
-      },{
+      }, {
         description: 'Column navigation',
         mac: '<kbd>Command</kbd> + <kbd>Control</kbd> + <kbd>Arrow Right</kbd> <br>AND<br> <kbd>Command</kbd> + <kbd>Control</kbd> + <kbd>Arrow Left</kbd>',
         windows: '<kbd>Alt</kbd> + <kbd>Shift</kbd> + <kbd>Arrow Right</kbd> <br>AND<br> <kbd>Alt</kbd> + <kbd>Shift</kbd> + <kbd>Arrow Right</kbd>'
-      },{
+      }, {
         description: 'Copy json to clipboard',
         mac: '<kbd>Command</kbd> + <kbd>Control</kbd> + <kbd>J</kbd>',
         windows: '<kbd>Alt</kbd> + <kbd>Shift</kbd> + <kbd>J</kbd>'
-      },{
+      }, {
         description: 'Submit template',
         mac: '<kbd>Command</kbd> + <kbd>Control</kbd> + <kbd>S</kbd>',
         windows: '<kbd>Alt</kbd> + <kbd>Shift</kbd> + <kbd>S</kbd>'
-      },]
+      }]
     }
   },
   computed: {
     localState: {
       get() {
         return this.value
-      }, set(val) {
+      },
+      set(val) {
         this.$emit('input', val)
       }
     }
diff --git a/packages/nc-gui/components/trialExpired.vue b/packages/nc-gui/components/trialExpired.vue
index fbda73e9c9..d6806dd89d 100644
--- a/packages/nc-gui/components/trialExpired.vue
+++ b/packages/nc-gui/components/trialExpired.vue
@@ -14,7 +14,6 @@
 
 <script>
 
-
 export default {
   name: 'TrialExpired',
   methods: {
diff --git a/packages/nc-gui/helpers/index.js b/packages/nc-gui/helpers/index.js
index 18a7fde719..a711136d50 100644
--- a/packages/nc-gui/helpers/index.js
+++ b/packages/nc-gui/helpers/index.js
@@ -75,7 +75,7 @@ function GetCaretPosition(ctrl) {
 
 export function validateTableName(v, isGQL) {
   if (!v) {
-    return "Table name required";
+    return 'Table name required'
   }
 
   // GraphQL naming convention
@@ -83,67 +83,66 @@ export function validateTableName(v, isGQL) {
 
   if (isGQL) {
     if (/^[_A-Za-z][_0-9A-Za-z]*$/.test(v)) {
-      return true;
+      return true
     }
 
     if (/^[^_A-Za-z]/.test(v)) {
-      return "Name should start with an alphabet or _";
+      return 'Name should start with an alphabet or _'
     }
-    const m = v.match(/[^_A-Za-z\d]/g);
+    const m = v.match(/[^_A-Za-z\d]/g)
     if (m) {
       return `Following characters are not allowed ${m
-        .map((c) => JSON.stringify(c))
-        .join(", ")}`;
+        .map(c => JSON.stringify(c))
+        .join(', ')}`
     }
   } else {
-
     // exclude . / \
     // rest all characters allowed
     // https://documentation.sas.com/doc/en/pgmsascdc/9.4_3.5/acreldb/n0rfg6x1shw0ppn1cwhco6yn09f7.htm#:~:text=By%20default%2C%20MySQL%20encloses%20column,not%20truncate%20a%20longer%20name.
-    const m = v.match(/[./\\]/g);
+    const m = v.match(/[./\\]/g)
     if (m) {
       return `Following characters are not allowed ${m
-        .map((c) => JSON.stringify(c))
-        .join(", ")}`;
+        .map(c => JSON.stringify(c))
+        .join(', ')}`
     }
 
-    return true;
+    return true
   }
 }
 
 export function validateColumnName(v, isGQL) {
   if (!v) {
-    return "Column name required";
+    return 'Column name required'
   }
 
   // GraphQL naming convention
   // http://spec.graphql.org/June2018/#Name
   if (isGQL) {
     if (/^[_A-Za-z][_0-9A-Za-z]*$/.test(v)) {
-      return true;
+      return true
     }
 
     if (/^[^_A-Za-z]/.test(v)) {
-      return "Name should start with an alphabet or _";
+      return 'Name should start with an alphabet or _'
     }
-    const m = v.match(/[^_A-Za-z\d]/g);
+    const m = v.match(/[^_A-Za-z\d]/g)
     if (m) {
       return `Following characters are not allowed ${m
-        .map((c) => JSON.stringify(c))
-        .join(", ")}`;
+        .map(c => JSON.stringify(c))
+        .join(', ')}`
     }
   } else {
     // exclude . / \
     // rest all characters allowed
     // https://documentation.sas.com/doc/en/pgmsascdc/9.4_3.5/acreldb/n0rfg6x1shw0ppn1cwhco6yn09f7.htm#:~:text=By%20default%2C%20MySQL%20encloses%20column,not%20truncate%20a%20longer%20name.
-    const m = v.match(/[./\\]/g);
+    const m = v.match(/[./\\]/g)
     if (m) {
       return `Following characters are not allowed ${m
-        .map((c) => JSON.stringify(c))
-        .join(", ")}`;
+        .map(c => JSON.stringify(c))
+        .join(', ')}`
     }
 
-    return true;
+    return true
   }
 }
 
diff --git a/packages/nc-gui/layouts/default.vue b/packages/nc-gui/layouts/default.vue
index e772c5fafa..27df881969 100644
--- a/packages/nc-gui/layouts/default.vue
+++ b/packages/nc-gui/layouts/default.vue
@@ -271,8 +271,8 @@
 </template>
 
 <script>
-import ReleaseInfo from '@/components/releaseInfo'
 import { mapGetters, mapActions, mapMutations } from 'vuex'
+import ReleaseInfo from '@/components/releaseInfo'
 import 'splitpanes/dist/splitpanes.css'
 import XBtn from '../components/global/xBtn'
 import dlgUnexpectedError from '../components/utils/dlgUnexpectedError'
diff --git a/packages/nc-gui/layouts/public.vue b/packages/nc-gui/layouts/public.vue
index fb765db4ed..6fea12f140 100644
--- a/packages/nc-gui/layouts/public.vue
+++ b/packages/nc-gui/layouts/public.vue
@@ -14,7 +14,8 @@
           <template #activator="{ on }">
             <v-btn
               to="/projects"
-              icon class="pa-1 brand-icon nc-noco-brand-icon"
+              icon
+class="pa-1 brand-icon nc-noco-brand-icon"
               v-on="on"
             >
               <v-img :src="require('~/assets/img/icons/512x512-trans.png')" max-height="30px" max-width="30px" />
diff --git a/packages/nc-gui/pages/projects/index.vue b/packages/nc-gui/pages/projects/index.vue
index 5795f98b3e..7c0f952cc9 100644
--- a/packages/nc-gui/pages/projects/index.vue
+++ b/packages/nc-gui/pages/projects/index.vue
@@ -874,7 +874,6 @@ export default {
           this.statusUpdatingProjectId = projectId
           this.projectStatusUpdating = true
           try {
-
             await this.$api.project.delete(projectId)
             this.$toast
               .success(`Project '${project.title}' deleted successfully`)
@@ -950,7 +949,6 @@ export default {
       this.loaded = true
     },
     async projectRouteHandler(project, count) {
-
       if (!this.deleteBtnClicked) {
         await this.$router.push({
           path: `/nc/${project.id}`
diff --git a/packages/nc-gui/plugins/i18n.js b/packages/nc-gui/plugins/i18n.js
index 5a3dcf6438..20b4b518d4 100644
--- a/packages/nc-gui/plugins/i18n.js
+++ b/packages/nc-gui/plugins/i18n.js
@@ -1,10 +1,10 @@
 // plugins/i18n.js
 
-import Vue from "vue";
-import VueI18n from "vue-i18n";
+import Vue from 'vue'
+import VueI18n from 'vue-i18n'
 
 // Tell Vue to use our plugin
-Vue.use(VueI18n);
+Vue.use(VueI18n)
 
 export default ({ app, store }) => {
   // Set the i18n instance on app
@@ -14,49 +14,49 @@ export default ({ app, store }) => {
     locale: store.state.windows.language,
 
     // Set the fallback locale in case the current locale can't be found
-    fallbackLocale: "en",
+    fallbackLocale: 'en',
 
     // Associate each locale to a content file
     messages: {
-      en: require("~/lang/en.json"),
-      zh_HK: require("~/lang/zh_HK.json"),
-      zh_TW: require("~/lang/zh_TW.json"),
-      zh_CN: require("~/lang/zh_CN.json"),
-      ja: require("~/lang/ja.json"),
-      fr: require("~/lang/fr.json"),
-      es: require("~/lang/es.json"),
-      de: require("~/lang/de.json"),
-      id: require("~/lang/id.json"),
-      it_IT: require("~/lang/it_IT.json"),
-      ko: require("~/lang/ko.json"),
-      lv: require("~/lang/lv.json"),
-      nl: require("~/lang/nl.json"),
-      ru: require("~/lang/ru.json"),
-      sv: require("~/lang/sv.json"),
-      da: require("~/lang/da.json"),
-      vi: require("~/lang/vi.json"),
-      no: require("~/lang/no.json"),
-      iw: require("~/lang/iw.json"),
-      fi: require("~/lang/fi.json"),
-      uk: require("~/lang/uk.json"),
-      hr: require("~/lang/hr.json"),
-      th: require("~/lang/th.json"),
-      sl: require("~/lang/sl.json"),
-      pt_BR: require("~/lang/pt_BR.json"),
-      fa: require("~/lang/fa.json"),
-      tr: require("~/lang/tr.json"),
-    },
-  });
+      en: require('~/lang/en.json'),
+      zh_HK: require('~/lang/zh_HK.json'),
+      zh_TW: require('~/lang/zh_TW.json'),
+      zh_CN: require('~/lang/zh_CN.json'),
+      ja: require('~/lang/ja.json'),
+      fr: require('~/lang/fr.json'),
+      es: require('~/lang/es.json'),
+      de: require('~/lang/de.json'),
+      id: require('~/lang/id.json'),
+      it_IT: require('~/lang/it_IT.json'),
+      ko: require('~/lang/ko.json'),
+      lv: require('~/lang/lv.json'),
+      nl: require('~/lang/nl.json'),
+      ru: require('~/lang/ru.json'),
+      sv: require('~/lang/sv.json'),
+      da: require('~/lang/da.json'),
+      vi: require('~/lang/vi.json'),
+      no: require('~/lang/no.json'),
+      iw: require('~/lang/iw.json'),
+      fi: require('~/lang/fi.json'),
+      uk: require('~/lang/uk.json'),
+      hr: require('~/lang/hr.json'),
+      th: require('~/lang/th.json'),
+      sl: require('~/lang/sl.json'),
+      pt_BR: require('~/lang/pt_BR.json'),
+      fa: require('~/lang/fa.json'),
+      tr: require('~/lang/tr.json')
+    }
+  })
 
   store.watch(
-    (state) => state.windows.language,
+    state => state.windows.language,
     (language) => {
       if (app.i18n.availableLocales.includes(language)) {
-        app.i18n.locale = language;
+        app.i18n.locale = language
       }
     }
-  );
-};
+  )
+}
 /**
  * @copyright Copyright (c) 2021, Xgene Cloud Ltd
  *
diff --git a/packages/nc-gui/store/app.js b/packages/nc-gui/store/app.js
index 95a02b5dc1..67d339968b 100644
--- a/packages/nc-gui/store/app.js
+++ b/packages/nc-gui/store/app.js
@@ -2,7 +2,7 @@ export const state = () => ({
   releaseVersion: null,
   hiddenRelease: null,
   latestRelease: null,
-  hiddenAnnouncement: null,
+  hiddenAnnouncement: null
 })
 
 export const mutations = {
@@ -17,7 +17,7 @@ export const mutations = {
   },
   MutHiddenAnnouncement(state, hiddenAnnouncement) {
     state.hiddenAnnouncement = hiddenAnnouncement
-  },
+  }
 }
 
 /**
diff --git a/packages/nc-gui/xc.js b/packages/nc-gui/xc.js
index 05e34d8647..dd4d9fd8b8 100644
--- a/packages/nc-gui/xc.js
+++ b/packages/nc-gui/xc.js
@@ -2,7 +2,6 @@
 function initApp(config) {
   const nuxtApp = document.createElement('div')
   nuxtApp.id = '__nuxt'
-  
 
   document.querySelector(config.selector).appendChild(nuxtApp);
   [

From 1f86f7245dd644afb95480b516bee9a95d81c671 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Wed, 20 Apr 2022 18:03:58 +0800
Subject: [PATCH 27/27] fix: allow editor to edit attachment field

Signed-off-by: Wing-Kam Wong <wingkwong.code@gmail.com>
---
 packages/nocodb/src/lib/utils/projectAcl.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/nocodb/src/lib/utils/projectAcl.ts b/packages/nocodb/src/lib/utils/projectAcl.ts
index f4c994d9ac..c8aa06840f 100644
--- a/packages/nocodb/src/lib/utils/projectAcl.ts
+++ b/packages/nocodb/src/lib/utils/projectAcl.ts
@@ -127,7 +127,8 @@ export default {
     bulkDataDeleteAll: true,
     relationDataRemove: true,
     relationDataAdd: true,
-    dataCount: true
+    dataCount: true,
+    upload: true
   },
   commenter: {
     formViewGet: true,