@crystaldesign/diva-backoffice 25.9.0-beta.13 → 25.9.0-beta.15

package/build/esm/index.js

@@ -33769,7 +33769,7 @@ var SeriesSelector$2 = function SeriesSelector(_ref) {
       read: enricherService + '/packages/' + packageId + '/' + dataSet + "/series?fields=seriesName[".concat(i18n.language.toLocaleUpperCase(), "];_id;serieNo;pricefeaturegroups;pricefeaturegroupsDisplayTexts;pricefeaturegroupsKeys;pricefeaturegroupsKeysDisplayTexts")
     },
     selectMapping: {
-      label: "${seriesName.".concat(i18n.language.toLocaleUpperCase(), "}"),
+      label: "${seriesName.".concat(i18n.language.toLocaleUpperCase(), "} (${serieNo})"),
       value: '${serieNo}'
     },
     autoSelectFirst: true,
@@ -34869,7 +34869,7 @@ var formatListValue = function formatListValue(values, type, locale) {
 /**
  * Converts an internal value to its display representation
  * For factors: keeps the decimal value
- * For discounts: converts to percentage (e.g., 0.2 -> "20")
+ * For discounts: converts from negative factor to percentage string (e.g., "0.95" -> "5")
  * @param value - The internal value to convert
  * @param type - The type of price modification
  * @returns The display value as string
@@ -34877,13 +34877,13 @@ var formatListValue = function formatListValue(values, type, locale) {
 var convertToDisplayValue = function convertToDisplayValue(value, type) {
   if (type === 'factor') return value;
   var numValue = parseFloat(value);
-  return isNaN(numValue) ? '0' : Math.round(numValue * 100).toString();
+  return isNaN(numValue) ? '0' : Math.round((1 - numValue) * 100).toString();
 };
 
 /**
  * Converts a display value back to its internal representation
  * For factors: keeps the input value
- * For discounts: converts from percentage to decimal (e.g., "20" -> "0.2")
+ * For discounts: converts the input as a negative factor (e.g., "5" -> "0.95" for a 5% discount)
  * @param value - The display value to convert
  * @param type - The type of price modification
  * @returns The internal value as string
@@ -34891,7 +34891,7 @@ var convertToDisplayValue = function convertToDisplayValue(value, type) {
 var convertFromDisplayValue = function convertFromDisplayValue(value, type) {
   if (type === 'factor') return value;
   var numValue = parseInt(value, 10);
-  return isNaN(numValue) ? '0' : (numValue / 100).toString();
+  return isNaN(numValue) ? '0' : (1 - numValue / 100).toString();
 };
 
 /**
@@ -36480,13 +36480,14 @@ function Content$3() {
 function ownKeys$b(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$b(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$b(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$b(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function UploadButton (_ref) {
-  var action = _ref.action,
-    title = _ref.title,
-    disabled = _ref.disabled,
-    contentType = _ref.contentType,
+  var action = _ref.action;
+    _ref.title;
+    _ref.disabled;
+    var contentType = _ref.contentType,
     updateProgress = _ref.updateProgress,
     fileList = _ref.fileList,
-    progress = _ref.progress;
+    progress = _ref.progress,
+    setName = _ref.setName;
   var _useTranslation = useTranslation(),
     t = _useTranslation.t;
   var root = useStore();
@@ -36510,10 +36511,27 @@ function UploadButton (_ref) {
         ref.current = undefined;
       }
     } else if (status === 'error') {
-      var _file$response$error, _file$response;
+      var _file$response, _file$response2;
       progress = 'ERROR';
       fileList = [];
-      error = (_file$response$error = (_file$response = file.response) === null || _file$response === void 0 ? void 0 : _file$response.error) !== null && _file$response$error !== void 0 ? _file$response$error : file.response;
+      if ((_file$response = file.response) !== null && _file$response !== void 0 && _file$response.error) {
+        error = file.response.error;
+      } else if ((_file$response2 = file.response) !== null && _file$response2 !== void 0 && _file$response2.errors) {
+        // If response has a validation error structure, extract messages
+        if (_typeof(file.response.errors) === 'object') {
+          error = Object.values(file.response.errors).map(function (v) {
+            return Array.isArray(v) ? v.join(', ') : v;
+          }).join('; ');
+        } else {
+          error = file.response.errors;
+        }
+      } else {
+        try {
+          error = JSON.parse(file.response);
+        } catch (_unused) {
+          error = 'Unknown error';
+        }
+      }
       if (ref.current) {
         clearInterval(ref.current.interval);
         ref.current = undefined;
@@ -36568,34 +36586,37 @@ function UploadButton (_ref) {
             // Allow both XML and ZIP files
             isXml = file.type === 'application/xml' || file.type === 'text/xml' || file.name.endsWith('.xml');
             isZip = file.type === 'application/zip' || file.name.endsWith('.zip');
+            nameWithoutExt = file.name.substring(0, file.name.lastIndexOf('.')) || file.name;
             if (!(!isXml && !isZip)) {
-              _context.next = 5;
+              _context.next = 6;
               break;
             }
             updateProgress('ERROR', fileList, t('backoffice.idmEnricher.import.uploadinvalid'));
             return _context.abrupt("return", Upload$2.LIST_IGNORE);
-          case 5:
+          case 6:
+            setName(nameWithoutExt);
+
+            // If it's already a ZIP file, return it as is
             if (!isZip) {
-              _context.next = 7;
+              _context.next = 9;
               break;
             }
             return _context.abrupt("return", file);
-          case 7:
+          case 9:
             // For XML files, create a ZIP
-            nameWithoutExt = file.name.substring(0, file.name.lastIndexOf('.')) || file.name;
             zip = new JSZip();
             zip.file(file.name, file);
-            _context.next = 12;
+            _context.next = 13;
             return zip.generateAsync({
               type: 'blob'
             });
-          case 12:
+          case 13:
             zipBlob = _context.sent;
             zipFile = new File([zipBlob], nameWithoutExt + '.zip', {
               type: 'application/zip'
             });
             return _context.abrupt("return", zipFile);
-          case 15:
+          case 16:
           case "end":
             return _context.stop();
         }
@@ -36624,12 +36645,18 @@ function UploadButton (_ref) {
     }
   };
   return /*#__PURE__*/jsx(Fragment, {
-    children: /*#__PURE__*/jsx(Upload$2, _objectSpread$b(_objectSpread$b({}, props), {}, {
-      children: progress !== 'SUCCESS' && /*#__PURE__*/jsx(Button$1, {
-        icon: /*#__PURE__*/jsx(UploadOutlined$1, {}),
-        disabled: disabled,
-        children: title !== null && title !== void 0 ? title : t('backoffice.idmEnricher.import.upload')
-      })
+    children: /*#__PURE__*/jsxs(Upload$2.Dragger, _objectSpread$b(_objectSpread$b({}, props), {}, {
+      disabled: progress === 'INPROGRESS',
+      children: [/*#__PURE__*/jsx("p", {
+        className: "ant-upload-drag-icon",
+        children: /*#__PURE__*/jsx(UploadOutlined$1, {})
+      }), /*#__PURE__*/jsx("p", {
+        className: "ant-upload-text",
+        children: t('backoffice.idmEnricher.import.uploadtext')
+      }), /*#__PURE__*/jsx("p", {
+        className: "ant-upload-hint",
+        children: t('backoffice.idmEnricher.import.uploadhint')
+      })]
     }))
   });
 }
@@ -36645,7 +36672,7 @@ function IDMImportForm (_ref) {
     progress = _ref.progress,
     name = _ref.name,
     error = _ref.error,
-    setName = _ref.setName,
+    _setName = _ref.setName,
     fileList = _ref.fileList;
   var _useTranslation = useTranslation(),
     t = _useTranslation.t;
@@ -36660,10 +36687,11 @@ function IDMImportForm (_ref) {
       }],
       children: /*#__PURE__*/jsx(Input, {
         onChange: function onChange(e) {
-          return setName(e.target.value);
+          return _setName(e.target.value);
         },
         value: name,
-        disabled: progress === 'INPROGRESS' || progress === 'SUCCESS'
+        placeholder: t('backoffice.idmEnricher.import.nameplaceholder'),
+        disabled: progress === 'INPROGRESS'
       })
     }), /*#__PURE__*/jsx(Form$1.Item, {
       children: /*#__PURE__*/jsx(UploadButton, {
@@ -36671,8 +36699,11 @@ function IDMImportForm (_ref) {
         contentType: "multipart/form-data",
         updateProgress: updateProgress,
         progress: progress,
-        disabled: !name.trim() || progress === 'INPROGRESS',
-        fileList: fileList
+        disabled: progress === 'INPROGRESS',
+        fileList: fileList,
+        setName: function setName(fileName) {
+          return !name && _setName(fileName);
+        }
       })
     }), /*#__PURE__*/jsxs(Form$1.Item, {
       style: {
@@ -36741,6 +36772,9 @@ function OpenModalButton (_ref) {
     setProgress(progress);
     setFileList(fileList);
     setError(error);
+    if (progress === 'SUCCESS') {
+      setName('');
+    }
   };
   var buttonText = progress == undefined || progress == 'ERROR' ? t('backoffice.idmEnricher.import.cancel') : progress === 'INPROGRESS' ? t('backoffice.idmEnricher.import.inprogress') : t('backoffice.idmEnricher.import.finish');
   return /*#__PURE__*/jsxs(Fragment, {
@@ -36753,17 +36787,14 @@ function OpenModalButton (_ref) {
       open: isModalOpen,
       onOk: handleOk,
       onCancel: handleOk,
-      cancelButtonProps: progress !== 'SUCCESS' ? {
+      cancelButtonProps: {
         style: {
           display: 'none'
         }
-      } : {
-        onClick: resetProgress
       },
       closable: progress !== 'INPROGRESS',
       maskClosable: progress !== 'INPROGRESS',
       okText: buttonText,
-      cancelText: progress === 'SUCCESS' ? t('backoffice.idmEnricher.import.new') : undefined,
       okButtonProps: {
         disabled: progress === 'INPROGRESS'
       } // Disable the button if progress is 'INPROGRESS'
@@ -37773,7 +37804,7 @@ var useSeriesSelector = function useSeriesSelector(modules) {
     read: idmService + "/v3.0/catalogs/".concat(catalogId, "/series?fields=seriesName[").concat(i18n.language.toLocaleUpperCase(), "];_id")
   };
   var selectMapping = {
-    label: "${seriesName.".concat(i18n.language.toLocaleUpperCase(), "}"),
+    label: "${seriesName.".concat(i18n.language.toLocaleUpperCase(), "} (${serieNo})"),
     value: '${_id}'
   };
   var fetchSerie = /*#__PURE__*/function () {

package/build/types/backoffice/src/ui/IDMCatalogEditor/components/OpenModalButton/Forms/IDMImportForm.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"IDMImportForm.d.ts","sourceRoot":"","sources":["../../../../../../../../../src/ui/IDMCatalogEditor/components/OpenModalButton/Forms/IDMImportForm.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAG1B,OAAO,EAAsB,UAAU,EAAE,MAAM,MAAM,CAAC;AACtD,OAAO,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AAGrD,UAAU,KAAK;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,CAAC,KAAK,EAAE,sBAAsB,EAAE,QAAQ,EAAE,UAAU,CAAC,GAAG,CAAC,EAAE,EAAE,KAAK,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IACrG,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAChC,QAAQ,EAAE,sBAAsB,CAAC;IACjC,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1B,QAAQ,EAAE,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;CAC7B;AAED,MAAM,CAAC,OAAO,WAAW,EAAE,UAAU,EAAE,cAAc,EAAE,cAAc,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,KAAK,qBAgCvH"}
+{"version":3,"file":"IDMImportForm.d.ts","sourceRoot":"","sources":["../../../../../../../../../src/ui/IDMCatalogEditor/components/OpenModalButton/Forms/IDMImportForm.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAG1B,OAAO,EAAsB,UAAU,EAAE,MAAM,MAAM,CAAC;AACtD,OAAO,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AAGrD,UAAU,KAAK;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,CAAC,KAAK,EAAE,sBAAsB,EAAE,QAAQ,EAAE,UAAU,CAAC,GAAG,CAAC,EAAE,EAAE,KAAK,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IACrG,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAChC,QAAQ,EAAE,sBAAsB,CAAC;IACjC,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1B,QAAQ,EAAE,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;CAC7B;AAED,MAAM,CAAC,OAAO,WAAW,EAAE,UAAU,EAAE,cAAc,EAAE,cAAc,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,KAAK,qBAsCvH"}

package/build/types/backoffice/src/ui/IDMCatalogEditor/components/OpenModalButton/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../../../src/ui/IDMCatalogEditor/components/OpenModalButton/index.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAmB,MAAM,OAAO,CAAC;AAMxC,UAAU,KAAK;IACb,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,YAAY,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,MAAM,CAAC;IACvB,OAAO,EAAE,MAAM,IAAI,CAAC;CACrB;AAED,MAAM,CAAC,OAAO,WAAW,EAAE,KAAK,EAAE,IAAI,EAAE,UAAU,EAAE,cAAc,EAAE,OAAO,EAAE,EAAE,KAAK,qBAuEnF"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../../../src/ui/IDMCatalogEditor/components/OpenModalButton/index.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAmB,MAAM,OAAO,CAAC;AAMxC,UAAU,KAAK;IACb,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,YAAY,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,MAAM,CAAC;IACvB,OAAO,EAAE,MAAM,IAAI,CAAC;CACrB;AAED,MAAM,CAAC,OAAO,WAAW,EAAE,KAAK,EAAE,IAAI,EAAE,UAAU,EAAE,cAAc,EAAE,OAAO,EAAE,EAAE,KAAK,qBAyEnF"}

package/build/types/backoffice/src/ui/IDMCatalogEditor/components/UploadButton/index.d.ts

@@ -9,7 +9,8 @@ interface Props {
     updateProgress: (state: IDMIMportProgressState, fileList: UploadFile<any>[], error?: string) => void;
     progress: IDMIMportProgressState;
     fileList: UploadFile<any>[];
+    setName: (name: string) => void;
 }
-export default function ({ action, title, disabled, contentType, updateProgress, fileList, progress }: Props): React.JSX.Element;
+export default function ({ action, title, disabled, contentType, updateProgress, fileList, progress, setName }: Props): React.JSX.Element;
 export {};
 //# sourceMappingURL=index.d.ts.map

package/build/types/backoffice/src/ui/IDMCatalogEditor/components/UploadButton/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../../../src/ui/IDMCatalogEditor/components/UploadButton/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAiB,MAAM,OAAO,CAAC;AAItC,OAAO,KAAK,EAAE,UAAU,EAAe,MAAM,MAAM,CAAC;AAIpD,OAAO,EAAE,sBAAsB,EAAE,MAAM,UAAU,CAAC;AAGlD,UAAU,KAAK;IACb,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,qBAAqB,CAAC;IACnC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,cAAc,EAAE,CAAC,KAAK,EAAE,sBAAsB,EAAE,QAAQ,EAAE,UAAU,CAAC,GAAG,CAAC,EAAE,EAAE,KAAK,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IACrG,QAAQ,EAAE,sBAAsB,CAAC;IACjC,QAAQ,EAAE,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;CAC7B;AAED,MAAM,CAAC,OAAO,WAAW,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,cAAc,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE,KAAK,qBA8H3G"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../../../src/ui/IDMCatalogEditor/components/UploadButton/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAiB,MAAM,OAAO,CAAC;AAItC,OAAO,KAAK,EAAE,UAAU,EAAe,MAAM,MAAM,CAAC;AAIpD,OAAO,EAAE,sBAAsB,EAAE,MAAM,UAAU,CAAC;AAGlD,UAAU,KAAK;IACb,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,qBAAqB,CAAC;IACnC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,cAAc,EAAE,CAAC,KAAK,EAAE,sBAAsB,EAAE,QAAQ,EAAE,UAAU,CAAC,GAAG,CAAC,EAAE,EAAE,KAAK,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IACrG,QAAQ,EAAE,sBAAsB,CAAC;IACjC,QAAQ,EAAE,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;IAC5B,OAAO,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;CACjC;AAED,MAAM,CAAC,OAAO,WAAW,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,cAAc,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,EAAE,KAAK,qBAmJpH"}

package/build/types/backoffice/src/ui/IDMEnricherEditor/components/PriceFactorCellRenderer/priceFactorHelpers.d.ts

@@ -26,7 +26,7 @@ export declare const formatListValue: (values: number[], type: PriceType, locale
 /**
  * Converts an internal value to its display representation
  * For factors: keeps the decimal value
- * For discounts: converts to percentage (e.g., 0.2 -> "20")
+ * For discounts: converts from negative factor to percentage string (e.g., "0.95" -> "5")
  * @param value - The internal value to convert
  * @param type - The type of price modification
  * @returns The display value as string
@@ -35,7 +35,7 @@ export declare const convertToDisplayValue: (value: string, type: PriceType) =>
 /**
  * Converts a display value back to its internal representation
  * For factors: keeps the input value
- * For discounts: converts from percentage to decimal (e.g., "20" -> "0.2")
+ * For discounts: converts the input as a negative factor (e.g., "5" -> "0.95" for a 5% discount)
  * @param value - The display value to convert
  * @param type - The type of price modification
  * @returns The internal value as string

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@crystaldesign/diva-backoffice",
-  "version": "25.9.0-beta.13",
+  "version": "25.9.0-beta.15",
   "license": "COMMERCIAL",
   "devDependencies": {
     "@testing-library/jest-dom": "^6.5.0",
@@ -15,13 +15,13 @@
   "dependencies": {
     "@ant-design/icons": "5.4.0",
     "@babel/runtime": "7.24.7",
-    "@crystaldesign/content-box": "25.9.0-beta.13",
-    "@crystaldesign/content-item": "25.9.0-beta.13",
-    "@crystaldesign/diva-core": "25.9.0-beta.13",
-    "@crystaldesign/diva-utils": "25.9.0-beta.13",
-    "@crystaldesign/media-upload": "25.9.0-beta.13",
-    "@crystaldesign/rtf-editor": "25.9.0-beta.13",
-    "@crystaldesign/spreadsheet": "25.9.0-beta.13",
+    "@crystaldesign/content-box": "25.9.0-beta.15",
+    "@crystaldesign/content-item": "25.9.0-beta.15",
+    "@crystaldesign/diva-core": "25.9.0-beta.15",
+    "@crystaldesign/diva-utils": "25.9.0-beta.15",
+    "@crystaldesign/media-upload": "25.9.0-beta.15",
+    "@crystaldesign/rtf-editor": "25.9.0-beta.15",
+    "@crystaldesign/spreadsheet": "25.9.0-beta.15",
     "@google/model-viewer": "3.5.0",
     "ag-charts-community": "^10.1.0",
     "ag-charts-react": "^10.1.0",
@@ -51,5 +51,5 @@
   },
   "module": "build/esm/index.js",
   "types": "./build/types/backoffice/src/index.d.ts",
-  "gitHead": "f80fd03276c65c51e29b405675f726fd47175573"
+  "gitHead": "0fce5cf3bb5666e6dc433a3bd63af6a2865792df"
 }