@truedat/bg 6.6.5 → 6.7.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/bg",
-  "version": "6.6.5",
+  "version": "6.7.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.6.5",
+    "@truedat/test": "6.7.0",
     "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.5",
-    "@truedat/df": "6.6.5",
-    "@truedat/lm": "6.6.5",
+    "@truedat/core": "6.7.0",
+    "@truedat/df": "6.7.0",
+    "@truedat/lm": "6.7.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": "875dcb0716cc64d30974106dc64c861d4306fcd6"
+  "gitHead": "6a4284b126a917e396160f1b36c03ca0faf6bac5"
 }

package/src/concepts/components/ConceptCompleteness.js

@@ -14,7 +14,7 @@ const missingRequiredFields = (concept, content) => {
     _.flatMap(({ fields }) =>
       _.filter((field) => {
         const name = field?.name;
-        const value = _.prop(name)(content);
+        const value = _.prop("value")(_.prop(name)(content));
         return (
           !_.isNumber(value) &&
           isRequired(field, content) &&
@@ -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/ConceptCreate.js

@@ -26,17 +26,17 @@ const ConceptCreate = ({ conceptActionLoading, conceptAction }) => {
   useEffect(() => {
     const templateFields = splitTranslatableFields(template);
 
-    setTranslatableKeys(_.keys(templateFields.translatable));
-    setNoTranslatableKeys(_.keys(templateFields.noTranslatable));
+    const translatableFields = _.keys(templateFields.translatable);
+    const noTranslatableFields = _.keys(templateFields.noTranslatable);
+
+    setTranslatableKeys(translatableFields);
+    setNoTranslatableKeys(noTranslatableFields);
 
     const updateI18nConcept = _.flow(
       _.map((langContent) => ({
         ...langContent,
         content: langContent.is_default
-          ? {
-              ...templateFields.translatable,
-              ...templateFields.noTranslatable,
-            }
+          ? { ...langContent.content }
           : { ...templateFields.translatable },
       })),
       _.keyBy("lang")

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/ConceptForm.js

@@ -79,8 +79,15 @@ const ConceptForm = ({
     onChangeConceptContent(concept.lang, content);
 
   const applySuggestions = (suggestions) => {
+    const suggestionContent = _.flow(
+      Object.entries,
+      _.reduce(
+        (acc, [key, value]) => _.set(key, { value, origin: "ai" })(acc),
+        {}
+      )
+    )(suggestions);
     onChangeConceptContent(concept.lang, {
-      content: { ...concept?.content, ...suggestions },
+      content: { ...concept?.content, ...suggestionContent },
     });
   };
 
@@ -165,7 +172,7 @@ ConceptForm.propTypes = {
   onChangeTemplate: PropTypes.func,
   onChangeConceptContent: PropTypes.func,
   actionKey: PropTypes.string,
-  conceptActionLoading: PropTypes.string,
+  loading: PropTypes.bool,
 };
 
 export default ConceptForm;

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

@@ -101,7 +101,7 @@ describe("<ConceptEdit />", () => {
     applyTemplate: jest.fn(),
   };
   it("matches the latest snapshot", async () => {
-    const { container, queryByText, debug } = render(
+    const { container, queryByText } = render(
       <Suspense fallback={null}>
         <ConceptEdit {...props} />
       </Suspense>,

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: "es",
+        id: 1,
+        is_default: true,
+        is_required: true,
+        is_enabled: true,
+      },
+    ],
+  })),
+}));
+
 describe("<ConceptCompleteness />", () => {
   const props = {
     concept: {
@@ -10,21 +25,21 @@ describe("<ConceptCompleteness />", () => {
         content: [
           {
             fields: [
-              { cardinality: "?", name: "field1" },
-              { cardinality: "1", name: "field2" },
-              { cardinality: "1", name: "field3" }
-            ]
-          }
-        ]
+              { cardinality: "?", name: "field1", label: "label1" },
+              { cardinality: "1", name: "field2", label: "label2" },
+              { cardinality: "1", name: "field3", label: "label3" },
+            ],
+          },
+        ],
       },
       content: {
-        field3: "value"
-      }
-    }
+        field3: { value: "value", origin: "user" },
+      },
+    },
   };
 
   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__/ConceptDetails.spec.js

@@ -1,7 +1,26 @@
-import React, { Suspense } from "react";
+import React from "react";
 import { render } from "@truedat/test/render";
 import { ConceptDetails } from "../ConceptDetails";
 
+jest.mock("@truedat/core/hooks", () => ({
+  useLocales: jest.fn(() => ({
+    loading: false,
+    locales: [
+      {
+        lang: "en",
+        id: 1,
+        is_default: true,
+        is_required: true,
+        is_enabled: true,
+      },
+    ],
+  })),
+}));
+
+const renderOpts = {
+  fallback: <div>Loading</div>,
+};
+
 describe("<ConceptDetails />", () => {
   const props = {
     concept: {
@@ -9,17 +28,27 @@ describe("<ConceptDetails />", () => {
       type: "type",
       status: "draft",
       template: {
-        content: [{ name: "field", value: "value1" }],
+        content: [
+          {
+            name: "foo_group",
+            fields: [
+              { name: "field", label: "field_label", values: ["value1"] },
+            ],
+          },
+        ],
+      },
+      content: {
+        field: { value: "value1", origin: "user" },
       },
     },
   };
 
-  it("matches the latest snapshot", () => {
-    const { container } = render(
-      <Suspense fallback={null}>
-        <ConceptDetails {...props} />
-      </Suspense>
-    );
+  it("matches the latest snapshot", async () => {
+    const { container, findByText } = render(<ConceptDetails {...props} />, {
+      ...renderOpts,
+    });
+
+    await findByText("field_label");
     expect(container).toMatchSnapshot();
   });
 });

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

@@ -86,7 +86,10 @@ describe("<ConceptsBulkUpdate />", () => {
     await waitFor(() => {
       expect(dispatch).toHaveBeenLastCalledWith(
         bulkUpdate({
-          updateAttributes: { content: { field1: "abc123456" }, domain_id: 1 },
+          updateAttributes: {
+            content: { field1: { value: "abc123456", origin: "user" } },
+            domain_id: 1,
+          },
           searchParams: {},
         })
       );

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

@@ -80,10 +80,10 @@ exports[`<ConceptEdit /> matches the latest snapshot 1`] = `
                 <div
                   aria-atomic="true"
                   aria-live="polite"
-                  class="divider text"
+                  class="divider default text"
                   role="alert"
                 >
-                  xyz_user
+                  Select one...
                 </div>
                 <i
                   aria-hidden="true"
@@ -96,8 +96,8 @@ exports[`<ConceptEdit /> matches the latest snapshot 1`] = `
                 >
                   <div
                     aria-checked="false"
-                    aria-selected="false"
-                    class="item"
+                    aria-selected="true"
+                    class="selected item"
                     role="option"
                     style="pointer-events: all;"
                   >
@@ -121,9 +121,9 @@ exports[`<ConceptEdit /> matches the latest snapshot 1`] = `
                     </span>
                   </div>
                   <div
-                    aria-checked="true"
-                    aria-selected="true"
-                    class="active selected item"
+                    aria-checked="false"
+                    aria-selected="false"
+                    class="item"
                     role="option"
                     style="pointer-events: all;"
                   >

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

@@ -1,7 +1,51 @@
 // 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"
+        />
+        label2
+      </div>
+    </div>
+  </div>
+</div>
 `;

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

@@ -4,7 +4,39 @@ exports[`<ConceptDetails /> matches the latest snapshot 1`] = `
 <div>
   <div
     class="ui bottom attached segment"
-    style="display: none;"
-  />
+    style=""
+  >
+    <div
+      class="ui horizontal divider"
+    >
+      <h3>
+        foo_group
+      </h3>
+    </div>
+    <div
+      class="ui big very relaxed list"
+      role="list"
+    >
+      <div
+        class="item"
+        role="listitem"
+      >
+        <div
+          class="header dynamic-field-header"
+        >
+          field_label
+        </div>
+        <div
+          class="description"
+        >
+          <div
+            class="default-value"
+          >
+            value1
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
 </div>
 `;