@truedat/dq 4.34.0 → 4.35.3

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # Changelog
 
+## [4.35.2] 2021-12-20
+
+### Fixed
+
+- [TD-4380] Allow modifier in operator filter
+
+## [4.34.3] 2021-12-15
+
+### Added
+
+- [TD-4273] Upload `RuleResults`
+
+## [4.34.2] 2021-12-14
+
+### Added
+
+- [TD-4314] Add BulkLoad for `rules`
+- [TD-4301] Add BulkLoad for `implementations`
+
 ## [4.34.0] 2021-12-02
 
 ### Changed

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/dq",
-  "version": "4.34.0",
+  "version": "4.35.3",
   "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.34.0",
-    "@truedat/df": "4.34.0",
+    "@truedat/core": "4.35.3",
+    "@truedat/df": "4.35.3",
     "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": "b1fe4f405c612bd342510cf34e8e9d89de0280fb"
+  "gitHead": "10cfa24ea2c47fe56e640e16cecaa51f302aaad3"
 }

package/src/api.js

@@ -4,6 +4,7 @@ const API_EXECUTION_GROUPS = "/api/execution_groups";
 const API_RULE = "/api/rules/:id";
 const API_RULES = "/api/rules";
 const API_RULES_SEARCH = "/api/rules/search";
+const API_RULES_UPLOAD = "/api/rules/upload";
 const API_RULE_FILTERS_SEARCH = "/api/rule_filters/search";
 const API_RULE_IMPLEMENTATION = "/api/rule_implementations/:id";
 const API_RULE_IMPLEMENTATIONS = "/api/rule_implementations";
@@ -13,7 +14,9 @@ const API_RULE_IMPLEMENTATIONS_FROM_RULE =
 const API_RULE_IMPLEMENTATIONS_SEARCH = "/api/rule_implementations/search";
 const API_RULE_IMPLEMENTATION_FILTERS_SEARCH =
   "/api/rule_implementation_filters/search";
+const API_RULE_IMPLEMENTATIONS_UPLOAD = "/api/rule_implementations/upload";
 const API_RULE_RESULT = "/api/rule_results/:id";
+const API_RULE_RESULTS = "/api/rule_results";
 const API_SUBSCRIPTIONS_SEARCH = "/api/subscriptions/user/me/search";
 const API_SUBSCRIPTION = "/api/subscriptions/:id";
 const API_SUBSCRIPTIONS = "/api/subscriptions";
