@truedat/dq 4.38.3 → 4.38.7

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## [4.38.7] 2022-02-22
+
+### Added
+
+- [TD-4437]
+  - Access denied alert message on rule results upload
+  - Hide rule results button if there is no manage_rule_results permission
+
 ## [4.37.6] 2022-02-06
 
 ### Fix

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/dq",
-  "version": "4.38.3",
+  "version": "4.38.7",
   "description": "Truedat Web Data Quality Module",
   "sideEffects": false,
   "jsnext:main": "src/index.js",
@@ -31,7 +31,7 @@
     "@babel/plugin-transform-modules-commonjs": "^7.15.0",
     "@babel/preset-env": "^7.15.0",
     "@babel/preset-react": "^7.14.5",
-    "@truedat/test": "4.38.3",
+    "@truedat/test": "4.38.7",
     "babel-jest": "^27.0.6",
     "babel-plugin-dynamic-import-node": "^2.3.3",
     "babel-plugin-lodash": "^3.3.4",
@@ -82,8 +82,8 @@
   },
   "dependencies": {
     "@apollo/client": "^3.4.10",
-    "@truedat/core": "4.38.3",
-    "@truedat/df": "4.38.3",
+    "@truedat/core": "4.38.7",
+    "@truedat/df": "4.38.7",
     "axios": "^0.19.2",
     "graphql": "^15.5.3",
     "path-to-regexp": "^1.7.0",
@@ -103,5 +103,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 0.88.2 < 2.1"
   },
-  "gitHead": "0ad3a7fe5d8d09b9c5e6e7007d8298748f6677fe"
+  "gitHead": "840c799ecdd6b8440112ac803119482e688142ed"
 }

package/src/components/ImplementationsRoutes.js

@@ -8,6 +8,9 @@ import RuleImplementationsLoader from "./RuleImplementationsLoader";
 const TemplatesLoader = React.lazy(() =>
   import("@truedat/df/templates/components/TemplatesLoader")
 );
+const UserDomainsLoader = React.lazy(() =>
+  import("@truedat/auth/users/components/UserDomainsLoader")
+);
 const UserSearchFiltersLoader = React.lazy(() =>
   import("@truedat/dd/components/UserSearchFiltersLoader")
 );
@@ -21,6 +24,7 @@ const ImplementationsRoutes = () => (
         <ImplementationFiltersLoader />
         <TemplatesLoader scope="qe" />
         <UserSearchFiltersLoader scope="rule_implementation" />
+        <UserDomainsLoader permissions={["manage_rule_results"]} />
         <RuleImplementations exact />
       </>
     )}

package/src/components/RuleResultsUpload.js

@@ -1,4 +1,5 @@
-import React from "react";
+import _ from "lodash/fp";
+import React, { useEffect, useState } from "react";
 import PropTypes from "prop-types";
 import { connect } from "react-redux";
 import { Dropdown } from "semantic-ui-react";
@@ -6,18 +7,31 @@ import { useIntl } from "react-intl";
 import { UploadModal } from "@truedat/core/components";
 import { uploadResults } from "../routines";
 
