From e0638b1278a72b2dbb40f3b96d86e3c7bb75c0f7 Mon Sep 17 00:00:00 2001 From: Einat Vinouze Date: Tue, 2 Jun 2020 11:10:41 +0300 Subject: When JobStatus is COMPLETED_AND_PAUSED add retry option dropdown menu on instantiationStatus Issue-ID: VID-821 Signed-off-by: Einat Vinouze Change-Id: Idd20b768c1279a3736fbeeb56ec85b3911bb186f --- .../onap/vid/services/AsyncInstantiationBusinessLogicImpl.java | 4 ++-- .../cypress/integration/iFrames/instantiationStatus.e2e.ts | 10 ++++++++-- .../support/jsonBuilders/mocks/jsons/asyncInstantiation.json | 3 ++- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/vid-app-common/src/main/java/org/onap/vid/services/AsyncInstantiationBusinessLogicImpl.java b/vid-app-common/src/main/java/org/onap/vid/services/AsyncInstantiationBusinessLogicImpl.java index 07c2d1593..91801973b 100644 --- a/vid-app-common/src/main/java/org/onap/vid/services/AsyncInstantiationBusinessLogicImpl.java +++ b/vid-app-common/src/main/java/org/onap/vid/services/AsyncInstantiationBusinessLogicImpl.java @@ -435,8 +435,8 @@ public class AsyncInstantiationBusinessLogicImpl implements } private boolean isRetryEnabledForStatus(JobStatus jobStatus) { - return featureManager.isActive(Features.FLAG_1902_RETRY_JOB) && - (jobStatus==JobStatus.COMPLETED_WITH_ERRORS || jobStatus==JobStatus.FAILED); + return jobStatus==JobStatus.COMPLETED_AND_PAUSED || (featureManager.isActive(Features.FLAG_1902_RETRY_JOB) && + (jobStatus==JobStatus.COMPLETED_WITH_ERRORS || jobStatus==JobStatus.FAILED)); } private void setServiceInfoStatus(ServiceInfo serviceInfo, JobStatus jobStatus) { diff --git a/vid-webpack-master/cypress/integration/iFrames/instantiationStatus.e2e.ts b/vid-webpack-master/cypress/integration/iFrames/instantiationStatus.e2e.ts index 8d19bc90d..a95d8e7cf 100644 --- a/vid-webpack-master/cypress/integration/iFrames/instantiationStatus.e2e.ts +++ b/vid-webpack-master/cypress/integration/iFrames/instantiationStatus.e2e.ts @@ -118,12 +118,11 @@ describe('Instantiation status', function () { cy.get('#' + jobId).find('.menu-div').click(); } - it('should disabled correct menu items', function () { + it.only('should disabled correct menu items', function () { cy.openIframe('app/ui/#/instantiationStatus'); // Instantiate action with Job status FAILED - isRetry = true - clickOnTitleAndThenOnMenuWithJobId('5c2cd8e5-27d0-42e3-85a1-85db5eaba459'); getDisabledDropDownItemByDataTestId('context-menu-retry').should('not.exist'); getDisabledDropDownItemByDataTestId('context-menu-remove').should('exist'); @@ -153,6 +152,13 @@ describe('Instantiation status', function () { getDisabledDropDownItemByDataTestId('context-menu-hide').should('not.exist'); getDisabledDropDownItemByDataTestId('context-menu-audit-info').should('not.exist'); getDisabledDropDownItemByDataTestId(contextMenuCreateAnotherOne).should('exist'); + + //COMPLETED_AND_PAUSED + clickOnTitleAndThenOnMenuWithJobId('850dc7d2-5240-437f-9bcd-b1ed7dc339d9'); + getDisabledDropDownItemByDataTestId('context-menu-retry').should('exist'); + getDisabledDropDownItemByDataTestId('context-menu-open').should('exist'); + getDisabledDropDownItemByDataTestId('context-menu-audit-info').should('exist'); + getDisabledDropDownItemByDataTestId(contextMenuCreateAnotherOne).should('exist'); }); it('clicking on create another one item, go to expected url', function () { diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/asyncInstantiation.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/asyncInstantiation.json index f2bb9d1c7..28fd5216f 100644 --- a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/asyncInstantiation.json +++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/asyncInstantiation.json @@ -339,6 +339,7 @@ "serviceModelId": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0", "serviceModelName": "action-data", "serviceModelVersion": "1.0", - "createdBulkDate": 1524663233000 + "createdBulkDate": 1524663233000, + "isRetryEnabled": true } ] -- cgit 1.2.3-korg