@truedat/ie 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.46.10] 2022-06-20
 
 ### Fixed

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/ie",
-  "version": "4.47.8",
+  "version": "4.48.2",
   "description": "Truedat Web Ingests",
   "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.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",
@@ -87,8 +87,8 @@
     ]
   },
   "dependencies": {
-    "@truedat/core": "4.47.8",
-    "@truedat/df": "4.47.8",
+    "@truedat/core": "4.48.2",
+    "@truedat/df": "4.48.2",
     "file-saver": "^2.0.5",
     "moment": "^2.24.0",
     "path-to-regexp": "^1.7.0",
@@ -107,5 +107,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 0.88.2 < 2.1"
   },
-  "gitHead": "dccc0d92c419a5ee257a8e15b64c1b98d909809a"
+  "gitHead": "93133e957332713e64c97eecdf45cc283c29bd32"
 }

package/src/ingests/components/IngestCompleteness.js

@@ -37,7 +37,12 @@ export const IngestCompleteness = ({ ingest }) => {
           {_.map.convert({ cap: false })(({ label }, i) => (
             <List.Item key={i}>
               <Icon name="right angle" color="grey" fitted />
-              {label}
+              {label ? (
+                <FormattedMessage
+                  id={`fields.${label}`}
+                  defaultMessage={label}
+                />
+              ) : null}
             </List.Item>
           ))(missingRequiredFields)}
         </List>
@@ -47,7 +52,7 @@ export const IngestCompleteness = ({ ingest }) => {
 };
 
 IngestCompleteness.propTypes = {
-  ingest: PropTypes.object
+  ingest: PropTypes.object,
 };
 
 const mapStateToProps = _.pick(["ingest"]);

package/src/ingests/components/IngestHeader.js

@@ -1,5 +1,6 @@
 import React from "react";
 import PropTypes from "prop-types";
+import { FormattedMessage } from "react-intl";
 import { connect } from "react-redux";
 import { Header, Icon } from "semantic-ui-react";
 
@@ -9,7 +10,11 @@ export const IngestHeader = ({ ingest, domain, template }) => (
     <Header.Content>
       {ingest.name}
       <Header.Subheader>
-        {template.label} {domain && `in ${domain.name}`}
+        <FormattedMessage
+          id={`templates.${template.label}`}
+          defaultMessage={template.label}
+        />
+        {domain ? ` in ${domain.name}` : null}
       </Header.Subheader>
     </Header.Content>
   </Header>

package/src/ingests/components/IngestSummary.js

@@ -4,25 +4,20 @@ import PropTypes from "prop-types";
 import { connect } from "react-redux";
 import { Header, Label, List, Icon, Segment } from "semantic-ui-react";
 import { FormattedMessage } from "react-intl";
-import { getFieldValues } from "../selectors";
 import { mapStatusColor } from "../constants/mappings";
 
-const Bold = ({ children }) => (
-  <div className="ingest-summary__content-bold">{children}</div>
-);
-
 const FieldValue = ({ field, value, color, in_progress }) => (
   <List.Item className="ingest-summary">
     <List.Content className="ingest-summary__content">
-      <Bold>
+      <div className="ingest-summary__content-bold">
         <FormattedMessage id={`ingest.props.${field}`} />:
-      </Bold>
+      </div>
       <Label color={color}>
         {value || <Icon name="ellipsis vertical" color="grey" />}
       </Label>
       {in_progress && (
         <Label color="red">
-          {<FormattedMessage id={`ingest.props.in_progress`} />}
+          <FormattedMessage id="ingest.props.in_progress" />
         </Label>
       )}
     </List.Content>
@@ -33,11 +28,11 @@ FieldValue.propTypes = {
   field: PropTypes.any,
   value: PropTypes.any,
   color: PropTypes.any,
-  in_progress: PropTypes.bool
+  in_progress: PropTypes.bool,
 };
 
 export const IngestSummary = ({
-  ingest: { status, version, last_change_at, last_change_user, in_progress }
+  ingest: { status, version, last_change_at, last_change_user, in_progress },
 }) => (
   <Segment>
     <Header as="h3" dividing>
@@ -63,12 +58,9 @@ export const IngestSummary = ({
 );
 
 IngestSummary.propTypes = {
-  ingest: PropTypes.object
+  ingest: PropTypes.object,
 };
 
-const mapStateToProps = state => ({
-  ingest: state.ingest,
-  fieldValues: getFieldValues(state)
-});
+const mapStateToProps = ({ ingest }) => ({ ingest });
 
 export default connect(mapStateToProps)(IngestSummary);

package/src/ingests/components/__tests__/__snapshots__/IngestHeader.spec.js.snap

@@ -12,9 +12,11 @@ exports[`<IngestHeader /> matches the latest snapshot 1`] = `
   <HeaderContent>
     Ingest1
     <HeaderSubheader>
-      Template1
-       
-      in Domain name
+      <MemoizedFormattedMessage
+        defaultMessage="Template1"
+        id="templates.Template1"
+      />
+       in Domain name
     </HeaderSubheader>
   </HeaderContent>
 </Header>

package/src/ingests/selectors/index.js

@@ -1,4 +1,3 @@
-export { getFieldValues } from "./getFieldValues";
 export { getParsedEvents } from "./getParsedEvents";
 export { getTemplateFields } from "./getTemplateFields";
 export { getTemplateGroups } from "./getTemplateGroups";

package/src/ingests/selectors/getFieldValues.js

@@ -1,32 +0,0 @@
-import _ from "lodash/fp";
-import { createSelector } from "reselect";
-import { getTemplateGroups } from "./getTemplateGroups";
-import { getIngest } from "./getIngest";
-
-const checkDependency = (field, content) => {
-  const on = _.prop(_.path("depends.on")(field))(content);
-  const to_be = _.path("depends.to_be")(field);
-  return _.isArray(on)
-    ? _.some(d => to_be.includes(d))(on)
-    : to_be.includes(on);
-};
-
-export const getFieldValues = createSelector(
-  [getTemplateGroups, getIngest],
-  (groups, ingest) =>
-    groups && ingest && ingest.content
-      ? groups.map(([name, fields]) => [
-          name,
-          fields.map(f => ({
-            field: f.label,
-            type: f.type,
-            widget: f.widget,
-            value: ingest.content[f.name],
-            hidden:
-              _.has("depends.to_be")(f) &&
-              _.has("depends.on")(f) &&
-              !checkDependency(f, _.prop("content")(ingest))
-          }))
-        ])
-      : []
-);