@truedat/bg 8.6.6 → 8.7.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/bg",
-  "version": "8.6.6",
+  "version": "8.7.0",
   "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.6.6",
+    "@truedat/test": "8.7.0",
     "identity-obj-proxy": "^3.0.0",
     "jest": "^29.7.0",
     "redux-saga-test-plan": "^4.0.6"
@@ -79,7 +79,7 @@
     "react-intl": "^7.1.11",
     "react-moment": "^1.1.3",
     "react-redux": "^9.2.0",
-    "react-router": "^7.6.0",
+    "react-router": "^7.15.0",
     "redux": "^5.0.1",
     "redux-saga": "^1.3.0",
     "redux-saga-routines": "^3.2.3",
@@ -87,5 +87,5 @@
     "semantic-ui-react": "^3.0.0-beta.2",
     "swr": "^2.3.3"
   },
-  "gitHead": "8a7cc3d7598dde1a52abbb9933118f4a90155d42"
+  "gitHead": "375298315086154cea326bfaebc504d6e45873ed"
 }

package/src/concepts/components/ConceptCreate.js

@@ -5,6 +5,7 @@ import PropTypes from "prop-types";
 import { connect } from "react-redux";
 import { useLanguage } from "@truedat/core/i18n";
 import { splitTranslatableFields } from "@truedat/core/services/i18nContent";
+import { applyTemplate } from "@truedat/df/utils";
 import { conceptAction } from "../routines";
 import { useConceptVersionsActions } from "../hooks/useConcepts";
 import ConceptForm from "./ConceptForm";
@@ -20,16 +21,24 @@ const ConceptCreate = ({ conceptActionLoading, conceptAction }) => {
   const [template, setTemplate] = useState();
 
   useEffect(() => {
-    const templateFields = splitTranslatableFields(template);
-    const updateI18nConcept = _.flow(
-      _.map((langContent) => ({
+    if (!template) return;
+
+    const translatableKeys = _.keys(
+      splitTranslatableFields(template).translatable,
+    );
+
+    const updateI18nConcept = _.mapValues((langContent) => {
+      const filled = applyTemplate(template)(
+        langContent.content || {},
+        domainId,
+      );
+      return {
         ...langContent,
         content: langContent.is_default
-          ? { ...langContent.content }
-          : { ..._.omitBy(_.isEmpty)(templateFields.translatable) },
-      })),
-      _.keyBy("lang"),
-    )(i18nConcept);
+          ? filled
+          : _.pick(translatableKeys, filled),
+      };
+    })(i18nConcept);
 
     if (!_.isEqual(i18nConcept, updateI18nConcept)) {
       setI18nConcept(updateI18nConcept);

package/src/concepts/components/ConceptEdit.js

@@ -98,6 +98,10 @@ export const ConceptEditLoader = (props) => {
   const template = _.prop("template")(data);
   const processedContent = applyTemplate(template);
 
+  const translatableKeys = _.keys(
+    splitTranslatableFields(template).translatable,
+  );
+
   const i18nContent = _.flow(
     _.filter(({ is_enabled }) => is_enabled),
     _.map(({ id, lang, is_default, is_required }) => {
@@ -105,10 +109,10 @@ export const ConceptEditLoader = (props) => {
 
       const langContent = is_default
         ? propContent
-        : {
-            ...splitTranslatableFields(template).translatable,
-            ...contentLang?.content,
-          };
+        : _.pick(
+            translatableKeys,
+            processedContent(contentLang?.content || {}, domain?.id),
+          );
       const langName = is_default ? propName : contentLang?.name || "";
 
       return {

package/src/concepts/components/ConceptForm.js

@@ -70,10 +70,10 @@ const ConceptForm = ({
   const handleI18nNameChange = (lang, name) =>
     setI18nConcept(_.set(`${lang}.name`, name, i18nConcept));
   const handleI18nConceptContentChange = (lang, { content }) => {
-    setI18nConcept({
-      ...i18nConcept,
-      [lang]: { ...i18nConcept[lang], content: { ...content } },
-    });
+    setI18nConcept((prev) => ({
+      ...prev,
+      [lang]: { ...prev[lang], content: { ...content } },
+    }));
   };
   const checkCanTranslate = () => {
     if (!disable_td_ai && templateId && domainId) {