@truedat/dq 4.45.7 → 4.46.1

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## [4.46.0] 2022-06-13
+
+### Fixed
+
+- [TD-4918] Implementations workflow permissions
+
 ## [4.45.7] 2022-06-07
 
 ### Fixed

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/dq",
-  "version": "4.45.7",
+  "version": "4.46.1",
   "description": "Truedat Web Data Quality Module",
   "sideEffects": false,
   "jsnext:main": "src/index.js",
@@ -34,7 +34,7 @@
     "@testing-library/jest-dom": "^5.16.4",
     "@testing-library/react": "^12.0.0",
     "@testing-library/user-event": "^13.2.1",
-    "@truedat/test": "4.45.7",
+    "@truedat/test": "4.46.0",
     "babel-jest": "^28.1.0",
     "babel-plugin-dynamic-import-node": "^2.3.3",
     "babel-plugin-lodash": "^3.3.4",
@@ -88,8 +88,8 @@
   },
   "dependencies": {
     "@apollo/client": "^3.6.4",
-    "@truedat/core": "4.45.7",
-    "@truedat/df": "4.45.7",
+    "@truedat/core": "4.46.0",
+    "@truedat/df": "4.46.1",
     "axios": "^0.19.2",
     "graphql": "^15.5.3",
     "path-to-regexp": "^1.7.0",
@@ -110,5 +110,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 0.88.2 < 2.1"
   },
-  "gitHead": "d3c6c144cc850972e0e602967e23259a1e176a2c"
+  "gitHead": "00524d691df3a57293aca6580e6bf96667e11761"
 }

package/src/components/ImplementationActions.js

