searchApi: fix response interceptors and suggestion config validation

src/lib/api/contrib/invenio/InvenioSearchApi.js

@@ -81,7 +81,7 @@ export class InvenioSearchApi {
       );
     }
     if (this.responseInterceptor) {
-      this.http.interceptors.request.use(
+      this.http.interceptors.response.use(
         this.responseInterceptor.resolve,
         this.responseInterceptor.reject
       );

src/lib/api/contrib/invenio/InvenioSearchApi.test.js

@@ -76,4 +76,36 @@ describe("test InvenioSearchApi class", () => {
     const request = mockedAxios.history.get[0];
     expect(request.url).toBe("/api/records");
   });
+
+  it("should register response interceptors on the response pipeline", async () => {
+    const responseResolve = jest.fn((response) => response);
+    const searchApi = new InvenioSearchApi({
+      axios: {
+        url: "/api/records",
+      },
+      invenio: {
+        requestSerializer: MockedRequestSerializer,
+        responseSerializer: MockedResponseSerializer,
+      },
+      interceptors: {
+        response: {
+          resolve: responseResolve,
+          reject: (error) => Promise.reject(error),
+        },
+      },
+    });
+    const mockedAxios = new MockAdapter(searchApi.http);
+
+    const mockedResponse = { hits: [{ result: "1" }] };
+    mockedAxios.onAny().reply(200, mockedResponse);
+    await searchApi.search({ q: "test" });
+
+    expect(responseResolve).toHaveBeenCalledTimes(1);
+    expect(responseResolve).toHaveBeenCalledWith(
+      expect.objectContaining({
+        status: 200,
+        data: mockedResponse,
+      })
+    );
+  });
 });

src/lib/api/contrib/invenio/InvenioSuggestionApi.js

@@ -58,21 +58,23 @@ class InvenioSuggestionResponseSerializer {
 
 export class InvenioSuggestionApi extends InvenioSearchApi {
   validateConfig(config) {
-    super.validateConfig(config);
-
+    // the parent `axios` config is already validated by the `InvenioSearchApi`
+    // constructor via `validateAxiosConfig`, here we only validate the
+    // suggestion-specific config
     if (!_hasIn(config, "invenio.suggestions.queryField")) {
       throw new Error(
         "InvenioSuggestionApi config: `invenio.suggestions.queryField` is required."
       );
     }
     if (!_hasIn(config, "invenio.suggestions.responseField")) {
       throw new Error(
-        "InvenioSuggestionApi config: `invenio.suggestions.queryField` is responseField."
+        "InvenioSuggestionApi config: `invenio.suggestions.responseField` is required."
       );
     }
   }
 
   initSerializers(config) {
+    this.validateConfig(config);
     const requestSerializerCls = _get(
       config,
       "invenio.requestSerializer",

src/lib/api/contrib/invenio/InvenioSuggestionApi.test.js

@@ -0,0 +1,64 @@
+/*
+ * This file is part of React-SearchKit.
+ * Copyright (C) 2019 CERN.
+ *
+ * React-SearchKit is free software; you can redistribute it and/or modify it
+ * under the terms of the MIT License; see LICENSE file for more details.
+ */
+
+import { InvenioSuggestionApi } from ".";
+
+describe("test InvenioSuggestionApi class", () => {
+  it("should throw when `invenio.suggestions.queryField` is missing", () => {
+    expect(
+      () =>
+        new InvenioSuggestionApi({
+          axios: {
+            url: "/api/records",
+          },
+          invenio: {
+            suggestions: {
+              responseField: "metadata.title",
+            },
+          },
+        })
+    ).toThrow(
+      "InvenioSuggestionApi config: `invenio.suggestions.queryField` is required."
+    );
+  });
+
+  it("should throw when `invenio.suggestions.responseField` is missing", () => {
+    expect(
+      () =>
+        new InvenioSuggestionApi({
+          axios: {
+            url: "/api/records",
+          },
+          invenio: {
+            suggestions: {
+              queryField: "title",
+            },
+          },
+        })
+    ).toThrow(
+      "InvenioSuggestionApi config: `invenio.suggestions.responseField` is required."
+    );
+  });
+
+  it("should not throw when both suggestion fields are provided", () => {
+    expect(
+      () =>
+        new InvenioSuggestionApi({
+          axios: {
+            url: "/api/records",
+          },
+          invenio: {
+            suggestions: {
+              queryField: "title",
+              responseField: "metadata.title",
+            },
+          },
+        })
+    ).not.toThrow();
+  });
+});

src/lib/api/contrib/opensearch/OSSearchApi.js

@@ -64,7 +64,7 @@ export class OSSearchApi {
       );
     }
     if (this.responseInterceptor) {
-      this.http.interceptors.request.use(
+      this.http.interceptors.response.use(
         this.responseInterceptor.resolve,
         this.responseInterceptor.reject
       );

src/lib/api/contrib/opensearch/OSSearchApi.test.js

@@ -76,4 +76,36 @@ describe("test OSSearchApi class", () => {
     const request = mockedAxios.history.post[0];
     expect(request.url).toBe("/api/records");
   });
+
+  it("should register response interceptors on the response pipeline", async () => {
+    const responseResolve = jest.fn((response) => response);
+    const searchApi = new OSSearchApi({
+      axios: {
+        url: "/api/records",
+      },
+      os: {
+        requestSerializer: MockedRequestSerializer,
+        responseSerializer: MockedResponseSerializer,
+      },
+      interceptors: {
+        response: {
+          resolve: responseResolve,
+          reject: (error) => Promise.reject(error),
+        },
+      },
+    });
+    const mockedAxios = new MockAdapter(searchApi.http);
+
+    const mockedResponse = { hits: [{ result: "1" }] };
+    mockedAxios.onAny().reply(200, mockedResponse);
+    await searchApi.search({ q: "test" });
+
+    expect(responseResolve).toHaveBeenCalledTimes(1);
+    expect(responseResolve).toHaveBeenCalledWith(
+      expect.objectContaining({
+        status: 200,
+        data: mockedResponse,
+      })
+    );
+  });
 });

src/lib/state/actions/query.js

@@ -199,7 +199,7 @@ const updateQueryStateAfterResponse = (response, dispatch, getState, appConfig)
     // Replace the URL args with the response new query state
     urlHandlerApi.replace(updatedQueryState);
   }
-  delete response.newStateQuery;
+  delete response.newQueryState;
   return response;
 };