pne-ui 4.0.45 → 4.0.47

package/cjs/component/search-ui/filters/component/select/SearchUIProcessorLogEntryTypeSelect.d.ts

@@ -1,9 +1 @@
-import React from 'react';
-import { AbstractEntity } from '../../../../..';
-interface IProps {
-    value: AbstractEntity | null;
-    onChange: (value: AbstractEntity) => void;
-    options: AbstractEntity[];
-}
-declare const SearchUIProcessorLogEntryTypeSelect: (props: IProps) => React.JSX.Element;
-export default SearchUIProcessorLogEntryTypeSelect;
+export { default } from './SearchUIAbstractEntityChipSelect';

package/cjs/component/search-ui/filters/component/select/SearchUIProcessorLogEntryTypeSelect.js

@@ -1,23 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = void 0;
 const tslib_1 = require("tslib");
-const react_1 = tslib_1.__importStar(require("react"));
-const material_1 = require("@mui/material");
-const ExpandMore_1 = tslib_1.__importDefault(require("@mui/icons-material/ExpandMore"));
-const style_1 = require("./style");
-const __1 = require("../../../../..");
-const react_i18next_1 = require("react-i18next");
-const NULL_OPTION = {
-    id: 0,
-    displayName: '',
-};
-const SearchUIProcessorLogEntryTypeSelect = (props) => {
-    const { t } = (0, react_i18next_1.useTranslation)();
-    const { value, onChange, options, } = props;
-    const [open, setOpen] = (0, react_1.useState)(false);
-    return react_1.default.createElement(material_1.Box, { sx: { position: 'relative' } },
-        react_1.default.createElement(material_1.Chip, { onDelete: () => setOpen(true), deleteIcon: react_1.default.createElement(ExpandMore_1.default, null), label: value ? value.displayName : t('react.chooseOne'), size: 'small' }),
-        react_1.default.createElement(__1.PneSelect, { open: open, onClose: () => setOpen(false), onOpen: () => setOpen(true), sx: style_1.selectUnderChipSx, getOptionLabel: opt => opt.label, value: value ? value : NULL_OPTION, onChange: (value) => onChange(value), options: options }));
-};
-exports.default = SearchUIProcessorLogEntryTypeSelect;
+var SearchUIAbstractEntityChipSelect_1 = require("./SearchUIAbstractEntityChipSelect");
+Object.defineProperty(exports, "default", { enumerable: true, get: function () { return tslib_1.__importDefault(SearchUIAbstractEntityChipSelect_1).default; } });
 //# sourceMappingURL=SearchUIProcessorLogEntryTypeSelect.js.map

package/cjs/component/search-ui/filters/component/select/SearchUIProcessorLogEntryTypeSelect.js.map

@@ -1 +1 @@
-{"version":3,"file":"SearchUIProcessorLogEntryTypeSelect.js","sourceRoot":"","sources":["../../../../../../src/component/search-ui/filters/component/select/SearchUIProcessorLogEntryTypeSelect.tsx"],"names":[],"mappings":";;;AAAA,uDAAuC;AACvC,4CAAyC;AACzC,wFAA2D;AAC3D,mCAA2C;AAC3C,sCAA0D;AAC1D,iDAA8C;AAQ9C,MAAM,WAAW,GAAmB;IAChC,EAAE,EAAE,CAAC;IACL,WAAW,EAAE,EAAE;CAClB,CAAA;AAED,MAAM,mCAAmC,GAAG,CAAC,KAAa,EAAE,EAAE;IAC1D,MAAM,EAAE,CAAC,EAAE,GAAG,IAAA,8BAAc,GAAE,CAAA;IAC9B,MAAM,EACF,KAAK,EACL,QAAQ,EACR,OAAO,GACV,GAAG,KAAK,CAAA;IACT,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,IAAA,gBAAQ,EAAC,KAAK,CAAC,CAAA;IAEvC,OAAO,8BAAC,cAAG,IAAC,EAAE,EAAE,EAAE,QAAQ,EAAE,UAAU,EAAE;QACpC,8BAAC,eAAI,IACD,QAAQ,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,EAC7B,UAAU,EAAE,8BAAC,oBAAc,OAAE,EAC7B,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,iBAAiB,CAAC,EACvD,IAAI,EAAE,OAAO,GACf;QACF,8BAAC,aAAS,IACN,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,EAC7B,MAAM,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,EAC3B,EAAE,EAAE,yBAAiB,EACrB,cAAc,EAAE,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,EAChC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,WAAW,EAClC,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,QAAQ,CAAC,KAAuB,CAAC,EACtD,OAAO,EAAE,OAAO,GAClB,CACA,CAAA;AACV,CAAC,CAAA;AAED,kBAAe,mCAAmC,CAAA"}
+{"version":3,"file":"SearchUIProcessorLogEntryTypeSelect.js","sourceRoot":"","sources":["../../../../../../src/component/search-ui/filters/component/select/SearchUIProcessorLogEntryTypeSelect.tsx"],"names":[],"mappings":";;;;AAAA,uFAA4D;AAAnD,oJAAA,OAAO,OAAA"}