@@ -17,38 +17,41 @@ import {
 import ExecutionPopup from "./ExecutionPopup";
 
 export const implementationActions = ({
+  actions,
   id,
   deleteImplementation,
   formatMessage,
-}) => [
-  {
-    key: "clone",
-    icon: "copy outline",
-    text: formatMessage({ id: "ruleImplementation.actions.clone" }),
-    value: "clone",
-    as: Link,
-    to: linkTo.IMPLEMENTATION_CLONE({ implementation_id: id }),
-  },
-  {
-    key: "move",
-    icon: "share square",
-    text: formatMessage({ id: "ruleImplementation.actions.move" }),
-    value: "move",
-    as: Link,
-    to: linkTo.IMPLEMENTATION_MOVE({ implementation_id: id }),
-  },
-  {
-    key: "delete",
-    value: "delete",
-    as: OptionModal,
-    headerMessage: "ruleImplementation.actions.delete.confirmation.header",
-    contentMessage: "ruleImplementation.actions.delete.confirmation.content",
-    iconName: "trash alternate outline",
-    iconColor: "red",
-    option: "ruleImplementation.actions.delete",
-    onConfirm: () => deleteImplementation({ id, redirectUrl: IMPLEMENTATIONS }),
-  },
-];
+}) =>
+  _.filter(({ key }) => _.flow(Object.keys, _.includes(key))(actions))([
+    {
+      key: "clone",
+      icon: "copy outline",
+      text: formatMessage({ id: "ruleImplementation.actions.clone" }),
+      value: "clone",
+      as: Link,
+      to: linkTo.IMPLEMENTATION_CLONE({ implementation_id: id }),
+    },
+    {
+      key: "move",
+      icon: "share square",
+      text: formatMessage({ id: "ruleImplementation.actions.move" }),
+      value: "move",
+      as: Link,
+      to: linkTo.IMPLEMENTATION_MOVE({ implementation_id: id }),
+    },
+    {
+      key: "delete",
+      value: "delete",
+      as: OptionModal,
+      headerMessage: "ruleImplementation.actions.delete.confirmation.header",
+      contentMessage: "ruleImplementation.actions.delete.confirmation.content",
+      iconName: "trash alternate outline",
+      iconColor: "red",
+      option: "ruleImplementation.actions.delete",
+      onConfirm: () =>
+        deleteImplementation({ id, redirectUrl: IMPLEMENTATIONS }),
+    },
+  ]);
 
 export const ImplementationActions = ({
   actions,
@@ -66,6 +69,7 @@ export const ImplementationActions = ({
     createExecutionGroup({ ...query, df_content });
   };
   const secondaryActions = implementationActions({
+    actions,
     id,
     deleteImplementation,
     formatMessage,
@@ -116,7 +120,9 @@ export const ImplementationActions = ({
         />
       ) : null}
       {actions?.execute ? <ExecutionPopup onSubmit={handleExecute} /> : null}
-      <GroupActions availableActions={secondaryActions} />
+      {_.isEmpty(secondaryActions) ? null : (
+        <GroupActions availableActions={secondaryActions} />
+      )}
     </>
   );
 };

package/src/components/ImplementationSearchResults.js

@@ -101,7 +101,9 @@ export const ImplementationSearchResults = ({
       selectedImplementations
     );
   };
-
+  const withoutColumns = useActiveRoute(IMPLEMENTATIONS_PENDING)
+    ? []
+    : ["status"];
   return (
     <Segment>
       <ImplementationSearchResultsHeader />
@@ -130,6 +132,7 @@ export const ImplementationSearchResults = ({
             executeImplementationsOn={executeImplementationsOn}
             isRowChecked={isRowChecked}
             selectedImplementations={selectedImplementations}
+            withoutColumns={withoutColumns}
           />
           <RuleImplementationsPagination />
         </Dimmer.Dimmable>

package/src/components/QualityRoutes.js

@@ -14,7 +14,7 @@ import ImplementationsRoutes from "./ImplementationsRoutes";
 import RulesRoutes from "./RulesRoutes";
 
 const QualityRoutes = () => {
-  const authorized = useAuthorized("data_quality");
+  const authorized = useAuthorized("quality");
 
   return (
     <>

package/src/components/RuleImplementationActions.js

@@ -37,9 +37,9 @@ RuleImplementationActions.propTypes = {
   canCreateRaw: PropTypes.bool,
 };
 
-const mapStateToProps = ({ userRulePermissions }) => ({
-  canCreate: !!userRulePermissions?.manage_quality_rule_implementations,
-  canCreateRaw: !!userRulePermissions?.manage_raw_quality_rule_implementations,
+const mapStateToProps = ({ implementationActions }) => ({
+  canCreate: !!implementationActions?.create,
+  canCreateRaw: !!implementationActions?.createRaw,
 });
 
 export default connect(mapStateToProps)(RuleImplementationActions);

package/src/components/RuleImplementationsActions.js

@@ -82,7 +82,7 @@ export const RuleImplementationsActions = ({
           />
         </>
       ) : null}
-      {actions?.createRaw ? (
+      {actions?.createRawRuleLess ? (
         <Button
           as={Link}
           to={IMPLEMENTATION_NEW_RAW}
@@ -91,7 +91,7 @@ export const RuleImplementationsActions = ({
           })}
         />
       ) : null}
-      {actions?.create ? (
+      {actions?.createRuleLess ? (
         <Button
           primary
           as={Link}

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

@@ -9,6 +9,9 @@ const renderOpts = {
     },
     implementationActions: {
       execute: { method: "POST" },
+      move: { method: "POST" },
+      clone: { method: "POST" },
+      delete: { method: "POST" },
     },
   },
 };

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

@@ -2,6 +2,13 @@ import React from "react";
 import { shallow } from "enzyme";
 import { ImplementationSearchResults } from "../ImplementationSearchResults";
 
+jest.mock("@truedat/core/hooks", () => ({
+  useAuthorized: jest.fn(() => true),
+  useActiveRoute: jest.fn((param) =>
+    param === "/pendingImplementations" ? true : false
+  ),
+}));
+
 describe("<ImplementationSearchResults />", () => {
   it("matches the latest snapshot", () => {
     const props = {

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

@@ -19,6 +19,9 @@ const stateExecutePermission = {
     manage: true,
     link_concept: true,
     execute: true,
+    move: true,
+    clone: true,
+    delete: true,
   },
 };
 
@@ -28,6 +31,9 @@ const stateNoExecutePermission = {
     manage: true,
     link_concept: true,
     execute: false,
+    move: true,
+    clone: true,
+    delete: true,
   },
 };
 

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

@@ -13,8 +13,8 @@ describe("<RuleImplementationsActions />", () => {
   const props = {
     actions: {
       uploadResults: {},
-      create: {},
-      createRaw: {},
+      createRuleLess: {},
+      createRawRuleLess: {},
       download: {},
       execute: {},
     },

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

@@ -33,6 +33,7 @@ exports[`<ImplementationSearchResults /> matches the latest snapshot 1`] = `
         executeImplementationsOn={false}
         isRowChecked={[Function]}
         selectedImplementations={Array []}
+        withoutColumns={Array []}
       />
       <Connect(Pagination) />
     </DimmerDimmable>
@@ -82,6 +83,7 @@ exports[`<ImplementationSearchResults /> renders executions on when executionEna
         executeImplementationsOn={true}
         isRowChecked={[Function]}
         selectedImplementations={Array []}
+        withoutColumns={Array []}
       />
       <Connect(Pagination) />
     </DimmerDimmable>

package/src/components/ruleImplementationForm/__tests__/RuleImplementationRawForm.spec.js

@@ -6,6 +6,8 @@ import { render } from "@truedat/test/render";
 import { multipleTemplatesMock } from "@truedat/test/mocks";
 import RuleImplementationRawForm from "../RuleImplementationRawForm";
 
+jest.setTimeout(30000);
+
 const renderOpts = {
   mocks: [multipleTemplatesMock({ scope: "ri", domainIds: [1] })],
   state: {

package/src/reducers/implementationActions.js

@@ -1,13 +1,20 @@
 import _ from "lodash/fp";
-import { clearRuleImplementations, fetchRuleImplementation } from "../routines";
+import {
+  clearRuleImplementation,
+  clearRuleImplementations,
+  fetchRuleImplementation,
+  fetchRuleImplementations,
+} from "../routines";
 
 const initialState = {};
 
 const implementationActions = (state = initialState, { type, payload }) => {
   switch (type) {
     case fetchRuleImplementation.SUCCESS:
+    case fetchRuleImplementations.SUCCESS:
       return _.pathOr(initialState, "_actions")(payload);
     case clearRuleImplementations.TRIGGER:
+    case clearRuleImplementation.TRIGGER:
       return initialState;
     default:
       return state;

package/src/reducers/ruleImplementations.js

@@ -26,6 +26,7 @@ const pickFields = _.pick([
   "goal",
   "dataset",
   "valdations",
+  "status",
 ]);
 
 const ruleImplementations = (state = initialState, { type, payload }) => {

package/src/selectors/getRuleImplementationColumns.js

@@ -28,6 +28,13 @@ export const defaultImplementationColumns = [
     fieldDecorator: RuleLink,
     width: 2,
   },
+  {
+    name: "status",
+    fieldDecorator: (value) =>
+      translateDecorator(`ruleImplementation.status.${value}`),
+    sort: { name: "status" },
+    width: 2,
+  },
   {
     name: "business_concept",
     fieldSelector: _.path("current_business_concept_version.name"),