From f8dff44cc7e1f3060f9f6471536afeac81a29f75 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Wed, 15 Jun 2022 23:32:52 +0530
Subject: [PATCH 01/42] wip: JSON import adapter implementation

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nc-gui/components/ProjectTabs.vue    |  27 +-
 .../nc-gui/components/import/JSONImport.vue   | 436 ++++++++++++++++++
 .../templateParsers/CSVTemplateAdapter.js     |   1 -
 .../templateParsers/JSONTemplateAdapter.js    | 156 +++++++
 packages/nocodb-sdk/src/index.ts              |   3 +-
 .../nocodb-sdk/src/lib/TemplateGenerator.ts   |  30 ++
 6 files changed, 650 insertions(+), 3 deletions(-)
 create mode 100644 packages/nc-gui/components/import/JSONImport.vue
 create mode 100644 packages/nc-gui/components/import/templateParsers/JSONTemplateAdapter.js
 create mode 100644 packages/nocodb-sdk/src/lib/TemplateGenerator.ts

diff --git a/packages/nc-gui/components/ProjectTabs.vue b/packages/nc-gui/components/ProjectTabs.vue
index a3fd6392ec..0a69cd3360 100644
--- a/packages/nc-gui/components/ProjectTabs.vue
+++ b/packages/nc-gui/components/ProjectTabs.vue
@@ -315,6 +315,21 @@
               </span>
             </v-list-item-title>
           </v-list-item>
+          <v-list-item
+            v-if="_isUIAllowed('jsonImport')"
+            v-t="['a:actions:import-json']"
+            @click="jsonImportModal = true"
+          >
+            <v-list-item-title>
+              <v-icon small>
+                mdi-code-json
+              </v-icon>
+              <span class="caption">
+                <!-- TODO: i18n -->
+                JSON file
+              </span>
+            </v-list-item-title>
+          </v-list-item>
           <v-list-item
             v-if="_isUIAllowed('excelQuickImport')"
             v-t="['a:actions:import-excel']"
@@ -370,6 +385,13 @@
       @closeModal="quickImportModal = false"
     />
 
+    <!-- Import From JSON string / file -->
+    <json-import
+      v-model="jsonImportModal"
+      hide-label
+      @closeModal="jsonImportModal = false"
+    />
+
     <import-from-airtable v-if="airtableImportModal" v-model="airtableImportModal" />
   </v-container>
 </template>
@@ -404,9 +426,11 @@ import GlobalAcl from '~/components/GlobalAcl'
 import AuditTab from '~/components/project/AuditTab'
 import QuickImport from '~/components/import/QuickImport'
 import ImportFromAirtable from '~/components/import/ImportFromAirtable'
