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

package/build/esm/index.js

@@ -17509,14 +17509,29 @@ function useSelectSimpleData (_ref) {
     });
     return selected.value;
   }, [selected]);
+  var setLoadedOptions = function setLoadedOptions(options) {
+    var _options$;
+    setOptions(options);
+    if (value && options) {
+      LOG$a.debug('value changed', toJS(value), toJS(options));
+      var _selected = findByValue(value, options, selectMapping);
+      var selectedValues = Array.isArray(_selected) ? _selected.map(function (item) {
+        return item.value;
+      }) : _selected === null || _selected === void 0 ? void 0 : _selected.value;
+      onSelectionChanged(selectedValues, _selected);
+    } else if (options !== null && options !== void 0 && (_options$ = options[0]) !== null && _options$ !== void 0 && _options$.value && autoSelectFirst) {
+      onSelectionChanged(options[0].value, options[0]);
+    }
+  };
   useEffect(function () {
     if (configuredOptions) {
       if (apiHandler.canReadList) LOG$a.warn('If options are provided, apiInterface will not be used');
-      setOptions(configuredOptions);
+      setLoadedOptions(configuredOptions);
       setLoading(false);
       return;
     }
-    if (options) {
+    if (sharedState !== null && sharedState !== void 0 && sharedState.options) {
+      setLoadedOptions(sharedState.options);
       setLoading(false);
       return;
     }
@@ -17528,25 +17543,11 @@ function useSelectSimpleData (_ref) {
       var options = data.data.map(function (item) {
         return parseDataEntry(item, selectMapping);
       });
-      setOptions(options);
+      setLoadedOptions(options);
     })["finally"](function () {
       setLoading(false);
     });
   }, []);
