@truedat/bg 4.48.0 → 4.48.4

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## [4.48.4] 2022-07-11
+
+
+### Changed
+
+- [TD-4995] Removed `in domain` suffix from concept header
+
+## [4.48.2] 2022-07-08
+
+### Changed
+
+- [TD-4995] Support localization of template fields and fixed values
+
 ## [4.47.1] 2022-06-22
 
 ### Fixed

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/bg",
-  "version": "4.48.0",
+  "version": "4.48.4",
   "description": "Truedat Web Business Glossary",
   "sideEffects": false,
   "jsnext:main": "src/index.js",
@@ -86,8 +86,8 @@
     ]
   },
   "dependencies": {
-    "@truedat/core": "4.48.0",
-    "@truedat/df": "4.48.0",
+    "@truedat/core": "4.48.4",
+    "@truedat/df": "4.48.4",
     "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": "c4587d045fa6c9028082bdfbcfb35e4383f117ed"
+  "gitHead": "5e50a034469bf3ad8e02a64eb875ad2b710b6b03"
 }

package/src/concepts/components/ConceptCompleteness.js

@@ -12,19 +12,18 @@ export const ConceptCompleteness = ({ concept }) => {
   const status = _.get("status")(concept);
 
   const missingRequiredFields = _.flow(
-    _.get("template.content"),
-    _.map(({ fields }) =>
+    _.path("template.content"),
+    _.flatMap(({ fields }) =>
       _.filter((field) => {
         const name = field?.name;
-        const value = _.get(name)(content);
+        const value = _.prop(name)(content);
         return (
           !_.isNumber(value) &&
           isRequired(field, content) &&
           (_.isNil(value) || _.isEmpty(value))
         );
       })(fields)
-    ),
-    _.flatten
+    )
   )(concept);
 
   return (
@@ -56,7 +55,12 @@ export const ConceptCompleteness = ({ concept }) => {
               {_.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>

package/src/concepts/components/ConceptHeader.js

@@ -2,7 +2,7 @@ import _ from "lodash/fp";
 import React from "react";
 import PropTypes from "prop-types";
 import { connect } from "react-redux";
-import { useIntl } from "react-intl";
+import { FormattedMessage, useIntl } from "react-intl";
 import { Grid, Header, Icon } from "semantic-ui-react";
 import { linkTo } from "@truedat/core/routes";
 import ShareLinkPopup from "@truedat/audit/components/ShareLinkPopup";
@@ -27,6 +27,7 @@ export const ConceptHeader = ({
   const description = concept?.description;
   const shareUrl = `${location.protocol}//${location.host}${path}`;
   const shareTitle = formatMessage({ id: "concepts.share.title" });
+  const templateLabel = template?.label;
 
   return (
     <Grid>
@@ -36,11 +37,10 @@ export const ConceptHeader = ({
           <Header.Content>
             {concept.name}
             <Header.Subheader>
-              {template.label}{" "}
-              {domain &&
-                `${formatMessage({ id: "concept.header.message.in" })} ${
-                  domain.name
-                }`}
+              <FormattedMessage
+                id={`templates.${templateLabel}`}
+                defaultMessage={templateLabel}
+              />
             </Header.Subheader>
           </Header.Content>
         </Header>

package/src/concepts/components/ConceptSummary.js

@@ -4,19 +4,14 @@ 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="concept-summary__content-bold">{children}</div>
-);
-
-const FieldValue = ({ field, value, color, in_progress }) => (
+const FieldValue = ({ field, value, color }) => (
   <List.Item className="concept-summary">
     <List.Content className="concept-summary__content">
-      <Bold>
+      <div className="concept-summary__content-bold">
         <FormattedMessage id={`concept.props.${field}`} />:
-      </Bold>
+      </div>
       <Label color={color}>
         {value || <Icon name="ellipsis vertical" color="grey" />}
       </Label>
@@ -28,17 +23,15 @@ FieldValue.propTypes = {
   field: PropTypes.any,
   value: PropTypes.any,
   color: PropTypes.any,
-  in_progress: PropTypes.bool,
 };
 
 export const ConceptSummary = ({
-  concept: { status, version, last_change_at, last_change_user, in_progress },
+  concept: { status, version, last_change_at, last_change_user },
 }) => (
   <Segment>
     <Header as="h3" dividing>
       <FormattedMessage id="concepts.summary" defaultMessage="Resumen" />
     </Header>
-
     <FieldValue
       field="status"
       value={
@@ -48,7 +41,6 @@ export const ConceptSummary = ({
         />
       }
       color={mapStatusColor[status]}
-      in_progress={in_progress}
     />
     <FieldValue field="version" value={version} />
     <FieldValue
@@ -68,9 +60,6 @@ ConceptSummary.propTypes = {
   concept: PropTypes.object,
 };
 
-const mapStateToProps = (state) => ({
-  concept: state.concept,
-  fieldValues: getFieldValues(state),
-});
+const mapStateToProps = ({ concept }) => ({ concept });
 
 export default connect(mapStateToProps)(ConceptSummary);

package/src/concepts/components/__tests__/__snapshots__/ConceptHeader.spec.js.snap

@@ -16,9 +16,10 @@ exports[`<ConceptHeader /> matches the latest snapshot 1`] = `
       <HeaderContent>
         Concept1
         <HeaderSubheader>
-          Template1
-           
-          concept.header.message.in Domain name
+          <MemoizedFormattedMessage
+            defaultMessage="Template1"
+            id="templates.Template1"
+          />
         </HeaderSubheader>
       </HeaderContent>
     </Header>

package/src/concepts/selectors/index.js

@@ -4,7 +4,6 @@ export { getConceptDomainPath } from "./getConceptDomainPath";
 export { getConceptSelectedFilters } from "./getConceptSelectedFilters";
 export { getConceptSelectedFilterActiveValues } from "./getConceptSelectedFilterActiveValues";
 export { getConceptSelectedFilterValues } from "./getConceptSelectedFilterValues";
-export { getFieldValues } from "./getFieldValues";
 export { getParsedEvents } from "./getParsedEvents";
 export { getPreviousConceptQuery } from "./getPreviousConceptQuery";
 export { getTemplateFields } from "./getTemplateFields";

package/src/messages/en.js

@@ -46,7 +46,6 @@ export default {
   "concept.events.relation_created": "added a link to a structure",
   "concept.events.relation_deleted": "removed a link to a structure",
   "concept.events.relation_deprecated": "deprecated link to a structure",
-  "concept.header.message.in": "in",
   "concept.props.in_progress": "In progress",
   "concept.props.last_update_at": "Update",
   "concept.props.last_update_by": "User",

package/src/messages/es.js

@@ -48,7 +48,6 @@ export default {
   "concept.events.relation_created": "Nueva relación",
   "concept.events.relation_deleted": "Relación eliminada",
   "concept.events.relation_deprecated": "Relación deprecada",
-  "concept.header.message.in": "en",
   "concept.props.in_progress": "Sin completar",
   "concept.props.last_update_at": "Modificación",
   "concept.props.last_update_by": "Usuario",

package/src/concepts/selectors/getFieldValues.js

@@ -1,32 +0,0 @@
-import _ from "lodash/fp";
-import { createSelector } from "reselect";
-import { getTemplateGroups } from "./getTemplateGroups";
-import { getConcept } from "./getConcept";
-
-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, getConcept],
-  (groups, concept) =>
-    groups && concept && concept.content
-      ? groups.map(([name, fields]) => [
-          name,
-          fields.map(f => ({
-            field: f.label,
-            type: f.type,
-            widget: f.widget,
-            value: concept.content[f.name],
-            hidden:
-              _.has("depends.to_be")(f) &&
-              _.has("depends.on")(f) &&
-              !checkDependency(f, _.prop("content")(concept))
-          }))
-        ])
-      : []
-);