@truedat/bg 8.5.3 → 8.5.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/bg",
-  "version": "8.5.3",
+  "version": "8.5.4",
   "description": "Truedat Web Business Glossary",
   "sideEffects": [
     "**/*.css",
@@ -54,7 +54,7 @@
     "@testing-library/jest-dom": "^6.6.3",
     "@testing-library/react": "^16.3.0",
     "@testing-library/user-event": "^14.6.1",
-    "@truedat/test": "8.5.3",
+    "@truedat/test": "8.5.4",
     "identity-obj-proxy": "^3.0.0",
     "jest": "^29.7.0",
     "redux-saga-test-plan": "^4.0.6"
@@ -87,5 +87,5 @@
     "semantic-ui-react": "^3.0.0-beta.2",
     "swr": "^2.3.3"
   },
-  "gitHead": "9d67766fe0910fe519b6f1f2042b4a5dcc28fad5"
+  "gitHead": "75272567eb3ec948a5cdeb8346ef9cacac58267f"
 }

package/src/concepts/components/ConceptForm.js

@@ -29,7 +29,7 @@ import { TranslationModal } from "@truedat/ai/components";
 import { useWebContext } from "@truedat/core/webContext";
 
 const SelectDynamicFormWithTranslations = lazy(
-  () => import("@truedat/df/components/SelectDynamicFormWithTranslations")
+  () => import("@truedat/df/components/SelectDynamicFormWithTranslations"),
 );
 
 const ConceptForm = ({
@@ -84,8 +84,8 @@ const ConceptForm = ({
         setCanTranslate(
           _.get("data.data.status", res) === "ok" &&
             isMultilingual &&
-            !_.isEmpty(translatableFields)
-        )
+            !_.isEmpty(translatableFields),
+        ),
       );
     }
   };
@@ -101,7 +101,7 @@ const ConceptForm = ({
         domain_ids: [domainId],
         resource_type: "business_concept",
       }).then((res) =>
-        setHasSuggestions(_.get("data.data.status", res) === "ok")
+        setHasSuggestions(_.get("data.data.status", res) === "ok"),
       );
       checkCanTranslate();
     }
