Browse Source

fix(gui): clear release info if there is no new release available

Signed-off-by: Pranav C <61551451+pranavxc@users.noreply.github.com>
pull/365/head
Pranav C 3 years ago
parent
commit
7d79806cfd
  1. 14
      packages/nc-gui/.eslintrc.json
  2. 2
      packages/nc-gui/components/project/spreadsheet/components/virtualCell/hasManyCell.vue
  3. 9
      packages/nc-gui/pages/user/authentication/signup/index.vue
  4. 2
      packages/nc-gui/plugins/projectLoader.js

14
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"
// }
// }
}

2
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"

9
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>-->

2
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

Loading…
Cancel
Save