@mcurros2/microm 1.1.443-0 → 1.1.446-0

package/dist/index.js

@@ -210,6 +210,7 @@ function $ed5512685e858344$export$f1f43a62560a15ec(props) {
     ]);
     const getAbortController = (0, $b4te3$react.useRef)(new AbortController);
     const saveAbortController = (0, $b4te3$react.useRef)(new AbortController);
+    const navigationProtectionBypassRef = (0, $b4te3$react.useRef)(false);
     const getInFlightRef = (0, $b4te3$react.useRef)(false);
     const cancellableSaveInFlightRef = (0, $b4te3$react.useRef)(false);
     const preserveSilentSaveOnUnmountRef = (0, $b4te3$react.useRef)(false);
@@ -417,6 +418,20 @@ function $ed5512685e858344$export$f1f43a62560a15ec(props) {
     const removeValidation = (0, $b4te3$react.useCallback)((column)=>{
         delete validationObject.current[column.name];
     }, []);
+    const completeWithNavigationProtectionBypassed = (0, $b4te3$react.useCallback)(async (complete)=>{
+        navigationProtectionBypassRef.current = true;
+        try {
+            const result = await complete();
+            // Awaiting callers resume before the next timer, so immediate navigation stays unprotected.
+            setTimeout(()=>{
+                navigationProtectionBypassRef.current = false;
+            }, 0);
+            return result;
+        } catch (error) {
+            navigationProtectionBypassRef.current = false;
+            throw error;
+        }
+    }, []);
     // MMC: silentSave handling
     const silentSaveInFlight = (0, $b4te3$react.useRef)(null);
     const silentSave = (0, $b4te3$react.useCallback)((requestOptions)=>{
@@ -508,12 +523,14 @@ function $ed5512685e858344$export$f1f43a62560a15ec(props) {
                     lastGetValues.current = completedValues;
                     if (mountedRef.current) form.resetDirty(completedValues);
                     if (action.refreshOnClose && mountedRef.current) await performGetData();
-                    if (buttonName === 'OK' && onSaved) await Promise.resolve(onSaved(actionStatus ?? {
-                        loading: false,
-                        operationType: formMode
-                    }));
-                    if (buttonName === 'Cancel' && onCancel) await Promise.resolve(onCancel());
-                    return true;
+                    return await completeWithNavigationProtectionBypassed(async ()=>{
+                        if (buttonName === 'OK' && onSaved) await Promise.resolve(onSaved(actionStatus ?? {
+                            loading: false,
+                            operationType: formMode
+                        }));
+                        if (buttonName === 'Cancel' && onCancel) await Promise.resolve(onCancel());
+                        return true;
+                    });
                 }
             });
         } catch (error) {
@@ -522,6 +539,7 @@ function $ed5512685e858344$export$f1f43a62560a15ec(props) {
             return false;
         }
     }, [
+        completeWithNavigationProtectionBypassed,
         entity,
         form,
         formMode,
@@ -579,23 +597,27 @@ function $ed5512685e858344$export$f1f43a62560a15ec(props) {
         }
         else save_result = await saveAndGet(saveAndGetOnSubmit || false);
         const saved = save_result.error === undefined && save_result.data !== undefined && save_result.data.Failed !== true;
-        if (saved && onSaved) {
-            // MMC: fix for mantine DateInput bug "invalid date"
-            // check all form values for date columns and set them to null if invalid
-            // The bug happens when closing the form with invalid date values, after save
-            for(const c in entity.def.columns){
-                if ((0, $lTNXP.isIn)(entity.def.columns[c].type, 'date', 'datetime', 'datetime2', 'smalldatetime')) {
-                    if (form.values[c]?.toString() === 'Invalid Date' || form.values[c]?.toString() === '') {
-                        form.values[c] = null;
-                        entity.def.columns[c].value = null;
+        if (!saved) return false;
+        return await completeWithNavigationProtectionBypassed(async ()=>{
+            if (onSaved) {
+                // MMC: fix for mantine DateInput bug "invalid date"
+                // check all form values for date columns and set them to null if invalid
+                // The bug happens when closing the form with invalid date values, after save
+                for(const c in entity.def.columns){
+                    if ((0, $lTNXP.isIn)(entity.def.columns[c].type, 'date', 'datetime', 'datetime2', 'smalldatetime')) {
+                        if (form.values[c]?.toString() === 'Invalid Date' || form.values[c]?.toString() === '') {
+                            form.values[c] = null;
+                            entity.def.columns[c].value = null;
+                        }
                     }
                 }
+                await Promise.resolve(onSaved(save_result));
             }
-            await Promise.resolve(onSaved(save_result));
-        }
-        return saved;
+            return true;
+        });
     }, [
         activeFormActions.OK,
+        completeWithNavigationProtectionBypassed,
         entity.def.columns,
         form.values,
         formMode,
@@ -621,6 +643,7 @@ function $ed5512685e858344$export$f1f43a62560a15ec(props) {
         onCancel
     ]);
     const hasUnsavedChanges = (0, $b4te3$react.useCallback)(()=>{
+        if (navigationProtectionBypassRef.current) return false;
         if (navigationProtectionMode === 'allways') return true;
         if (navigationProtectionMode === 'disabled') return false;
         return form.isDirty() && !(0, $2cfmO.areValuesObjectsEqual)(form.values, lastGetValues.current);
@@ -7351,6 +7374,8 @@ parcelRegister("9GCyf", function(module, exports) {
 
 $parcel$export(module.exports, "useHierarchyKeys", function () { return $7f5304fd68d04ed6$export$1dc6a021c60990b5; });
 
+parcelRequire("2eyXi");
+var $2cfmO = parcelRequire("2cfmO");
 const $7f5304fd68d04ed6$var$generateParentKeysArray = (hierarchy, mappedHierarchy, values, changedIndex)=>{
     return hierarchy.map((_, index)=>{
         const parentKeys = {};
@@ -7364,12 +7389,7 @@ const $7f5304fd68d04ed6$var$generateParentKeysArray = (hierarchy, mappedHierarch
 };
 const $7f5304fd68d04ed6$var$areParentKeysArraysEqual = (left, right)=>{
     if (left.length !== right.length) return false;
-    return left.every((leftKeys, index)=>{
-        const rightKeys = right[index];
-        const leftNames = Object.keys(leftKeys);
-        const rightNames = Object.keys(rightKeys);
-        return leftNames.length === rightNames.length && leftNames.every((name)=>leftKeys[name] === rightKeys[name]);
-    });
+    return left.every((leftKeys, index)=>(0, $2cfmO.areValuesObjectsEqual)(leftKeys, right[index]));
 };
 const $7f5304fd68d04ed6$var$areStringArraysEqual = (left, right)=>{
     if (left === undefined || right === undefined) return left === right;
@@ -9302,6 +9322,8 @@ $parcel$export(module.exports, "DataGrid", function () { return $3ea298384e41b05
 
 
 
+parcelRequire("2eyXi");
+var $2cfmO = parcelRequire("2cfmO");
 parcelRequire("7xGLy");
 var $d50o9 = parcelRequire("d50o9");
 var $lFsp3 = parcelRequire("lFsp3");
@@ -9322,6 +9344,8 @@ var $3vFhj = parcelRequire("3vFhj");
 var $TMsro = parcelRequire("TMsro");
 
 var $5JIrZ = parcelRequire("5JIrZ");
+
+var $5hC9b = parcelRequire("5hC9b");
 const $3ea298384e41b05b$export$7a235056ace2c138 = {
     search: [],
     limit: "10000",
@@ -9378,13 +9402,35 @@ const $3ea298384e41b05b$export$7a235056ace2c138 = {
 };
 function $3ea298384e41b05b$export$c8dd51eb24f71762(props) {
     props = (0, $b4te3$mantinecore.useComponentDefaultProps)('DataGrid', $3ea298384e41b05b$export$7a235056ace2c138, props);
+    const { executeRetainedSearch: executeRetainedSearch, ...retainedSearchProps } = (0, $5hC9b.useRetainedSearch)({
+        retainSearch: props.retainSearch,
+        search: props.search,
+        onSearch: props.onSearch,
+        onSearchTextChange: props.onSearchTextChange
+    });
+    props = {
+        ...props,
+        ...retainedSearchProps
+    };
     const { entity: entity, selectionMode: selectionMode, gridHeight: gridHeight, preserveSelection: preserveSelection, autoSelectFirstRow: autoSelectFirstRow, autoFocus: autoFocus, toolbarIconVariant: toolbarIconVariant, actionsButtonVariant: actionsButtonVariant, enableAdd: enableAdd, enableEdit: enableEdit, enableDelete: enableDelete, enableView: enableView, enableExport: enableExport, columnBorders: columnBorders, autoSizeColumnsOnLoad: autoSizeColumnsOnLoad, rowBorders: rowBorders, withBorder: withBorder, labels: labels, columnsOverrides: columnsOverrides, toolbarSize: toolbarSize, viewName: viewName, showActions: showActions, renderOnlyWhenVisible: renderOnlyWhenVisible, filtersFormSize: filtersFormSize, parentKeys: parentKeys, search: search, limit: limit, parentFormAPI: parentFormAPI, showToolbar: showToolbar, showActionsToolbar: showActionsToolbar, enableImport: enableImport, setInitialFiltersFromColumns: setInitialFiltersFromColumns, visibleFilters: visibleFilters, formMode: formMode, showColumnsConfigMenu: showColumnsConfigMenu, showSelectRowsButton: showSelectRowsButton, maxSearchTerms: maxSearchTerms, minGridHeight: minGridHeight, refreshOnInit: refreshOnInit, onSearch: onSearch, onSearchTextChange: onSearchTextChange, addActionName: addActionName, editActionName: editActionName, deleteActionName: deleteActionName, viewActionName: viewActionName } = props;
     const theme = (0, $b4te3$mantinecore.useMantineTheme)();
     const visibilityDivRef = (0, $b4te3$react.useRef)(null);
     const isFirstVisible = (0, $i27OQ.useFirstVisible)(visibilityDivRef);
     const [searchData, setSearchData] = (0, $b4te3$react.useState)((0, $7B1hX.getInitialSearchData)(search) ?? []);
     const viewState = (0, $7B1hX.useViewState)(search, limit);
-    const [executeViewEnabled, setExecuteViewEnabled] = (0, $b4te3$react.useState)(refreshOnInit !== false);
+    const [executeViewEnabled, setExecuteViewEnabled] = (0, $b4te3$react.useState)(refreshOnInit !== false || executeRetainedSearch);
+    const [initialParentKeys] = (0, $b4te3$react.useState)(parentKeys);
+    (0, $b4te3$react.useEffect)(()=>{
+        if (executeViewEnabled) return;
+        if (!executeRetainedSearch && (0, $2cfmO.areValuesObjectsEqual)(initialParentKeys, parentKeys)) return;
+        // eslint-disable-next-line react-hooks/set-state-in-effect
+        setExecuteViewEnabled(true);
+    }, [
+        executeRetainedSearch,
+        executeViewEnabled,
+        initialParentKeys,
+        parentKeys
+    ]);
     const executeViewState = (0, $lB8CV.useExecuteView)(entity, parentKeys, viewName, viewState.searchText, viewState.limitRows, viewState.refresh, viewState.filterValues, executeViewEnabled);
     const dataGridAPI = (0, $5JIrZ.useDataGrid)(props, {
         executeViewState: executeViewState,
@@ -34766,6 +34812,71 @@ function $8e67432a124f4bfb$export$f77741f33c48605(props, stateProps) {
 
 });
 
+parcelRegister("5hC9b", function(module, exports) {
+
+$parcel$export(module.exports, "useRetainedSearch", function () { return $77f9cb72fb2d6360$export$af39f590caec4ba9; });
+
+
+const $77f9cb72fb2d6360$var$RETAINED_SEARCH_VERSION = 1;
+const $77f9cb72fb2d6360$var$RETAINED_SEARCH_PREFIX = "retained-search";
+const $77f9cb72fb2d6360$var$DISABLED_SEARCH_KEY = `${$77f9cb72fb2d6360$var$RETAINED_SEARCH_PREFIX}:disabled`;
+function $77f9cb72fb2d6360$var$createInitialState(initialSearch) {
+    return {
+        version: $77f9cb72fb2d6360$var$RETAINED_SEARCH_VERSION,
+        executed: false,
+        terms: initialSearch ?? []
+    };
+}
+function $77f9cb72fb2d6360$var$deserializeRetainedSearch(value, initialSearch) {
+    try {
+        const parsed = JSON.parse(value);
+        if (parsed.version !== $77f9cb72fb2d6360$var$RETAINED_SEARCH_VERSION || typeof parsed.executed !== "boolean" || !Array.isArray(parsed.terms) || !parsed.terms.every((term)=>typeof term === "string")) return $77f9cb72fb2d6360$var$createInitialState(initialSearch);
+        return parsed;
+    } catch  {
+        return $77f9cb72fb2d6360$var$createInitialState(initialSearch);
+    }
+}
+function $77f9cb72fb2d6360$export$af39f590caec4ba9({ retainSearch: retainSearch, search: search, onSearch: onSearch, onSearchTextChange: onSearchTextChange }) {
+    const [state, setState] = (0, $b4te3$mantinehooks.useSessionStorage)({
+        key: retainSearch ? `${$77f9cb72fb2d6360$var$RETAINED_SEARCH_PREFIX}:${retainSearch}` : $77f9cb72fb2d6360$var$DISABLED_SEARCH_KEY,
+        defaultValue: $77f9cb72fb2d6360$var$createInitialState(search),
+        getInitialValueInEffect: false,
+        deserialize: (value)=>$77f9cb72fb2d6360$var$deserializeRetainedSearch(value, search)
+    });
+    const handleSearch = (0, $b4te3$react.useCallback)((searchText)=>{
+        setState(searchText?.length ? {
+            version: $77f9cb72fb2d6360$var$RETAINED_SEARCH_VERSION,
+            executed: true,
+            terms: searchText
+        } : $77f9cb72fb2d6360$var$createInitialState());
+        onSearch?.(searchText);
+    }, [
+        onSearch,
+        setState
+    ]);
+    const handleSearchTextChange = (0, $b4te3$react.useCallback)((searchText)=>{
+        if (!searchText?.length) setState($77f9cb72fb2d6360$var$createInitialState());
+        onSearchTextChange?.(searchText);
+    }, [
+        onSearchTextChange,
+        setState
+    ]);
+    if (!retainSearch) return {
+        search: search,
+        executeRetainedSearch: false,
+        onSearch: onSearch,
+        onSearchTextChange: onSearchTextChange
+    };
+    return {
+        search: state.terms,
+        executeRetainedSearch: state.executed,
+        onSearch: handleSearch,
+        onSearchTextChange: handleSearchTextChange
+    };
+}
+
+});
+
 
 parcelRegister("jLHxW", function(module, exports) {
 
@@ -35028,8 +35139,6 @@ parcelRequire("2Qb3Q");
 var $kjFvY = parcelRequire("kjFvY");
 
 var $8Yv4s = parcelRequire("8Yv4s");
-
-var $5hC9b = parcelRequire("5hC9b");
 const $8d0c133549cd711e$export$ca3c0aba4a54ad4 = {
     actionsButtonVariant: 'light',
     toolbarIconVariant: 'light',
@@ -35051,19 +35160,16 @@ function $8d0c133549cd711e$export$9cb50712304736e2(props) {
     const { client: client, parentKeys: parentKeys, actionsButtonVariant: actionsButtonVariant, toolbarIconVariant: toolbarIconVariant, formMode: formMode, enableAdd: enableAdd, enableEdit: enableEdit, enableDelete: enableDelete, enableView: enableView, retainSearch: retainSearch, search: search, refreshOnInit: refreshOnInit, onSearch: onSearch, onSearchTextChange: onSearchTextChange, bgLight: bgLight, bgDark: bgDark, gridHeight: gridHeight, containerCardProps: containerCardProps, loadingComponent: loadingComponent, entityConstructor: entityConstructor, entityLoader: entityLoader, ...rest } = mergedProps;
     const theme = (0, $b4te3$mantinecore.useMantineTheme)();
     const { result: entityBuilder, ready: entityReady } = (0, $8Yv4s.useResolvedEntityBuilder)(client, parentKeys, mergedProps);
-    const retainedSearchProps = (0, $5hC9b.useRetainedSearch)({
-        retainSearch: retainSearch,
-        search: search,
-        refreshOnInit: refreshOnInit,
-        onSearch: onSearch,
-        onSearchTextChange: onSearchTextChange
-    });
     return /*#__PURE__*/ (0, $b4te3$reactjsxruntime.jsx)((0, $b4te3$mantinecore.Card), {
         bg: theme.colorScheme === "light" ? bgLight : bgDark,
         ...containerCardProps,
         children: !entityReady || !entityBuilder ? loadingComponent : /*#__PURE__*/ (0, $b4te3$reactjsxruntime.jsx)((0, $kjFvY.DataGrid), {
             ...rest,
-            ...retainedSearchProps,
+            retainSearch: retainSearch,
+            search: search,
+            refreshOnInit: refreshOnInit,
+            onSearch: onSearch,
+            onSearchTextChange: onSearchTextChange,
             parentKeys: parentKeys,
             formMode: formMode,
             enableAdd: enableAdd !== undefined ? enableAdd : formMode === "view" ? false : undefined,
@@ -35121,71 +35227,6 @@ function $37d1aaa86f76c559$export$c87356516bcec8d(client, parentKeys, source) {
 
 });
 
-parcelRegister("5hC9b", function(module, exports) {
-
-$parcel$export(module.exports, "useRetainedSearch", function () { return $77f9cb72fb2d6360$export$af39f590caec4ba9; });
-
-
-const $77f9cb72fb2d6360$var$RETAINED_SEARCH_VERSION = 1;
-const $77f9cb72fb2d6360$var$RETAINED_SEARCH_PREFIX = "retained-search";
-const $77f9cb72fb2d6360$var$DISABLED_SEARCH_KEY = `${$77f9cb72fb2d6360$var$RETAINED_SEARCH_PREFIX}:disabled`;
-function $77f9cb72fb2d6360$var$createInitialState(initialSearch) {
-    return {
-        version: $77f9cb72fb2d6360$var$RETAINED_SEARCH_VERSION,
-        executed: false,
-        terms: initialSearch ?? []
-    };
-}
-function $77f9cb72fb2d6360$var$deserializeRetainedSearch(value, initialSearch) {
-    try {
-        const parsed = JSON.parse(value);
-        if (parsed.version !== $77f9cb72fb2d6360$var$RETAINED_SEARCH_VERSION || typeof parsed.executed !== "boolean" || !Array.isArray(parsed.terms) || !parsed.terms.every((term)=>typeof term === "string")) return $77f9cb72fb2d6360$var$createInitialState(initialSearch);
-        return parsed;
-    } catch  {
-        return $77f9cb72fb2d6360$var$createInitialState(initialSearch);
-    }
-}
-function $77f9cb72fb2d6360$export$af39f590caec4ba9({ retainSearch: retainSearch, search: search, refreshOnInit: refreshOnInit, onSearch: onSearch, onSearchTextChange: onSearchTextChange }) {
-    const [state, setState] = (0, $b4te3$mantinehooks.useSessionStorage)({
-        key: retainSearch ? `${$77f9cb72fb2d6360$var$RETAINED_SEARCH_PREFIX}:${retainSearch}` : $77f9cb72fb2d6360$var$DISABLED_SEARCH_KEY,
-        defaultValue: $77f9cb72fb2d6360$var$createInitialState(search),
-        getInitialValueInEffect: false,
-        deserialize: (value)=>$77f9cb72fb2d6360$var$deserializeRetainedSearch(value, search)
-    });
-    const handleSearch = (0, $b4te3$react.useCallback)((searchText)=>{
-        setState(searchText?.length ? {
-            version: $77f9cb72fb2d6360$var$RETAINED_SEARCH_VERSION,
-            executed: true,
-            terms: searchText
-        } : $77f9cb72fb2d6360$var$createInitialState());
-        onSearch?.(searchText);
-    }, [
-        onSearch,
-        setState
-    ]);
-    const handleSearchTextChange = (0, $b4te3$react.useCallback)((searchText)=>{
-        if (!searchText?.length) setState($77f9cb72fb2d6360$var$createInitialState());
-        onSearchTextChange?.(searchText);
-    }, [
-        onSearchTextChange,
-        setState
-    ]);
-    if (!retainSearch) return {
-        search: search,
-        refreshOnInit: refreshOnInit,
-        onSearch: onSearch,
-        onSearchTextChange: onSearchTextChange
-    };
-    return {
-        search: state.terms,
-        refreshOnInit: state.executed ? true : refreshOnInit,
-        onSearch: handleSearch,
-        onSearchTextChange: handleSearchTextChange
-    };
-}
-
-});
-
 
 
 parcelRegister("17D0Z", function(module, exports) {
@@ -41017,6 +41058,8 @@ $parcel$export(module.exports, "DataView", function () { return $2a573abad3e0e83
 
 
 
+parcelRequire("2eyXi");
+var $2cfmO = parcelRequire("2cfmO");
 parcelRequire("7xGLy");
 var $d50o9 = parcelRequire("d50o9");
 var $7B1hX = parcelRequire("7B1hX");
@@ -41028,6 +41071,8 @@ var $j8hoz = parcelRequire("j8hoz");
 
 var $TMsro = parcelRequire("TMsro");
 
+var $5hC9b = parcelRequire("5hC9b");
+
 var $2iAx4 = parcelRequire("2iAx4");
 
 var $5yF9X = parcelRequire("5yF9X");
@@ -41082,10 +41127,32 @@ const $2a573abad3e0e83e$export$8d0177ff9f5686ad = {
 };
 const $2a573abad3e0e83e$export$5e15d737b33a1c27 = /*#__PURE__*/ (0, $b4te3$react.forwardRef)(function DataView(props, ref) {
     props = (0, $b4te3$mantinecore.useComponentDefaultProps)('DataView', $2a573abad3e0e83e$export$8d0177ff9f5686ad, props);
+    const { executeRetainedSearch: executeRetainedSearch, ...retainedSearchProps } = (0, $5hC9b.useRetainedSearch)({
+        retainSearch: props.retainSearch,
+        search: props.search,
+        onSearch: props.onSearch,
+        onSearchTextChange: props.onSearchTextChange
+    });
+    props = {
+        ...props,
+        ...retainedSearchProps
+    };
     const { entity: entity, autoFocus: autoFocus, toolbarIconVariant: toolbarIconVariant, actionsButtonVariant: actionsButtonVariant, enableAdd: enableAdd, enableEdit: enableEdit, enableDelete: enableDelete, enableView: enableView, enableExport: enableExport, labels: labels, Card: Card, CardContainer: CardContainer, limit: limit, search: search, viewName: viewName, filtersFormSize: filtersFormSize, toolbarSize: toolbarSize, showAppliedFilters: showAppliedFilters, showRefreshButton: showRefreshButton, hideCheckboxToggle: hideCheckboxToggle, showFiltersButton: showFiltersButton, searchPlaceholder: searchPlaceholder, showActions: showActions, parentKeys: parentKeys, visibleFilters: visibleFilters, setInitialFiltersFromColumns: setInitialFiltersFromColumns, cardHrefRootURL: cardHrefRootURL, cardHrefTarget: cardHrefTarget, showSearchInput: showSearchInput, showSelectRowsButton: showSelectRowsButton, showToolbar: showToolbar, showDeleteOnlyWhenMultiselect: showDeleteOnlyWhenMultiselect, parentFormAPI: parentFormAPI, formMode: formMode, CardRowAlign: CardRowAlign, RowsContainer: RowsContainer, refreshOnInit: refreshOnInit, RowsContainerProps: RowsContainerProps, onSearch: onSearch, onSearchTextChange: onSearchTextChange, addActionName: addActionName, editActionName: editActionName, deleteActionName: deleteActionName, viewActionName: viewActionName } = props;
     const [searchData, setSearchData] = (0, $b4te3$react.useState)((0, $7B1hX.getInitialSearchData)(search) ?? []);
     const viewState = (0, $7B1hX.useViewState)(search, limit);
-    const [executeViewEnabled, setExecuteViewEnabled] = (0, $b4te3$react.useState)(refreshOnInit !== false);
+    const [executeViewEnabled, setExecuteViewEnabled] = (0, $b4te3$react.useState)(refreshOnInit !== false || executeRetainedSearch);
+    const [initialParentKeys] = (0, $b4te3$react.useState)(parentKeys);
+    (0, $b4te3$react.useEffect)(()=>{
+        if (executeViewEnabled) return;
+        if (!executeRetainedSearch && (0, $2cfmO.areValuesObjectsEqual)(initialParentKeys, parentKeys)) return;
+        // eslint-disable-next-line react-hooks/set-state-in-effect
+        setExecuteViewEnabled(true);
+    }, [
+        executeRetainedSearch,
+        executeViewEnabled,
+        initialParentKeys,
+        parentKeys
+    ]);
     const executeViewState = (0, $lB8CV.useExecuteView)(entity, parentKeys, viewName, viewState.searchText, viewState.limitRows, viewState.refresh, viewState.filterValues, executeViewEnabled);
     const dataViewAPI = (0, $5yF9X.useDataView)(props, {
         executeViewState: executeViewState,
@@ -41358,8 +41425,6 @@ $parcel$export(module.exports, "DataViewPanel", function () { return $5072e0bd8d
 parcelRequire("ccjva");
 var $7n39P = parcelRequire("7n39P");
 
-var $5hC9b = parcelRequire("5hC9b");
-
 var $8Yv4s = parcelRequire("8Yv4s");
 const $5072e0bd8dd4d8f5$export$7eaaa54623f2185b = {
     actionsButtonVariant: 'light',
@@ -41402,19 +41467,16 @@ function $5072e0bd8dd4d8f5$export$3dd1ad9bd450bb4f(props) {
     const { client: client, parentKeys: parentKeys, actionsButtonVariant: actionsButtonVariant, toolbarIconVariant: toolbarIconVariant, formMode: formMode, enableAdd: enableAdd, enableEdit: enableEdit, enableDelete: enableDelete, enableView: enableView, Card: CardProp, retainSearch: retainSearch, search: search, refreshOnInit: refreshOnInit, onSearch: onSearch, onSearchTextChange: onSearchTextChange, bgLight: bgLight, bgDark: bgDark, rowsContainerProps: rowsContainerProps, containerCardProps: containerCardProps, loadingComponent: loadingComponent, entityConstructor: entityConstructor, entityLoader: entityLoader, ...rest } = mergedProps;
     const theme = (0, $b4te3$mantinecore.useMantineTheme)();
     const { result: entityBuilder, ready: entityReady } = (0, $8Yv4s.useResolvedEntityBuilder)(client, parentKeys, mergedProps);
-    const retainedSearchProps = (0, $5hC9b.useRetainedSearch)({
-        retainSearch: retainSearch,
-        search: search,
-        refreshOnInit: refreshOnInit,
-        onSearch: onSearch,
-        onSearchTextChange: onSearchTextChange
-    });
     return /*#__PURE__*/ (0, $b4te3$reactjsxruntime.jsx)((0, $b4te3$mantinecore.Card), {
         bg: theme.colorScheme === "light" ? bgLight : bgDark,
         ...containerCardProps,
         children: !entityReady || !entityBuilder ? loadingComponent : /*#__PURE__*/ (0, $b4te3$reactjsxruntime.jsx)((0, $7n39P.DataView), {
             ...rest,
-            ...retainedSearchProps,
+            retainSearch: retainSearch,
+            search: search,
+            refreshOnInit: refreshOnInit,
+            onSearch: onSearch,
+            onSearchTextChange: onSearchTextChange,
             RowsContainer: (0, $b4te3$mantinecore.SimpleGrid),
             RowsContainerProps: rowsContainerProps,
             formMode: formMode,