@truedat/core 4.47.8 → 4.48.2

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## [4.48.2] 2022-07-08
+
+### Changed
+
+- [TD-4995] Support localization of template fields and fixed values
+
 ## [4.47.5] 2022-06-30
 
 ### Added

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/core",
-  "version": "4.47.8",
+  "version": "4.48.2",
   "description": "Truedat Web Core",
   "sideEffects": false,
   "jsnext:main": "src/index.js",
@@ -35,7 +35,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.8",
+    "@truedat/test": "4.47.9",
     "babel-jest": "^28.1.0",
     "babel-plugin-dynamic-import-node": "^2.3.3",
     "babel-plugin-lodash": "^3.3.4",
@@ -112,5 +112,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 0.88.2 < 2.1"
   },
-  "gitHead": "dccc0d92c419a5ee257a8e15b64c1b98d909809a"
+  "gitHead": "93133e957332713e64c97eecdf45cc283c29bd32"
 }

package/src/components/DateRangeFilter.js

@@ -1,8 +1,6 @@
 import React, { useEffect, useState } from "react";
 import moment from "moment";
 import PropTypes from "prop-types";
-import { useIntl } from "react-intl";
-import { Form, Input, Label, Dropdown } from "semantic-ui-react";
 import { DatesRangeInput } from "semantic-ui-calendar-react";
 
 const validNumber = (value) => RegExp("^\\d+$").test(value);
@@ -10,10 +8,8 @@ const validRange = (value) =>
   RegExp("^\\d{4}-\\d\\d-\\d\\d *- *\\d{4}-\\d\\d-\\d\\d$").test(value);
 
 export const DateRangeFilter = ({
-  label,
   onChange,
   defaultValues,
-  size = "small",
   name = "date",
   dateFormat = "YYYY-MM-DD",
 }) => {
@@ -47,10 +43,8 @@ export const DateRangeFilter = ({
 DateRangeFilter.propTypes = {
   dateFormat: PropTypes.string,
   defaultValues: PropTypes.object,
-  label: PropTypes.node,
   name: PropTypes.string,
   onChange: PropTypes.func,
-  size: PropTypes.string,
 };
 
 export default DateRangeFilter;

package/src/components/OptionGroup.js

@@ -4,21 +4,6 @@ import PropTypes from "prop-types";
 import { Dropdown } from "semantic-ui-react";
 import { lowerDeburr } from "../services/sort";
 
-const Group = ({ label, icon, options, onClick, value }) => (
-  <>
-    <Dropdown.Divider />
-    <Dropdown.Header icon={icon} content={label} />
-    {options.map((option, i) => (
-      <Dropdown.Item
-        key={i}
-        className="group"
-        {...option}
-        onClick={onClick}
-        selected={value == option.value}
-      />
-    ))}
-  </>
-);
 // TODO: Refactor
 export const OptionGroup = ({
   fluid,
@@ -62,10 +47,7 @@ export const OptionGroup = ({
 
   useEffect(() => {
     // eslint-disable-next-line prettier/prettier
-    _.flow(
-      toFlattenedShorthands,
-      setFlattenedOptions
-    )(availableOptions);
+    _.flow(toFlattenedShorthands, setFlattenedOptions)(availableOptions);
   }, [availableOptions]);
 
   const flatOptionMatches = (o, searchQuery) =>
@@ -94,18 +76,17 @@ export const OptionGroup = ({
     multiple && onChange(dropdown.value);
   };
 
-  const findText = () =>
-    _.flow(
-      _.reduce(
-        (acc, o) =>
-          _.has("options")(o) ? [...acc, ..._.prop("options")(o)] : [...acc, o],
-        []
-      ),
-      _.find((o) => o.value == value),
-      _.prop("text")
-    )(options);
-
-  const text = value && !query && findText();
+  const findText = _.flow(
+    _.reduce(
+      (acc, o) =>
+        _.has("options")(o) ? [...acc, ..._.prop("options")(o)] : [...acc, o],
+      []
+    ),
+    _.find((o) => o.value == value),
+    _.prop("text")
+  );
+
+  const text = value && !query ? findText(options) : "";
 
   const toFlattenedShorthands = (availableOpts) =>
     availableOpts.flatMap((option, i) => {

package/src/components/TemplateSelector.js

@@ -7,14 +7,15 @@ import { useQuery } from "@apollo/client";
 import { accentInsensitivePathOrder } from "../services/sort";
 import { TEMPLATES_QUERY } from "../api/queries";
 
-const makeOptions = _.flow(
-  _.map(({ label: text, id: value }) => ({
-    key: value,
-    value,
-    text,
-  })),
-  _.sortBy(accentInsensitivePathOrder("text"))
-);
+const makeOptions = (formatMessage) =>
+  _.flow(
+    _.map(({ label, id: value }) => ({
+      key: value,
+      value,
+      text: formatMessage({ id: `templates.${label}`, defaultMessage: label }),
+    })),
+    _.sortBy(accentInsensitivePathOrder("text"))
+  );
 
 export const TemplateSelector = ({
   clearable,
@@ -26,7 +27,7 @@ export const TemplateSelector = ({
   templates,
 }) => {
   const { formatMessage } = useIntl();
-  const options = makeOptions(templates);
+  const options = makeOptions(formatMessage)(templates);
   const hidden = loading ? false : _.size(templates) <= 1;
 
   const handleChange = (e, { value, ...data }) => {

package/src/components/UserFilters.js

@@ -16,11 +16,11 @@ export const UserFilters = ({
 }) => {
   return _.isEmpty(userFilters) ? null : (
     <div className="selectedFilters">
-      {userFilters.map((userFilter, i) => (
+      {userFilters.map((userFilter, key) => (
         <Label
           basic={selectedUserFilter == userFilter.name ? false : true}
           circular
-          key={`label${userFilter.id}.${i}`}
+          key={key}
         >
           <span
             onClick={

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

@@ -25,6 +25,7 @@ exports[`<OptionGroup /> matches the latest snapshot 1`] = `
     searchQuery=""
     selectOnBlur={true}
     selectOnNavigation={true}
+    text=""
     wrapSelection={true}
   />
 </Fragment>

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

@@ -7,7 +7,7 @@ exports[`<UserFilters /> matches the latest snapshot 1`] = `
   <Label
     basic={true}
     circular={true}
-    key="labelundefined.0"
+    key="0"
   >
     <span
       className="userFilter"
@@ -51,7 +51,7 @@ exports[`<UserFilters /> matches the latest snapshot 1`] = `
   <Label
     basic={true}
     circular={true}
-    key="labelundefined.1"
+    key="1"
   >
     <span
       className="userFilter"

package/src/services/fieldType.js

@@ -12,12 +12,14 @@ const guessType = _.flow(
 );
 
 export const getFieldType = ({ data_type_class, type }) =>
-  _.includes(data_type_class)([
-    "boolean",
-    "date",
-    "number",
-    "string",
-    "timestamp",
-  ])
+  type === "reference_dataset_field"
+    ? "string"
+    : _.includes(data_type_class)([
+        "boolean",
+        "date",
+        "number",
+        "string",
+        "timestamp",
+      ])
     ? data_type_class
     : guessType(type);