@truedat/dq 7.12.7 → 7.13.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/dq",
-  "version": "7.12.7",
+  "version": "7.13.1",
   "description": "Truedat Web Data Quality Module",
   "sideEffects": false,
   "module": "src/index.js",
@@ -53,7 +53,7 @@
     "@testing-library/jest-dom": "^6.6.3",
     "@testing-library/react": "^16.3.0",
     "@testing-library/user-event": "^14.6.1",
-    "@truedat/test": "7.12.7",
+    "@truedat/test": "7.13.1",
     "identity-obj-proxy": "^3.0.0",
     "jest": "^29.7.0",
     "redux-saga-test-plan": "^4.0.6"
@@ -86,5 +86,5 @@
     "semantic-ui-react": "^3.0.0-beta.2",
     "swr": "^2.3.3"
   },
-  "gitHead": "4fcf1a96c366bb13af6261808308a00cc7480a82"
+  "gitHead": "17c040e6539b00eab7870d0d82ac91910e85b7ac"
 }

package/src/api.js

@@ -22,8 +22,7 @@ const API_RULE_IMPLEMENTATIONS_XLSX_UPLOAD_JOBS =
   "/api/rule_implementations/xlsx/upload_jobs";
 const API_RULE_IMPLEMENTATIONS_XLSX_UPLOAD_JOB =
   "/api/rule_implementations/xlsx/upload_jobs/:id";
-const API_RULE_IMPLEMENTATIONS_FROM_RULE =
-  "/api/rules/:id/rule_implementations";
+const API_RULE_IMPLEMENTATIONS_FROM_RULE = "/api/rules/rule_implementations";
 const API_RULE_IMPLEMENTATIONS_SEARCH = "/api/rule_implementations/search";
 const API_RULE_IMPLEMENTATION_FILTERS_SEARCH =
   "/api/rule_implementation_filters/search";

package/src/components/ImplementationActions.js

@@ -111,47 +111,27 @@ export const ImplementationActions = ({
         <Button
           primary
           content={formatMessage({ id: "actions.publish" })}
-          onClick={() =>
-            publishImplementation({
-              id,
-              redirectUrl: linkTo.IMPLEMENTATION({ implementation_id: id }),
-            })
-          }
+          onClick={() => publishImplementation({ id })}
         />
       ) : null}
       {actions?.restore ? (
         <Button
           primary
           content={formatMessage({ id: "actions.restore" })}
-          onClick={() =>
-            restoreImplementation({
-              id,
-              redirectUrl: linkTo.IMPLEMENTATION({ implementation_id: id }),
-            })
-          }
+          onClick={() => restoreImplementation({ id })}
         />
       ) : null}
       {actions?.reject ? (
         <Button
           secondary
           content={formatMessage({ id: "actions.reject" })}
-          onClick={() =>
-            rejectImplementation({
-              id,
-              redirectUrl: linkTo.IMPLEMENTATION({ implementation_id: id }),
-            })
-          }
+          onClick={() => rejectImplementation({ id })}
         />
       ) : null}
       {actions?.submit ? (
         <Button
           content={formatMessage({ id: "actions.submit" })}
-          onClick={() =>
-            submitImplementation({
-              id,
-              redirectUrl: linkTo.IMPLEMENTATION({ implementation_id: id }),
-            })
-          }
+          onClick={() => submitImplementation({ id })}
         />
       ) : null}
       {actions?.execute ? <ExecutionPopup onSubmit={handleExecute} /> : null}

package/src/components/RuleFormImplementations.js

@@ -4,7 +4,7 @@ import { connect } from "react-redux";
 import { Container } from "semantic-ui-react";
 import { getLinkedImplementationsToRulesColumns } from "../selectors";
 import {
-  useRuleImplementationSearch,
+  useRuleImplementationFromRulesSearch,
   useRuleImplementationFilters,
 } from "../hooks/useImplementations";
 import RuleImplementationsTable from "./RuleImplementationsTable";
