@truedat/bg 6.6.3 → 6.6.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/bg",
-  "version": "6.6.3",
+  "version": "6.6.5",
   "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.3",
+    "@truedat/test": "6.6.5",
     "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.3",
-    "@truedat/df": "6.6.3",
-    "@truedat/lm": "6.6.3",
+    "@truedat/core": "6.6.5",
+    "@truedat/df": "6.6.5",
+    "@truedat/lm": "6.6.5",
     "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": "1cb86ec68afdf2e6fd018a748bc94c8e598d0e77"
+  "gitHead": "875dcb0716cc64d30974106dc64c861d4306fcd6"
 }

package/src/concepts/components/ConceptEdit.js

@@ -9,6 +9,8 @@ import {
   splitTranslatableFields,
   formatLocales,
 } from "@truedat/core/services/i18nContent";
+import { useTemplate } from "@truedat/core/hooks";
+
 import { conceptAction } from "../routines";
 
 import ConceptForms from "./ConceptForms";
@@ -20,7 +22,7 @@ export const ConceptEdit = ({
   template,
   action,
   conceptAction,
-  applyTemplate,
+  processedContent,
 }) => {
   const { content: propContent, name: propName, domain } = concept;
   const { locales, loading: localesLoading } = useLocales(false);
@@ -81,7 +83,7 @@ export const ConceptEdit = ({
       )
     )(i18nConcept);
 
-    const newContent = applyTemplate(defaultContent.content, domain?.id);
+    const newContent = processedContent(defaultContent.content, domain?.id);
 
     const business_concept_version = {
       name: defaultContent.name,
@@ -118,42 +120,47 @@ export const ConceptEdit = ({
 
 ConceptEdit.propTypes = {
   action: PropTypes.object,
-  applyTemplate: PropTypes.func,
   concept: PropTypes.object,
   conceptAction: PropTypes.func.isRequired,
-  intl: PropTypes.object,
+  templateName: PropTypes.string,
   loading: PropTypes.bool,
-  selectDomain: PropTypes.func,
-  selectTemplate: PropTypes.func,
-  template: PropTypes.object,
 };
 
-const mapStateToProps = ({
-  concept,
-  conceptActionLoading,
-  conceptActions,
-  templateLoading,
-  templates,
-}) => {
+export const ConceptEditLoader = (props) => {
+  const templateName = _.prop("templateName")(props);
+  const concept = _.prop("concept")(props);
+  const { domain } = concept;
+
+  const { data, loading: templateLoading } = useTemplate({
+    name: templateName,
+    domainIds: [domain.id],
+  });
+
+  const template = _.prop("template")(data);
+  const processedContent = applyTemplate(template);
+
+  return (
+    <ConceptEdit
+      templateLoading={templateLoading}
+      processedContent={processedContent}
+      template={template}
+      {...props}
+    />
+  );
+};
+
+const mapStateToProps = ({ concept, conceptActionLoading, conceptActions }) => {
   const action = _.prop(actionKey)(conceptActions);
-  const loading =
-    templateLoading ||
-    (action && action.href && conceptActionLoading === action.href);
-
-  const template =
-    templates && concept && concept.type
-      ? _.flow(_.find(_.propEq("name", concept.type)))(templates)
-      : null;
+  const loading = action && action.href && conceptActionLoading === action.href;
+
   return {
     action,
     concept,
     loading,
-    template,
-    loading,
-    applyTemplate: applyTemplate(template),
+    templateName: concept.type,
   };
 };
 
 export default compose(connect(mapStateToProps, { conceptAction }))(
-  ConceptEdit
+  ConceptEditLoader
 );

package/src/concepts/components/ConceptForms.js

@@ -95,7 +95,7 @@ const ConceptForms = ({
           domainId={domainId}
           template={template}
           concept={i18nConcept[singleLang]}
-          defaultContent={i18nConcept[singleLang]}
+          defaultContent={i18nConcept[singleLang].content}
           noTranslatableFields={[]}
           onChangeDomainId={handleDomainChange}
           onChangeName={handleI18nNameChange}
@@ -188,7 +188,7 @@ ConceptForms.propTypes = {
   template: PropTypes.object,
   i18nConcept: PropTypes.object,
   loading: PropTypes.bool,
-  langs: PropTypes.array,
+  langs: PropTypes.object,
   noTranslatableFields: PropTypes.array,
   translatableFields: PropTypes.array,
   setI18nConcept: PropTypes.func,

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

@@ -0,0 +1,113 @@
+import React, { Suspense } from "react";
+import { render } from "@truedat/test/render";
+import { waitFor } from "@testing-library/react";
+import ConceptEdit from "../ConceptEdit";
+
+const template1 = {
+  id: 1,
+  name: "template1",
+  label: "template1",
+  scope: "foo",
+  content: [
+    {
+      fields: [
+        {
+          name: "user",
+          type: "user",
+          label: "user",
+          widget: "dropdown",
+          values: {
+            processed_users: ["xyz_user", "foo_user"],
+            role_users: "role_users",
+          },
+        },
+      ],
+    },
+  ],
+};
+
+jest.mock("@truedat/core/hooks", () => ({
+  useLocales: jest.fn(() => ({
+    loading: false,
+    locales: [
+      {
+        local_name: "es",
+        name: "es",
+        lang: "es",
+        id: 1,
+        is_default: true,
+        is_enabled: true,
+        is_required: true,
+      },
+    ],
+  })),
+  useTemplate: jest.fn(() => ({
+    loading: false,
+    data: { template: template1 },
+  })),
+}));
+
+jest.mock("@truedat/bg/concepts/hooks/useConcepts", () => {
+  const originalModule = jest.requireActual(
+    "@truedat/bg/concepts/hooks/useConcepts"
+  );
+
+  return {
+    __esModule: true,
+    ...originalModule,
+    useConceptFilters: () => ({
+      trigger: () => ({
+        then: (callback) =>
+          callback({
+            data: { data: {} },
+          }),
+      }),
+    }),
+    useConceptVersionsSearch: () => ({
+      trigger: () => ({
+        then: (callback) =>
+          callback({
+            data: { data: [] },
+            headers: {},
+          }),
+      }),
+    }),
+  };
+});
+
+const concept = {
+  _actions: { can_create_structure_link: true },
+  id: 1,
+  business_concept_id: 1111,
+  name: "concept_name",
+  domain: { id: 1, name: "bar" },
+  status: "draft",
+  content: { user: "xyz_user" },
+  links: [
+    {
+      id: 745,
+      resource_id: 4569480,
+      resource_type: "data_structure",
+    },
+  ],
+};
+
+const renderOpts = {
+  state: { concept },
+};
+
+describe("<ConceptEdit />", () => {
+  const props = {
+    applyTemplate: jest.fn(),
+  };
+  it("matches the latest snapshot", async () => {
+    const { container, queryByText, debug } = render(
+      <Suspense fallback={null}>
+        <ConceptEdit {...props} />
+      </Suspense>,
+      renderOpts
+    );
+    await waitFor(() => expect(queryByText(/foo_user/i)).toBeInTheDocument());
+    expect(container).toMatchSnapshot();
+  });
+});

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

@@ -0,0 +1,172 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`<ConceptEdit /> matches the latest snapshot 1`] = `
+<div>
+  <div
+    class="ui segment ui text container"
+    style=""
+  >
+    <h2
+      class="ui header"
+    >
+      <i
+        aria-hidden="true"
+        class="book icon"
+      />
+      <div
+        class="content"
+      >
+        Edit Business Concept
+      </div>
+    </h2>
+    <form
+      class="ui form"
+    >
+      <div
+        class="required field"
+      >
+        <label>
+          Term
+        </label>
+        <div
+          class="field"
+        >
+          <div
+            class="ui input"
+          >
+            <input
+              name="name"
+              type="text"
+              value="concept_name"
+            />
+          </div>
+        </div>
+      </div>
+      <h3
+        class="ui header"
+      >
+        Template fields (only required for publishing)
+      </h3>
+      <div
+        class="ui segment"
+      >
+        <div
+          class="field"
+          data-testid="form-field"
+        >
+          <label>
+            user
+          </label>
+          <div
+            class="dimmable"
+          >
+            <div
+              class="field"
+            >
+              <div
+                aria-expanded="false"
+                class="ui fluid search selection dropdown"
+                name="user"
+                role="combobox"
+              >
+                <input
+                  aria-autocomplete="list"
+                  autocomplete="off"
+                  class="search"
+                  tabindex="0"
+                  type="text"
+                  value=""
+                />
+                <div
+                  aria-atomic="true"
+                  aria-live="polite"
+                  class="divider text"
+                  role="alert"
+                >
+                  xyz_user
+                </div>
+                <i
+                  aria-hidden="true"
+                  class="dropdown icon"
+                />
+                <div
+                  aria-multiselectable="false"
+                  class="menu transition"
+                  role="listbox"
+                >
+                  <div
+                    aria-checked="false"
+                    aria-selected="false"
+                    class="item"
+                    role="option"
+                    style="pointer-events: all;"
+                  >
+                    <span
+                      class="text"
+                    >
+                      No selection
+                    </span>
+                  </div>
+                  <div
+                    aria-checked="false"
+                    aria-selected="false"
+                    class="item"
+                    role="option"
+                    style="pointer-events: all;"
+                  >
+                    <span
+                      class="text"
+                    >
+                      foo_user
+                    </span>
+                  </div>
+                  <div
+                    aria-checked="true"
+                    aria-selected="true"
+                    class="active selected item"
+                    role="option"
+                    style="pointer-events: all;"
+                  >
+                    <span
+                      class="text"
+                    >
+                      xyz_user
+                    </span>
+                  </div>
+                </div>
+              </div>
+            </div>
+            <div
+              class="ui inverted dimmer"
+            >
+              <div
+                class="content"
+              >
+                <div
+                  class="ui loader"
+                />
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </form>
+    <div
+      class="concept-forms-actions actions"
+    >
+      <a
+        class="ui secondary button"
+        href="/"
+        role="button"
+      >
+        Cancel
+      </a>
+      <button
+        class="ui primary button"
+      >
+        Update
+      </button>
+    </div>
+  </div>
+</div>
+`;