-  useEffect(function () {
-    var _options$;
-    // set the selected option only after the options are loaded
-    if (value && options) {
-      LOG$a.debug('value changed', value);
-      var _selected = findByValue(value, options, selectMapping);
-      var selectedValues = Array.isArray(_selected) ? _selected.map(function (item) {
-        return item.value;
-      }) : _selected === null || _selected === void 0 ? void 0 : _selected.value;
-      onSelectionChanged(selectedValues, _selected);
-    } else if (options !== null && options !== void 0 && (_options$ = options[0]) !== null && _options$ !== void 0 && _options$.value && autoSelectFirst) {
-      onSelectionChanged(options[0].value, options[0]);
-    }
-  }, [value, options]);
   var onSelectionChanged = function onSelectionChanged(value, option) {
     setSelected(option);
     onChange === null || onChange === void 0 || onChange(parseReturnData(option, selectMapping));
@@ -35910,24 +35911,34 @@ var useCatalogContext = function useCatalogContext() {
       root.contextStore.clearContext('catalog');
     }
 
-    // Only update if catalog changed
-    // initally ony the id is set so we need to update it again if we get the full catalog form the selector, so only checking for id is not enough
+    // initally only the id is set so we need to update it again if we get the full catalog form the selector
     var currentCatalog = getContext().selectedCatalog;
-    if (currentCatalog._id === newCatalog._id && currentCatalog.name === newCatalog.name && JSON.stringify(currentCatalog.isoLanguageIds) === JSON.stringify(newCatalog.isoLanguageIds)) {
-      return; // No changes detected
+    var catalogChanged = currentCatalog._id !== newCatalog._id;
+    var catalogDataOnlyChanged = currentCatalog.name === newCatalog.name && JSON.stringify(currentCatalog.isoLanguageIds) === JSON.stringify(newCatalog.isoLanguageIds);
+    if (!catalogChanged && !catalogDataOnlyChanged) {
+      // No changes detected
+      return;
+    }
+    if (!catalogChanged && catalogDataOnlyChanged) {
+      // Only the data changed, so we only need to update the context of the catalog
+      root.contextStore.updateContext('catalog', {
+        selectedCatalog: newCatalog,
+        catalogId: newCatalog._id
+      });
+      return;
     }
+    if (catalogChanged) {
+      // The catalog changed, so we need to rest the full context
+      root.contextStore.updateContext('catalog', {
+        selectedCatalog: newCatalog,
+        catalogId: newCatalog._id,
+        selectedSerie: undefined,
+        selectedItem: undefined,
+        selectedFeature: undefined,
+        seriesSelectorState: createDefaultSelectState('seriesSelectorState'),
+        featureSelectorState: createDefaultSelectState('featureSelectorState')
+      });
 
-    // Update any field catalog changed
-    root.contextStore.updateContext('catalog', {
-      selectedCatalog: newCatalog,
-      catalogId: newCatalog._id,
-      selectedSerie: undefined,
-      selectedItem: undefined,
-      selectedFeature: undefined,
-      seriesSelectorState: createDefaultSelectState('seriesSelectorState'),
-      featureSelectorState: createDefaultSelectState('featureSelectorState')
-    });
-    if (currentCatalog._id !== newCatalog._id) {
       // Update URL only if the id changed
       navigate(path + newCatalog._id + (modules.length ? '/' + modules.join('/') : '') + (searchParams ? '?' + searchParams.toString() : ''));
     }
@@ -36756,27 +36767,22 @@ var CatalogSelector$1 = observer(CatalogSelector);
 var SeriesSelector = function SeriesSelector(_ref) {
   var modules = _ref.modules;
   var _useTranslation = useTranslation(),
-    t = _useTranslation.t,
-    i18n = _useTranslation.i18n;
-  var _useCatalogContext = useCatalogContext(modules),
-    catalogId = _useCatalogContext.catalogId,
-    idmService = _useCatalogContext.idmService,
-    selectedSerie = _useCatalogContext.selectedSerie,
-    setSelectedSerie = _useCatalogContext.setSelectedSerie,
-    seriesSelectorState = _useCatalogContext.seriesSelectorState;
+    t = _useTranslation.t;
+  var _useSeriesSelector = useSeriesSelector(modules),
+    catalogId = _useSeriesSelector.catalogId,
+    seriesSelectorState = _useSeriesSelector.seriesSelectorState,
+    apiInterface = _useSeriesSelector.apiInterface,
+    selectedSerie = _useSeriesSelector.selectedSerie,
+    onChange = _useSeriesSelector.onChange,
+    selectMapping = _useSeriesSelector.selectMapping;
   return /*#__PURE__*/jsx(SimpleSelect, {
     sharedState: seriesSelectorState,
-    apiInterface: {
-      read: idmService + '/v3.0/catalogs/' + catalogId + "/series?fields=seriesName[".concat(i18n.language.toLocaleUpperCase(), "];_id;serieNo;pricefeaturegroups;pricefeaturegroupsDisplayTexts;pricefeaturegroupsKeys;pricefeaturegroupsKeysDisplayTexts")
-    },
-    selectMapping: {
-      label: "${seriesName.".concat(i18n.language.toLocaleUpperCase(), "}"),
-      value: '${_id}'
-    },
+    apiInterface: apiInterface,
+    selectMapping: selectMapping,
     autoSelectFirst: true,
     title: t('backoffice.menu.items.label.IDMCatalogEditorTableSeries'),
     value: selectedSerie,
-    onChange: setSelectedSerie,
+    onChange: onChange,
     search: true,
     style: {
       width: 200
@@ -36785,6 +36791,95 @@ var SeriesSelector = function SeriesSelector(_ref) {
   }, catalogId);
 };
 var SeriesSelector$1 = observer(SeriesSelector);
+var useSeriesSelector = function useSeriesSelector(modules) {
+  var _useTranslation2 = useTranslation(),
+    i18n = _useTranslation2.i18n;
+  var root = useStore();
+  var _useCatalogContext = useCatalogContext(modules),
+    catalogId = _useCatalogContext.catalogId,
+    idmService = _useCatalogContext.idmService,
+    selectedSerie = _useCatalogContext.selectedSerie,
+    setSelectedSerie = _useCatalogContext.setSelectedSerie,
+    seriesSelectorState = _useCatalogContext.seriesSelectorState;
+  var _useState = useState(selectedSerie),
+    _useState2 = _slicedToArray(_useState, 2),
+    selected = _useState2[0],
+    setSelected = _useState2[1];
+  var apiInterface = {
+    read: idmService + "/v3.0/catalogs/".concat(catalogId, "/series?fields=seriesName[").concat(i18n.language.toLocaleUpperCase(), "];_id")
+  };
+  var selectMapping = {
+    label: "${seriesName.".concat(i18n.language.toLocaleUpperCase(), "}"),
+    value: '${_id}'
+  };
+  var fetchSerie = /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(newSerie) {
+      var _seriesSelectorState$, _seriesSelectorState$2;
+      var isLoaded, api, serie, option;
+      return _regeneratorRuntime.wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            if (newSerie) {
+              _context.next = 2;
+              break;
+            }
+            return _context.abrupt("return");
+          case 2:
+            // if the extend series data is already loaded, use it
+            isLoaded = !!((_seriesSelectorState$ = seriesSelectorState.options) !== null && _seriesSelectorState$ !== void 0 && (_seriesSelectorState$ = _seriesSelectorState$.find(function (option) {
+              return option.value === (newSerie === null || newSerie === void 0 ? void 0 : newSerie._id);
+            })) !== null && _seriesSelectorState$ !== void 0 && (_seriesSelectorState$ = _seriesSelectorState$.data) !== null && _seriesSelectorState$ !== void 0 && _seriesSelectorState$.serieNo);
+            if (!isLoaded) {
+              _context.next = 6;
+              break;
+            }
+            setSelectedSerie(newSerie);
+            return _context.abrupt("return");
+          case 6:
+            //fetching of pricefeatruegroups is slow, so we can't fetch it in the list, but only for the selected serie
+            seriesSelectorState.setLoading(true);
+            api = new _default$d({
+              type: 'SelectSimple',
+              apiInterface: {
+                read: idmService + "/v3.0/catalogs/".concat(catalogId, "/series/").concat(newSerie._id, "?fields=seriesName[").concat(i18n.language.toLocaleUpperCase(), "];_id;serieNo;pricefeaturegroups;pricefeaturegroupsDisplayTexts;pricefeaturegroupsKeys;pricefeaturegroupsKeysDisplayTexts")
+              }
+            }, root);
+            _context.next = 10;
+            return api.read();
+          case 10:
+            serie = _context.sent;
+            //save the extended series data in the options, without triggering state change
+            option = (_seriesSelectorState$2 = seriesSelectorState.options) === null || _seriesSelectorState$2 === void 0 ? void 0 : _seriesSelectorState$2.find(function (option) {
+              return option.value === newSerie._id;
+            });
+            if (option) {
+              option.data = serie;
+            }
+            setSelectedSerie(serie);
+            seriesSelectorState.setLoading(false);
+          case 15:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function fetchSerie(_x) {
+      return _ref2.apply(this, arguments);
+    };
+  }();
+  var onChange = function onChange(value) {
+    setSelected(value);
+    fetchSerie(value);
+  };
+  return {
+    catalogId: catalogId,
+    seriesSelectorState: seriesSelectorState,
+    apiInterface: apiInterface,
+    selectMapping: selectMapping,
+    selectedSerie: selected,
+    onChange: onChange
+  };
+};
 
 function useModule (currentModules) {
   var root = useStore();

package/build/types/backoffice/src/ui/IDMCatalogEditor/components/PrefilterSelectors/SeriesSelector.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SeriesSelector.d.ts","sourceRoot":"","sources":["../../../../../../../../src/ui/IDMCatalogEditor/components/PrefilterSelectors/SeriesSelector.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;uCAMW;IAAE,OAAO,EAAE,MAAM,EAAE,CAAA;CAAE;;;AA8B1D,wBAAwC"}
+{"version":3,"file":"SeriesSelector.d.ts","sourceRoot":"","sources":["../../../../../../../../src/ui/IDMCatalogEditor/components/PrefilterSelectors/SeriesSelector.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAmB,MAAM,OAAO,CAAC;uCASH;IAAE,OAAO,EAAE,MAAM,EAAE,CAAA;CAAE;;;AAqB1D,wBAAwC"}

package/build/types/backoffice/src/ui/IDMCatalogEditor/hooks/useCatalogContext.d.ts

@@ -8,12 +8,12 @@ export declare const useCatalogContext: (currentModules?: string[]) => {
     selectedCatalog: any;
     idmService: string;
     organizationId: string;
-    catalogSelectorState?: SharedSelectState;
+    catalogSelectorState: SharedSelectState;
     selectedSerie?: any;
-    seriesSelectorState?: SharedSelectState;
+    seriesSelectorState: SharedSelectState;
     selectedItem?: any;
-    itemSelectorState?: SharedSelectState;
+    itemSelectorState: SharedSelectState;
     selectedFeature?: any;
-    featureSelectorState?: SharedSelectState;
+    featureSelectorState: SharedSelectState;
 };
 //# sourceMappingURL=useCatalogContext.d.ts.map

package/build/types/backoffice/src/ui/IDMCatalogEditor/hooks/useCatalogContext.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useCatalogContext.d.ts","sourceRoot":"","sources":["../../../../../../../src/ui/IDMCatalogEditor/hooks/useCatalogContext.ts"],"names":[],"mappings":"AAGA,OAAO,EAAU,iBAAiB,EAAE,MAAM,sDAAsD,CAAC;AAiBjG,eAAO,MAAM,iBAAiB,oBAAoB,MAAM,EAAE;8BAqD9C,GAAG,GAAG,SAAS;4BAOhB,GAAG,GAAG,SAAS;kCAOZ,GAAG,GAAG,SAAS;kCAOf,GAAG,GAAG,MAAM,YAAW,MAAM,EAAE,SAAyB,MAAM,UAAiB,OAAO;eAvFvF,MAAM;qBACA,GAAG;gBACR,MAAM;oBACF,MAAM;2BACC,iBAAiB;oBACxB,GAAG;0BACG,iBAAiB;mBACxB,GAAG;wBACE,iBAAiB;sBACnB,GAAG;2BACE,iBAAiB;CAsIzC,CAAC"}
+{"version":3,"file":"useCatalogContext.d.ts","sourceRoot":"","sources":["../../../../../../../src/ui/IDMCatalogEditor/hooks/useCatalogContext.ts"],"names":[],"mappings":"AAGA,OAAO,EAAU,iBAAiB,EAAE,MAAM,sDAAsD,CAAC;AAiBjG,eAAO,MAAM,iBAAiB,oBAAoB,MAAM,EAAE;8BAqD9C,GAAG,GAAG,SAAS;4BAOhB,GAAG,GAAG,SAAS;kCAOZ,GAAG,GAAG,SAAS;kCAOf,GAAG,GAAG,MAAM,YAAW,MAAM,EAAE,SAAyB,MAAM,UAAiB,OAAO;eAvFvF,MAAM;qBACA,GAAG;gBACR,MAAM;oBACF,MAAM;0BACA,iBAAiB;oBACvB,GAAG;yBACE,iBAAiB;mBACvB,GAAG;uBACC,iBAAiB;sBAClB,GAAG;0BACC,iBAAiB;CA+IxC,CAAC"}

package/build/types/backoffice/src/ui/SelectSimple/useSelectSimpleData.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useSelectSimpleData.d.ts","sourceRoot":"","sources":["../../../../../../src/ui/SelectSimple/useSelectSimpleData.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,qBAAqB,EAAE,MAAM,EAAiB,MAAM,SAAS,CAAC;AAMvE,MAAM,CAAC,OAAO,WAAW,EACvB,YAAY,EACZ,aAAa,EACb,UAAU,EACV,QAAQ,EACR,KAAK,EACL,OAAO,EAAE,iBAAiB,EAC1B,eAAe,EACf,WAAW,GACZ,EAAE,qBAAqB;;;;sBAsEa,GAAG,UAAU,MAAM,GAAG,MAAM,EAAE,GAAG,SAAS;;EAiB9E"}
+{"version":3,"file":"useSelectSimpleData.d.ts","sourceRoot":"","sources":["../../../../../../src/ui/SelectSimple/useSelectSimpleData.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,qBAAqB,EAAE,MAAM,EAAiB,MAAM,SAAS,CAAC;AAOvE,MAAM,CAAC,OAAO,WAAW,EACvB,YAAY,EACZ,aAAa,EACb,UAAU,EACV,QAAQ,EACR,KAAK,EACL,OAAO,EAAE,iBAAiB,EAC1B,eAAe,EACf,WAAW,GACZ,EAAE,qBAAqB;;;;sBAuEa,GAAG,UAAU,MAAM,GAAG,MAAM,EAAE,GAAG,SAAS;;EAiB9E"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@crystaldesign/diva-backoffice",
-  "version": "25.8.0-beta.13",
+  "version": "25.8.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.8.0-beta.13",
-    "@crystaldesign/content-item": "25.8.0-beta.13",
-    "@crystaldesign/diva-core": "25.8.0-beta.13",
-    "@crystaldesign/diva-utils": "25.8.0-beta.13",
-    "@crystaldesign/media-upload": "25.8.0-beta.13",
-    "@crystaldesign/rtf-editor": "25.8.0-beta.13",
-    "@crystaldesign/spreadsheet": "25.8.0-beta.13",
+    "@crystaldesign/content-box": "25.8.0-beta.15",
+    "@crystaldesign/content-item": "25.8.0-beta.15",
+    "@crystaldesign/diva-core": "25.8.0-beta.15",
+    "@crystaldesign/diva-utils": "25.8.0-beta.15",
+    "@crystaldesign/media-upload": "25.8.0-beta.15",
+    "@crystaldesign/rtf-editor": "25.8.0-beta.15",
+    "@crystaldesign/spreadsheet": "25.8.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": "1711631dd5429aa9ad629c4e77427e69e969a3c0"
+  "gitHead": "bf79de9df314c4ae32cd6d5f778cc9b4322aad95"
 }