Merge "free text filter in instantiationStatus Page"

3 files changed, 16 insertions, 3 deletions

diff --git a/vid-webpack-master/cypress/integration/iFrames/instantiationStatus.e2e.ts b/vid-webpack-master/cypress/integration/iFrames/instantiationStatus.e2e.ts
index 3b657343f..054f7858b 100644
--- a/vid-webpack-master/cypress/integration/iFrames/instantiationStatus.e2e.ts
+++ b/vid-webpack-master/cypress/integration/iFrames/instantiationStatus.e2e.ts
@@ -58,6 +58,18 @@ describe('Instantiation status', function () {
     }
   });
 
+  it('should filter rows by filter text', function () {
+    cy.openIframe('app/ui/#/instantiationStatus');
+    cy.getElementByDataTestsId("instantiationStatusFilter").type("ComplexService");
+    cy.get('table#instantiation-status tbody tr').should('have.length', 3);
+  });
+
+  it('should filter rows by url filter text', function () {
+    cy.openIframe('app/ui/#/instantiationStatus?filterText=ComplexService');
+    cy.getElementByDataTestsId("instantiationStatusFilter").should('have.value','ComplexService');
+    cy.get('table#instantiation-status tbody tr').should('have.length', 3);
+  });
+
   it('should enable correct menu items', function () {
         cy.openIframe('app/ui/#/instantiationStatus');
 
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 85e091742..b829361af 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
@@ -18,5 +18,6 @@
   "FLAG_1911_INSTANTIATION_ORDER_IN_ASYNC_ALACARTE": false,
   "FLAG_1911_INSTANTIATION_ORDER_BUTTON_IN_ASYNC_ALACARTE": false,
   "FLAG_2002_VNF_PLATFORM_MULTI_SELECT" : false,
-  "FLAG_2002_VFM_UPGRADE_ADDITIONAL_OPTIONS": true
+  "FLAG_2002_VFM_UPGRADE_ADDITIONAL_OPTIONS": true,
+  "FLAG_2004_INSTANTIATION_STATUS_FILTER": true
 }
diff --git a/vid-webpack-master/cypress/support/steps/login.step.ts b/vid-webpack-master/cypress/support/steps/login.step.ts
index a7ed0752e..99c80bcb7 100644
--- a/vid-webpack-master/cypress/support/steps/login.step.ts
+++ b/vid-webpack-master/cypress/support/steps/login.step.ts
@@ -34,8 +34,8 @@ function login(): void {
   }
 }
 
-function openIframe(iframeUrl : string): void {
-  cy.visit(iframeUrl);
+function openIframe(iframeUrl : string): Chainable<Window> {
+  return cy.visit(iframeUrl);
 }
 
 Cypress.Commands.add('login', login);