From 342b189cfeb87ab0f156c2afc4319ed33dd541a0 Mon Sep 17 00:00:00 2001 From: Wing-Kam Wong Date: Fri, 22 Apr 2022 12:00:56 +0800 Subject: [PATCH 1/3] fix: correct ui allowed names Signed-off-by: Wing-Kam Wong --- .../components/project/spreadsheet/components/moreActions.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/nc-gui/components/project/spreadsheet/components/moreActions.vue b/packages/nc-gui/components/project/spreadsheet/components/moreActions.vue index 46441815ff..dfeda8ca45 100644 --- a/packages/nc-gui/components/project/spreadsheet/components/moreActions.vue +++ b/packages/nc-gui/components/project/spreadsheet/components/moreActions.vue @@ -63,7 +63,7 @@ Date: Fri, 22 Apr 2022 12:02:09 +0800 Subject: [PATCH 2/3] fix: allow editors to import csv Signed-off-by: Wing-Kam Wong --- packages/nc-gui/helpers/rolePermissionsEE.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/nc-gui/helpers/rolePermissionsEE.js b/packages/nc-gui/helpers/rolePermissionsEE.js index 4687f32f6b..3fd9c12907 100644 --- a/packages/nc-gui/helpers/rolePermissionsEE.js +++ b/packages/nc-gui/helpers/rolePermissionsEE.js @@ -13,7 +13,8 @@ export default { sortSync: true, fieldsSync: true, gridColUpdate: true, - filterSync: true + filterSync: true, + csvImport: true }, commenter: { smartSheet: true, @@ -34,6 +35,7 @@ export default { * * @author Naveen MR * @author Pranav C Balan + * @author Wing-Kam Wong * * @license GNU AGPL version 3 or any later version * From 62cbf6b5b7fb632af6ea63c3f4fc639e3fdaed4c Mon Sep 17 00:00:00 2001 From: Wing-Kam Wong Date: Fri, 22 Apr 2022 12:58:58 +0800 Subject: [PATCH 3/3] fix: cypress test for editor acl Signed-off-by: Wing-Kam Wong --- scripts/cypress/integration/spec/roleValidation.spec.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scripts/cypress/integration/spec/roleValidation.spec.js b/scripts/cypress/integration/spec/roleValidation.spec.js index dddaaee322..e4412d015e 100644 --- a/scripts/cypress/integration/spec/roleValidation.spec.js +++ b/scripts/cypress/integration/spec/roleValidation.spec.js @@ -215,6 +215,7 @@ export function _editComment(roleType, previewMode) { export function _viewMenu(roleType, previewMode) { let columnName = "City"; let navDrawListCnt = 1; + // Download CSV let actionsMenuItemsCnt = 1; cy.openTableTab(columnName, 25); @@ -231,7 +232,11 @@ export function _viewMenu(roleType, previewMode) { // Owner, Creator will have two navigation drawer (on each side of center panel) if (roleType == "owner" || roleType == "creator") { navDrawListCnt = 2; + // Download CSV / Upload CSV / Shared View List / Webhook actionsMenuItemsCnt = 4; + } else if (roleType == "editor") { + // Download CSV / Upload CSV + actionsMenuItemsCnt = 2; } cy.get(".v-navigation-drawer__content")