package/cjs/component/search-ui/filters/customerLevelDependencies.d.ts

@@ -0,0 +1,6 @@
+import { MultigetCriterion } from './types';
+/**
+ * Returns the merchant selected by an exact multiget criterion.
+ * Customer levels are intentionally unavailable for ALL, SEARCH or multi-selection.
+ */
+export declare const getConcreteCustomerLevelMerchantId: (multigetCriteria: readonly MultigetCriterion[]) => number | null;

package/cjs/component/search-ui/filters/customerLevelDependencies.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getConcreteCustomerLevelMerchantId = void 0;
+const types_1 = require("./types");
+/**
+ * Returns the merchant selected by an exact multiget criterion.
+ * Customer levels are intentionally unavailable for ALL, SEARCH or multi-selection.
+ */
+const getConcreteCustomerLevelMerchantId = (multigetCriteria) => {
+    const merchantCriterion = multigetCriteria.find(criterion => criterion.entityType === types_1.LinkedEntityTypeEnum.MERCHANT);
+    if (!merchantCriterion || merchantCriterion.filterType !== types_1.MultichoiceFilterTypeEnum.NONE) {
+        return null;
+    }
+    const selectedIds = merchantCriterion.selectedItems
+        .split(',')
+        .map(value => value.trim())
+        .filter(Boolean);
+    if (selectedIds.length !== 1) {
+        return null;
+    }
+    const merchantId = Number(selectedIds[0]);
+    return Number.isSafeInteger(merchantId) && merchantId > 0 ? merchantId : null;
+};
+exports.getConcreteCustomerLevelMerchantId = getConcreteCustomerLevelMerchantId;
+//# sourceMappingURL=customerLevelDependencies.js.map

package/cjs/component/search-ui/filters/customerLevelDependencies.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"customerLevelDependencies.js","sourceRoot":"","sources":["../../../../src/component/search-ui/filters/customerLevelDependencies.ts"],"names":[],"mappings":";;;AAAA,mCAIgB;AAEhB;;;GAGG;AACI,MAAM,kCAAkC,GAAG,CAC9C,gBAA8C,EACjC,EAAE;IACf,MAAM,iBAAiB,GAAG,gBAAgB,CAAC,IAAI,CAC3C,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,UAAU,KAAK,4BAAoB,CAAC,QAAQ,CACtE,CAAA;IAED,IAAI,CAAC,iBAAiB,IAAI,iBAAiB,CAAC,UAAU,KAAK,iCAAyB,CAAC,IAAI,EAAE,CAAC;QACxF,OAAO,IAAI,CAAA;IACf,CAAC;IAED,MAAM,WAAW,GAAG,iBAAiB,CAAC,aAAa;SAC9C,KAAK,CAAC,GAAG,CAAC;SACV,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;SAC1B,MAAM,CAAC,OAAO,CAAC,CAAA;IAEpB,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC3B,OAAO,IAAI,CAAA;IACf,CAAC;IAED,MAAM,UAAU,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAA;IACzC,OAAO,MAAM,CAAC,aAAa,CAAC,UAAU,CAAC,IAAI,UAAU,GAAG,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAA;AACjF,CAAC,CAAA;AAtBY,QAAA,kCAAkC,sCAsB9C"}

package/cjs/component/search-ui/filters/state/SearchUIFiltersStoreProvider.d.ts

@@ -0,0 +1,7 @@
+import React from 'react';
+type Props = {
+    settingsContextName: string;
+    children: React.ReactNode;
+};
+export declare const SearchUIFiltersStoreProvider: ({ settingsContextName, children }: Props) => React.JSX.Element;
+export {};

