Catalog alignment
Issue-ID: SDC-2724
Signed-off-by: ys9693 <ys9693@att.com>
Change-Id: I52b4aacb58cbd432ca0e1ff7ff1f7dd52099c6fe
diff --git a/catalog-ui/configurations/MenuReadMe.txt b/catalog-ui/configurations/MenuReadMe.txt
index 16a7d0f..248898d 100644
--- a/catalog-ui/configurations/MenuReadMe.txt
+++ b/catalog-ui/configurations/MenuReadMe.txt
@@ -8,9 +8,6 @@
-----------------------------
ADMIN
DESIGNER
-TESTER
-OPS
-GOVERNOR
The JSON is separated to roles, and for each role we define "states",
what menu to show the user for each state of the component:
@@ -19,8 +16,6 @@
-----------------------------
NOT_CERTIFIED_CHECKOUT
NOT_CERTIFIED_CHECKIN
-READY_FOR_CERTIFICATION
-CERTIFICATION_IN_PROGRESS
CERTIFIED
For each state we can define the user that will see this menu, the available parameters are:
@@ -39,7 +34,6 @@
"ANY":[
{"text":"Edit" ,"action":"goToEntity"},
{"text":"Check in","action":"changeLifecycleState", "url":"lifecycleState/CHECKIN", "confirmationModal": "lifecycleState/CHECKIN"},
- {"text":"Submit for Testing","action":"changeLifecycleState", "url":"lifecycleState/certificationRequest", "emailModal": "lifecycleState/CERTIFICATIONREQUEST"},
{"text":"View" ,"action":"openViewerModal"}
],
"NOT_OWNER":[
@@ -54,5 +48,4 @@
action - Function that will be called when pressing on the menu item
url - Data added to menu item, in case the function need to use it, example: for function "changeLifecycleState", I need to pass also the url "lifecycleState/CHECKOUT" that I want the state to change to.
confirmationModal - Open confirmation modal (user should select "OK" or "Cancel"), and continue with the action.
-emailModal - Open email modal (user should fill email details), and continue with the action.
blockedForTypes - This item will not be shown for specific components types.
diff --git a/catalog-ui/configurations/dev.js b/catalog-ui/configurations/dev.js
index bca5912..a57d1b9 100644
--- a/catalog-ui/configurations/dev.js
+++ b/catalog-ui/configurations/dev.js
@@ -1,59 +1,58 @@
const SDC_CONFIG = {
"environment": "dev",
"api": {
- "GET_component": "/v1/catalog/:type/:id",
- "PUT_component": "/v1/catalog/:type/:id/metadata",
- "GET_component_validate_name": "/v1/catalog/:type/validate-name/:name",
- "POST_changeLifecycleState": "/v1/catalog/",
- "component_api_root": "/v1/catalog/",
- "GET_user": "/v1/user/:id",
- "GET_user_authorize": "/v1/user/authorize",
- "GET_all_users": "/v1/user/users",
- "POST_create_user": "/v1/user",
- "DELETE_delete_user": "/v1/user/:id",
- "POST_edit_user_role": "/v1/user/:id/role",
- "GET_resource": "/v1/catalog/resources/:id",
- "GET_resources_latestversion_notabstract":"/v1/catalog/:type/latestversion/notabstract/:id",
- "GET_resources_certified_not_abstract": "/v1/catalog/resources/certified/notabstract/:id",
- "GET_resources_certified_abstract": "/v1/catalog/resources/certified/abstract/:id",
- "GET_resource_property": "/v1/catalog/:type/:entityId/properties/:id",
- "PUT_resource": "/v1/catalog/resources/:id/metadata",
- "GET_resource_artifact": "/v1/catalog/:type/:entityId/artifacts/:id",
- "GET_download_instance_artifact": "/v1/catalog/:type/:entityId/resourceInstances/:instanceId/artifacts/:id",
- "POST_instance_artifact": "/v1/catalog/:type/:entityId/resourceInstance/:instanceId/artifacts/:id",
- "GET_resource_additional_information": "/v1/catalog/:type/:entityId/additionalinfo/:id",
- "GET_service_artifact": "/v1/catalog/services/:serviceId/artifacts/:id",
- "GET_resource_interface_artifact": "/v1/catalog/:type/:entityId/standard/:operation/artifacts/:id",
- "GET_resource_api_artifact": "/v1/catalog/:type/:entityId/artifacts/api/:id",
- "GET_configuration_ui": "/v1/configuration/ui",
+ "GET_SDC_Setup_Data": "/v1/setup/ui",
+ "GET_component": "/v1/catalog/:type/:id",
+ "PUT_component": "/v1/catalog/:type/:id/metadata",
+ "GET_component_validate_name": "/v1/catalog/:type/validate-name/:name",
+ "POST_changeLifecycleState": "/v1/catalog/",
+ "component_api_root": "/v1/catalog/",
+ "GET_user": "/v1/user/:id",
+ "GET_user_authorize": "/v1/user/authorize",
+ "GET_all_users": "/v1/user/users",
+ "POST_create_user": "/v1/user",
+ "DELETE_delete_user": "/v1/user/:id",
+ "POST_edit_user_role": "/v1/user/:id/role",
+ "GET_resource": "/v1/catalog/resources/:id",
+ "GET_resources_latestversion_notabstract":"/v1/catalog/:type/latestversion/notabstract/:id",
+ "GET_resources_certified_not_abstract": "/v1/catalog/resources/certified/notabstract/:id",
+ "GET_resources_certified_abstract": "/v1/catalog/resources/certified/abstract/:id",
+ "GET_resource_property": "/v1/catalog/:type/:entityId/properties/:id",
+ "PUT_resource": "/v1/catalog/resources/:id/metadata",
+ "GET_resource_artifact": "/v1/catalog/:type/:entityId/artifacts/:id",
+ "GET_download_instance_artifact": "/v1/catalog/:type/:entityId/resourceInstances/:instanceId/artifacts/:id",
+ "POST_instance_artifact": "/v1/catalog/:type/:entityId/resourceInstance/:instanceId/artifacts/:id",
+ "GET_resource_additional_information": "/v1/catalog/:type/:entityId/additionalinfo/:id",
+ "GET_service_artifact": "/v1/catalog/services/:serviceId/artifacts/:id",
+ "GET_resource_interface_artifact": "/v1/catalog/:type/:entityId/standard/:operation/artifacts/:id",
+ "GET_resource_api_artifact": "/v1/catalog/:type/:entityId/artifacts/api/:id",
+ "GET_configuration_ui": "/v1/configuration/ui",
"GET_plugins_configuration": "/config/ui/plugins",
"GET_plugin_online_state": "/config/ui/plugins/:pluginId/online",
- "GET_resource_validate_name": "/v1/catalog/resources/validate-name/:name",
- "GET_activity_log": "/v1/catalog/audit-records/:type/:id",
- "GET_service": "/v1/catalog/services/:id",
- "GET_service_validate_name": "/v1/catalog/services/validate-name/:name",
- "GET_service_distributions":"/v1/catalog/services/:uuid/distribution",
- "GET_service_distributions_components":"/v1/catalog/services/distribution/:distributionId",
- "POST_service_distribution_deploy" : "/v1/catalog/services/:serviceId/distribution/:distributionId/markDeployed",
- "GET_element": "/v1/followed",
- "GET_catalog": "/v1/screen",
- "GET_ecomp_menu_items": "/v1/user/:userId/functionalmenu",
- "GET_resource_category": "/v1/resourceCategories",
- "GET_service_category": "/v1/serviceCategories",
- "resource_instance": "/v1/catalog/:entityType/:entityId/resourceInstance/:id",
- "GET_resource_instance_property": "/v1/catalog/:type/:entityId/resourceInstance/:componentInstanceId/property/:propertyValueId",
- "GET_relationship": "/v1/catalog/:entityType/:entityId/resourceInstance/:action",
- "GET_lifecycle_state_resource": "/v1/catalog/:type/:id/lifecycleState/:action",
- "GET_lifecycle_state_CHECKIN":"lifecycleState/CHECKIN",
- "GET_lifecycle_state_CERTIFICATIONREQUEST":"lifecycleState/CERTIFICATIONREQUEST",
- "GET_lifecycle_state_UNDOCHECKOUT":"lifecycleState/UNDOCHECKOUT",
- "root": "/sdc1/feProxy/rest",
- "no_proxy_root": "/sdc1/rest",
+ "GET_resource_validate_name": "/v1/catalog/resources/validate-name/:name",
+ "GET_activity_log": "/v1/catalog/audit-records/:type/:id",
+ "GET_service": "/v1/catalog/services/:id",
+ "GET_service_validate_name": "/v1/catalog/services/validate-name/:name",
+ "GET_service_distributions":"/v1/catalog/services/:uuid/distribution",
+ "GET_service_distributions_components":"/v1/catalog/services/distribution/:distributionId",
+ "POST_service_distribution_deploy" : "/v1/catalog/services/:serviceId/distribution/:distributionId/markDeployed",
+ "GET_element": "/v1/followed",
+ "GET_catalog": "/v1/screen",
+ "GET_ecomp_menu_items": "/v1/user/:userId/functionalmenu",
+ "GET_resource_category": "/v1/resourceCategories",
+ "GET_service_category": "/v1/serviceCategories",
+ "resource_instance": "/v1/catalog/:entityType/:entityId/resourceInstance/:id",
+ "GET_resource_instance_property": "/v1/catalog/:type/:entityId/resourceInstance/:componentInstanceId/property/:propertyValueId",
+ "GET_relationship": "/v1/catalog/:entityType/:entityId/resourceInstance/:action",
+ "GET_lifecycle_state_resource": "/v1/catalog/:type/:id/lifecycleState/:action",
+ "GET_lifecycle_state_CHECKIN":"lifecycleState/CHECKIN",
+ "GET_lifecycle_state_UNDOCHECKOUT":"lifecycleState/UNDOCHECKOUT",
+ "root": "/sdc1/feProxy/rest",
+ "no_proxy_root": "/sdc1/rest",
"workflow_root": "/sdc1/feProxy/wf",
"POST_workflow_artifact": "sdc/v1/catalog",
- "PUT_service": "/v1/catalog/services/:id/metadata",
- "GET_download_artifact": "/v1/catalog/",
- "GET_SDC_Version": "/version",
+ "PUT_service": "/v1/catalog/services/:id/metadata",
+ "GET_download_artifact": "/v1/catalog/",
"GET_categories": "/v1/categories/:types",
"POST_category": "/v1/category/:types/:categoryId",
"POST_subcategory": "/v1/category/:types/:categoryId/subCategory/:subCategoryId",
@@ -67,10 +66,12 @@
"create_policy_instance":"/v1/catalog/:entityType/:entityId/policies/:policyId",
"CRUD_policy":"/v1/catalog/:entityType/policies/:policyId",
"POST_GAB_Search": "/v1/catalog/gab/searchFor",
-
+ "uicache_root":"/sdc1/feProxy/uicache/v1",
+ "GET_uicache_catalog":"/catalog",
+ "GET_uicache_left_palette":"/catalog/resources/latestversion/notabstract/metadata",
},
"resourceTypesFilter":{
- "resource":["CP","VFC","VL","CVFC","GROUP","POLICY"],
+ "resource":["CP","VFC","VL","CVFC","GROUP","POLICY", "Configuration"],
"service":["CP","VF","VL", "PNF","CR","CVFC","SERVICE","Configuration","GROUP","POLICY"]
},
"logConfig": {
@@ -91,7 +92,7 @@
"cpEndPointInstances" : ["cloudep","ossep","personep","premisesep"],
"toscaFileExtension":"yaml,yml",
"csarFileExtension":"csar",
- "showOutlook": false,
+ "showOutlook": true,
"validationConfigPath":"configurations/validation.json",
"categories": {},
"testers": {
@@ -107,7 +108,7 @@
"default": "DL-ASDCL1-4ServiceCertificationTeam;DL-ASDCL4-7ServiceCertificationTeam"
}
},
- "roles": ["ADMIN", "TESTER", "GOVERNOR", "OPS", "DESIGNER"],
+ "roles": ["ADMIN", "DESIGNER"],
"tutorial": {
"tabs": [
{
diff --git a/catalog-ui/configurations/menu.js b/catalog-ui/configurations/menu.js
index 4f85d0f..4569b26 100644
--- a/catalog-ui/configurations/menu.js
+++ b/catalog-ui/configurations/menu.js
@@ -28,10 +28,10 @@
}
},
"SERVICE": {
- "submitForTesting": {
- "text": "Submit for Testing",
- "url": "lifecycleState/certificationRequest",
- "emailModal": "lifecycleState/CERTIFICATIONREQUEST"
+ "certify": {
+ "text": "Certify",
+ "url": "lifecycleState/certify",
+ "confirmationModal": "lifecycleState/certify"
},
"checkIn": {
"text": "Check in",
@@ -64,73 +64,15 @@
"checkOut": {"text": "Check Out", "url": "lifecycleState/CHECKOUT"}
},
"SERVICE": {
- "submitForTesting": {
- "text": "Submit for Testing",
- "url": "lifecycleState/certificationRequest",
- "emailModal": "lifecycleState/CERTIFICATIONREQUEST"
- },
- "checkOut": {"text": "Check Out", "url": "lifecycleState/CHECKOUT"}
- }
- }
- },
- "folder": [
- {"text": "Active Projects", "groupname": "IN_PROGRESS"},
- {"text": "Check Out", "group": "IN_PROGRESS", "state": "NOT_CERTIFIED_CHECKOUT"},
- {"text": "Check In", "group": "IN_PROGRESS", "state": "NOT_CERTIFIED_CHECKIN"},
- {"text": "Followed Projects", "groupname": "FOLLOWING"},
- {"text": "Ready For Testing", "group": "FOLLOWING", "state": "READY_FOR_CERTIFICATION"},
- {"text": "In Testing", "group": "FOLLOWING", "state": "CERTIFICATION_IN_PROGRESS"},
- {"text": "Certified", "group": "FOLLOWING", "state": "CERTIFIED"}
- ]
-
- },
- "TESTER": {
- "title": "Tester's Workspace",
- "dashboard": {
- "showCreateNew": false
- },
- "changeLifecycleStateButtons": {
- "READY_FOR_CERTIFICATION": {
- "RESOURCE":{},
- "SERVICE":{
- "startTesting": {"text": "Start Testing", "url": "lifecycleState/startCertification"}
- }
- },
- "CERTIFICATION_IN_PROGRESS": {
- "RESOURCE":{},
- "SERVICE": {
- "accept": {
- "text": "Accept",
+ "certify": {
+ "text": "Certify",
"url": "lifecycleState/certify",
"confirmationModal": "lifecycleState/certify"
},
- "reject": {
- "text": "Reject",
- "url": "lifecycleState/failCertification",
- "confirmationModal": "lifecycleState/failCertification"
- },
- "cancel": {
- "text": "Cancel",
- "action": "changeLifecycleState",
- "url": "lifecycleState/cancelCertification",
- "confirmationModal": "lifecycleState/cancel"
- }
+ "checkOut": {"text": "Check Out", "url": "lifecycleState/CHECKOUT"}
}
- }
- },
- "folder": [
- {"text": "Active Projects", "groupname": "FOLLOWING"},
- {"text": "Ready For Testing", "group": "FOLLOWING", "state": "READY_FOR_CERTIFICATION"},
- {"text": "In Testing", "group": "FOLLOWING", "state": "CERTIFICATION_IN_PROGRESS"}
- ]
- },
- "OPS": {
- "title": "Operations Workspace",
- "dashboard": {
- "showCreateNew": false
- },
- "changeLifecycleStateButtons": {
- "DISTRIBUTION_APPROVED": {
+ },
+ "DISTRIBUTION_NOT_APPROVED": {
"RESOURCE":{},
"SERVICE": {
"distribute": {
@@ -141,7 +83,7 @@
"confirmationModal": "distribution-state/reject"
}
},
- "monitor": {"text": "Monitor", "disabled": true}
+ "checkOut": {"text": "Check Out", "url": "lifecycleState/CHECKOUT"}
}
},
"DISTRIBUTED": {
@@ -155,103 +97,19 @@
"confirmationModal": "distribution-state/reject"
}
},
- "monitor": {"text": "Monitor", "url": "distribution-state/monitor"}
+ "checkOut": {"text": "Check Out", "url": "lifecycleState/CHECKOUT"}
}
}
},
"folder": [
- {"text": "Active Projects", "groupname": "FOLLOWING"},
- {
- "text": "Waiting For Distribution",
- "group": "FOLLOWING",
- "state": "CERTIFIED",
- "dist": "DISTRIBUTION_APPROVED"
- },
- {"text": "Distributed", "group": "FOLLOWING", "state": "CERTIFIED", "dist": "DISTRIBUTED"}
+ {"text": "Active Projects", "groupname": "IN_PROGRESS"},
+ {"text": "Check Out", "group": "IN_PROGRESS", "state": "NOT_CERTIFIED_CHECKOUT"},
+ {"text": "Check In", "group": "IN_PROGRESS", "state": "NOT_CERTIFIED_CHECKIN"},
+ {"text": "Followed Projects", "groupname": "FOLLOWING"},
+ {"text": "Certified", "group": "FOLLOWING", "state": "CERTIFIED"},
+ {"text": "Distributed", "group": "FOLLOWING", "state": "DISTRIBUTED"}
]
- },
- "GOVERNOR": {
- "title": "Governance Rep's Workspace",
- "dashboard": {
- "showCreateNew": false
- },
- "changeLifecycleStateButtons": {
- "DISTRIBUTION_NOT_APPROVED": {
- "RESOURCE":{},
- "SERVICE": {
- "approve": {
- "text": "Approve",
- "url": "distribution-state/approve",
- "confirmationModal": "distribution-state/approve",
- "conformanceLevelModal": {
- "url": "distribution-state/reject",
- "confirmationModal": "distribution-state/reject"
- }
- },
- "reject": {
- "text": "Reject",
- "url": "distribution-state/reject",
- "confirmationModal": "distribution-state/reject"
- }
- }
- },
- "DISTRIBUTION_APPROVED": {
- "RESOURCE":{},
- "SERVICE": {
- "reject": {
- "text": "Reject",
- "url": "distribution-state/reject",
- "confirmationModal": "distribution-state/reject"
- }
- }
- },
- "DISTRIBUTED": {
- "RESOURCE":{},
- "SERVICE": {
- "reject": {
- "text": "Reject",
- "url": "distribution-state/reject",
- "confirmationModal": "distribution-state/reject"
- }
- }
- },
- "DISTRIBUTION_REJECTED": {
- "RESOURCE":{},
- "SERVICE": {
- "approve": {
- "text": "Approve",
- "url": "distribution-state/approve",
- "confirmationModal": "distribution-state/approve",
- "conformanceLevelModal": {
- "url": "distribution-state/reject",
- "confirmationModal": "distribution-state/reject"
- }
- }
- }
- }
- },
- "folder": [
- {"text": "Active Projects", "groupname": "FOLLOWING"},
- {
- "text": "Waiting For Approval",
- "group": "FOLLOWING",
- "state": "CERTIFIED",
- "dist": "DISTRIBUTION_NOT_APPROVED"
- },
- {
- "text": "Distribution Rejected",
- "group": "FOLLOWING",
- "state": "CERTIFIED",
- "dist": "DISTRIBUTION_REJECTED"
- },
- {
- "text": "Distribution Approved",
- "group": "FOLLOWING",
- "state": "CERTIFIED",
- "dist": "DISTRIBUTION_APPROVED,DISTRIBUTED"
- }
- ]
}
},
"confirmationMessages": {
@@ -270,31 +128,6 @@
"title": "Certification confirmation",
"message": "Please add comment and confirm test results."
},
- "lifecycleState/cancel": {
- "showComment": true,
- "title": "Cancel test",
- "message": "Please add comment and cancel test."
- },
- "lifecycleState/failCertification": {
- "showComment": true,
- "title": "Rejection confirmation",
- "message": "Please add comment and confirm test results."
- },
- "lifecycleState/CERTIFICATIONREQUEST": {
- "showComment": true,
- "title": "Submit for testing",
- "message": "Please add comment and submit for testing."
- },
- "distribution-state/approve": {
- "showComment": true,
- "title": "Distribution confirmation",
- "message": "Please add comment and confirm %1 approval for distribution."
- },
- "distribution-state/reject": {
- "showComment": true,
- "title": "Rejection confirmation",
- "message": "Please add comment and confirm %1 rejection for distribution."
- },
"updateTemplate": {
"showComment": false,
"title": "Update Template Confirmation",
@@ -315,7 +148,8 @@
"message": "Switching versions will erase service paths: %1. Are you sure you want to proceed?"
},
"deleteInstance": {"title": "Delete Confirmation", "message": "Are you sure you would like to delete %1?"},
- "deleteInput": {"title": "Delete Confirmation", "message": "Are you sure you would like to delete %1?"}
+ "deleteInput": {"title": "Delete Confirmation", "message": "Are you sure you would like to delete %1?"},
+ "okButton": "OK"
},
"statuses": {
"inDesign": {
@@ -325,14 +159,6 @@
"NOT_CERTIFIED_CHECKIN"
]
},
- "readyForCertification": {
- "name": "Ready For Testing",
- "values": ["READY_FOR_CERTIFICATION"]
- },
- "inCertification": {
- "name": "In Testing",
- "values": ["CERTIFICATION_IN_PROGRESS"]
- },
"certified": {
"name": "Certified",
"values": ["CERTIFIED"]
@@ -352,36 +178,14 @@
"DESIGNER": {
"states": {
"NOT_CERTIFIED_CHECKOUT": {
- "ANY": [
- {
- "text": "Submit for Testing",
- "action": "changeLifecycleState",
- "url": "lifecycleState/certificationRequest",
- "emailModal": "lifecycleState/CERTIFICATIONREQUEST"
- }
- ],
- "NOT_OWNER": []
- },
- "NOT_CERTIFIED_CHECKIN": {
- "ANY": [
- {
- "text": "Submit for Testing",
- "action": "changeLifecycleState",
- "url": "lifecycleState/certificationRequest",
- "emailModal": "lifecycleState/CERTIFICATIONREQUEST"
- }
- ]
- },
- "READY_FOR_CERTIFICATION": {
"ANY": []
},
- "CERTIFICATION_IN_PROGRESS": {
+ "NOT_CERTIFIED_CHECKIN": {
"ANY": []
},
"CERTIFIED": {
"ANY": []
}
-
}
},
"OTHER": {
@@ -395,14 +199,10 @@
"LifeCycleStatuses": {
"NOT_CERTIFIED_CHECKOUT": {"text": "In Design Check Out", "icon": "checkout-editable-status-icon"},
"NOT_CERTIFIED_CHECKIN": {"text": "In Design Check In", "icon": "checkin-status-icon "},
- "READY_FOR_CERTIFICATION": {"text": "Ready for testing"},
- "CERTIFICATION_IN_PROGRESS": {"text": "In Testing"},
"CERTIFIED": {"text": "Certified", "icon": "checkin-status-icon "}
},
"DistributionStatuses": {
"DISTRIBUTION_NOT_APPROVED": {"text": "Waiting For Distribution"},
- "DISTRIBUTION_APPROVED": {"text": "Distribution Approved"},
- "DISTRIBUTION_REJECTED": {"text": "Distribution Rejected"},
"DISTRIBUTED": {"text": "Distributed"}
},
"canvas_buttons": {
@@ -412,12 +212,6 @@
"url": "lifecycleState/CHECKIN",
"confirmationModal": "lifecycleState/CHECKIN"
},
- "submitForTesting": {
- "text": "Submit for Testing",
- "action": "changeLifecycleState",
- "url": "lifecycleState/certificationRequest",
- "emailModal": "lifecycleState/CERTIFICATIONREQUEST"
- },
"deleteVersion": {
"text": "Delete Version",
"action": "changeLifecycleState",
@@ -461,16 +255,12 @@
{"text": "General", "action": "onMenuItemPressed", "state": "workspace.general"},
{"text": "Deployment Artifact", "action": "onMenuItemPressed", "state": "workspace.deployment_artifacts"},
{"text": "Information Artifact", "action": "onMenuItemPressed", "state": "workspace.information_artifacts"},
- {"text": "TOSCA Artifacts", "action": "onMenuItemPressed", "state": "workspace.tosca_artifacts"},
+ {"text": "TOSCA Artifacts", "action": "onMenuItemPressed", "state": "workspace.tosca_artifacts"},
{"text": "Composition", "action": "onMenuItemPressed", "state": "workspace.composition.details"},
{"text": "Operation", "action":"onMenuItemPressed", "state": "workspace.interface_operation"},
{"text": "Activity Log", "action": "onMenuItemPressed", "state": "workspace.activity_log"},
{"text": "Deployment", "action": "onMenuItemPressed", "state": "workspace.deployment"},
- {
- "text": "Properties Assignment",
- "action": "onMenuItemPressed",
- "state": "workspace.properties_assignment"
- },
+ {"text": "Properties Assignment", "action": "onMenuItemPressed", "state": "workspace.properties_assignment"},
{"text": "Req. & Capabilities", "action": "onMenuItemPressed", "state": "workspace.reqAndCapEditable"}
],
"PNF": [
@@ -481,11 +271,7 @@
{"text": "Composition", "action": "onMenuItemPressed", "state": "workspace.composition.details"},
{"text": "Operation", "action": "onMenuItemPressed", "state": "workspace.interface_operation"},
{"text": "Activity Log", "action": "onMenuItemPressed", "state": "workspace.activity_log"},
- {
- "text": "Properties Assignment",
- "action": "onMenuItemPressed",
- "state": "workspace.properties_assignment"
- },
+ {"text": "Properties Assignment", "action": "onMenuItemPressed", "state": "workspace.properties_assignment"},
{"text": "Req. & Capabilities", "action": "onMenuItemPressed", "state": "workspace.reqAndCapEditable"}
],
"CR": [
@@ -493,9 +279,11 @@
{"text": "Deployment Artifact", "action": "onMenuItemPressed", "state": "workspace.deployment_artifacts"},
{"text": "Information Artifact", "action": "onMenuItemPressed", "state": "workspace.information_artifacts"},
{"text": "TOSCA Artifacts", "action": "onMenuItemPressed", "state": "workspace.tosca_artifacts"},
- {"text": "Composition", "action": "onMenuItemPressed", "state": "workspace.composition.details"},
+ {"text": "Composition", "action": "onMenuItemPressed", "state": "workspace.composition.details", "disabledCategories":["Partner Domain Service"]},
+ {"text": "Operation", "action":"onMenuItemPressed", "state": "workspace.interface_operation"},
{"text": "Activity Log", "action": "onMenuItemPressed", "state": "workspace.activity_log"},
- {"text": "Properties Assignment", "action": "onMenuItemPressed", "state": "workspace.properties_assignment"}
+ {"text": "Properties Assignment", "action": "onMenuItemPressed", "state": "workspace.properties_assignment"},
+ {"text": "Req. & Capabilities", "action": "onMenuItemPressed", "state": "workspace.reqAndCapEditable"}
],
"SERVICE": [
{"text": "General", "action": "onMenuItemPressed", "state": "workspace.general", "hiddenCategories":["Partner Domain Service"]},
@@ -505,14 +293,9 @@
{"text": "Activity Log", "action": "onMenuItemPressed", "state": "workspace.activity_log"},
{"text": "Management Workflow", "action": "onMenuItemPressed", "state": "workspace.management_workflow"},
{"text": "Network Call Flow ", "action": "onMenuItemPressed", "state": "workspace.network_call_flow"},
- {"text": "Distribution","action": "onMenuItemPressed","state": "workspace.distribution","disabledRoles": ["ADMIN", "TESTER", "GOVERNOR", "DESIGNER"]},
+ {"text": "Distribution","action": "onMenuItemPressed","state": "workspace.distribution","disabledRoles": ["ADMIN"]},
{"text": "Deployment", "action": "onMenuItemPressed", "state": "workspace.deployment"},
- {
- "text": "Properties Assignment",
- "action": "onMenuItemPressed",
- "state": "workspace.properties_assignment"
- },
- {"text": "Req. & Capabilities", "action": "onMenuItemPressed", "state": "workspace.reqAndCapEditable"}
+ {"text": "Properties Assignment", "action": "onMenuItemPressed", "state": "workspace.properties_assignment"}
]
}
diff --git a/catalog-ui/configurations/mock.json b/catalog-ui/configurations/mock.json
index 63daabd..89454c7 100644
--- a/catalog-ui/configurations/mock.json
+++ b/catalog-ui/configurations/mock.json
@@ -25,7 +25,6 @@
"GET_relationship": "/v1/catalog/services/:serviceId/resourceInstance/:action",
"GET_lifecycle_state_resource": "/v1/catalog/:type/:id/lifecycleState/:action",
"GET_lifecycle_state_CHECKIN":"lifecycleState/CHECKIN",
- "GET_lifecycle_state_CERTIFICATIONREQUEST":"lifecycleState/CERTIFICATIONREQUEST",
"GET_lifecycle_state_UNDOCHECKOUT":"lifecycleState/UNDOCHECKOUT",
"root": "http://localhost:9999"
},
@@ -40,7 +39,8 @@
"userFirstName": "HTTP_CSP_FIRSTNAME",
"userLastName": "HTTP_CSP_LASTNAME",
"userEmail": "HTTP_CSP_EMAIL",
- "xEcompRequestId": " X-ECOMP-RequestID"
+ "xEcompRequestId": " X-ECOMP-RequestID",
+ "portalCookie": "EPService"
},
"userTypes": {
"admin": {
@@ -51,32 +51,11 @@
"xEcompRequestId": "ccccc"
},
"designer": {
- "userId": "cs0008",
+ "userId": "m08740",
"email": "designer@sdc.com",
"firstName": "Carlos",
"lastName": "Santana",
"xEcompRequestId": "ccccc"
- },
- "tester": {
- "userId": "jm0007",
- "email": "tester@sdc.com",
- "firstName": "Johnny",
- "lastName": "Depp",
- "xEcompRequestId": "ccccc"
- },
- "governor": {
- "userId": "gv0001",
- "email": "governor@sdc.com",
- "firstName": "gover",
- "lastName": "nor",
- "xEcompRequestId": "ccccc"
- },
- "ops": {
- "userId": "op0001",
- "email": "ops@sdc.com",
- "firstName": "op",
- "lastName": "ss",
- "xEcompRequestId": "ccccc"
}
},
"statuses": {
@@ -87,14 +66,6 @@
"NOT_CERTIFIED_CHECKIN"
]
},
- "readyForCertification": {
- "name": "Ready for certification",
- "values": "READY_FOR_CERTIFICATION"
- },
- "inCertification": {
- "name": "In Certification",
- "values": "CERTIFICATION_IN_PROGRESS"
- },
"certified": {
"name": "Certified",
"values": "CERTIFIED"
@@ -115,12 +86,8 @@
{"text":"Edit" ,"action":"goToEntity"}
],
"NOT_CERTIFIED_CHECKIN":[
- {"text":"Check out","action":"changeLifecycleState", "url":"CHECKOUT"},
- {"text":"Submit for Testing","action":"changeLifecycleState", "url":"certificationRequest"}
-
+ {"text":"Check out","action":"changeLifecycleState", "url":"CHECKOUT"}
],
- "READY_FOR_CERTIFICATION":[],
- "CERTIFICATION_IN_PROGRESS":[],
"CERTIFIED":[]
}
},
@@ -130,42 +97,15 @@
"states":{
"NOT_CERTIFIED_CHECKOUT":[
{"text":"Edit" ,"action":"goToEntity"},
- {"text":"Check in","action":"changeLifecycleState", "url":"CHECKIN"},
- {"text":"Submit for Testing","action":"changeLifecycleState", "url":"certificationRequest"}
+ {"text":"Check in","action":"changeLifecycleState", "url":"CHECKIN"}
],
"NOT_CERTIFIED_CHECKIN":[
- {"text":"Check out","action":"changeLifecycleState", "url":"CHECKOUT"},
- {"text":"Submit for Testing","action":"changeLifecycleState", "url":"certificationRequest"}
- ],
- "READY_FOR_CERTIFICATION":[
- ],
- "CERTIFICATION_IN_PROGRESS":[
+ {"text":"Check out","action":"changeLifecycleState", "url":"CHECKOUT"}
],
"CERTIFIED":[
]
}
- },
- "TESTER":{
- "pages":[],
- "READY_FOR_CERTIFICATION":[],
- "CERTIFICATION_IN_PROGRESS":[],
- "CERTIFIED":[]
-
- },
- "OPS":{
- "pages":[],
- "READY_FOR_CERTIFICATION":[],
- "CERTIFICATION_IN_PROGRESS":[],
- "CERTIFIED":[]
-
- },
- "GOVERNOR":{
- "pages":[],
- "READY_FOR_CERTIFICATION":[],
- "CERTIFICATION_IN_PROGRESS":[],
- "CERTIFIED":[]
-
}
}
}
diff --git a/catalog-ui/configurations/prod.js b/catalog-ui/configurations/prod.js
index 496c576..1b7ae7d 100644
--- a/catalog-ui/configurations/prod.js
+++ b/catalog-ui/configurations/prod.js
@@ -1,59 +1,58 @@
const SDC_CONFIG = {
"environment": "prod",
"api": {
- "GET_component": "/v1/catalog/:type/:id",
- "PUT_component": "/v1/catalog/:type/:id/metadata",
- "GET_component_validate_name": "/v1/catalog/:type/validate-name/:name",
- "POST_changeLifecycleState": "/v1/catalog/",
- "component_api_root": "/v1/catalog/",
- "GET_user": "/v1/user/:id",
- "GET_user_authorize": "/v1/user/authorize",
- "GET_all_users": "/v1/user/users",
- "POST_create_user": "/v1/user",
- "DELETE_delete_user": "/v1/user/:id",
- "POST_edit_user_role": "/v1/user/:id/role",
- "GET_resource": "/v1/catalog/resources/:id",
- "GET_resources_latestversion_notabstract":"/v1/catalog/:type/latestversion/notabstract/:id",
- "GET_resources_certified_not_abstract": "/v1/catalog/resources/certified/notabstract/:id",
- "GET_resources_certified_abstract": "/v1/catalog/resources/certified/abstract/:id",
- "GET_resource_property": "/v1/catalog/:type/:entityId/properties/:id",
- "PUT_resource": "/v1/catalog/resources/:id/metadata",
- "GET_resource_artifact": "/v1/catalog/:type/:entityId/artifacts/:id",
- "GET_download_instance_artifact": "/v1/catalog/:type/:entityId/resourceInstances/:instanceId/artifacts/:id",
- "POST_instance_artifact": "/v1/catalog/:type/:entityId/resourceInstance/:instanceId/artifacts/:id",
- "GET_resource_additional_information": "/v1/catalog/:type/:entityId/additionalinfo/:id",
- "GET_service_artifact": "/v1/catalog/services/:serviceId/artifacts/:id",
- "GET_resource_interface_artifact": "/v1/catalog/:type/:entityId/standard/:operation/artifacts/:id",
- "GET_resource_api_artifact": "/v1/catalog/:type/:entityId/artifacts/api/:id",
- "GET_configuration_ui": "/v1/configuration/ui",
+ "GET_SDC_Setup_Data": "/v1/setup/ui",
+ "GET_component": "/v1/catalog/:type/:id",
+ "PUT_component": "/v1/catalog/:type/:id/metadata",
+ "GET_component_validate_name": "/v1/catalog/:type/validate-name/:name",
+ "POST_changeLifecycleState": "/v1/catalog/",
+ "component_api_root": "/v1/catalog/",
+ "GET_user": "/v1/user/:id",
+ "GET_user_authorize": "/v1/user/authorize",
+ "GET_all_users": "/v1/user/users",
+ "POST_create_user": "/v1/user",
+ "DELETE_delete_user": "/v1/user/:id",
+ "POST_edit_user_role": "/v1/user/:id/role",
+ "GET_resource": "/v1/catalog/resources/:id",
+ "GET_resources_latestversion_notabstract":"/v1/catalog/:type/latestversion/notabstract/:id",
+ "GET_resources_certified_not_abstract": "/v1/catalog/resources/certified/notabstract/:id",
+ "GET_resources_certified_abstract": "/v1/catalog/resources/certified/abstract/:id",
+ "GET_resource_property": "/v1/catalog/:type/:entityId/properties/:id",
+ "PUT_resource": "/v1/catalog/resources/:id/metadata",
+ "GET_resource_artifact": "/v1/catalog/:type/:entityId/artifacts/:id",
+ "GET_download_instance_artifact": "/v1/catalog/:type/:entityId/resourceInstances/:instanceId/artifacts/:id",
+ "POST_instance_artifact": "/v1/catalog/:type/:entityId/resourceInstance/:instanceId/artifacts/:id",
+ "GET_resource_additional_information": "/v1/catalog/:type/:entityId/additionalinfo/:id",
+ "GET_service_artifact": "/v1/catalog/services/:serviceId/artifacts/:id",
+ "GET_resource_interface_artifact": "/v1/catalog/:type/:entityId/standard/:operation/artifacts/:id",
+ "GET_resource_api_artifact": "/v1/catalog/:type/:entityId/artifacts/api/:id",
+ "GET_configuration_ui": "/v1/configuration/ui",
"GET_plugins_configuration": "/config/ui/plugins",
"GET_plugin_online_state": "/config/ui/plugins/:pluginId/online",
- "GET_resource_validate_name": "/v1/catalog/resources/validate-name/:name",
- "GET_activity_log": "/v1/catalog/audit-records/:type/:id",
- "GET_service": "/v1/catalog/services/:id",
- "GET_service_validate_name": "/v1/catalog/services/validate-name/:name",
- "GET_service_distributions":"/v1/catalog/services/:uuid/distribution",
- "GET_service_distributions_components":"/v1/catalog/services/distribution/:distributionId",
- "POST_service_distribution_deploy" : "/v1/catalog/services/:serviceId/distribution/:distributionId/markDeployed",
- "GET_element": "/v1/followed",
- "GET_catalog": "/v1/screen",
- "GET_ecomp_menu_items": "/v1/user/:userId/functionalmenu",
- "GET_resource_category": "/v1/resourceCategories",
- "GET_service_category": "/v1/serviceCategories",
- "resource_instance": "/v1/catalog/:entityType/:entityId/resourceInstance/:id",
- "GET_resource_instance_property": "/v1/catalog/:type/:entityId/resourceInstance/:componentInstanceId/property/:propertyValueId",
- "GET_relationship": "/v1/catalog/:entityType/:entityId/resourceInstance/:action",
- "GET_lifecycle_state_resource": "/v1/catalog/:type/:id/lifecycleState/:action",
- "GET_lifecycle_state_CHECKIN":"lifecycleState/CHECKIN",
- "GET_lifecycle_state_CERTIFICATIONREQUEST":"lifecycleState/CERTIFICATIONREQUEST",
- "GET_lifecycle_state_UNDOCHECKOUT":"lifecycleState/UNDOCHECKOUT",
- "root": "/sdc1/feProxy/rest",
- "no_proxy_root": "/sdc1/rest",
+ "GET_resource_validate_name": "/v1/catalog/resources/validate-name/:name",
+ "GET_activity_log": "/v1/catalog/audit-records/:type/:id",
+ "GET_service": "/v1/catalog/services/:id",
+ "GET_service_validate_name": "/v1/catalog/services/validate-name/:name",
+ "GET_service_distributions":"/v1/catalog/services/:uuid/distribution",
+ "GET_service_distributions_components":"/v1/catalog/services/distribution/:distributionId",
+ "POST_service_distribution_deploy" : "/v1/catalog/services/:serviceId/distribution/:distributionId/markDeployed",
+ "GET_element": "/v1/followed",
+ "GET_catalog": "/v1/screen",
+ "GET_ecomp_menu_items": "/v1/user/:userId/functionalmenu",
+ "GET_resource_category": "/v1/resourceCategories",
+ "GET_service_category": "/v1/serviceCategories",
+ "resource_instance": "/v1/catalog/:entityType/:entityId/resourceInstance/:id",
+ "GET_resource_instance_property": "/v1/catalog/:type/:entityId/resourceInstance/:componentInstanceId/property/:propertyValueId",
+ "GET_relationship": "/v1/catalog/:entityType/:entityId/resourceInstance/:action",
+ "GET_lifecycle_state_resource": "/v1/catalog/:type/:id/lifecycleState/:action",
+ "GET_lifecycle_state_CHECKIN":"lifecycleState/CHECKIN",
+ "GET_lifecycle_state_UNDOCHECKOUT":"lifecycleState/UNDOCHECKOUT",
+ "root": "/sdc1/feProxy/rest",
+ "no_proxy_root": "/sdc1/rest",
"workflow_root": "/sdc1/feProxy/wf",
"POST_workflow_artifact": "sdc/v1/catalog",
- "PUT_service": "/v1/catalog/services/:id/metadata",
- "GET_download_artifact": "/v1/catalog/",
- "GET_SDC_Version": "/version",
+ "PUT_service": "/v1/catalog/services/:id/metadata",
+ "GET_download_artifact": "/v1/catalog/",
"GET_categories": "/v1/categories/:types",
"POST_category": "/v1/category/:types/:categoryId",
"POST_subcategory": "/v1/category/:types/:categoryId/subCategory/:subCategoryId",
@@ -67,9 +66,12 @@
"create_policy_instance":"/v1/catalog/:entityType/:entityId/policies/:policyId",
"CRUD_policy":"/v1/catalog/:entityType/policies/:policyId",
"POST_GAB_Search": "/v1/catalog/gab/searchFor",
+ "uicache_root":"/sdc1/feProxy/uicache/v1",
+ "GET_uicache_catalog":"/catalog",
+ "GET_uicache_left_palette":"/catalog/resources/latestversion/notabstract/metadata",
},
"resourceTypesFilter":{
- "resource":["CP","VFC","VL","CVFC","GROUP","POLICY"],
+ "resource":["CP","VFC","VL","CVFC","GROUP","POLICY", "Configuration"],
"service":["CP","VF","VL", "PNF","CR","CVFC","SERVICE","Configuration","GROUP","POLICY"]
},
"logConfig": {
@@ -106,7 +108,7 @@
"default": "DL-ASDCL1-4ServiceCertificationTeam;DL-ASDCL4-7ServiceCertificationTeam"
}
},
- "roles": ["ADMIN", "TESTER", "GOVERNOR", "OPS", "DESIGNER"],
+ "roles": ["ADMIN", "DESIGNER"],
"tutorial": {
"tabs": [
{
diff --git a/catalog-ui/configurations/validation.json b/catalog-ui/configurations/validation.json
index 01b899d..bd45210 100644
--- a/catalog-ui/configurations/validation.json
+++ b/catalog-ui/configurations/validation.json
@@ -6,7 +6,24 @@
"validationPatterns": {
"string": "^[\\sa-zA-Z0-9+-]+$",
+ "stringOrEmpty": "^[\\sa-zA-Z0-9&-]*$",
"comment": "^[\\u0000-\\u00BF]*$",
- "integer": "^(([-+]?\\d+)|([-+]?0x[0-9a-fA-F]+))$"
+ "integer": "^(([-+]?\\d+)|([-+]?0x[0-9a-fA-F]+))$",
+ "componentName": "^(?=.*[^. ])[\\s\\w\\&_.:-]{1,1024}$",
+ "propertyName": "^[a-zA-Z0-9_:-]{1,50}$",
+ "tag": "^[\\s\\w_.-]{1,50}$",
+ "vendorRelease": "^[\\x20-\\x21\\x23-\\x29\\x2B-\\x2E\\x30-\\x39\\x3B\\x3D\\x40-\\x5B\\x5D-\\x7B\\x7D-\\xFF]{1,25}$",
+ "vendorName": "^[\\x20-\\x21\\x23-\\x29\\x2B-\\x2E\\x30-\\x39\\x3B\\x3D\\x40-\\x5B\\x5D-\\x7B\\x7D-\\xFF]{1,60}$",
+ "vendorModelNumber": "^[\\x20-\\x21\\x23-\\x29\\x2B-\\x2E\\x30-\\x39\\x3B\\x3D\\x40-\\x5B\\x5D-\\x7B\\x7D-\\xFF]{1,65}$",
+ "serviceTypeAndRole": "^[\\x20-\\x21\\x23-\\x29\\x2B-\\x2E\\x30-\\x39\\x3B\\x3D\\x40-\\x5B\\x5D-\\x7B\\x7D-\\xFF]{1,256}$",
+ "contactId": "^[\\s\\w-]{1,50}$",
+ "userId": "^[\\s\\w-]{1,50}$",
+ "label": "^[\\sa-zA-Z0-9+-]{1,25}$",
+ "integerNoLeadingZero": "^(0|[-+]?[1-9][0-9]*|[-+]?0x[0-9a-fA-F]+|[-+]?0o[0-7]+)$",
+ "float": "^[-+]?[0-9]*.?[0-9]+([eE][-+]?[0-9]+)?f?$",
+ "number": "^((([-+]?\\d+)|([-+]?0x[0-9a-fA-F]+))|([-+]?[0-9]*\\.?[0-9]+([eE][-+]?[0-9]+)?))$",
+ "key": "^[\\s\\w-]{1,50}$",
+ "boolean": "^([Tt][Rr][Uu][Ee]|[Ff][Aa][Ll][Ss][Ee])$",
+ "mapKey": "^[\\w]{1,50}$"
}
}