@truedat/dq 5.0.4 → 5.0.6

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## [5.0.6] 2023-01-30
+
+### Changed
+
+- [TD-5524] Use implementation_ref instead of implementation id on subscriptions
+
 ## [5.0.4] 2023-01-27
 
 ### Changed

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/dq",
-  "version": "5.0.4",
+  "version": "5.0.6",
   "description": "Truedat Web Data Quality Module",
   "sideEffects": false,
   "jsnext:main": "src/index.js",
@@ -34,7 +34,7 @@
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/react": "^12.0.0",
     "@testing-library/user-event": "^13.2.1",
-    "@truedat/test": "5.0.4",
+    "@truedat/test": "5.0.5",
     "babel-jest": "^28.1.0",
     "babel-plugin-dynamic-import-node": "^2.3.3",
     "babel-plugin-lodash": "^3.3.4",
@@ -92,8 +92,8 @@
   },
   "dependencies": {
     "@apollo/client": "^3.7.1",
-    "@truedat/core": "5.0.4",
-    "@truedat/df": "5.0.4",
+    "@truedat/core": "5.0.5",
+    "@truedat/df": "5.0.5",
     "decode-uri-component": "^0.2.2",
     "graphql": "^15.5.3",
     "moment": "^2.29.4",
@@ -118,5 +118,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 2.0.3 < 2.2"
   },
-  "gitHead": "91d484a16499494eedec012362b3a7f45cb1cbc9"
+  "gitHead": "8b2dcaba45d7b32a6e3e14821e580157a418a5bb"
 }

package/src/components/RuleSubscriptionLoader.js

@@ -11,29 +11,34 @@ import {
 export const RuleSubscriptionLoader = ({
   clearSubscriptionsSearch,
   searchSubscriptions,
+  ruleImplementation,
 }) => {
-  const { id, implementation_id } = useParams();
+  const { id } = useParams();
 
   useEffect(() => {
-    const payload = {
-      resource_id: _.toInteger(id || implementation_id),
-      events: ["rule_result_created"],
-      resource_type: id ? "rule" : implementation_id ? "implementation" : "",
-    };
+    if (!_.isEmpty(id) || !_.isEmpty(ruleImplementation)) {
+      const payload = {
+        resource_id: _.toInteger(id || ruleImplementation.implementation_ref),
+        events: ["rule_result_created"],
+        resource_type: id ? "rule" : ruleImplementation ? "implementation" : "",
+      };
 
-    searchSubscriptions(payload);
-    return () => {
-      clearSubscriptionsSearch();
-    };
-  }, [clearSubscriptionsSearch, searchSubscriptions, id]);
+      searchSubscriptions(payload);
+      return () => {
+        clearSubscriptionsSearch();
+      };
+    }
+  }, [clearSubscriptionsSearch, searchSubscriptions, id, ruleImplementation]);
   return null;
 };
 
 RuleSubscriptionLoader.propTypes = {
   clearSubscriptionsSearch: PropTypes.func,
   searchSubscriptions: PropTypes.func,
+  ruleImplementation: PropTypes.object,
 };
 
-export default connect(null, { clearSubscriptionsSearch, searchSubscriptions })(
-  RuleSubscriptionLoader
-);
+export default connect(_.pick(["ruleImplementation"]), {
+  clearSubscriptionsSearch,
+  searchSubscriptions,
+})(RuleSubscriptionLoader);

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

@@ -4,7 +4,7 @@ import { RuleSubscriptionLoader } from "../RuleSubscriptionLoader";
 
 jest.mock("react-router-dom", () => ({
   ...jest.requireActual("react-router-dom"),
-  useParams: () => ({ id: 1 })
+  useParams: () => ({ id: 1 }),
 }));
 
 describe("<RuleSubscriptionLoader />", () => {
@@ -21,7 +21,11 @@ describe("<RuleSubscriptionLoader />", () => {
     const searchSubscriptions = jest.fn();
     const clearSubscriptionsSearch = jest.fn();
 
-    const props = { searchSubscriptions, clearSubscriptionsSearch };
+    const props = {
+      searchSubscriptions,
+      clearSubscriptionsSearch,
+      ruleImplementation: { implementation_ref: 1 },
+    };
     const wrapper = mount(<RuleSubscriptionLoader {...props} />);
     expect(clearSubscriptionsSearch.mock.calls.length).toBe(0);
     expect(searchSubscriptions.mock.calls.length).toBe(1);