@truedat/dq 7.5.9 → 7.5.10

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

@@ -1,199 +1,142 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`<Subscription /> matches the latest snapshot 1`] = `
-<Popup
-  basic={true}
-  disabled={false}
-  eventsEnabled={true}
-  flowing={true}
-  on="click"
-  pinned={false}
-  popperModifiers={[]}
-  position="bottom right"
-  trigger={
-    <Button
-      as="button"
-      basic={true}
-      className="button icon group-actions"
-      data-tooltip="quality.actions.unsubcribe.tooltip"
-      icon={
-        <Icon
-          as="i"
-          className="secondary"
-          name="eye"
-        />
-      }
-    />
-  }
->
-  <Suspense
-    fallback={
-      <div>
-        Loading...
-      </div>
-    }
+<div>
+  <button
+    class="ui basic icon button button icon group-actions"
+    data-tooltip="quality.actions.unsubcribe.tooltip"
   >
-    <lazy
-      disabled={false}
-      handleChange={[Function]}
-      handleDelete={[Function]}
-      handleSubmit={[Function]}
-      subscription={
-        {
-          "id": 2,
-          "periodicity": "daily",
-          "scope": {
-            "events": [
-              "rule_result_created",
-            ],
-            "resource_id": 2,
-            "resource_type": "rule",
-            "status": [
-              "warn",
-            ],
-          },
-          "subscriber": {
-            "id": 3,
-            "identifier": "2",
-            "type": "user",
-          },
-        }
-      }
-      subscriptionUpdating={false}
-    >
-      <SubscriptionContent
-        setSubscription={[Function]}
-        subscription={
-          {
-            "id": 2,
-            "periodicity": "daily",
-            "scope": {
-              "events": [
-                "rule_result_created",
-              ],
-              "resource_id": 2,
-              "resource_type": "rule",
-              "status": [
-                "warn",
-              ],
-            },
-            "subscriber": {
-              "id": 3,
-              "identifier": "2",
-              "type": "user",
-            },
-          }
-        }
-      />
-    </lazy>
-  </Suspense>
-</Popup>
+    <i
+      aria-hidden="true"
+      class="eye icon secondary"
+    />
+  </button>
+</div>
 `;
 
 exports[`<SubscriptionContent /> matches the latest snapshot 1`] = `
-<FormField>
-  <FormField>
-    <label>
-      <MemoizedFormattedMessage
-        id="subscriptions.notification"
-      />
-    </label>
-  </FormField>
-  <FormCheckbox
-    as={[Function]}
-    checked={false}
-    control={[Function]}
-    label={
-      <label>
-        <Icon
-          as="i"
-          color="green"
-          name="circle"
-        />
-        <Memo(MemoizedFormattedMessage)
-          id="subscriptions.status.success"
-        />
-      </label>
-    }
-    name="success"
-    onChange={[Function]}
-  />
-  <FormCheckbox
-    as={[Function]}
-    checked={true}
-    control={[Function]}
-    label={
+<div>
+  <div
+    class="field"
+  >
+    <div
+      class="field"
+    >
       <label>
-        <Icon
-          as="i"
-          color="yellow"
-          name="circle"
-        />
-        <Memo(MemoizedFormattedMessage)
-          id="subscriptions.status.warn"
-        />
+        subscriptions.notification
       </label>
-    }
-    name="warn"
-    onChange={[Function]}
-  />
-  <FormCheckbox
-    as={[Function]}
-    checked={false}
-    control={[Function]}
-    label={
-      <label>
-        <Icon
-          as="i"
-          color="red"
-          name="circle"
-        />
-        <Memo(MemoizedFormattedMessage)
-          id="subscriptions.status.fail"
+    </div>
+    <div
+      class="field"
+    >
+      <div
+        class="ui checkbox"
+      >
+        <input
+          class="hidden"
+          name="success"
+          readonly=""
+          tabindex="0"
+          type="checkbox"
         />
-      </label>
-    }
-    name="fail"
-    onChange={[Function]}
-  />
-  <FormCheckbox
-    as={[Function]}
-    checked={false}
-    control={[Function]}
-    label={
-      <label>
-        <Icon
-          as="i"
-          color="grey"
-          inverted={true}
-          name="warning circle"
+        <label>
+          <i
+            aria-hidden="true"
+            class="green circle icon"
+          />
+          subscriptions.status.success
+        </label>
+      </div>
+    </div>
+    <div
+      class="field"
+    >
+      <div
+        class="ui checked checkbox"
+      >
+        <input
+          checked=""
+          class="hidden"
+          name="warn"
+          readonly=""
+          tabindex="0"
+          type="checkbox"
         />
-        <Memo(MemoizedFormattedMessage)
-          id="subscriptions.status.empty_dataset"
+        <label>
+          <i
+            aria-hidden="true"
+            class="yellow circle icon"
+          />
+          subscriptions.status.warn
+        </label>
+      </div>
+    </div>
+    <div
+      class="field"
+    >
+      <div
+        class="ui checkbox"
+      >
+        <input
+          class="hidden"
+          name="fail"
+          readonly=""
+          tabindex="0"
+          type="checkbox"
         />
-      </label>
-    }
-    name="empty_dataset"
-    onChange={[Function]}
-  />
-  <FormCheckbox
-    as={[Function]}
-    checked={false}
-    control={[Function]}
-    label={
-      <label>
-        <Icon
-          as="i"
-          color="red"
-          name="warning circle"
+        <label>
+          <i
+            aria-hidden="true"
+            class="red circle icon"
+          />
+          subscriptions.status.fail
+        </label>
+      </div>
+    </div>
+    <div
+      class="field"
+    >
+      <div
+        class="ui checkbox"
+      >
+        <input
+          class="hidden"
+          name="empty_dataset"
+          readonly=""
+          tabindex="0"
+          type="checkbox"
         />
-        <Memo(MemoizedFormattedMessage)
-          id="subscriptions.status.error"
+        <label>
+          <i
+            aria-hidden="true"
+            class="grey warning circle inverted icon"
+          />
+          subscriptions.status.empty_dataset
+        </label>
+      </div>
+    </div>
+    <div
+      class="field"
+    >
+      <div
+        class="ui checkbox"
+      >
+        <input
+          class="hidden"
+          name="error"
+          readonly=""
+          tabindex="0"
+          type="checkbox"
         />
-      </label>
-    }
-    name="error"
-    onChange={[Function]}
-  />
-</FormField>
+        <label>
+          <i
+            aria-hidden="true"
+            class="red warning circle icon"
+          />
+          subscriptions.status.error
+        </label>
+      </div>
+    </div>
+  </div>
+</div>
 `;

