From 328869a85038bf7c53856eef17aeefcaf0538922 Mon Sep 17 00:00:00 2001 From: Alexey Sandler Date: Sun, 26 Jan 2020 14:41:24 +0200 Subject: create a flag FLAG_2006_USER_PERMISSIONS_BY_OWNING_ENTITY in dev. Issue-ID: VID-758 Signed-off-by: Alexey Sandler Change-Id: I6f5b9717b63ab1cffd8f27024f0752a2699db736 --- features.properties.md | 4 ++++ vid-app-common/src/main/java/org/onap/vid/properties/Features.java | 1 + .../src/main/webapp/app/vid/scripts/constants/componentConstants.js | 3 ++- vid-automation/src/main/java/vid/automation/test/infra/Features.java | 1 + .../cypress/support/jsonBuilders/mocks/jsons/flags.cypress.json | 3 ++- .../src/app/shared/services/featureFlag/feature-flags.service.ts | 3 ++- 6 files changed, 12 insertions(+), 3 deletions(-) diff --git a/features.properties.md b/features.properties.md index f5e1113b9..b2e453c52 100644 --- a/features.properties.md +++ b/features.properties.md @@ -207,4 +207,8 @@ * FLAG_MORE_AUDIT_INFO_LINK_ON_AUDIT_INFO On the "audit info" modal (available on Instantiation Status page), shows a link navigating to the read-only RETRY page with more audit info. + +*FLAG_2006_USER_PERMISSIONS_BY_OWNING_ENTITY + When flag is true the user will be provided with edit permissions by owning entity id even the user have no permission by Subscriber, + when the flag is false the user provided with edit permission by Subscriber. \ No newline at end of file diff --git a/vid-app-common/src/main/java/org/onap/vid/properties/Features.java b/vid-app-common/src/main/java/org/onap/vid/properties/Features.java index 74f7d4e0b..fd50321a3 100644 --- a/vid-app-common/src/main/java/org/onap/vid/properties/Features.java +++ b/vid-app-common/src/main/java/org/onap/vid/properties/Features.java @@ -84,6 +84,7 @@ public enum Features implements Feature { FLAG_2004_INSTANTIATION_TEMPLATES_POPUP, FLAG_2002_UNLIMITED_MAX, FLAG_MORE_AUDIT_INFO_LINK_ON_AUDIT_INFO, + FLAG_2006_USER_PERMISSIONS_BY_OWNING_ENTITY, ; diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/constants/componentConstants.js b/vid-app-common/src/main/webapp/app/vid/scripts/constants/componentConstants.js index 9cdd5ceb9..1e8a04baf 100755 --- a/vid-app-common/src/main/webapp/app/vid/scripts/constants/componentConstants.js +++ b/vid-app-common/src/main/webapp/app/vid/scripts/constants/componentConstants.js @@ -265,7 +265,8 @@ appDS2 FLAG_FLASH_REPLACE_VF_MODULE: "FLAG_FLASH_REPLACE_VF_MODULE", FLAG_FLASH_MORE_ACTIONS_BUTTON_IN_OLD_VIEW_EDIT: "FLAG_FLASH_MORE_ACTIONS_BUTTON_IN_OLD_VIEW_EDIT", FLAG_SHOW_ORCHESTRATION_TYPE: "FLAG_SHOW_ORCHESTRATION_TYPE", - FLAG_2004_INSTANTIATION_TEMPLATES_POPUP : "FLAG_2004_INSTANTIATION_TEMPLATES_POPUP" + FLAG_2004_INSTANTIATION_TEMPLATES_POPUP : "FLAG_2004_INSTANTIATION_TEMPLATES_POPUP", + FLAG_2006_USER_PERMISSIONS_BY_OWNING_ENTITY: "FLAG_2006_USER_PERMISSIONS_BY_OWNING_ENTITY" } }; diff --git a/vid-automation/src/main/java/vid/automation/test/infra/Features.java b/vid-automation/src/main/java/vid/automation/test/infra/Features.java index f55053497..8495ceb0f 100644 --- a/vid-automation/src/main/java/vid/automation/test/infra/Features.java +++ b/vid-automation/src/main/java/vid/automation/test/infra/Features.java @@ -57,6 +57,7 @@ public enum Features implements Feature { FLAG_2004_CREATE_ANOTHER_INSTANCE_FROM_TEMPLATE, FLAG_2002_UNLIMITED_MAX, FLAG_2004_INSTANTIATION_TEMPLATES_POPUP, + FLAG_2006_USER_PERMISSIONS_BY_OWNING_ENTITY, ; public boolean isActive() { diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/flags.cypress.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/flags.cypress.json index c7740207c..bd9fb9025 100644 --- a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/flags.cypress.json +++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/flags.cypress.json @@ -22,5 +22,6 @@ "FLAG_2004_INSTANTIATION_STATUS_FILTER": true, "FLAG_2004_INSTANTIATION_TEMPLATES_POPUP" : false, "FLAG_2002_UNLIMITED_MAX" : true, - "FLAG_2004_CREATE_ANOTHER_INSTANCE_FROM_TEMPLATE": true + "FLAG_2004_CREATE_ANOTHER_INSTANCE_FROM_TEMPLATE": true, + "FLAG_2006_USER_PERMISSIONS_BY_OWNING_ENTITY": true } diff --git a/vid-webpack-master/src/app/shared/services/featureFlag/feature-flags.service.ts b/vid-webpack-master/src/app/shared/services/featureFlag/feature-flags.service.ts index 19a3fc73c..db270decf 100644 --- a/vid-webpack-master/src/app/shared/services/featureFlag/feature-flags.service.ts +++ b/vid-webpack-master/src/app/shared/services/featureFlag/feature-flags.service.ts @@ -16,7 +16,8 @@ export enum Features { FLAG_2004_INSTANTIATION_STATUS_FILTER ='FLAG_2004_INSTANTIATION_STATUS_FILTER', FLAG_2004_CREATE_ANOTHER_INSTANCE_FROM_TEMPLATE = 'FLAG_2004_CREATE_ANOTHER_INSTANCE_FROM_TEMPLATE', FLAG_MORE_AUDIT_INFO_LINK_ON_AUDIT_INFO = 'FLAG_MORE_AUDIT_INFO_LINK_ON_AUDIT_INFO', - FLAG_2004_INSTANTIATION_TEMPLATES_POPUP = 'FLAG_2004_INSTANTIATION_TEMPLATES_POPUP' + FLAG_2004_INSTANTIATION_TEMPLATES_POPUP = 'FLAG_2004_INSTANTIATION_TEMPLATES_POPUP', + FLAG_2006_USER_PERMISSIONS_BY_OWNING_ENTITY= 'FLAG_2006_USER_PERMISSIONS_BY_OWNING_ENTITY' } @Injectable() -- cgit 1.2.3-korg