@truedat/bg 6.6.4 → 6.6.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/bg",
-  "version": "6.6.4",
+  "version": "6.6.6",
   "description": "Truedat Web Business Glossary",
   "sideEffects": false,
   "jsnext:main": "src/index.js",
@@ -34,7 +34,7 @@
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/react": "^12.0.0",
     "@testing-library/user-event": "^13.2.1",
-    "@truedat/test": "6.6.4",
+    "@truedat/test": "6.6.6",
     "babel-jest": "^28.1.0",
     "babel-plugin-dynamic-import-node": "^2.3.3",
     "babel-plugin-lodash": "^3.3.4",
@@ -86,9 +86,9 @@
     ]
   },
   "dependencies": {
-    "@truedat/core": "6.6.4",
-    "@truedat/df": "6.6.4",
-    "@truedat/lm": "6.6.4",
+    "@truedat/core": "6.6.6",
+    "@truedat/df": "6.6.6",
+    "@truedat/lm": "6.6.6",
     "decode-uri-component": "^0.2.2",
     "file-saver": "^2.0.5",
     "moment": "^2.29.4",
@@ -111,5 +111,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 2.0.3 < 2.2"
   },
-  "gitHead": "27d89e54bdeca18ed5d4cff590058bda5ebec629"
+  "gitHead": "87a359e52cc9df990110f9dcbb39a2f3d6b6eb80"
 }

package/src/concepts/components/ConceptCompleteness.js

