diff options
| -rw-r--r-- | catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ResourceBusinessLogic.java | 8 | ||||
| -rw-r--r-- | catalog-ui/src/app/view-models/workspace/workspace-view.html | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ResourceBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ResourceBusinessLogic.java index e11dbb3b67..aa2ba31385 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ResourceBusinessLogic.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ResourceBusinessLogic.java @@ -4225,10 +4225,6 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic { return componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(resourceStatus.right().value()), ""); } Resource resource = resourceStatus.left().value(); - if (isComponentSystemDeployed(resource)) { - throw new ByActionStatusComponentException(ActionStatus.CANNOT_DELETE_SYSTEM_DEPLOYED_RESOURCES, ComponentTypeEnum.RESOURCE.getValue(), - resource.getName()); - } StorageOperationStatus result = StorageOperationStatus.OK; lockComponent(resourceId, resource, "Mark resource to delete"); try { @@ -4270,6 +4266,10 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic { componentException(resourceStatus.right().value()); } Resource resource = resourceStatus.left().value(); + if (isComponentSystemDeployed(resource)) { + throw new ByActionStatusComponentException(ActionStatus.CANNOT_DELETE_SYSTEM_DEPLOYED_RESOURCES, ComponentTypeEnum.RESOURCE.getValue(), + resource.getName()); + } if (Boolean.FALSE.equals(resource.isArchived())) { log.debug("The resource, {}, requested for delete has not been archived.", resourceId); throw new ComponentException(ActionStatus.COMPONENT_NOT_ARCHIVED, resourceId); diff --git a/catalog-ui/src/app/view-models/workspace/workspace-view.html b/catalog-ui/src/app/view-models/workspace/workspace-view.html index 21cebeb388..6a5cd924aa 100644 --- a/catalog-ui/src/app/view-models/workspace/workspace-view.html +++ b/catalog-ui/src/app/view-models/workspace/workspace-view.html @@ -94,7 +94,7 @@ ng-click="deleteArchivedComponent()" class="sprite-new delete-btn" data-tests-id="delete_archive_version" - sdc-smart-tooltip="Delete Service" + sdc-smart-tooltip="Delete Component" prevent-double-click>Delete</span> <span data-ng-click = "archiveComponent()" |