@@ -172,7 +172,7 @@ const ConceptForm = ({
           defaultLang,
           i18nConcept[defaultLang]?.name,
           handleI18nNameChange,
-          true
+          true,
         )
       ) : (
         <>
@@ -209,14 +209,14 @@ const ConceptForm = ({
                   {renderNameField(
                     defaultLang,
                     i18nConcept[defaultLang]?.name,
-                    handleI18nNameChange
+                    handleI18nNameChange,
                   )}
                 </Grid.Column>
                 <Grid.Column>
                   {renderNameField(
                     altLang,
                     i18nConcept[altLang]?.name,
-                    handleI18nNameChange
+                    handleI18nNameChange,
                   )}
                 </Grid.Column>
               </Grid.Row>
@@ -250,7 +250,7 @@ const ConceptForm = ({
     _.flow(
       _.filter("is_required"),
       _.map("name"),
-      _.every(isNonEmptyString)
+      _.every(isNonEmptyString),
     )(i18nConcept);
   const validTemplate = () =>
     _.isObject(template) && isNonEmptyString(template?.name);
@@ -290,7 +290,7 @@ const ConceptForm = ({
   const isThereAnyTranslatableField =
     _.flow(
       _.keys,
-      _.some((key) => !_.isEmpty(i18nConcept[defaultLang]?.content?.[key]))
+      _.some((key) => !_.isEmpty(i18nConcept[defaultLang]?.content?.[key])),
     )(translatableFields) || !_.isEmpty(i18nConcept[defaultLang]?.name);
 
   const disableTranslationButton =

package/src/concepts/selectors/__tests__/getParsedEvents.spec.js

@@ -4,7 +4,7 @@ describe("selectors: getParsedEvents", () => {
   const concept = {
     template: {
       content: [
-        { fields: [{ type: "system", name: "field_1", label: "Label" }] },
+        { fields: [{ type: "string", name: "field_1", label: "Label" }] },
       ],
     },
   };
@@ -83,8 +83,8 @@ describe("selectors: getParsedEvents", () => {
     resource_id: 10,
     payload: [
       {
-        msg_key: "changed_field_without_target",
-        msg_params: ["Label", JSON.stringify({ id: 1, name: "foo" })],
+        msg_key: "changed_field",
+        msg_params: ["Label", "foo"],
       },
     ],
   };
@@ -129,7 +129,10 @@ describe("selectors: getParsedEvents", () => {
     event: "update_concept_draft",
     resource_id: 23,
     payload: [
-      { msg_key: "changed_field_without_target", msg_params: ["changed_field_1", null] },
+      {
+        msg_key: "changed_field_without_target",
+        msg_params: ["changed_field_1", null],
+      },
       { msg_key: "changed_field", msg_params: ["changed_field_2", "value_2"] },
     ],
   };
@@ -139,7 +142,10 @@ describe("selectors: getParsedEvents", () => {
     event: "update_concept_draft",
     resource_id: 24,
     payload: [
-      { msg_key: "changed_field_without_target", msg_params: ["changed_field_1", null] },
+      {
+        msg_key: "changed_field_without_target",
+        msg_params: ["changed_field_1", null],
+      },
       { msg_key: "changed_field", msg_params: ["changed_field_2", "value_2"] },
     ],
   };
@@ -161,7 +167,10 @@ describe("selectors: getParsedEvents", () => {
       payload: {
         content: {
           removed: {},
-          changed: { changed_field_1: { origin: "origin", value: "value_1" }, changed_field_2: { origin: "origin", value: "value_2" } },
+          changed: {
+            changed_field_1: { origin: "origin", value: "value_1" },
+            changed_field_2: { origin: "origin", value: "value_2" },
+          },
           added: {},
         },
       },
@@ -230,7 +239,13 @@ describe("selectors: getParsedEvents", () => {
       id: 9,
       event: "update_concept_draft",
       resource_id: 10,
-      payload: { content: { changed: { field_1: { origin: "origin", value: { id: 1, name: "foo" } } } } },
+      payload: {
+        content: {
+          changed: {
+            field_1: { origin: "origin", value: "foo" },
+          },
+        },
+      },
     },
     {
       id: 10,
@@ -288,7 +303,10 @@ describe("selectors: getParsedEvents", () => {
       payload: {
         content: {
           removed: {},
-          changed: { changed_field_1: { origin: "origin", value: null }, changed_field_2: { origin: "origin", value: "value_2" } },
+          changed: {
+            changed_field_1: { origin: "origin", value: null },
+            changed_field_2: { origin: "origin", value: "value_2" },
+          },
           added: {},
         },
       },
@@ -310,7 +328,22 @@ describe("selectors: getParsedEvents", () => {
   it("should return all the events with the new payload", () => {
     const res = getParsedEvents({ events, concept });
     expect(res).toHaveLength(14);
-    expect(res).toEqual([r1, r2, r3, r4, r5, r6, r7, r8, r9, r10, r11, r12, r13, r14]);
+    expect(res).toEqual([
+      r1,
+      r2,
+      r3,
+      r4,
+      r5,
+      r6,
+      r7,
+      r8,
+      r9,
+      r10,
+      r11,
+      r12,
+      r13,
+      r14,
+    ]);
   });
 
   it("should return empty array when we have no elements", () => {
@@ -565,17 +598,40 @@ describe("selectors: getParsedEvents", () => {
         content: [
           {
             fields: [
-              { type: "string", name: "Checkbox String", label: "Checkbox String" },
+              {
+                type: "string",
+                name: "Checkbox String",
+                label: "Checkbox String",
+              },
               { type: "string", name: "Date", label: "Date" },
               { type: "string", name: "Date Time", label: "Date Time" },
-              { type: "domain", name: "Dropdown Domain", label: "Dropdown Domain" },
-              { type: "string", name: "Dropdown Key Value", label: "Dropdown Key Value" },
-              { type: "string", name: "Dropdown String", label: "Dropdown String" },
-              { type: "system", name: "Dropdown System", label: "Dropdown System" },
-              { type: "enriched_text", name: "Enrichedtext", label: "Enrichedtext" },
+              {
+                type: "domain",
+                name: "Dropdown Domain",
+                label: "Dropdown Domain",
+              },
+              {
+                type: "string",
+                name: "Dropdown Key Value",
+                label: "Dropdown Key Value",
+              },
+              {
+                type: "string",
+                name: "Dropdown String",
+                label: "Dropdown String",
+              },
+              {
+                type: "system",
+                name: "Dropdown System",
+                label: "Dropdown System",
+              },
               { type: "string", name: "Extra", label: "Extra" },
               { type: "hierarchy", name: "Hierarchy", label: "Hierarchy" },
-              { type: "hierarchy", name: "Hierarchy multiple", label: "Hierarchy multiple" },
+              {
+                type: "hierarchy",
+                name: "Hierarchy multiple",
+                label: "Hierarchy multiple",
+              },
               { type: "url", name: "Links", label: "Links" },
               { type: "integer", name: "Number", label: "Number" },
               { type: "string", name: "Radio String", label: "Radio String" },
@@ -640,7 +696,10 @@ describe("selectors: getParsedEvents", () => {
       });
       expect(res[0].payload).toContainEqual({
         msg_key: "changed_field",
-        msg_params: ["Dropdown String", JSON.stringify(["option_a", "option_b"])],
+        msg_params: [
+          "Dropdown String",
+          JSON.stringify(["option_a", "option_b"]),
+        ],
         msg_via: "single_update",
       });
       expect(res[0].payload).toContainEqual({
@@ -748,7 +807,7 @@ describe("selectors: getParsedEvents", () => {
       });
     });
 
-    it("should NOT show values for complex field types (enriched_text, url, table, system, image)", () => {
+    it("should NOT show values for complex field types (url, table, system, image)", () => {
       const events = [
         {
           id: 1,
@@ -766,30 +825,6 @@ describe("selectors: getParsedEvents", () => {
                     name: "System Bar",
                   },
                 },
-                Enrichedtext: {
-                  origin: "user",
-                  value: {
-                    document: {
-                      data: {},
-                      nodes: [
-                        {
-                          data: {},
-                          nodes: [
-                            {
-                              marks: [],
-                              object: "text",
-                              text: "Lorem ipsum dolor sit amet",
-                            },
-                          ],
-                          object: "block",
-                          type: "paragraph",
-                        },
-                      ],
-                      object: "document",
-                    },
-                    object: "value",
-                  },
-                },
                 Links: {
                   origin: "user",
                   value: [
@@ -835,14 +870,6 @@ describe("selectors: getParsedEvents", () => {
         ],
         msg_via: "single_update",
       });
-      expect(res[0].payload).toContainEqual({
-        msg_key: "changed_field_without_target",
-        msg_params: [
-          "Enrichedtext",
-          expect.stringContaining("Lorem ipsum dolor sit amet"),
-        ],
-        msg_via: "single_update",
-      });
       expect(res[0].payload).toContainEqual({
         msg_key: "changed_field_without_target",
         msg_params: [
@@ -988,7 +1015,7 @@ describe("selectors: getParsedEvents", () => {
       expect(res[0].payload).not.toContainEqual(
         expect.objectContaining({
           msg_key: "confidential_true",
-        })
+        }),
       );
     });
   });

package/src/concepts/selectors/getParsedEvents.js

@@ -30,7 +30,7 @@ const getConceptFieldChanges = (
   fields,
   templateFields,
   fieldsWithoutValue,
-  event_via
+  event_via,
 ) =>
   _.flow(
     _.toPairs,
@@ -38,8 +38,8 @@ const getConceptFieldChanges = (
     _.map(([k, fieldValue]) => {
       const v =
         _.isObject(fieldValue) &&
-          !_.isNull(fieldValue) &&
-          _.has("value", fieldValue)
+        !_.isNull(fieldValue) &&
+        _.has("value", fieldValue)
           ? fieldValue.value
           : fieldValue;
       return {
@@ -47,28 +47,26 @@ const getConceptFieldChanges = (
         msg_params: [getFieldLabel(k, templateFields), toStr(v)],
         msg_via: event_via,
       };
-    })
+    }),
   )(fields);
 
 const fromValueType = (msg_key, field, value, fieldsWithoutValue) =>
-  _.isString(value) ? msg_key :
-    _.includes(field)(fieldsWithoutValue) ||
-      _.isNil(value)
-      ? msg_key + "_without_target"
-      : msg_key;
+  _.includes(field)(fieldsWithoutValue) || _.isNil(value)
+    ? msg_key + "_without_target"
+    : msg_key;
 
 const getFieldLabel = (field, fields) =>
   _.flow(
     _.find((f) => _.prop("name")(f) == field),
     _.defaultTo({}),
-    _.prop("label")
+    _.prop("label"),
   )(fields) || field;
 
 const getUpdateConceptEvent = (
   { payload, ...e },
   templateFields,
   fieldsWithoutValue,
-  options = {}
+  options = {},
 ) => {
   if (!payload) return { ...e, payload: [] };
 
@@ -163,29 +161,27 @@ const getUpdateConceptEvent = (
           changed,
           templateFields,
           fieldsWithoutValue,
-          event_via
+          event_via,
         ),
         getConceptFieldChanges(
           "added_field",
           added,
           templateFields,
           fieldsWithoutValue,
-          event_via
+          event_via,
         ),
         getConceptFieldChanges(
           "removed_field",
           removed,
           templateFields,
           fieldsWithoutValue,
-          event_via
+          event_via,
         ),
       ]),
-      _.flatten
+      _.flatten,
     )([]);
   }
 
-
-
   if (field_config.length === 0) {
     return { ...e, payload: [{ msg_via: event_via }] };
   }
@@ -209,14 +205,16 @@ const getRelationFromConceptToFieldEvent = ({ payload, ...e }) => {
   return { ...e, payload: [{ msg_key, msg_params, msg_via: event_via }] };
 };
 
-
 const enrichEvent = ({ payload, ...e }, event_message_key) => {
   const { event_via, target_id, target_type, target_name } = payload;
   const msg_key = target_type
     ? `${event_message_key}_${toStr(target_type)}`
     : event_message_key;
   const msg_params = [target_name || toStr(target_id)];
-  return { ...e, payload: [{ msg_key, msg_params: msg_params, msg_via: event_via }] };
+  return {
+    ...e,
+    payload: [{ msg_key, msg_params: msg_params, msg_via: event_via }],
+  };
 };
 
 const addEventVia = ({ payload, ...e }) => {
@@ -232,37 +230,34 @@ const getParsedEvents = createSelector(
     const templateFields = _.flow(
       _.prop("content"),
       _.map(_.prop("fields")),
-      _.flatten
+      _.flatten,
     )(template);
 
     const fieldsWithoutValue = _.flow(
       _.filter((f) =>
         _.includes(_.prop("type")(f))([
-          "enriched_text",
           "url",
           "table",
           "system",
           "image",
-        ])
+          "markdown",
+        ]),
       ),
-      _.map(_.prop("name"))
+      _.map(_.prop("name")),
     )(templateFields);
+
     return _.map((e) => {
       const { event } = e;
       if (event === "create_concept_draft") {
         return getNewConceptVersion(e);
       } else if (event === "update_concept_draft") {
-        return getUpdateConceptEvent(
-          e,
-          templateFields,
-          fieldsWithoutValue,
-          { isDraft: true });
+        return getUpdateConceptEvent(e, templateFields, fieldsWithoutValue, {
+          isDraft: true,
+        });
       } else if (event === "update_concept") {
-        return getUpdateConceptEvent(
-          e,
-          templateFields,
-          fieldsWithoutValue,
-          { isDraft: false });
+        return getUpdateConceptEvent(e, templateFields, fieldsWithoutValue, {
+          isDraft: false,
+        });
       } else if (event === "delete_concept_draft") {
         return getDeleteConceptDraftEvent(e);
       } else if (event === "new_published_version") {
@@ -296,7 +291,7 @@ const getParsedEvents = createSelector(
         return getEmptyPayloadEvent(e);
       }
     })(events);
-  }
+  },
 );
 
 export { getParsedEvents };