package/cjs/component/search-ui/filters/state/SearchUIFiltersStoreProvider.js

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SearchUIFiltersStoreProvider = void 0;
+const tslib_1 = require("tslib");
+const react_1 = tslib_1.__importStar(require("react"));
+const store_1 = require("./store");
+const retention_1 = require("./retention");
+const SearchUIFiltersStoreProvider = ({ settingsContextName, children }) => {
+    const store = (0, react_1.useMemo)(store_1.createSearchUIFiltersStore, [settingsContextName]);
+    const instanceIdRef = (0, react_1.useRef)(Symbol(settingsContextName));
+    useStoreLifecycleEffect(() => {
+        const unregister = (0, retention_1.registerSearchUIInstance)(settingsContextName, instanceIdRef.current);
+        const persistState = () => (0, retention_1.retainSearchUIState)(settingsContextName, store.getState());
+        const unsubscribe = store.subscribe(persistState);
+        persistState();
+        return () => {
+            persistState();
+            unsubscribe();
+            unregister();
+        };
+    }, [settingsContextName, store]);
+    const contextValue = (0, react_1.useMemo)(() => ({
+        store,
+        instanceId: instanceIdRef.current,
+    }), [store]);
+    return react_1.default.createElement(store_1.SearchUIFiltersStoreContext.Provider, { value: contextValue }, children);
+};
+exports.SearchUIFiltersStoreProvider = SearchUIFiltersStoreProvider;
+const useStoreLifecycleEffect = typeof window === 'undefined' ? react_1.useEffect : react_1.useLayoutEffect;
+//# sourceMappingURL=SearchUIFiltersStoreProvider.js.map

package/cjs/component/search-ui/filters/state/SearchUIFiltersStoreProvider.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"SearchUIFiltersStoreProvider.js","sourceRoot":"","sources":["../../../../../src/component/search-ui/filters/state/SearchUIFiltersStoreProvider.tsx"],"names":[],"mappings":";;;;AAAA,uDAAwE;AACxE,mCAGgB;AAChB,2CAGoB;AAOb,MAAM,4BAA4B,GAAG,CAAC,EAAC,mBAAmB,EAAE,QAAQ,EAAQ,EAAE,EAAE;IACnF,MAAM,KAAK,GAAG,IAAA,eAAO,EAAC,kCAA0B,EAAE,CAAC,mBAAmB,CAAC,CAAC,CAAA;IACxE,MAAM,aAAa,GAAG,IAAA,cAAM,EAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC,CAAA;IAEzD,uBAAuB,CAAC,GAAG,EAAE;QACzB,MAAM,UAAU,GAAG,IAAA,oCAAwB,EAAC,mBAAmB,EAAE,aAAa,CAAC,OAAO,CAAC,CAAA;QACvF,MAAM,YAAY,GAAG,GAAG,EAAE,CAAC,IAAA,+BAAmB,EAAC,mBAAmB,EAAE,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAA;QACrF,MAAM,WAAW,GAAG,KAAK,CAAC,SAAS,CAAC,YAAY,CAAC,CAAA;QAEjD,YAAY,EAAE,CAAA;QAEd,OAAO,GAAG,EAAE;YACR,YAAY,EAAE,CAAA;YACd,WAAW,EAAE,CAAA;YACb,UAAU,EAAE,CAAA;QAChB,CAAC,CAAA;IACL,CAAC,EAAE,CAAC,mBAAmB,EAAE,KAAK,CAAC,CAAC,CAAA;IAEhC,MAAM,YAAY,GAAG,IAAA,eAAO,EAAC,GAAG,EAAE,CAAC,CAAC;QAChC,KAAK;QACL,UAAU,EAAE,aAAa,CAAC,OAAO;KACpC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAA;IAEZ,OAAO,8BAAC,mCAA2B,CAAC,QAAQ,IAAC,KAAK,EAAE,YAAY,IAC3D,QAAQ,CAC0B,CAAA;AAC3C,CAAC,CAAA;AA1BY,QAAA,4BAA4B,gCA0BxC;AAED,MAAM,uBAAuB,GAAG,OAAO,MAAM,KAAK,WAAW,CAAC,CAAC,CAAC,iBAAS,CAAC,CAAC,CAAC,uBAAe,CAAA"}

package/cjs/component/search-ui/filters/state/actions.js

@@ -14,6 +14,7 @@ const isoWeek_1 = tslib_1.__importDefault(require("dayjs/plugin/isoWeek"));
 const cloneDeep_1 = tslib_1.__importDefault(require("lodash/cloneDeep"));
 const isEqual_1 = tslib_1.__importDefault(require("lodash/isEqual"));
 const dateRangeTimeZone_1 = require("../dateRangeTimeZone");
