@crystaldesign/diva-backoffice 26.5.0-beta.41 → 26.5.0-beta.42

package/build/esm/index.js

@@ -10099,11 +10099,21 @@ function loadConfiguration(t, root, config, lang, apiConfig) {
           return !showCampaignFields(data);
         }
       }, {
-        name: ['settings', 'campaignSettings', 'variants'],
-        label: t('backoffice.form.organizationdetails.items.variants'),
+        name: ['settings', 'campaignSettings', 'landingPageKey'],
+        label: t('backoffice.form.organizationdetails.items.landingPageKey'),
         tabgroup: t('backoffice.form.organizationdetails.campaignLandingPage'),
-        type: 'select',
-        mode: 'tags',
+        type: 'input',
+        hidden: function hidden(data) {
+          return !showCampaignFields(data);
+        }
+      }, {
+        type: 'subTitle',
+        name: t('backoffice.form.organizationdetails.campaignSection.marketingTracking'),
+        tabgroup: t('backoffice.form.organizationdetails.campaignLandingPage'),
+        orientation: 'horizontal',
+        style: {
+          marginBottom: '20px'
+        },
         hidden: function hidden(data) {
           return !showCampaignFields(data);
         }
@@ -10132,9 +10142,8 @@ function loadConfiguration(t, root, config, lang, apiConfig) {
           return !showCampaignFields(data);
         }
       }, {
-        name: ['settings', 'makeApiKey'],
-        label: t('backoffice.form.organizationdetails.items.settings.makeApiKey'),
-        permission: 'backoffice_admin_organizations',
+        name: ['settings', 'campaignSettings', 'leadTableCampaignId'],
+        label: t('backoffice.form.organizationdetails.items.leadTableCampaingId'),
         tabgroup: t('backoffice.form.organizationdetails.campaignLandingPage'),
         type: 'input',
         hidden: function hidden(data) {
@@ -10150,10 +10159,13 @@ function loadConfiguration(t, root, config, lang, apiConfig) {
           return (data === null || data === void 0 ? void 0 : data.type) !== 'CAMPAIGN' && (data === null || data === void 0 ? void 0 : data.type) !== 'RETAILERCHILD' && (data === null || data === void 0 ? void 0 : data.type) !== 'RETAILER' && (data === null || data === void 0 ? void 0 : data.parentType) !== 'RETAILER';
         }
       }, {
-        name: ['settings', 'campaignSettings', 'leadTableCampaignId'],
-        label: t('backoffice.form.organizationdetails.items.leadTableCampaingId'),
+        type: 'subTitle',
+        name: 'Theme',
         tabgroup: t('backoffice.form.organizationdetails.campaignLandingPage'),
-        type: 'input',
+        orientation: 'horizontal',
+        style: {
+          marginBottom: '20px'
+        },
         hidden: function hidden(data) {
           return !showCampaignFields(data);
         }
@@ -18053,6 +18065,22 @@ function _objectSpread$1m(e) { for (var r = 1; r < arguments.length; r++) { var
 function _createForOfIteratorHelper$s(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray$s(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray$s(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray$s(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray$s(r, a) : void 0; } }
 function _arrayLikeToArray$s(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+
+/**
+ * Merge persisted state with submitted form values:
+ * - Arrays with different lengths → use submitted array (tags, multi-select emails, Form.List add/remove row).
+ * - Same length → deep merge element-wise (nested media url/refId on additionalContactData stay intact).
+ * - undefined from form → keep destination (Form omits unregistered fields).
+ */
+function mergeFormWithCustomizer(objValue, srcValue) {
+  if (Array.isArray(objValue) && Array.isArray(srcValue) && objValue.length !== srcValue.length) {
+    return srcValue;
+  }
+  if (srcValue === undefined) {
+    return objValue;
+  }
+  return undefined;
+}
 function useFormData (_ref) {
   var _loadedData$_id;
   var id = _ref.id,
@@ -18319,14 +18347,7 @@ function useFormData (_ref) {
       return _regeneratorRuntime.wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
-            // lodash merge() merges arrays by index, which truncates or keeps stale elements when
-            // lengths differ (e.g. tags / multi-select email lists). Prefer submitted array values in full.
-            newData = mergeWith(cloneDeep((_state$data = state.data) !== null && _state$data !== void 0 ? _state$data : {}), values, function (_objValue, srcValue) {
-              if (Array.isArray(srcValue)) {
-                return srcValue;
-              }
-              return undefined;
-            });
+            newData = mergeWith(cloneDeep((_state$data = state.data) !== null && _state$data !== void 0 ? _state$data : {}), values, mergeFormWithCustomizer);
             if (!skipApi) {
               _context2.next = 3;
               break;
@@ -18459,7 +18480,7 @@ function useFormData (_ref) {
       var item = getItem(id !== null && id !== void 0 ? id : '');
       item === null || item === void 0 || (_item$onValueChange = item.onValueChange) === null || _item$onValueChange === void 0 || _item$onValueChange.call(item, value, item, state.form);
     }
-    var data = d !== null && d !== void 0 ? d : mergeWith(_objectSpread$1m({}, state.data), state.form.getFieldsValue(), mergeCustomizer);
+    var data = d !== null && d !== void 0 ? d : mergeWith(cloneDeep(state.data), state.form.getFieldsValue(), mergeFormWithCustomizer);
     if (id) {
       setFieldInObject(id, data, value);
       var newFieldErrors = _objectSpread$1m({}, fieldErrors);
@@ -18489,12 +18510,6 @@ function useFormData (_ref) {
     }
     return undefined;
   };
-
-  //if at an array an entry got added or deleted, its handeled by and so we take the data from the formdata
-  var mergeCustomizer = function mergeCustomizer(obj, src) {
-    if (Array.isArray(obj) && Array.isArray(src) && obj.length != src.length) return src;
-    return undefined;
-  };
   var setNewData = function setNewData(newData, orig) {
     if (usedPreset.used === true) {
       var usdPreset = presets.data[usedPreset.index];

package/build/types/backoffice/src/ui/Form/useFormData.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useFormData.d.ts","sourceRoot":"","sources":["../../../../../../src/ui/Form/useFormData.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"useFormData.d.ts","sourceRoot":"","sources":["../../../../../../src/ui/Form/useFormData.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@crystaldesign/diva-backoffice",
-  "version": "26.5.0-beta.41",
+  "version": "26.5.0-beta.42",
   "license": "COMMERCIAL",
   "devDependencies": {
     "@testing-library/jest-dom": "^6.5.0",
@@ -15,13 +15,13 @@
   "dependencies": {
     "@ant-design/icons": "6.1.0",
     "@babel/runtime": "7.24.7",
-    "@crystaldesign/content-box": "26.5.0-beta.41",
-    "@crystaldesign/content-item": "26.5.0-beta.41",
-    "@crystaldesign/diva-core": "26.5.0-beta.41",
-    "@crystaldesign/diva-utils": "26.5.0-beta.41",
-    "@crystaldesign/media-upload": "26.5.0-beta.41",
-    "@crystaldesign/rtf-editor": "26.5.0-beta.41",
-    "@crystaldesign/spreadsheet": "26.5.0-beta.41",
+    "@crystaldesign/content-box": "26.5.0-beta.42",
+    "@crystaldesign/content-item": "26.5.0-beta.42",
+    "@crystaldesign/diva-core": "26.5.0-beta.42",
+    "@crystaldesign/diva-utils": "26.5.0-beta.42",
+    "@crystaldesign/media-upload": "26.5.0-beta.42",
+    "@crystaldesign/rtf-editor": "26.5.0-beta.42",
+    "@crystaldesign/spreadsheet": "26.5.0-beta.42",
     "@google/genai": "^1.22.0",
     "@google/model-viewer": "3.5.0",
     "ag-charts-community": "^10.1.0",
@@ -53,5 +53,5 @@
   },
   "module": "build/esm/index.js",
   "types": "./build/types/backoffice/src/index.d.ts",
-  "gitHead": "2e92bbe2ffd95e9be38fbc021652c7690b9a8e10"
+  "gitHead": "c9f2c4064147d85297e73b7971be0a07baf5ff4e"
 }