package/src/components/ruleImplementationForm/DatasetForm.js

@@ -1,5 +1,5 @@
 import _ from "lodash/fp";
-import React from "react";
+import { lazy } from "react";
 import PropTypes from "prop-types";
 import { connect } from "react-redux";
 import { useIntl } from "react-intl";
@@ -12,12 +12,12 @@ import { lowerDeburrTrim } from "@truedat/core/services/sort";
 import { datasetDefaultFiltersSelector } from "../../selectors";
 import "../../styles/ruleImplementationForm/DatasetForm.less";
 
-const StructureSelectorInputField = React.lazy(() =>
-  import("@truedat/dd/components/StructureSelectorInputField")
+const StructureSelectorInputField = lazy(
+  () => import("@truedat/dd/components/StructureSelectorInputField")
 );
 
-const ReferenceDatasetSelectorInputField = React.lazy(() =>
-  import("@truedat/dd/components/ReferenceDatasetSelectorInputField")
+const ReferenceDatasetSelectorInputField = lazy(
+  () => import("@truedat/dd/components/ReferenceDatasetSelectorInputField")
 );
 
 export const DatasetForm = ({
@@ -93,7 +93,9 @@ export const DatasetForm = ({
     } else if (value) {
       const mergedValue = { ..._.nth(index)(structures), ...value };
       setStructures(replaceAt(index, mergedValue)(structures));
-    } else setStructures(deleteStructure(index, structures));
+    } else {
+      setStructures(deleteStructure(index, structures));
+    }
   };
 
   const deleteStructure = (index, items) => {
@@ -177,7 +179,6 @@ export const DatasetForm = ({
           >
             {formatMessage({ id: "dataset.form.button.add_structure" })}
           </Button>
-
           {_.isEmpty(availableReferenceDatasets) ? null : (
             <Button
               onClick={(e) => {

package/src/components/ruleImplementationForm/DateField.js

@@ -1,6 +1,5 @@
 import _ from "lodash/fp";
 import PropTypes from "prop-types";
-import React from "react";
 import { DateInput } from "semantic-ui-calendar-react";
 
 export const DateField = ({ name, label, value, onChange }) => {

package/src/components/ruleImplementationForm/DateTimeField.js

@@ -1,6 +1,5 @@
 import _ from "lodash/fp";
 import PropTypes from "prop-types";
-import React from "react";
 import { DateTimeInput } from "semantic-ui-calendar-react";
 
 export const DateTimeField = ({ name, label, value, onChange }) => {

package/src/components/ruleImplementationForm/FieldModifier.js

@@ -1,12 +1,12 @@
 import _ from "lodash/fp";
 import PropTypes from "prop-types";
-import React, { Fragment } from "react";
+import { lazy, Fragment } from "react";
 import { useIntl } from "react-intl";
 import { Form, Icon, Segment } from "semantic-ui-react";
 
 import { getStructureFieldOptionValue } from "@truedat/dd/selectors/getStructureFieldOptionValue";
-const StructureFieldsDropdown = React.lazy(() =>
-  import("@truedat/dd/components/StructureFieldsDropdown")
+const StructureFieldsDropdown = lazy(
+  () => import("@truedat/dd/components/StructureFieldsDropdown")
 );
 
 export default function FieldModifier({

package/src/components/ruleImplementationForm/FieldsGrid.js

@@ -1,5 +1,5 @@
 import _ from "lodash/fp";
-import React, { useState } from "react";
+import { useState } from "react";
 import PropTypes from "prop-types";
 import { Button, Grid } from "semantic-ui-react";
 import FieldsGroup from "./FieldsGroup";

package/src/components/ruleImplementationForm/FieldsGroup.js

@@ -1,13 +1,13 @@
 import _ from "lodash/fp";
-import React from "react";
+import { lazy } from "react";
 import { useIntl } from "react-intl";
 import { Button, Grid, Icon } from "semantic-ui-react";
 import PropTypes from "prop-types";
 import { getStructureFieldOptionValue } from "@truedat/dd/selectors/getStructureFieldOptionValue";
 import { getStructureFields } from "../../selectors/getStructureFields";
 
-const StructureFieldsDropdown = React.lazy(() =>
-  import("@truedat/dd/components/StructureFieldsDropdown")
+const StructureFieldsDropdown = lazy(
+  () => import("@truedat/dd/components/StructureFieldsDropdown")
 );
 
 const Field = ({

package/src/components/ruleImplementationForm/FiltersField.js

@@ -1,5 +1,5 @@
 import _ from "lodash/fp";
-import React, { useState } from "react";
+import { lazy, useState } from "react";
 import PropTypes from "prop-types";
 import { getStructureFieldOptionValue } from "@truedat/dd/selectors/getStructureFieldOptionValue";
 import ReferenceDatasetFieldSelector from "@truedat/dd/components/ReferenceDatasetFieldSelector";
@@ -12,12 +12,12 @@ import StringField from "./StringField";
 import StringListField from "./StringListField";
 import FieldModifier from "./FieldModifier";
 
-const StructureFieldsDropdown = React.lazy(() =>
-  import("@truedat/dd/components/StructureFieldsDropdown")
+const StructureFieldsDropdown = lazy(
+  () => import("@truedat/dd/components/StructureFieldsDropdown")
 );
 
-const StructureSelectorInputField = React.lazy(() =>
-  import("@truedat/dd/components/StructureSelectorInputField")
+const StructureSelectorInputField = lazy(
+  () => import("@truedat/dd/components/StructureSelectorInputField")
 );
 
 const DEFAULT_FILTERS = { "class.raw": ["field"] };

package/src/components/ruleImplementationForm/FiltersFormGroup.js

@@ -1,5 +1,5 @@
 import _ from "lodash/fp";
-import React from "react";
+import { lazy } from "react";
 import { Form, Dropdown } from "semantic-ui-react";
 import PropTypes from "prop-types";
 import { useIntl } from "react-intl";
@@ -10,12 +10,12 @@ import FiltersField from "./FiltersField";
 import FieldModifier from "./FieldModifier";
 import operatorFunctions from "./operators";
 
-const StructureFieldsDropdown = React.lazy(() =>
-  import("@truedat/dd/components/StructureFieldsDropdown")
+const StructureFieldsDropdown = lazy(
+  () => import("@truedat/dd/components/StructureFieldsDropdown")
 );
 
-const ValueConditionStructure = React.lazy(() =>
-  import("@truedat/dd/components/ValueConditionStructure")
+const ValueConditionStructure = lazy(
+  () => import("@truedat/dd/components/ValueConditionStructure")
 );
 
 export const FiltersFormGroup = ({
@@ -102,7 +102,6 @@ export const FiltersFormGroup = ({
             </Dropdown>
           ) : null}
         </div>
-
         {selectedModifier ? (
           <FieldModifier
             modifier={selectedModifier}

package/src/components/ruleImplementationForm/FiltersGrid.js

@@ -1,5 +1,5 @@
 import _ from "lodash/fp";
-import React, { useState } from "react";
+import { useState } from "react";
 import PropTypes from "prop-types";
 import { Button, Grid } from "semantic-ui-react";
 import FiltersGroup from "./FiltersGroup";

package/src/components/ruleImplementationForm/FiltersGroup.js

@@ -1,5 +1,5 @@
 import _ from "lodash/fp";
-import React, { Fragment, useState } from "react";
+import { Fragment, useState } from "react";
 import { useIntl } from "react-intl";
 import {
   Accordion,
@@ -34,11 +34,13 @@ const Filter = ({
   const [activePopulation, setActivePopulation] = useState(
     !_.isEmpty(clause?.population)
   );
+
   const conditionApplies = (row) =>
     row?.operator?.value_type_filter === "any" &&
     row?.operator?.value_type === "field" &&
     row?.operator?.population &&
     row?.value;
+
   const onPopupClick = (index) => {
     const display = !activePopulation;
     !display && onConditionChange(index, null);
@@ -46,6 +48,7 @@ const Filter = ({
     display && setActiveConditionIndex(index);
     setActivePopulation(display);
   };
+
   const onValueConditionChange = (value) => {
     onConditionChange(index, value);
     if (_.isNil(value)) {
@@ -53,8 +56,10 @@ const Filter = ({
       setActivePopulation(false);
     }
   };
+
   const findSiblings = (row) =>
     _.filter((v) => !_.isNil(v?.id))(row?.value || []);
+
   return (
     <>
       <Grid.Row data-testid={`row-${index}`}>

package/src/components/ruleImplementationForm/FixedListField.js

@@ -1,18 +1,17 @@
 import _ from "lodash/fp";
 import PropTypes from "prop-types";
-import React from "react";
 import { useIntl } from "react-intl";
 import { Form } from "semantic-ui-react";
 
-const getDropdownOptions = formatMessage => fixed_values => {
-  return _.map(value => {
+const getDropdownOptions = (formatMessage) => (fixed_values) => {
+  return _.map((value) => {
     return {
       key: value,
       text: formatMessage({
         id: `ruleImplementation.filtersField.${value}`,
-        defaultMessage: value
+        defaultMessage: value,
       }),
-      value: value
+      value: value,
     };
   })(fixed_values);
 };
@@ -22,7 +21,7 @@ export const FixedListField = ({
   label,
   value,
   onChange,
-  fixedValues
+  fixedValues,
 }) => {
   const { formatMessage } = useIntl();
   const raw = _.propOr({}, "raw")(value);
@@ -41,7 +40,7 @@ export const FixedListField = ({
 FixedListField.propTypes = {
   name: PropTypes.string,
   label: PropTypes.string,
-  onChange: PropTypes.func
+  onChange: PropTypes.func,
 };
 
 export default FixedListField;

package/src/components/ruleImplementationForm/InformationForm.js

@@ -1,5 +1,5 @@
 import _ from "lodash/fp";
-import React from "react";
+import { lazy } from "react";
 import PropTypes from "prop-types";
 import { useIntl, FormattedMessage } from "react-intl";
 import { useQuery } from "@apollo/client";
@@ -8,8 +8,8 @@ import { Form, Icon, Popup } from "semantic-ui-react";
 import { DomainSelector } from "@truedat/core/components";
 import LimitsForm from "./LimitsForm";
 
-const SelectableDynamicForm = React.lazy(() =>
-  import("@truedat/df/components/SelectableDynamicForm")
+const SelectableDynamicForm = lazy(
+  () => import("@truedat/df/components/SelectableDynamicForm")
 );
 
 const DomainActionsLoader = ({ id, actions, onLoad }) => {
@@ -77,7 +77,6 @@ export const InformationForm = ({
           autoComplete="off"
         />
       </Form.Field>
-
       {_.isNil(ruleImplementation?.rule_id) ? (
         <Form.Field required={true}>
           <label>

package/src/components/ruleImplementationForm/LimitsForm.js

@@ -1,5 +1,4 @@
 import _ from "lodash/fp";
-import React from "react";
 import PropTypes from "prop-types";
 import { useIntl } from "react-intl";
 import { Form, Icon, Popup, Label, Segment } from "semantic-ui-react";

package/src/components/ruleImplementationForm/NumberField.js

@@ -1,6 +1,5 @@
 import _ from "lodash/fp";
 import PropTypes from "prop-types";
-import React from "react";
 import { Form } from "semantic-ui-react";
 
 const targetValue = (e) => {

package/src/components/ruleImplementationForm/PopulationForm.js

@@ -1,5 +1,4 @@
 import _ from "lodash/fp";
-import React from "react";
 import PropTypes from "prop-types";
 import { dropAt, replaceAt } from "@truedat/core/services/arrays";
 import { FiltersGrid } from "./FiltersGrid";

package/src/components/ruleImplementationForm/RuleImplementationBasicForm.js

@@ -1,8 +1,8 @@
 import _ from "lodash/fp";
-import React, { useState, useEffect } from "react";
+import { lazy, useState, useEffect } from "react";
 import PropTypes from "prop-types";
 import { connect } from "react-redux";
-import { useHistory } from "react-router-dom";
+import { useNavigate } from "react-router";
 import { useIntl } from "react-intl";
 import { useQuery } from "@apollo/client";
 import { Button, Form, Icon, Popup } from "semantic-ui-react";
@@ -11,8 +11,8 @@ import { DOMAIN_QUERY } from "@truedat/core/api/queries";
 import LimitsForm from "./LimitsForm";
 import { areLimitsValid } from "./limitsValidation";
 
-const SelectableDynamicForm = React.lazy(() =>
-  import("@truedat/df/components/SelectableDynamicForm")
+const SelectableDynamicForm = lazy(
+  () => import("@truedat/df/components/SelectableDynamicForm")
 );
 
 const DomainActionsLoader = ({ id, actions, onLoad }) => {
@@ -59,8 +59,7 @@ export const RuleImplementationBasicForm = ({
   setImplementationKey,
 }) => {
   const { formatMessage } = useIntl();
-  const history = useHistory();
-
+  const navigate = useNavigate();
   const domainActions = ["publishImplementation"];
 
   const [isContentValid, setIsContentValid] = useState();
@@ -102,7 +101,7 @@ export const RuleImplementationBasicForm = ({
     (!_.isEmpty(rule) || _.prop("domain_id")(ruleImplementation)) &&
     areLimitsValid(ruleImplementation);
 
-  const doCancel = () => history.goBack();
+  const doCancel = () => navigate(-1);
 
   const domainId = ruleImplementation?.domain_id || rule?.domain_id;