From 7d79806cfd9f031c3811a8207cf9c7aac45243ed Mon Sep 17 00:00:00 2001
From: Pranav C <61551451+pranavxc@users.noreply.github.com>
Date: Wed, 21 Jul 2021 13:48:11 +0530
Subject: [PATCH] fix(gui): clear release info if there is  no new release
 available

Signed-off-by: Pranav C <61551451+pranavxc@users.noreply.github.com>
---
 packages/nc-gui/.eslintrc.json                     | 14 ++++++++++++++
 .../components/virtualCell/hasManyCell.vue         |  2 +-
 .../pages/user/authentication/signup/index.vue     |  9 ++++-----
 packages/nc-gui/plugins/projectLoader.js           |  2 ++
 4 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/packages/nc-gui/.eslintrc.json b/packages/nc-gui/.eslintrc.json
index f9e2c2c8a6..d5f6bce3ff 100644
--- a/packages/nc-gui/.eslintrc.json
+++ b/packages/nc-gui/.eslintrc.json
@@ -18,10 +18,24 @@
       "never"
     ],
     "require-await": "off"
+//    "@intlify/vue-i18n/no-raw-text": "off",
+//    "@intlify/vue-i18n/no-duplicate-keys-in-locale": [
+//      "error",
+//      {
+//        "ignoreI18nBlock": false
+//      }
+//    ],
+//    "@intlify/vue-i18n/no-missing-keys": "error"
   },
   "parserOptions": {
     "parser": "babel-eslint",
     "ecmaVersion": 8,
     "sourceType": "module"
   }
+//  "settings": {
+//    "vue-i18n": {
+//      "localeDir": "./static/lang/*.json",
+//      "messageSyntaxVersion": "^8.20.0"
+//    }
+//  }
 }
diff --git a/packages/nc-gui/components/project/spreadsheet/components/virtualCell/hasManyCell.vue b/packages/nc-gui/components/project/spreadsheet/components/virtualCell/hasManyCell.vue
index 979ad6db6b..f9e578638f 100644
--- a/packages/nc-gui/components/project/spreadsheet/components/virtualCell/hasManyCell.vue
+++ b/packages/nc-gui/components/project/spreadsheet/components/virtualCell/hasManyCell.vue
@@ -95,6 +95,7 @@
       <component
         :is="form"
         v-if="selectedChild"
+        ref="expandedForm"
         v-model="selectedChild"
         :db-alias="nodes.dbAlias"
         :has-many="childMeta.hasMany"
@@ -102,7 +103,6 @@
         :table="childMeta.tn"
         :old-row="{...selectedChild}"
         :meta="childMeta"
-        ref="expandedForm"
         :sql-ui="sqlUi"
         :primary-value-column="childPrimaryCol"
         :api="childApi"
diff --git a/packages/nc-gui/pages/user/authentication/signup/index.vue b/packages/nc-gui/pages/user/authentication/signup/index.vue
index 21cdb4c6e2..8d8a67f2e5 100644
--- a/packages/nc-gui/pages/user/authentication/signup/index.vue
+++ b/packages/nc-gui/pages/user/authentication/signup/index.vue
@@ -171,17 +171,16 @@
 
             <br>
 
-            <v-row justify="center">
-              <p class="text-right grey--text font-weight-light caption">
+            <div class="text-center">
+              <p class="grey--text font-weight-light caption">
                 By signing up, you agree to
                 <span class="grey--text pointer" @click="openUrl('https://nocodb.com/terms-of-service')"><u>Terms of service</u></span>
-              </p> &nbsp;
-
+              </p>
               <div class="d-flex align-center mb-4 justify-center">
                 <v-checkbox v-model="subscribe" color="grey" dense hide-details class="mt-0  pt-0" />
                 <label class="caption grey--text font-weight-light">Subscribe to our weekly newsletter</label>
               </div>
-            </v-row>
+            </div>
 
             <!--<br>-->
             <!--<h3>OR</h3>-->
diff --git a/packages/nc-gui/plugins/projectLoader.js b/packages/nc-gui/plugins/projectLoader.js
index 6efbbbb692..50b4d397ce 100644
--- a/packages/nc-gui/plugins/projectLoader.js
+++ b/packages/nc-gui/plugins/projectLoader.js
@@ -66,6 +66,8 @@ export default async({ store, redirect, $axios, $toast }) => {
       const releaseInfo = await store.dispatch('sqlMgr/ActSqlOp', [null, 'xcRelease'])
       if (releaseInfo && releaseInfo.docker && releaseInfo.docker.upgrade) {
         store.commit('app/MutReleaseVersion', releaseInfo.docker.name)
+      } else {
+        store.commit('app/MutReleaseVersion', null)
       }
     } catch (e) {
       // ignore