@truedat/dq 4.49.4 → 4.49.7

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## [4.49.6] 2022-10-08
+
+### Fixed
+
+- [TD-4945] User with permission can save or published on edition
+
 ## [4.48.13] 2022-26-07
 
 ### Fixed

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/dq",
-  "version": "4.49.4",
+  "version": "4.49.7",
   "description": "Truedat Web Data Quality Module",
   "sideEffects": false,
   "jsnext:main": "src/index.js",
@@ -93,8 +93,8 @@
   },
   "dependencies": {
     "@apollo/client": "^3.6.4",
-    "@truedat/core": "4.49.4",
-    "@truedat/df": "4.49.4",
+    "@truedat/core": "4.49.7",
+    "@truedat/df": "4.49.7",
     "graphql": "^15.5.3",
     "path-to-regexp": "^1.7.0",
     "prop-types": "^15.8.1",
@@ -114,5 +114,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 0.88.2 < 2.1"
   },
-  "gitHead": "31a5acbf9468f20ff8bdd29c6692adfc2636b460"
+  "gitHead": "e57a27c689a1e18026fe5b8a02d9414d5ea70337"
 }

package/src/components/NewRuleImplementation.js

@@ -248,12 +248,12 @@ export const NewRuleImplementation = ({
   createRuleImplementation,
   updateRuleImplementation,
   edition = false,
-  rule,
   ruleImplementationProps,
   structuresFields,
   structuresSiblings,
   operators,
   implementationType = "",
+  rule,
 }) => {
   const precalculatedDataset = _.flow(
     _.propOr([{}], "dataset"),
@@ -315,6 +315,9 @@ export const NewRuleImplementation = ({
           result_type: ruleImplementationProps.result_type,
           minimum: ruleImplementationProps.minimum,
           goal: ruleImplementationProps.goal,
+          rule: ruleImplementationProps.rule_id
+            ? ruleImplementationProps.rule
+            : null,
           rule_id: ruleImplementationProps.rule_id,
           domain_id: ruleImplementationProps.domain_id,
           status: ruleImplementationProps.status,
@@ -341,6 +344,9 @@ export const NewRuleImplementation = ({
           result_type: "percentage",
           minimum: null,
           goal: null,
+          rule_id: _.propOr(null, "id")(rule),
+          domain_id: _.propOr(null, "domain_id")(rule),
+          rule: rule,
         }
   );
 
@@ -477,7 +483,7 @@ export const NewRuleImplementation = ({
             implementation_type: ruleImplementation.implementationType,
             df_name: ruleImplementation?.dfName,
             df_content: ruleImplementation?.dfContent,
-            rule_id: rule ? rule.id : ruleImplementation.rule_id,
+            rule_id: ruleImplementation.rule_id,
             raw_content: { ...raw_content },
             result_type: ruleImplementation.result_type,
             minimum: ruleImplementation.minimum,
@@ -495,7 +501,7 @@ export const NewRuleImplementation = ({
             implementation_type: ruleImplementation.implementationType,
             df_name: ruleImplementation?.dfName,
             df_content: ruleImplementation?.dfContent,
-            rule_id: rule ? rule.id : ruleImplementation.rule_id,
+            rule_id: ruleImplementation.rule_id,
             result_type: ruleImplementation.result_type,
             minimum: ruleImplementation.minimum,
             goal: ruleImplementation.goal,
@@ -577,7 +583,6 @@ NewRuleImplementation.propTypes = {
   edition: PropTypes.bool,
   implementationType: PropTypes.string,
   operators: PropTypes.object,
-  rule: PropTypes.object,
   ruleImplementationProps: PropTypes.object,
   structuresFields: PropTypes.object,
   structuresSiblings: PropTypes.object,

package/src/components/RuleRoutes.js

@@ -126,18 +126,18 @@ export const RuleRoutes = ({
           exact
           path={RULE_IMPLEMENTATION_NEW}
           render={() =>
-            structuresAliasesLoading || systemsLoading ? null : (
+            structuresAliasesLoading || systemsLoading ? null : ruleLoaded ? (
               <NewRuleImplementation />
-            )
+            ) : null
           }
         />
         <Route
           exact
           path={RULE_IMPLEMENTATION_NEW_RAW}
           render={() =>
-            structuresAliasesLoading || systemsLoading ? null : (
+            structuresAliasesLoading || systemsLoading ? null : ruleLoaded ? (
               <NewRuleImplementation implementationType="raw" />
-            )
+            ) : null
           }
         />
       </>

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

@@ -2,6 +2,7 @@ import _ from "lodash/fp";
 import React from "react";
 import { waitFor, within } from "@testing-library/react";
 import { render } from "@truedat/test/render";
+import { DOMAIN_QUERY, DOMAINS_QUERY } from "@truedat/core/api/queries";
 import { multipleTemplatesMock } from "@truedat/test/mocks";
 import userEvent from "@testing-library/user-event";
 import defaultMessages from "@truedat/test/messages";
@@ -14,11 +15,40 @@ import {
   ruleImplementationLoaderActions,
 } from "./__fixtures__/newRuleImplementationHelper";
 
+const domainActions = ["publishImplementation", "manageSegments"];
+const domains = [
+  { id: "2", name: "Truedat", parentId: "", actions: domainActions },
+];
+const requestVariables = {
+  action: "manageRulelessImplementations",
+  domainActions: domainActions,
+};
+const domainsMock = {
+  request: { query: DOMAINS_QUERY, variables: requestVariables },
+  result: { data: { domains: domains } },
+};
+const domainMock = {
+  request: {
+    query: DOMAIN_QUERY,
+    variables: { id: 2, actions: ["publishImplementation", "manageSegments"] },
+  },
+  result: { data: { domain: { id: "2", actions: domainActions } } },
+};
+
+const messages = {
+  en: { ...defaultMessages.en },
+};
+
 describe("<NewRuleImplementation />", () => {
   const createRuleImplementation = jest.fn();
   const updateRuleImplementation = jest.fn();
 
-  const ruleImplementationProps = { id: 1, name: "nn", executable: true };
+  const ruleImplementationProps = {
+    id: 1,
+    name: "nn",
+    executable: true,
+    result_type: "goal",
+  };
 
   const props = {
     ruleImplementationProps,
@@ -31,8 +61,11 @@ describe("<NewRuleImplementation />", () => {
         scope: "ri",
         domainIds: null,
       }),
+      domainsMock,
+      domainMock,
     ],
     state: { ruleImplementationCreating: false },
+    messages,
     fallback: "lazy",
   };
 
@@ -50,10 +83,8 @@ describe("<NewRuleImplementation />", () => {
   });
 
   it("calculate aliases when not informed", async () => {
-    const applyTemplate = jest.fn();
     const props = {
       ...newRuleImplementationProps,
-      applyTemplate: applyTemplate,
     };
     const { container, queryByText } = render(
       <NewRuleImplementationComponent {...props} />,
@@ -76,6 +107,8 @@ describe("<NewRuleImplementation> NewRuleImplementation doSubmit", () => {
         scope: "ri",
         domainIds: [2],
       }),
+      domainsMock,
+      domainMock,
     ],
     messages: {
       en: {
@@ -113,9 +146,9 @@ describe("<NewRuleImplementation> NewRuleImplementation doSubmit", () => {
     minimum: 80,
     populations: [],
     result_type: "percentage",
-    rule_id: undefined,
+    rule_id: null,
     segments: [],
-    status: undefined,
+    status: "draft",
   };
 
   it("doSubmit: is empty operator", async () => {
@@ -195,6 +228,13 @@ describe("<NewRuleImplementation> NewRuleImplementation doSubmit", () => {
       within(selectedOperator).queryByText(/is empty/)
     ).toBeInTheDocument();
 
+    // Segments
+
+    await waitFor(() => {
+      expect(getByRole("button", { name: "Next" })).toBeEnabled();
+    });
+    userEvent.click(await getByRole("button", { name: "Next" }));
+
     await waitFor(() => {
       expect(getByRole("button", { name: "Save" })).toBeEnabled();
     });
@@ -326,6 +366,13 @@ describe("<NewRuleImplementation> NewRuleImplementation doSubmit", () => {
       []
     );
 
+    // Segments
+
+    await waitFor(() => {
+      expect(getByRole("button", { name: "Next" })).toBeEnabled();
+    });
+    userEvent.click(await getByRole("button", { name: "Next" }));
+
     await waitFor(() => {
       expect(getByRole("button", { name: "Save" })).toBeEnabled();
     });

package/src/components/__tests__/__fixtures__/NewRuleImplementationProps.js

@@ -198,6 +198,12 @@ export const newRuleImplementationProps = {
       },
     ],
     rule_id: 631,
+    rule: {
+      active: true,
+      name: "rule_new_engine_dq_postgresql",
+      df_name: "dq_default_template",
+      df_content: {},
+    },
     validations: [
       {
         operator: {
@@ -246,6 +252,7 @@ export const newRuleImplementationProps = {
     minimum: 20,
     goal: 10,
     raw_content: {},
+    domain_id: 2,
   },
   ruleImplementationRaw: {},
   sources: [],

package/src/components/__tests__/__fixtures__/newRuleImplementationHelper.js

@@ -989,7 +989,6 @@ export const ruleImplementationLoaderGlobalState = {
   ruleImplementationOperators,
   structuresFields,
   structuresSiblings,
-  domains: [{ id: 2, name: "domain1" }],
 };
 
 export const ruleImplementationLoaderActions = {

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

@@ -29,6 +29,7 @@ exports[`<NewRuleImplementation /> calculate aliases when not informed 1`] = `
       >
         <div
           class="column"
+          style="visibility: visible;"
         >
           <div
             class="stretched center aligned row"
@@ -41,7 +42,7 @@ exports[`<NewRuleImplementation /> calculate aliases when not informed 1`] = `
               >
                 <i
                   aria-hidden="true"
-                  class="info icon"
+                  class="black info icon"
                 />
                 <div
                   class="content"
@@ -58,7 +59,7 @@ exports[`<NewRuleImplementation /> calculate aliases when not informed 1`] = `
               >
                 <i
                   aria-hidden="true"
-                  class="database icon"
+                  class="black database icon"
                 />
                 <div
                   class="content"
@@ -75,7 +76,7 @@ exports[`<NewRuleImplementation /> calculate aliases when not informed 1`] = `
               >
                 <i
                   aria-hidden="true"
-                  class="user icon"
+                  class="black user icon"
                 />
                 <div
                   class="content"
@@ -92,7 +93,7 @@ exports[`<NewRuleImplementation /> calculate aliases when not informed 1`] = `
               >
                 <i
                   aria-hidden="true"
-                  class="setting icon"
+                  class="black setting icon"
                 />
                 <div
                   class="content"
@@ -104,6 +105,23 @@ exports[`<NewRuleImplementation /> calculate aliases when not informed 1`] = `
                   </div>
                 </div>
               </div>
+              <div
+                class="step"
+              >
+                <i
+                  aria-hidden="true"
+                  class="black grid layout icon"
+                />
+                <div
+                  class="content"
+                >
+                  <div
+                    class="title"
+                  >
+                    Segments
+                  </div>
+                </div>
+              </div>
             </div>
             <div
               class="ui fitted hidden divider"
@@ -305,81 +323,6 @@ exports[`<NewRuleImplementation /> calculate aliases when not informed 1`] = `
                   </div>
                 </div>
               </div>
-              <div
-                class="required field"
-              >
-                <label>
-                  Template
-                  <div
-                    class="ui left pointing label"
-                  >
-                    Empty required field
-                  </div>
-                </label>
-                <div
-                  class="field"
-                >
-                  <div
-                    aria-busy="false"
-                    aria-expanded="false"
-                    class="ui search selection dropdown"
-                    name="template"
-                    role="combobox"
-                  >
-                    <input
-                      aria-autocomplete="list"
-                      autocomplete="off"
-                      class="search"
-                      tabindex="0"
-                      type="text"
-                      value=""
-                    />
-                    <div
-                      aria-atomic="true"
-                      aria-live="polite"
-                      class="divider default text"
-                      role="alert"
-                    >
-                      Select a template...
-                    </div>
-                    <i
-                      aria-hidden="true"
-                      class="dropdown icon"
-                    />
-                    <div
-                      class="menu transition"
-                      role="listbox"
-                    >
-                      <div
-                        aria-checked="false"
-                        aria-selected="true"
-                        class="selected item"
-                        role="option"
-                        style="pointer-events: all;"
-                      >
-                        <span
-                          class="text"
-                        >
-                          template1
-                        </span>
-                      </div>
-                      <div
-                        aria-checked="false"
-                        aria-selected="false"
-                        class="item"
-                        role="option"
-                        style="pointer-events: all;"
-                      >
-                        <span
-                          class="text"
-                        >
-                          template2
-                        </span>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </div>
             </form>
           </div>
           <div
@@ -877,6 +820,7 @@ exports[`<NewRuleImplementation /> matches the latest snapshot 1`] = `
       >
         <div
           class="column"
+          style="visibility: visible;"
         >
           <div
             class="stretched center aligned row"
@@ -889,7 +833,7 @@ exports[`<NewRuleImplementation /> matches the latest snapshot 1`] = `
               >
                 <i
                   aria-hidden="true"
-                  class="info icon"
+                  class="black info icon"
                 />
                 <div
                   class="content"
@@ -906,7 +850,7 @@ exports[`<NewRuleImplementation /> matches the latest snapshot 1`] = `
               >
                 <i
                   aria-hidden="true"
-                  class="database icon"
+                  class="black database icon"
                 />
                 <div
                   class="content"
@@ -923,7 +867,7 @@ exports[`<NewRuleImplementation /> matches the latest snapshot 1`] = `
               >
                 <i
                   aria-hidden="true"
-                  class="user icon"
+                  class="black user icon"
                 />
                 <div
                   class="content"
@@ -940,7 +884,7 @@ exports[`<NewRuleImplementation /> matches the latest snapshot 1`] = `
               >
                 <i
                   aria-hidden="true"
-                  class="setting icon"
+                  class="black setting icon"
                 />
                 <div
                   class="content"
@@ -952,6 +896,23 @@ exports[`<NewRuleImplementation /> matches the latest snapshot 1`] = `
                   </div>
                 </div>
               </div>
+              <div
+                class="disabled step"
+              >
+                <i
+                  aria-hidden="true"
+                  class="grey grid layout icon"
+                />
+                <div
+                  class="content"
+                >
+                  <div
+                    class="title"
+                  >
+                    Segments
+                  </div>
+                </div>
+              </div>
             </div>
             <div
               class="ui fitted hidden divider"
@@ -1010,52 +971,59 @@ exports[`<NewRuleImplementation /> matches the latest snapshot 1`] = `
                 </div>
               </div>
               <div
-                class="field"
+                class="required field"
               >
+                <label>
+                  Domain
+                </label>
                 <div
-                  class="required field"
+                  class="field"
                 >
-                  <label>
-                    Domain
-                  </label>
                   <div
-                    class="field"
+                    aria-expanded="false"
+                    aria-multiselectable="false"
+                    class="ui floating dropdown"
+                    role="listbox"
+                    tabindex="0"
                   >
+                    <label>
+                      Select a domain...
+                    </label>
+                    <i
+                      aria-hidden="true"
+                      class="dropdown icon"
+                    />
                     <div
-                      aria-expanded="false"
-                      class="ui fluid search selection dropdown"
-                      name="domain"
-                      role="combobox"
+                      class="menu transition"
                     >
-                      <input
-                        aria-autocomplete="list"
-                        autocomplete="off"
-                        class="search"
-                        tabindex="0"
-                        type="text"
-                        value=""
-                      />
                       <div
-                        aria-atomic="true"
-                        aria-live="polite"
-                        class="divider default text"
-                        role="alert"
+                        class="ui left icon input search"
                       >
-                        Select a domain...
+                        <input
+                          type="text"
+                        />
+                        <i
+                          aria-hidden="true"
+                          class="search icon"
+                        />
                       </div>
-                      <i
-                        aria-hidden="true"
-                        class="dropdown icon"
-                      />
                       <div
-                        aria-multiselectable="false"
-                        class="menu transition"
-                        role="listbox"
+                        class="scrolling menu transition"
                       >
                         <div
-                          class="message"
+                          aria-selected="false"
+                          class="item"
+                          role="option"
                         >
-                          No results found.
+                          <div
+                            style="margin-left: 0px;"
+                          >
+                            <i
+                              aria-hidden="true"
+                              class="icon"
+                            />
+                            Truedat
+                          </div>
                         </div>
                       </div>
                     </div>

package/src/components/ruleImplementationForm/InformationForm.js

@@ -1,25 +1,32 @@
 import _ from "lodash/fp";
 import React from "react";
-import { connect } from "react-redux";
 import PropTypes from "prop-types";
 import { useIntl, FormattedMessage } from "react-intl";
+import { useQuery } from "@apollo/client";
+import { DOMAIN_QUERY } from "@truedat/core/api/queries";
 import { Form, Icon, Popup } from "semantic-ui-react";
+import { DomainSelector } from "@truedat/core/components";
 import LimitsForm from "./LimitsForm";
 
-const DomainDropdownSelector = React.lazy(() =>
-  import("@truedat/bg/taxonomy/components/DomainDropdownSelector")
-);
-
 const SelectableDynamicForm = React.lazy(() =>
   import("@truedat/df/components/SelectableDynamicForm")
 );
 
+const DomainActionsLoader = ({ id, actions, onLoad }) => {
+  useQuery(DOMAIN_QUERY, {
+    fetchPolicy: "cache-and-network",
+    variables: { id, actions },
+    onCompleted: onLoad,
+  });
+  return null;
+};
+
 export const InformationForm = ({
   setImplementationKey,
   onChange,
   ruleImplementation,
   setIsValid,
-  rule,
+  onDomainsLoad,
 }) => {
   const { formatMessage } = useIntl();
 
@@ -28,7 +35,9 @@ export const InformationForm = ({
 
     setIsValid(_.isEmpty(valid));
   };
-  const domainId = ruleImplementation?.domain_id || rule?.domain_id;
+  const domainId = ruleImplementation?.domain_id;
+  const domainActions = ["publishImplementation", "manageSegments"];
+
   return (
     <>
       <Form.Radio
@@ -66,14 +75,30 @@ export const InformationForm = ({
         />
       </Form.Field>
 
-      {_.isEmpty(rule) && !ruleImplementation?.rule_id ? (
-        <Form.Field>
-          <DomainDropdownSelector
+      {_.isNil(ruleImplementation?.rule_id) ? (
+        <Form.Field required={true}>
+          <label>
+            <FormattedMessage id="quality.domain" />
+          </label>
+          <DomainSelector
+            action={
+              ruleImplementation.rule_id
+                ? "manageImplementations"
+                : "manageRulelessImplementations"
+            }
             value={ruleImplementation.domain_id}
+            domainActions={domainActions}
+            onLoad={(data) => onDomainsLoad(data.domains)}
             onChange={(_e, { value }) => onChange("domain_id", value)}
           />
         </Form.Field>
-      ) : null}
+      ) : (
+        <DomainActionsLoader
+          id={domainId}
+          actions={domainActions}
+          onLoad={(data) => onDomainsLoad([data.domain])}
+        />
+      )}
       <LimitsForm onChange={onChange} ruleImplementation={ruleImplementation} />
       <SelectableDynamicForm
         scope="ri"
@@ -90,12 +115,10 @@ export const InformationForm = ({
 
 InformationForm.propTypes = {
   onChange: PropTypes.func,
-  rule: PropTypes.object,
   ruleImplementation: PropTypes.object,
   setImplementationKey: PropTypes.func,
   setIsValid: PropTypes.func,
+  onDomainsLoad: PropTypes.func,
 };
 
-const mapStateToProps = ({ rule }) => ({ rule });
-
-export default connect(mapStateToProps)(InformationForm);
+export default InformationForm;