From badccd590d0150b20bc9ee4bcadd88e93768bbf7 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Mon, 10 Jan 2022 15:15:48 +0530
Subject: [PATCH] fix: show password dialog only when required

- upgrade nc-help (fixed primary key creation problem with whitespace)

re #937

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../project/spreadsheet/public/xcForm.vue     |  2 ++
 .../project/spreadsheet/public/xcTable.vue    | 10 ++++++++-
 packages/nocodb/package-lock.json             | 22 +++++++++----------
 packages/nocodb/package.json                  |  2 +-
 4 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/packages/nc-gui/components/project/spreadsheet/public/xcForm.vue b/packages/nc-gui/components/project/spreadsheet/public/xcForm.vue
index 17fd399080..c3b2293371 100644
--- a/packages/nc-gui/components/project/spreadsheet/public/xcForm.vue
+++ b/packages/nc-gui/components/project/spreadsheet/public/xcForm.vue
@@ -206,6 +206,8 @@
           <v-text-field
             v-model="password"
             dense
+            autocomplete="shared-form-password"
+            browser-autocomplete="shared-form-password"
             type="password"
             solo
             flat
diff --git a/packages/nc-gui/components/project/spreadsheet/public/xcTable.vue b/packages/nc-gui/components/project/spreadsheet/public/xcTable.vue
index ec47c17898..f633dd3600 100644
--- a/packages/nc-gui/components/project/spreadsheet/public/xcTable.vue
+++ b/packages/nc-gui/components/project/spreadsheet/public/xcTable.vue
@@ -168,6 +168,8 @@
           <v-text-field
             v-model="password"
             dense
+            autocomplete="shared-table-password"
+            browser-autocomplete="shared-table-password"
             type="password"
             solo
             flat
@@ -567,7 +569,13 @@ export default {
           rowMeta: {}
         }))
       } catch (e) {
-        this.showPasswordModal = true
+        if (e.message === 'Not found' || e.message === 'Meta not found') {
+          this.notFound = true
+        } else if (e.message === 'Invalid password') {
+          this.showPasswordModal = true
+        } else {
+          console.log(e)
+        }
       }
 
       this.loadingData = false
diff --git a/packages/nocodb/package-lock.json b/packages/nocodb/package-lock.json
index 2d9f73785c..932e306d40 100644
--- a/packages/nocodb/package-lock.json
+++ b/packages/nocodb/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "nocodb",
-  "version": "0.84.3",
+  "version": "0.84.4",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "nocodb",
-      "version": "0.84.3",
+      "version": "0.84.4",
       "license": "AGPL-3.0-or-later",
       "dependencies": {
         "@google-cloud/storage": "^5.7.2",
@@ -66,7 +66,7 @@
         "mysql2": "^2.2.5",
         "nanoid": "^3.1.20",
         "nc-common": "0.0.6",
-        "nc-help": "^0.2.24",
+        "nc-help": "^0.2.26",
         "nc-lib-gui": "0.84.5",
         "nc-plugin": "^0.1.1",
         "ncp": "^2.0.0",
@@ -15850,13 +15850,13 @@
       }
     },
     "node_modules/nc-help": {
-      "version": "0.2.24",
-      "resolved": "https://registry.npmjs.org/nc-help/-/nc-help-0.2.24.tgz",
-      "integrity": "sha512-Pa/ANsusuOtGRtnINgynCzztnq3AyzSp7vkkwQbyV7fSFGQuvlO1LMT/e+WnTNAOQFKhkS6VETFlPah6aPYalQ==",
+      "version": "0.2.26",
+      "resolved": "https://registry.npmjs.org/nc-help/-/nc-help-0.2.26.tgz",
+      "integrity": "sha512-yXoL/RuRSIp4qtQMK8zORWV63d5LG7uEB0gejget+J5yEHouOdSamqx18J+QqO2Yl1iQHoz0vw/Td8kglxbKZg==",
       "dependencies": {
         "axios": "^0.21.1",
         "boxen": "^4.2.0",
-        "colors": "^1.4.0",
+        "colors": "1.4.0",
         "dayjs": "^1.8.32",
         "debug": "^4.1.1",
         "ejs": "^3.1.3",
@@ -37147,13 +37147,13 @@
       "integrity": "sha512-3AryS9uwa5NfISLxMciUonrH7YfXp+nlahB9T7girXIsLQrmwX4MdnuKs32akduCOGpKmjTJSWmATULbuMkbfw=="
     },
     "nc-help": {
-      "version": "0.2.24",
-      "resolved": "https://registry.npmjs.org/nc-help/-/nc-help-0.2.24.tgz",
-      "integrity": "sha512-Pa/ANsusuOtGRtnINgynCzztnq3AyzSp7vkkwQbyV7fSFGQuvlO1LMT/e+WnTNAOQFKhkS6VETFlPah6aPYalQ==",
+      "version": "0.2.26",
+      "resolved": "https://registry.npmjs.org/nc-help/-/nc-help-0.2.26.tgz",
+      "integrity": "sha512-yXoL/RuRSIp4qtQMK8zORWV63d5LG7uEB0gejget+J5yEHouOdSamqx18J+QqO2Yl1iQHoz0vw/Td8kglxbKZg==",
       "requires": {
         "axios": "^0.21.1",
         "boxen": "^4.2.0",
-        "colors": "^1.4.0",
+        "colors": "1.4.0",
         "dayjs": "^1.8.32",
         "debug": "^4.1.1",
         "ejs": "^3.1.3",
diff --git a/packages/nocodb/package.json b/packages/nocodb/package.json
index a9ca49dea7..6f820a9a10 100644
--- a/packages/nocodb/package.json
+++ b/packages/nocodb/package.json
@@ -147,7 +147,7 @@
     "mysql2": "^2.2.5",
     "nanoid": "^3.1.20",
     "nc-common": "0.0.6",
-    "nc-help": "^0.2.24",
+    "nc-help": "^0.2.26",
     "nc-lib-gui": "0.84.5",
     "nc-plugin": "^0.1.1",
     "ncp": "^2.0.0",