New Filter Bar (#596)

* engagement filter redo

* test related

* fix issue with toolbar chips

* fix space error in Engagement search box. Fix cypress spec 2

* fix issue when clicking on engagement status links after original load

* lint failure avoidance

* fix page reload filter hold

* test

cypress/integration/2_existing_engagement_spec.js

@@ -8,8 +8,7 @@ describe('existing engagement engagement', () => {
 
   it('searches for an engagement', () => {
     cy.visit('/app/engagements/all');
-    cy.get('[data-cy=search_input]').should('exist');
-    cy.get('[data-cy=search_input]').type('cypress');
+    cy.get('[data-cy=search_input]').should('exist').type('cypress');
 
     cy.get('[data-cy=engagement_cards_section]')
       .find('[data-cy=view_engagement_button]')
@@ -18,7 +17,7 @@ describe('existing engagement engagement', () => {
   });
 
   it('filters engagements', () => {
-    cy.get('#filter_dropdown')
+    cy.get('#status_dropdown')
       .click({ force: true })
       .get('[data-testid=active]')
       .click();
@@ -32,7 +31,7 @@ describe('existing engagement engagement', () => {
   it('sorts engagements', () => {
     cy.get('#sort_dropdown')
       .click({ force: true })
-      .get('[data-testid="Start Date Asc"]')
+      .get('[data-testid="startDate-asc"]')
       .click();
 
     cy.get('[data-cy=engagement_cards_section]')
@@ -42,11 +41,23 @@ describe('existing engagement engagement', () => {
   });
 
   it('reset search criteria', () => {
-    cy.get('[data-cy=search_input]').type('cypress');
+    cy.get(`[aria-label="Open advanced search"]`)
+      .click();
 
     cy.get('[data-cy=reset_button]').click();
+    cy.get('[aria-label="Search input"]').should('exist').should('have.value', '');
+
+    cy.get('[data-cy=category]').type('Category');
+    cy.get('[data-cy=engagement-customer]').type('cypress hill')
+
+    cy.get(`[aria-label="Open advanced search"]`)
+      .click();
+
+    cy.get('[aria-label="Search input"]').should('exist').should('have.value', "cypress hill category='Category'");
+
+    cy.get('[aria-label="Reset"]').click();
 
-    cy.get('[data-cy=search_input]').should('have.value', '');
+    cy.get('[aria-label="Search input"]').should('exist').should('have.value', '');
 
     cy.get('[data-cy=engagement_cards_section]')
       .find('[data-cy=view_engagement_button]')