From be131d7dfe33909977107ade30a8450c1309f7b8 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Tue, 16 Nov 2021 15:18:04 +0530
Subject: [PATCH] test(cypress): provide delay to sync view metas

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 package-lock.json                                   |  9 +++++++++
 package.json                                        |  3 ++-
 .../spreadsheet/components/spreadsheetNavDrawer.vue | 10 +++++++---
 .../project/spreadsheet/public/xcForm.vue           | 13 -------------
 .../cypress/integration/common/6f_attachments.js    |  2 +-
 5 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 8447c4d58d..09b183335f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3570,6 +3570,15 @@
         "parse-json": "^4.0.0"
       }
     },
+    "cross-env": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz",
+      "integrity": "sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==",
+      "dev": true,
+      "requires": {
+        "cross-spawn": "^7.0.1"
+      }
+    },
     "cross-spawn": {
       "version": "7.0.3",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
diff --git a/package.json b/package.json
index 20b09f1a75..f71b7fe693 100644
--- a/package.json
+++ b/package.json
@@ -2,13 +2,14 @@
   "name": "root",
   "devDependencies": {
     "@4tw/cypress-drag-drop": "^2.0.0",
+    "cross-env": "^7.0.3",
     "cypress": "^7.3.0",
     "cypress-file-upload": "^5.0.8",
     "jsdoc-to-markdown": "^5.0.3",
     "lerna": "^3.20.1"
   },
   "scripts": {
-    "start:api": "cd ./packages/nocodb; npm install; npm run watch:run",
+    "start:api": "cd ./packages/nocodb; npm install; cross-env NC_DISABLE_TELE=true npm run watch:run",
     "start:web": "cd ./packages/nc-gui; 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",
diff --git a/packages/nc-gui/components/project/spreadsheet/components/spreadsheetNavDrawer.vue b/packages/nc-gui/components/project/spreadsheet/components/spreadsheetNavDrawer.vue
index c8687d400e..75b8476e8f 100644
--- a/packages/nc-gui/components/project/spreadsheet/components/spreadsheetNavDrawer.vue
+++ b/packages/nc-gui/components/project/spreadsheet/components/spreadsheetNavDrawer.vue
@@ -436,7 +436,7 @@
             <!-- People with private link can only see cells visible in this view -->
           </p>
           <div style="border-radius: 4px" class="share-link-box body-2 pa-2 d-flex align-center">
-            {{ `${dashboardUrl}#/nc/${shareLink.view_type === 'form' ? 'form' : 'view' }/${shareLink.view_id}` }}
+            {{ `${dashboardUrl}#/nc/${shareLink.view_type === 'form' ? 'form' : 'view'}/${shareLink.view_id}` }}
             <v-spacer />
             <a
               :href=" `${dashboardUrl}#/nc/${shareLink.view_type === 'form' ? 'form' : 'view'}/${shareLink.view_id}`"
@@ -590,6 +590,7 @@ export default {
     if (this.load) {
       await this.loadViews()
     }
+    this.onViewIdChange(this.selectedViewIdLocal)
   },
   methods: {
     onViewIdChange(id) {
@@ -631,7 +632,8 @@ export default {
             fieldsOrder: JSON.parse(mainView.query_params).fieldsOrder
           })
         }
-      } catch {}
+      } catch {
+      }
       this.createViewType = type
       this.showCreateView = true
     },
@@ -711,7 +713,9 @@ export default {
       const old_title = view.title
 
       this.$set(view, 'edit', false)
-      if (view.title_temp === view.title) { return }
+      if (view.title_temp === view.title) {
+        return
+      }
       if (this.viewsList.some((v, i) => i !== index && (v.alias || v.title) === view.title_temp)) {
         this.$toast.info('View name should be unique').goAway(3000)
         return
diff --git a/packages/nc-gui/components/project/spreadsheet/public/xcForm.vue b/packages/nc-gui/components/project/spreadsheet/public/xcForm.vue
index d222193117..17fd399080 100644
--- a/packages/nc-gui/components/project/spreadsheet/public/xcForm.vue
+++ b/packages/nc-gui/components/project/spreadsheet/public/xcForm.vue
@@ -398,19 +398,6 @@ export default {
           formData
         })
 
-        //
-        // data = { ...this.localState, ...data }
-        //
-        // // save hasmany and manytomany relations from local state
-        // if (this.$refs.virtual && Array.isArray(this.$refs.virtual)) {
-        //   for (const vcell of this.$refs.virtual) {
-        //     if (vcell.save) {
-        //       await vcell.save(data)
-        //     }
-        //   }
-        // }
-        //
-
         this.virtual = {}
         this.localState = {}
 
diff --git a/scripts/cypress/integration/common/6f_attachments.js b/scripts/cypress/integration/common/6f_attachments.js
index 2e9b51fe11..9c648af41e 100644
--- a/scripts/cypress/integration/common/6f_attachments.js
+++ b/scripts/cypress/integration/common/6f_attachments.js
@@ -40,8 +40,8 @@ export const genTest = (type, xcdb) => {
       // create form-view
       cy.get(`.nc-create-form-view`).click();
       cy.getActiveModal().find('button:contains(Submit)').click()
-
       cy.get(`.nc-view-item.nc-form-view-item`).contains('Country1').click()
+      cy.wait(1000)
       cy.get('.v-navigation-drawer__content > .container')
         .find('.v-list > .v-list-item')
         .contains('Share View')