+import JsonImport from '~/components/import/JSONImport'
 
 export default {
   components: {
+    JsonImport,
     ImportFromAirtable,
     SwaggerClient,
     // Screensaver,
@@ -447,7 +471,8 @@ export default {
       showScreensaver: false,
       quickImportModal: false,
       quickImportType: '',
-      airtableImportModal: false
+      airtableImportModal: false,
+      jsonImportModal: false
     }
   },
   methods: {
diff --git a/packages/nc-gui/components/import/JSONImport.vue b/packages/nc-gui/components/import/JSONImport.vue
new file mode 100644
index 0000000000..fc55b865b3
--- /dev/null
+++ b/packages/nc-gui/components/import/JSONImport.vue
@@ -0,0 +1,436 @@
+<template>
+  <div :class="{'pt-10':!hideLabel}">
+    <v-dialog v-model="dropOrUpload" max-width="600">
+      <v-card max-width="600">
+        <v-tabs height="30" :value="2">
+          <v-tab>
+            <v-icon small class="mr-1">
+              mdi-file-upload-outline
+            </v-icon>
+            <span class="caption text-capitalize">Upload</span>
+          </v-tab>
+          <v-tab>
+            <v-icon small class="mr-1">
+              mdi-link-variant
+            </v-icon>
+            <span class="caption text-capitalize">URL</span>
+          </v-tab>
+          <v-tab>
+            <v-icon small class="mr-1">
+              mdi-link-variant
+            </v-icon>
+            <span class="caption text-capitalize">String</span>
+          </v-tab>
+
+          <v-tab-item>
+            <div class="nc-excel-import-tab-item ">
+              <div
+                class="nc-droppable d-flex align-center justify-center flex-column"
+                :style="{
+                  background : dragOver ? '#7772' : ''
+                }"
+                @click="$refs.file.click()"
+                @drop.prevent="dropHandler"
+                @dragover.prevent="dragOver = true"
+                @dragenter.prevent="dragOver = true"
+                @dragexit="dragOver = false"
+                @dragleave="dragOver = false"
+                @dragend="dragOver = false"
+              >
+                <x-icon :color="['primary','grey']" size="50">
+                  mdi-file-plus-outline
+                </x-icon>
+                <p class="title  mb-1 mt-2">
+                  <!-- Select File to Upload-->
+                  {{ $t('msg.info.upload') }}
+                </p>
+                <p class="grey--text mb-1">
+                  <!-- or drag and drop file-->
+                  {{ $t('msg.info.upload_sub') }}
+                </p>
+
+                <p v-if="quickImportType == 'excel'" class="caption grey--text">
+                  <!-- Supported: .xls, .xlsx, .xlsm, .ods, .ots -->
+                  {{ $t('msg.info.excelSupport') }}
+                </p>
+              </div>
+            </div>
+          </v-tab-item>
+          <v-tab-item>
+            <div class="nc-excel-import-tab-item align-center">
+              <div class="pa-4 d-100 h-100">
+                <v-form ref="form" v-model="valid">
+                  <div class="d-flex">
+                    <!--label="Enter excel file url"-->
+                    <v-text-field
+                      v-model="url"
+                      hide-details="auto"
+                      type="url"
+                      :label="quickImportType == 'excel' ? $t('msg.info.excelURL') : $t('msg.info.csvURL') "
+                      class="caption"
+                      outlined
+                      dense
+                      :rules="[v => !!v || $t('general.required') ]"
+                    />
+                    <v-btn v-t="['c:project:create:excel:load-url']" class="ml-3" color="primary" @click="loadUrl">
+                      <!--Load-->
+                      {{ $t('general.load') }}
+                    </v-btn>
+                  </div>
+                </v-form>
+              </div>
+            </div>
+          </v-tab-item>
+          <v-tab-item>
+            <div class="nc-excel-import-tab-item align-center">
+              <div class="pa-4 d-100 h-100">
+                <v-form ref="form" v-model="valid">
+                  <div class="">
+                    <!--label="Enter excel file url"-->
+                    <monaco-json-editor
+                      v-model="jsonString"
+                      style="height:300px"
+                    />
+                    <v-btn v-t="['c:project:create:excel:load-url']" class="ml-3" color="primary" @click="loadJsonString">
+                      <!--Load-->
+                      {{ $t('general.load') }}
+                    </v-btn>
+                  </div>
+                </v-form>
+              </div>
+            </div>
+          </v-tab-item>
+        </v-tabs>
+
+        <div class="px-4 pb-2">
+          <div class="d-flex">
+            <v-spacer />
+            <span class="caption pointer grey--text" @click="showMore = !showMore">
+              {{ showMore ? $t('general.hideAll') : $t('general.showMore') }}
+              <v-icon small color="grey lighten-1">mdi-menu-{{ showMore ? 'up' : 'down' }}</v-icon>
+            </span>
+          </div>
+          <div class="mb-2 pt-2 nc-excel-import-options" :style="{ maxHeight: showMore ? '100px' : '0'}">
+            <p />
+            <!--hint="# of rows to parse to infer data type"-->
+            <v-text-field
+              v-model="parserConfig.maxRowsToParse"
+              style="max-width: 250px"
+              class="caption mx-auto"
+              dense
+              persistent-hint
+              :hint="$t('msg.info.footMsg')"
+              outlined
+              type="number"
+            />
+          </div>
+        </div>
+      </v-card>
+    </v-dialog>
+
+    <v-tooltip bottom>
+      <template #activator="{on}">
+        <input
+          v-if="quickImportType == 'excel'"
+          ref="file"
+          class="nc-excel-import-input"
+          type="file"
+          style="display: none"
+          accept=".xlsx, .xls, .xlsm, .ods, .ots"
+          @change="_change($event)"
+        >
+        <input
+          v-if="quickImportType == 'csv'"
+          ref="file"
+          class="nc-excel-import-input"
+          type="file"
+          style="display: none"
+          accept=".csv"
+          @change="_change($event)"
+        >
+        <v-btn
+
+          v-if="!hideLabel"
+          small
+          outlined
+          v-on="on"
+          @click="$refs.file.click()"
+        >
+          <v-icon small class="mr-1">
+            mdi-file-excel-outline
+          </v-icon>
+          <!--Import-->
+          {{ $t('activity.import') }}
+        </v-btn>
+      </template>
+      <span class="caption">Create template from Excel</span>
+    </v-tooltip>
+
+    <v-dialog v-if="templateData" v-model="templateEditorModal" max-width="1000">
+      <v-card class="pa-6" min-width="500">
+        <template-editor :project-template.sync="templateData" excel-import :quick-import-type="quickImportType">
+          <template #toolbar="{valid}">
+            <h3 class="mt-2 grey--text">
+              <span>
+                JSON
+              </span>
+              : {{ templateData.title }}
+            </h3>
+            <v-spacer />
+            <v-spacer />
+            <create-project-from-template-btn
+              :template-data="templateData"
+              :import-data="importData"
+              :import-to-project="importToProject"
+              excel-import
+              :valid="valid"
+              create-gql-text="Import as GQL Project"
+              create-rest-text="Import as REST Project"
+              @closeModal="$emit('closeModal'),templateEditorModal = false"
+            >
+              <!--Import Excel-->
+              <span v-if="quickImportType === 'excel'">
+                {{ $t('activity.importExcel') }}
+              </span>
+              <!--Import CSV-->
+              <span v-if="quickImportType === 'csv'">
+                {{ $t('activity.importCSV') }}
+              </span>
+            </create-project-from-template-btn>
+          </template>
+        </template-editor>
+      </v-card>
+    </v-dialog>
+  </div>
+</template>
+
+<script>
+
+// import XLSX from 'xlsx'
+import TemplateEditor from '~/components/templates/Editor'
+import CreateProjectFromTemplateBtn from '~/components/templates/CreateProjectFromTemplateBtn'
+import ExcelUrlTemplateAdapter from '~/components/import/templateParsers/ExcelUrlTemplateAdapter'
+import ExcelTemplateAdapter from '~/components/import/templateParsers/ExcelTemplateAdapter'
+import MonacoJsonEditor from '~/components/monaco/MonacoJsonEditor'
+import JSONTemplateAdapter from '~/components/import/templateParsers/JSONTemplateAdapter'
+
+export default {
+  name: 'JsonImport',
+  components: { MonacoJsonEditor, CreateProjectFromTemplateBtn, TemplateEditor },
+  props: {
+    hideLabel: Boolean,
+    value: Boolean,
+    importToProject: Boolean,
+    quickImportType: String
+  },
+  data() {
+    return {
+      templateEditorModal: false,
+      valid: null,
+      templateData: null,
+      importData: null,
+      dragOver: false,
+      url: '',
+      showMore: false,
+      parserConfig: {
+        maxRowsToParse: 500
+      },
+      filename: '',
+      jsonString: `[{
+        "data": "Click Here",
+        "size": 36,
+        "style": "bold",
+        "name": "text1",
+        "hOffset": 250,
+        "vOffset": 100,
+        "alignment": "center",
+        "onMouseUp": "sun1.opacity = (sun1.opacity / 100) * 90;"
+    }]`
+    }
+  },
+  computed: {
+    dropOrUpload: {
+      set(v) {
+        this.$emit('input', v)
+      },
+      get() {
+        return this.value
+      }
+    }
+  },
+  mounted() {
+    if (this.$route && this.$route.query && this.$route.query.excelUrl) {
+      this.url = this.$route.query.excelUrl
+      this.loadUrl()
+    }
+  },
+  methods: {
+
+    selectFile() {
+      this.$refs.file.files = null
+      this.$refs.file.click()
+    },
+
+    _change(event) {
+      const files = event.target.files
+      if (files && files[0]) {
+        this._file(files[0])
+        event.target.value = ''
+      }
+    },
+    async _file(file) {
+      this.templateData = null
+      this.importData = null
+      this.$store.commit('loader/MutMessage', 'Loading excel file')
+      let i = 0
+      const int = setInterval(() => {
+        this.$store.commit('loader/MutMessage', `Loading excel file${'.'.repeat(++i % 4)}`)
+      }, 1000)
+      this.dropOrUpload = false
+      const reader = new FileReader()
+      this.filename = file.name
+
+      reader.onload = async(e) => {
+        const ab = e.target.result
+        await this.parseAndExtractData('file', ab, file.name)
+        this.$store.commit('loader/MutMessage', null)
+
+        clearInterval(int)
+      }
+
+      const handleEvent = (event) => {
+        this.$store.commit('loader/MutMessage', `${event.type}: ${event.loaded} bytes transferred`)
+      }
+
+      reader.addEventListener('progress', handleEvent)
+      reader.onerror = (e) => {
+        console.log('error', e)
+        this.$store.commit('loader/MutClear')
+      }
+      reader.readAsArrayBuffer(file)
+    },
+
+    async parseAndExtractData(type, val, name) {
+      try {
+        let templateGenerator
+        this.templateData = null
+        this.importData = null
+        switch (type) {
+          case 'file':
+            templateGenerator = new ExcelTemplateAdapter(name, val, this.parserConfig)
+            break
+          case 'url':
+            templateGenerator = new ExcelUrlTemplateAdapter(val, this.$store, this.parserConfig, this.$api)
+            break
+          case 'string':
+            templateGenerator = new JSONTemplateAdapter('test', val)
+            break
+        }
+        await templateGenerator.init()
+        templateGenerator.parse()
+        this.templateData = templateGenerator.getTemplate()
+        this.importData = templateGenerator.getData()
+        this.templateEditorModal = true
+      } catch (e) {
+        console.log(e)
+        this.$toast
+          .error(await this._extractSdkResponseErrorMsg(e))
+          .goAway(3000)
+      }
+    },
+
+    dropHandler(ev) {
+      this.dragOver = false
+      let file
+      if (ev.dataTransfer.items) {
+        // Use DataTransferItemList interface to access the file(s)
+        if (ev.dataTransfer.items.length && ev.dataTransfer.items[0].kind === 'file') {
+          file = ev.dataTransfer.items[0].getAsFile()
+        }
+      } else if (ev.dataTransfer.files.length) {
+        file = ev.dataTransfer.files[0]
+      }
+
+      if (!file) {
+        return
+      }
+
+      if (this.quickImportType === 'excel') {
+        if (!/.*\.(xls|xlsx|xlsm|ods|ots)/.test(file.name)) {
+          return this.$toast.error('Dropped file is not an accepted file type. The accepted file types are .xls, .xlsx, .xlsm, .ods, .ots!').goAway(3000)
+        }
+      } else if (this.quickImportType === 'csv') {
+        if (!/.*\.(csv)/.test(file.name)) {
+          return this.$toast.error('Dropped file is not an accepted file type. The accepted file type is .csv!').goAway(3000)
+        }
+      }
+      this._file(file)
+    },
+    dragOverHandler(ev) {
+      // Prevent default behavior (Prevent file from being opened)
+      ev.preventDefault()
+    },
+
+    async loadUrl() {
+      if ((this.$refs.form && !this.$refs.form.validate()) || !this.url) {
+        return
+      }
+
+      this.$store.commit('loader/MutMessage', 'Loading excel file from url')
+
+      let i = 0
+      const int = setInterval(() => {
+        this.$store.commit('loader/MutMessage', `Loading excel file${'.'.repeat(++i % 4)}`)
+      }, 1000)
+
+      this.dropOrUpload = false
+
+      await this.parseAndExtractData('url', this.url, '')
+      clearInterval(int)
+      this.$store.commit('loader/MutClear')
+    },
+
+    async loadJsonString() {
+      // if ((this.$refs.form && !this.$refs.form.validate()) || !this.url) {
+      //   return
+      // }
+
+      this.$store.commit('loader/MutMessage', 'Loading excel file from url')
+
+      let i = 0
+      const int = setInterval(() => {
+        this.$store.commit('loader/MutMessage', `Loading excel file${'.'.repeat(++i % 4)}`)
+      }, 1000)
+
+      this.dropOrUpload = false
+
+      await this.parseAndExtractData('string', this.jsonString)
+      clearInterval(int)
+      this.$store.commit('loader/MutClear')
+    }
+
+  }
+}
+</script>
+
+<style scoped>
+.nc-droppable {
+  width: 100%;
+  min-height: 200px;
+  border-radius: 4px;
+  border: 2px dashed #ddd;
+}
+
+.nc-excel-import-tab-item {
+  min-height: 400px;
+  padding: 20px;
+  display: flex;
+  align-items: stretch;
+  width: 100%;
+}
+
+.nc-excel-import-options {
+  transition: .4s max-height;
+  overflow: hidden;
+}
+</style>
diff --git a/packages/nc-gui/components/import/templateParsers/CSVTemplateAdapter.js b/packages/nc-gui/components/import/templateParsers/CSVTemplateAdapter.js
index 9a3be0d4de..c608a79f85 100644
--- a/packages/nc-gui/components/import/templateParsers/CSVTemplateAdapter.js
+++ b/packages/nc-gui/components/import/templateParsers/CSVTemplateAdapter.js
@@ -1,6 +1,5 @@
 import Papaparse from 'papaparse'
 import TemplateGenerator from '~/components/import/templateParsers/TemplateGenerator'
-
 export default class CSVTemplateAdapter extends TemplateGenerator {
   constructor(name, data) {
     super()
diff --git a/packages/nc-gui/components/import/templateParsers/JSONTemplateAdapter.js b/packages/nc-gui/components/import/templateParsers/JSONTemplateAdapter.js
new file mode 100644
index 0000000000..14977ebdd7
--- /dev/null
+++ b/packages/nc-gui/components/import/templateParsers/JSONTemplateAdapter.js
@@ -0,0 +1,156 @@
+import { TemplateGenerator } from 'nocodb-sdk'
+import { UITypes } from '~/components/project/spreadsheet/helpers/uiTypes'
+import { getCheckboxValue, isCheckboxType } from '~/components/import/templateParsers/parserHelpers'
+
+const jsonTypeToUidt = {
+  number: UITypes.Number,
+  string: UITypes.SingleLineText,
+  date: UITypes.DateTime,
+  boolean: UITypes.Checkbox,
+  object: UITypes.LongText
+}
+
+export default class JSONTemplateAdapter extends TemplateGenerator {
+  constructor(name = 'test', data, parserConfig = {}) {
+    super()
+    this.config = {
+      maxRowsToParse: 500,
+      ...parserConfig
+    }
+    this.name = name
+    this.jsonData = typeof data === 'string' ? JSON.parse(data) : data
+    this.project = {
+      title: this.name,
+      tables: []
+    }
+    this.data = {}
+  }
+
+  async init() {
+  }
+
+  parseData() {
+    this.columns = this.csv.meta.fields
+    this.data = this.csv.data
+  }
+
+  getColumns() {
+    return this.columns
+  }
+
+  getData() {
+    return this.data
+  }
+
+  parse() {
+    // for (let i = 0; i < this.wb.SheetNames.length; i++) {
+    // const columnNamePrefixRef = { id: 0 }
+
+    const tn = 'table'
+
+    const table = { table_name: tn, ref_table_name: tn, columns: [] }
+
+    this.data[tn] = []
+
+    // const ws = this.wb.Sheets[sheet]
+    // const range = XLSX.utils.decode_range(ws['!ref'])
+    // const rows = XLSX.utils.sheet_to_json(ws, { header: 1, blankrows: false, cellDates: true, defval: null })
+
+    const objKeys = Object.keys(this.jsonData[0])
+
+    for (let col = 0; col < objKeys.length; col++) {
+      const key = objKeys[col]
+      const cn = objKeys[col].replace(/\W/g, '_').trim()
+
+      const column = {
+        column_name: cn,
+        ref_column_name: cn
+      }
+
+      table.columns.push(column)
+
+      column.uidt = jsonTypeToUidt[typeof this.jsonData[0][key]] || UITypes.SingleLineText
+
+      // todo: optimize
+      if (column.uidt === UITypes.SingleLineText) {
+        // check for long text
+        if (this.jsonData.some(r =>
+          (r[key] || '').toString().match(/[\r\n]/) ||
+          (r[key] || '').toString().length > 255)
+        ) {
+          column.uidt = UITypes.LongText
+        } else {
+          const vals = this.jsonData
+            .map(r => r[key])
+            .filter(v => v !== null && v !== undefined && v.toString().trim() !== '')
+
+          const checkboxType = isCheckboxType(vals)
+          if (checkboxType.length === 1) {
+            column.uidt = UITypes.Checkbox
+          } else {
+            // todo: optimize
+            // check column is multi or single select by comparing unique values
+            // todo:
+            // eslint-disable-next-line no-lonely-if
+            if (vals.some(v => v && v.toString().includes(','))) {
+              let flattenedVals = vals.flatMap(v => v ? v.toString().trim().split(/\s*,\s*/) : [])
+              const uniqueVals = flattenedVals = flattenedVals
+                .filter((v, i, arr) => i === arr.findIndex(v1 => v.toLowerCase() === v1.toLowerCase()))
+              if (flattenedVals.length > uniqueVals.length && uniqueVals.length <= Math.ceil(flattenedVals.length / 2)) {
+                column.uidt = UITypes.MultiSelect
+                column.dtxp = `'${uniqueVals.join("','")}'`
+              }
+            } else {
+              const uniqueVals = vals.map(v => v.toString().trim()).filter((v, i, arr) => i === arr.findIndex(v1 => v.toLowerCase() === v1.toLowerCase()))
+              if (vals.length > uniqueVals.length && uniqueVals.length <= Math.ceil(vals.length / 2)) {
+                column.uidt = UITypes.SingleSelect
+                column.dtxp = `'${uniqueVals.join("','")}'`
+              }
+            }
+          }
+        }
+      } else if (column.uidt === UITypes.Number) {
+        if (this.jsonData.slice(1, this.config.maxRowsToParse).some((v) => {
+          return v && v[key] && parseInt(+v[key]) !== +v[key]
+        })) {
+          column.uidt = UITypes.Decimal
+        }
+        if (this.jsonData.every((v, i) => {
+          return v[key] && v[key].toString().startsWith('$')
+        })) {
+          column.uidt = UITypes.Currency
+        }
+      } else if (column.uidt === UITypes.DateTime) {
+        if (this.jsonData.every((v, i) => {
+          return v[key] && v[key].toString().split(' ').length === 1
+        })) {
+          column.uidt = UITypes.Date
+        }
+      }
+    }
+
+    // let rowIndex = 0
+    for (const row of this.jsonData) {
+      const rowData = {}
+      for (let i = 0; i < table.columns.length; i++) {
+        if (table.columns[i].uidt === UITypes.Checkbox) {
+          rowData[table.columns[i].column_name] = getCheckboxValue(row[i])
+        } else if (table.columns[i].uidt === UITypes.Currency) {
+          rowData[table.columns[i].column_name] = (row[table.columns[i].ref_column_name].replace(/[^\d.]+/g, '')) || row[i]
+        } else if (table.columns[i].uidt === UITypes.SingleSelect || table.columns[i].uidt === UITypes.MultiSelect) {
+          rowData[table.columns[i].column_name] = (row[table.columns[i].ref_column_name] || '').toString().trim() || null
+        } else {
+          // toto: do parsing if necessary based on type
+          rowData[table.columns[i].column_name] = row[table.columns[i].ref_column_name]
+        }
+      }
+      this.data[tn].push(rowData)
+      // rowIndex++
+    }
+    this.project.tables.push(table)
+  }
+
+  getTemplate() {
+    return this.project
+  }
+}
diff --git a/packages/nocodb-sdk/src/index.ts b/packages/nocodb-sdk/src/index.ts
index 805152d812..561b841c36 100644
--- a/packages/nocodb-sdk/src/index.ts
+++ b/packages/nocodb-sdk/src/index.ts
@@ -5,6 +5,7 @@ export * from './lib/sqlUi';
 export * from './lib/globals';
 export * from './lib/helperFunctions';
 export * from './lib/formulaHelpers';
-export * from './lib/passwordHelpers';
 export { default as UITypes, isVirtualCol } from './lib/UITypes';
 export { default as CustomAPI } from './lib/CustomAPI';
+export { default as TemplateGenerator } from './lib/TemplateGenerator';
+export * from './lib/passwordHelpers';
diff --git a/packages/nocodb-sdk/src/lib/TemplateGenerator.ts b/packages/nocodb-sdk/src/lib/TemplateGenerator.ts
new file mode 100644
index 0000000000..ad74741b65
--- /dev/null
+++ b/packages/nocodb-sdk/src/lib/TemplateGenerator.ts
@@ -0,0 +1,30 @@
+import UITypes from './UITypes';
+
+export interface Column {
+  column_name: string;
+  ref_column_name: string;
+  uidt?: UITypes;
+  dtxp?: any;
+  dt?: any;
+}
+export interface Table {
+  table_name: string;
+  ref_table_name: string;
+  columns: Array<Column>;
+}
+export interface Template {
+  title: string;
+  tables: Array<Table>;
+}
+
+export default abstract class TemplateGenerator {
+  abstract parse(): Promise<any>;
+  abstract parseTemplate(): Promise<Template>;
+  abstract getColumns(): Promise<any>;
+  abstract parseData(): Promise<any>;
+  abstract getData(): Promise<{
+    [table_name: string]: Array<{
+      [key: string]: any;
+    }>;
+  }>;
+}

From 6c2abde02caf71e654e63f4c36abdde3ea7bd7a0 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Thu, 16 Jun 2022 12:29:08 +0530
Subject: [PATCH 02/42] wip: JSON - file & url based import

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../nc-gui/components/import/JSONImport.vue   | 96 ++++++++-----------
 .../templateParsers/JSONTemplateAdapter.js    | 18 ++--
 .../templateParsers/JSONUrlTemplateAdapter.js | 32 +++++++
 3 files changed, 80 insertions(+), 66 deletions(-)
 create mode 100644 packages/nc-gui/components/import/templateParsers/JSONUrlTemplateAdapter.js

diff --git a/packages/nc-gui/components/import/JSONImport.vue b/packages/nc-gui/components/import/JSONImport.vue
index fc55b865b3..ba2190b4d0 100644
--- a/packages/nc-gui/components/import/JSONImport.vue
+++ b/packages/nc-gui/components/import/JSONImport.vue
@@ -23,7 +23,7 @@
           </v-tab>
 
           <v-tab-item>
-            <div class="nc-excel-import-tab-item ">
+            <div class="nc-json-import-tab-item ">
               <div
                 class="nc-droppable d-flex align-center justify-center flex-column"
                 :style="{
@@ -57,7 +57,7 @@
             </div>
           </v-tab-item>
           <v-tab-item>
-            <div class="nc-excel-import-tab-item align-center">
+            <div class="nc-json-import-tab-item align-center">
               <div class="pa-4 d-100 h-100">
                 <v-form ref="form" v-model="valid">
                   <div class="d-flex">
@@ -82,19 +82,21 @@
             </div>
           </v-tab-item>
           <v-tab-item>
-            <div class="nc-excel-import-tab-item align-center">
+            <div class="nc-json-import-tab-item align-center">
               <div class="pa-4 d-100 h-100">
                 <v-form ref="form" v-model="valid">
                   <div class="">
                     <!--label="Enter excel file url"-->
                     <monaco-json-editor
                       v-model="jsonString"
-                      style="height:300px"
+                      style="height:320px"
                     />
-                    <v-btn v-t="['c:project:create:excel:load-url']" class="ml-3" color="primary" @click="loadJsonString">
-                      <!--Load-->
-                      {{ $t('general.load') }}
-                    </v-btn>
+                    <div class="text-center mt-4">
+                      <v-btn v-t="['c:project:create:excel:load-url']" class="ml-3" color="primary" @click="loadJsonString">
+                        <!--Load-->
+                        {{ $t('general.load') }}
+                      </v-btn>
+                    </div>
                   </div>
                 </v-form>
               </div>
@@ -110,7 +112,7 @@
               <v-icon small color="grey lighten-1">mdi-menu-{{ showMore ? 'up' : 'down' }}</v-icon>
             </span>
           </div>
-          <div class="mb-2 pt-2 nc-excel-import-options" :style="{ maxHeight: showMore ? '100px' : '0'}">
+          <div class="mb-2 pt-2 nc-json-import-options" :style="{ maxHeight: showMore ? '200px' : '0'}">
             <p />
             <!--hint="# of rows to parse to infer data type"-->
             <v-text-field
@@ -123,6 +125,18 @@
               outlined
               type="number"
             />
+
+            <v-checkbox
+              v-model="parserConfig.normalizeNested"
+              style="width: 250px"
+              class="mx-auto mb-2"
+              dense
+              hide-details
+            >
+              <template #label>
+                <span class="caption">Normalize nested</span>
+              </template>
+            </v-checkbox>
           </div>
         </div>
       </v-card>
@@ -133,19 +147,17 @@
         <input
           v-if="quickImportType == 'excel'"
           ref="file"
-          class="nc-excel-import-input"
+          class="nc-json-import-input"
           type="file"
           style="display: none"
-          accept=".xlsx, .xls, .xlsm, .ods, .ots"
           @change="_change($event)"
         >
         <input
           v-if="quickImportType == 'csv'"
           ref="file"
-          class="nc-excel-import-input"
+          class="nc-json-import-input"
           type="file"
           style="display: none"
-          accept=".csv"
           @change="_change($event)"
         >
         <v-btn
@@ -163,12 +175,12 @@
           {{ $t('activity.import') }}
         </v-btn>
       </template>
-      <span class="caption">Create template from Excel</span>
+      <span class="caption">Create template from JSON</span>
     </v-tooltip>
 
     <v-dialog v-if="templateData" v-model="templateEditorModal" max-width="1000">
       <v-card class="pa-6" min-width="500">
-        <template-editor :project-template.sync="templateData" excel-import :quick-import-type="quickImportType">
+        <template-editor :project-template.sync="templateData" json-import :quick-import-type="quickImportType">
           <template #toolbar="{valid}">
             <h3 class="mt-2 grey--text">
               <span>
@@ -182,7 +194,7 @@
               :template-data="templateData"
               :import-data="importData"
               :import-to-project="importToProject"
-              excel-import
+              json-import
               :valid="valid"
               create-gql-text="Import as GQL Project"
               create-rest-text="Import as REST Project"
@@ -206,11 +218,9 @@
 
 <script>
 
-// import XLSX from 'xlsx'
 import TemplateEditor from '~/components/templates/Editor'
 import CreateProjectFromTemplateBtn from '~/components/templates/CreateProjectFromTemplateBtn'
 import ExcelUrlTemplateAdapter from '~/components/import/templateParsers/ExcelUrlTemplateAdapter'
-import ExcelTemplateAdapter from '~/components/import/templateParsers/ExcelTemplateAdapter'
 import MonacoJsonEditor from '~/components/monaco/MonacoJsonEditor'
 import JSONTemplateAdapter from '~/components/import/templateParsers/JSONTemplateAdapter'
 
@@ -233,19 +243,11 @@ export default {
       url: '',
       showMore: false,
       parserConfig: {
-        maxRowsToParse: 500
+        maxRowsToParse: 500,
+        normalizeNested: false
       },
       filename: '',
-      jsonString: `[{
-        "data": "Click Here",
-        "size": 36,
-        "style": "bold",
-        "name": "text1",
-        "hOffset": 250,
-        "vOffset": 100,
-        "alignment": "center",
-        "onMouseUp": "sun1.opacity = (sun1.opacity / 100) * 90;"
-    }]`
+      jsonString: ''
     }
   },
   computed: {
@@ -317,13 +319,14 @@ export default {
         this.importData = null
         switch (type) {
           case 'file':
-            templateGenerator = new ExcelTemplateAdapter(name, val, this.parserConfig)
+            templateGenerator = new JSONTemplateAdapter(name, val, this.parserConfig)
             break
           case 'url':
+            templateGenerator = new ExcelUrlTemplateAdapter(val, this.$store, this.parserConfig, this.$api)
             templateGenerator = new ExcelUrlTemplateAdapter(val, this.$store, this.parserConfig, this.$api)
             break
           case 'string':
-            templateGenerator = new JSONTemplateAdapter('test', val)
+            templateGenerator = new JSONTemplateAdapter('test', val, this.parserConfig)
             break
         }
         await templateGenerator.init()
@@ -355,15 +358,6 @@ export default {
         return
       }
 
-      if (this.quickImportType === 'excel') {
-        if (!/.*\.(xls|xlsx|xlsm|ods|ots)/.test(file.name)) {
-          return this.$toast.error('Dropped file is not an accepted file type. The accepted file types are .xls, .xlsx, .xlsm, .ods, .ots!').goAway(3000)
-        }
-      } else if (this.quickImportType === 'csv') {
-        if (!/.*\.(csv)/.test(file.name)) {
-          return this.$toast.error('Dropped file is not an accepted file type. The accepted file type is .csv!').goAway(3000)
-        }
-      }
       this._file(file)
     },
     dragOverHandler(ev) {
@@ -376,11 +370,11 @@ export default {
         return
       }
 
-      this.$store.commit('loader/MutMessage', 'Loading excel file from url')
+      this.$store.commit('loader/MutMessage', 'Loading json file from url')
 
       let i = 0
       const int = setInterval(() => {
-        this.$store.commit('loader/MutMessage', `Loading excel file${'.'.repeat(++i % 4)}`)
+        this.$store.commit('loader/MutMessage', `Loading json file${'.'.repeat(++i % 4)}`)
       }, 1000)
 
       this.dropOrUpload = false
@@ -391,21 +385,7 @@ export default {
     },
 
     async loadJsonString() {
-      // if ((this.$refs.form && !this.$refs.form.validate()) || !this.url) {
-      //   return
-      // }
-
-      this.$store.commit('loader/MutMessage', 'Loading excel file from url')
-
-      let i = 0
-      const int = setInterval(() => {
-        this.$store.commit('loader/MutMessage', `Loading excel file${'.'.repeat(++i % 4)}`)
-      }, 1000)
-
-      this.dropOrUpload = false
-
       await this.parseAndExtractData('string', this.jsonString)
-      clearInterval(int)
       this.$store.commit('loader/MutClear')
     }
 
@@ -421,7 +401,7 @@ export default {
   border: 2px dashed #ddd;
 }
 
-.nc-excel-import-tab-item {
+.nc-json-import-tab-item {
   min-height: 400px;
   padding: 20px;
   display: flex;
@@ -429,7 +409,7 @@ export default {
   width: 100%;
 }
 
-.nc-excel-import-options {
+.nc-json-import-options {
   transition: .4s max-height;
   overflow: hidden;
 }
diff --git a/packages/nc-gui/components/import/templateParsers/JSONTemplateAdapter.js b/packages/nc-gui/components/import/templateParsers/JSONTemplateAdapter.js
index 14977ebdd7..7bb8a34a56 100644
--- a/packages/nc-gui/components/import/templateParsers/JSONTemplateAdapter.js
+++ b/packages/nc-gui/components/import/templateParsers/JSONTemplateAdapter.js
@@ -43,6 +43,8 @@ export default class JSONTemplateAdapter extends TemplateGenerator {
   }
 
   parse() {
+    const jsonData = Array.isArray(this.this.jsonData) ? this.this.jsonData : [this.jsonData]
+
     // for (let i = 0; i < this.wb.SheetNames.length; i++) {
     // const columnNamePrefixRef = { id: 0 }
 
@@ -56,7 +58,7 @@ export default class JSONTemplateAdapter extends TemplateGenerator {
     // const range = XLSX.utils.decode_range(ws['!ref'])
     // const rows = XLSX.utils.sheet_to_json(ws, { header: 1, blankrows: false, cellDates: true, defval: null })
 
-    const objKeys = Object.keys(this.jsonData[0])
+    const objKeys = Object.keys(jsonData[0])
 
     for (let col = 0; col < objKeys.length; col++) {
       const key = objKeys[col]
@@ -69,18 +71,18 @@ export default class JSONTemplateAdapter extends TemplateGenerator {
 
       table.columns.push(column)
 
-      column.uidt = jsonTypeToUidt[typeof this.jsonData[0][key]] || UITypes.SingleLineText
+      column.uidt = jsonTypeToUidt[typeof jsonData[0][key]] || UITypes.SingleLineText
 
       // todo: optimize
       if (column.uidt === UITypes.SingleLineText) {
         // check for long text
-        if (this.jsonData.some(r =>
+        if (jsonData.some(r =>
           (r[key] || '').toString().match(/[\r\n]/) ||
           (r[key] || '').toString().length > 255)
         ) {
           column.uidt = UITypes.LongText
         } else {
-          const vals = this.jsonData
+          const vals = jsonData
             .map(r => r[key])
             .filter(v => v !== null && v !== undefined && v.toString().trim() !== '')
 
@@ -110,18 +112,18 @@ export default class JSONTemplateAdapter extends TemplateGenerator {
           }
         }
       } else if (column.uidt === UITypes.Number) {
-        if (this.jsonData.slice(1, this.config.maxRowsToParse).some((v) => {
+        if (jsonData.slice(1, this.config.maxRowsToParse).some((v) => {
           return v && v[key] && parseInt(+v[key]) !== +v[key]
         })) {
           column.uidt = UITypes.Decimal
         }
-        if (this.jsonData.every((v, i) => {
+        if (jsonData.every((v, i) => {
           return v[key] && v[key].toString().startsWith('$')
         })) {
           column.uidt = UITypes.Currency
         }
       } else if (column.uidt === UITypes.DateTime) {
-        if (this.jsonData.every((v, i) => {
+        if (jsonData.every((v, i) => {
           return v[key] && v[key].toString().split(' ').length === 1
         })) {
           column.uidt = UITypes.Date
@@ -130,7 +132,7 @@ export default class JSONTemplateAdapter extends TemplateGenerator {
     }
 
     // let rowIndex = 0
-    for (const row of this.jsonData) {
+    for (const row of jsonData) {
       const rowData = {}
       for (let i = 0; i < table.columns.length; i++) {
         if (table.columns[i].uidt === UITypes.Checkbox) {
diff --git a/packages/nc-gui/components/import/templateParsers/JSONUrlTemplateAdapter.js b/packages/nc-gui/components/import/templateParsers/JSONUrlTemplateAdapter.js
new file mode 100644
index 0000000000..dc5e87e0e9
--- /dev/null
+++ b/packages/nc-gui/components/import/templateParsers/JSONUrlTemplateAdapter.js
@@ -0,0 +1,32 @@
+import { TemplateGenerator } from 'nocodb-sdk'
+import { UITypes } from '~/components/project/spreadsheet/helpers/uiTypes'
+import { getCheckboxValue, isCheckboxType } from '~/components/import/templateParsers/parserHelpers'
+
+const jsonTypeToUidt = {
+  number: UITypes.Number,
+  string: UITypes.SingleLineText,
+  date: UITypes.DateTime,
+  boolean: UITypes.Checkbox,
+  object: UITypes.LongText
+}
+
+export default class JSONTemplateAdapter extends JSONTemplateAdapter {
+  constructor(url, $store, parserConfig, $api) {
+    const name = url.split('/').pop()
+    super(name, null, parserConfig)
+    this.url = url
+    this.$api = $api
+    this.$store = $store
+  }
+
+  async init() {
+    const data = await this.$api.utils.axiosRequestMake({
+      apiMeta: {
+        url: this.url,
+        responseType: 'arraybuffer'
+      }
+    })
+    this.jsonData = data.data
+    await super.init()
+  }
+}

From d320ee9d99413e3d0e8bc1195e967051dba8a3cf Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Thu, 16 Jun 2022 17:04:38 +0530
Subject: [PATCH 03/42] feat: JSON import

- Email and URL support
- Nested Data normalization
- Handle both object and array
- Optional data import option

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../nc-gui/components/import/JSONImport.vue   |  65 +++++--
 .../templateParsers/JSONTemplateAdapter.js    | 172 +++++++++---------
 .../templateParsers/JSONUrlTemplateAdapter.js |  19 +-
 .../import/templateParsers/parserHelpers.js   |  58 +++++-
 .../components/monaco/MonacoJsonEditor.js     |   3 +
 5 files changed, 196 insertions(+), 121 deletions(-)

diff --git a/packages/nc-gui/components/import/JSONImport.vue b/packages/nc-gui/components/import/JSONImport.vue
index ba2190b4d0..117c79cc2a 100644
--- a/packages/nc-gui/components/import/JSONImport.vue
+++ b/packages/nc-gui/components/import/JSONImport.vue
@@ -2,7 +2,7 @@
   <div :class="{'pt-10':!hideLabel}">
     <v-dialog v-model="dropOrUpload" max-width="600">
       <v-card max-width="600">
-        <v-tabs height="30" :value="2">
+        <v-tabs height="30">
           <v-tab>
             <v-icon small class="mr-1">
               mdi-file-upload-outline
@@ -61,18 +61,18 @@
               <div class="pa-4 d-100 h-100">
                 <v-form ref="form" v-model="valid">
                   <div class="d-flex">
-                    <!--label="Enter excel file url"-->
+                    <!-- todo:  i18n label-->
                     <v-text-field
                       v-model="url"
                       hide-details="auto"
                       type="url"
-                      :label="quickImportType == 'excel' ? $t('msg.info.excelURL') : $t('msg.info.csvURL') "
+                      label="Enter JSON file url"
                       class="caption"
                       outlined
                       dense
                       :rules="[v => !!v || $t('general.required') ]"
                     />
-                    <v-btn v-t="['c:project:create:excel:load-url']" class="ml-3" color="primary" @click="loadUrl">
+                    <v-btn v-t="['c:project:create:json:load-url']" class="ml-3" color="primary" @click="loadUrl">
                       <!--Load-->
                       {{ $t('general.load') }}
                     </v-btn>
@@ -85,9 +85,14 @@
             <div class="nc-json-import-tab-item align-center">
               <div class="pa-4 d-100 h-100">
                 <v-form ref="form" v-model="valid">
-                  <div class="">
+                  <div class="nc-json-editor-wrapper">
+                    <v-btn small class="nc-json-format-btn" @click="formatJson">
+                      Format
+                    </v-btn>
+
                     <!--label="Enter excel file url"-->
                     <monaco-json-editor
+                      ref="editor"
                       v-model="jsonString"
                       style="height:320px"
                     />
@@ -137,6 +142,17 @@
                 <span class="caption">Normalize nested</span>
               </template>
             </v-checkbox>
+            <v-checkbox
+              v-model="parserConfig.importData"
+              style="width: 250px"
+              class="mx-auto mb-2"
+              dense
+              hide-details
+            >
+              <template #label>
+                <span class="caption">Import data</span>
+              </template>
+            </v-checkbox>
           </div>
         </div>
       </v-card>
@@ -220,9 +236,9 @@
 
 import TemplateEditor from '~/components/templates/Editor'
 import CreateProjectFromTemplateBtn from '~/components/templates/CreateProjectFromTemplateBtn'
-import ExcelUrlTemplateAdapter from '~/components/import/templateParsers/ExcelUrlTemplateAdapter'
 import MonacoJsonEditor from '~/components/monaco/MonacoJsonEditor'
 import JSONTemplateAdapter from '~/components/import/templateParsers/JSONTemplateAdapter'
+import JSONUrlTemplateAdapter from '~/components/import/templateParsers/JSONUrlTemplateAdapter'
 
 export default {
   name: 'JsonImport',
@@ -244,7 +260,8 @@ export default {
       showMore: false,
       parserConfig: {
         maxRowsToParse: 500,
-        normalizeNested: false
+        normalizeNested: false,
+        importData: true
       },
       filename: '',
       jsonString: ''
@@ -258,6 +275,9 @@ export default {
       get() {
         return this.value
       }
+    },
+    tables() {
+      return this.$store.state.project.tables || []
     }
   },
   mounted() {
@@ -267,6 +287,10 @@ export default {
     }
   },
   methods: {
+    formatJson() {
+      console.log(this.$refs.editor)
+      this.$refs.editor.format()
+    },
 
     selectFile() {
       this.$refs.file.files = null
@@ -319,19 +343,21 @@ export default {
         this.importData = null
         switch (type) {
           case 'file':
-            templateGenerator = new JSONTemplateAdapter(name, val, this.parserConfig)
+            templateGenerator = new JSONTemplateAdapter('JSON', val, this.parserConfig)
             break
           case 'url':
-            templateGenerator = new ExcelUrlTemplateAdapter(val, this.$store, this.parserConfig, this.$api)
-            templateGenerator = new ExcelUrlTemplateAdapter(val, this.$store, this.parserConfig, this.$api)
+            templateGenerator = new JSONUrlTemplateAdapter(val, this.$store, this.parserConfig, this.$api)
             break
           case 'string':
-            templateGenerator = new JSONTemplateAdapter('test', val, this.parserConfig)
+            templateGenerator = new JSONTemplateAdapter('JSON', val, this.parserConfig)
             break
         }
         await templateGenerator.init()
         templateGenerator.parse()
         this.templateData = templateGenerator.getTemplate()
+
+        this.templateData.tables[0].table_name = this.populateUniqueTableName()
+
         this.importData = templateGenerator.getData()
         this.templateEditorModal = true
       } catch (e) {
@@ -364,7 +390,11 @@ export default {
       // Prevent default behavior (Prevent file from being opened)
       ev.preventDefault()
     },
-
+    populateUniqueTableName() {
+      let c = 1
+      while (this.tables.some(t => t.title === `Sheet${c}`)) { c++ }
+      return `Sheet${c}`
+    },
     async loadUrl() {
       if ((this.$refs.form && !this.$refs.form.validate()) || !this.url) {
         return
@@ -413,4 +443,15 @@ export default {
   transition: .4s max-height;
   overflow: hidden;
 }
+
+.nc-json-editor-wrapper{
+  position: relative;
+}
+
+.nc-json-format-btn{
+  position:absolute;
+  right:4px;
+  top:4px;
+  z-index:9;
+}
 </style>
diff --git a/packages/nc-gui/components/import/templateParsers/JSONTemplateAdapter.js b/packages/nc-gui/components/import/templateParsers/JSONTemplateAdapter.js
index 7bb8a34a56..b53230b789 100644
--- a/packages/nc-gui/components/import/templateParsers/JSONTemplateAdapter.js
+++ b/packages/nc-gui/components/import/templateParsers/JSONTemplateAdapter.js
@@ -1,15 +1,21 @@
-import { TemplateGenerator } from 'nocodb-sdk'
-import { UITypes } from '~/components/project/spreadsheet/helpers/uiTypes'
-import { getCheckboxValue, isCheckboxType } from '~/components/import/templateParsers/parserHelpers'
+import { TemplateGenerator, UITypes } from 'nocodb-sdk'
+import {
+  extractMultiOrSingleSelectProps,
+  getCheckboxValue,
+  isCheckboxType, isDecimalType, isEmailType,
+  isMultiLineTextType, isUrlType
+} from '~/components/import/templateParsers/parserHelpers'
 
 const jsonTypeToUidt = {
   number: UITypes.Number,
   string: UITypes.SingleLineText,
   date: UITypes.DateTime,
   boolean: UITypes.Checkbox,
-  object: UITypes.LongText
+  object: UITypes.JSON
 }
 
+const extractNestedData = (obj, path) => path.reduce((val, key) => val && val[key], obj)
+
 export default class JSONTemplateAdapter extends TemplateGenerator {
   constructor(name = 'test', data, parserConfig = {}) {
     super()
@@ -18,7 +24,7 @@ export default class JSONTemplateAdapter extends TemplateGenerator {
       ...parserConfig
     }
     this.name = name
-    this.jsonData = typeof data === 'string' ? JSON.parse(data) : data
+    this._jsonData = typeof data === 'string' ? JSON.parse(data) : data
     this.project = {
       title: this.name,
       tables: []
@@ -42,117 +48,103 @@ export default class JSONTemplateAdapter extends TemplateGenerator {
     return this.data
   }
 
-  parse() {
-    const jsonData = Array.isArray(this.this.jsonData) ? this.this.jsonData : [this.jsonData]
-
-    // for (let i = 0; i < this.wb.SheetNames.length; i++) {
-    // const columnNamePrefixRef = { id: 0 }
+  get jsonData() {
+    return Array.isArray(this._jsonData) ? this._jsonData : [this._jsonData]
+  }
 
+  parse() {
+    const jsonData = this.jsonData
     const tn = 'table'
-
     const table = { table_name: tn, ref_table_name: tn, columns: [] }
 
     this.data[tn] = []
 
-    // const ws = this.wb.Sheets[sheet]
-    // const range = XLSX.utils.decode_range(ws['!ref'])
-    // const rows = XLSX.utils.sheet_to_json(ws, { header: 1, blankrows: false, cellDates: true, defval: null })
+    for (const col of Object.keys(jsonData[0])) {
+      const columns = this._parseColumn([col], jsonData)
+      table.columns.push(...columns)
+    }
+
+    if (this.config.importData) { this._parseTableData(table) }
+
+    this.project.tables.push(table)
+  }
 
-    const objKeys = Object.keys(jsonData[0])
+  getTemplate() {
+    return this.project
+  }
 
-    for (let col = 0; col < objKeys.length; col++) {
-      const key = objKeys[col]
-      const cn = objKeys[col].replace(/\W/g, '_').trim()
+  _parseColumn(path = [], jsonData = this.jsonData, firstRowVal = path.reduce((val, k) => val && val[k], this.jsonData[0])) {
+    const columns = []
+    // parse nested
+    if (firstRowVal && typeof firstRowVal === 'object' && !Array.isArray(firstRowVal) && this.config.normalizeNested) {
+      for (const key of Object.keys(firstRowVal)) {
+        const normalizedNestedColumns = this._parseColumn([...path, key], this.jsonData, firstRowVal[key])
+        columns.push(...normalizedNestedColumns)
+      }
+    } else {
+      const cn = path.join('_').replace(/\W/g, '_').trim()
 
       const column = {
         column_name: cn,
-        ref_column_name: cn
+        ref_column_name: cn,
+        path
       }
 
-      table.columns.push(column)
+      column.uidt = jsonTypeToUidt[typeof firstRowVal] || UITypes.SingleLineText
+
+      const colData = jsonData.map(r => extractNestedData(r, path))
+      Object.assign(column, this._getColumnUIDTAndMetas(colData, column.uidt))
+      columns.push(column)
+    }
 
-      column.uidt = jsonTypeToUidt[typeof jsonData[0][key]] || UITypes.SingleLineText
+    return columns
+  }
 
-      // todo: optimize
-      if (column.uidt === UITypes.SingleLineText) {
-        // check for long text
-        if (jsonData.some(r =>
-          (r[key] || '').toString().match(/[\r\n]/) ||
-          (r[key] || '').toString().length > 255)
-        ) {
-          column.uidt = UITypes.LongText
+  _getColumnUIDTAndMetas(colData, defaultType) {
+    const colProps = { uidt: defaultType }
+    // todo: optimize
+    if (colProps.uidt === UITypes.SingleLineText) {
+      // check for long text
+      if (isMultiLineTextType(colData)) {
+        colProps.uidt = UITypes.LongText
+      } if (isEmailType(colData)) {
+        colProps.uidt = UITypes.Email
+      } if (isUrlType(colData)) {
+        colProps.uidt = UITypes.URL
+      } else {
+        const checkboxType = isCheckboxType(colData)
+        if (checkboxType.length === 1) {
+          colProps.uidt = UITypes.Checkbox
         } else {
-          const vals = jsonData
-            .map(r => r[key])
-            .filter(v => v !== null && v !== undefined && v.toString().trim() !== '')
-
-          const checkboxType = isCheckboxType(vals)
-          if (checkboxType.length === 1) {
-            column.uidt = UITypes.Checkbox
-          } else {
-            // todo: optimize
-            // check column is multi or single select by comparing unique values
-            // todo:
-            // eslint-disable-next-line no-lonely-if
-            if (vals.some(v => v && v.toString().includes(','))) {
-              let flattenedVals = vals.flatMap(v => v ? v.toString().trim().split(/\s*,\s*/) : [])
-              const uniqueVals = flattenedVals = flattenedVals
-                .filter((v, i, arr) => i === arr.findIndex(v1 => v.toLowerCase() === v1.toLowerCase()))
-              if (flattenedVals.length > uniqueVals.length && uniqueVals.length <= Math.ceil(flattenedVals.length / 2)) {
-                column.uidt = UITypes.MultiSelect
-                column.dtxp = `'${uniqueVals.join("','")}'`
-              }
-            } else {
-              const uniqueVals = vals.map(v => v.toString().trim()).filter((v, i, arr) => i === arr.findIndex(v1 => v.toLowerCase() === v1.toLowerCase()))
-              if (vals.length > uniqueVals.length && uniqueVals.length <= Math.ceil(vals.length / 2)) {
-                column.uidt = UITypes.SingleSelect
-                column.dtxp = `'${uniqueVals.join("','")}'`
-              }
-            }
-          }
-        }
-      } else if (column.uidt === UITypes.Number) {
-        if (jsonData.slice(1, this.config.maxRowsToParse).some((v) => {
-          return v && v[key] && parseInt(+v[key]) !== +v[key]
-        })) {
-          column.uidt = UITypes.Decimal
-        }
-        if (jsonData.every((v, i) => {
-          return v[key] && v[key].toString().startsWith('$')
-        })) {
-          column.uidt = UITypes.Currency
-        }
-      } else if (column.uidt === UITypes.DateTime) {
-        if (jsonData.every((v, i) => {
-          return v[key] && v[key].toString().split(' ').length === 1
-        })) {
-          column.uidt = UITypes.Date
+          Object.assign(colProps, extractMultiOrSingleSelectProps(colData))
         }
       }
+    } else if (colProps.uidt === UITypes.Number) {
+      if (isDecimalType(colData)) {
+        colProps.uidt = UITypes.Decimal
+      }
     }
+    return colProps
+  }
 
-    // let rowIndex = 0
-    for (const row of jsonData) {
+  _parseTableData(tableMeta) {
+    for (const row of this.jsonData) {
       const rowData = {}
-      for (let i = 0; i < table.columns.length; i++) {
-        if (table.columns[i].uidt === UITypes.Checkbox) {
-          rowData[table.columns[i].column_name] = getCheckboxValue(row[i])
-        } else if (table.columns[i].uidt === UITypes.Currency) {
-          rowData[table.columns[i].column_name] = (row[table.columns[i].ref_column_name].replace(/[^\d.]+/g, '')) || row[i]
-        } else if (table.columns[i].uidt === UITypes.SingleSelect || table.columns[i].uidt === UITypes.MultiSelect) {
-          rowData[table.columns[i].column_name] = (row[table.columns[i].ref_column_name] || '').toString().trim() || null
+      for (let i = 0; i < tableMeta.columns.length; i++) {
+        const value = extractNestedData(row, tableMeta.columns[i].path || [])
+        if (tableMeta.columns[i].uidt === UITypes.Checkbox) {
+          rowData[tableMeta.columns[i].ref_column_name] = getCheckboxValue(value)
+        } else if (tableMeta.columns[i].uidt === UITypes.SingleSelect || tableMeta.columns[i].uidt === UITypes.MultiSelect) {
+          rowData[tableMeta.columns[i].ref_column_name] = (value || '').toString().trim() || null
+        } else if (tableMeta.columns[i].uidt === UITypes.JSON) {
+          rowData[tableMeta.columns[i].ref_column_name] = JSON.stringify(value)
         } else {
           // toto: do parsing if necessary based on type
-          rowData[table.columns[i].column_name] = row[table.columns[i].ref_column_name]
+          rowData[tableMeta.columns[i].column_name] = value
         }
       }
-      this.data[tn].push(rowData)
+      this.data[tableMeta.ref_table_name].push(rowData)
       // rowIndex++
     }
-    this.project.tables.push(table)
-  }
-
-  getTemplate() {
-    return this.project
   }
 }
diff --git a/packages/nc-gui/components/import/templateParsers/JSONUrlTemplateAdapter.js b/packages/nc-gui/components/import/templateParsers/JSONUrlTemplateAdapter.js
index dc5e87e0e9..34494e00fc 100644
--- a/packages/nc-gui/components/import/templateParsers/JSONUrlTemplateAdapter.js
+++ b/packages/nc-gui/components/import/templateParsers/JSONUrlTemplateAdapter.js
@@ -1,16 +1,6 @@
-import { TemplateGenerator } from 'nocodb-sdk'
-import { UITypes } from '~/components/project/spreadsheet/helpers/uiTypes'
-import { getCheckboxValue, isCheckboxType } from '~/components/import/templateParsers/parserHelpers'
+import JSONTemplateAdapter from '~/components/import/templateParsers/JSONTemplateAdapter'
 
-const jsonTypeToUidt = {
-  number: UITypes.Number,
-  string: UITypes.SingleLineText,
-  date: UITypes.DateTime,
-  boolean: UITypes.Checkbox,
-  object: UITypes.LongText
-}
-
-export default class JSONTemplateAdapter extends JSONTemplateAdapter {
+export default class JSONUrlTemplateAdapter extends JSONTemplateAdapter {
   constructor(url, $store, parserConfig, $api) {
     const name = url.split('/').pop()
     super(name, null, parserConfig)
@@ -22,11 +12,10 @@ export default class JSONTemplateAdapter extends JSONTemplateAdapter {
   async init() {
     const data = await this.$api.utils.axiosRequestMake({
       apiMeta: {
-        url: this.url,
-        responseType: 'arraybuffer'
+        url: this.url
       }
     })
-    this.jsonData = data.data
+    this._jsonData = data
     await super.init()
   }
 }
diff --git a/packages/nc-gui/components/import/templateParsers/parserHelpers.js b/packages/nc-gui/components/import/templateParsers/parserHelpers.js
index 75fd80ead7..4d1c70ff1f 100644
--- a/packages/nc-gui/components/import/templateParsers/parserHelpers.js
+++ b/packages/nc-gui/components/import/templateParsers/parserHelpers.js
@@ -1,3 +1,6 @@
+import { UITypes } from 'nocodb-sdk'
+import { isEmail, isValidURL } from '~/helpers'
+
 const booleanOptions = [
   { checked: true, unchecked: false },
   { x: true, '': false },
@@ -11,14 +14,24 @@ const booleanOptions = [
   { '✔': true, '': false },
   { enabled: true, disabled: false },
   { on: true, off: false },
-  { done: true, '': false }
+  { done: true, '': false },
+  { true: true, false: false }
 ]
 const aggBooleanOptions = booleanOptions.reduce((obj, o) => ({ ...obj, ...o }), {})
-export const isCheckboxType = (values, col = '') => {
+
+const getColVal = (row, col = null) => {
+  return row && col ? row[col] : row
+}
+
+export const isCheckboxType = (values, col = null) => {
   let options = booleanOptions
   for (let i = 0; i < values.length; i++) {
-    let val = col ? values[i][col] : values[i]
-    val = val === null || val === undefined ? '' : val
+    const val = getColVal(values[i], col)
+
+    if (val === null || val === undefined || val.toString().trim() === '') {
+      continue
+    }
+
     options = options.filter(v => val in v)
     if (!options.length) {
       return false
@@ -29,3 +42,40 @@ export const isCheckboxType = (values, col = '') => {
 export const getCheckboxValue = (value) => {
   return value && aggBooleanOptions[value]
 }
+
+export const isMultiLineTextType = (values, col = null) => {
+  return values.some(r =>
+    (getColVal(r, col) || '').toString().match(/[\r\n]/) ||
+    (getColVal(r, col) || '').toString().length > 255)
+}
+
+export const extractMultiOrSingleSelectProps = (colData) => {
+  const colProps = {}
+  if (colData.some(v => v && v.toString().includes(','))) {
+    let flattenedVals = colData.flatMap(v => v ? v.toString().trim().split(/\s*,\s*/) : [])
+    const uniqueVals = flattenedVals = flattenedVals
+      .filter((v, i, arr) => i === arr.findIndex(v1 => v.toLowerCase() === v1.toLowerCase()))
+    if (flattenedVals.length > uniqueVals.length && uniqueVals.length <= Math.ceil(flattenedVals.length / 2)) {
+      colProps.uidt = UITypes.MultiSelect
+      colProps.dtxp = `'${uniqueVals.join("','")}'`
+    }
+  } else {
+    const uniqueVals = colData.map(v => v.toString().trim()).filter((v, i, arr) => i === arr.findIndex(v1 => v.toLowerCase() === v1.toLowerCase()))
+    if (colData.length > uniqueVals.length && uniqueVals.length <= Math.ceil(colData.length / 2)) {
+      colProps.uidt = UITypes.SingleSelect
+      colProps.dtxp = `'${uniqueVals.join("','")}'`
+    }
+  }
+  return colProps
+}
+
+export const isDecimalType = colData => colData.some((v) => {
+  return v && parseInt(+v) !== +v
+})
+
+export const isEmailType = colData => !colData.some((v) => {
+  return v && !isEmail(v)
+})
+export const isUrlType = colData => !colData.some((v) => {
+  return v && !isValidURL(v)
+})
diff --git a/packages/nc-gui/components/monaco/MonacoJsonEditor.js b/packages/nc-gui/components/monaco/MonacoJsonEditor.js
index 1362ac4f1c..aa05a99738 100644
--- a/packages/nc-gui/components/monaco/MonacoJsonEditor.js
+++ b/packages/nc-gui/components/monaco/MonacoJsonEditor.js
@@ -83,6 +83,9 @@ export default {
   },
 
   methods: {
+    format() {
+      this.editor.getAction('editor.action.formatDocument').run()
+    },
     resizeLayout() {
       this.editor.layout();
     },

From 2c69a47af46c21e8a06af3c2db74b45ae31fa63d Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Tue, 21 Jun 2022 17:19:03 +0530
Subject: [PATCH 04/42] refactor: add url validation

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nc-gui/components/import/JSONImport.vue | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/components/import/JSONImport.vue b/packages/nc-gui/components/import/JSONImport.vue
index 117c79cc2a..976273028c 100644
--- a/packages/nc-gui/components/import/JSONImport.vue
+++ b/packages/nc-gui/components/import/JSONImport.vue
@@ -70,7 +70,11 @@
                       class="caption"
                       outlined
                       dense
-                      :rules="[v => !!v || $t('general.required') ]"
+                      :rules="
+                        [
+                          v => !!v || $t('general.required'),
+                          v => !(/(10)(\.([2]([0-5][0-5]|[01234][6-9])|[1][0-9][0-9]|[1-9][0-9]|[0-9])){3}|(172)\.(1[6-9]|2[0-9]|3[0-1])(\.(2[0-4][0-9]|25[0-5]|[1][0-9][0-9]|[1-9][0-9]|[0-9])){2}|(192)\.(168)(\.(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])){2}|(0.0.0.0)|localhost?/g).test(v) || errorMessages.ipBlockList
+                        ]"
                     />
                     <v-btn v-t="['c:project:create:json:load-url']" class="ml-3" color="primary" @click="loadUrl">
                       <!--Load-->
@@ -264,7 +268,10 @@ export default {
         importData: true
       },
       filename: '',
-      jsonString: ''
+      jsonString: '',
+      errorMessages: {
+        ipBlockList: 'IP Not allowed!'
+      }
     }
   },
   computed: {

From 8d5c40c068fc186a3ca87ab66fc779395620b161 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Tue, 21 Jun 2022 17:22:37 +0530
Subject: [PATCH 05/42] refactor: disable url based import

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../nc-gui/components/import/JSONImport.vue   | 139 +++++++++---------
 1 file changed, 70 insertions(+), 69 deletions(-)

diff --git a/packages/nc-gui/components/import/JSONImport.vue b/packages/nc-gui/components/import/JSONImport.vue
index 976273028c..9e0f34075d 100644
--- a/packages/nc-gui/components/import/JSONImport.vue
+++ b/packages/nc-gui/components/import/JSONImport.vue
@@ -10,58 +10,58 @@
             <span class="caption text-capitalize">Upload</span>
           </v-tab>
           <v-tab>
-            <v-icon small class="mr-1">
+            <!--            <v-icon small class="mr-1">
               mdi-link-variant
             </v-icon>
             <span class="caption text-capitalize">URL</span>
-          </v-tab>
-          <v-tab>
-            <v-icon small class="mr-1">
-              mdi-link-variant
-            </v-icon>
-            <span class="caption text-capitalize">String</span>
-          </v-tab>
-
-          <v-tab-item>
-            <div class="nc-json-import-tab-item ">
-              <div
-                class="nc-droppable d-flex align-center justify-center flex-column"
-                :style="{
-                  background : dragOver ? '#7772' : ''
-                }"
-                @click="$refs.file.click()"
-                @drop.prevent="dropHandler"
-                @dragover.prevent="dragOver = true"
-                @dragenter.prevent="dragOver = true"
-                @dragexit="dragOver = false"
-                @dragleave="dragOver = false"
-                @dragend="dragOver = false"
-              >
-                <x-icon :color="['primary','grey']" size="50">
-                  mdi-file-plus-outline
-                </x-icon>
-                <p class="title  mb-1 mt-2">
-                  <!-- Select File to Upload-->
-                  {{ $t('msg.info.upload') }}
-                </p>
-                <p class="grey--text mb-1">
-                  <!-- or drag and drop file-->
-                  {{ $t('msg.info.upload_sub') }}
-                </p>
-
-                <p v-if="quickImportType == 'excel'" class="caption grey--text">
-                  <!-- Supported: .xls, .xlsx, .xlsm, .ods, .ots -->
-                  {{ $t('msg.info.excelSupport') }}
-                </p>
+          </v-tab>-->
+            <v-tab>
+              <v-icon small class="mr-1">
+                mdi-link-variant
+              </v-icon>
+              <span class="caption text-capitalize">String</span>
+            </v-tab>
+
+            <v-tab-item>
+              <div class="nc-json-import-tab-item ">
+                <div
+                  class="nc-droppable d-flex align-center justify-center flex-column"
+                  :style="{
+                    background : dragOver ? '#7772' : ''
+                  }"
+                  @click="$refs.file.click()"
+                  @drop.prevent="dropHandler"
+                  @dragover.prevent="dragOver = true"
+                  @dragenter.prevent="dragOver = true"
+                  @dragexit="dragOver = false"
+                  @dragleave="dragOver = false"
+                  @dragend="dragOver = false"
+                >
+                  <x-icon :color="['primary','grey']" size="50">
+                    mdi-file-plus-outline
+                  </x-icon>
+                  <p class="title  mb-1 mt-2">
+                    <!-- Select File to Upload-->
+                    {{ $t('msg.info.upload') }}
+                  </p>
+                  <p class="grey--text mb-1">
+                    <!-- or drag and drop file-->
+                    {{ $t('msg.info.upload_sub') }}
+                  </p>
+
+                  <p v-if="quickImportType == 'excel'" class="caption grey--text">
+                    <!-- Supported: .xls, .xlsx, .xlsm, .ods, .ots -->
+                    {{ $t('msg.info.excelSupport') }}
+                  </p>
+                </div>
               </div>
-            </div>
-          </v-tab-item>
-          <v-tab-item>
+            </v-tab-item>
+            <!--          <v-tab-item>
             <div class="nc-json-import-tab-item align-center">
               <div class="pa-4 d-100 h-100">
                 <v-form ref="form" v-model="valid">
                   <div class="d-flex">
-                    <!-- todo:  i18n label-->
+                    &lt;!&ndash; todo:  i18n label&ndash;&gt;
                     <v-text-field
                       v-model="url"
                       hide-details="auto"
@@ -77,40 +77,41 @@
                         ]"
                     />
                     <v-btn v-t="['c:project:create:json:load-url']" class="ml-3" color="primary" @click="loadUrl">
-                      <!--Load-->
+                      &lt;!&ndash;Load&ndash;&gt;
                       {{ $t('general.load') }}
                     </v-btn>
                   </div>
                 </v-form>
               </div>
             </div>
-          </v-tab-item>
-          <v-tab-item>
-            <div class="nc-json-import-tab-item align-center">
-              <div class="pa-4 d-100 h-100">
-                <v-form ref="form" v-model="valid">
-                  <div class="nc-json-editor-wrapper">
-                    <v-btn small class="nc-json-format-btn" @click="formatJson">
-                      Format
-                    </v-btn>
-
-                    <!--label="Enter excel file url"-->
-                    <monaco-json-editor
-                      ref="editor"
-                      v-model="jsonString"
-                      style="height:320px"
-                    />
-                    <div class="text-center mt-4">
-                      <v-btn v-t="['c:project:create:excel:load-url']" class="ml-3" color="primary" @click="loadJsonString">
-                        <!--Load-->
-                        {{ $t('general.load') }}
+          </v-tab-item>-->
+            <v-tab-item>
+              <div class="nc-json-import-tab-item align-center">
+                <div class="pa-4 d-100 h-100">
+                  <v-form ref="form" v-model="valid">
+                    <div class="nc-json-editor-wrapper">
+                      <v-btn small class="nc-json-format-btn" @click="formatJson">
+                        Format
                       </v-btn>
+
+                      <!--label="Enter excel file url"-->
+                      <monaco-json-editor
+                        ref="editor"
+                        v-model="jsonString"
+                        style="height:320px"
+                      />
+                      <div class="text-center mt-4">
+                        <v-btn v-t="['c:project:create:excel:load-url']" class="ml-3" color="primary" @click="loadJsonString">
+                          <!--Load-->
+                          {{ $t('general.load') }}
+                        </v-btn>
+                      </div>
                     </div>
-                  </div>
-                </v-form>
+                  </v-form>
+                </div>
               </div>
-            </div>
-          </v-tab-item>
+            </v-tab-item>
+          </v-tab>
         </v-tabs>
 
         <div class="px-4 pb-2">

From c0fa025feff12455dedbe7dd8643cf831d6c63ea Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Thu, 23 Jun 2022 09:30:50 +0800
Subject: [PATCH 06/42] feat: add /api/v1/db/meta/nocodb/health

---
 scripts/sdk/swagger.json | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/scripts/sdk/swagger.json b/scripts/sdk/swagger.json
index acbac69bab..5dabc2d321 100644
--- a/scripts/sdk/swagger.json
+++ b/scripts/sdk/swagger.json
@@ -5128,6 +5128,27 @@
         "description": ""
       }
     },
+    "/api/v1/db/meta/nocodb/health": {
+      "parameters": [],
+      "get": {
+        "summary": "",
+        "operationId": "utils-app-health",
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {}
+              }
+            }
+          }
+        },
+        "tags": [
+          "Utils"
+        ],
+        "description": ""
+      }
+    },
     "/api/v1/db/meta/cache": {
       "get": {
         "summary": "Your GET endpoint",

From 7e80f6c2f6aada8775076e5f018229bfd47035e0 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Thu, 23 Jun 2022 09:31:00 +0800
Subject: [PATCH 07/42] feat: add appHealth

---
 packages/nocodb-sdk/src/lib/Api.ts | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/packages/nocodb-sdk/src/lib/Api.ts b/packages/nocodb-sdk/src/lib/Api.ts
index 2c992d87d2..be954c20bf 100644
--- a/packages/nocodb-sdk/src/lib/Api.ts
+++ b/packages/nocodb-sdk/src/lib/Api.ts
@@ -3208,6 +3208,22 @@ export class Api<
         ...params,
       }),
 
+    /**
+     * No description
+     *
+     * @tags Utils
+     * @name AppHealth
+     * @request GET:/api/v1/db/meta/nocodb/health
+     * @response `200` `any` OK
+     */
+    appHealth: (params: RequestParams = {}) =>
+      this.request<any, any>({
+        path: `/api/v1/db/meta/nocodb/health`,
+        method: 'GET',
+        format: 'json',
+        ...params,
+      }),
+
     /**
      * @description Get All K/V pairs in NocoCache
      *

From e7e387fdc132552d45ec97411777325cad91fdd9 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Thu, 23 Jun 2022 13:37:06 +0800
Subject: [PATCH 08/42] feat: appHealth implementation

---
 packages/nocodb/src/lib/meta/api/utilApis.ts | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/packages/nocodb/src/lib/meta/api/utilApis.ts b/packages/nocodb/src/lib/meta/api/utilApis.ts
index 89ebef8cb6..8d45374ce5 100644
--- a/packages/nocodb/src/lib/meta/api/utilApis.ts
+++ b/packages/nocodb/src/lib/meta/api/utilApis.ts
@@ -60,6 +60,16 @@ export async function releaseVersion(_req: Request, res: Response) {
   res.json(result);
 }
 
+export async function appHealth(_: Request, res: Response) {
+  res.json({
+    message: 'OK',
+    timestamp: Date(),
+    uptime: process.uptime(),
+    memoryUsage: process.memoryUsage(),
+    cpuUsage: process.cpuUsage()
+  });
+}
+
 async function _axiosRequestMake(req: Request, res: Response) {
   const { apiMeta } = req.body;
 
@@ -133,5 +143,6 @@ export default router => {
   );
   router.get('/api/v1/db/meta/nocodb/info', catchError(appInfo));
   router.get('/api/v1/db/meta/nocodb/version', catchError(releaseVersion));
+  router.get('/api/v1/db/meta/nocodb/health', catchError(appHealth));
   router.post('/api/v1/db/meta/axiosRequestMake', catchError(axiosRequestMake));
 };

From b6d1961b73e9872b47395a742daea4d36be50cc9 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Thu, 23 Jun 2022 14:15:57 +0800
Subject: [PATCH 09/42] fix: rm mem & cpu usage

---
 packages/nocodb/src/lib/meta/api/utilApis.ts | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/nocodb/src/lib/meta/api/utilApis.ts b/packages/nocodb/src/lib/meta/api/utilApis.ts
index 8d45374ce5..e49fc03988 100644
--- a/packages/nocodb/src/lib/meta/api/utilApis.ts
+++ b/packages/nocodb/src/lib/meta/api/utilApis.ts
@@ -63,10 +63,8 @@ export async function releaseVersion(_req: Request, res: Response) {
 export async function appHealth(_: Request, res: Response) {
   res.json({
     message: 'OK',
-    timestamp: Date(),
-    uptime: process.uptime(),
-    memoryUsage: process.memoryUsage(),
-    cpuUsage: process.cpuUsage()
+    timestamp: Date.now(),
+    uptime: process.uptime()
   });
 }
 

From 3492712644dafd2b7e43dc3e3c1fe740ce5804a1 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Thu, 23 Jun 2022 14:35:40 +0800
Subject: [PATCH 10/42] docs: add health api

---
 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 5695aff635..483d280d25 100644
--- a/packages/noco-docs/content/en/developer-resources/rest-apis.md
+++ b/packages/noco-docs/content/en/developer-resources/rest-apis.md
@@ -167,6 +167,7 @@ Currently, the default value for {orgs} is <b>noco</b>. Users will be able to ch
 | Meta | Post | utils | testConnection | /api/v1/db/meta/projects/connection/test |
 | Meta | Get | utils | appInfo | /api/v1/db/meta/nocodb/info |
 | Meta | Get | utils | appVersion | /api/v1/db/meta/nocodb/version |
+| Meta | Get | utils | appHealth | /api/v1/db/meta/nocodb/health |
 
 ## Query params
 

From a3e274888e7a68aceeb1da6f2837025c7128c5ec Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 23 Jun 2022 08:47:52 +0000
Subject: [PATCH 11/42] chore(deps): bump got from 11.8.2 to 11.8.5 in
 /packages/noco-docs

Bumps [got](https://github.com/sindresorhus/got) from 11.8.2 to 11.8.5.
- [Release notes](https://github.com/sindresorhus/got/releases)
- [Commits](https://github.com/sindresorhus/got/compare/v11.8.2...v11.8.5)

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

Signed-off-by: dependabot[bot] <support@github.com>
---
 packages/noco-docs/package-lock.json | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/noco-docs/package-lock.json b/packages/noco-docs/package-lock.json
index 6647d34ac9..b0eeb9e53c 100644
--- a/packages/noco-docs/package-lock.json
+++ b/packages/noco-docs/package-lock.json
@@ -7390,16 +7390,16 @@
       }
     },
     "node_modules/got": {
-      "version": "11.8.2",
-      "resolved": "https://registry.npmjs.org/got/-/got-11.8.2.tgz",
-      "integrity": "sha512-D0QywKgIe30ODs+fm8wMZiAcZjypcCodPNuMz5H9Mny7RJ+IjJ10BdmGW7OM7fHXP+O7r6ZwapQ/YQmMSvB0UQ==",
+      "version": "11.8.5",
+      "resolved": "https://registry.npmjs.org/got/-/got-11.8.5.tgz",
+      "integrity": "sha512-o0Je4NvQObAuZPHLFoRSkdG2lTgtcynqymzg2Vupdx6PorhaT5MCbIyXG6d4D94kk8ZG57QeosgdiqfJWhEhlQ==",
       "dependencies": {
         "@sindresorhus/is": "^4.0.0",
         "@szmarczak/http-timer": "^4.0.5",
         "@types/cacheable-request": "^6.0.1",
         "@types/responselike": "^1.0.0",
         "cacheable-lookup": "^5.0.3",
-        "cacheable-request": "^7.0.1",
+        "cacheable-request": "^7.0.2",
         "decompress-response": "^6.0.0",
         "http2-wrapper": "^1.0.0-beta.5.2",
         "lowercase-keys": "^2.0.0",
@@ -22650,16 +22650,16 @@
       }
     },
     "got": {
-      "version": "11.8.2",
-      "resolved": "https://registry.npmjs.org/got/-/got-11.8.2.tgz",
-      "integrity": "sha512-D0QywKgIe30ODs+fm8wMZiAcZjypcCodPNuMz5H9Mny7RJ+IjJ10BdmGW7OM7fHXP+O7r6ZwapQ/YQmMSvB0UQ==",
+      "version": "11.8.5",
+      "resolved": "https://registry.npmjs.org/got/-/got-11.8.5.tgz",
+      "integrity": "sha512-o0Je4NvQObAuZPHLFoRSkdG2lTgtcynqymzg2Vupdx6PorhaT5MCbIyXG6d4D94kk8ZG57QeosgdiqfJWhEhlQ==",
       "requires": {
         "@sindresorhus/is": "^4.0.0",
         "@szmarczak/http-timer": "^4.0.5",
         "@types/cacheable-request": "^6.0.1",
         "@types/responselike": "^1.0.0",
         "cacheable-lookup": "^5.0.3",
-        "cacheable-request": "^7.0.1",
+        "cacheable-request": "^7.0.2",
         "decompress-response": "^6.0.0",
         "http2-wrapper": "^1.0.0-beta.5.2",
         "lowercase-keys": "^2.0.0",

From 5a882c90a0d6d0fa34961f7f64e6bce64c8e392e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 23 Jun 2022 10:54:15 +0000
Subject: [PATCH 12/42] chore(deps): bump got from 11.8.2 to 11.8.5 in
 /packages/noco-blog

Bumps [got](https://github.com/sindresorhus/got) from 11.8.2 to 11.8.5.
- [Release notes](https://github.com/sindresorhus/got/releases)
- [Commits](https://github.com/sindresorhus/got/compare/v11.8.2...v11.8.5)

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

Signed-off-by: dependabot[bot] <support@github.com>
---
 packages/noco-blog/package-lock.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/noco-blog/package-lock.json b/packages/noco-blog/package-lock.json
index 05a95ff26b..4f1f092cb2 100644
--- a/packages/noco-blog/package-lock.json
+++ b/packages/noco-blog/package-lock.json
@@ -5836,16 +5836,16 @@
       }
     },
     "got": {
-      "version": "11.8.2",
-      "resolved": "https://registry.npmjs.org/got/-/got-11.8.2.tgz",
-      "integrity": "sha512-D0QywKgIe30ODs+fm8wMZiAcZjypcCodPNuMz5H9Mny7RJ+IjJ10BdmGW7OM7fHXP+O7r6ZwapQ/YQmMSvB0UQ==",
+      "version": "11.8.5",
+      "resolved": "https://registry.npmjs.org/got/-/got-11.8.5.tgz",
+      "integrity": "sha512-o0Je4NvQObAuZPHLFoRSkdG2lTgtcynqymzg2Vupdx6PorhaT5MCbIyXG6d4D94kk8ZG57QeosgdiqfJWhEhlQ==",
       "requires": {
         "@sindresorhus/is": "^4.0.0",
         "@szmarczak/http-timer": "^4.0.5",
         "@types/cacheable-request": "^6.0.1",
         "@types/responselike": "^1.0.0",
         "cacheable-lookup": "^5.0.3",
-        "cacheable-request": "^7.0.1",
+        "cacheable-request": "^7.0.2",
         "decompress-response": "^6.0.0",
         "http2-wrapper": "^1.0.0-beta.5.2",
         "lowercase-keys": "^2.0.0",

From 51b21cd1e0873ba466ae54eab2c781646f9531a3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 23 Jun 2022 12:53:06 +0000
Subject: [PATCH 13/42] chore(deps): bump shell-quote from 1.7.2 to 1.7.3 in
 /packages/nc-plugin

Bumps [shell-quote](https://github.com/substack/node-shell-quote) from 1.7.2 to 1.7.3.
- [Release notes](https://github.com/substack/node-shell-quote/releases)
- [Changelog](https://github.com/substack/node-shell-quote/blob/master/CHANGELOG.md)
- [Commits](https://github.com/substack/node-shell-quote/compare/v1.7.2...1.7.3)

---
updated-dependencies:
- dependency-name: shell-quote
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 packages/nc-plugin/package-lock.json | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/nc-plugin/package-lock.json b/packages/nc-plugin/package-lock.json
index dfecb2107a..2fba7f3aba 100644
--- a/packages/nc-plugin/package-lock.json
+++ b/packages/nc-plugin/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "nc-plugin",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "nc-plugin",
-      "version": "0.1.1",
+      "version": "0.1.3",
       "license": "MIT",
       "dependencies": {
         "@bitauth/libauth": "^1.17.1",
@@ -10298,9 +10298,9 @@
       }
     },
     "node_modules/shell-quote": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.2.tgz",
-      "integrity": "sha512-mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg==",
+      "version": "1.7.3",
+      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.3.tgz",
+      "integrity": "sha512-Vpfqwm4EnqGdlsBFNmHhxhElJYrdfcxPThu+ryKS5J8L/fhAwLazFZtq+S+TWZ9ANj2piSQLGj6NQg+lKPmxrw==",
       "dev": true
     },
     "node_modules/shelljs": {
@@ -19881,9 +19881,9 @@
       "dev": true
     },
     "shell-quote": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.2.tgz",
-      "integrity": "sha512-mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg==",
+      "version": "1.7.3",
+      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.3.tgz",
+      "integrity": "sha512-Vpfqwm4EnqGdlsBFNmHhxhElJYrdfcxPThu+ryKS5J8L/fhAwLazFZtq+S+TWZ9ANj2piSQLGj6NQg+lKPmxrw==",
       "dev": true
     },
     "shelljs": {

From 6562693ca2e83c14d8d890c0726bf12949fbca30 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 23 Jun 2022 12:53:07 +0000
Subject: [PATCH 14/42] chore(deps): bump shell-quote from 1.7.2 to 1.7.3 in
 /packages/noco-docs

Bumps [shell-quote](https://github.com/substack/node-shell-quote) from 1.7.2 to 1.7.3.
- [Release notes](https://github.com/substack/node-shell-quote/releases)
- [Changelog](https://github.com/substack/node-shell-quote/blob/master/CHANGELOG.md)
- [Commits](https://github.com/substack/node-shell-quote/compare/v1.7.2...1.7.3)

---
updated-dependencies:
- dependency-name: shell-quote
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 packages/noco-docs/package-lock.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/noco-docs/package-lock.json b/packages/noco-docs/package-lock.json
index 6647d34ac9..5099ceb9de 100644
--- a/packages/noco-docs/package-lock.json
+++ b/packages/noco-docs/package-lock.json
@@ -13804,9 +13804,9 @@
       }
     },
     "node_modules/shell-quote": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.2.tgz",
-      "integrity": "sha512-mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg=="
+      "version": "1.7.3",
+      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.3.tgz",
+      "integrity": "sha512-Vpfqwm4EnqGdlsBFNmHhxhElJYrdfcxPThu+ryKS5J8L/fhAwLazFZtq+S+TWZ9ANj2piSQLGj6NQg+lKPmxrw=="
     },
     "node_modules/side-channel": {
       "version": "1.0.4",
@@ -27611,9 +27611,9 @@
       "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="
     },
     "shell-quote": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.2.tgz",
-      "integrity": "sha512-mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg=="
+      "version": "1.7.3",
+      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.3.tgz",
+      "integrity": "sha512-Vpfqwm4EnqGdlsBFNmHhxhElJYrdfcxPThu+ryKS5J8L/fhAwLazFZtq+S+TWZ9ANj2piSQLGj6NQg+lKPmxrw=="
     },
     "side-channel": {
       "version": "1.0.4",

From d13e9c90acb0c9f96aa75d1db8883c848e6c0bc2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 23 Jun 2022 12:53:07 +0000
Subject: [PATCH 15/42] chore(deps): bump got from 11.8.2 to 11.8.5 in
 /packages/noco-docs-prev

Bumps [got](https://github.com/sindresorhus/got) from 11.8.2 to 11.8.5.
- [Release notes](https://github.com/sindresorhus/got/releases)
- [Commits](https://github.com/sindresorhus/got/compare/v11.8.2...v11.8.5)

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

Signed-off-by: dependabot[bot] <support@github.com>
---
 packages/noco-docs-prev/package-lock.json | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/noco-docs-prev/package-lock.json b/packages/noco-docs-prev/package-lock.json
index 0b4965758b..4059ee8ca9 100644
--- a/packages/noco-docs-prev/package-lock.json
+++ b/packages/noco-docs-prev/package-lock.json
@@ -7390,16 +7390,16 @@
       }
     },
     "node_modules/got": {
-      "version": "11.8.2",
-      "resolved": "https://registry.npmjs.org/got/-/got-11.8.2.tgz",
-      "integrity": "sha512-D0QywKgIe30ODs+fm8wMZiAcZjypcCodPNuMz5H9Mny7RJ+IjJ10BdmGW7OM7fHXP+O7r6ZwapQ/YQmMSvB0UQ==",
+      "version": "11.8.5",
+      "resolved": "https://registry.npmjs.org/got/-/got-11.8.5.tgz",
+      "integrity": "sha512-o0Je4NvQObAuZPHLFoRSkdG2lTgtcynqymzg2Vupdx6PorhaT5MCbIyXG6d4D94kk8ZG57QeosgdiqfJWhEhlQ==",
       "dependencies": {
         "@sindresorhus/is": "^4.0.0",
         "@szmarczak/http-timer": "^4.0.5",
         "@types/cacheable-request": "^6.0.1",
         "@types/responselike": "^1.0.0",
         "cacheable-lookup": "^5.0.3",
-        "cacheable-request": "^7.0.1",
+        "cacheable-request": "^7.0.2",
         "decompress-response": "^6.0.0",
         "http2-wrapper": "^1.0.0-beta.5.2",
         "lowercase-keys": "^2.0.0",
@@ -22650,16 +22650,16 @@
       }
     },
     "got": {
-      "version": "11.8.2",
-      "resolved": "https://registry.npmjs.org/got/-/got-11.8.2.tgz",
-      "integrity": "sha512-D0QywKgIe30ODs+fm8wMZiAcZjypcCodPNuMz5H9Mny7RJ+IjJ10BdmGW7OM7fHXP+O7r6ZwapQ/YQmMSvB0UQ==",
+      "version": "11.8.5",
+      "resolved": "https://registry.npmjs.org/got/-/got-11.8.5.tgz",
+      "integrity": "sha512-o0Je4NvQObAuZPHLFoRSkdG2lTgtcynqymzg2Vupdx6PorhaT5MCbIyXG6d4D94kk8ZG57QeosgdiqfJWhEhlQ==",
       "requires": {
         "@sindresorhus/is": "^4.0.0",
         "@szmarczak/http-timer": "^4.0.5",
         "@types/cacheable-request": "^6.0.1",
         "@types/responselike": "^1.0.0",
         "cacheable-lookup": "^5.0.3",
-        "cacheable-request": "^7.0.1",
+        "cacheable-request": "^7.0.2",
         "decompress-response": "^6.0.0",
         "http2-wrapper": "^1.0.0-beta.5.2",
         "lowercase-keys": "^2.0.0",

From e09434939e37870cedb70889368dd3a8a430c67b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 23 Jun 2022 12:53:07 +0000
Subject: [PATCH 16/42] chore(deps): bump shell-quote in
 /packages/noco-docs-prev

Bumps [shell-quote](https://github.com/substack/node-shell-quote) from 1.7.2 to 1.7.3.
- [Release notes](https://github.com/substack/node-shell-quote/releases)
- [Changelog](https://github.com/substack/node-shell-quote/blob/master/CHANGELOG.md)
- [Commits](https://github.com/substack/node-shell-quote/compare/v1.7.2...1.7.3)

---
updated-dependencies:
- dependency-name: shell-quote
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 packages/noco-docs-prev/package-lock.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/noco-docs-prev/package-lock.json b/packages/noco-docs-prev/package-lock.json
index 0b4965758b..5883b373c3 100644
--- a/packages/noco-docs-prev/package-lock.json
+++ b/packages/noco-docs-prev/package-lock.json
@@ -13804,9 +13804,9 @@
       }
     },
     "node_modules/shell-quote": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.2.tgz",
-      "integrity": "sha512-mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg=="
+      "version": "1.7.3",
+      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.3.tgz",
+      "integrity": "sha512-Vpfqwm4EnqGdlsBFNmHhxhElJYrdfcxPThu+ryKS5J8L/fhAwLazFZtq+S+TWZ9ANj2piSQLGj6NQg+lKPmxrw=="
     },
     "node_modules/side-channel": {
       "version": "1.0.4",
@@ -27611,9 +27611,9 @@
       "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="
     },
     "shell-quote": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.2.tgz",
-      "integrity": "sha512-mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg=="
+      "version": "1.7.3",
+      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.3.tgz",
+      "integrity": "sha512-Vpfqwm4EnqGdlsBFNmHhxhElJYrdfcxPThu+ryKS5J8L/fhAwLazFZtq+S+TWZ9ANj2piSQLGj6NQg+lKPmxrw=="
     },
     "side-channel": {
       "version": "1.0.4",

From f97f2abe1611d11fb03d6ebec9e4ddecec93d1fa Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 23 Jun 2022 12:53:24 +0000
Subject: [PATCH 17/42] chore(deps): bump shell-quote from 1.7.2 to 1.7.3 in
 /packages/noco-i18n

Bumps [shell-quote](https://github.com/substack/node-shell-quote) from 1.7.2 to 1.7.3.
- [Release notes](https://github.com/substack/node-shell-quote/releases)
- [Changelog](https://github.com/substack/node-shell-quote/blob/master/CHANGELOG.md)
- [Commits](https://github.com/substack/node-shell-quote/compare/v1.7.2...1.7.3)

---
updated-dependencies:
- dependency-name: shell-quote
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 packages/noco-i18n/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/noco-i18n/package-lock.json b/packages/noco-i18n/package-lock.json
index 0534c88b81..db60a0be16 100644
--- a/packages/noco-i18n/package-lock.json
+++ b/packages/noco-i18n/package-lock.json
@@ -9793,9 +9793,9 @@
       "dev": true
     },
     "shell-quote": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.2.tgz",
-      "integrity": "sha512-mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg==",
+      "version": "1.7.3",
+      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.3.tgz",
+      "integrity": "sha512-Vpfqwm4EnqGdlsBFNmHhxhElJYrdfcxPThu+ryKS5J8L/fhAwLazFZtq+S+TWZ9ANj2piSQLGj6NQg+lKPmxrw==",
       "dev": true
     },
     "side-channel": {

From 054497673080d8cb372d4e96dfc35857f99c51c1 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Thu, 23 Jun 2022 11:13:50 +0530
Subject: [PATCH 18/42] fix: json import - correction in file upload

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../nc-gui/components/import/JSONImport.vue   | 144 ++++++++----------
 1 file changed, 67 insertions(+), 77 deletions(-)

diff --git a/packages/nc-gui/components/import/JSONImport.vue b/packages/nc-gui/components/import/JSONImport.vue
index 9e0f34075d..a096f92fc0 100644
--- a/packages/nc-gui/components/import/JSONImport.vue
+++ b/packages/nc-gui/components/import/JSONImport.vue
@@ -9,54 +9,54 @@
             </v-icon>
             <span class="caption text-capitalize">Upload</span>
           </v-tab>
-          <v-tab>
-            <!--            <v-icon small class="mr-1">
+          <!--          <v-tab>-->
+          <!--            <v-icon small class="mr-1">
               mdi-link-variant
             </v-icon>
             <span class="caption text-capitalize">URL</span>
           </v-tab>-->
-            <v-tab>
-              <v-icon small class="mr-1">
-                mdi-link-variant
-              </v-icon>
-              <span class="caption text-capitalize">String</span>
-            </v-tab>
-
-            <v-tab-item>
-              <div class="nc-json-import-tab-item ">
-                <div
-                  class="nc-droppable d-flex align-center justify-center flex-column"
-                  :style="{
-                    background : dragOver ? '#7772' : ''
-                  }"
-                  @click="$refs.file.click()"
-                  @drop.prevent="dropHandler"
-                  @dragover.prevent="dragOver = true"
-                  @dragenter.prevent="dragOver = true"
-                  @dragexit="dragOver = false"
-                  @dragleave="dragOver = false"
-                  @dragend="dragOver = false"
-                >
-                  <x-icon :color="['primary','grey']" size="50">
-                    mdi-file-plus-outline
-                  </x-icon>
-                  <p class="title  mb-1 mt-2">
-                    <!-- Select File to Upload-->
-                    {{ $t('msg.info.upload') }}
-                  </p>
-                  <p class="grey--text mb-1">
-                    <!-- or drag and drop file-->
-                    {{ $t('msg.info.upload_sub') }}
-                  </p>
-
-                  <p v-if="quickImportType == 'excel'" class="caption grey--text">
-                    <!-- Supported: .xls, .xlsx, .xlsm, .ods, .ots -->
-                    {{ $t('msg.info.excelSupport') }}
-                  </p>
-                </div>
+          <v-tab>
+            <v-icon small class="mr-1">
+              mdi-link-variant
+            </v-icon>
+            <span class="caption text-capitalize">String</span>
+          </v-tab>
+
+          <v-tab-item>
+            <div class="nc-json-import-tab-item ">
+              <div
+                class="nc-droppable d-flex align-center justify-center flex-column"
+                :style="{
+                  background : dragOver ? '#7772' : ''
+                }"
+                @click="$refs.file.click()"
+                @drop.prevent="dropHandler"
+                @dragover.prevent="dragOver = true"
+                @dragenter.prevent="dragOver = true"
+                @dragexit="dragOver = false"
+                @dragleave="dragOver = false"
+                @dragend="dragOver = false"
+              >
+                <x-icon :color="['primary','grey']" size="50">
+                  mdi-file-plus-outline
+                </x-icon>
+                <p class="title  mb-1 mt-2">
+                  <!-- Select File to Upload-->
+                  {{ $t('msg.info.upload') }}
+                </p>
+                <p class="grey--text mb-1">
+                  <!-- or drag and drop file-->
+                  {{ $t('msg.info.upload_sub') }}
+                </p>
+
+                <p v-if="quickImportType == 'excel'" class="caption grey--text">
+                  <!-- Supported: .xls, .xlsx, .xlsm, .ods, .ots -->
+                  {{ $t('msg.info.excelSupport') }}
+                </p>
               </div>
-            </v-tab-item>
-            <!--          <v-tab-item>
+            </div>
+          </v-tab-item>
+          <!--          <v-tab-item>
             <div class="nc-json-import-tab-item align-center">
               <div class="pa-4 d-100 h-100">
                 <v-form ref="form" v-model="valid">
@@ -85,33 +85,32 @@
               </div>
             </div>
           </v-tab-item>-->
-            <v-tab-item>
-              <div class="nc-json-import-tab-item align-center">
-                <div class="pa-4 d-100 h-100">
-                  <v-form ref="form" v-model="valid">
-                    <div class="nc-json-editor-wrapper">
-                      <v-btn small class="nc-json-format-btn" @click="formatJson">
-                        Format
-                      </v-btn>
+          <v-tab-item>
+            <div class="nc-json-import-tab-item align-center">
+              <div class="pa-4 d-100 h-100">
+                <v-form ref="form" v-model="valid">
+                  <div class="nc-json-editor-wrapper">
+                    <v-btn small class="nc-json-format-btn" @click="formatJson">
+                      Format
+                    </v-btn>
 
-                      <!--label="Enter excel file url"-->
-                      <monaco-json-editor
-                        ref="editor"
-                        v-model="jsonString"
-                        style="height:320px"
-                      />
-                      <div class="text-center mt-4">
-                        <v-btn v-t="['c:project:create:excel:load-url']" class="ml-3" color="primary" @click="loadJsonString">
-                          <!--Load-->
-                          {{ $t('general.load') }}
-                        </v-btn>
-                      </div>
+                    <!--label="Enter excel file url"-->
+                    <monaco-json-editor
+                      ref="editor"
+                      v-model="jsonString"
+                      style="height:320px"
+                    />
+                    <div class="text-center mt-4">
+                      <v-btn v-t="['c:project:create:excel:load-url']" class="ml-3" color="primary" @click="loadJsonString">
+                        <!--Load-->
+                        {{ $t('general.load') }}
+                      </v-btn>
                     </div>
-                  </v-form>
-                </div>
+                  </div>
+                </v-form>
               </div>
-            </v-tab-item>
-          </v-tab>
+            </div>
+          </v-tab-item>
         </v-tabs>
 
         <div class="px-4 pb-2">
@@ -166,15 +165,6 @@
     <v-tooltip bottom>
       <template #activator="{on}">
         <input
-          v-if="quickImportType == 'excel'"
-          ref="file"
-          class="nc-json-import-input"
-          type="file"
-          style="display: none"
-          @change="_change($event)"
-        >
-        <input
-          v-if="quickImportType == 'csv'"
           ref="file"
           class="nc-json-import-input"
           type="file"
@@ -341,7 +331,7 @@ export default {
         console.log('error', e)
         this.$store.commit('loader/MutClear')
       }
-      reader.readAsArrayBuffer(file)
+      reader.readAsText(file)
     },
 
     async parseAndExtractData(type, val, name) {

From b904f57350c2d3fb32788ecfa58d44f03285540e Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Thu, 23 Jun 2022 19:37:53 +0530
Subject: [PATCH 19/42] fix: handle null/undefined

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../nc-gui/components/import/JSONImport.vue   | 26 ++++++++++++++++++-
 .../import/templateParsers/parserHelpers.js   |  4 +--
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/packages/nc-gui/components/import/JSONImport.vue b/packages/nc-gui/components/import/JSONImport.vue
index a096f92fc0..89fa9cddfb 100644
--- a/packages/nc-gui/components/import/JSONImport.vue
+++ b/packages/nc-gui/components/import/JSONImport.vue
@@ -143,7 +143,31 @@
               hide-details
             >
               <template #label>
-                <span class="caption">Normalize nested</span>
+                <span class="caption">Flatten nested</span>
+                <v-tooltip bottom position-y="">
+                  <template #activator="{ on }">
+                    <v-icon small class="ml-1" v-on="on">
+                      mdi-information-outline
+                    </v-icon>
+                  </template>
+                  <div class="caption" style="width: 260px">
+                    If flatten nested option is set it will flatten nested object as root level property. In normal case nested object will treat as JSON column.
+                    <br>
+                    <br>
+                    For example the following input: <code class="caption font-weight-bold">{
+                      "prop1": {
+                      "prop2": "value"
+                      },
+                      "prop3": "value",
+                      "prop4": 1
+                      }</code> will treat as:
+                    <code class="caption font-weight-bold">{
+                      "prop1_prop2": "value",
+                      "prop3": "value",
+                      "prop4": 1
+                      }</code>
+                  </div>
+                </v-tooltip>
               </template>
             </v-checkbox>
             <v-checkbox
diff --git a/packages/nc-gui/components/import/templateParsers/parserHelpers.js b/packages/nc-gui/components/import/templateParsers/parserHelpers.js
index 4d1c70ff1f..43156d3bea 100644
--- a/packages/nc-gui/components/import/templateParsers/parserHelpers.js
+++ b/packages/nc-gui/components/import/templateParsers/parserHelpers.js
@@ -51,7 +51,7 @@ export const isMultiLineTextType = (values, col = null) => {
 
 export const extractMultiOrSingleSelectProps = (colData) => {
   const colProps = {}
-  if (colData.some(v => v && v.toString().includes(','))) {
+  if (colData.some(v => v && (v || '').toString().includes(','))) {
     let flattenedVals = colData.flatMap(v => v ? v.toString().trim().split(/\s*,\s*/) : [])
     const uniqueVals = flattenedVals = flattenedVals
       .filter((v, i, arr) => i === arr.findIndex(v1 => v.toLowerCase() === v1.toLowerCase()))
@@ -60,7 +60,7 @@ export const extractMultiOrSingleSelectProps = (colData) => {
       colProps.dtxp = `'${uniqueVals.join("','")}'`
     }
   } else {
-    const uniqueVals = colData.map(v => v.toString().trim()).filter((v, i, arr) => i === arr.findIndex(v1 => v.toLowerCase() === v1.toLowerCase()))
+    const uniqueVals = colData.map(v => (v || '').toString().trim()).filter((v, i, arr) => i === arr.findIndex(v1 => v.toLowerCase() === v1.toLowerCase()))
     if (colData.length > uniqueVals.length && uniqueVals.length <= Math.ceil(colData.length / 2)) {
       colProps.uidt = UITypes.SingleSelect
       colProps.dtxp = `'${uniqueVals.join("','")}'`

From bcd3c9ee502c17feb03527b091a4e01da342dbbe Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Thu, 16 Jun 2022 17:14:18 +0530
Subject: [PATCH 20/42] fix: invalidate token if admin email or password
 changed

- Invalidate old token if admin email changed in env
- Invalidate token if password updated in env
- Avoid unnecessary update if both email and passwords are same

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../lib/meta/api/userApi/initAdminFromEnv.ts  | 33 ++++++++++++-------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/packages/nocodb/src/lib/meta/api/userApi/initAdminFromEnv.ts b/packages/nocodb/src/lib/meta/api/userApi/initAdminFromEnv.ts
index 81885ed12d..5f32fefcee 100644
--- a/packages/nocodb/src/lib/meta/api/userApi/initAdminFromEnv.ts
+++ b/packages/nocodb/src/lib/meta/api/userApi/initAdminFromEnv.ts
@@ -169,7 +169,8 @@ export default async function initAdminFromEnv(_ncMeta = Noco.ncMeta) {
                 salt,
                 email,
                 password,
-                email_verification_token
+                email_verification_token,
+                token_version: null
               },
               ncMeta
             );
@@ -181,22 +182,32 @@ export default async function initAdminFromEnv(_ncMeta = Noco.ncMeta) {
                 salt,
                 email,
                 password,
-                email_verification_token
+                email_verification_token,
+                token_version: null
               },
               ncMeta
             );
           }
         } else {
-          // if email's are not different update the password and hash
-          await User.update(
-            superUser.id,
-            {
-              salt,
-              password,
-              email_verification_token
-            },
-            ncMeta
+          const newPasswordHash = await promisify(bcrypt.hash)(
+            process.env.NC_ADMIN_PASSWORD,
+            superUser.hash
           );
+
+          if (newPasswordHash !== superUser.password) {
+            // if email's are same and passwords are different
+            // then update the password and token version
+            await User.update(
+              superUser.id,
+              {
+                salt,
+                password,
+                email_verification_token,
+                token_version: null
+              },
+              ncMeta
+            );
+          }
         }
       }
       await ncMeta.commit();

From 09ae21b799e2f605a008f341308150e4e0272ea0 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Thu, 16 Jun 2022 23:22:31 +0530
Subject: [PATCH 21/42] fix: property name correction

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nocodb/src/lib/meta/api/userApi/initAdminFromEnv.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nocodb/src/lib/meta/api/userApi/initAdminFromEnv.ts b/packages/nocodb/src/lib/meta/api/userApi/initAdminFromEnv.ts
index 5f32fefcee..cc173cb00d 100644
--- a/packages/nocodb/src/lib/meta/api/userApi/initAdminFromEnv.ts
+++ b/packages/nocodb/src/lib/meta/api/userApi/initAdminFromEnv.ts
@@ -191,7 +191,7 @@ export default async function initAdminFromEnv(_ncMeta = Noco.ncMeta) {
         } else {
           const newPasswordHash = await promisify(bcrypt.hash)(
             process.env.NC_ADMIN_PASSWORD,
-            superUser.hash
+            superUser.salt
           );
 
           if (newPasswordHash !== superUser.password) {

From 5d4535d046a3e43cc4190310075acc0bf489ee5f Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Thu, 16 Jun 2022 23:28:16 +0530
Subject: [PATCH 22/42] fix: on adimn password/email update(env based)
 invalidate refresh token

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../nocodb/src/lib/meta/api/userApi/initAdminFromEnv.ts  | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/packages/nocodb/src/lib/meta/api/userApi/initAdminFromEnv.ts b/packages/nocodb/src/lib/meta/api/userApi/initAdminFromEnv.ts
index cc173cb00d..fd77676a46 100644
--- a/packages/nocodb/src/lib/meta/api/userApi/initAdminFromEnv.ts
+++ b/packages/nocodb/src/lib/meta/api/userApi/initAdminFromEnv.ts
@@ -170,7 +170,8 @@ export default async function initAdminFromEnv(_ncMeta = Noco.ncMeta) {
                 email,
                 password,
                 email_verification_token,
-                token_version: null
+                token_version: null,
+                refresh_token: null
               },
               ncMeta
             );
@@ -183,7 +184,8 @@ export default async function initAdminFromEnv(_ncMeta = Noco.ncMeta) {
                 email,
                 password,
                 email_verification_token,
-                token_version: null
+                token_version: null,
+                refresh_token: null
               },
               ncMeta
             );
@@ -203,7 +205,8 @@ export default async function initAdminFromEnv(_ncMeta = Noco.ncMeta) {
                 salt,
                 password,
                 email_verification_token,
-                token_version: null
+                token_version: null,
+                refresh_token: null
               },
               ncMeta
             );

From e76daa8f81e6821995e789430a05287feef36ec7 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Sat, 18 Jun 2022 11:46:33 +0530
Subject: [PATCH 23/42] fix: ensure user exist and add missing await

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

diff --git a/packages/nocodb/src/lib/meta/api/userApi/initAdminFromEnv.ts b/packages/nocodb/src/lib/meta/api/userApi/initAdminFromEnv.ts
index fd77676a46..3fca9a2afa 100644
--- a/packages/nocodb/src/lib/meta/api/userApi/initAdminFromEnv.ts
+++ b/packages/nocodb/src/lib/meta/api/userApi/initAdminFromEnv.ts
@@ -103,7 +103,7 @@ export default async function initAdminFromEnv(_ncMeta = Noco.ncMeta) {
           // check user account already present with the new admin email
           const existingUserWithNewEmail = await User.getByEmail(email, ncMeta);
 
-          if (existingUserWithNewEmail) {
+          if (existingUserWithNewEmail?.id) {
             // get all project access belongs to the existing account
             // and migrate to the admin account
             const existingUserProjects = await ncMeta.metaList2(
@@ -155,7 +155,7 @@ export default async function initAdminFromEnv(_ncMeta = Noco.ncMeta) {
             }
 
             // delete existing user
-            ncMeta.metaDelete(
+            await ncMeta.metaDelete(
               null,
               null,
               MetaTable.USERS,

From 20bba310a84c0477d83aac7eedbc52a9368ece07 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Thu, 23 Jun 2022 22:37:31 +0530
Subject: [PATCH 24/42] fix: clear user cache after removing user account

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../lib/meta/api/userApi/initAdminFromEnv.ts   | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/packages/nocodb/src/lib/meta/api/userApi/initAdminFromEnv.ts b/packages/nocodb/src/lib/meta/api/userApi/initAdminFromEnv.ts
index 3fca9a2afa..00ff47f196 100644
--- a/packages/nocodb/src/lib/meta/api/userApi/initAdminFromEnv.ts
+++ b/packages/nocodb/src/lib/meta/api/userApi/initAdminFromEnv.ts
@@ -5,10 +5,11 @@ import { Tele } from 'nc-help';
 
 import bcrypt from 'bcryptjs';
 import Noco from '../../../Noco';
-import { MetaTable } from '../../../utils/globals';
+import { CacheScope, MetaTable } from '../../../utils/globals';
 import ProjectUser from '../../../models/ProjectUser';
 import { validatePassword } from 'nocodb-sdk';
 import boxen from 'boxen';
+import NocoCache from '../../../cache/NocoCache';
 
 const { isEmail } = require('validator');
 const rolesLevel = { owner: 0, creator: 1, editor: 2, commenter: 3, viewer: 4 };
@@ -162,6 +163,21 @@ export default async function initAdminFromEnv(_ncMeta = Noco.ncMeta) {
               existingUserWithNewEmail.id
             );
 
+            // clear cache
+            await NocoCache.delAll(
+              CacheScope.USER,
+              `${existingUserWithNewEmail.email}___*`
+            );
+            await NocoCache.del(
+              `${CacheScope.USER}:${existingUserWithNewEmail.id}`
+            );
+            await NocoCache.del(
+              `${CacheScope.USER}:${existingUserWithNewEmail.email}`
+            );
+            await NocoCache.del(
+              `${CacheScope.USER}:${existingUserWithNewEmail.email}`
+            );
+
             // Update email and password of super admin account
             await User.update(
               superUser.id,

From 11861b678066a524cc84c6e381a42fc61b2d0b50 Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Fri, 24 Jun 2022 20:06:55 +0530
Subject: [PATCH 25/42] feat: support view import

Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com>
---
 .../nc-gui/components/import/ImportFromAirtable.vue   | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/components/import/ImportFromAirtable.vue b/packages/nc-gui/components/import/ImportFromAirtable.vue
index d22031d35f..4f04064384 100644
--- a/packages/nc-gui/components/import/ImportFromAirtable.vue
+++ b/packages/nc-gui/components/import/ImportFromAirtable.vue
@@ -107,6 +107,13 @@
                         hide-details
                         dense
                       />
+                      <v-checkbox
+                        v-model="syncSource.details.options.syncViews"
+                        class="caption"
+                        label="Import Secondary Views"
+                        hide-details
+                        dense
+                      />
                       <v-tooltip bottom>
                         <template #activator="{ on }">
                           <div v-on="on">
@@ -225,7 +232,7 @@ export default {
         apiKey: '',
         shareId: '',
         options: {
-          syncViews: false,
+          syncViews: true,
           syncData: true,
           syncRollup: false,
           syncLookup: true,
@@ -327,7 +334,7 @@ export default {
             apiKey: '',
             shareId: '',
             options: {
-              syncViews: false,
+              syncViews: true,
               syncData: true,
               syncRollup: false,
               syncLookup: true,

From a9d756669ae52a87081730e400a54f9b88e9ab53 Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Fri, 24 Jun 2022 20:11:50 +0530
Subject: [PATCH 26/42] refactor: reorder menu items

Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com>
---
 .../components/import/ImportFromAirtable.vue       | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/nc-gui/components/import/ImportFromAirtable.vue b/packages/nc-gui/components/import/ImportFromAirtable.vue
index 4f04064384..845947a760 100644
--- a/packages/nc-gui/components/import/ImportFromAirtable.vue
+++ b/packages/nc-gui/components/import/ImportFromAirtable.vue
@@ -86,6 +86,13 @@
                         hide-details
                         dense
                       />
+                      <v-checkbox
+                        v-model="syncSource.details.options.syncViews"
+                        class="caption"
+                        label="Import Secondary Views"
+                        hide-details
+                        dense
+                      />
                       <v-checkbox
                         v-model="syncSource.details.options.syncRollup"
                         class="caption"
@@ -107,13 +114,6 @@
                         hide-details
                         dense
                       />
-                      <v-checkbox
-                        v-model="syncSource.details.options.syncViews"
-                        class="caption"
-                        label="Import Secondary Views"
-                        hide-details
-                        dense
-                      />
                       <v-tooltip bottom>
                         <template #activator="{ on }">
                           <div v-on="on">

From c9bf931dd954b18a10c20092e494450e0e9efa67 Mon Sep 17 00:00:00 2001
From: mertmit <mertmit99@gmail.com>
Date: Fri, 24 Jun 2022 19:46:04 +0300
Subject: [PATCH 27/42] fix: token_version null handling

Signed-off-by: mertmit <mertmit99@gmail.com>
---
 .../nocodb/src/lib/meta/api/userApi/initAdminFromEnv.ts   | 5 +----
 .../nocodb/src/lib/meta/api/userApi/initStrategies.ts     | 8 ++++----
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/packages/nocodb/src/lib/meta/api/userApi/initAdminFromEnv.ts b/packages/nocodb/src/lib/meta/api/userApi/initAdminFromEnv.ts
index 00ff47f196..86a1a30e9a 100644
--- a/packages/nocodb/src/lib/meta/api/userApi/initAdminFromEnv.ts
+++ b/packages/nocodb/src/lib/meta/api/userApi/initAdminFromEnv.ts
@@ -174,10 +174,7 @@ export default async function initAdminFromEnv(_ncMeta = Noco.ncMeta) {
             await NocoCache.del(
               `${CacheScope.USER}:${existingUserWithNewEmail.email}`
             );
-            await NocoCache.del(
-              `${CacheScope.USER}:${existingUserWithNewEmail.email}`
-            );
-
+            
             // Update email and password of super admin account
             await User.update(
               superUser.id,
diff --git a/packages/nocodb/src/lib/meta/api/userApi/initStrategies.ts b/packages/nocodb/src/lib/meta/api/userApi/initStrategies.ts
index e6c99869ac..b7d8599f7a 100644
--- a/packages/nocodb/src/lib/meta/api/userApi/initStrategies.ts
+++ b/packages/nocodb/src/lib/meta/api/userApi/initStrategies.ts
@@ -103,8 +103,8 @@ export function initStrategies(router): void {
 
         if (cachedVal) {
           if (
-            cachedVal.token_version &&
-            jwtPayload.token_version &&
+            !cachedVal.token_version ||
+            !jwtPayload.token_version ||
             cachedVal.token_version !== jwtPayload.token_version
           ) {
             return done(new Error('Token Expired. Please login again.'));
@@ -115,8 +115,8 @@ export function initStrategies(router): void {
         User.getByEmail(jwtPayload?.email)
           .then(async user => {
             if (
-              user.token_version &&
-              jwtPayload.token_version &&
+              !user.token_version ||
+              !jwtPayload.token_version ||
               user.token_version !== jwtPayload.token_version
             ) {
               return done(new Error('Token Expired. Please login again.'));

From eaaf4fd1017f83164cc603fa7ed8414484d4a777 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Sat, 25 Jun 2022 12:08:08 +0800
Subject: [PATCH 28/42] fix: update health & version url

---
 .../noco-docs/content/en/developer-resources/rest-apis.md | 4 ++--
 packages/nocodb-sdk/src/lib/Api.ts                        | 8 ++++----
 packages/nocodb/src/lib/meta/api/utilApis.ts              | 4 ++--
 scripts/sdk/swagger.json                                  | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

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 483d280d25..c062707e86 100644
--- a/packages/noco-docs/content/en/developer-resources/rest-apis.md
+++ b/packages/noco-docs/content/en/developer-resources/rest-apis.md
@@ -166,8 +166,8 @@ Currently, the default value for {orgs} is <b>noco</b>. Users will be able to ch
 | Meta | Delete| utils | cacheDelete | /api/v1/db/meta/cache |
 | Meta | Post | utils | testConnection | /api/v1/db/meta/projects/connection/test |
 | Meta | Get | utils | appInfo | /api/v1/db/meta/nocodb/info |
-| Meta | Get | utils | appVersion | /api/v1/db/meta/nocodb/version |
-| Meta | Get | utils | appHealth | /api/v1/db/meta/nocodb/health |
+| Meta | Get | utils | appVersion | /api/v1/version |
+| Meta | Get | utils | appHealth | /api/v1/health |
 
 ## Query params
 
diff --git a/packages/nocodb-sdk/src/lib/Api.ts b/packages/nocodb-sdk/src/lib/Api.ts
index be954c20bf..41a8a37c96 100644
--- a/packages/nocodb-sdk/src/lib/Api.ts
+++ b/packages/nocodb-sdk/src/lib/Api.ts
@@ -3197,12 +3197,12 @@ export class Api<
      *
      * @tags Utils
      * @name AppVersion
-     * @request GET:/api/v1/db/meta/nocodb/version
+     * @request GET:/api/v1/version
      * @response `200` `any` OK
      */
     appVersion: (params: RequestParams = {}) =>
       this.request<any, any>({
-        path: `/api/v1/db/meta/nocodb/version`,
+        path: `/api/v1/version`,
         method: 'GET',
         format: 'json',
         ...params,
@@ -3213,12 +3213,12 @@ export class Api<
      *
      * @tags Utils
      * @name AppHealth
-     * @request GET:/api/v1/db/meta/nocodb/health
+     * @request GET:/api/v1/health
      * @response `200` `any` OK
      */
     appHealth: (params: RequestParams = {}) =>
       this.request<any, any>({
-        path: `/api/v1/db/meta/nocodb/health`,
+        path: `/api/v1/health`,
         method: 'GET',
         format: 'json',
         ...params,
diff --git a/packages/nocodb/src/lib/meta/api/utilApis.ts b/packages/nocodb/src/lib/meta/api/utilApis.ts
index e49fc03988..ff04fb9d24 100644
--- a/packages/nocodb/src/lib/meta/api/utilApis.ts
+++ b/packages/nocodb/src/lib/meta/api/utilApis.ts
@@ -140,7 +140,7 @@ export default router => {
     ncMetaAclMw(testConnection, 'testConnection')
   );
   router.get('/api/v1/db/meta/nocodb/info', catchError(appInfo));
-  router.get('/api/v1/db/meta/nocodb/version', catchError(releaseVersion));
-  router.get('/api/v1/db/meta/nocodb/health', catchError(appHealth));
   router.post('/api/v1/db/meta/axiosRequestMake', catchError(axiosRequestMake));
+  router.get('/api/v1/version', catchError(releaseVersion));
+  router.get('/api/v1/health', catchError(appHealth));
 };
diff --git a/scripts/sdk/swagger.json b/scripts/sdk/swagger.json
index 5dabc2d321..cb5d576664 100644
--- a/scripts/sdk/swagger.json
+++ b/scripts/sdk/swagger.json
@@ -5107,7 +5107,7 @@
         ]
       }
     },
-    "/api/v1/db/meta/nocodb/version": {
+    "/api/v1/version": {
       "parameters": [],
       "get": {
         "summary": "",
@@ -5128,7 +5128,7 @@
         "description": ""
       }
     },
-    "/api/v1/db/meta/nocodb/health": {
+    "/api/v1/health": {
       "parameters": [],
       "get": {
         "summary": "",

From 762d7489c8c817b6d9f03381216cdb0ef5212d61 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Sat, 25 Jun 2022 11:58:23 +0530
Subject: [PATCH 29/42] feat: validate file extension

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nc-gui/components/import/JSONImport.vue | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/nc-gui/components/import/JSONImport.vue b/packages/nc-gui/components/import/JSONImport.vue
index 89fa9cddfb..36c5a28baa 100644
--- a/packages/nc-gui/components/import/JSONImport.vue
+++ b/packages/nc-gui/components/import/JSONImport.vue
@@ -193,6 +193,7 @@
           class="nc-json-import-input"
           type="file"
           style="display: none"
+          accept=".json"
           @change="_change($event)"
         >
         <v-btn
@@ -285,7 +286,8 @@ export default {
       filename: '',
       jsonString: '',
       errorMessages: {
-        ipBlockList: 'IP Not allowed!'
+        ipBlockList: 'IP Not allowed!',
+        importJSON: 'Target file is not an accepted file type. The accepted file type is .json!'
       }
     }
   },
@@ -406,6 +408,10 @@ export default {
         return
       }
 
+      if (!/.*\.json/.test(file.name)) {
+        return this.$toast.error(this.errorMessages.importJSON).goAway(3000)
+      }
+
       this._file(file)
     },
     dragOverHandler(ev) {

From 546f06a23c352a4e3c90514bf5bf22534d5d44b7 Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Sat, 25 Jun 2022 12:16:45 +0530
Subject: [PATCH 30/42] refactor: disable ludicrous mode option

Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com>
---
 packages/nc-gui/components/import/ImportFromAirtable.vue | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/packages/nc-gui/components/import/ImportFromAirtable.vue b/packages/nc-gui/components/import/ImportFromAirtable.vue
index 845947a760..a3264182a3 100644
--- a/packages/nc-gui/components/import/ImportFromAirtable.vue
+++ b/packages/nc-gui/components/import/ImportFromAirtable.vue
@@ -8,7 +8,6 @@
         <div
           v-t="['c:airtable-import:turbo-mode']"
           class="ml-2 mt-3 title pointer nc-btn-enable-turbo"
-          @click="enableTurbo"
         >
           🚀
         </div>
@@ -357,10 +356,10 @@ export default {
         this.$toast.error(await this._extractSdkResponseErrorMsg(e)).goAway(3000)
       }
     },
-    enableTurbo() {
-      this.$set(this.syncSource.details.options, 'syncViews', true)
-      this.$toast.success('🚀🚀 Ludicrous mode activated! Let\'s go! 🚀🚀').goAway(3000)
-    },
+    // enableTurbo() {
+    //   this.$set(this.syncSource.details.options, 'syncViews', true)
+    //   this.$toast.success('🚀🚀 Ludicrous mode activated! Let\'s go! 🚀🚀').goAway(3000)
+    // },
     migrateSync(src) {
       if (!src.details?.options) {
         src.details.options = {

From 1406677bd3de698ffb8c0ef512d7911d32341f27 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Sat, 25 Jun 2022 16:14:29 +0530
Subject: [PATCH 31/42] refactor: label update

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nc-gui/components/import/JSONImport.vue | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/packages/nc-gui/components/import/JSONImport.vue b/packages/nc-gui/components/import/JSONImport.vue
index 36c5a28baa..c9ce4c6b55 100644
--- a/packages/nc-gui/components/import/JSONImport.vue
+++ b/packages/nc-gui/components/import/JSONImport.vue
@@ -220,9 +220,8 @@
           <template #toolbar="{valid}">
             <h3 class="mt-2 grey--text">
               <span>
-                JSON
+                JSON Import
               </span>
-              : {{ templateData.title }}
             </h3>
             <v-spacer />
             <v-spacer />
@@ -367,13 +366,13 @@ export default {
         this.importData = null
         switch (type) {
           case 'file':
-            templateGenerator = new JSONTemplateAdapter('JSON', val, this.parserConfig)
+            templateGenerator = new JSONTemplateAdapter(name, val, this.parserConfig)
             break
           case 'url':
             templateGenerator = new JSONUrlTemplateAdapter(val, this.$store, this.parserConfig, this.$api)
             break
           case 'string':
-            templateGenerator = new JSONTemplateAdapter('JSON', val, this.parserConfig)
+            templateGenerator = new JSONTemplateAdapter(name, val, this.parserConfig)
             break
         }
         await templateGenerator.init()

From 4f2f9e413820140ed8d81751e0b526f0665719e8 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Sat, 25 Jun 2022 16:25:10 +0530
Subject: [PATCH 32/42] refactor: flatten json by default

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nc-gui/components/import/JSONImport.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nc-gui/components/import/JSONImport.vue b/packages/nc-gui/components/import/JSONImport.vue
index c9ce4c6b55..73c29de7dd 100644
--- a/packages/nc-gui/components/import/JSONImport.vue
+++ b/packages/nc-gui/components/import/JSONImport.vue
@@ -279,7 +279,7 @@ export default {
       showMore: false,
       parserConfig: {
         maxRowsToParse: 500,
-        normalizeNested: false,
+        normalizeNested: true,
         importData: true
       },
       filename: '',

From e15e729a31e28419e04ea0d742cc71063d0a3e4e Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Sat, 25 Jun 2022 17:30:42 +0530
Subject: [PATCH 33/42] fix: ManyToMany column naming

- Add suffix `List` instead of `MMList`
- Proper child table name
- Cypress test case corrections

re #2429

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nocodb/src/__tests__/restv2.test.ts         | 10 +++++-----
 packages/nocodb/src/lib/meta/api/columnApis.ts       |  4 ++--
 packages/nocodb/src/lib/meta/api/metaDiffApis.ts     |  4 ++--
 .../integration/common/2b_table_with_m2m_column.js   |  4 ++--
 .../cypress/integration/common/4f_grid_view_share.js | 12 ++++++------
 .../integration/common/4f_pg_grid_view_share.js      | 10 +++++-----
 6 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/packages/nocodb/src/__tests__/restv2.test.ts b/packages/nocodb/src/__tests__/restv2.test.ts
index 8030f98883..3458b25f9a 100644
--- a/packages/nocodb/src/__tests__/restv2.test.ts
+++ b/packages/nocodb/src/__tests__/restv2.test.ts
@@ -209,7 +209,7 @@ describe('Noco v2 Tests', () => {
           type: UITypes.Rollup,
           alias: 'filmCount',
           rollupColumn: 'FilmId',
-          relationColumn: 'FilmMMList',
+          relationColumn: 'FilmList',
           rollupFunction: 'count'
         }
       ];
@@ -413,7 +413,7 @@ describe('Noco v2 Tests', () => {
         type: UITypes.Lookup,
         alias: 'filmNames',
         lookupColumn: 'Title',
-        relationColumn: 'FilmMMList'
+        relationColumn: 'FilmList'
       };
       request(app)
         .post(`/nc/${projectId}/generate`)
@@ -1335,7 +1335,7 @@ describe('Noco v2 Tests', () => {
           type: UITypes.Lookup,
           alias: 'filmIds',
           lookupColumn: 'FilmId',
-          relationColumn: 'FilmMMList'
+          relationColumn: 'FilmList'
         },
         {
           table: 'actor',
@@ -1398,7 +1398,7 @@ describe('Noco v2 Tests', () => {
           type: UITypes.Rollup,
           alias: 'actorsCount',
           rollupColumn: 'ActorId',
-          relationColumn: 'ActorMMList',
+          relationColumn: 'ActorList',
           rollupFunction: 'count'
         },
         {
@@ -1406,7 +1406,7 @@ describe('Noco v2 Tests', () => {
           type: UITypes.Lookup,
           alias: 'actorsCountList',
           lookupColumn: 'actorsCount',
-          relationColumn: 'FilmMMList'
+          relationColumn: 'FilmList'
         },
         {
           table: 'actor',
diff --git a/packages/nocodb/src/lib/meta/api/columnApis.ts b/packages/nocodb/src/lib/meta/api/columnApis.ts
index e68aff846a..9be0e100fa 100644
--- a/packages/nocodb/src/lib/meta/api/columnApis.ts
+++ b/packages/nocodb/src/lib/meta/api/columnApis.ts
@@ -427,7 +427,7 @@ export async function columnAdd(req: Request, res: Response<TableType>) {
           await Column.insert({
             title: getUniqueColumnAliasName(
               await child.getColumns(),
-              `${child.title}MMList`
+              `${parent.title}List`
             ),
             uidt: UITypes.LinkToAnotherRecord,
             type: 'mm',
@@ -447,7 +447,7 @@ export async function columnAdd(req: Request, res: Response<TableType>) {
           await Column.insert({
             title: getUniqueColumnAliasName(
               await parent.getColumns(),
-              req.body.title ?? `${parent.title}MMList`
+              req.body.title ?? `${child.title}List`
             ),
 
             uidt: UITypes.LinkToAnotherRecord,
diff --git a/packages/nocodb/src/lib/meta/api/metaDiffApis.ts b/packages/nocodb/src/lib/meta/api/metaDiffApis.ts
index 9df02372a6..59e1ba70fb 100644
--- a/packages/nocodb/src/lib/meta/api/metaDiffApis.ts
+++ b/packages/nocodb/src/lib/meta/api/metaDiffApis.ts
@@ -785,7 +785,7 @@ export async function extractAndGenerateManyToManyRelations(
         await Column.insert<LinkToAnotherRecordColumn>({
           title: getUniqueColumnAliasName(
             modelA.columns,
-            `${modelB.title}MMList`
+            `${modelB.title}List`
           ),
           fk_model_id: modelA.id,
           fk_related_model_id: modelB.id,
@@ -803,7 +803,7 @@ export async function extractAndGenerateManyToManyRelations(
         await Column.insert<LinkToAnotherRecordColumn>({
           title: getUniqueColumnAliasName(
             modelB.columns,
-            `${modelA.title}MMList`
+            `${modelA.title}List`
           ),
           fk_model_id: modelB.id,
           fk_related_model_id: modelA.id,
diff --git a/scripts/cypress/integration/common/2b_table_with_m2m_column.js b/scripts/cypress/integration/common/2b_table_with_m2m_column.js
index c1d9a0f7d4..7b0b8ba148 100644
--- a/scripts/cypress/integration/common/2b_table_with_m2m_column.js
+++ b/scripts/cypress/integration/common/2b_table_with_m2m_column.js
@@ -23,10 +23,10 @@ export const genTest = (apiType, dbType) => {
 
         it("Expand m2m column", () => {
             // expand first row
-            cy.get('td[data-col="FilmMMList"] div', { timeout: 12000 })
+            cy.get('td[data-col="FilmList"] div', { timeout: 12000 })
                 .first()
                 .click({ force: true });
-            cy.get('td[data-col="FilmMMList"] div .mdi-arrow-expand')
+            cy.get('td[data-col="FilmList"] div .mdi-arrow-expand')
                 .first()
                 .click({ force: true });
 
diff --git a/scripts/cypress/integration/common/4f_grid_view_share.js b/scripts/cypress/integration/common/4f_grid_view_share.js
index 5c5bda992d..15ebf5f9a7 100644
--- a/scripts/cypress/integration/common/4f_grid_view_share.js
+++ b/scripts/cypress/integration/common/4f_grid_view_share.js
@@ -170,7 +170,7 @@ export const genTest = (apiType, dbType) => {
                 const verifyCsv = (retrievedRecords) => {
                     // expected output, statically configured
                     let storedRecords = [
-                        `Address,District,PostalCode,Phone,Location,CustomerList,StaffList,CityRead,StaffMMList`,
+                        `Address,District,PostalCode,Phone,Location,CustomerList,StaffList,CityRead,StaffList`,
                         `1013 Tabuk Boulevard,West Bengali,96203,158399646978,[object Object],2,,Kanchrapara,`,
                         `1892 Nabereznyje Telny Lane,Tutuila,28396,478229987054,[object Object],2,,Tafuna,`,
                         `1993 Tabuk Lane,Tamil Nadu,64221,648482415405,[object Object],2,,Tambaram,`,
@@ -231,7 +231,7 @@ export const genTest = (apiType, dbType) => {
                 const verifyCsv = (retrievedRecords) => {
                     // expected output, statically configured
                     let storedRecords = [
-                        `Address,District,PostalCode,Phone,Location,CustomerList,StaffList,CityRead,StaffMMList`,
+                        `Address,District,PostalCode,Phone,Location,CustomerList,StaffList,CityRead,StaffList`,
                         `1993 Tabuk Lane,Tamil Nadu,64221,648482415405,[object Object],2,,Tambaram,`,
                         `1661 Abha Drive,Tamil Nadu,14400,270456873752,[object Object],1,,Pudukkottai,`,
                     ];
@@ -270,7 +270,7 @@ export const genTest = (apiType, dbType) => {
                 cy.get('[data-col="CustomerList"]').should("exist");
                 cy.get('[data-col="StaffList"]').should("exist");
                 cy.get('[data-col="CityRead"]').should("exist");
-                cy.get('[data-col="StaffMMList"]').should("exist");
+                cy.get('[data-col="StaffList"]').should("exist");
 
                 // has many field validation
                 mainPage
@@ -327,17 +327,17 @@ export const genTest = (apiType, dbType) => {
             it(`Share GRID view : Virtual column validation > many to many`, () => {
                 // many-to-many field validation
                 mainPage
-                    .getCell("StaffMMList", 1)
+                    .getCell("StaffList", 1)
                     .click()
                     .find("button.mdi-close-thick")
                     .should("not.exist");
                 mainPage
-                    .getCell("StaffMMList", 1)
+                    .getCell("StaffList", 1)
                     .click()
                     .find("button.mdi-plus")
                     .should("not.exist");
                 mainPage
-                    .getCell("StaffMMList", 1)
+                    .getCell("StaffList", 1)
                     .click()
                     .find("button.mdi-arrow-expand")
                     .click();
diff --git a/scripts/cypress/integration/common/4f_pg_grid_view_share.js b/scripts/cypress/integration/common/4f_pg_grid_view_share.js
index 7e450dcbab..a53109f2f7 100644
--- a/scripts/cypress/integration/common/4f_pg_grid_view_share.js
+++ b/scripts/cypress/integration/common/4f_pg_grid_view_share.js
@@ -228,7 +228,7 @@ export const genTest = (apiType, dbType) => {
                 const verifyCsv = (retrievedRecords) => {
                     // expected output, statically configured
                     let storedRecords = [
-                        `Address,District,PostalCode,Phone,Location,CustomerList,StaffList,CityRead,StaffMMList`,
+                        `Address,District,PostalCode,Phone,Location,CustomerList,StaffList,CityRead,StaffList`,
                         `1888 Kabul Drive,,20936,,1,,Ife,,`,
                         `1661 Abha Drive,,14400,,1,,Pudukkottai,,`,
                     ];
@@ -265,7 +265,7 @@ export const genTest = (apiType, dbType) => {
                 cy.get('[data-col="CustomerList"]').should("exist");
                 cy.get('[data-col="StaffList"]').should("exist");
                 cy.get('[data-col="CityRead"]').should("exist");
-                cy.get('[data-col="StaffMMList"]').should("exist");
+                cy.get('[data-col="StaffList"]').should("exist");
 
                 // has many field validation
                 mainPage
@@ -322,17 +322,17 @@ export const genTest = (apiType, dbType) => {
             it(`Share GRID view : Virtual column validation > many to many`, () => {
                 // many-to-many field validation
                 mainPage
-                    .getCell("StaffMMList", 1)
+                    .getCell("StaffList", 1)
                     .click()
                     .find("button.mdi-close-thick")
                     .should("not.exist");
                 mainPage
-                    .getCell("StaffMMList", 1)
+                    .getCell("StaffList", 1)
                     .click()
                     .find("button.mdi-plus")
                     .should("not.exist");
                 mainPage
-                    .getCell("StaffMMList", 1)
+                    .getCell("StaffList", 1)
                     .click()
                     .find("button.mdi-arrow-expand")
                     .click();

From 2f5f1ef872449d6bf397aed9cdc00d3328750bff Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Sat, 25 Jun 2022 21:08:57 +0530
Subject: [PATCH 34/42] fix: update bt, hm and mm column names

- BT - `TableRead` => `Table`
- HM - `TableList` => `Table List`
- MM - `TableMMList` => `Table List`

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nocodb/src/__tests__/restv2.test.ts              | 8 ++++----
 packages/nocodb/src/lib/meta/api/columnApis.ts            | 8 ++++----
 packages/nocodb/src/lib/meta/api/metaDiffApis.ts          | 6 +++---
 packages/nocodb/src/lib/meta/api/projectApis.ts           | 4 ++--
 scripts/cypress/integration/common/1a_table_operations.js | 2 +-
 scripts/cypress/integration/common/1c_sql_view.js         | 4 ++--
 .../common/2a_table_with_belongs_to_colulmn.js            | 4 ++--
 .../integration/common/2b_table_with_m2m_column.js        | 4 ++--
 .../cypress/integration/common/4c_form_view_detailed.js   | 2 +-
 .../integration/common/4d_table_view_grid_locked.js       | 6 +++---
 scripts/cypress/integration/common/4e_form_view_share.js  | 2 +-
 scripts/cypress/integration/common/5a_user_role.js        | 2 +-
 scripts/cypress/integration/common/6b_downloadCsv.js      | 4 ++--
 scripts/cypress/integration/common/6f_attachments.js      | 2 +-
 14 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/packages/nocodb/src/__tests__/restv2.test.ts b/packages/nocodb/src/__tests__/restv2.test.ts
index 3458b25f9a..ffb6b97794 100644
--- a/packages/nocodb/src/__tests__/restv2.test.ts
+++ b/packages/nocodb/src/__tests__/restv2.test.ts
@@ -209,7 +209,7 @@ describe('Noco v2 Tests', () => {
           type: UITypes.Rollup,
           alias: 'filmCount',
           rollupColumn: 'FilmId',
-          relationColumn: 'FilmList',
+          relationColumn: 'Film List',
           rollupFunction: 'count'
         }
       ];
@@ -413,7 +413,7 @@ describe('Noco v2 Tests', () => {
         type: UITypes.Lookup,
         alias: 'filmNames',
         lookupColumn: 'Title',
-        relationColumn: 'FilmList'
+        relationColumn: 'Film List'
       };
       request(app)
         .post(`/nc/${projectId}/generate`)
@@ -1335,7 +1335,7 @@ describe('Noco v2 Tests', () => {
           type: UITypes.Lookup,
           alias: 'filmIds',
           lookupColumn: 'FilmId',
-          relationColumn: 'FilmList'
+          relationColumn: 'Film List'
         },
         {
           table: 'actor',
@@ -1406,7 +1406,7 @@ describe('Noco v2 Tests', () => {
           type: UITypes.Lookup,
           alias: 'actorsCountList',
           lookupColumn: 'actorsCount',
-          relationColumn: 'FilmList'
+          relationColumn: 'Film List'
         },
         {
           table: 'actor',
diff --git a/packages/nocodb/src/lib/meta/api/columnApis.ts b/packages/nocodb/src/lib/meta/api/columnApis.ts
index 9be0e100fa..ea3aa7c17b 100644
--- a/packages/nocodb/src/lib/meta/api/columnApis.ts
+++ b/packages/nocodb/src/lib/meta/api/columnApis.ts
@@ -57,7 +57,7 @@ async function createHmAndBtColumn(
   {
     const title = getUniqueColumnAliasName(
       await child.getColumns(),
-      type === 'bt' ? alias : `${parent.title}Read`
+      type === 'bt' ? alias : `${parent.title}`
     );
     await Column.insert<LinkToAnotherRecordColumn>({
       title,
@@ -79,7 +79,7 @@ async function createHmAndBtColumn(
   {
     const title = getUniqueColumnAliasName(
       await parent.getColumns(),
-      type === 'hm' ? alias : `${child.title}List`
+      type === 'hm' ? alias : `${child.title} List`
     );
     await Column.insert({
       title,
@@ -427,7 +427,7 @@ export async function columnAdd(req: Request, res: Response<TableType>) {
           await Column.insert({
             title: getUniqueColumnAliasName(
               await child.getColumns(),
-              `${parent.title}List`
+              `${parent.title} List`
             ),
             uidt: UITypes.LinkToAnotherRecord,
             type: 'mm',
@@ -447,7 +447,7 @@ export async function columnAdd(req: Request, res: Response<TableType>) {
           await Column.insert({
             title: getUniqueColumnAliasName(
               await parent.getColumns(),
-              req.body.title ?? `${child.title}List`
+              req.body.title ?? `${child.title} List`
             ),
 
             uidt: UITypes.LinkToAnotherRecord,
diff --git a/packages/nocodb/src/lib/meta/api/metaDiffApis.ts b/packages/nocodb/src/lib/meta/api/metaDiffApis.ts
index 59e1ba70fb..7729796b43 100644
--- a/packages/nocodb/src/lib/meta/api/metaDiffApis.ts
+++ b/packages/nocodb/src/lib/meta/api/metaDiffApis.ts
@@ -671,7 +671,7 @@ export async function metaDiffSync(req, res) {
               if (change.relationType === RelationTypes.BELONGS_TO) {
                 const title = getUniqueColumnAliasName(
                   childModel.columns,
-                  `${parentModel.title || parentModel.table_name}Read`
+                  `${parentModel.title || parentModel.table_name}`
                 );
                 await Column.insert<LinkToAnotherRecordColumn>({
                   uidt: UITypes.LinkToAnotherRecord,
@@ -785,7 +785,7 @@ export async function extractAndGenerateManyToManyRelations(
         await Column.insert<LinkToAnotherRecordColumn>({
           title: getUniqueColumnAliasName(
             modelA.columns,
-            `${modelB.title}List`
+            `${modelB.title} List`
           ),
           fk_model_id: modelA.id,
           fk_related_model_id: modelB.id,
@@ -803,7 +803,7 @@ export async function extractAndGenerateManyToManyRelations(
         await Column.insert<LinkToAnotherRecordColumn>({
           title: getUniqueColumnAliasName(
             modelB.columns,
-            `${modelA.title}List`
+            `${modelA.title} List`
           ),
           fk_model_id: modelB.id,
           fk_related_model_id: modelA.id,
diff --git a/packages/nocodb/src/lib/meta/api/projectApis.ts b/packages/nocodb/src/lib/meta/api/projectApis.ts
index 1e8899a04b..69cc6797e0 100644
--- a/packages/nocodb/src/lib/meta/api/projectApis.ts
+++ b/packages/nocodb/src/lib/meta/api/projectApis.ts
@@ -215,7 +215,7 @@ async function populateMeta(base: Base, project: Project): Promise<any> {
             uidt: UITypes.LinkToAnotherRecord,
             type: 'hm',
             hm,
-            title: `${hm.title}List`
+            title: `${hm.title} List`
           };
         }),
         ...belongsTo.map(bt => {
@@ -230,7 +230,7 @@ async function populateMeta(base: Base, project: Project): Promise<any> {
             uidt: UITypes.LinkToAnotherRecord,
             type: 'bt',
             bt,
-            title: `${bt.rtitle}Read`
+            title: `${bt.rtitle}`
           };
         })
       ];
diff --git a/scripts/cypress/integration/common/1a_table_operations.js b/scripts/cypress/integration/common/1a_table_operations.js
index ce208bbc05..c54d243f50 100644
--- a/scripts/cypress/integration/common/1a_table_operations.js
+++ b/scripts/cypress/integration/common/1a_table_operations.js
@@ -92,7 +92,7 @@ export const genTest = (apiType, dbType) => {
             cy.openTableTab("Country", 25);
 
             mainPage
-                .getCell("CityList", 1)
+                .getCell("City List", 1)
                 .find(".name")
                 .contains("Kabul")
                 .should("exist");
diff --git a/scripts/cypress/integration/common/1c_sql_view.js b/scripts/cypress/integration/common/1c_sql_view.js
index 2a39736847..a57d328da6 100644
--- a/scripts/cypress/integration/common/1c_sql_view.js
+++ b/scripts/cypress/integration/common/1c_sql_view.js
@@ -139,8 +139,8 @@ export const genTest = (apiType, dbType) => {
             cy.openViewsTab("CustomerList", 25);
             cy.closeViewsTab("CustomerList");
 
-            cy.openViewsTab("FilmList", 25);
-            cy.closeViewsTab("FilmList");
+            cy.openViewsTab("Film List", 25);
+            cy.closeViewsTab("Film List");
 
             cy.openViewsTab("SalesByFilmCategory", 16);
             cy.closeViewsTab("SalesByFilmCategory");
diff --git a/scripts/cypress/integration/common/2a_table_with_belongs_to_colulmn.js b/scripts/cypress/integration/common/2a_table_with_belongs_to_colulmn.js
index d8e046d6c1..8924e9ca8e 100644
--- a/scripts/cypress/integration/common/2a_table_with_belongs_to_colulmn.js
+++ b/scripts/cypress/integration/common/2a_table_with_belongs_to_colulmn.js
@@ -23,12 +23,12 @@ export const genTest = (apiType, dbType) => {
 
         it("Expand belongs-to column", () => {
             // expand first row
-            cy.get('td[data-col="CityList"] div:visible', {
+            cy.get('td[data-col="City List"] div:visible', {
                 timeout: 12000,
             })
                 .first()
                 .click();
-            cy.get('td[data-col="CityList"] div .mdi-arrow-expand:visible')
+            cy.get('td[data-col="City List"] div .mdi-arrow-expand:visible')
                 .first()
                 .click();
 
diff --git a/scripts/cypress/integration/common/2b_table_with_m2m_column.js b/scripts/cypress/integration/common/2b_table_with_m2m_column.js
index 7b0b8ba148..de4beeb246 100644
--- a/scripts/cypress/integration/common/2b_table_with_m2m_column.js
+++ b/scripts/cypress/integration/common/2b_table_with_m2m_column.js
@@ -23,10 +23,10 @@ export const genTest = (apiType, dbType) => {
 
         it("Expand m2m column", () => {
             // expand first row
-            cy.get('td[data-col="FilmList"] div', { timeout: 12000 })
+            cy.get('td[data-col="Film List"] div', { timeout: 12000 })
                 .first()
                 .click({ force: true });
-            cy.get('td[data-col="FilmList"] div .mdi-arrow-expand')
+            cy.get('td[data-col="Film List"] div .mdi-arrow-expand')
                 .first()
                 .click({ force: true });
 
diff --git a/scripts/cypress/integration/common/4c_form_view_detailed.js b/scripts/cypress/integration/common/4c_form_view_detailed.js
index e81ad93100..dbcbd4d585 100644
--- a/scripts/cypress/integration/common/4c_form_view_detailed.js
+++ b/scripts/cypress/integration/common/4c_form_view_detailed.js
@@ -119,7 +119,7 @@ export const genTest = (apiType, dbType) => {
                     .should("exist");
                 cy.get(".nc-field-wrapper")
                     .eq(1)
-                    .contains("CityList")
+                    .contains("City List")
                     .should("exist");
                 cy.get(".nc-field-wrapper")
                     .eq(2)
diff --git a/scripts/cypress/integration/common/4d_table_view_grid_locked.js b/scripts/cypress/integration/common/4d_table_view_grid_locked.js
index 94630fc2e4..b702cfcdcb 100644
--- a/scripts/cypress/integration/common/4d_table_view_grid_locked.js
+++ b/scripts/cypress/integration/common/4d_table_view_grid_locked.js
@@ -77,18 +77,18 @@ export const genTest = (apiType, dbType) => {
 
                 // check if add/ expand options available for 'has many' column type
                 mainPage
-                    .getCell("CityList", 1)
+                    .getCell("City List", 1)
                     .click()
                     .find("button.mdi-plus")
                     .should(`${vString}exist`);
                 mainPage
-                    .getCell("CityList", 1)
+                    .getCell("City List", 1)
                     .click()
                     .find("button.mdi-arrow-expand")
                     .should(`${vString}exist`);
 
                 // update row option (right click) - should not be available for Lock view
-                mainPage.getCell("CityList", 1).rightclick();
+                mainPage.getCell("City List", 1).rightclick();
                 cy.get(".menuable__content__active").should(
                     `${vString}be.visible`
                 );
diff --git a/scripts/cypress/integration/common/4e_form_view_share.js b/scripts/cypress/integration/common/4e_form_view_share.js
index b2e16ba956..5ee037bc86 100644
--- a/scripts/cypress/integration/common/4e_form_view_share.js
+++ b/scripts/cypress/integration/common/4e_form_view_share.js
@@ -131,7 +131,7 @@ export const genTest = (apiType, dbType) => {
                         // all fields, barring removed field should exist
                         cy.get('[title="City"]').should("exist");
                         cy.get('[title="LastUpdate"]').should("exist");
-                        cy.get('[title="CountryRead"]').should("exist");
+                        cy.get('[title="Country"]').should("exist");
                         cy.get('[title="AddressList"]').should("not.exist");
 
                         // order of LastUpdate & City field is retained
diff --git a/scripts/cypress/integration/common/5a_user_role.js b/scripts/cypress/integration/common/5a_user_role.js
index 0c46ef67a7..3fece6bc4c 100644
--- a/scripts/cypress/integration/common/5a_user_role.js
+++ b/scripts/cypress/integration/common/5a_user_role.js
@@ -209,7 +209,7 @@ export const genTest = (apiType, dbType) => {
                     const verifyCsv = (retrievedRecords) => {
                         // expected output, statically configured
                         let storedRecords = [
-                            `City,AddressList,CountryRead`,
+                            `City,AddressList,Country`,
                             `A Corua (La Corua),939 Probolinggo Loop,Spain`,
                             `Abha,733 Mandaluyong Place,Saudi Arabia`,
                             `Abu Dhabi,535 Ahmadnagar Manor,United Arab Emirates`,
diff --git a/scripts/cypress/integration/common/6b_downloadCsv.js b/scripts/cypress/integration/common/6b_downloadCsv.js
index 1fe80dced5..fc920ba8cb 100644
--- a/scripts/cypress/integration/common/6b_downloadCsv.js
+++ b/scripts/cypress/integration/common/6b_downloadCsv.js
@@ -31,7 +31,7 @@ export const genTest = (apiType, dbType) => {
                 //     `Angola,"Benguela, Namibe"`,
                 // ];
                 let storedRecords = [
-                    ['Country','CityList'],
+                    ['Country','City List'],
                     ['Afghanistan','Kabul'],
                     ['Algeria','Skikda', 'Bchar', 'Batna'],
                     ['American Samoa','Tafuna'],
@@ -41,7 +41,7 @@ export const genTest = (apiType, dbType) => {
                 // if (isPostgres()) {
                 //     // order of second entry is different
                 //     storedRecords = [
-                //         `Country,CityList`,
+                //         `Country,City List`,
                 //         `Afghanistan,Kabul`,
                 //         `Algeria,"Skikda, Bchar, Batna"`,
                 //         `American Samoa,Tafuna`,
diff --git a/scripts/cypress/integration/common/6f_attachments.js b/scripts/cypress/integration/common/6f_attachments.js
index 4d3e8ef036..b7aab2dc0d 100644
--- a/scripts/cypress/integration/common/6f_attachments.js
+++ b/scripts/cypress/integration/common/6f_attachments.js
@@ -113,7 +113,7 @@ export const genTest = (apiType, dbType) => {
 
             const verifyCsv = (retrievedRecords) => {
                 let storedRecords = [
-                    `Country,CityList,testAttach`,
+                    `Country,City List,testAttach`,
                     `Afghanistan,Kabul,1.json(http://localhost:8080/download/p_h0wxjx5kgoq3w4/vw_skyvc7hsp9i34a/2HvU8R.json)`,
                 ];
 

From 4867f9d6e5520bde457a1808d6506d29ba98579d Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Sat, 25 Jun 2022 21:43:58 +0530
Subject: [PATCH 35/42] test:  cypress test correction

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../integration/common/1a_table_operations.js |  4 +--
 .../cypress/integration/common/1c_sql_view.js |  4 +--
 .../1d_pg_table_view_drag_drop_reorder.js     |  2 +-
 .../common/1d_table_view_drag_drop_reorder.js |  2 +-
 .../integration/common/4e_form_view_share.js  |  4 +--
 .../integration/common/4f_grid_view_share.js  | 30 +++++++++----------
 .../common/4f_pg_grid_view_share.js           | 28 ++++++++---------
 .../integration/common/5a_user_role.js        |  2 +-
 .../integration/common/6b_downloadCsv.js      |  2 +-
 .../integration/spec/roleValidation.spec.js   |  2 +-
 10 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/scripts/cypress/integration/common/1a_table_operations.js b/scripts/cypress/integration/common/1a_table_operations.js
index c54d243f50..3e5b2793bc 100644
--- a/scripts/cypress/integration/common/1a_table_operations.js
+++ b/scripts/cypress/integration/common/1a_table_operations.js
@@ -80,9 +80,9 @@ export const genTest = (apiType, dbType) => {
             // 4a. Address table, has many field
             cy.openTableTab("Address", 25);
 
-            mainPage.getCell("CityRead", 1).scrollIntoView();
+            mainPage.getCell("City", 1).scrollIntoView();
             mainPage
-                .getCell("CityRead", 1)
+                .getCell("City", 1)
                 .find(".name")
                 .contains("Lethbridge")
                 .should("exist");
diff --git a/scripts/cypress/integration/common/1c_sql_view.js b/scripts/cypress/integration/common/1c_sql_view.js
index a57d328da6..2a39736847 100644
--- a/scripts/cypress/integration/common/1c_sql_view.js
+++ b/scripts/cypress/integration/common/1c_sql_view.js
@@ -139,8 +139,8 @@ export const genTest = (apiType, dbType) => {
             cy.openViewsTab("CustomerList", 25);
             cy.closeViewsTab("CustomerList");
 
-            cy.openViewsTab("Film List", 25);
-            cy.closeViewsTab("Film List");
+            cy.openViewsTab("FilmList", 25);
+            cy.closeViewsTab("FilmList");
 
             cy.openViewsTab("SalesByFilmCategory", 16);
             cy.closeViewsTab("SalesByFilmCategory");
diff --git a/scripts/cypress/integration/common/1d_pg_table_view_drag_drop_reorder.js b/scripts/cypress/integration/common/1d_pg_table_view_drag_drop_reorder.js
index 9f99519791..f37be89209 100644
--- a/scripts/cypress/integration/common/1d_pg_table_view_drag_drop_reorder.js
+++ b/scripts/cypress/integration/common/1d_pg_table_view_drag_drop_reorder.js
@@ -23,7 +23,7 @@ export const genTest = (apiType, dbType) => {
         /*
             Original order of list items
             Actor, Address, Category, City, Country, Customer, FIlm, FilmText, Language, Payment, Rental Staff
-            ActorInfo, CustomerList, FilmList, NiceButSlowerFilmList, SalesByFilmCategory, SalesByStore, StaffList
+            ActorInfo, Customer List, Film List, NiceButSlowerFilm List, SalesByFilmCategory, SalesByStore, Staff List
         */
 
         it(`Table & SQL View list, Drag/drop`, () => {
diff --git a/scripts/cypress/integration/common/1d_table_view_drag_drop_reorder.js b/scripts/cypress/integration/common/1d_table_view_drag_drop_reorder.js
index a76f8cba7e..2aa191b0ab 100644
--- a/scripts/cypress/integration/common/1d_table_view_drag_drop_reorder.js
+++ b/scripts/cypress/integration/common/1d_table_view_drag_drop_reorder.js
@@ -18,7 +18,7 @@ export const genTest = (apiType, dbType) => {
         /*
             Original order of list items
             Actor, Address, Category, City, Country, Customer, FIlm, FilmText, Language, Payment, Rental Staff
-            ActorInfo, CustomerList, FilmList, NiceButSlowerFilmList, SalesByFilmCategory, SalesByStore, StaffList
+            ActorInfo, Customer List, Film List, NiceButSlowerFilm List, SalesByFilmCategory, SalesByStore, Staff List
         */
 
         before(() => {
diff --git a/scripts/cypress/integration/common/4e_form_view_share.js b/scripts/cypress/integration/common/4e_form_view_share.js
index 5ee037bc86..c661775c3b 100644
--- a/scripts/cypress/integration/common/4e_form_view_share.js
+++ b/scripts/cypress/integration/common/4e_form_view_share.js
@@ -72,7 +72,7 @@ export const genTest = (apiType, dbType) => {
                 //     "#data-table-form-City"
                 // );
 
-                cy.get('[title="AddressList"]').drag(".nc-drag-n-drop-to-hide");
+                cy.get('[title="Address List"]').drag(".nc-drag-n-drop-to-hide");
 
                 cy.get(".nc-form > .mx-auto")
                     .find('[type="checkbox"]')
@@ -132,7 +132,7 @@ export const genTest = (apiType, dbType) => {
                         cy.get('[title="City"]').should("exist");
                         cy.get('[title="LastUpdate"]').should("exist");
                         cy.get('[title="Country"]').should("exist");
-                        cy.get('[title="AddressList"]').should("not.exist");
+                        cy.get('[title="Address List"]').should("not.exist");
 
                         // order of LastUpdate & City field is retained
                         cy.get(".nc-field-wrapper")
diff --git a/scripts/cypress/integration/common/4f_grid_view_share.js b/scripts/cypress/integration/common/4f_grid_view_share.js
index 15ebf5f9a7..8a35a02b3f 100644
--- a/scripts/cypress/integration/common/4f_grid_view_share.js
+++ b/scripts/cypress/integration/common/4f_grid_view_share.js
@@ -170,7 +170,7 @@ export const genTest = (apiType, dbType) => {
                 const verifyCsv = (retrievedRecords) => {
                     // expected output, statically configured
                     let storedRecords = [
-                        `Address,District,PostalCode,Phone,Location,CustomerList,StaffList,CityRead,StaffList`,
+                        `Address,District,PostalCode,Phone,Location,Customer List,Staff List,City,Staff List`,
                         `1013 Tabuk Boulevard,West Bengali,96203,158399646978,[object Object],2,,Kanchrapara,`,
                         `1892 Nabereznyje Telny Lane,Tutuila,28396,478229987054,[object Object],2,,Tafuna,`,
                         `1993 Tabuk Lane,Tamil Nadu,64221,648482415405,[object Object],2,,Tambaram,`,
@@ -231,7 +231,7 @@ export const genTest = (apiType, dbType) => {
                 const verifyCsv = (retrievedRecords) => {
                     // expected output, statically configured
                     let storedRecords = [
-                        `Address,District,PostalCode,Phone,Location,CustomerList,StaffList,CityRead,StaffList`,
+                        `Address,District,PostalCode,Phone,Location,CustomerList,Staff List,City,Staff List`,
                         `1993 Tabuk Lane,Tamil Nadu,64221,648482415405,[object Object],2,,Tambaram,`,
                         `1661 Abha Drive,Tamil Nadu,14400,270456873752,[object Object],1,,Pudukkottai,`,
                     ];
@@ -267,24 +267,24 @@ export const genTest = (apiType, dbType) => {
 
             it(`Share GRID view : Virtual column validation > has many`, () => {
                 // verify column headers
-                cy.get('[data-col="CustomerList"]').should("exist");
-                cy.get('[data-col="StaffList"]').should("exist");
-                cy.get('[data-col="CityRead"]').should("exist");
-                cy.get('[data-col="StaffList"]').should("exist");
+                cy.get('[data-col="Customer List"]').should("exist");
+                cy.get('[data-col="Staff List"]').should("exist");
+                cy.get('[data-col="City"]').should("exist");
+                cy.get('[data-col="Staff List"]').should("exist");
 
                 // has many field validation
                 mainPage
-                    .getCell("CustomerList", 3)
+                    .getCell("Customer List", 3)
                     .click()
                     .find("button.mdi-close-thick")
                     .should("not.exist");
                 mainPage
-                    .getCell("CustomerList", 3)
+                    .getCell("Customer List", 3)
                     .click()
                     .find("button.mdi-plus")
                     .should("not.exist");
                 mainPage
-                    .getCell("CustomerList", 3)
+                    .getCell("Customer List", 3)
                     .click()
                     .find("button.mdi-arrow-expand")
                     .click();
@@ -308,17 +308,17 @@ export const genTest = (apiType, dbType) => {
             it(`Share GRID view : Virtual column validation > belongs to`, () => {
                 // belongs to field validation
                 mainPage
-                    .getCell("CityRead", 1)
+                    .getCell("City", 1)
                     .click()
                     .find("button.mdi-close-thick")
                     .should("not.exist");
                 mainPage
-                    .getCell("CityRead", 1)
+                    .getCell("City", 1)
                     .click()
                     .find("button.mdi-arrow-expand")
                     .should("not.exist");
                 mainPage
-                    .getCell("CityRead", 1)
+                    .getCell("City", 1)
                     .find(".v-chip")
                     .contains("Kanchrapara")
                     .should("exist");
@@ -327,17 +327,17 @@ export const genTest = (apiType, dbType) => {
             it(`Share GRID view : Virtual column validation > many to many`, () => {
                 // many-to-many field validation
                 mainPage
-                    .getCell("StaffList", 1)
+                    .getCell("Staff List", 1)
                     .click()
                     .find("button.mdi-close-thick")
                     .should("not.exist");
                 mainPage
-                    .getCell("StaffList", 1)
+                    .getCell("Staff List", 1)
                     .click()
                     .find("button.mdi-plus")
                     .should("not.exist");
                 mainPage
-                    .getCell("StaffList", 1)
+                    .getCell("Staff List", 1)
                     .click()
                     .find("button.mdi-arrow-expand")
                     .click();
diff --git a/scripts/cypress/integration/common/4f_pg_grid_view_share.js b/scripts/cypress/integration/common/4f_pg_grid_view_share.js
index a53109f2f7..e049477f05 100644
--- a/scripts/cypress/integration/common/4f_pg_grid_view_share.js
+++ b/scripts/cypress/integration/common/4f_pg_grid_view_share.js
@@ -228,7 +228,7 @@ export const genTest = (apiType, dbType) => {
                 const verifyCsv = (retrievedRecords) => {
                     // expected output, statically configured
                     let storedRecords = [
-                        `Address,District,PostalCode,Phone,Location,CustomerList,StaffList,CityRead,StaffList`,
+                        `Address,District,PostalCode,Phone,Location,Customer List,Staff List,City,Staff List`,
                         `1888 Kabul Drive,,20936,,1,,Ife,,`,
                         `1661 Abha Drive,,14400,,1,,Pudukkottai,,`,
                     ];
@@ -262,24 +262,24 @@ export const genTest = (apiType, dbType) => {
 
             it(`Share GRID view : Virtual column validation > has many`, () => {
                 // verify column headers
-                cy.get('[data-col="CustomerList"]').should("exist");
-                cy.get('[data-col="StaffList"]').should("exist");
-                cy.get('[data-col="CityRead"]').should("exist");
-                cy.get('[data-col="StaffList"]').should("exist");
+                cy.get('[data-col="Customer List"]').should("exist");
+                cy.get('[data-col="Staff List"]').should("exist");
+                cy.get('[data-col="City"]').should("exist");
+                cy.get('[data-col="Staff List"]').should("exist");
 
                 // has many field validation
                 mainPage
-                    .getCell("CustomerList", 3)
+                    .getCell("Customer List", 3)
                     .click()
                     .find("button.mdi-close-thick")
                     .should("not.exist");
                 mainPage
-                    .getCell("CustomerList", 3)
+                    .getCell("Customer List", 3)
                     .click()
                     .find("button.mdi-plus")
                     .should("not.exist");
                 mainPage
-                    .getCell("CustomerList", 3)
+                    .getCell("Customer List", 3)
                     .click()
                     .find("button.mdi-arrow-expand")
                     .click();
@@ -303,17 +303,17 @@ export const genTest = (apiType, dbType) => {
             it(`Share GRID view : Virtual column validation > belongs to`, () => {
                 // belongs to field validation
                 mainPage
-                    .getCell("CityRead", 1)
+                    .getCell("City", 1)
                     .click()
                     .find("button.mdi-close-thick")
                     .should("not.exist");
                 mainPage
-                    .getCell("CityRead", 1)
+                    .getCell("City", 1)
                     .click()
                     .find("button.mdi-arrow-expand")
                     .should("not.exist");
                 mainPage
-                    .getCell("CityRead", 1)
+                    .getCell("City", 1)
                     .find(".v-chip")
                     .contains("al-Ayn")
                     .should("exist");
@@ -322,17 +322,17 @@ export const genTest = (apiType, dbType) => {
             it(`Share GRID view : Virtual column validation > many to many`, () => {
                 // many-to-many field validation
                 mainPage
-                    .getCell("StaffList", 1)
+                    .getCell("Staff List", 1)
                     .click()
                     .find("button.mdi-close-thick")
                     .should("not.exist");
                 mainPage
-                    .getCell("StaffList", 1)
+                    .getCell("Staff List", 1)
                     .click()
                     .find("button.mdi-plus")
                     .should("not.exist");
                 mainPage
-                    .getCell("StaffList", 1)
+                    .getCell("Staff List", 1)
                     .click()
                     .find("button.mdi-arrow-expand")
                     .click();
diff --git a/scripts/cypress/integration/common/5a_user_role.js b/scripts/cypress/integration/common/5a_user_role.js
index 3fece6bc4c..232f13f7c6 100644
--- a/scripts/cypress/integration/common/5a_user_role.js
+++ b/scripts/cypress/integration/common/5a_user_role.js
@@ -209,7 +209,7 @@ export const genTest = (apiType, dbType) => {
                     const verifyCsv = (retrievedRecords) => {
                         // expected output, statically configured
                         let storedRecords = [
-                            `City,AddressList,Country`,
+                            `City,Address List,Country`,
                             `A Corua (La Corua),939 Probolinggo Loop,Spain`,
                             `Abha,733 Mandaluyong Place,Saudi Arabia`,
                             `Abu Dhabi,535 Ahmadnagar Manor,United Arab Emirates`,
diff --git a/scripts/cypress/integration/common/6b_downloadCsv.js b/scripts/cypress/integration/common/6b_downloadCsv.js
index fc920ba8cb..bac94fdc24 100644
--- a/scripts/cypress/integration/common/6b_downloadCsv.js
+++ b/scripts/cypress/integration/common/6b_downloadCsv.js
@@ -31,7 +31,7 @@ export const genTest = (apiType, dbType) => {
                 //     `Angola,"Benguela, Namibe"`,
                 // ];
                 let storedRecords = [
-                    ['Country','City List'],
+                    ['Country','CityList'],
                     ['Afghanistan','Kabul'],
                     ['Algeria','Skikda', 'Bchar', 'Batna'],
                     ['American Samoa','Tafuna'],
diff --git a/scripts/cypress/integration/spec/roleValidation.spec.js b/scripts/cypress/integration/spec/roleValidation.spec.js
index e88c6af853..f9156c7a9f 100644
--- a/scripts/cypress/integration/spec/roleValidation.spec.js
+++ b/scripts/cypress/integration/spec/roleValidation.spec.js
@@ -236,7 +236,7 @@ export function _viewMenu(roleType, previewMode, navDrawListCnt) {
         // Download CSV / Upload CSV / Shared View List / Webhook
         actionsMenuItemsCnt = 4;
     } else if (roleType == "editor") {
-        // Download CSV / Upload CSV 
+        // Download CSV / Upload CSV
         actionsMenuItemsCnt = 2;
     }
 

From 411ad59b886b90a48994ddbbc6e340689a7502c8 Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Mon, 27 Jun 2022 12:44:32 +0530
Subject: [PATCH 36/42] fix: cypress corrections

Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com>
---
 .../integration/common/1d_table_view_drag_drop_reorder.js       | 2 +-
 scripts/cypress/integration/common/4f_grid_view_share.js        | 2 +-
 scripts/cypress/integration/common/6b_downloadCsv.js            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/cypress/integration/common/1d_table_view_drag_drop_reorder.js b/scripts/cypress/integration/common/1d_table_view_drag_drop_reorder.js
index 2aa191b0ab..e6582ab0b6 100644
--- a/scripts/cypress/integration/common/1d_table_view_drag_drop_reorder.js
+++ b/scripts/cypress/integration/common/1d_table_view_drag_drop_reorder.js
@@ -65,7 +65,7 @@ export const genTest = (apiType, dbType) => {
             validateTreeField(2, "Address");
             validateTreeField(12, "Staff");
             validateTreeField(13, "ActorInfo");
-            validateTreeField(14, "CustomerList");
+            validateTreeField(14, "Customer List");
 
             // undo project-tree expand operation
             cy.get(".nc-project-tree")
diff --git a/scripts/cypress/integration/common/4f_grid_view_share.js b/scripts/cypress/integration/common/4f_grid_view_share.js
index 8a35a02b3f..c625951b58 100644
--- a/scripts/cypress/integration/common/4f_grid_view_share.js
+++ b/scripts/cypress/integration/common/4f_grid_view_share.js
@@ -231,7 +231,7 @@ export const genTest = (apiType, dbType) => {
                 const verifyCsv = (retrievedRecords) => {
                     // expected output, statically configured
                     let storedRecords = [
-                        `Address,District,PostalCode,Phone,Location,CustomerList,Staff List,City,Staff List`,
+                        `Address,District,PostalCode,Phone,Location,Customer List,Staff List,City,Staff List`,
                         `1993 Tabuk Lane,Tamil Nadu,64221,648482415405,[object Object],2,,Tambaram,`,
                         `1661 Abha Drive,Tamil Nadu,14400,270456873752,[object Object],1,,Pudukkottai,`,
                     ];
diff --git a/scripts/cypress/integration/common/6b_downloadCsv.js b/scripts/cypress/integration/common/6b_downloadCsv.js
index bac94fdc24..fc920ba8cb 100644
--- a/scripts/cypress/integration/common/6b_downloadCsv.js
+++ b/scripts/cypress/integration/common/6b_downloadCsv.js
@@ -31,7 +31,7 @@ export const genTest = (apiType, dbType) => {
                 //     `Angola,"Benguela, Namibe"`,
                 // ];
                 let storedRecords = [
-                    ['Country','CityList'],
+                    ['Country','City List'],
                     ['Afghanistan','Kabul'],
                     ['Algeria','Skikda', 'Bchar', 'Batna'],
                     ['American Samoa','Tafuna'],

From 02e013c1504ee0194650e3d194c6a5a2e8b0f6e0 Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Mon, 27 Jun 2022 13:23:45 +0530
Subject: [PATCH 37/42] fix: cypress correction for ltar name change

Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com>
---
 .../integration/common/1d_table_view_drag_drop_reorder.js       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/cypress/integration/common/1d_table_view_drag_drop_reorder.js b/scripts/cypress/integration/common/1d_table_view_drag_drop_reorder.js
index e6582ab0b6..2aa191b0ab 100644
--- a/scripts/cypress/integration/common/1d_table_view_drag_drop_reorder.js
+++ b/scripts/cypress/integration/common/1d_table_view_drag_drop_reorder.js
@@ -65,7 +65,7 @@ export const genTest = (apiType, dbType) => {
             validateTreeField(2, "Address");
             validateTreeField(12, "Staff");
             validateTreeField(13, "ActorInfo");
-            validateTreeField(14, "Customer List");
+            validateTreeField(14, "CustomerList");
 
             // undo project-tree expand operation
             cy.get(".nc-project-tree")

From dd5abf43dcb5a84084f5a5d64590fb52eface312 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Mon, 27 Jun 2022 13:56:34 +0530
Subject: [PATCH 38/42] fix: hasmany column naming in metadiff

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nocodb/src/lib/meta/api/metaDiffApis.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nocodb/src/lib/meta/api/metaDiffApis.ts b/packages/nocodb/src/lib/meta/api/metaDiffApis.ts
index 7729796b43..cdcce50557 100644
--- a/packages/nocodb/src/lib/meta/api/metaDiffApis.ts
+++ b/packages/nocodb/src/lib/meta/api/metaDiffApis.ts
@@ -686,7 +686,7 @@ export async function metaDiffSync(req, res) {
               } else if (change.relationType === RelationTypes.HAS_MANY) {
                 const title = getUniqueColumnAliasName(
                   childModel.columns,
-                  `${childModel.title || childModel.table_name}List`
+                  `${childModel.title || childModel.table_name} List`
                 );
                 await Column.insert<LinkToAnotherRecordColumn>({
                   uidt: UITypes.LinkToAnotherRecord,

From bf4e1e49cb4a61967d390caccf77bf736bf419cc Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Mon, 27 Jun 2022 16:45:58 +0530
Subject: [PATCH 39/42] fix: reset token_version in user object if null

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nocodb/src/lib/meta/api/userApi/userApis.ts | 7 +++----
 packages/nocodb/src/lib/models/User.ts               | 3 +++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/nocodb/src/lib/meta/api/userApi/userApis.ts b/packages/nocodb/src/lib/meta/api/userApi/userApis.ts
index 320b4850e9..596de0cec4 100644
--- a/packages/nocodb/src/lib/meta/api/userApi/userApis.ts
+++ b/packages/nocodb/src/lib/meta/api/userApi/userApis.ts
@@ -179,15 +179,14 @@ async function successfulSignIn({
     await promisify((req as any).login.bind(req))(user);
     const refreshToken = randomTokenString();
 
-    let token_version = user.token_version;
-    if (!token_version) {
-      token_version = randomTokenString();
+    if (!user.token_version) {
+      user.token_version = randomTokenString();
     }
 
     await User.update(user.id, {
       refresh_token: refreshToken,
       email: user.email,
-      token_version
+      token_version: user.token_version
     });
     setTokenCookie(res, refreshToken);
 
diff --git a/packages/nocodb/src/lib/models/User.ts b/packages/nocodb/src/lib/models/User.ts
index a1a91aada5..fe7743e1ca 100644
--- a/packages/nocodb/src/lib/models/User.ts
+++ b/packages/nocodb/src/lib/models/User.ts
@@ -84,6 +84,9 @@ export default class User implements UserType {
 
     if (updateObj.email) {
       updateObj.email = updateObj.email.toLowerCase();
+    } else {
+      // set email prop to avoid generation of invalid cache key
+      updateObj.email = (await this.get(id, ncMeta))?.email?.toLowerCase();
     }
     // get existing cache
     const keys = [

From 03f1e2d902ebf9fc81c4c22a298b68166f30feb3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 27 Jun 2022 13:31:00 +0000
Subject: [PATCH 40/42] chore(deps): bump shell-quote from 1.7.2 to 1.7.3 in
 /packages/noco-blog

Bumps [shell-quote](https://github.com/substack/node-shell-quote) from 1.7.2 to 1.7.3.
- [Release notes](https://github.com/substack/node-shell-quote/releases)
- [Changelog](https://github.com/substack/node-shell-quote/blob/master/CHANGELOG.md)
- [Commits](https://github.com/substack/node-shell-quote/compare/v1.7.2...1.7.3)

---
updated-dependencies:
- dependency-name: shell-quote
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 packages/noco-blog/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/noco-blog/package-lock.json b/packages/noco-blog/package-lock.json
index 05a95ff26b..6745cbf0fc 100644
--- a/packages/noco-blog/package-lock.json
+++ b/packages/noco-blog/package-lock.json
@@ -10797,9 +10797,9 @@
       "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="
     },
     "shell-quote": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.2.tgz",
-      "integrity": "sha512-mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg=="
+      "version": "1.7.3",
+      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.3.tgz",
+      "integrity": "sha512-Vpfqwm4EnqGdlsBFNmHhxhElJYrdfcxPThu+ryKS5J8L/fhAwLazFZtq+S+TWZ9ANj2piSQLGj6NQg+lKPmxrw=="
     },
     "side-channel": {
       "version": "1.0.4",

From 36119319b95764e6acebd18d65b33a3874f05700 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Mon, 27 Jun 2022 18:59:26 +0530
Subject: [PATCH 41/42] chore: make sdk script part of run script to run them
 sequentially

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .github/workflows/ci-cd.yml | 12 ------------
 package.json                | 12 ++++++------
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml
index 02d321f178..25793d026f 100644
--- a/.github/workflows/ci-cd.yml
+++ b/.github/workflows/ci-cd.yml
@@ -49,7 +49,6 @@ jobs:
               uses: cypress-io/github-action@v2
               with:
                   start: |
-                      npm run build:common
                       npm run start:api:cache
                       npm run start:web
                       docker-compose -f ./scripts/cypress/docker-compose-pg.yml up -d
@@ -94,7 +93,6 @@ jobs:
               uses: cypress-io/github-action@v2
               with:
                   start: |
-                      npm run build:common
                       npm run start:api:cache
                       npm run start:web
                       docker-compose -f ./scripts/cypress/docker-compose-pg.yml up -d
@@ -139,7 +137,6 @@ jobs:
               uses: cypress-io/github-action@v2
               with:
                   start: |
-                      npm run build:common
                       npm run start:api:cache
                       npm run start:web
                       docker-compose -f ./scripts/cypress/docker-compose-pg.yml up -d
@@ -184,7 +181,6 @@ jobs:
               uses: cypress-io/github-action@v2
               with:
                   start: |
-                      npm run build:common
                       npm run start:api:cache
                       npm run start:web
                       docker-compose -f ./scripts/cypress/docker-compose-pg.yml up -d
@@ -229,7 +225,6 @@ jobs:
               uses: cypress-io/github-action@v2
               with:
                   start: |
-                      npm run build:common
                       npm run start:api:cache
                       npm run start:web
                       docker-compose -f ./scripts/docker-compose-cypress.yml up -d
@@ -274,7 +269,6 @@ jobs:
               uses: cypress-io/github-action@v2
               with:
                   start: |
-                      npm run build:common
                       npm run start:api:cache
                       npm run start:web
                       docker-compose -f ./scripts/docker-compose-cypress.yml up -d
@@ -319,7 +313,6 @@ jobs:
               uses: cypress-io/github-action@v2
               with:
                   start: |
-                      npm run build:common
                       npm run start:api:cache
                       npm run start:web
                       docker-compose -f ./scripts/docker-compose-cypress.yml up -d
@@ -364,7 +357,6 @@ jobs:
               uses: cypress-io/github-action@v2
               with:
                   start: |
-                      npm run build:common
                       npm run start:api:cache
                       npm run start:web
                       docker-compose -f ./scripts/docker-compose-cypress.yml up -d
@@ -409,7 +401,6 @@ jobs:
               uses: cypress-io/github-action@v2
               with:
                   start: |
-                      npm run build:common
                       npm run start:xcdb-api:cache
                       npm run start:web
                       docker-compose -f ./scripts/docker-compose-cypress.yml up -d
@@ -454,7 +445,6 @@ jobs:
               uses: cypress-io/github-action@v2
               with:
                   start: |
-                      npm run build:common
                       npm run start:xcdb-api:cache
                       npm run start:web
                       docker-compose -f ./scripts/docker-compose-cypress.yml up -d
@@ -499,7 +489,6 @@ jobs:
               uses: cypress-io/github-action@v2
               with:
                   start: |
-                      npm run build:common
                       npm run start:xcdb-api:cache
                       npm run start:web
                       docker-compose -f ./scripts/docker-compose-cypress.yml up -d
@@ -544,7 +533,6 @@ jobs:
               uses: cypress-io/github-action@v2
               with:
                   start: |
-                      npm run build:common
                       npm run start:xcdb-api:cache
                       npm run start:web
                       docker-compose -f ./scripts/docker-compose-cypress.yml up -d
diff --git a/package.json b/package.json
index 579c3db173..d9e2159799 100644
--- a/package.json
+++ b/package.json
@@ -15,12 +15,12 @@
   "scripts": {
     "build:common": "cd ./packages/nocodb-sdk; npm install; npm run build",
     "install:common": "cd ./packages/nocodb; npm install ../nocodb-sdk; cd ../nc-gui; npm install ../nocodb-sdk",
-    "start:api": "cd ./packages/nocodb; npm install; NC_DISABLE_CACHE=true NC_DISABLE_TELE=true npm run watch:run:cypress",
-    "start:xcdb-api": "cd ./packages/nocodb; npm install; NC_DISABLE_CACHE=true NC_DISABLE_TELE=true NC_INFLECTION=camelize DATABASE_URL=sqlite:../../../scripts/cypress/fixtures/sqlite-sakila/sakila.db npm run watch:run:cypress",
-    "start:api:cache": "cd ./packages/nocodb; npm install; NC_DISABLE_TELE=true npm run watch:run:cypress",
-    "start:api:cache:pg": "cd ./packages/nocodb; npm install; NC_DISABLE_TELE=true npm run watch:run:cypress:pg",
-    "start:xcdb-api:cache": "cd ./packages/nocodb; npm install; NC_DISABLE_TELE=true NC_INFLECTION=camelize DATABASE_URL=sqlite:../../../scripts/cypress/fixtures/sqlite-sakila/sakila.db npm run watch:run:cypress",
-    "start:web": "cd ./packages/nc-gui; npm install; npm run dev",
+    "start:api": "cd ./packages/nocodb-sdk; npm install; npm run build ; cd ./nocodb; npm install ../nocodb-sdk; npm install; NC_DISABLE_CACHE=true NC_DISABLE_TELE=true npm run watch:run:cypress",
+    "start:xcdb-api": "cd ./packages/nocodb-sdk; npm install; npm run build ; cd ./nocodb; npm install ../nocodb-sdk;npm install; NC_DISABLE_CACHE=true NC_DISABLE_TELE=true NC_INFLECTION=camelize DATABASE_URL=sqlite:../../../scripts/cypress/fixtures/sqlite-sakila/sakila.db npm run watch:run:cypress",
+    "start:api:cache": "cd ./packages/nocodb-sdk; npm install; npm run build ; cd ./nocodb; npm install ../nocodb-sdk;npm install; NC_DISABLE_TELE=true npm run watch:run:cypress",
+    "start:api:cache:pg": "cd ./packages/nocodb-sdk; npm install; npm run build ; cd ./nocodb; npm install ../nocodb-sdk; npm install; NC_DISABLE_TELE=true npm run watch:run:cypress:pg",
+    "start:xcdb-api:cache": "cd ./packages/nocodb-sdk; npm install; npm run build ; cd ./nocodb; npm install ../nocodb-sdk; npm install; NC_DISABLE_TELE=true NC_INFLECTION=camelize DATABASE_URL=sqlite:../../../scripts/cypress/fixtures/sqlite-sakila/sakila.db npm run watch:run:cypress",
+    "start:web": "cd ./packages/nocodb-sdk; npm install; npm run build ; cd ./nc-gui; npm install ../nocodb-sdk; npm install; npm run dev",
     "cypress:run": "cypress run --config-file ./scripts/cypress/cypress.json",
     "cypress:open": "cypress open --config-file ./scripts/cypress/cypress.json",
     "cypress:clear": "cypress cache clear",

From fccc159ff6c0b83468f0d3df2ccbd5cbc32a87a8 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Mon, 27 Jun 2022 19:45:19 +0530
Subject: [PATCH 42/42] chore: path correction

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 package.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index d9e2159799..602192d780 100644
--- a/package.json
+++ b/package.json
@@ -15,12 +15,12 @@
   "scripts": {
     "build:common": "cd ./packages/nocodb-sdk; npm install; npm run build",
     "install:common": "cd ./packages/nocodb; npm install ../nocodb-sdk; cd ../nc-gui; npm install ../nocodb-sdk",
-    "start:api": "cd ./packages/nocodb-sdk; npm install; npm run build ; cd ./nocodb; npm install ../nocodb-sdk; npm install; NC_DISABLE_CACHE=true NC_DISABLE_TELE=true npm run watch:run:cypress",
-    "start:xcdb-api": "cd ./packages/nocodb-sdk; npm install; npm run build ; cd ./nocodb; npm install ../nocodb-sdk;npm install; NC_DISABLE_CACHE=true NC_DISABLE_TELE=true NC_INFLECTION=camelize DATABASE_URL=sqlite:../../../scripts/cypress/fixtures/sqlite-sakila/sakila.db npm run watch:run:cypress",
-    "start:api:cache": "cd ./packages/nocodb-sdk; npm install; npm run build ; cd ./nocodb; npm install ../nocodb-sdk;npm install; NC_DISABLE_TELE=true npm run watch:run:cypress",
-    "start:api:cache:pg": "cd ./packages/nocodb-sdk; npm install; npm run build ; cd ./nocodb; npm install ../nocodb-sdk; npm install; NC_DISABLE_TELE=true npm run watch:run:cypress:pg",
-    "start:xcdb-api:cache": "cd ./packages/nocodb-sdk; npm install; npm run build ; cd ./nocodb; npm install ../nocodb-sdk; npm install; NC_DISABLE_TELE=true NC_INFLECTION=camelize DATABASE_URL=sqlite:../../../scripts/cypress/fixtures/sqlite-sakila/sakila.db npm run watch:run:cypress",
-    "start:web": "cd ./packages/nocodb-sdk; npm install; npm run build ; cd ./nc-gui; npm install ../nocodb-sdk; npm install; npm run dev",
+    "start:api": "npm run build:common ; cd ./packages/nocodb; npm install ../nocodb-sdk; npm install; NC_DISABLE_CACHE=true NC_DISABLE_TELE=true npm run watch:run:cypress",
+    "start:xcdb-api": "npm run build:common ; cd ./packages/nocodb; npm install ../nocodb-sdk;npm install; NC_DISABLE_CACHE=true NC_DISABLE_TELE=true NC_INFLECTION=camelize DATABASE_URL=sqlite:../../../scripts/cypress/fixtures/sqlite-sakila/sakila.db npm run watch:run:cypress",
+    "start:api:cache": "npm run build:common ; cd ./packages/nocodb; npm install ../nocodb-sdk;npm install; NC_DISABLE_TELE=true npm run watch:run:cypress",
+    "start:api:cache:pg": "npm run build:common ; cd ./packages/nocodb; npm install ../nocodb-sdk; npm install; NC_DISABLE_TELE=true npm run watch:run:cypress:pg",
+    "start:xcdb-api:cache": "npm run build:common ; cd ./packages/nocodb; npm install ../nocodb-sdk; npm install; NC_DISABLE_TELE=true NC_INFLECTION=camelize DATABASE_URL=sqlite:../../../scripts/cypress/fixtures/sqlite-sakila/sakila.db npm run watch:run:cypress",
+    "start:web": "npm run build:common ; cd ./packages/nc-gui; npm install ../nocodb-sdk; npm install; npm run dev",
     "cypress:run": "cypress run --config-file ./scripts/cypress/cypress.json",
     "cypress:open": "cypress open --config-file ./scripts/cypress/cypress.json",
     "cypress:clear": "cypress cache clear",