+const customerLevelDependencies_1 = require("../customerLevelDependencies");
 dayjs_1.default.extend(utc_1.default);
 dayjs_1.default.extend(timezone_1.default);
 dayjs_1.default.extend(isoWeek_1.default);
@@ -32,6 +33,7 @@ const criterionToLinkedEntityMap = {
 const getLinkedEntityTypeByCriterion = (criterion) => {
     return criterionToLinkedEntityMap[criterion] ?? null;
 };
+const isConfiguredCriterion = (draft, criterion) => draft.possibleCriteria.includes(criterion) || draft.predefinedCriteria.includes(criterion);
 const getInitialMultigetCriterion = (entityType) => ({
     entityType: entityType,
     filterType: types_1.MultichoiceFilterTypeEnum.NONE,
@@ -82,58 +84,141 @@ const sanitizeMultigetCriteria = (incoming, activeCriteria) => {
     });
     return Array.from(uniqueByEntity.values());
 };
+const isRetainedSnapshotCompatible = (snapshot, state) => {
+    return (0, isEqual_1.default)(snapshot.possibleCriteria, state.possibleCriteria)
+        && (0, isEqual_1.default)(snapshot.predefinedCriteria, state.predefinedCriteria)
+        && (0, isEqual_1.default)(snapshot.exactSearchLabels, state.exactSearchLabels)
+        && snapshot.manualSearch === !!state.config?.manualSearch;
+};
+const addCriterionReducer = (draft, criterion, configuredOnly = false) => {
+    if (configuredOnly && !isConfiguredCriterion(draft, criterion)) {
+        return;
+    }
+    if (draft.criteria.includes(criterion)) {
+        const entityType = getLinkedEntityTypeByCriterion(criterion);
+        if (entityType !== null
+            && !draft.multigetCriteria.some(multigetCriterion => multigetCriterion.entityType === entityType)) {
+            draft.multigetCriteria.push(getInitialMultigetCriterion(entityType));
+        }
+        return;
+    }
+    draft.criteria.push(criterion);
+    addInitialMultigetCriterionReducer(draft, criterion);
+};
+const ensureCustomerLevelDependenciesReducer = (draft) => {
+    if (!draft.criteria.includes(types_1.CriterionTypeEnum.CUSTOMER_LEVEL)) {
+        return;
+    }
+    types_1.CUSTOMER_LEVEL_DEPENDENCIES.forEach(dependency => addCriterionReducer(draft, dependency, true));
+};
+const applyConditionsReducer = (draft, conditions) => {
+    const { criteria: incomingCriteria, multigetCriteria: incomingMultigetCriteria, ...rest } = conditions;
+    const prevCriteria = draft.criteria.slice();
+    Object.assign(draft, rest);
+    if (incomingCriteria !== undefined) {
+        const allowedCriteria = new Set([
+            ...draft.predefinedCriteria,
+            ...draft.possibleCriteria,
+        ]);
+        const sanitizedIncoming = Array.from(new Set(incomingCriteria.filter(criterion => allowedCriteria.has(criterion))));
+        const mergedCriteria = Array.from(new Set([
+            ...draft.predefinedCriteria,
+            ...sanitizedIncoming,
+        ]));
+        const removedCriteria = prevCriteria.filter(criterion => !mergedCriteria.includes(criterion));
+        removedCriteria.forEach(criterion => {
+            clearCriterionReducer(draft, criterion);
+        });
+        const addedCriteria = mergedCriteria.filter(criterion => !prevCriteria.includes(criterion));
+        if (incomingMultigetCriteria === undefined) {
+            addedCriteria.forEach(criterion => {
+                addInitialMultigetCriterionReducer(draft, criterion);
+            });
+        }
+        draft.criteria = mergedCriteria;
+    }
+    if (incomingMultigetCriteria !== undefined) {
+        const sanitizedMultigetCriteria = sanitizeMultigetCriteria(incomingMultigetCriteria, draft.criteria);
+        const missingEntityTypes = draft.criteria
+            .map(getLinkedEntityTypeByCriterion)
+            .filter((entityType) => entityType !== null)
+            .filter(entityType => !sanitizedMultigetCriteria.some(item => item.entityType === entityType));
+        missingEntityTypes.forEach(entityType => {
+            sanitizedMultigetCriteria.push(getInitialMultigetCriterion(entityType));
+        });
+        draft.multigetCriteria = sanitizedMultigetCriteria;
+    }
+    ensureCustomerLevelDependenciesReducer(draft);
+};
+const restoreAppliedSearchCriteria = (snapshot, retainedDraftSearchCriteria, currentSearchCriteria) => {
+    if (!snapshot.hasUnappliedFilters || !snapshot.appliedSearchCriteria) {
+        return currentSearchCriteria;
+    }
+    const retainedDraftWithoutDates = {
+        ...retainedDraftSearchCriteria,
+        dateFrom: currentSearchCriteria.dateFrom,
+        dateTo: currentSearchCriteria.dateTo,
+    };
+    if (!(0, isEqual_1.default)(retainedDraftWithoutDates, currentSearchCriteria)) {
+        return currentSearchCriteria;
+    }
+    return {
+        ...(0, cloneDeep_1.default)(snapshot.appliedSearchCriteria),
+        dateFrom: (0, isEqual_1.default)(snapshot.appliedSearchCriteria.dateFrom, retainedDraftSearchCriteria.dateFrom)
+            ? currentSearchCriteria.dateFrom
+            : snapshot.appliedSearchCriteria.dateFrom,
+        dateTo: (0, isEqual_1.default)(snapshot.appliedSearchCriteria.dateTo, retainedDraftSearchCriteria.dateTo)
+            ? currentSearchCriteria.dateTo
+            : snapshot.appliedSearchCriteria.dateTo,
+    };
+};
 const getSearchUIFiltersActions = (set, get) => ({
-    setInitialState: (state) => {
+    setInitialState: (state, retainedSnapshot) => {
         set((draft) => {
-            return {
+            const initialState = {
                 ...draft,
                 ...(0, initial_1.getSearchUIFiltersInitialState)(),
                 ...(0, initial_1.getSearchUIInitialSearchCriteria)(state.defaults),
                 ...state,
             };
+            Object.assign(draft, initialState);
+            ensureCustomerLevelDependenciesReducer(draft);
+            if (retainedSnapshot && isRetainedSnapshotCompatible(retainedSnapshot, initialState)) {
+                applyConditionsReducer(draft, retainedSnapshot.searchConditions);
+                draft.activeTemplateName = retainedSnapshot.activeTemplateName;
+                draft.restoredFromRetention = true;
+            }
+            draft.initialized = true;
         });
-        postUpdate(set, get);
+        const retainedDraftSearchCriteria = get().restoredFromRetention
+            ? extractSearchCriteriaFromState(get())
+            : null;
+        syncCriterionAvailability(set, get);
+        normalizeRetainedDateRange(set, get);
+        ensureTransactionSessionStatusesPrefetched(set, get);
+        if (get().restoredFromRetention && retainedSnapshot && retainedDraftSearchCriteria) {
+            const currentSearchCriteria = extractSearchCriteriaFromState(get());
+            const appliedSearchCriteria = get().config?.manualSearch
+                ? restoreAppliedSearchCriteria(retainedSnapshot, retainedDraftSearchCriteria, currentSearchCriteria)
+                : currentSearchCriteria;
+            get().onFiltersUpdate(appliedSearchCriteria);
+            set((draft) => {
+                draft.prevSearchCriteria = currentSearchCriteria;
+                draft.appliedSearchCriteria = appliedSearchCriteria;
+                draft.hasUnappliedFilters = !!draft.config?.manualSearch
+                    && !(0, isEqual_1.default)(currentSearchCriteria, appliedSearchCriteria);
+            });
+            return;
+        }
+        checkIfFiltersChanged(set, get);
     },
     updateConditions: (conditions, options) => {
         set((draft) => {
-            const { criteria: incomingCriteria, multigetCriteria: incomingMultigetCriteria, ...rest } = conditions;
-            const prevCriteria = draft.criteria.slice();
-            Object.assign(draft, rest);
-            if (incomingCriteria !== undefined) {
-                const allowedCriteria = new Set([
-                    ...draft.predefinedCriteria,
-                    ...draft.possibleCriteria,
-                ]);
-                const sanitizedIncoming = Array.from(new Set(incomingCriteria.filter(criterion => allowedCriteria.has(criterion))));
-                const mergedCriteria = Array.from(new Set([
-                    ...draft.predefinedCriteria,
-                    ...sanitizedIncoming,
-                ]));
-                const removedCriteria = prevCriteria.filter(criterion => !mergedCriteria.includes(criterion));
-                removedCriteria.forEach(criterion => {
-                    clearCriterionReducer(draft, criterion);
-                });
-                const addedCriteria = mergedCriteria.filter(criterion => !prevCriteria.includes(criterion));
-                if (incomingMultigetCriteria === undefined) {
-                    addedCriteria.forEach(criterion => {
-                        addInitialMultigetCriterionReducer(draft, criterion);
-                    });
-                }
-                draft.criteria = mergedCriteria;
-            }
-            if (incomingMultigetCriteria !== undefined) {
-                const sanitizedMultigetCriteria = sanitizeMultigetCriteria(incomingMultigetCriteria, draft.criteria);
-                const missingEntityTypes = draft.criteria
-                    .map(getLinkedEntityTypeByCriterion)
-                    .filter((entityType) => entityType !== null)
-                    .filter(entityType => !sanitizedMultigetCriteria.some(item => item.entityType === entityType));
-                missingEntityTypes.forEach(entityType => {
-                    sanitizedMultigetCriteria.push(getInitialMultigetCriterion(entityType));
-                });
-                draft.multigetCriteria = sanitizedMultigetCriteria;
-            }
+            applyConditionsReducer(draft, conditions);
             if (options?.resetTemplate) {
                 draft.template = null;
+                draft.activeTemplateName = null;
+                draft.skipLastTemplateAutoApply = true;
             }
         });
         postUpdate(set, get, options);
@@ -150,6 +235,8 @@ const getSearchUIFiltersActions = (set, get) => ({
         set(draft => {
             Object.assign(draft, conditions);
             draft.template = template;
+            draft.activeTemplateName = template?.name ?? null;
+            ensureCustomerLevelDependenciesReducer(draft);
         });
         syncCriterionAvailability(set, get);
         const currentSearchCriteria = extractSearchCriteriaFromState(get());
@@ -158,19 +245,23 @@ const getSearchUIFiltersActions = (set, get) => ({
         }
         set(draft => {
             draft.prevSearchCriteria = currentSearchCriteria;
+            if (!hasUnappliedFilters) {
+                draft.appliedSearchCriteria = currentSearchCriteria;
+            }
             draft.hasUnappliedFilters = hasUnappliedFilters;
         });
     },
     clearCriteria: () => {
         localStorage.removeItem(LAST_TEMPLATE_NAME + get().settingsContextName);
         set((draft) => {
-            return {
-                ...draft,
+            Object.assign(draft, {
                 ...(0, initial_1.getSearchUIInitialSearchCriteria)(draft.defaults),
                 exactSearchLabel: draft.exactSearchLabels[0],
                 template: null,
+                activeTemplateName: null,
                 criteria: draft.predefinedCriteria,
-            };
+            });
+            ensureCustomerLevelDependenciesReducer(draft);
         });
         postUpdate(set, get);
     },
@@ -183,8 +274,10 @@ const getSearchUIFiltersActions = (set, get) => ({
     },
     addCriterion: (criterionType) => {
         set((draft) => {
-            draft.criteria.push(criterionType);
-            addInitialMultigetCriterionReducer(draft, criterionType);
+            if (criterionType === types_1.CriterionTypeEnum.CUSTOMER_LEVEL) {
+                types_1.CUSTOMER_LEVEL_DEPENDENCIES.forEach(dependency => addCriterionReducer(draft, dependency, true));
+            }
+            addCriterionReducer(draft, criterionType);
         });
         get().setJustAddedCriterion(criterionType);
         postUpdate(set, get);
@@ -209,6 +302,7 @@ const getSearchUIFiltersActions = (set, get) => ({
             set((draft) => {
                 draft.templates.push(template);
                 draft.template = template;
+                draft.activeTemplateName = template.name;
             });
         })
             // .catch(raiseUIError)
@@ -226,6 +320,7 @@ const getSearchUIFiltersActions = (set, get) => ({
                 const index = draft.templates.findIndex(t => t.name === templateName);
                 draft.templates[index].searchConditions = template.searchConditions;
                 draft.template = template;
+                draft.activeTemplateName = template.name;
             });
         })
             // .catch(raiseUIError)
@@ -247,7 +342,9 @@ const getSearchUIFiltersActions = (set, get) => ({
                 if (draft.template?.name === template.name) {
                     Object.assign(draft, (0, initial_1.getSearchUIInitialSearchCriteria)(draft.defaults));
                     draft.template = null;
+                    draft.activeTemplateName = null;
                     draft.criteria = draft.predefinedCriteria;
+                    ensureCustomerLevelDependenciesReducer(draft);
                 }
             });
             postUpdate(set, get);
@@ -265,22 +362,37 @@ const getSearchUIFiltersActions = (set, get) => ({
         }
         localStorage.setItem(LAST_TEMPLATE_NAME + get().settingsContextName, template.name);
         set((draft) => {
-            return {
-                ...draft,
-                template: template,
-                ...conditions,
-            };
+            Object.assign(draft, defaults);
+            draft.template = template;
+            draft.activeTemplateName = template.name;
+            applyConditionsReducer(draft, conditions);
         });
         postUpdate(set, get, options);
     },
     loadTemplates: () => {
-        get().defaults.getSearchTemplates(get().settingsContextName)
+        const settingsContextName = get().settingsContextName;
+        const defaults = get().defaults;
+        defaults.getSearchTemplates(settingsContextName)
             .then(templates => {
+            if (get().settingsContextName !== settingsContextName) {
+                return;
+            }
             const normalizedTemplates = templates.map(normalizeSearchUITemplate);
             set((draft) => {
                 draft.templates = normalizedTemplates;
             });
-            const lastTemplateName = localStorage.getItem(LAST_TEMPLATE_NAME + get().settingsContextName);
+            if (get().restoredFromRetention) {
+                const activeTemplate = normalizedTemplates.find(t => t.name === get().activeTemplateName) ?? null;
+                set((draft) => {
+                    draft.template = activeTemplate;
+                    draft.activeTemplateName = activeTemplate?.name ?? null;
+                });
+                return;
+            }
+            if (get().skipLastTemplateAutoApply) {
+                return;
+            }
+            const lastTemplateName = localStorage.getItem(LAST_TEMPLATE_NAME + settingsContextName);
             const lastTemplate = normalizedTemplates.find(t => t.name === lastTemplateName);
             if (lastTemplate) {
                 get().setTemplate(lastTemplate, { forceSearch: true });
@@ -296,8 +408,15 @@ const getSearchUIFiltersActions = (set, get) => ({
     },
     setMultigetCriterion: (criterion) => {
         set((draft) => {
+            const previousMerchantId = criterion.entityType === types_1.LinkedEntityTypeEnum.MERCHANT
+                ? (0, customerLevelDependencies_1.getConcreteCustomerLevelMerchantId)(draft.multigetCriteria)
+                : null;
             const index = draft.multigetCriteria.findIndex(c => c.entityType === criterion.entityType);
             draft.multigetCriteria[index] = criterion;
+            if (criterion.entityType === types_1.LinkedEntityTypeEnum.MERCHANT
+                && previousMerchantId !== (0, customerLevelDependencies_1.getConcreteCustomerLevelMerchantId)(draft.multigetCriteria)) {
+                draft.customerLevel = null;
+            }
         });
         postUpdate(set, get);
     },
@@ -344,8 +463,19 @@ const getSearchUIFiltersActions = (set, get) => ({
         });
         postUpdate(set, get);
     },
+    setCustomerLevelCriterion: customerLevel => {
+        set((draft) => {
+            draft.customerLevel = (0, customerLevelDependencies_1.getConcreteCustomerLevelMerchantId)(draft.multigetCriteria) === null
+                ? null
+                : customerLevel;
+        });
+        postUpdate(set, get);
+    },
     setCurrenciesCriterion: (currencies) => {
         set((draft) => {
+            if (!(0, isEqual_1.default)(draft.currencies, currencies)) {
+                draft.customerLevel = null;
+            }
             draft.currencies = currencies;
         });
         postUpdate(set, get);
@@ -490,6 +620,7 @@ const getSearchUIFiltersActions = (set, get) => ({
         const currentSearchCriteria = extractSearchCriteriaFromState(get());
         get().onFiltersUpdate(currentSearchCriteria);
         set((draft) => {
+            draft.appliedSearchCriteria = currentSearchCriteria;
             draft.hasUnappliedFilters = false;
         });
     },
@@ -524,6 +655,7 @@ const addInitialMultigetCriterionReducer = (draft, criterionType) => {
         case types_1.CriterionTypeEnum.RESELLER:
             draft.multigetCriteria.push(getInitialMultigetCriterion(types_1.LinkedEntityTypeEnum.RESELLER));
             break;
+        case types_1.CriterionTypeEnum.CUSTOMER_LEVEL:
         case types_1.CriterionTypeEnum.CURRENCY:
         case types_1.CriterionTypeEnum.EXACT:
         case types_1.CriterionTypeEnum.ORDERS_SEARCH:
@@ -567,8 +699,12 @@ const clearCriterionReducer = (draft, criterionType) => {
             draft.ordersSearchLabel = 'merchant_invoice_id';
             draft.ordersSearchValue = '';
             break;
+        case types_1.CriterionTypeEnum.CUSTOMER_LEVEL:
+            draft.customerLevel = null;
+            break;
         case types_1.CriterionTypeEnum.CURRENCY:
             draft.currencies = initial_1.searchUIInitialAllableCollection;
+            draft.customerLevel = null;
             break;
         case types_1.CriterionTypeEnum.COUNTRIES:
             draft.countries = initial_1.searchUICountriesInitialAllableCollection;
@@ -600,6 +736,7 @@ const clearCriterionReducer = (draft, criterionType) => {
             break;
         case types_1.CriterionTypeEnum.MERCHANT:
             removeMultigetCriterionReducer(draft, types_1.LinkedEntityTypeEnum.MERCHANT);
+            draft.customerLevel = null;
             break;
         case types_1.CriterionTypeEnum.RESELLER:
             removeMultigetCriterionReducer(draft, types_1.LinkedEntityTypeEnum.RESELLER);
@@ -845,6 +982,17 @@ const postUpdate = (set, get, options) => {
     ensureTransactionSessionStatusesPrefetched(set, get);
     checkIfFiltersChanged(set, get, options);
 };
+const normalizeRetainedDateRange = (set, get) => {
+    const state = get();
+    if (!state.restoredFromRetention || state.dateRangeSpec.dateRangeSpecType === 'EXACTLY') {
+        return;
+    }
+    const timeSelectionEnabled = isDateRangeTimeSelectionEnabled(state.criteria, state.config);
+    const normalizedDateRange = calculateNonExactDates(state.dateRangeSpec, getNonExactDateRangeTimeZone(state.config, timeSelectionEnabled));
+    set(draft => {
+        draft.dateRangeSpec = normalizedDateRange;
+    });
+};
 const syncCriterionAvailability = (set, get) => {
     const criteriaWithRules = (0, criterionAvailability_1.getCriteriaWithAvailabilityRules)(get().config);
     if (!criteriaWithRules.length) {
@@ -900,6 +1048,7 @@ const checkIfFiltersChanged = (set, get, options) => {
             get().onFiltersUpdate(currentSearchCriteria);
             set((draft) => {
                 draft.prevSearchCriteria = currentSearchCriteria;
+                draft.appliedSearchCriteria = currentSearchCriteria;
                 draft.hasUnappliedFilters = false;
             });
         }
@@ -908,12 +1057,19 @@ const checkIfFiltersChanged = (set, get, options) => {
 const extractSearchCriteriaFromState = (state) => {
     const timeSelectionEnabled = isDateRangeTimeSelectionEnabled(state.criteria, state.config);
     const dateOnlyTimeZone = getConfiguredDateOnlyTimeZone(state.config);
+    const customerLevelDependenciesSatisfied = state.criteria.includes(types_1.CriterionTypeEnum.CUSTOMER_LEVEL)
+        && state.criteria.includes(types_1.CriterionTypeEnum.MERCHANT)
+        && state.criteria.includes(types_1.CriterionTypeEnum.CURRENCY)
+        && (0, customerLevelDependencies_1.getConcreteCustomerLevelMerchantId)(state.multigetCriteria) !== null;
     return {
         initialized: true,
         exactSearchLabel: extractExactSearchLabel(state.exactSearchLabel),
         exactSearchValue: state.exactSearchValue,
         ordersSearchLabel: state.ordersSearchLabel,
         ordersSearchValue: state.ordersSearchValue,
+        customerLevelId: customerLevelDependenciesSatisfied
+            ? state.customerLevel?.id ?? null
+            : null,
         status: extractStatus(state.status),
         threeD: extract3D(state.threeD),
         currencies: extractEntitiesIds(state.currencies),
@@ -947,6 +1103,7 @@ const getTemplate = (templateName, store) => ({
         exactSearchValue: store.exactSearchValue,
         ordersSearchLabel: store.ordersSearchLabel,
         ordersSearchValue: store.ordersSearchValue,
+        customerLevel: store.customerLevel,
         status: store.status,
         currencies: store.currencies,
         countries: store.countries,
@@ -1045,6 +1202,7 @@ exports.OrdersSearchLabelsConfig = {
     'customer_billing_country': { type: 'country', maxLength: 128 },
     'customer_dna_id': { type: 'integer', maxLength: 10 },
     'customer_id': { type: 'integer', maxLength: 10 },
+    'merchant_customer_identifier': { type: 'string', maxLength: 128 },
     'batch_id': { type: 'integer', maxLength: 10 },
     'source_bank_name': { type: 'string', maxLength: 128 },
     'source_country': { type: 'country', maxLength: 128 },