@truedat/dq 4.31.7 → 4.32.2

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## [4.32.2] 2021-11-22
+
+### Hotfix
+
+[TD-4327] Fix dropdown domain selector for glossay new quality rule
+
 ## [4.31.4] 2021-10-25
 
 ### Added

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/dq",
-  "version": "4.31.7",
+  "version": "4.32.2",
   "description": "Truedat Web Data Quality Module",
   "sideEffects": false,
   "jsnext:main": "src/index.js",
@@ -31,7 +31,7 @@
     "@babel/plugin-transform-modules-commonjs": "^7.15.0",
     "@babel/preset-env": "^7.15.0",
     "@babel/preset-react": "^7.14.5",
-    "@truedat/test": "4.31.7",
+    "@truedat/test": "4.32.0",
     "babel-jest": "^27.0.6",
     "babel-plugin-dynamic-import-node": "^2.3.3",
     "babel-plugin-lodash": "^3.3.4",
@@ -82,8 +82,8 @@
   },
   "dependencies": {
     "@apollo/client": "^3.4.10",
-    "@truedat/core": "4.31.7",
-    "@truedat/df": "4.31.7",
+    "@truedat/core": "4.32.0",
+    "@truedat/df": "4.32.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": "eb71852427257eba949ffcf6c9b3cd62d7c4c466"
+  "gitHead": "827680aa084932f97406bf372c08f10d826093a6"
 }

package/src/components/RuleForm.js

@@ -19,6 +19,7 @@ import {
 import { HistoryBackButton } from "@truedat/core/components";
 import { applyTemplate } from "@truedat/df/utils";
 import { selectDomain } from "@truedat/df/routines";
+import { getDomainSelectorOptions } from "@truedat/bg/selectors";
 import DynamicRuleForm from "./DynamicRuleForm";
 
 const DomainDropdownSelector = React.lazy(() =>
@@ -345,9 +346,13 @@ export class RuleForm extends React.Component {
     } = this.props;
     const rule = this.state;
     const { domain_id } = rule;
-    const { concept } = this.props;
+    const { concept, domainOptions } = this.props;
     const messages = this.generateValidationMessages();
-    const defaultFilters = _.isEmpty(domain_id)
+    const hasDomainSelected = _.flow(
+      _.reject((id) => _.isNil(id) || id === ""),
+      _.negate(_.isEmpty)
+    )([domain_id]);
+    const defaultFilters = !hasDomainSelected
       ? filters
       : { ...filters, domain_ids: [domain_id] };
 
@@ -394,7 +399,11 @@ export class RuleForm extends React.Component {
             >
               <DomainDropdownSelector
                 name="domain"
-                scope="manage_quality_rule"
+                domainOptions={
+                  domainOptions
+                    ? getDomainSelectorOptions({ domains: domainOptions })
+                    : null
+                }
                 hideLabel
                 invalid={!_.isFinite(this.state.domain_id)}
                 onChange={this.handleDomainSelected}
@@ -564,6 +573,7 @@ RuleForm.propTypes = {
   template: PropTypes.object,
   match: PropTypes.object,
   intl: PropTypes.object,
+  domainOptions: PropTypes.array,
 };
 
 const mapStateToProps = (state) => ({
@@ -572,6 +582,7 @@ const mapStateToProps = (state) => ({
   templatesLoaded: !state.templatesLoading && !_.isEmpty(state.templates),
   template: state.template,
   applyTemplate: applyTemplate(state.template),
+  domainOptions: _.pathOr(null, "conceptRulesActions.domain_ids")(state),
 });
 
 const mapDispatchToProps = { selectDomain };

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

@@ -178,11 +178,11 @@ exports[`<RuleForm /> matches the latest snapshot for create 1`] = `
         required={true}
       >
         <lazy
+          domainOptions={null}
           hideLabel={true}
           invalid={true}
           name="domain"
           onChange={[Function]}
-          scope="manage_quality_rule"
           value={null}
         />
       </FieldLabelWrapping>
@@ -412,11 +412,11 @@ exports[`<RuleForm /> matches the latest snapshot for editMode 1`] = `
         required={true}
       >
         <lazy
+          domainOptions={null}
           hideLabel={true}
           invalid={true}
           name="domain"
           onChange={[Function]}
-          scope="manage_quality_rule"
           value={null}
         />
       </FieldLabelWrapping>