@truedat/dq 4.40.0 → 4.40.1

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [4.40.1] 2022-03-08
+
+### Changed
+
+- [TD-4604] Use actions from `POST /api/implementations/search` instead of
+  fetching permissions
+
 ## [4.39.0] 2022-03-01
 
 ### Changed

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/dq",
-  "version": "4.40.0",
+  "version": "4.40.1",
   "description": "Truedat Web Data Quality Module",
   "sideEffects": false,
   "jsnext:main": "src/index.js",
@@ -82,8 +82,8 @@
   },
   "dependencies": {
     "@apollo/client": "^3.4.10",
-    "@truedat/core": "4.40.0",
-    "@truedat/df": "4.40.0",
+    "@truedat/core": "4.40.1",
+    "@truedat/df": "4.40.1",
     "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": "0bd677584da73a5021a5c96f2e5525fde9a1958a"
+  "gitHead": "58b35b48833fbed1602d1070853e6c805bcc48f1"
 }

package/src/components/ImplementationsRoutes.js

@@ -8,9 +8,6 @@ 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")
 );
@@ -24,7 +21,6 @@ const ImplementationsRoutes = () => (
         <ImplementationFiltersLoader />
         <TemplatesLoader scope="qe" />
         <UserSearchFiltersLoader scope="rule_implementation" />
-        <UserDomainsLoader permissions={["manage_rule_results"]} />
         <RuleImplementations exact />
       </>
     )}

package/src/components/RuleImplementationsActions.js

