@truedat/df 4.51.1 → 4.51.3

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [4.51.3] 2022-09-16
+
+### Changed
+
+- [TD-4794] Replace `DomainDropdownSelector` and `DomainMenuSelector` with
+  common `DomainSelector`
+
 ## [4.50.3] 2022-08-29
 
 ### Changed

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/df",
-  "version": "4.51.1",
+  "version": "4.51.3",
   "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.47.9",
+    "@truedat/test": "4.51.3",
     "babel-jest": "^28.1.0",
     "babel-plugin-dynamic-import-node": "^2.3.3",
     "babel-plugin-lodash": "^3.3.4",
@@ -87,8 +87,8 @@
     ]
   },
   "dependencies": {
-    "@truedat/auth": "4.51.1",
-    "@truedat/core": "4.51.1",
+    "@truedat/auth": "4.51.3",
+    "@truedat/core": "4.51.3",
     "path-to-regexp": "^1.7.0",
     "prop-types": "^15.8.1",
     "react-color": "^2.17.3",
@@ -106,5 +106,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 0.88.2 < 2.1"
   },
-  "gitHead": "2f5c5f130f1fd84a103c8a97096eb2c191d06446"
+  "gitHead": "69d6cf8f7379eb2ef5744a4fdd357a7dd662b115"
 }

package/src/components/FieldViewerValue.js

@@ -12,7 +12,7 @@ export const LocalizedFieldValue = ({ label, value }) => {
   const { formatMessage } = useIntl();
   return formatMessage({
     id: `fields.${label}.${value}`,
-    defaultMessage: value,
+    defaultMessage: String(value),
   });
 };
 

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

