@truedat/dq 4.44.0 → 4.44.1

package/src/reducers/ruleImplementationRedirect.js

@@ -20,7 +20,9 @@ export const ruleImplementationRedirect = (
       return initialState;
     case createRuleImplementation.SUCCESS: {
       const id = payload?.data?.rule_id;
-      return linkTo.RULE_IMPLEMENTATIONS({ id });
+      return id
+        ? linkTo.RULE_IMPLEMENTATIONS({ id })
+        : linkTo.IMPLEMENTATIONS();
     }
     case createImplementationStructure.SUCCESS: {
       return payload?.redirectUrl;
@@ -31,16 +33,15 @@ export const ruleImplementationRedirect = (
     }
     case updateRuleImplementation.SUCCESS: {
       const { data } = payload || {};
-      const { id: implementation_id, rule_id: id } = data;
-      return linkTo.RULE_IMPLEMENTATION({ id, implementation_id });
+      const { id: implementation_id } = data;
+      return linkTo.IMPLEMENTATION({ implementation_id });
     }
     case uploadImplementations.SUCCESS: {
       return IMPLEMENTATIONS;
     }
     case deleteRuleResult.SUCCESS: {
-      const { rule_implementation_id: implementation_id, rule_id: id } =
-        payload;
-      return linkTo.RULE_IMPLEMENTATION_RESULTS({ id, implementation_id });
+      const { rule_implementation_id: implementation_id } = payload;
+      return linkTo.IMPLEMENTATION_RESULTS({ implementation_id });
     }
     default:
       return state;

package/src/reducers/ruleRedirect.js

@@ -25,8 +25,10 @@ export const ruleRedirect = (state = initialState, { type, payload, meta }) => {
       return linkTo.RULE({ id });
     }
     case setRuleImplementationStatus.SUCCESS: {
-      const id = payload?.id;
-      return _.isNil(id) ? state : linkTo.RULE_IMPLEMENTATIONS({ id });
+      const { implementation_id, ruleId: id } = payload;
+      return id
+        ? linkTo.RULE_IMPLEMENTATIONS({ id })
+        : linkTo.IMPLEMENTATION({ implementation_id });
     }
     case deleteRule.SUCCESS:
       return RULES;

package/src/reducers/userRulePermissions.js

@@ -1,5 +1,5 @@
 import _ from "lodash/fp";
-import { updateRule, fetchRule } from "../routines";
+import { updateRule, fetchRule, clearRule } from "../routines";
 
 const initialState = {};
 
@@ -11,6 +11,8 @@ const userRulePermissions = (state = initialState, { type, payload }) => {
       return _.pathOr(initialState, "user_permissions")(payload);
     case updateRule.SUCCESS:
       return _.pathOr(initialState, "user_permissions")(payload);
+    case clearRule.TRIGGER:
+      return initialState;
     default:
       return state;
   }

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

@@ -53,7 +53,8 @@ describe("sagas: setRuleImplementationStatusSaga", () => {
         .next({ data })
         .put(
           setRuleImplementationStatus.success({
-            id: ruleId,
+            implementation_id: id,
+            ruleId,
             deleted,
           })
         )
@@ -81,8 +82,9 @@ describe("sagas: setRuleImplementationStatusSaga", () => {
         .next({ data })
         .put(
           setRuleImplementationStatus.success({
-            id: ruleId,
-            deleted,
+            implementation_id: id,
+            ruleId,
+            deleted: false,
           })
         )
         .next()
@@ -110,7 +112,8 @@ describe("sagas: setRuleImplementationStatusSaga", () => {
         .next({ data })
         .put(
           setRuleImplementationStatus.success({
-            id: ruleId,
+            implementation_id: id,
+            ruleId,
             deleted,
           })
         )

package/src/sagas/setRuleImplementationStatus.js

@@ -26,7 +26,13 @@ export function* setRuleImplementationStatusSaga({ payload }) {
     const url = compile(API_RULE_IMPLEMENTATION)({ id });
     yield put(setRuleImplementationStatus.request());
     yield deletionRequest(url, payload);
-    yield put(setRuleImplementationStatus.success({ id: ruleId, deleted }));
+    yield put(
+      setRuleImplementationStatus.success({
+        implementation_id: id,
+        ruleId,
+        deleted,
+      })
+    );
   } catch (error) {
     if (error.response) {
       const { status, data } = error.response;