@truedat/dd 4.28.7 → 4.28.8

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## [4.28.8] 2021-09-20
+
+### Added
+
+- [TD-3970] `StructureFieldsDropdown` support for cast type and modifier
+
 ## [4.28.6] 2021-09-20
 
 ### Added

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/dd",
-  "version": "4.28.7",
+  "version": "4.28.8",
   "description": "Truedat Web Data Dictionary",
   "sideEffects": false,
   "jsnext:main": "src/index.js",
@@ -16,8 +16,8 @@
   "scripts": {
     "clean": "rimraf yarn-error.log",
     "debug": "node --inspect-brk node_modules/.bin/jest --runInBand",
-    "test": "jest --coverage",
-    "test:watch": "jest --watch",
+    "test": "TZ=UTC jest --coverage",
+    "test:watch": "TZ=UTC jest --watch",
     "eslint": "eslint src/**",
     "eslint:fix": "eslint --fix src/**"
   },
@@ -34,7 +34,7 @@
     "@testing-library/jest-dom": "^5.14.1",
     "@testing-library/react": "^12.0.0",
     "@testing-library/user-event": "^13.2.1",
-    "@truedat/test": "4.28.7",
+    "@truedat/test": "4.28.8",
     "babel-jest": "^27.0.6",
     "babel-plugin-dynamic-import-node": "^2.3.3",
     "babel-plugin-lodash": "^3.3.4",
@@ -84,9 +84,9 @@
     ]
   },
   "dependencies": {
-    "@truedat/auth": "4.28.7",
-    "@truedat/core": "4.28.7",
-    "@truedat/df": "4.28.7",
+    "@truedat/auth": "4.28.8",
+    "@truedat/core": "4.28.8",
+    "@truedat/df": "4.28.8",
     "lodash": "^4.17.21",
     "path-to-regexp": "^1.7.0",
     "prop-types": "^15.7.2",
@@ -107,5 +107,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 0.88.2 < 2.1"
   },
-  "gitHead": "d5cfc6f850ec38066139c97836b75d2f21d61d54"
+  "gitHead": "33a7f73dd4ffbd31d1df270c8453c3a876412990"
 }

package/src/components/StructureFieldsDropdown.js

@@ -6,52 +6,6 @@ import { OptionGroup } from "@truedat/core/components";
 import { useIntl } from "react-intl";
 import { getStructuresFields } from "../selectors/getStructuresFields";
 
-const withFilters = (structureFields, filters) =>
-  filters
-    ? _.filter((f) =>
-        _.every.convert({ cap: false })((v, k) => v.includes(_.prop(k)(f)))(
-          filters
-        )
-      )(structureFields)
-    : structureFields;
-
-const getOptions = (structureFields, formatMessage) =>
-  _.flow(
-    _.sortBy(_.flow(_.prop("name"), _.toLower)),
-    _.groupBy("label"),
-    _.reduce.convert({ cap: false })(
-      (acc, v, k) =>
-        _.isNil(k) || k === "undefined"
-          ? [...acc, ...v]
-          : [...acc, { label: k, options: v }],
-      []
-    ),
-    _.map.convert({ cap: false })((field) =>
-      toFieldOption(field, formatMessage)
-    )
-  )(structureFields);
-
-const toFieldOption = (field, formatMessage) =>
-  _.has("options")(field)
-    ? {
-        icon: "table",
-        label: field.label,
-        options: _.map((field) => formatOption(field, formatMessage))(
-          field.options
-        ),
-      }
-    : formatOption(field, formatMessage);
-
-const formatOption = (field, formatMessage) => ({
-  key: field.data_structure_id,
-  text: field.name,
-  value: field.data_structure_id,
-  icon: formatMessage({
-    id: `field_type.icon.${field.field_type}`,
-    defaultMessage: "hashtag",
-  }),
-});
-
 export const StructureFieldsDropdown = ({
   label,
   inline,
@@ -59,13 +13,77 @@ export const StructureFieldsDropdown = ({
   structureFields,
   filters,
   value,
+  typeCastModifiers,
 }) => {
   const { formatMessage } = useIntl();
-  const onClick = ({ value }) => {
+  const onClick = ({ value, modifier }) => {
     const field = _.find(_.propEq("data_structure_id", value))(structureFields);
-    onSelectField(field);
+    onSelectField(field, modifier);
   };
 
+  const formatOption = (field) => {
+    const modifier = _.find({sourceType: field.field_type})(typeCastModifiers)
+    if(modifier){
+      return({
+        key: field.data_structure_id,
+        text: `${field.name} (${formatMessage({
+          id: `filtersGrid.field.modifier.${modifier.name}`
+        })})`,
+        modifier,
+        value: field.data_structure_id,
+        icon: formatMessage({
+          id: `field_type.icon.${field.field_type}`,
+          defaultMessage: "hashtag",
+        }),
+      })
+    }
+    
+    return({
+    key: field.data_structure_id,
+    text: field.name,
+    value: field.data_structure_id,
+    icon: formatMessage({
+      id: `field_type.icon.${field.field_type}`,
+      defaultMessage: "hashtag",
+    }),
+  })
+
+};
+  const toFieldOption = (field) =>
+    _.has("options")(field)
+      ? {
+          icon: "table",
+          label: field.label,
+          options: _.map(formatOption)(field.options),
+        }
+      : formatOption(field);
+
+  const getOptions = _.flow(
+    _.sortBy(_.flow(_.prop("name"), _.toLower)),
+    _.groupBy("label"),
+    _.reduce.convert({ cap: false })(
+      (acc, v, k) =>
+        _.isNil(k) || k === "undefined"
+          ? [...acc, ...v]
+          : [...acc, { label: k, options: v }],
+      []
+    ),
+    _.map(toFieldOption),
+  )
+
+  const castSourceTypes = _.flow(
+    _.map(({sourceType})=>sourceType),
+    _.uniq
+  )(typeCastModifiers)
+  const options = _.flow(
+    _.filter((f) =>
+        _.every.convert({ cap: false })((v, k) => v.includes(_.prop(k)(f)))(
+          filters
+        ) || castSourceTypes.includes(f.field_type)
+      ),
+    getOptions
+  )(structureFields);
+
   return (
     <OptionGroup
       inline={inline}
@@ -75,7 +93,7 @@ export const StructureFieldsDropdown = ({
       placeholder={formatMessage({
         id: "structureFields.dropdown.placeholder",
       })}
-      options={getOptions(withFilters(structureFields, filters), formatMessage)}
+      options={options}
     />
   );
 };
@@ -87,6 +105,7 @@ StructureFieldsDropdown.propTypes = {
   structureFields: PropTypes.array,
   onSelectField: PropTypes.func,
   filters: PropTypes.object,
+  typeCastModifiers: PropTypes.array,
 };
 
 const mapStateToProps = (state, props) => ({

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

@@ -52,7 +52,7 @@ describe("<ValueConditionStructure />", () => {
         data_structure_id: 2,
         field_type: "string",
         label: "bar",
-      });
+      }, undefined);
     });
   });
 });