From da94db14f8f73654ac25eb37b45bbe8be2d38218 Mon Sep 17 00:00:00 2001
From: Pranav C <61551451+pranavxc@users.noreply.github.com>
Date: Mon, 2 Aug 2021 17:20:45 +0530
Subject: [PATCH] fix: project import issues

Correction in error message and added import permission to user role

re #400

Signed-off-by: Pranav C <61551451+pranavxc@users.noreply.github.com>
---
 packages/nc-gui/components/project/settings/xcMeta.vue | 10 +++++-----
 packages/nc-gui/pages/projects/index.vue               |  6 +++---
 packages/nocodb/src/lib/noco/meta/NcMetaMgr.ts         |  2 +-
 packages/nocodb/src/lib/utils/projectAcl.ts            |  8 +++++---
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/packages/nc-gui/components/project/settings/xcMeta.vue b/packages/nc-gui/components/project/settings/xcMeta.vue
index fa0326beec..a4de7a5049 100644
--- a/packages/nc-gui/components/project/settings/xcMeta.vue
+++ b/packages/nc-gui/components/project/settings/xcMeta.vue
@@ -180,7 +180,7 @@ export default {
             ])
             this.$toast.success('Successfully exported metadata').goAway(3000)
           } catch (e) {
-            this.$toast.error('Some internal error occurred').goAway(3000)
+            this.$toast.error(e.message).goAway(3000)
           }
           this.dialogShow = false
           this.loading = null
@@ -217,7 +217,7 @@ export default {
             link.click()
             this.$toast.success('Successfully exported metadata').goAway(3000)
           } catch (e) {
-            this.$toast.error('Some internal error occurred').goAway(3000)
+            this.$toast.error(e.message).goAway(3000)
           }
           this.dialogShow = false
           this.loading = null
@@ -242,7 +242,7 @@ export default {
             ])
             this.$toast.success('Metadata cleared successfully').goAway(3000)
           } catch (e) {
-            this.$toast.error('Some internal error occurred').goAway(3000)
+            this.$toast.error(e.message).goAway(3000)
           }
           this.dialogShow = false
           this.loading = null
@@ -268,7 +268,7 @@ export default {
 
             this.$toast.success('Metadata imported successfully').goAway(3000)
           } catch (e) {
-            this.$toast.error('Some internal error occurred').goAway(3000)
+            this.$toast.error(e.message).goAway(3000)
           }
           this.dialogShow = false
           this.loading = null
@@ -292,7 +292,7 @@ export default {
           ])
           this.$toast.success('Successfully imported metadata').goAway(3000)
         } catch (e) {
-          this.$toast.error('Some internal error occurred').goAway(3000)
+          this.$toast.error(e.message).goAway(3000)
         }
         this.dialogShow = false
         this.loading = null
diff --git a/packages/nc-gui/pages/projects/index.vue b/packages/nc-gui/pages/projects/index.vue
index e559a6f631..91362ad394 100644
--- a/packages/nc-gui/pages/projects/index.vue
+++ b/packages/nc-gui/pages/projects/index.vue
@@ -999,7 +999,7 @@ export default {
               .success('Successfully exported metadata')
               .goAway(3000)
           } catch (e) {
-            this.$toast.error('Some internal error occurred').goAway(3000)
+            this.$toast.error(e.message).goAway(3000)
           }
           this.dialogShow = false
           this.loading = null
@@ -1025,7 +1025,7 @@ export default {
             ])
             this.$toast.success('Metadata cleared successfully').goAway(3000)
           } catch (e) {
-            this.$toast.error('Some internal error occurred').goAway(3000)
+            this.$toast.error(e.message).goAway(3000)
           }
           this.dialogShow = false
           this.loading = null
@@ -1056,7 +1056,7 @@ export default {
           this.$toast.success('Successfully imported metadata').goAway(3000)
           await this.projectsLoad()
         } catch (e) {
-          this.$toast.error('Some internal error occurred').goAway(3000)
+          this.$toast.error(e.message).goAway(3000)
         }
         this.dialogShow = false
         this.loading = null
diff --git a/packages/nocodb/src/lib/noco/meta/NcMetaMgr.ts b/packages/nocodb/src/lib/noco/meta/NcMetaMgr.ts
index a851b18927..f433a30a38 100644
--- a/packages/nocodb/src/lib/noco/meta/NcMetaMgr.ts
+++ b/packages/nocodb/src/lib/noco/meta/NcMetaMgr.ts
@@ -405,7 +405,7 @@ export default class NcMetaMgr {
         // check project already exist
         if (await this.xcMeta.projectGetById(importProjectId)) {
           // todo:
-          throw new Error(`Project with id '${importProjectId}' already exist`)
+          throw new Error(`Project with id '${importProjectId}' already exist, it's not allowed at the moment`)
         } else {
           // create the project if not found
           await this.xcMeta.knex('nc_projects').insert(projectConfig);
diff --git a/packages/nocodb/src/lib/utils/projectAcl.ts b/packages/nocodb/src/lib/utils/projectAcl.ts
index 5709489aa7..11e834de64 100644
--- a/packages/nocodb/src/lib/utils/projectAcl.ts
+++ b/packages/nocodb/src/lib/utils/projectAcl.ts
@@ -4,7 +4,7 @@ export default {
   guest: {},
   editor: {
     xcAuditCreate: true,
-    xcAttachmentUpload:true,
+    xcAttachmentUpload: true,
     xcVirtualTableList: true,
     xcMetaTablesImportZipToLocalFsAndDb: false,
     // testConnection:true,
@@ -164,7 +164,7 @@ export default {
 
     xcModelRowAuditAndCommentList: true,
     xcAuditCommentInsert: true,
-    xcAuditModelCommentsCount:true
+    xcAuditModelCommentsCount: true
   },
   commenter: {
     xcVirtualTableList: true,
@@ -188,7 +188,7 @@ export default {
 
     xcModelRowAuditAndCommentList: true,
     xcAuditCommentInsert: true,
-    xcAuditModelCommentsCount:true
+    xcAuditModelCommentsCount: true
   }, viewer: {
     xcVirtualTableList: true,
     projectList: true,
@@ -219,6 +219,8 @@ export default {
     projectDelete: false,
     projectRestart: false,
     projectStart: false,
+    xcMetaTablesImportZipToLocalFsAndDb: true,
+    xcMetaTablesExportDbToZip: true
   }
 }