-export const RuleResultsUpload = ({ uploadResults, loading }) => {
+export const RuleResultsUpload = ({ uploadResults, loading, userDomains }) => {
   const { formatMessage } = useIntl();
+  const [permissionFound, setPermissionFound] = useState(false);
+
+  useEffect(() => {
+    setPermissionFound(
+      !_.flow(
+        _.find({ permission: "manage_rule_results" }),
+        _.path("domains"),
+        _.isEmpty
+      )(userDomains)
+    );
+  }, [userDomains]);
 
   return (
     <UploadModal
       icon="upload"
       trigger={
-        <Dropdown.Item
-          icon="upload"
-          text={formatMessage({ id: "ruleResults.actions.upload.tooltip" })}
-          disabled={loading}
-        />
+        permissionFound ? (
+          <Dropdown.Item
+            icon="upload"
+            text={formatMessage({ id: "ruleResults.actions.upload.tooltip" })}
+            disabled={loading}
+          />
+        ) : null
       }
       header={formatMessage({
         id: "ruleResults.actions.upload.confirmation.header",
@@ -38,10 +52,14 @@ export const RuleResultsUpload = ({ uploadResults, loading }) => {
 RuleResultsUpload.propTypes = {
   uploadResults: PropTypes.func,
   loading: PropTypes.bool,
+  userDomains: PropTypes.array,
 };
 
-const mapStateToProps = ({ uploadingResults }) => ({
-  loading: uploadingResults,
-});
+const mapStateToProps = (state) => {
+  return {
+    loading: state.uploadingResults,
+    userDomains: state.userDomains,
+  };
+};
 
 export default connect(mapStateToProps, { uploadResults })(RuleResultsUpload);

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

@@ -1,18 +1,73 @@
-import _ from "lodash/fp";
 import React from "react";
-import { shallow } from "enzyme";
 import { intl } from "@truedat/test/intl-stub";
+import { IntlProvider } from "react-intl";
+import { render } from "@truedat/test/render";
+import { shallow } from "enzyme";
 import { RuleResultsUpload } from "../RuleResultsUpload";
 
-jest.spyOn(React, "useContext").mockImplementation(() => intl);
+afterEach(() => {    
+  jest.clearAllMocks();
+});
 
 describe("<RuleResultsUpload />", () => {
+  const renderOpts = {
+    messages: {
+      en: {
+        "ruleResults.actions.upload.tooltip": "Upload rule results",
+        "ruleResults.actions.upload.confirmation.header": "Upload rule results",
+        "uploadModal.actions.upload.confirmation.content": "Drag an drop file or click to select file",
+        "ruleResults.actions.upload.confirmation.header": "Upload rule results",
+      },
+    },
+  };
+
   it("matches the latest snapshot", () => {
+    const spy = jest.spyOn(React, "useContext").mockImplementation(() => intl);
     const props = {
       uploadResults: jest.fn(),
       loading: false,
     };
     const wrapper = shallow(<RuleResultsUpload {...props} />);
     expect(wrapper).toMatchSnapshot();
+    spy.mockRestore();
+  });
+
+  it("Renders upload rule results menu item if there is a domain with manage_rule_results permission", () => {
+    const props = {
+      uploadResults: jest.fn(),
+      loading: false,
+      userDomains: [
+        {
+          domains: [
+            {
+              external_id: "Truedat",
+              id: 2,
+              name: "Truedat",
+            },
+          ],
+          permission: "manage_rule_results",
+        },
+      ],
+    };
+    const { getByText } = render(<RuleResultsUpload {...props} />, renderOpts);
+
+    const element = getByText("Upload rule results");
+    expect(element).toBeInTheDocument()
+  });
+
+  it("Does not render upload rule results menu item if there is no domain with manage_rule_results permission", () => {
+    const props = {
+      uploadResults: jest.fn(),
+      loading: false,
+      userDomains: [],
+    };
+
+    const { queryByText } = render(
+      <RuleResultsUpload {...props} />,
+      renderOpts
+    );
+
+    const element = queryByText("Upload rule results");
+    expect(element).toBeNull();
   });
 });

package/src/components/__tests__/__snapshots__/RuleResultsUpload.spec.js.snap

@@ -7,12 +7,6 @@ exports[`<RuleResultsUpload /> matches the latest snapshot 1`] = `
   header="ruleResults.actions.upload.confirmation.header"
   icon="upload"
   param="rule_results"
-  trigger={
-    <DropdownItem
-      disabled={false}
-      icon="upload"
-      text="ruleResults.actions.upload.tooltip"
-    />
-  }
+  trigger={null}
 />
 `;

package/src/reducers/dqMessage.js

@@ -104,7 +104,17 @@ const dqMessage = (state = initialState, { type, payload }) => {
         text: "",
       };
     case uploadResults.FAILURE:
-      if (payload.status != 500) {
+      if (payload.status === 403) {
+        return {
+          error: true,
+          header: `ruleResults.upload.failed.header`,
+          messages: [
+            { id: "alert.status.403.header" },
+            { id: "permission.manage_rule_results" },
+          ],
+          icon: "attention",
+        };
+      } else if (payload.status != 500) {
         return {
           error: true,
           header: "ruleResults.upload.failed.header",