@@ -40,10 +40,12 @@ export const Completeness = ({
           id="concepts.props.completeness"
           defaultMessage="Completeness"
         />{" "}
-        <FormattedMessage
-          id={`i18n.messages.locale.${lang}`}
-          defaultMessage={langLocalName}
-        />
+        {langLocalName ? (
+          <FormattedMessage
+            id={`i18n.messages.locale.${lang}`}
+            defaultMessage={langLocalName}
+          />
+        ) : null}
       </Header>
       <>{}</>
       <Progress

package/src/concepts/components/ConceptEdit.js

@@ -10,68 +10,34 @@ import {
   formatLocales,
 } from "@truedat/core/services/i18nContent";
 import { useTemplate } from "@truedat/core/hooks";
-
 import { conceptAction } from "../routines";
-
 import ConceptForms from "./ConceptForms";
 const actionKey = "update";
 
 export const ConceptEdit = ({
   concept,
+  content,
   loading,
+  locales,
+  localesLoading,
   template,
   action,
   conceptAction,
   processedContent,
 }) => {
-  const { content: propContent, name: propName, domain } = concept;
-  const { locales, loading: localesLoading } = useLocales(false);
-  const [i18nConcept, setI18nConcept] = useState({});
-
-  if (_.isNil(propContent)) {
-    return null;
-  }
-
-  if (_.isEmpty(i18nConcept)) {
-    const i18n_content = concept.i18n_content || {};
-
-    const { translatable: translatableFields } =
-      splitTranslatableFields(template);
-
-    const i18nConceptInit = _.flow(
-      _.filter(({ is_enabled }) => is_enabled),
-      _.map(({ id, lang, is_default, is_required }) => {
-        const contentLang = _.get(lang)(i18n_content);
-
-        const langContent = is_default
-          ? propContent
-          : { ...translatableFields, ...contentLang?.content };
-        const langName = is_default ? propName : contentLang?.name || "";
-
-        return {
-          id,
-          lang,
-          is_default,
-          is_required,
-          name: langName,
-          content: langContent,
-        };
-      }),
-      _.keyBy("lang")
-    )(locales);
-
-    setI18nConcept(i18nConceptInit);
-  }
+  const { domain } = concept;
+
+  const [i18nConcept, setI18nConcept] = useState(content);
 
   const templateFields = splitTranslatableFields(template);
 
   const translatableKeys = _.keys(templateFields.translatable);
   const noTranslatableKeys = _.keys(templateFields.noTranslatable);
   const langs = formatLocales(locales);
-  const defaultContent = _.flow(_.find("is_default"))(i18nConcept);
 
   const handleSubmit = (e) => {
     e.preventDefault();
+    const defaultContent = _.flow(_.find("is_default"))(i18nConcept);
 
     const i18nSendConcept = _.flow(
       _.omit(defaultContent.lang),
@@ -129,8 +95,9 @@ ConceptEdit.propTypes = {
 export const ConceptEditLoader = (props) => {
   const templateName = _.prop("templateName")(props);
   const concept = _.prop("concept")(props);
-  const { domain } = concept;
+  const { content: propContent, name: propName, domain } = concept;
 
+  const { locales, loading: localesLoading } = useLocales(false);
   const { data, loading: templateLoading } = useTemplate({
     name: templateName,
     domainIds: [domain.id],
@@ -139,11 +106,39 @@ export const ConceptEditLoader = (props) => {
   const template = _.prop("template")(data);
   const processedContent = applyTemplate(template);
 
+  const i18nContent = _.flow(
+    _.filter(({ is_enabled }) => is_enabled),
+    _.map(({ id, lang, is_default, is_required }) => {
+      const contentLang = _.get(lang)(concept.i18n_content || {});
+
+      const langContent = is_default
+        ? propContent
+        : {
+            ...splitTranslatableFields(template).translatable,
+            ...contentLang?.content,
+          };
+      const langName = is_default ? propName : contentLang?.name || "";
+
+      return {
+        id,
+        lang,
+        is_default,
+        is_required,
+        name: langName,
+        content: langContent,
+      };
+    }),
+    _.keyBy("lang")
+  )(locales);
+
   return (
     <ConceptEdit
       templateLoading={templateLoading}
+      localesLoading={localesLoading}
       processedContent={processedContent}
+      content={i18nContent}
       template={template}
+      locales={locales}
       {...props}
     />
   );

package/src/concepts/components/__tests__/ConceptCompleteness.spec.js

@@ -1,7 +1,22 @@
 import React from "react";
-import { shallow } from "enzyme";
+import { render } from "@truedat/test/render";
 import { ConceptCompleteness } from "../ConceptCompleteness";
 
+jest.mock("@truedat/core/hooks", () => ({
+  useLocales: jest.fn(() => ({
+    loading: false,
+    locales: [
+      {
+        lang: "en",
+        id: 1,
+        is_default: true,
+        is_required: true,
+        is_enabled: true,
+      },
+    ],
+  })),
+}));
+
 describe("<ConceptCompleteness />", () => {
   const props = {
     concept: {
@@ -12,19 +27,19 @@ describe("<ConceptCompleteness />", () => {
             fields: [
               { cardinality: "?", name: "field1" },
               { cardinality: "1", name: "field2" },
-              { cardinality: "1", name: "field3" }
-            ]
-          }
-        ]
+              { cardinality: "1", name: "field3" },
+            ],
+          },
+        ],
       },
       content: {
-        field3: "value"
-      }
-    }
+        field3: "value",
+      },
+    },
   };
 
   it("matches the latest snapshot", () => {
-    const wrapper = shallow(<ConceptCompleteness {...props} />);
-    expect(wrapper).toMatchSnapshot();
+    const { container } = render(<ConceptCompleteness {...props} />);
+    expect(container).toMatchSnapshot();
   });
 });

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

@@ -1,7 +1,50 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`<ConceptCompleteness /> matches the latest snapshot 1`] = `
-<Segment
-  className="completeness"
-/>
+<div>
+  <div
+    class="ui segment completeness"
+  >
+    <h3
+      class="ui dividing header"
+    >
+      Completeness
+       
+    </h3>
+    <div
+      class="ui warning progress"
+      data-percent="50"
+    >
+      <div
+        class="bar"
+        style="width: 50%;"
+      >
+        <div
+          class="progress"
+        >
+          50%
+        </div>
+      </div>
+    </div>
+    <h4
+      class="ui dividing header"
+    >
+      Missing required fields
+    </h4>
+    <div
+      class="ui list"
+      role="list"
+    >
+      <div
+        class="item"
+        role="listitem"
+      >
+        <i
+          aria-hidden="true"
+          class="grey right angle fitted icon"
+        />
+      </div>
+    </div>
+  </div>
+</div>
 `;