DATAP-1208 Convert reducers to RTK slices

cypress/e2e/common/filters.cy.js

@@ -34,6 +34,8 @@ describe('Filter Panel', () => {
       fixture = { fixture: 'common/get-complaints-date-to.json' };
       cy.intercept(request, fixture).as('getComplaintsDateTo');
 
+      // eslint-disable-next-line cypress/no-unnecessary-waiting
+      cy.wait(500);
       cy.log('is expanded');
 
       cy.get('#date_received-from').should('be.visible');

cypress/e2e/document/document.cy.js

@@ -46,19 +46,19 @@ describe('Document View', () => {
       cy.intercept(request, fixture).as('getAggsResults');
 
       request =
-        '?**&field=all&has_narrative=true&search_term=pizza&size=10&sort=relevance_desc';
+        '?**&field=all&frm=0&has_narrative=true&no_aggs=true&search_term=pizza&size=10&sort=relevance_desc';
       fixture = { fixture: 'document/get-results.json' };
       cy.intercept(request, fixture).as('getResults');
 
       cy.intercept('GET', '/_suggest/?text=pizza', []);
 
       cy.visit(
-        '?searchText=pizza&has_narrative=true&size=10&sort=relevance_desc&tab=List'
+        '?searchText=pizza&has_narrative=true&size=10&sort=relevance_desc&tab=List',
       );
 
       cy.get('select#select-sort option:selected').should(
         'have.text',
-        'Relevance'
+        'Relevance',
       );
 
       cy.contains('.pill', 'Has narrative').should('be.visible');
@@ -82,7 +82,7 @@ describe('Document View', () => {
 
       cy.get('select#select-sort option:selected').should(
         'have.text',
-        'Relevance'
+        'Relevance',
       );
 
       cy.contains('.pill', 'Has narrative').should('be.visible');

cypress/fixtures/document/get-detail.json

@@ -1 +1 @@
-{"took":11,"timed_out":false,"_shards":{"total":5,"successful":5,"skipped":0,"failed":0},"hits":{"total":{"value":1,"relation":"eq"},"max_score":1.0,"hits":[{"_index":"complaint-public-v2","_type":"_doc","_id":"3146099","_score":1.0,"_source":{"product":"Credit card or prepaid card","complaint_what_happened":"my card has been declined for \" suspicious '' purchases and they are not able to prevent, or remedy the problem. I've worked with them multiple times and after excessive hold times on each call, it continues and can't seem to be fixed. \n\nEach time I call it's a different excuse. \n\nThis started in early XXXX of XXXX and has occurred in XXXX, XXXX, XXXX of XXXX, XXXX of XXXX and XX/XX/XXXX. \n\nThe purchases were for the following : 1. Pizza at local Pizza shop. ( 1 block from house ) 2. XXXX XXXX for prescription medicine and household ( 2 miles from home ) 3. Online game service using a virtual card number that was exclusively provided by capital one for this service.","date_sent_to_company":"2019-02-07T12:00:00-05:00","issue":"Trouble using your card",":updated_at":1639539163,"date_received_formatted":"02/07/19","sub_product":"General-purpose credit card or charge card","zip_code":"19438","tags":null,"has_narrative":true,"complaint_id":"3146099","date_sent_to_company_formatted":"02/07/19","timely":"Yes","consumer_consent_provided":"Consent provided","company_response":"Closed with explanation","date_indexed":"2021-12-15T12:00:00-05:00","submitted_via":"Web","date_indexed_formatted":"12/15/21","company":"CAPITAL ONE FINANCIAL CORPORATION","date_received":"2019-02-07T12:00:00-05:00","state":"PA","consumer_disputed":"N/A","company_public_response":null,"sub_issue":"Can't use card to make purchases"}}]}}
+{"took": 11, "timed_out": false, "_shards": { "total": 5, "successful": 5, "skipped": 0, "failed": 0 }, "hits": {"total": { "value": 1, "relation": "eq" }, "max_score": 1.0, "hits": [{"_index": "complaint-public-v2", "_type": "_doc", "_id": "3146099", "_score": 1.0, "_source": {"product": "Credit card or prepaid card", "complaint_what_happened": "my card has been declined for \" suspicious '' purchases and they are not able to prevent, or remedy the problem. I've worked with them multiple times and after excessive hold times on each call, it continues and can't seem to be fixed. \n\nEach time I call it's a different excuse. \n\nThis started in early XXXX of XXXX and has occurred in XXXX, XXXX, XXXX of XXXX, XXXX of XXXX and XX/XX/XXXX. \n\nThe purchases were for the following : 1. Pizza at local Pizza shop. ( 1 block from house ) 2. XXXX XXXX for prescription medicine and household ( 2 miles from home ) 3. Online game service using a virtual card number that was exclusively provided by capital one for this service.", "date_sent_to_company": "2019-02-07T12:00:00-05:00", "issue": "Trouble using your card", ":updated_at": 1639539163, "date_received_formatted": "02/07/19", "sub_product": "General-purpose credit card or charge card", "zip_code": "19438", "tags": null, "has_narrative": true, "complaint_id": "3146099", "date_sent_to_company_formatted": "02/07/19", "timely": "Yes", "consumer_consent_provided": "Consent provided", "company_response": "Closed with explanation", "date_indexed": "2021-12-15T12:00:00-05:00", "submitted_via": "Web", "date_indexed_formatted": "12/15/21", "company": "CAPITAL ONE FINANCIAL CORPORATION", "date_received": "2019-02-07T12:00:00-05:00", "state": "PA", "consumer_disputed": "N/A", "company_public_response": null, "sub_issue": "Can't use card to make purchases"}}]}}

package.json

@@ -118,10 +118,10 @@
     ],
     "coverageThreshold": {
       "global": {
-        "branches": 85,
-        "functions": 89,
-        "lines": 93,
-        "statements": 93
+        "branches": 86,
+        "functions": 94,
+        "lines": 94,
+        "statements": 94
       }
     },
     "coverageReporters": [

src/App.spec.js

@@ -1,62 +1,39 @@
 import App from './App';
 import { Provider } from 'react-redux';
 import 'regenerator-runtime/runtime';
-import { render, screen, waitFor } from '@testing-library/react';
+import { MemoryRouter, Route, Routes } from 'react-router-dom';
+import { render, screen } from '@testing-library/react';
 import * as useUpdateLocationHook from './hooks/useUpdateLocation';
 import store from './app/store';
-import { MemoryRouter, Route, Routes } from 'react-router-dom';
 import { ComplaintDetail } from './components/ComplaintDetail/ComplaintDetail';
-
+import { waitFor } from './testUtils/test-utils';
 jest.mock('highcharts/modules/accessibility');
 jest.mock('highcharts/highmaps');
 
 describe('initial state', () => {
-  it('renders search page', () => {
+  it('renders search page', async () => {
     const updateLocationHookSpy = jest.spyOn(
       useUpdateLocationHook,
       'useUpdateLocation',
     );
-
     render(
       <Provider store={store}>
         <App />
       </Provider>,
     );
 
-    expect(updateLocationHookSpy).toBeCalled();
-
+    expect(updateLocationHookSpy).toBeCalledTimes(1);
     expect(screen.getByText(/Consumer Complaint Database/)).toBeInTheDocument();
     expect(screen.getByText(/Search within/)).toBeInTheDocument();
     expect(
       screen.getByRole('button', { name: /Show advanced search tips/ }),
     ).toBeInTheDocument();
-  });
-
-  it('renders tour button', async () => {
-    const updateLocationHookSpy = jest
-      .spyOn(useUpdateLocationHook, 'useUpdateLocation')
-      .mockImplementation(() => jest.fn());
-
-    render(
-      <Provider store={store}>
-        <App />
-      </Provider>,
-    );
-
-    expect(updateLocationHookSpy).toBeCalled();
-
-    expect(screen.getByText(/Consumer Complaint Database/)).toBeInTheDocument();
-    expect(screen.getByText(/Search within/)).toBeInTheDocument();
-    expect(
-      screen.getByRole('button', { name: /Show advanced search tips/ }),
-    ).toBeInTheDocument();
-
     await waitFor(() => {
       expect(
         screen.getByRole('button', { name: /Take a tour/ }),
       ).toBeInTheDocument();
     });
-  });
+  }, 10000);
 
   it('renders the detail route', () => {
     render(
@@ -74,10 +51,7 @@ describe('initial state', () => {
     ).toBeInTheDocument();
     expect(
       screen.getByRole('link', { name: /Back to search results/ }),
-    ).toHaveAttribute(
-      'href',
-      '/?chartType=line&dateInterval=Month&dateRange=3y&date_received_max=2020-05-05&date_received_min=2017-05-05&lens=Product&searchField=all&subLens=sub_product&tab=Trends',
-    );
+    ).toHaveAttribute('href', '/');
 
     expect(screen.getByText('This page is loading')).toBeInTheDocument();
   });

src/actions/__fixtures__/emptyStore.js

@@ -1,17 +1,21 @@
-import { defaultAggs as aggs } from '../../reducers/aggs/aggs';
-import { defaultDetail as detail } from '../../reducers/detail/detail';
-import { defaultMap as map } from '../../reducers/map/map';
-import { defaultQuery as query } from '../../reducers/query/query';
-import { defaultTrends as trends } from '../../reducers/trends/trends';
-import { defaultResults as results } from '../../reducers/results/results';
-import { defaultView as view } from '../../reducers/view/view';
+import { aggsState as aggs } from '../../reducers/aggs/aggsSlice';
+import { detailState as detail } from '../../reducers/detail/detailSlice';
+import { filtersState as filters } from '../../reducers/filters/filtersSlice';
+import { mapState as map } from '../../reducers/map/mapSlice';
+import { queryState as query } from '../../reducers/query/querySlice';
+import { resultsState as results } from '../../reducers/results/resultsSlice';
+import { routesState as routes } from '../../reducers/routes/routesSlice';
+import { trendsState as trends } from '../../reducers/trends/trendsSlice';
+import { viewState as view } from '../../reducers/view/viewSlice';
 
 export default Object.freeze({
   aggs,
   detail,
+  filters,
   map,
   query,
   results,
+  routes,
   trends,
   view,
 });

src/actions/__tests__/complaints.spec.js

@@ -1,33 +1,31 @@
 import * as sut from '..';
 import * as constants from '../../constants';
 import { initialState, setupStore } from '../../testUtils/setupStore';
-import {
-  AGGREGATIONS_API_CALLED,
-  COMPLAINT_DETAIL_CALLED,
-  COMPLAINTS_API_CALLED,
-  STATES_API_CALLED,
-  TRENDS_API_CALLED,
-} from '..';
 
 describe('action::complaints', () => {
   let expectedHitsQS, expectedQS, fixtureStore;
 
   beforeEach(() => {
     expectedHitsQS =
-      '@@API?date_received_max=2020-05-05&date_received_min=2017-05-05&field=all&size=25&sort=created_date_desc';
+      '@@API?date_received_max=2020-05-05&date_received_min=2017-05-05&field=all&frm=0&no_aggs=true&size=25&sort=created_date_desc';
   });
   describe('getAggregations', () => {
     beforeEach(() => {
       fixtureStore = initialState();
-      fixtureStore.query.tab = constants.MODE_LIST;
       expectedQS =
-        '@@API?date_received_max=2020-05-05&date_received_min=2017-05-05&field=all&sort=created_date_desc&size=0';
+        '@@API?date_received_max=2020-05-05&date_received_min=2017-05-05&field=all&size=0';
     });
 
     it('executes a chain of actions', function () {
+      fixtureStore.view.tab = constants.MODE_LIST;
+
       const store = setupStore(fixtureStore);
       const url = expectedQS;
-      const expectedActions = [sut.callingApi(AGGREGATIONS_API_CALLED, url)];
+
+      const expectedActions = [
+        sut.aggregationsApiCalled(url),
+        sut.httpGet(url, sut.aggregationsReceived, sut.aggregationsApiFailed),
+      ];
       store.dispatch(sut.getAggregations());
       const { actions } = store.getState().actions;
       expect(actions).toEqual(expectedActions);
@@ -49,13 +47,18 @@ describe('action::complaints', () => {
     beforeEach(() => {
       fixtureStore = initialState();
       expectedUrl = expectedHitsQS;
-      fixtureStore.query.tab = constants.MODE_LIST;
+      fixtureStore.view.tab = constants.MODE_LIST;
     });
 
     it('executes a chain of actions', function () {
       const store = setupStore(fixtureStore);
       const expectedActions = [
-        sut.callingApi(COMPLAINTS_API_CALLED, expectedUrl),
+        sut.complaintsApiCalled(expectedUrl),
+        sut.httpGet(
+          expectedUrl,
+          sut.complaintsReceived,
+          sut.complaintsApiFailed,
+        ),
       ];
       store.dispatch(sut.getComplaints());
       const { actions } = store.getState().actions;
@@ -78,14 +81,19 @@ describe('action::complaints', () => {
 
     beforeEach(() => {
       fixtureStore = initialState();
-      fixtureStore.query.tab = constants.MODE_DOCUMENT;
+      fixtureStore.view.tab = constants.MODE_DETAIL;
       expectedUrl = '@@API123';
     });
 
     it('executes a series of actions', function () {
       const store = setupStore(fixtureStore);
       const expectedActions = [
-        sut.callingApi(COMPLAINT_DETAIL_CALLED, expectedUrl),
+        sut.complaintDetailCalled(expectedUrl),
+        sut.httpGet(
+          expectedUrl,
+          sut.complaintDetailReceived,
+          sut.complaintDetailFailed,
+        ),
       ];
       store.dispatch(sut.getComplaintDetail(123));
       const { actions } = store.getState().actions;
@@ -107,14 +115,19 @@ describe('action::complaints', () => {
 
     beforeEach(() => {
       fixtureStore = initialState();
-      fixtureStore.query.tab = constants.MODE_MAP;
+      fixtureStore.view.tab = constants.MODE_MAP;
       expectedUrl =
-        '@@APIgeo/states/?date_received_max=2020-05-05&date_received_min=2017-05-05&field=all&no_aggs=true';
+        '@@APIgeo/states/?date_received_max=2020-05-05' +
+        '&date_received_min=2017-05-05&field=all&frm=0&no_aggs=true' +
+        '&size=25&sort=created_date_desc';
     });
 
     it('executes a series of actions', function () {
       const store = setupStore(fixtureStore);
-      const expectedActions = [sut.callingApi(STATES_API_CALLED, expectedUrl)];
+      const expectedActions = [
+        sut.statesApiCalled(expectedUrl),
+        sut.httpGet(expectedUrl, sut.statesReceived, sut.statesApiFailed),
+      ];
       store.dispatch(sut.getStates());
       const { actions } = store.getState().actions;
       expect(actions).toEqual(expectedActions);
@@ -135,14 +148,20 @@ describe('action::complaints', () => {
 
     beforeEach(() => {
       fixtureStore = initialState();
-      fixtureStore.query.tab = constants.MODE_TRENDS;
+      fixtureStore.view.tab = constants.MODE_TRENDS;
       expectedUrl =
-        '@@APItrends/?date_received_max=2020-05-05&date_received_min=2017-05-05&field=all&lens=product&sub_lens=sub_product&trend_depth=5&trend_interval=month&no_aggs=true';
+        '@@APItrends?date_received_max=2020-05-05' +
+        '&date_received_min=2017-05-05&field=all&frm=0&lens=product' +
+        '&no_aggs=true&searchField=all&size=25&sort=created_date_desc' +
+        '&sub_lens=sub_product&trend_depth=5&trend_interval=month';
     });
 
     it('executes a series of actions', function () {
       const store = setupStore(fixtureStore);
-      const expectedActions = [sut.callingApi(TRENDS_API_CALLED, expectedUrl)];
+      const expectedActions = [
+        sut.trendsApiCalled(expectedUrl),
+        sut.httpGet(expectedUrl, sut.trendsReceived, sut.trendsApiFailed),
+      ];
       store.dispatch(sut.getTrends());
       const { actions } = store.getState().actions;
       expect(actions).toEqual(expectedActions);