@@ -25,6 +28,7 @@ export {
   API_RULE,
   API_RULES,
   API_RULES_SEARCH,
+  API_RULES_UPLOAD,
   API_RULE_FILTERS_SEARCH,
   API_RULE_IMPLEMENTATION,
   API_RULE_IMPLEMENTATIONS,
@@ -32,8 +36,10 @@ export {
   API_RULE_IMPLEMENTATIONS_FROM_RULE,
   API_RULE_IMPLEMENTATIONS_SEARCH,
   API_RULE_IMPLEMENTATION_FILTERS_SEARCH,
+  API_RULE_IMPLEMENTATIONS_UPLOAD,
   API_RULE_RESULT,
+  API_RULE_RESULTS,
   API_SUBSCRIPTIONS_SEARCH,
   API_SUBSCRIPTION,
-  API_SUBSCRIPTIONS
+  API_SUBSCRIPTIONS,
 };

package/src/components/ImplementationsUploadButton.js

@@ -0,0 +1,61 @@
+import React from "react";
+import PropTypes from "prop-types";
+import { connect } from "react-redux";
+import { Dropdown } from "semantic-ui-react";
+import { FormattedMessage, useIntl } from "react-intl";
+import { UploadModal } from "@truedat/core/components";
+import { API_RULE_IMPLEMENTATIONS_UPLOAD } from "../api";
+import { uploadImplementations } from "../routines";
+
+const uploadAction = {
+  method: "POST",
+  href: API_RULE_IMPLEMENTATIONS_UPLOAD,
+};
+
+export const ImplementationsUploadButton = ({
+  uploadImplementations,
+  loading,
+}) => {
+  const { formatMessage } = useIntl();
+  return (
+    <UploadModal
+      icon="upload"
+      trigger={
+        <Dropdown.Item
+          icon="upload"
+          text={formatMessage({
+            id: "ruleImplementations.actions.upload.tooltip",
+          })}
+          disabled={loading}
+        />
+      }
+      header={
+        <FormattedMessage id="ruleImplementations.actions.upload.confirmation.header" />
+      }
+      content={
+        <FormattedMessage id="ruleImplementations.actions.upload.confirmation.content" />
+      }
+      param={"implementations"}
+      handleSubmit={(data) =>
+        uploadImplementations({
+          action: "upload",
+          data,
+          ...uploadAction,
+        })
+      }
+    />
+  );
+};
+
+ImplementationsUploadButton.propTypes = {
+  uploadImplementations: PropTypes.func,
+  loading: PropTypes.bool,
+};
+
+const mapStateToProps = ({ uploadImplementationsFile: { loading } }) => ({
+  loading,
+});
+
+export default connect(mapStateToProps, { uploadImplementations })(
+  ImplementationsUploadButton
+);

package/src/components/RuleImplementationsActions.js

@@ -2,9 +2,7 @@ import _ from "lodash/fp";
 import React from "react";
 import PropTypes from "prop-types";
 import { connect } from "react-redux";
-import { Button, Checkbox } from "semantic-ui-react";
-import { useIntl } from "react-intl";
-import { downloadImplementations } from "../routines";
+import { Checkbox } from "semantic-ui-react";
 import { getImplementationsExecution } from "../selectors";
 import {
   addImplementationFilter,
@@ -13,35 +11,11 @@ import {
   createExecutionGroup,
 } from "../routines";
 import ExecutionPopup from "./ExecutionPopup";
-
-const staticHeaderLabels = [
-  "implementation_key",
-  "implementation_type",
-  "rule",
-  "template",
-  "goal",
-  "minimum",
-  "business_concept",
-  "last_execution_at",
-  "result",
-  "execution",
-  "inserted_at",
-  "executable",
-];
-
-const staticContentLabels = [
-  "quality_result.under_minimum",
-  "quality_result.under_goal",
-  "quality_result.over_goal",
-  "quality_result.no_execution",
-  "executable.true",
-  "executable.false",
-];
+import RuleImplementationsOptions from "./RuleImplementationsOptions";
 
 export const RuleImplementationsActions = ({
   addImplementationFilter,
   canExecute,
-  downloadImplementations,
   executeImplementationsOn,
   toggleImplementationFilterValue,
   removeImplementationFilter,
@@ -51,21 +25,8 @@ export const RuleImplementationsActions = ({
   setMode,
   implementationsExecution,
   ruleImplementationCount,
-  ruleImplementationsDownloading,
   ruleImplementationsLoading,
 }) => {
-  const { formatMessage } = useIntl();
-
-  const headerLabels = _.flow(
-    _.map((l) => [l, formatMessage({ id: `ruleImplementations.props.${l}` })]),
-    _.fromPairs
-  )(staticHeaderLabels);
-
-  const contentLabels = _.flow(
-    _.map((l) => [l, formatMessage({ id: `ruleImplementations.props.${l}` })]),
-    _.fromPairs
-  )(staticContentLabels);
-
   const showExecutableInfo = () => {
     addImplementationFilter({ filter: "executable" });
     toggleImplementationFilterValue({
@@ -112,27 +73,13 @@ export const RuleImplementationsActions = ({
           />
         </>
       )}
-      {!ruleImplementationsLoading && (
-        <Button
-          floated="right"
-          secondary
-          icon="download"
-          data-tooltip={formatMessage({
-            id: "implementations.actions.download.tooltip",
-          })}
-          onClick={() =>
-            downloadImplementations({ contentLabels, headerLabels })
-          }
-          loading={ruleImplementationsDownloading}
-        />
-      )}
+      <RuleImplementationsOptions loading={ruleImplementationsLoading} />
     </div>
   );
 };
 
 RuleImplementationsActions.propTypes = {
   addImplementationFilter: PropTypes.func,
-  downloadImplementations: PropTypes.func,
   canExecute: PropTypes.bool,
   createExecutionGroup: PropTypes.func,
   executeImplementationsOn: PropTypes.bool,
@@ -143,7 +90,6 @@ RuleImplementationsActions.propTypes = {
   selectedImplementations: PropTypes.array,
   setMode: PropTypes.func,
   toggleImplementationFilterValue: PropTypes.func,
-  ruleImplementationsDownloading: PropTypes.bool,
   ruleImplementationsLoading: PropTypes.bool,
 };
 
@@ -151,13 +97,11 @@ const mapStateToProps = (state) => ({
   canExecute: _.propOr(false, "userImplementationsPermissions.execute")(state),
   ruleImplementationCount: state.ruleImplementationCount,
   implementationsExecution: getImplementationsExecution(state),
-  ruleImplementationsDownloading: state.ruleImplementationsDownloading,
   ruleImplementationsLoading: state.ruleImplementationsLoading,
 });
 
 export default connect(mapStateToProps, {
   addImplementationFilter,
-  downloadImplementations,
   toggleImplementationFilterValue,
   removeImplementationFilter,
   createExecutionGroup,

package/src/components/RuleImplementationsDownload.js

@@ -0,0 +1,86 @@
+import _ from "lodash/fp";
+import React from "react";
+import PropTypes from "prop-types";
+import { connect } from "react-redux";
+import { Dropdown } from "semantic-ui-react";
+import { useIntl } from "react-intl";
+import { downloadImplementations } from "../routines";
+
+const staticHeaderLabels = [
+  "implementation_key",
+  "implementation_type",
+  "rule",
+  "template",
+  "goal",
+  "minimum",
+  "business_concept",
+  "last_execution_at",
+  "result",
+  "execution",
+  "inserted_at",
+  "executable",
+];
+
+const staticContentLabels = [
+  "quality_result.under_minimum",
+  "quality_result.under_goal",
+  "quality_result.over_goal",
+  "quality_result.no_execution",
+  "executable.true",
+  "executable.false",
+];
+
+export const RuleImplementationsDownload = ({
+  downloadImplementations,
+  ruleImplementationsDownloading,
+  ruleImplementations,
+}) => {
+  const { formatMessage } = useIntl();
+
+  const headerLabels = _.flow(
+    _.map((l) => [l, formatMessage({ id: `ruleImplementations.props.${l}` })]),
+    _.fromPairs
+  )(staticHeaderLabels);
+
+  const contentLabels = _.flow(
+    _.map((l) => [l, formatMessage({ id: `ruleImplementations.props.${l}` })]),
+    _.fromPairs
+  )(staticContentLabels);
+
+  const isDisabled = _.isEmpty(ruleImplementations);
+
+  return (
+    <Dropdown.Item
+      icon="download"
+      content={
+        <>
+          <span>
+            {formatMessage({ id: "implementations.actions.download.tooltip" })}
+          </span>
+          {isDisabled && (
+            <p className="menu-item-description">
+              {formatMessage({ id: "implementations.actions.download.empty" })}
+            </p>
+          )}
+        </>
+      }
+      onClick={() => downloadImplementations({ contentLabels, headerLabels })}
+      disabled={isDisabled || ruleImplementationsDownloading}
+    />
+  );
+};
+
+RuleImplementationsDownload.propTypes = {
+  downloadImplementations: PropTypes.func,
+  ruleImplementationsDownloading: PropTypes.bool,
+  ruleImplementations: PropTypes.array,
+};
+
+const mapStateToProps = _.pick([
+  "ruleImplementationsDownloading",
+  "ruleImplementations",
+]);
+
+export default connect(mapStateToProps, {
+  downloadImplementations,
+})(RuleImplementationsDownload);

package/src/components/RuleImplementationsOptions.js

@@ -0,0 +1,28 @@
+import React from "react";
+import PropTypes from "prop-types";
+import { Dropdown } from "semantic-ui-react";
+import RuleImplementationsDownload from "./RuleImplementationsDownload";
+import RuleResultsUpload from "./RuleResultsUpload";
+import ImplementationsUploadButton from "./ImplementationsUploadButton";
+
+export const RuleImplementationsOptions = ({ loading }) => (
+  <Dropdown
+    icon="ellipsis vertical"
+    className="button icon group-actions button-update"
+    direction="left"
+    floating
+    disabled={loading}
+  >
+    <Dropdown.Menu>
+      <RuleImplementationsDownload />
+      <ImplementationsUploadButton />
+      <RuleResultsUpload />
+    </Dropdown.Menu>
+  </Dropdown>
+);
+
+RuleImplementationsOptions.propTypes = {
+  loading: PropTypes.bool,
+};
+
+export default RuleImplementationsOptions;

package/src/components/RuleResultsUpload.js

@@ -0,0 +1,47 @@
+import React from "react";
+import PropTypes from "prop-types";
+import { connect } from "react-redux";
+import { Dropdown } from "semantic-ui-react";
+import { useIntl } from "react-intl";
+import { UploadModal } from "@truedat/core/components";
+import { uploadResults } from "../routines";
+
+export const RuleResultsUpload = ({ uploadResults, loading }) => {
+  const { formatMessage } = useIntl();
+
+  return (
+    <UploadModal
+      icon="upload"
+      trigger={
+        <Dropdown.Item
+          icon="upload"
+          text={formatMessage({ id: "ruleResults.actions.upload.tooltip" })}
+          disabled={loading}
+        />
+      }
+      header={formatMessage({
+        id: "ruleResults.actions.upload.confirmation.header",
+      })}
+      content={formatMessage({
+        id: "uploadModal.actions.upload.confirmation.content",
+      })}
+      param={"rule_results"}
+      handleSubmit={(data) =>
+        uploadResults({
+          data,
+        })
+      }
+    />
+  );
+};
+
+RuleResultsUpload.propTypes = {
+  uploadResults: PropTypes.func,
+  loading: PropTypes.bool,
+};
+
+const mapStateToProps = ({ uploadingResults }) => ({
+  loading: uploadingResults,
+});
+
+export default connect(mapStateToProps, { uploadResults })(RuleResultsUpload);

package/src/components/RulesActions.js

@@ -5,26 +5,33 @@ import { Link } from "react-router-dom";
 import { Button } from "semantic-ui-react";
 import { FormattedMessage } from "react-intl";
 import { RULE_NEW } from "@truedat/core/routes";
+import { uploadRules } from "../routines";
+import RulesUploadButton from "./RulesUploadButton";
 
-export const RulesActions = ({ userRulesPermissions }) => (
+export const RulesActions = ({ userRulesPermissions, upload }) => (
   <div style={{ float: "right" }}>
     {userRulesPermissions.manage_quality_rules && (
-      <Button
-        primary
-        as={Link}
-        to={RULE_NEW}
-        content={<FormattedMessage id="quality.actions.create" />}
-      />
+      <>
+        <Button
+          primary
+          as={Link}
+          to={RULE_NEW}
+          content={<FormattedMessage id="quality.actions.create" />}
+        />
+        {upload && <RulesUploadButton />}
+        <RulesUploadButton />
+      </>
     )}
   </div>
 );
 
 RulesActions.propTypes = {
-  userRulesPermissions: PropTypes.object
+  userRulesPermissions: PropTypes.object,
+  upload: PropTypes.bool,
 };
 
 const mapStateToProps = ({ userRulesPermissions }) => ({
-  userRulesPermissions
+  userRulesPermissions,
 });
 
-export default connect(mapStateToProps)(RulesActions);
+export default connect(mapStateToProps)(RulesActions, uploadRules);

package/src/components/RulesUploadButton.js

@@ -0,0 +1,58 @@
+import React from "react";
+import PropTypes from "prop-types";
+import { connect } from "react-redux";
+import { Button } from "semantic-ui-react";
+import { FormattedMessage, useIntl } from "react-intl";
+import { UploadModal } from "@truedat/core/components";
+import { API_RULES_UPLOAD } from "../api";
+import { uploadRules } from "../routines";
+
+const uploadAction = {
+  method: "POST",
+  href: API_RULES_UPLOAD,
+};
+
+export const RulesUploadButton = ({ uploadRules, loading }) => {
+  const { formatMessage } = useIntl();
+  return (
+    <UploadModal
+      icon="upload"
+      trigger={
+        <Button
+          secondary
+          floated="right"
+          icon="upload"
+          loading={loading}
+          data-tooltip={formatMessage({
+            id: "rules.actions.upload.tooltip",
+          })}
+        />
+      }
+      header={
+        <FormattedMessage id="rules.actions.upload.confirmation.header" />
+      }
+      content={
+        <FormattedMessage id="rules.actions.upload.confirmation.content" />
+      }
+      param={"rules"}
+      handleSubmit={(data) =>
+        uploadRules({
+          action: "upload",
+          data,
+          ...uploadAction,
+        })
+      }
+    />
+  );
+};
+
+RulesUploadButton.propTypes = {
+  uploadRules: PropTypes.func,
+  loading: PropTypes.bool,
+};
+
+const mapStateToProps = ({ uploadRulesFile: { loading } }) => ({
+  loading,
+});
+
+export default connect(mapStateToProps, { uploadRules })(RulesUploadButton);

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

@@ -8,7 +8,6 @@ jest.spyOn(React, "useContext").mockImplementation(() => intl);
 
 describe("<RuleImplementationsActions />", () => {
   const addImplementationFilter = jest.fn();
-  const downloadImplementations = jest.fn();
   const toggleImplementationFilterValue = jest.fn();
   const setMode = jest.fn();
   const removeImplementationFilter = jest.fn();
@@ -17,9 +16,7 @@ describe("<RuleImplementationsActions />", () => {
     executionGroupLoading: false,
     ruleImplementationCount: 12,
     implementationsExecution: true,
-    ruleImplementationsDownloading: false,
     ruleImplementationsLoading: false,
-    downloadImplementations,
     toggleImplementationFilterValue,
     addImplementationFilter,
     executeImplementationsOn: false,
@@ -31,12 +28,6 @@ describe("<RuleImplementationsActions />", () => {
     expect(wrapper).toMatchSnapshot();
   });
 
-  it("calls downloadImplementations on button click", () => {
-    const wrapper = shallow(<RuleImplementationsActions {...props} />);
-    wrapper.find("Button").simulate("click");
-    expect(downloadImplementations.mock.calls.length).toBe(1);
-  });
-
   it("as user with permissions I see execute implementations button and checkbox", () => {
     const props = {
       canExecute: true,

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

@@ -0,0 +1,18 @@
+import _ from "lodash/fp";
+import React from "react";
+import { shallow } from "enzyme";
+import { intl } from "@truedat/test/intl-stub";
+import { RuleImplementationsOptions } from "../RuleImplementationsOptions";
+
+jest.spyOn(React, "useContext").mockImplementation(() => intl);
+
+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();
+  });
+});

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

@@ -0,0 +1,18 @@
+import _ from "lodash/fp";
+import React from "react";
+import { shallow } from "enzyme";
+import { intl } from "@truedat/test/intl-stub";
+import { RuleResultsUpload } from "../RuleResultsUpload";
+
+jest.spyOn(React, "useContext").mockImplementation(() => intl);
+
+describe("<RuleResultsUpload />", () => {
+  it("matches the latest snapshot", () => {
+    const props = {
+      uploadResults: jest.fn(),
+      loading: false,
+    };
+    const wrapper = shallow(<RuleResultsUpload {...props} />);
+    expect(wrapper).toMatchSnapshot();
+  });
+});

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

@@ -27,14 +27,8 @@ exports[`<RuleImplementationsActions /> matches the latest snapshot 1`] = `
     disabled={true}
     handleSubmit={[Function]}
   />
-  <Button
-    as="button"
-    data-tooltip="implementations.actions.download.tooltip"
-    floated="right"
-    icon="download"
+  <RuleImplementationsOptions
     loading={false}
-    onClick={[Function]}
-    secondary={true}
   />
 </div>
 `;

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

@@ -0,0 +1,58 @@
+// 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>
+`;