From 309e992bf617bd15886df7a563c82b418a30f7cf Mon Sep 17 00:00:00 2001 From: Raju Udava <86527202+dstala@users.noreply.github.com> Date: Wed, 13 Apr 2022 13:26:09 +0530 Subject: [PATCH 1/2] fix: toast error corrections & cache flush on delete Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> --- packages/nc-gui/components/createOrEditProject.vue | 13 ++----------- packages/nc-gui/pages/project/xcdb.vue | 2 +- packages/nocodb/src/lib/noco-models/Project.ts | 4 ++++ 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/packages/nc-gui/components/createOrEditProject.vue b/packages/nc-gui/components/createOrEditProject.vue index 813e4255a6..e46832832d 100644 --- a/packages/nc-gui/components/createOrEditProject.vue +++ b/packages/nc-gui/components/createOrEditProject.vue @@ -87,12 +87,8 @@ :height="20" :label="$t('placeholder.projName')" autofocus - > - - - + /> - - - - @@ -1154,7 +1147,6 @@ export default { }, selectFile(db, obj, key, index) { this.$refs[key][index].click() - }, onPanelToggle(panelIndex, envKey) { this.$nextTick(() => { @@ -1289,7 +1281,6 @@ export default { }, constructProjectJsonFromProject(project) { - const p = project // JSON.parse(JSON.stringify(project.projectJson)); p.ui = { @@ -1403,6 +1394,7 @@ export default { this.projectCreated = true } catch (e) { this.$toast.error(await this._extractSdkResponseErrorMsg(e)).goAway(3000) + toast.goAway(100) } this.projectReloading = false @@ -1882,7 +1874,6 @@ export default { } } } - } }, beforeMount() { diff --git a/packages/nc-gui/pages/project/xcdb.vue b/packages/nc-gui/pages/project/xcdb.vue index 3df04c0bf8..12fb168366 100644 --- a/packages/nc-gui/pages/project/xcdb.vue +++ b/packages/nc-gui/pages/project/xcdb.vue @@ -156,7 +156,7 @@ export default { } }) } catch (e) { - this.$toast.error(e.message).goAway(3000) + this.$toast.error(await this._extractSdkResponseErrorMsg(e)).goAway(3000) } this.loading = false } else { diff --git a/packages/nocodb/src/lib/noco-models/Project.ts b/packages/nocodb/src/lib/noco-models/Project.ts index e1bc347051..59599f3d9b 100644 --- a/packages/nocodb/src/lib/noco-models/Project.ts +++ b/packages/nocodb/src/lib/noco-models/Project.ts @@ -184,6 +184,10 @@ export default class Project implements ProjectType { } if (o) await NocoCache.del(`${CacheScope.PROJECT}:${projectId}`); + if (o?.title) { + await NocoCache.del(`${CacheScope.PROJECT}:${o.title}`); + } + // remove item in cache list await NocoCache.deepDel( CacheScope.PROJECT, From 58c0a6a47cb5a7431aefe988246753811c7874bd Mon Sep 17 00:00:00 2001 From: Raju Udava <86527202+dstala@users.noreply.github.com> Date: Wed, 13 Apr 2022 15:25:48 +0530 Subject: [PATCH 2/2] review correction: make toast disappear immediately Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> --- packages/nc-gui/components/createOrEditProject.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/nc-gui/components/createOrEditProject.vue b/packages/nc-gui/components/createOrEditProject.vue index e46832832d..922843d5a3 100644 --- a/packages/nc-gui/components/createOrEditProject.vue +++ b/packages/nc-gui/components/createOrEditProject.vue @@ -1394,7 +1394,7 @@ export default { this.projectCreated = true } catch (e) { this.$toast.error(await this._extractSdkResponseErrorMsg(e)).goAway(3000) - toast.goAway(100) + toast.goAway(0) } this.projectReloading = false