@visns-studio/visns-components 6.31.1 → 6.31.2

package/README.md

@@ -9,6 +9,19 @@ A comprehensive React component library used by the VISNS Studio team for CRM an
 
 VISNS Components is a React-based UI component library that provides a set of reusable, consistent, and customizable components for building web applications. It includes components for authentication, data grids, forms, navigation, and more, designed to work seamlessly together.
 
+## Recent Updates (v6.31.2)
+
+### `MergeEntity` compares the two records it is actually merging
+
+`processTemplate` substituted `{dataId}` with the current (source) entity
+before applying the caller's own values, so `loadTargetEntity(entityId)`
+fetched the source a second time. Step 3 then diffed the source against
+itself, always reported "no conflicts", and sent an empty `field_overrides`
+map with the merge. Explicit template values now win and `{dataId}` only
+falls back to the current entity when nothing was supplied. Every consumer's
+merge tab (contacts, clients, …) gets a real conflict step without a config
+change.
+
 ## Recent Updates (v6.31.0)
 
 ### The header badge self-heals too, and the pop takes its timings from the server

package/package.json

@@ -93,7 +93,7 @@
         "react-dom": "^17.0.0 || ^18.0.0 || ^19.0.0"
     },
     "name": "@visns-studio/visns-components",
-    "version": "6.31.1",
+    "version": "6.31.2",
     "description": "Various packages to assist in the development of our Custom Applications.",
     "main": "src/index.js",
     "files": [

package/src/components/MergeEntity.jsx

@@ -174,13 +174,16 @@ const MergeEntity = ({ endpoints, config, dataId, onUpdate = () => {} }) => {
     const [showAdvanced, setShowAdvanced] = useState(false);
 
     // Replace placeholders in URLs
+    // Explicit values win: `{dataId}` only falls back to the current entity
+    // when the caller did not supply one (loadTargetEntity passes the target's
+    // id, and must not be given the source again).
     const processTemplate = (template, data = {}) => {
         let processed = template;
-        processed = processed.replace(/\{dataId\}/g, dataId);
         Object.keys(data).forEach((key) => {
             const placeholder = new RegExp(`\\{${key}\\}`, 'g');
             processed = processed.replace(placeholder, data[key]);
         });
+        processed = processed.replace(/\{dataId\}/g, dataId);
         return processed;
     };