@@ -24,6 +24,7 @@ exports[`<SelectableDynamicForm /> with a single template matches the latest sna
         >
           <input
             name="field1"
+            placeholder="field1"
             type="text"
             value=""
           />

package/src/components/widgets/StringField.js

@@ -4,8 +4,8 @@ import { Form } from "semantic-ui-react";
 import { useIntl } from "react-intl";
 
 export const StringField = ({
-  field: { name, cardinality, value },
-  onChange
+  field: { name, cardinality, placeholder, value },
+  onChange,
 }) => {
   const { formatMessage } = useIntl();
   return cardinality == "+" || cardinality == "*" ? (
@@ -18,7 +18,7 @@ export const StringField = ({
       options={["", ...(value || [])].map((o, i) => ({
         key: i,
         value: o,
-        text: o
+        text: o,
       }))}
       placeholder={formatMessage({ id: "fields.dropdown.placeholder" })}
       search
@@ -26,13 +26,18 @@ export const StringField = ({
       value={value || []}
     />
   ) : (
-    <Form.Input value={value || ""} name={name} onChange={onChange} />
+    <Form.Input
+      value={value || ""}
+      name={name}
+      onChange={onChange}
+      placeholder={placeholder}
+    />
   );
 };
 
 StringField.propTypes = {
   field: PropTypes.object,
-  onChange: PropTypes.func
+  onChange: PropTypes.func,
 };
 
 export default StringField;

package/src/templates/components/TemplateRoutes.js

@@ -14,10 +14,6 @@ import Template from "./Template";
 import TemplatesLoader from "./TemplatesLoader";
 import TemplateLoader from "./TemplateLoader";
 
-const DomainsLoader = React.lazy(() =>
-  import("@truedat/bg/taxonomy/components/DomainsLoader")
-);
-
 export const TemplateRoutes = () => {
   const authorized = useAuthorized();
   return (
@@ -32,19 +28,13 @@ export const TemplateRoutes = () => {
             <Switch>
               <Route
                 path={TEMPLATES_NEW}
-                render={() => (
-                  <>
-                    <DomainsLoader />
-                    <NewTemplate />
-                  </>
-                )}
+                render={() => <NewTemplate />}
                 exact
               />
               <Route
                 path={TEMPLATE}
                 render={() => (
                   <>
-                    <DomainsLoader />
                     <TemplateLoader />
                     <Template />
                   </>

package/src/templates/utils/applyDefaults.js

@@ -15,8 +15,8 @@ const meetsSwitchCondition = (defaults, content, onSwitch, value) => {
   return !_.isNil(onSwitch) && _.isObject(value) && _.has(field)(value);
 };
 
-const meetsDomain = (values, domain) =>
-  _.includes(_.toString(domain))(_.keys(values));
+const meetsDomain = (values, domainId) =>
+  _.includes(_.toString(domainId))(_.keys(values));
 
 const standardDefault = (on, toBe, onSwitch, onDomain) =>
   _.every(_.isNil)([on, toBe, onSwitch, onDomain]);
@@ -24,7 +24,7 @@ const standardDefault = (on, toBe, onSwitch, onDomain) =>
 const getDefaultValue = (defaults, content, on) =>
   _.defaultTo(_.prop(on)(defaults))(_.prop(on)(content));
 
-export const applyDefaults = (templateContent) => (content, domain) =>
+export const applyDefaults = (templateContent) => (content, domainId) =>
   _.flow(
     getTemplateDefaults,
     _.omitBy((d) => _.includes(_.prop("name")(d))(_.keys(content))),
@@ -44,8 +44,8 @@ export const applyDefaults = (templateContent) => (content, domain) =>
             const field = getDefaultValue(acc, content, onSwitch);
             const defaultValue = _.prop(field)(value);
             return _.assoc(name, defaultValue)(acc);
-          } else if (meetsDomain(onDomain, domain)) {
-            const defaultValue = _.prop(domain)(value);
+          } else if (meetsDomain(onDomain, domainId)) {
+            const defaultValue = _.prop(domainId)(value);
             return _.assoc(name, defaultValue)(acc);
           } else {
             return _.assoc(name, value)(acc);
@@ -54,8 +54,8 @@ export const applyDefaults = (templateContent) => (content, domain) =>
           const field = getDefaultValue(acc, content, onSwitch);
           const defaultValue = _.prop(field)(value);
           return _.assoc(name, defaultValue)(acc);
-        } else if (meetsDomain(onDomain, domain)) {
-          const defaultValue = _.prop(domain)(value);
+        } else if (meetsDomain(onDomain, domainId)) {
+          const defaultValue = _.prop(domainId)(value);
           return _.assoc(name, defaultValue)(acc);
         }
         return acc;

package/src/templates/utils/applyTemplate.js

@@ -9,28 +9,28 @@ import { filterValues } from "./filterValues";
 
 export const applyTemplate =
   (template) =>
-  (content, domain = null) => {
+  (content, domainId = null) => {
     const templateContent = flattenFields(template);
     return _.flow(
       filterFields(templateContent),
       filterValues(templateContent),
       filterDepends(templateContent),
       filterSwitches(templateContent),
-      (content) => filterDomains(templateContent)(content, domain),
-      (content) => applyDefaults(templateContent)(content, domain)
+      (content) => filterDomains(templateContent)(content, domainId),
+      (content) => applyDefaults(templateContent)(content, domainId)
     )(content);
   };
 
 export const applyTemplateWithoutDefaults =
   (template) =>
-  (content, domain = null) => {
+  (content, domainId = null) => {
     const templateContent = flattenFields(template);
     return _.flow(
       filterFields(templateContent),
       filterValues(templateContent),
       filterDepends(templateContent),
       filterSwitches(templateContent),
-      (content) => filterDomains(templateContent)(content, domain)
+      (content) => filterDomains(templateContent)(content, domainId)
     )(content);
   };
 

package/src/templates/utils/filterDomains.js

@@ -1,9 +1,9 @@
 import _ from "lodash/fp";
 
-const validDomainValue = (field, content, domain) => {
+const validDomainValue = (field, content, domainId) => {
   const name = _.prop("name")(field);
   const value = _.prop(name)(content);
-  const values = _.prop(domain)(field?.values?.domain);
+  const values = _.prop(domainId)(field?.values?.domain);
 
   return (
     (_.isArray(value) && !_.isEmpty(_.intersection(values)(value))) ||
@@ -12,8 +12,8 @@ const validDomainValue = (field, content, domain) => {
   );
 };
 
-const validDomainFields = (templateContent, content, domain) => {
-  if (_.isNil(domain)) {
+const validDomainFields = (templateContent, content, domainId) => {
+  if (_.isNil(domainId)) {
     return _.flow(
       _.reject(_.has("values.domain")),
       _.map("name")
@@ -23,13 +23,13 @@ const validDomainFields = (templateContent, content, domain) => {
     _.reject(
       (field) =>
         _.has("values.domain")(field) &&
-        !validDomainValue(field, content, domain)
+        !validDomainValue(field, content, domainId)
     ),
     _.map("name")
   )(templateContent);
 };
 
-export const filterDomains = (templateContent) => (content, domain) => {
-  const vv = validDomainFields(templateContent, content, domain);
+export const filterDomains = (templateContent) => (content, domainId) => {
+  const vv = validDomainFields(templateContent, content, domainId);
   return _.pick(vv)(content);
 };