@truedat/bg 6.2.2 → 6.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/bg",
-  "version": "6.2.2",
+  "version": "6.3.0",
   "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.2.2",
+    "@truedat/test": "6.2.3",
     "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.2.2",
-    "@truedat/df": "6.2.2",
-    "@truedat/lm": "6.2.2",
+    "@truedat/core": "6.3.0",
+    "@truedat/df": "6.3.0",
+    "@truedat/lm": "6.3.0",
     "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": "c3a8148f279081b110cf549b8cffed2443f6bb80"
+  "gitHead": "fadb5776768bcbaeac2ed35e6fdbef23c0a8263a"
 }

package/src/concepts/components/ConceptCompleteness.js

@@ -28,6 +28,7 @@ const missingRequiredFields = (concept, content) => {
 export const Completeness = ({
   status,
   completeness,
+  lang,
   langLocalName,
   concept,
   content,
@@ -39,7 +40,10 @@ export const Completeness = ({
           id="concepts.props.completeness"
           defaultMessage="Completeness"
         />{" "}
-        {langLocalName || null}
+        <FormattedMessage
+          id={`i18n.messages.locale.${lang}`}
+          defaultMessage={langLocalName}
+        />
       </Header>
       <>{}</>
       <Progress
@@ -82,6 +86,7 @@ Completeness.propTypes = {
   concept: PropTypes.object,
   status: PropTypes.string,
   completeness: PropTypes.number,
+  lang: PropTypes.string,
   langLocalName: PropTypes.string,
   content: PropTypes.object,
 };
@@ -138,6 +143,7 @@ export const ConceptCompleteness = ({ concept }) => {
             key={lang}
             status={status}
             completeness={completeness}
+            lang={lang}
             langLocalName={_.size(i18nConcept) > 1 ? langLocalName : null}
             concept={concept}
             content={content}

package/src/concepts/components/ConceptCreate.js

@@ -63,6 +63,7 @@ const ConceptCreate = ({ action, conceptActionLoading, conceptAction }) => {
 
     const i18nSendConcept = _.flow(
       _.omit(defaultContent.lang),
+      _.omitBy(({ name, is_required }) => _.isEmpty(name) && !is_required),
       _.mapValues((langConcept) =>
         _.flow(_.pick(["name", "content"]), ({ name, content }) => {
           return { name, content: _.pick(translatableKeys)(content) };

package/src/concepts/components/ConceptDetails.js

@@ -52,13 +52,15 @@ export const ConceptDetails = ({ concept }) => {
         content: langContent,
       };
     }),
+    _.filter(({ content }) => !_.isEmpty(content)),
     _.orderBy(["isDefault", "isRequired", "lang"], ["desc", "desc", "asc"]),
     _.keyBy("lang")
   )(locales);
 
   return (
     <Segment attached="bottom">
-      {_.size(i18nConcept) > 1 ? (
+      {!_.includes(concept.status)(["published", "versioned"]) &&
+      _.size(i18nConcept) > 1 ? (
         <ButtonGroup floated="right">
           {_.flow(
             _.map(({ lang, content }) => {
@@ -77,7 +79,7 @@ export const ConceptDetails = ({ concept }) => {
       ) : null}
       <DynamicFormViewer
         template={concept.template}
-        content={i18nConcept[selectedLang]?.content}
+        content={i18nConcept[selectedLang]?.content || concept.content}
       />
     </Segment>
   );

package/src/concepts/components/ConceptEdit.js

@@ -73,6 +73,7 @@ export const ConceptEdit = ({
 
     const i18nSendConcept = _.flow(
       _.omit(defaultContent.lang),
+      _.omitBy(({ name, is_required }) => _.isEmpty(name) && !is_required),
       _.mapValues((langConcept) =>
         _.flow(_.pick(["name", "content"]), ({ name, content }) => {
           return { name, content: _.pick(translatableKeys)(content) };

package/src/concepts/components/ConceptForms.js

@@ -65,7 +65,11 @@ const ConceptForms = ({
   const validDomain = () => _.isFinite(domainId);
 
   const validNames = () =>
-    _.flow(_.map("name"), _.every(isNonEmptyString))(i18nConcept);
+    _.flow(
+      _.filter("is_required"),
+      _.map("name"),
+      _.every(isNonEmptyString)
+    )(i18nConcept);
 
   const validTemplate = () =>
     _.isObject(template) && isNonEmptyString(template?.name);

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

@@ -1,4 +1,4 @@
-import React from "react";
+import React, { Suspense } from "react";
 import { waitFor } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
 import { render } from "@truedat/test/render";
@@ -44,11 +44,9 @@ const props = {
   onChangeConceptContent: jest.fn(),
 };
 
-// const state = {
-//   conceptActions: { create: {} },
-//   conceptActionLoading: "",
-//   domains: [{ id: 1, name: "domain1" }],
-// };
+const state = {
+  // domains: [{ id: 1, name: "domain1" }],
+};
 const templateVariables = { scope: "bg", domainIds: [1] };
 const domainVariables = { action: "createBusinessConcept" };
 
@@ -59,63 +57,23 @@ describe("<ConceptForm />", () => {
         multipleTemplatesMock(templateVariables),
         domainsMock(domainVariables),
       ],
-      // state,
+      state,
       fallback: "lazy",
     };
 
     it("matches the latest snapshot", async () => {
       const { container, queryByText } = render(
-        <ConceptForm {...props} />,
+        <Suspense fallback={null}>
+          <ConceptForm {...props} />
+        </Suspense>,
         renderOpts
       );
       await waitFor(() => expect(queryByText(/lazy/i)).not.toBeInTheDocument());
       await waitFor(() =>
         expect(queryByText(/loading/i)).not.toBeInTheDocument()
       );
-      // await waitFor(() => expect(queryByText(/fooDomain/)).toBeInTheDocument());
+      await waitFor(() => expect(queryByText(/bazDomain/)).toBeInTheDocument());
       expect(container).toMatchSnapshot();
     });
-
-    // it("renders dynamic fields when template is selected", async () => {
-    //   const { findByText, getByText, queryByText, getAllByRole } = render(
-    //     <ConceptForm />,
-    //     renderOpts
-    //   );
-    //   await waitFor(() => expect(queryByText(/lazy/i)).not.toBeInTheDocument());
-    //   await waitFor(() => expect(queryByText(/fooDomain/)).toBeInTheDocument());
-    //   userEvent.click(await findByText("fooDomain"));
-    //   userEvent.type(getAllByRole("textbox")[1], "name");
-    //   userEvent.click(await findByText("template1"));
-    //   expect(getByText("field1")).toBeInTheDocument();
-    // });
   });
-
-  // describe("with a single template", () => {
-  //   const renderOpts = {
-  //     mocks: [singleTemplateMock(templateVariables)],
-  //     state,
-  //     fallback: "lazy",
-  //   };
-
-  // it("matches the latest snapshot", async () => {
-  //   const { container, queryByText } = render(<ConceptForm />, renderOpts);
-  //   await waitFor(() => expect(queryByText(/lazy/i)).not.toBeInTheDocument());
-  //   await waitFor(() =>
-  //     expect(queryByText(/loading/i)).not.toBeInTheDocument()
-  //   );
-  //   await waitFor(() =>
-  //     expect(queryByText(/fooDomain/)).not.toBeInTheDocument()
-  //   );
-  //   expect(container).toMatchSnapshot();
-  // });
-
-  // it("contains no <TemplateSelector />", async () => {
-  //   const { queryByText } = render(<ConceptForm />, renderOpts);
-  //   await waitFor(() => expect(queryByText(/lazy/i)).not.toBeInTheDocument());
-  //   await waitFor(() =>
-  //     expect(queryByText(/loading/i)).not.toBeInTheDocument()
-  //   );
-  //   expect(queryByText("template1")).not.toBeInTheDocument();
-  // });
-  // });
 });