@@ -15,7 +15,7 @@ export const RuleFormImplementations = ({ rule, columns }) => {
   const searchProps = {
     initialSortColumn: "implementation_key.raw",
     initialSortDirection: "ascending",
-    useSearch: useRuleImplementationSearch,
+    useSearch: useRuleImplementationFromRulesSearch,
     useFilters: useRuleImplementationFilters,
     pageSize: 20,
     defaultFilters: {

package/src/components/__tests__/RuleFormImplementations.spec.js

@@ -1,6 +1,28 @@
 import { render, waitForLoad } from "@truedat/test/render";
+import { useSearchContext } from "@truedat/core/search/SearchContext";
+import {
+  useRuleImplementationFromRulesSearch,
+  useRuleImplementationFilters,
+} from "../../hooks/useImplementations";
 import { RuleFormImplementations } from "../RuleFormImplementations";
 
+jest.mock("@truedat/core/search/SearchContext", () => {
+  const originalModule = jest.requireActual(
+    "@truedat/core/search/SearchContext"
+  );
+
+  return {
+    __esModule: true,
+    ...originalModule,
+    useSearchContext: jest.fn(),
+  };
+});
+
+jest.mock("../../hooks/useImplementations", () => ({
+  useRuleImplementationFromRulesSearch: jest.fn(),
+  useRuleImplementationFilters: jest.fn(),
+}));
+
 describe("<RuleFormImplementations />", () => {
   const rule = { id: 1, name: "rule name" };
   const updateDeletionQuery = jest.fn();
@@ -10,6 +32,24 @@ describe("<RuleFormImplementations />", () => {
     deletedRender: false,
   };
 
+  beforeEach(() => {
+    jest.clearAllMocks();
+    useRuleImplementationFromRulesSearch.mockReturnValue({
+      trigger: jest.fn(),
+    });
+    useRuleImplementationFilters.mockReturnValue({
+      trigger: jest.fn(),
+    });
+    useSearchContext.mockReturnValue({
+      searchData: {
+        data: [],
+        scroll_id: null,
+      },
+      searchMust: { status: ["pending"] },
+      setOnSearchChange: jest.fn(),
+    });
+  });
+
   it("matches the latest snapshot", async () => {
     const rendered = render(<RuleFormImplementations {...props} />);
     await waitForLoad(rendered);
@@ -31,4 +71,11 @@ describe("<RuleFormImplementations />", () => {
       rendered.container.querySelector(".implementation-actions")
     ).toBeInTheDocument();
   });
+
+  it("uses useRuleImplementationFromRulesSearch hook", async () => {
+    const rendered = render(<RuleFormImplementations {...props} />);
+    await waitForLoad(rendered);
+
+    expect(useRuleImplementationFromRulesSearch).toHaveBeenCalled();
+  });
 });

package/src/hooks/__tests__/useImplementations.spec.js

@@ -0,0 +1,35 @@
+import _ from "lodash/fp";
+import useSWRMutations from "swr/mutation";
+import { renderHook } from "@testing-library/react";
+import { apiJsonPost } from "@truedat/core/services/api";
+import { API_RULE_IMPLEMENTATIONS_FROM_RULE } from "../../api";
+import { useRuleImplementationFromRulesSearch } from "../useImplementations";
+
+jest.mock("swr/mutation", () => ({
+  __esModule: true,
+  ...jest.requireActual("swr/mutation"),
+  default: jest.fn(),
+}));
+
+jest.mock("@truedat/core/services/api", () => ({
+  __esModule: true,
+  ...jest.requireActual("@truedat/core/services/api"),
+  apiJsonPost: jest.fn(),
+}));
+
+describe("useRuleImplementationFromRulesSearch", () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it("calls useSWRMutations with correct api route", () => {
+    renderHook(() => useRuleImplementationFromRulesSearch());
+    const [url, func] = _.last(useSWRMutations.mock.calls);
+    const arg = { rule_id: 1, page: 1 };
+    expect(url).toBe(API_RULE_IMPLEMENTATIONS_FROM_RULE);
+    func(url, { arg });
+
+    expect(apiJsonPost).toHaveBeenCalledWith(url, arg);
+  });
+});
+

package/src/hooks/useImplementations.js

@@ -11,6 +11,7 @@ import {
 import {
   API_RULE_IMPLEMENTATIONS_SEARCH,
   API_RULE_IMPLEMENTATION_FILTERS_SEARCH,
+  API_RULE_IMPLEMENTATIONS_FROM_RULE,
   API_RULE_IMPLEMENTATIONS_XLSX_DOWNLOAD,
   API_RULE_IMPLEMENTATIONS_XLSX_UPLOAD,
   API_RULE_IMPLEMENTATIONS_XLSX_UPLOAD_JOBS,
@@ -41,6 +42,12 @@ export const useRuleImplementationSearch = () => {
   });
 };
 
+export const useRuleImplementationFromRulesSearch = () => {
+  return useSWRMutations(API_RULE_IMPLEMENTATIONS_FROM_RULE, (url, { arg }) => {
+    return apiJsonPost(url, arg);
+  });
+};
+
 export const useImplementationsDownload = () => {
   return useSWRMutations(
     API_RULE_IMPLEMENTATIONS_XLSX_DOWNLOAD,

package/src/reducers/__tests__/ruleRedirect.spec.js

@@ -11,12 +11,12 @@ import {
   submitImplementation,
   publishImplementation,
   rejectImplementation,
+  restoreImplementation,
 } from "../../routines";
 import { ruleRedirect } from "..";
 
 const fooState = { foo: "bar" };
 const initialState = "";
-const redirectUrl = "/foo/bar";
 
 describe("reducers: ruleImplementationRedirect", () => {
   it("should provide the initial state", () => {
@@ -65,30 +65,38 @@ describe("reducers: ruleImplementationRedirect", () => {
   });
 
   it("should return the redirectUrl from the payload on deleteImplementation.SUCCESS action", () => {
+    const redirectUrl = "/foo/bar";
     const payload = { redirectUrl };
     expect(ruleRedirect(fooState, deleteImplementation.success(payload))).toBe(
       redirectUrl
     );
   });
 
-  it("should return the redirectUrl from the payload on submitImplementation.SUCCESS action", () => {
-    const payload = { redirectUrl };
+  it("should return the current state on submitImplementation.SUCCESS action", () => {
+    const payload = { data: {} };
     expect(ruleRedirect(fooState, submitImplementation.success(payload))).toBe(
-      redirectUrl
+      fooState
     );
   });
 
-  it("should return the redirectUrl from the payload on publishImplementation.SUCCESS action", () => {
-    const payload = { redirectUrl };
+  it("should return the current state on publishImplementation.SUCCESS action", () => {
+    const payload = { data: {} };
     expect(ruleRedirect(fooState, publishImplementation.success(payload))).toBe(
-      redirectUrl
+      fooState
     );
   });
 
-  it("should return the redirectUrl from the payload on rejectImplementation.SUCCESS action", () => {
-    const payload = { redirectUrl };
+  it("should return the current state on rejectImplementation.SUCCESS action", () => {
+    const payload = { data: {} };
     expect(ruleRedirect(fooState, rejectImplementation.success(payload))).toBe(
-      redirectUrl
+      fooState
+    );
+  });
+
+  it("should return the current state on restoreImplementation.SUCCESS action", () => {
+    const payload = { data: {} };
+    expect(ruleRedirect(fooState, restoreImplementation.success(payload))).toBe(
+      fooState
     );
   });
 });

package/src/reducers/ruleRedirect.js

@@ -52,13 +52,10 @@ export const ruleRedirect = (state = initialState, { type, payload, meta }) => {
     case deleteImplementation.SUCCESS:
       return payload?.redirectUrl || state;
     case publishImplementation.SUCCESS:
-      return payload?.redirectUrl || state;
     case submitImplementation.SUCCESS:
-      return payload?.redirectUrl || state;
     case rejectImplementation.SUCCESS:
-      return payload?.redirectUrl || state;
     case restoreImplementation.SUCCESS:
-      return payload?.redirectUrl || state;
+      return state;
     default:
       return state;
   }

package/src/sagas/__tests__/publishImplementation.spec.js

@@ -4,7 +4,7 @@ import {
   publishImplementationSaga,
 } from "../publishImplementation";
 import { PUBLISH_IMPLEMENTATION } from "../../api/mutations";
-import { publishImplementation } from "../../routines";
+import { publishImplementation, fetchRuleImplementation } from "../../routines";
 
 describe("sagas: publishImplementationRequestSaga", () => {
   it("should invoke publishImplementationSaga on publishImplementation.TRIGGER", () => {
@@ -29,8 +29,7 @@ describe("sagas: publishImplementationRequestSaga", () => {
 describe("sagas: publishImplementationSaga", () => {
   const client = { mutate: jest.fn() };
   const id = "123";
-  const redirectUrl = "foo";
-  const payload = { id, redirectUrl };
+  const payload = { id };
   const data = { foo: "bar" };
 
   it("should put a success action when a response is returned", () => {
@@ -46,7 +45,9 @@ describe("sagas: publishImplementationSaga", () => {
           variables: payload,
         })
         .next({ data })
-        .put(publishImplementation.success({ data, redirectUrl }))
+        .put(publishImplementation.success({ data }))
+        .next()
+        .put(fetchRuleImplementation.trigger({ id: `${id}` }))
         .next()
         .put(publishImplementation.fulfill())
         .next()

package/src/sagas/__tests__/rejectImplementation.spec.js

@@ -4,7 +4,7 @@ import {
   rejectImplementationSaga,
 } from "../rejectImplementation";
 import { REJECT_IMPLEMENTATION } from "../../api/mutations";
-import { rejectImplementation } from "../../routines";
+import { rejectImplementation, fetchRuleImplementation } from "../../routines";
 
 describe("sagas: rejectImplementationRequestSaga", () => {
   it("should invoke rejectImplementationSaga on rejectImplementation.TRIGGER", () => {
@@ -29,8 +29,7 @@ describe("sagas: rejectImplementationRequestSaga", () => {
 describe("sagas: rejectImplementationSaga", () => {
   const client = { mutate: jest.fn() };
   const id = "123";
-  const redirectUrl = "foo";
-  const payload = { id, redirectUrl };
+  const payload = { id };
   const data = { foo: "bar" };
 
   it("should put a success action when a response is returned", () => {
@@ -46,7 +45,9 @@ describe("sagas: rejectImplementationSaga", () => {
           variables: payload,
         })
         .next({ data })
-        .put(rejectImplementation.success({ data, redirectUrl }))
+        .put(rejectImplementation.success({ data }))
+        .next()
+        .put(fetchRuleImplementation.trigger({ id: `${id}` }))
         .next()
         .put(rejectImplementation.fulfill())
         .next()

package/src/sagas/__tests__/submitImplementation.spec.js

@@ -4,7 +4,7 @@ import {
   submitImplementationSaga,
 } from "../submitImplementation";
 import { SUBMIT_IMPLEMENTATION } from "../../api/mutations";
-import { submitImplementation } from "../../routines";
+import { submitImplementation, fetchRuleImplementation } from "../../routines";
 
 describe("sagas: submitImplementationRequestSaga", () => {
   it("should invoke submitImplementationSaga on submitImplementation.TRIGGER", () => {
@@ -29,8 +29,7 @@ describe("sagas: submitImplementationRequestSaga", () => {
 describe("sagas: submitImplementationSaga", () => {
   const client = { mutate: jest.fn() };
   const id = "123";
-  const redirectUrl = "foo";
-  const payload = { id, redirectUrl };
+  const payload = { id };
   const data = { foo: "bar" };
 
   it("should put a success action when a response is returned", () => {
@@ -46,7 +45,9 @@ describe("sagas: submitImplementationSaga", () => {
           variables: payload,
         })
         .next({ data })
-        .put(submitImplementation.success({ data, redirectUrl }))
+        .put(submitImplementation.success({ data }))
+        .next()
+        .put(fetchRuleImplementation.trigger({ id: `${id}` }))
         .next()
         .put(submitImplementation.fulfill())
         .next()

package/src/sagas/publishImplementation.js

@@ -1,17 +1,18 @@
 import { call, put, takeLatest, getContext } from "redux-saga/effects";
 import { PUBLISH_IMPLEMENTATION } from "../api/mutations";
-import { publishImplementation } from "../routines";
+import { publishImplementation, fetchRuleImplementation } from "../routines";
 
 export function* publishImplementationSaga({ payload }) {
   const client = yield getContext("client");
   try {
-    const { id, redirectUrl } = payload;
+    const { id } = payload;
     yield put(publishImplementation.request({ id }));
     const { data } = yield call(client.mutate, {
       mutation: PUBLISH_IMPLEMENTATION,
       variables: payload,
     });
-    yield put(publishImplementation.success({ data, redirectUrl }));
+    yield put(publishImplementation.success({ data }));
+    yield put(fetchRuleImplementation.trigger({ id: `${id}` }));
   } catch (error) {
     yield put(publishImplementation.failure(error.message));
   } finally {

package/src/sagas/rejectImplementation.js

@@ -1,17 +1,18 @@
 import { call, put, takeLatest, getContext } from "redux-saga/effects";
 import { REJECT_IMPLEMENTATION } from "../api/mutations";
-import { rejectImplementation } from "../routines";
+import { rejectImplementation, fetchRuleImplementation } from "../routines";
 
 export function* rejectImplementationSaga({ payload }) {
   const client = yield getContext("client");
   try {
-    const { id, redirectUrl } = payload;
+    const { id } = payload;
     yield put(rejectImplementation.request({ id }));
     const { data } = yield call(client.mutate, {
       mutation: REJECT_IMPLEMENTATION,
       variables: payload,
     });
-    yield put(rejectImplementation.success({ data, redirectUrl }));
+    yield put(rejectImplementation.success({ data }));
+    yield put(fetchRuleImplementation.trigger({ id: `${id}` }));
   } catch (error) {
     yield put(rejectImplementation.failure(error.message));
   } finally {

package/src/sagas/restoreImplementation.js

@@ -1,17 +1,18 @@
 import { call, put, takeLatest, getContext } from "redux-saga/effects";
 import { RESTORE_IMPLEMENTATION } from "../api/mutations";
-import { restoreImplementation } from "../routines";
+import { restoreImplementation, fetchRuleImplementation } from "../routines";
 
 export function* restoreImplementationSaga({ payload }) {
   const client = yield getContext("client");
   try {
-    const { id, redirectUrl } = payload;
+    const { id } = payload;
     yield put(restoreImplementation.request({ id }));
     const { data } = yield call(client.mutate, {
       mutation: RESTORE_IMPLEMENTATION,
       variables: payload,
     });
-    yield put(restoreImplementation.success({ data, redirectUrl }));
+    yield put(restoreImplementation.success({ data }));
+    yield put(fetchRuleImplementation.trigger({ id: `${id}` }));
   } catch (error) {
     yield put(restoreImplementation.failure(error.message));
   } finally {

package/src/sagas/submitImplementation.js

@@ -1,17 +1,18 @@
 import { call, put, takeLatest, getContext } from "redux-saga/effects";
 import { SUBMIT_IMPLEMENTATION } from "../api/mutations";
-import { submitImplementation } from "../routines";
+import { submitImplementation, fetchRuleImplementation } from "../routines";
 
 export function* submitImplementationSaga({ payload }) {
   const client = yield getContext("client");
   try {
-    const { id, redirectUrl } = payload;
+    const { id } = payload;
     yield put(submitImplementation.request({ id }));
     const { data } = yield call(client.mutate, {
       mutation: SUBMIT_IMPLEMENTATION,
       variables: payload,
     });
-    yield put(submitImplementation.success({ data, redirectUrl }));
+    yield put(submitImplementation.success({ data }));
+    yield put(fetchRuleImplementation.trigger({ id: `${id}` }));
   } catch (error) {
     yield put(submitImplementation.failure(error.message));
   } finally {