From 226ef715d7afe3758fbc88c05cf4d752c6bed51b Mon Sep 17 00:00:00 2001 From: Rachitha Ramappa Date: Wed, 23 Sep 2020 12:42:19 +0530 Subject: New audit info screen changes Audit screen css changes and export mso status to external file Change-Id: I71d577121e18090eab7a388ed01707823e45ac82 Issue-ID: VID-901 Signed-off-by: rachitha.ramappa@att.com --- .../integration/iFrames/auditInfo.modal.e2e.ts | 24 ++-- .../iFrames/exportMSOStatusToCSV.e2e.ts | 38 ++++++ .../jsonBuilders/mocks/jsons/flags.cypress.json | 3 +- vid-webpack-master/package.json | 2 + .../instantiationStatus.component.scss | 13 ++ .../auditInfoModal/auditInfoModal.component.html | 132 +++++++++++---------- .../auditInfoModal/auditInfoModal.component.scss | 55 ++++----- .../auditInfoModal.component.spec.ts | 11 ++ .../auditInfoModal/auditInfoModal.component.ts | 61 +++++++++- .../space-to-underscore.pipe.spec.ts | 8 ++ .../spaceToUnderscore/space-to-underscore.pipe.ts | 17 +++ .../shared/server/serviceInfo/AuditStatus.model.ts | 3 + .../services/featureFlag/feature-flags.service.ts | 3 +- vid-webpack-master/src/app/shared/shared.module.ts | 13 +- 14 files changed, 272 insertions(+), 111 deletions(-) create mode 100644 vid-webpack-master/cypress/integration/iFrames/exportMSOStatusToCSV.e2e.ts create mode 100644 vid-webpack-master/src/app/shared/pipes/spaceToUnderscore/space-to-underscore.pipe.spec.ts create mode 100644 vid-webpack-master/src/app/shared/pipes/spaceToUnderscore/space-to-underscore.pipe.ts (limited to 'vid-webpack-master') diff --git a/vid-webpack-master/cypress/integration/iFrames/auditInfo.modal.e2e.ts b/vid-webpack-master/cypress/integration/iFrames/auditInfo.modal.e2e.ts index 16ed21935..c28d77b79 100644 --- a/vid-webpack-master/cypress/integration/iFrames/auditInfo.modal.e2e.ts +++ b/vid-webpack-master/cypress/integration/iFrames/auditInfo.modal.e2e.ts @@ -31,11 +31,7 @@ describe('Audit information modal', function () { cy.get('.icon-menu').eq(index).click({force: true}).then(()=>{ cy.getElementByDataTestsId('context-menu-audit-info').click({force:true}).then(()=>{ cy.setViewportToSmallPopup(); - cy.get('#service-model-name').should('contain', row.find('#serviceModelName').text().trim()) - .getElementByDataTestsId('model-item-value-userId').should('contain', row.find('#userId').text().trim()) - .get('#service-instantiation-audit-info-vid').should('be.visible') - .get('#service-instantiation-audit-info-vid').find('#vidJobStatus').should('be.visible') - .get('#service-instantiation-audit-info-mso').should('be.visible') + cy.get('#service-instantiation-audit-info-mso').should('be.visible') .get('#service-instantiation-audit-info-mso').find('#msoJobStatus').should('be.visible') .get('#cancelButton').click({force: true}) .setViewportToDefault(); @@ -64,8 +60,8 @@ describe('Audit information modal', function () { cy.setViewportToSmallPopup(); cy.get('#service-instantiation-audit-info-mso thead tr th#instanceName').should("be.visible") .get('#service-instantiation-audit-info-mso tbody tr').each(function (row, index) { - assert.equal(row.find('.request-id').text().trim(), res[index]['requestId']); - assert.equal(row.find('.msoInstanceName').text().trim(), 'service: ' + res[index]['instanceName']); + assert.equal(row.find('#msoRequestId').text().trim(), res[index]['requestId']); + assert.equal(row.find('.msoInstanceName').text().trim(), res[index]['instanceName']); assert.equal(row.find('#msoJobStatus').text().trim(), _.capitalize(res[index]['jobStatus'])); assert.equal(row.find('#msoAdditionalInfo span').text().trim(), res[index]['additionalInfo']); }); @@ -84,5 +80,19 @@ describe('Audit information modal', function () { }) }); + it('Refresh link should be visible and clicking refresh should fetch latest data', function () { + cy.initAuditInfoMSOALaCarte(); + cy.openIframe('app/ui/#/instantiationStatus'); + cy.get('.instantiation-status-data tbody tr').each(function (row, index) { + cy.get('.icon-menu').eq(index).click({force: true}).then(()=>{ + cy.getElementByDataTestsId('context-menu-audit-info').click({force:true}).then(()=>{ + cy.setViewportToSmallPopup(); + cy.get('#refreshButton').should('be.visible'); + }) + + }) + }); + }); + }); }); diff --git a/vid-webpack-master/cypress/integration/iFrames/exportMSOStatusToCSV.e2e.ts b/vid-webpack-master/cypress/integration/iFrames/exportMSOStatusToCSV.e2e.ts new file mode 100644 index 000000000..a9ade182c --- /dev/null +++ b/vid-webpack-master/cypress/integration/iFrames/exportMSOStatusToCSV.e2e.ts @@ -0,0 +1,38 @@ +import {JsonBuilder} from "../../support/jsonBuilders/jsonBuilder"; +import {AsyncInstantiationModel} from "../../support/jsonBuilders/models/asyncInstantiation.model"; +import {ServiceModel} from "../../support/jsonBuilders/models/service.model"; + +describe('Audit Information model', function () { + describe('Export MSO status', function (){ + var jsonBuilderInstantiationBuilder: JsonBuilder = new JsonBuilder(); + var jsonBuilderAndMock: JsonBuilder = new JsonBuilder(); + beforeEach(() => { + cy.clearSessionStorage(); + cy.setReduxState(); + cy.preventErrorsOnLoading(); + jsonBuilderInstantiationBuilder.basicMock('cypress/support/jsonBuilders/mocks/jsons/asyncInstantiation.json', + Cypress.config('baseUrl') + "/asyncInstantiation**"); + cy.initAAIMock(); + cy.initVidMock(); + cy.initAsyncInstantiation(); + cy.login(); + }); + + afterEach(() => { + cy.screenshot(); + }); + + it(`should display 2 tables with information's`, function () { + cy.initAuditInfoMSOALaCarte(); + cy.openIframe('app/ui/#/instantiationStatus'); + + cy.get('#b1ff271b-829a-43f9-a2e3-23987a34f261 > #jobStatus > .menu-div > .icon-menu').click({force: true}).then(() =>{ + cy.getElementByDataTestsId('context-menu-audit-info').click(); + cy.wait(1000); + cy.getElementByDataTestsId('export-button').click(); + }); + + + }); + }) +}) 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 2a4e88210..41f65ff65 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 @@ -32,5 +32,6 @@ "FLAG_2008_PAUSE_INSTANTIATION_ON_VFMODULE_POPUP" : true, "FLAG_2008_REMOVE_PAUSE_INSTANTIATION" : true, "FLAG_2008_DISABLE_DRAG_FOR_BASE_MODULE" : true, - "FLAG_2008_CREATE_VFMODULE_INSTANTIATION_ORDER_NUMBER": true + "FLAG_2008_CREATE_VFMODULE_INSTANTIATION_ORDER_NUMBER": true, + "FLAG_2011_EXPORT_MSO_STATUS": true } diff --git a/vid-webpack-master/package.json b/vid-webpack-master/package.json index 25b4b4ddb..ffe630bd2 100755 --- a/vid-webpack-master/package.json +++ b/vid-webpack-master/package.json @@ -45,6 +45,7 @@ "@nicky-lenaers/ngx-scroll-to": "3.0.1", "@turf/turf": "5.1.6", "@types/lodash": "4.14.121", + "angular-resizable-element": "^3.3.3", "angular-svg-icon": "5.0.0", "angular-tree-component": "8.5.2", "angular2-datatable": "0.6.0", @@ -73,6 +74,7 @@ "rxjs-compat": "^6.3.3", "slnodejs": "^2.1.124", "tslib": "1.9.x", + "xlsx": "^0.16.6", "zone.js": "~0.9.1" }, "devDependencies": { diff --git a/vid-webpack-master/src/app/instantiationStatus/instantiationStatus.component.scss b/vid-webpack-master/src/app/instantiationStatus/instantiationStatus.component.scss index 352a7db10..fd826fba7 100644 --- a/vid-webpack-master/src/app/instantiationStatus/instantiationStatus.component.scss +++ b/vid-webpack-master/src/app/instantiationStatus/instantiationStatus.component.scss @@ -1,3 +1,16 @@ +.content.modal-open .body-content-jsp{ + margin-left: 3% !important; + //margin-right: 3% !important; + margin-top: 0% !important; +} +.content.modal-open .body-content-jsp .service-models-page .service-model-content{ + margin-left: 0% !important; + width: 100% !important; +} +.body-content-jsp { + margin-left: 14% !important; + margin-right: 2% !important; +} .last { position: sticky; diff --git a/vid-webpack-master/src/app/shared/components/auditInfoModal/auditInfoModal.component.html b/vid-webpack-master/src/app/shared/components/auditInfoModal/auditInfoModal.component.html index 086669091..038477d25 100644 --- a/vid-webpack-master/src/app/shared/components/auditInfoModal/auditInfoModal.component.html +++ b/vid-webpack-master/src/app/shared/components/auditInfoModal/auditInfoModal.component.html @@ -1,93 +1,95 @@