@@ -14,18 +14,19 @@ import ExecutionPopup from "./ExecutionPopup";
 import RuleImplementationsOptions from "./RuleImplementationsOptions";
 
 export const RuleImplementationsActions = ({
+  actions,
   addImplementationFilter,
   canExecute,
-  executeImplementationsOn,
-  toggleImplementationFilterValue,
-  removeImplementationFilter,
   createExecutionGroup,
-  selectedImplementations,
+  executeImplementationsOn,
   implementationQuery,
-  setMode,
   implementationsExecution,
+  removeImplementationFilter,
   ruleImplementationCount,
   ruleImplementationsLoading,
+  selectedImplementations,
+  setMode,
+  toggleImplementationFilterValue,
 }) => {
   const showExecutableInfo = () => {
     addImplementationFilter({ filter: "executable" });
@@ -50,6 +51,8 @@ export const RuleImplementationsActions = ({
       : { filters: { id: selectedImplementations } };
     createExecutionGroup({ ...query, df_content });
   };
+
+  const canUploadResults = !!actions?.uploadResults;
   return (
     <div style={{ float: "right" }}>
       {implementationsExecution && canExecute && (
@@ -73,24 +76,28 @@ export const RuleImplementationsActions = ({
           />
         </>
       )}
-      <RuleImplementationsOptions loading={ruleImplementationsLoading} />
+      <RuleImplementationsOptions
+        loading={ruleImplementationsLoading}
+        canUploadResults={canUploadResults}
+      />
     </div>
   );
 };
 
 RuleImplementationsActions.propTypes = {
+  actions: PropTypes.object,
   addImplementationFilter: PropTypes.func,
   canExecute: PropTypes.bool,
   createExecutionGroup: PropTypes.func,
   executeImplementationsOn: PropTypes.bool,
-  implementationsExecution: PropTypes.bool,
   implementationQuery: PropTypes.object,
+  implementationsExecution: PropTypes.bool,
   removeImplementationFilter: PropTypes.func,
   ruleImplementationCount: PropTypes.number,
+  ruleImplementationsLoading: PropTypes.bool,
   selectedImplementations: PropTypes.array,
   setMode: PropTypes.func,
   toggleImplementationFilterValue: PropTypes.func,
-  ruleImplementationsLoading: PropTypes.bool,
 };
 
 const mapStateToProps = (state) => ({
@@ -98,6 +105,7 @@ const mapStateToProps = (state) => ({
   ruleImplementationCount: state.ruleImplementationCount,
   implementationsExecution: getImplementationsExecution(state),
   ruleImplementationsLoading: state.ruleImplementationsLoading,
+  actions: state.implementationsActions,
 });
 
 export default connect(mapStateToProps, {

package/src/components/RuleImplementationsOptions.js

@@ -5,7 +5,7 @@ import RuleImplementationsDownload from "./RuleImplementationsDownload";
 import RuleResultsUpload from "./RuleResultsUpload";
 import ImplementationsUploadButton from "./ImplementationsUploadButton";
 
-export const RuleImplementationsOptions = ({ loading }) => (
+export const RuleImplementationsOptions = ({ loading, canUploadResults }) => (
   <Dropdown
     icon="ellipsis vertical"
     className="button icon group-actions button-update"
@@ -16,13 +16,14 @@ export const RuleImplementationsOptions = ({ loading }) => (
     <Dropdown.Menu>
       <RuleImplementationsDownload />
       <ImplementationsUploadButton />
-      <RuleResultsUpload />
+      {canUploadResults ? <RuleResultsUpload /> : null}
     </Dropdown.Menu>
   </Dropdown>
 );
 
 RuleImplementationsOptions.propTypes = {
   loading: PropTypes.bool,
+  canUploadResults: PropTypes.bool,
 };
 
 export default RuleImplementationsOptions;

package/src/components/RuleResultsUpload.js

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

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

@@ -12,6 +12,7 @@ describe("<RuleImplementationsActions />", () => {
   const setMode = jest.fn();
   const removeImplementationFilter = jest.fn();
   const props = {
+    actions: { uploadResults: {} },
     canExecute: true,
     executionGroupLoading: false,
     ruleImplementationCount: 12,
@@ -23,6 +24,7 @@ describe("<RuleImplementationsActions />", () => {
     setMode,
     removeImplementationFilter,
   };
+
   it("matches the latest snapshot", () => {
     const wrapper = shallow(<RuleImplementationsActions {...props} />);
     expect(wrapper).toMatchSnapshot();

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

@@ -1,18 +1,22 @@
-import _ from "lodash/fp";
 import React from "react";
-import { shallow } from "enzyme";
-import { intl } from "@truedat/test/intl-stub";
-import { RuleImplementationsOptions } from "../RuleImplementationsOptions";
+import { waitFor } from "@testing-library/react";
+import { render } from "@truedat/test/render";
+import coreEn from "@truedat/core/messages/en";
+import RuleImplementationsOptions from "../RuleImplementationsOptions";
+import en from "../../messages/en";
 
-jest.spyOn(React, "useContext").mockImplementation(() => intl);
+const renderOpts = {
+  messages: { en: { ...coreEn, ...en } },
+};
+
+const props = { canUploadResults: true };
 
 describe("<RuleImplementationsOptions />", () => {
-  it("matches the latest snapshot", () => {
-    const wrapper = shallow(<RuleImplementationsOptions />);
-    expect(wrapper).toMatchSnapshot();
-  });
-  it("matches the latest loading snapshot", () => {
-    const wrapper = shallow(<RuleImplementationsOptions loading />);
-    expect(wrapper).toMatchSnapshot();
+  it("matches the latest snapshot", async () => {
+    const { container } = render(
+      <RuleImplementationsOptions {...props} />,
+      renderOpts
+    );
+    await waitFor(() => expect(container).toMatchSnapshot());
   });
 });

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

@@ -1,73 +1,15 @@
 import React from "react";
-import { intl } from "@truedat/test/intl-stub";
-import { IntlProvider } from "react-intl";
+import { waitFor } from "@testing-library/react";
 import { render } from "@truedat/test/render";
-import { shallow } from "enzyme";
-import { RuleResultsUpload } from "../RuleResultsUpload";
+import coreEn from "@truedat/core/messages/en";
+import RuleResultsUpload from "../RuleResultsUpload";
+import en from "../../messages/en";
 
-afterEach(() => {    
-  jest.clearAllMocks();
-});
+const renderOpts = { messages: { en: { ...coreEn, ...en } } };
 
 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();
+  it("matches the latest snapshot", async () => {
+    const { container } = render(<RuleResultsUpload />, renderOpts);
+    await waitFor(() => expect(container).toMatchSnapshot());
   });
 });

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

@@ -28,6 +28,7 @@ exports[`<RuleImplementationsActions /> matches the latest snapshot 1`] = `
     handleSubmit={[Function]}
   />
   <RuleImplementationsOptions
+    canUploadResults={true}
     loading={false}
   />
 </div>

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

@@ -1,58 +1,67 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`<RuleImplementationsOptions /> matches the latest loading snapshot 1`] = `
-<Dropdown
-  additionLabel="Add "
-  additionPosition="top"
-  className="button icon group-actions button-update"
-  closeOnBlur={true}
-  closeOnEscape={true}
-  deburr={false}
-  direction="left"
-  disabled={true}
-  floating={true}
-  icon="ellipsis vertical"
-  minCharacters={1}
-  noResultsMessage="No results found."
-  openOnFocus={true}
-  renderLabel={[Function]}
-  searchInput="text"
-  selectOnBlur={true}
-  selectOnNavigation={true}
-  wrapSelection={true}
->
-  <DropdownMenu>
-    <Connect(RuleImplementationsDownload) />
-    <Connect(ImplementationsUploadButton) />
-    <Connect(RuleResultsUpload) />
-  </DropdownMenu>
-</Dropdown>
-`;
-
 exports[`<RuleImplementationsOptions /> matches the latest snapshot 1`] = `
-<Dropdown
-  additionLabel="Add "
-  additionPosition="top"
-  className="button icon group-actions button-update"
-  closeOnBlur={true}
-  closeOnEscape={true}
-  deburr={false}
-  direction="left"
-  floating={true}
-  icon="ellipsis vertical"
-  minCharacters={1}
-  noResultsMessage="No results found."
-  openOnFocus={true}
-  renderLabel={[Function]}
-  searchInput="text"
-  selectOnBlur={true}
-  selectOnNavigation={true}
-  wrapSelection={true}
->
-  <DropdownMenu>
-    <Connect(RuleImplementationsDownload) />
-    <Connect(ImplementationsUploadButton) />
-    <Connect(RuleResultsUpload) />
-  </DropdownMenu>
-</Dropdown>
+<div>
+  <div
+    aria-expanded="false"
+    class="ui floating dropdown button icon group-actions button-update"
+    role="listbox"
+    tabindex="0"
+  >
+    <i
+      aria-hidden="true"
+      class="ellipsis vertical icon"
+    />
+    <div
+      class="menu transition left"
+    >
+      <div
+        aria-disabled="true"
+        class="disabled item"
+        role="option"
+      >
+        <i
+          aria-hidden="true"
+          class="download icon"
+        />
+        <span>
+          Download with csv format
+        </span>
+        <p
+          class="menu-item-description"
+        >
+          There are no Implementations to be downloaded
+        </p>
+      </div>
+      <div
+        class="item"
+        role="option"
+      >
+        <i
+          aria-hidden="true"
+          class="upload icon"
+        />
+        <span
+          class="text"
+        >
+          Upload Implementations
+        </span>
+      </div>
+      <div
+        class="item"
+        role="option"
+      >
+        <i
+          aria-hidden="true"
+          class="upload icon"
+        />
+        <span
+          class="text"
+        >
+          Upload rule results
+        </span>
+      </div>
+    </div>
+  </div>
+</div>
 `;

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

@@ -1,12 +1,20 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`<RuleResultsUpload /> matches the latest snapshot 1`] = `
-<UploadModal
-  content="uploadModal.actions.upload.confirmation.content"
-  handleSubmit={[Function]}
-  header="ruleResults.actions.upload.confirmation.header"
-  icon="upload"
-  param="rule_results"
-  trigger={null}
-/>
+<div>
+  <div
+    class="item"
+    role="option"
+  >
+    <i
+      aria-hidden="true"
+      class="upload icon"
+    />
+    <span
+      class="text"
+    >
+      Upload rule results
+    </span>
+  </div>
+</div>
 `;

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

@@ -0,0 +1,50 @@
+import {
+  clearRuleImplementations,
+  searchRuleImplementations,
+} from "../../routines";
+import {
+  implementationsActions,
+  initialState,
+} from "../implementationsActions";
+
+const fooState = { foo: "bar" };
+const payload = {};
+
+describe("reducers: implementationsActions", () => {
+  it("should provide the initial state", () => {
+    expect(implementationsActions(undefined, {})).toBe(initialState);
+  });
+
+  it("should be the initial state after receiving the clearRuleImplementations.TRIGGER action", () => {
+    expect(
+      implementationsActions(fooState, {
+        type: clearRuleImplementations.TRIGGER,
+        payload,
+      })
+    ).toBe(initialState);
+  });
+
+  it("should be the initial state after receiving the searchRuleImplementations.TRIGGER action", () => {
+    expect(
+      implementationsActions(fooState, {
+        type: searchRuleImplementations.TRIGGER,
+        payload,
+      })
+    ).toBe(initialState);
+  });
+
+  it("should extract _actions from the searchRuleImplementations.SUCCESS action", () => {
+    const _actions = { uploadResults: { foo: "bar" } };
+    const payload = { data: { _actions } };
+    expect(
+      implementationsActions(fooState, {
+        type: searchRuleImplementations.SUCCESS,
+        payload,
+      })
+    ).toMatchObject(_actions);
+  });
+
+  it("should ignore unhandled actions", () => {
+    expect(implementationsActions(fooState, { type: "FOO" })).toBe(fooState);
+  });
+});

package/src/reducers/__tests__/{uploadingResults.spec.js → resultsUploading.spec.js}

@@ -1,18 +1,18 @@
 import { uploadResults } from "../../routines";
-import { uploadingResults } from "..";
+import { resultsUploading } from "../resultsUploading";
 
 const fooState = { foo: "bar" };
 
 const initialState = false;
 
-describe("reducers: uploadingResults", () => {
+describe("reducers: resultsUploading", () => {
   it("should provide the initial state", () => {
-    expect(uploadingResults(undefined, {})).toEqual(initialState);
+    expect(resultsUploading(undefined, {})).toEqual(initialState);
   });
 
   it("should handle the uploadResults.TRIGGER action", () => {
     expect(
-      uploadingResults(fooState, {
+      resultsUploading(fooState, {
         type: uploadResults.TRIGGER,
       })
     ).toBeTruthy();
@@ -20,7 +20,7 @@ describe("reducers: uploadingResults", () => {
 
   it("should handle the uploadResults.FULFILL action", () => {
     expect(
-      uploadingResults(fooState, {
+      resultsUploading(fooState, {
         type: uploadResults.FULFILL,
       })
     ).toBeFalsy();

package/src/reducers/implementationsActions.js

@@ -0,0 +1,24 @@
+import {
+  clearRuleImplementations,
+  searchRuleImplementations,
+} from "../routines";
+
+export const initialState = null;
+
+export const implementationsActions = (
+  state = initialState,
+  { type, payload }
+) => {
+  switch (type) {
+    case clearRuleImplementations.TRIGGER:
+      return initialState;
+    case searchRuleImplementations.TRIGGER:
+      return initialState;
+    case searchRuleImplementations.SUCCESS:
+      return payload?.data?._actions || initialState;
+    default:
+      return state;
+  }
+};
+
+export default implementationsActions;

package/src/reducers/index.js

@@ -3,9 +3,11 @@ import { conceptRulesActions } from "./conceptRulesActions";
 import { conceptRulesLoading } from "./conceptRulesLoading";
 import { deletionQuery } from "./deletionQuery";
 import { dqMessage } from "./dqMessage";
-import { previousRuleImplementationQuery } from "./previousRuleImplementationQuery";
-import { executionGroupLoading } from "./executionGroupLoading";
 import { executionGroup } from "./executionGroup";
+import { executionGroupLoading } from "./executionGroupLoading";
+import { implementationsActions } from "./implementationsActions";
+import { previousRuleImplementationQuery } from "./previousRuleImplementationQuery";
+import { resultsUploading } from "./resultsUploading";
 import { rule } from "./rule";
 import { ruleActions } from "./ruleActions";
 import { ruleActiveFilters } from "./ruleActiveFilters";
@@ -14,6 +16,7 @@ import { ruleCreating } from "./ruleCreating";
 import { ruleFilters } from "./ruleFilters";
 import { ruleFiltersLoading } from "./ruleFiltersLoading";
 import { ruleImplementation } from "./ruleImplementation";
+import { ruleImplementationActiveFilters } from "./ruleImplementationActiveFilters";
 import { ruleImplementationCount } from "./ruleImplementationCount";
 import { ruleImplementationCreating } from "./ruleImplementationCreating";
 import { ruleImplementationFilters } from "./ruleImplementationFilters";
@@ -26,7 +29,6 @@ import { ruleImplementationSaving } from "./ruleImplementationSaving";
 import { ruleImplementationSelectedFilter } from "./ruleImplementationSelectedFilter";
 import { ruleImplementations } from "./ruleImplementations";
 import { ruleImplementationsDownloading } from "./ruleImplementationsDownloading";
-import { ruleImplementationActiveFilters } from "./ruleImplementationActiveFilters";
 import { ruleImplementationsLoading } from "./ruleImplementationsLoading";
 import { ruleImplementationsPageSize } from "./ruleImplementationsPageSize";
 import { ruleLoading } from "./ruleLoading";
@@ -39,10 +41,9 @@ import { rulesLoading } from "./rulesLoading";
 import { rulesPageSize } from "./rulesPageSize";
 import { uploadingImplementationsFile } from "./uploadingImplementationsFile";
 import { uploadingRulesFile } from "./uploadingRulesFile";
+import { userImplementationsPermissions } from "./userImplementationsPermissions";
 import { userRulePermissions } from "./userRulePermissions";
 import { userRulesPermissions } from "./userRulesPermissions";
-import { userImplementationsPermissions } from "./userImplementationsPermissions";
-import { uploadingResults } from "./uploadingResults";
 
 export {
   conceptRules,
@@ -50,9 +51,11 @@ export {
   conceptRulesLoading,
   deletionQuery,
   dqMessage,
-  previousRuleImplementationQuery,
-  executionGroupLoading,
   executionGroup,
+  executionGroupLoading,
+  implementationsActions,
+  previousRuleImplementationQuery,
+  resultsUploading,
   rule,
   ruleActions,
   ruleActiveFilters,
@@ -84,10 +87,9 @@ export {
   rules,
   rulesLoading,
   rulesPageSize,
-  uploadingRulesFile,
   uploadingImplementationsFile,
+  uploadingRulesFile,
+  userImplementationsPermissions,
   userRulePermissions,
   userRulesPermissions,
-  userImplementationsPermissions,
-  uploadingResults,
 };

package/src/reducers/{uploadingResults.js → resultsUploading.js}

@@ -2,7 +2,7 @@ import { uploadResults } from "../routines";
 
 const initialState = false;
 
-export const uploadingResults = (state = initialState, { type }) => {
+export const resultsUploading = (state = initialState, { type }) => {
   switch (type) {
     case uploadResults.TRIGGER:
       return true;
@@ -13,4 +13,4 @@ export const uploadingResults = (state = initialState, { type }) => {
   }
 };
 
-export default uploadingResults;
+export default resultsUploading;