global: react-searchkit axios config and snapshots

- converted filters to post_filters - config expects an axios property
inveniosoftware · Apr 3, 2020 · 032c41b · 032c41b
1 parent d20c6de
commit 032c41b
Show file tree

Hide file tree

Showing 23 changed files with 115 additions and 64 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,6 +4,7 @@ __pycache__/
 
 # Idea software family
 .idea/
+.vscode/
 
 # C extensions
 *.so

diff --git a/.vscode/settings.json b/.vscode/settings.json
diff --git a/invenio_app_ils/config.py b/invenio_app_ils/config.py
@@ -1141,10 +1141,10 @@ def _(x):
             ),
         ),
         filters=dict(
-            circulation=default_value_when_missing_filter("circulation.state",
-                                                          "NOT_ON_LOAN"),
         ),
         post_filters=dict(
+            circulation=default_value_when_missing_filter(
+                "circulation.state", "NOT_ON_LOAN"),
             status=terms_filter("status"),
             medium=terms_filter("medium"),
             restrictions=terms_filter("circulation_restriction"),
@@ -1187,19 +1187,17 @@ def _(x):
                 )
             ),
         ),
-        filters={
+        post_filters={
+            "state": terms_filter("state"),
+            "delivery": terms_filter("delivery.method"),
+            "availability": keyed_range_filter(
+                "document.circulation.has_items_for_loan",
+                {"Available for loan": {"gt": 0}},
+            ),
             "returns.end_date": overdue_loans_filter("end_date"),
             "loans_from_date": date_range_filter("start_date", "gte"),
             "loans_to_date": date_range_filter("start_date", "lte"),
         },
-        post_filters=dict(
-            state=terms_filter("state"),
-            delivery=terms_filter("delivery.method"),
-            availability=keyed_range_filter(
-                "document.circulation.has_items_for_loan",
-                {"Available for loan": {"gt": 0}},
-            ),
-        ),
     ),
     acq_orders=dict(  # OrderSearch.Meta.index
         aggs=dict(

diff --git a/ui/package-lock.json b/ui/package-lock.json
diff --git a/ui/package.json b/ui/package.json
@@ -11,7 +11,7 @@
     "format": "prettier --config ./.prettierrc --ignore-path ./.prettierignore --write \"**/*.js\""
   },
   "dependencies": {
-    "axios": "^0.19.0",
+    "axios": "^0.19.2",
     "extract-text-webpack-plugin": "^3.0.2",
     "formik": "^2.0.6",
     "less": "^3.10.3",

diff --git a/ui/src/components/SearchControls/__tests__/SearchControls.test.js b/ui/src/components/SearchControls/__tests__/SearchControls.test.js
@@ -30,8 +30,10 @@ beforeEach(() => {
 });
 
 const searchApi = new InvenioSearchApi({
-  url: documentApi.searchBaseURL,
-  withCredentials: true,
+  axios: {
+    url: documentApi.searchBaseURL,
+    withCredentials: true,
+  },
 });
 
 describe('SearchControls tests', () => {

diff --git a/ui/src/components/SearchControls/__tests__/__snapshots__/SearchControls.test.js.snap b/ui/src/components/SearchControls/__tests__/__snapshots__/SearchControls.test.js.snap
@@ -101,16 +101,23 @@ exports[`SearchControls tests should mount SearchControls component 1`] = `
   }
 >
   <ReactSearchKit
+    appName="RSK"
     defaultSortByOnEmptyQuery={null}
-    history={null}
+    eventListenerEnabled={false}
     searchApi={
       InvenioSearchApi {
+        "axiosConfig": Object {
+          "url": "https://localhost:5000/api/documents/",
+          "withCredentials": true,
+        },
         "http": [Function],
+        "requestInterceptor": undefined,
         "requestSerializer": InvenioRequestSerializer {
           "_addFilter": [Function],
           "_addFilters": [Function],
           "serialize": [Function],
         },
+        "responseInterceptor": undefined,
         "responseSerializer": InvenioResponseSerializer {
           "serialize": [Function],
         },
@@ -139,15 +146,17 @@ exports[`SearchControls tests should mount SearchControls component 1`] = `
       }
     >
       <Connect(Bootstrap)
-        historyListen={null}
+        appName="RSK"
+        eventListenerEnabled={false}
         searchOnInit={true}
       >
         <Bootstrap
-          historyListen={null}
+          appName="RSK"
+          eventListenerEnabled={false}
           onAppInitialized={[Function]}
-          onBrowserHistoryExternallyChanged={[Function]}
           searchOnInit={true}
           searchOnUrlQueryStringChanged={[Function]}
+          updateQueryState={[Function]}
         >
           <SearchControls
             layoutToggle={

diff --git a/ui/src/pages/backoffice/Acquisition/Order/OrderSearch/OrderSearch.js b/ui/src/pages/backoffice/Acquisition/Order/OrderSearch/OrderSearch.js
@@ -42,11 +42,13 @@ class OrderResponseSerializer {
 
 export class OrderSearch extends Component {
   searchApi = new InvenioSearchApi({
+    axios: {
+      url: orderApi.searchBaseURL,
+      withCredentials: true,
+    },
     invenio: {
       responseSerializer: OrderResponseSerializer,
     },
-    url: orderApi.searchBaseURL,
-    withCredentials: true,
   });
 
   renderSearchBar = (_, queryString, onInputChange, executeSearch) => {

diff --git a/ui/src/pages/backoffice/Acquisition/Vendor/VendorSearch/VendorSearch.js b/ui/src/pages/backoffice/Acquisition/Vendor/VendorSearch/VendorSearch.js
@@ -29,8 +29,10 @@ import history from '@history';
 
 export class VendorSearch extends Component {
   searchApi = new InvenioSearchApi({
-    url: vendorApi.searchBaseURL,
-    withCredentials: true,
+    axios: {
+      url: vendorApi.searchBaseURL,
+      withCredentials: true,
+    },
   });
   searchConfig = getSearchConfig('vendors');
 

diff --git a/ui/src/pages/backoffice/Document/DocumentSearch/DocumentSearch.js b/ui/src/pages/backoffice/Document/DocumentSearch/DocumentSearch.js
@@ -30,8 +30,10 @@ import history from '@history';
 
 export class DocumentSearch extends Component {
   searchApi = new InvenioSearchApi({
-    url: documentApi.searchBaseURL,
-    withCredentials: true,
+    axios: {
+      url: documentApi.searchBaseURL,
+      withCredentials: true,
+    },
   });
   searchConfig = getSearchConfig('documents');
 

diff --git a/ui/src/pages/backoffice/DocumentRequest/DocumentRequestSearch/DocumentRequestSearch.js b/ui/src/pages/backoffice/DocumentRequest/DocumentRequestSearch/DocumentRequestSearch.js
@@ -29,8 +29,10 @@ import { responseRejectInterceptor } from '@api/base';
 
 export class DocumentRequestSearch extends Component {
   searchApi = new InvenioSearchApi({
-    url: documentRequestApi.searchBaseURL,
-    withCredentials: true,
+    axios: {
+      url: documentRequestApi.searchBaseURL,
+      withCredentials: true,
+    },
     interceptors: {
       response: { reject: responseRejectInterceptor },
     },

diff --git a/ui/src/pages/backoffice/EItem/EItemSearch/EItemSearch.js b/ui/src/pages/backoffice/EItem/EItemSearch/EItemSearch.js
@@ -28,8 +28,10 @@ import history from '@history';
 
 export class EItemSearch extends Component {
   searchApi = new InvenioSearchApi({
-    url: eitemApi.searchBaseURL,
-    withCredentials: true,
+    axios: {
+      url: eitemApi.searchBaseURL,
+      withCredentials: true,
+    },
     interceptors: {
       response: { reject: responseRejectInterceptor },
     },

diff --git a/ui/src/pages/backoffice/ILL/BorrowingRequestSearch/BorrowingRequestSearch.js b/ui/src/pages/backoffice/ILL/BorrowingRequestSearch/BorrowingRequestSearch.js
@@ -29,8 +29,10 @@ import { BorrowingRequestListEntry } from './components';
 
 export class BorrowingRequestSearch extends Component {
   searchApi = new InvenioSearchApi({
-    url: borrowingRequestApi.searchBaseURL,
-    withCredentials: true,
+    axios: {
+      url: borrowingRequestApi.searchBaseURL,
+      withCredentials: true,
+    },
   });
 
   renderSearchBar = (_, queryString, onInputChange, executeSearch) => {

diff --git a/ui/src/pages/backoffice/ILL/LibrarySearch/LibrarySearch.js b/ui/src/pages/backoffice/ILL/LibrarySearch/LibrarySearch.js
@@ -27,8 +27,10 @@ import { LibraryListEntry } from './components/LibraryListEntry';
 
 export class LibrarySearch extends Component {
   searchApi = new InvenioSearchApi({
-    url: libraryApi.searchBaseURL,
-    withCredentials: true,
+    axios: {
+      url: libraryApi.searchBaseURL,
+      withCredentials: true,
+    },
   });
   searchConfig = getSearchConfig('libraries');
 

diff --git a/ui/src/pages/backoffice/Item/ItemSearch/ItemSearch.js b/ui/src/pages/backoffice/Item/ItemSearch/ItemSearch.js
@@ -25,8 +25,10 @@ import {
 
 export class ItemSearch extends Component {
   searchApi = new InvenioSearchApi({
-    url: itemApi.searchBaseURL,
-    withCredentials: true,
+    axios: {
+      url: itemApi.searchBaseURL,
+      withCredentials: true,
+    },
     interceptors: {
       response: { reject: responseRejectInterceptor },
     },

diff --git a/ui/src/pages/backoffice/Loan/LoanSearch/SearchDateRange.js b/ui/src/pages/backoffice/Loan/LoanSearch/SearchDateRange.js
@@ -3,6 +3,7 @@ import { Card } from 'semantic-ui-react';
 import { DatePicker } from '@components';
 import { withState } from 'react-searchkit';
 import _isEmpty from 'lodash/isEmpty';
+import _flatten from 'lodash/flatten';
 
 class _SearchDateRange extends Component {
   getCurrentDates() {
@@ -17,16 +18,21 @@ class _SearchDateRange extends Component {
     return [fromDate, toDate];
   }
 
-  /** react-searchkit allows having the same filter multiple times.
-   * For the range dates filters we want each filter one time only so we have
-   * to remove any pre-existing filters with the same name
+  /** react-searchkit allows having the same filter multiple times with different values.
+   * For this range dates filters, we want each filter to appear only one time with one value
+   * (e.g. loan_start_date = `<date>`)
    */
   onDateChange = newFilter => {
     const [name, value] = newFilter;
-    let filters = newFilter;
-    // If value is empty we simply remove the filter otherwise if we have
-    // value we remove the filter and add the new one.
-    if (!_isEmpty(value)) filters = [[name, ''], newFilter];
+    if (_isEmpty(value))
+      return this.props.updateQueryState({ filters: newFilter });
+
+    const oldFilters = this.props.currentQueryState.filters.filter(
+      filter => filter[0] === name
+    );
+
+    let filters = [newFilter];
+    if (!_isEmpty(oldFilters)) filters.unshift(_flatten(oldFilters));
     return this.props.updateQueryState({ filters: filters });
   };
 

diff --git a/ui/src/pages/backoffice/Patron/PatronSearch/PatronSearch.js b/ui/src/pages/backoffice/Patron/PatronSearch/PatronSearch.js
@@ -29,8 +29,10 @@ import { ExportReactSearchKitResults } from '../../components';
 
 export class PatronSearch extends Component {
   searchApi = new InvenioSearchApi({
-    url: patronApi.searchBaseURL,
-    withCredentials: true,
+    axios: {
+      url: patronApi.searchBaseURL,
+      withCredentials: true,
+    },
     interceptors: {
       response: { reject: responseRejectInterceptor },
     },

diff --git a/ui/src/pages/backoffice/Series/SeriesSearch/SeriesSearch.js b/ui/src/pages/backoffice/Series/SeriesSearch/SeriesSearch.js
@@ -31,8 +31,10 @@ import history from '@history';
 
 export class SeriesSearch extends Component {
   searchApi = new InvenioSearchApi({
-    url: seriesApi.searchBaseURL,
-    withCredentials: true,
+    axios: {
+      url: seriesApi.searchBaseURL,
+      withCredentials: true,
+    },
     interceptors: {
       response: { reject: responseRejectInterceptor },
     },

diff --git a/ui/src/pages/frontsite/Documents/DocumentsSearch/DocumentsSearch.js b/ui/src/pages/frontsite/Documents/DocumentsSearch/DocumentsSearch.js
@@ -35,8 +35,10 @@ import history from '@history';
 
 export class DocumentsSearch extends Component {
   searchApi = new InvenioSearchApi({
-    url: literatureApi.searchBaseURL,
-    withCredentials: true,
+    axios: {
+      url: literatureApi.searchBaseURL,
+      withCredentials: true,
+    },
     interceptors: {
       response: { reject: responseRejectInterceptor },
     },

diff --git a/ui/src/pages/frontsite/Documents/DocumentsSearch/DocumentsSearchMobile.js b/ui/src/pages/frontsite/Documents/DocumentsSearch/DocumentsSearchMobile.js
@@ -14,8 +14,10 @@ import { DocumentSearchResultsGrid } from './DocumentSearchResultsGrid';
 
 export class DocumentsSearchMobile extends Component {
   searchApi = new InvenioSearchApi({
-    url: documentApi.searchBaseURL,
-    withCredentials: true,
+    axios: {
+      url: documentApi.searchBaseURL,
+      withCredentials: true,
+    },
     interceptors: {
       response: { reject: responseRejectInterceptor },
     },

diff --git a/.../frontsite/Documents/DocumentsSearch/__tests__/__snapshots__/DocumentsSearch.test.js.snap b/.../frontsite/Documents/DocumentsSearch/__tests__/__snapshots__/DocumentsSearch.test.js.snap
@@ -3,7 +3,9 @@
 exports[`DocumentsSearch tests should load the DocumentsSearch component 1`] = `
 <Fragment>
   <ReactSearchKit
+    appName="RSK"
     defaultSortByOnEmptyQuery={null}
+    eventListenerEnabled={false}
     history={
       Object {
         "action": "POP",
@@ -26,12 +28,20 @@ exports[`DocumentsSearch tests should load the DocumentsSearch component 1`] = `
     }
     searchApi={
       InvenioSearchApi {
+        "axiosConfig": Object {
+          "url": "https://localhost:5000/api/literature/",
+          "withCredentials": true,
+        },
         "http": [Function],
+        "requestInterceptor": undefined,
         "requestSerializer": InvenioRequestSerializer {
           "_addFilter": [Function],
           "_addFilters": [Function],
           "serialize": [Function],
         },
+        "responseInterceptor": Object {
+          "reject": [Function],
+        },
         "responseSerializer": InvenioResponseSerializer {
           "serialize": [Function],
         },

diff --git a/ui/src/pages/frontsite/components/Series/SeriesLiteratureSearch/SeriesLiteratureSearch.js b/ui/src/pages/frontsite/components/Series/SeriesLiteratureSearch/SeriesLiteratureSearch.js
@@ -58,11 +58,13 @@ export class SeriesLiteratureSearch extends React.Component {
     ).length;
     const documentsCount = serialsCount + monographsCount;
     const api = new InvenioSearchApi({
+      axios: {
+        url: literatureApi.searchBaseURL,
+        withCredentials: true,
+      },
       invenio: {
         requestSerializer: literatureRequestSerializerCls(metadata),
       },
-      url: literatureApi.searchBaseURL,
-      withCredentials: true,
     });
     return (
       <>
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,7 @@ __pycache__/ @@
     # Idea software family
     .idea/
+    .vscode/
     # C extensions
     *.so
@@ Expand Down @@