Browse Source

fix: gui caching issue after upgrading

re #533

Signed-off-by: Pranav C <pranavxc@gmail.com>
pull/614/head
Pranav C 3 years ago
parent
commit
07617e02fb
  1. 2
      packages/nc-gui/components/ProjectTreeView.vue
  2. 2
      packages/nc-gui/components/authTab.vue
  3. 2
      packages/nc-gui/components/project/appStore.vue
  4. 2
      packages/nc-gui/components/project/table.vue
  5. 22
      packages/nc-gui/components/projectTabs.vue
  6. 2
      packages/nc-gui/pages/index.vue
  7. 6
      packages/nc-lib-gui/lib/XcLibGui.js
  8. 2
      packages/nc-lib-gui/package.json
  9. 8
      packages/nocodb/package-lock.json
  10. 4
      packages/nocodb/package.json

2
packages/nc-gui/components/ProjectTreeView.vue

@ -1,5 +1,5 @@
<template>
<div style="height: 100%" @mouseenter="onMiniHoverEnter" @mouseleave="onMiniHoverLeave">
<div style="height: 100%" class="nc-tree-view" @mouseenter="onMiniHoverEnter" @mouseleave="onMiniHoverLeave">
<!-- :expand-on-hover="mini"-->
<v-navigation-drawer
ref="drawer"

2
packages/nc-gui/components/authTab.vue

@ -1,5 +1,5 @@
<template>
<div class="h-100">
<div class="h-100 nc-auth-tab">
<div class="h-100" style="width: 100%">
<v-tabs height="30" color="x-active">
<v-tab>

2
packages/nc-gui/components/project/appStore.vue

@ -1,5 +1,5 @@
<template>
<div class="d-flex h-100">
<div class="d-flex h-100 nc-app-store-tab">
<v-dialog v-model="pluginInstallOverlay" min-width="400px" max-width="700px" min-height="300">
<v-card
v-if="installPlugin && pluginInstallOverlay"

2
packages/nc-gui/components/project/table.vue

@ -1,5 +1,5 @@
<template>
<v-container fluid class="pa-0 ma-0" style="height: 100%">
<v-container fluid class="pa-0 ma-0 nc-table-tab" style="height: 100%">
<v-alert v-if="error" type="error" class="ma-2">
{{ error }}
</v-alert>

22
packages/nc-gui/components/projectTabs.vue

@ -6,7 +6,7 @@
dark
background-color="primary"
height="40"
class="project-tabs"
class="project-tabs nc-project-tabs"
color=""
next-icon="mdi-arrow-right-bold-box-outline"
prev-icon="mdi-arrow-left-bold-box-outline"
@ -254,17 +254,7 @@
<script>
import { mapGetters, mapMutations } from 'vuex'
// import Roles from '@/components/auth/roles'
import GlobalAcl from '@/components/globalAcl'
import GrpcClient from '@/components/project/grpcClient'
import ProjectSettings from '@/components/project/projectSettings'
// import CreateOrEditProject from '@/components/createOrEditProject'
import DisableOrEnableModels from '@/components/project/projectMetadata/disableOrEnableModels'
import CronJobs from '@/components/project/cronJobs'
import AuthTab from '@/components/authTab'
import AppStore from '@/components/project/appStore'
import DlgTableCreate from '@/components/utils/dlgTableCreate'
import Screensaver from '@/components/screensaver'
import SwaggerClient from '@/components/project/swaggerClient'
import treeViewIcons from '../helpers/treeViewIcons'
import TableView from './project/table'
import ViewTab from './project/view'
@ -284,6 +274,16 @@ import xTerm from './xTerm'
import ApiClientSwaggerTab from './project/apiClientSwagger'
import XcMeta from './project/settings/xcMeta'
import XcInfo from './project/xcInfo'
import SwaggerClient from '@/components/project/swaggerClient'
import Screensaver from '@/components/screensaver'
import DlgTableCreate from '@/components/utils/dlgTableCreate'
import AppStore from '@/components/project/appStore'
import AuthTab from '@/components/authTab'
import CronJobs from '@/components/project/cronJobs'
import DisableOrEnableModels from '@/components/project/projectMetadata/disableOrEnableModels'
import ProjectSettings from '@/components/project/projectSettings'
import GrpcClient from '@/components/project/grpcClient'
import GlobalAcl from '@/components/globalAcl'
import AuditTab from '~/components/project/auditTab'
export default {

2
packages/nc-gui/pages/index.vue

@ -1,6 +1,6 @@
<template>
<v-row
class="welcome-page"
class="welcome-page nc-welcome-page"
style="min-height: 100vh"
align="center"
justify="center"

6
packages/nc-lib-gui/lib/XcLibGui.js

@ -11,6 +11,12 @@ class XcLibGui {
expressMiddleware() {
const router = express.Router();
router.get('/', (request, response) => {
response.header('Cache-Control', 'private, no-cache, no-store, must-revalidate');
response.header('Expires', '-1');
response.header('Pragma', 'no-cache');
response.sendFile(path.join(__dirname, 'dist','index.html'));
});
router.use('/', express.static(path.join(__dirname, 'dist')));
return router;
}

2
packages/nc-lib-gui/package.json

@ -1,6 +1,6 @@
{
"name": "nc-lib-gui",
"version": "0.2.58",
"version": "0.2.60",
"description": "> TODO: description",
"author": "“pranavxc” <pranavxc@gmail.com>",
"homepage": "https://gitlab.com/xgenecloud-ts/xgenecloud-ts#readme",

8
packages/nocodb/package-lock.json generated

@ -1,6 +1,6 @@
{
"name": "nocodb",
"version": "0.11.39",
"version": "0.11.40",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
@ -12360,9 +12360,9 @@
}
},
"nc-lib-gui": {
"version": "0.2.58",
"resolved": "https://registry.npmjs.org/nc-lib-gui/-/nc-lib-gui-0.2.58.tgz",
"integrity": "sha512-lYjSiGqob5+CfJUwsA5v+4u3nHCZ7iHXrI3nLMfkvvWstvuRBhcUKkINhUL3AcV9yWOuuhCF8c8Txv59x2btCg==",
"version": "0.2.60",
"resolved": "https://registry.npmjs.org/nc-lib-gui/-/nc-lib-gui-0.2.60.tgz",
"integrity": "sha512-pOXQlAHuJxnk5Eo0lNpi3hJFPvuSgbiMDxwFM0Nme6pswGvhB86138IYujSZeai2TGcVjreNNcQaiHItvtAhrw==",
"requires": {
"axios": "^0.19.2",
"body-parser": "^1.19.0",

4
packages/nocodb/package.json

@ -147,7 +147,7 @@
"nanoid": "^3.1.20",
"nc-common": "0.0.6",
"nc-help": "^0.2.14",
"nc-lib-gui": "0.2.58",
"nc-lib-gui": "0.2.60",
"nc-plugin": "^0.1.1",
"ncp": "^2.0.0",
"nodemailer": "^6.4.10",
@ -244,4 +244,4 @@
"**/*.spec.js"
]
}
}
}

Loading…
Cancel
Save