namirasoft-account-react 1.5.13 → 1.5.15

package/src/layouts/NSALayout.tsx

@@ -1,7 +1,6 @@
 import { NamirasoftAccountClient } from 'namirasoft-account-client';
 import { ProductFullRow } from 'namirasoft-api-product';
 import { CacheService, EnvService, IStorageLocal, NamingConvention } from 'namirasoft-core';
-import { EntityResolveResponseRow } from 'namirasoft-field';
 import { NamirasoftMessageServer } from 'namirasoft-message';
 import { NamirasoftMap } from 'namirasoft-site-map';
 import { IBackgroundProps, IBaseComponentProps, IHeaderIconProps, IHeaderRightProps, NSBarActionProps, NSBarAlertProps, NSBarTitleProps, NSDialogDelete, NSLayout, NSLoading, ProductCacheService } from 'namirasoft-site-react';
@@ -18,7 +17,7 @@ import { NSAWorkspaceListDialog } from '../components/NSAWorkspaceListDialog';
 import { FieldCacheService } from '../FieldCacheService';
 import { IEntityInfo } from '../IEntityInfo';
 import { NSACacheService } from '../NSACacheService';
-import { NSARouterMakerProps } from '../NSARouterMakerProps';
+import { NSARouterMakerResult } from '../NSARouterMakerResult';
 import { UseParams } from '../UseParams';
 import { Actions } from './Actions';
 import { NSALayout_Field } from './NSALayout_Field';
@@ -61,7 +60,7 @@ export interface NSALayoutPagesProps<RowType extends { id: string }, RowTypeInpu
     };
     view?: NSASectionViewCutomProps<RowType>;
 }
-export interface NSALayoutCustomProps<RowType extends { id: string }, RowTypeInput = RowType> extends IBaseComponentProps, NSARouterMakerProps
+export interface NSALayoutCustomProps<RowType extends { id: string }, RowTypeInput = RowType> extends IBaseComponentProps, NSARouterMakerResult
 {
     action?: NSBarActionProps;
     title?: NSBarTitleProps;
@@ -111,8 +110,6 @@ interface NSALayoutState
     showWorkspaceListDialog: boolean;
     showUserDialog: boolean;
     showMasterMenu: boolean;
-    ctf_enabled: boolean;
-    ctf_rows: EntityResolveResponseRow | null;
 }
 
 export class NSALayout<RowType extends { id: string }, RowTypeInput = RowType> extends Component<NSALayoutProps<RowType, RowTypeInput>, NSALayoutState>
@@ -122,7 +119,6 @@ export class NSALayout<RowType extends { id: string }, RowTypeInput = RowType> e
     private hasCFT: boolean;
     private isLoggedIn: boolean;
     private cache_product: CacheService<ProductFullRow>;
-    private cache_field: CacheService<EntityResolveResponseRow>;
     private cache_message: CacheService<number>;
     private cache_master_menu: CacheService<{ open: boolean }>;
     NSASectionList_Ref = createRef<NSASectionList<RowType, RowTypeInput>>();
@@ -151,9 +147,6 @@ export class NSALayout<RowType extends { id: string }, RowTypeInput = RowType> e
         // Cache Product
         this.cache_product = ProductCacheService.get(this.props.product_id, console.error);
 
-        // Cache Fields
-        this.cache_field = FieldCacheService.get(this.props.account.token_manager, this.props.product_id, props.notifier.onError)
-
         // Cache Message
         this.cache_message = new CacheService<number>("ns-messsage-count", new IStorageLocal(), 15, async () => "1.0.0", async () =>
         {
@@ -181,8 +174,6 @@ export class NSALayout<RowType extends { id: string }, RowTypeInput = RowType> e
             showWorkspaceListDialog: false,
             showUserDialog: false,
             showMasterMenu: false,
-            ctf_enabled: this.hasCFT,
-            ctf_rows: null
         };
     }
     public reloadMessageCount(force: boolean)
@@ -249,15 +240,6 @@ export class NSALayout<RowType extends { id: string }, RowTypeInput = RowType> e
             this.setState(() => ({ showMasterMenu: status.open }));
         })
 
-        if (this.hasCFT)
-            if (this.props.pages?.entity)
-            {
-                this.cache_field.get().then(res =>
-                {
-                    this.setState(prev => { return { ...prev, ctf_rows: res } });
-                });
-            }
-
         if (this.isLoggedIn)
             this.reloadMessageCount(false);
 
@@ -276,20 +258,6 @@ export class NSALayout<RowType extends { id: string }, RowTypeInput = RowType> e
     {
         client.stop();
     }
-    private getCTF(): { enabled: boolean; rows: EntityResolveResponseRow | null; }
-    {
-        const rows = this.state.ctf_rows;
-        if (!rows)
-            return { enabled: this.state.ctf_enabled, rows: null };
-        const entity_name = NamingConvention.auto.convert((this.props.pages?.entity?.name ?? "").trim(), NamingConvention.lower_case);
-        return {
-            enabled: this.state.ctf_enabled,
-            rows: {
-                ...rows,
-                slots: rows.slots.filter(slot => NamingConvention.auto.convert((slot.entity ?? "").trim(), NamingConvention.lower_case) === entity_name),
-            },
-        };
-    }
     override render()
     {
         this.onDidMounted_Ready = false;
@@ -530,21 +498,31 @@ export class NSALayout<RowType extends { id: string }, RowTypeInput = RowType> e
         if (this.props.pages?.list)
         {
             action_name = "List";
-            content = <NSASectionList<RowType, RowTypeInput>
-                ref={this.NSASectionList_Ref}
+            content = <FieldCacheService
                 {...this.props}
-                {...this.props.pages.list}
-                entity={this.props.pages.entity}
-                onIDsChanged={() =>
+                render={rows =>
                 {
-                    this.setState(prev => ({ ...prev }));
-                    this.props.pages?.list?.onIDsChanged?.();
+                    if (this.props.pages?.list)
+                        return <NSASectionList<RowType, RowTypeInput>
+                            ref={this.NSASectionList_Ref}
+                            {...this.props}
+                            {...this.props.pages.list}
+                            entity={this.props.pages.entity}
+                            onIDsChanged={() =>
+                            {
+                                this.setState(prev => ({ ...prev }));
+                                this.props.pages?.list?.onIDsChanged?.();
+                            }}
+                            ctf={{
+                                enabled: this.hasCFT,
+                                rows
+                            }}
+                        >
+                            {this.props.children}
+                        </NSASectionList>;
+                    return <></>;
                 }}
-                ctf={this.getCTF()}
-                deleteFieldCache={() => { this.cache_field.del(); }}
-            >
-                {this.props.children}
-            </NSASectionList>
+            />;
         }
         else if (this.props.pages?.edit)
         {
@@ -552,54 +530,73 @@ export class NSALayout<RowType extends { id: string }, RowTypeInput = RowType> e
                 action_name = "Edit";
             else
                 action_name = "New";
-            content = <>
-                <NSASectionEdit
-                    ref={this.NSASectionEdit_Ref}
-                    {...this.props}
-                    {...this.props.pages.edit}
-                    entity={this.props.pages.entity}
-                    ctf={this.getCTF()}
-                    deleteFieldCache={() => { this.cache_field.del(); }}
-                    onRowLoaded={(row) =>
-                    {
-                        this.setState(prev => ({ ...prev }), () =>
-                        {
-                            this.props.pages?.edit?.onRowLoaded?.(row);
-                        });
-                    }}
-                    model={{
-                        id,
-                        row: null
-                    }}
-                >
-                    {this.props.children}
-                </NSASectionEdit>
-            </>;
+            content = <FieldCacheService
+                {...this.props}
+                render={rows =>
+                {
+                    if (this.props.pages?.edit)
+                        return <NSASectionEdit
+                            ref={this.NSASectionEdit_Ref}
+                            {...this.props}
+                            {...this.props.pages.edit}
+                            entity={this.props.pages.entity}
+                            ctf={{
+                                enabled: this.hasCFT,
+                                rows
+                            }}
+                            onRowLoaded={(row) =>
+                            {
+                                this.setState(prev => ({ ...prev }), () =>
+                                {
+                                    this.props.pages?.edit?.onRowLoaded?.(row);
+                                });
+                            }}
+                            model={{
+                                id,
+                                row: null
+                            }}
+                        >
+                            {this.props.children}
+                        </NSASectionEdit>;
+                    return <></>;
+                }}
+            />;
         }
         else if (this.props.pages?.view)
         {
             action_name = "View";
-            content = <NSASectionView
-                ref={this.NSASectionView_Ref}
+
+            content = <FieldCacheService
                 {...this.props}
-                {...this.props.pages.view}
-                entity={this.props.pages.entity}
-                ctf={this.getCTF()}
-                deleteFieldCache={() => { this.cache_field.del(); }}
-                onRowLoaded={(row) =>
+                render={rows =>
                 {
-                    this.setState(prev => ({ ...prev }), () =>
-                    {
-                        this.props.pages?.view?.onRowLoaded?.(row);
-                    });
-                }}
-                model={{
-                    id,
-                    row: null
+                    if (this.props.pages?.view)
+                        return <NSASectionView
+                            ref={this.NSASectionView_Ref}
+                            {...this.props}
+                            {...this.props.pages.view}
+                            entity={this.props.pages.entity}
+                            ctf={{
+                                enabled: this.hasCFT,
+                                rows
+                            }}
+                            onRowLoaded={(row) =>
+                            {
+                                this.setState(prev => ({ ...prev }), () =>
+                                {
+                                    this.props.pages?.view?.onRowLoaded?.(row);
+                                });
+                            }}
+                            model={{
+                                id,
+                                row: null
+                            }}
+                        >
+                            {this.props.children}
+                        </NSASectionView>;
+                    return <></>;
                 }}
-            >
-                {this.props.children}
-            </NSASectionView>
+            />;
         }
         else
             content = this.props.children;
@@ -652,84 +649,85 @@ export class NSALayout<RowType extends { id: string }, RowTypeInput = RowType> e
                         }}
                     />
                 }
-                <NSLayout
+                <FieldCacheService
                     {...this.props}
-                    scope={scope}
-                    logo={logo}
-                    background={{ image: background, attachment: this.props.background?.attachment, size: this.props.background?.size }}
-                    header={{
-                        enabled: this.props.header?.enabled,
-                        right: {
-                            icons: [...icons, ...(this.props.header?.right?.icons ?? [])],
-                        },
-                        left: {
-                            title: this.props.header?.left?.title
-                        },
-                        mega_menu: this.props.header?.mega_menu,
-                        onCollapse: () =>
-                        {
-                            this.setState((prev) => ({ showMasterMenu: !prev.showMasterMenu }))
-                        },
-                        filters_postprocessor: (filters) => NSALayout_Field.postprocess(filters, this.state.ctf_rows),
-                    }}
-                    action={{
-                        title: action_title,
-                        description: action_description,
-                        menus: action.menus,
-                        children: this.props.action?.children
-                    }}
-                    isLoggedIn={this.props.account?.token_manager?.exists}
-                    notifications={this.props.notifier.getNotifications()}
-                >
-                    <Helmet>
-                        <meta name="ns-account-user-id" content={user_id} />
-                        <meta name="ns-account-user-first-name" content={user_first_name} />
-                        <meta name="ns-account-user-last-name" content={user_last_name} />
-                        <meta name="ns-account-user-email" content={user_email} />
-                        <meta name="ns-account-user-phone" content={user_phone} />
-                    </Helmet>
-                    {
-                        this.state.showDeleteDialog &&
-                        <NSDialogDelete
-                            title={"Delete Confirmation"}
-                            description={
-                                (getIDs && getIDs().length > 1)
-                                    ? `Are you sure you want to delete ${getIDs().length} ${name}s?`
-                                    : `Are you sure you want to delete ${name}?`
-                            }
-                            onClose={hideDeleteDialog}
-                            onNo={{ action: hideDeleteDialog, showLoading: false }}
-                            show_as_code={false}
-                            onYes={{
-                                showLoading: false,
-                                action: (onFinished) =>
+                    render={(ctf_rows) => (
+                        <NSLayout
+                            {...this.props}
+                            scope={scope}
+                            logo={logo}
+                            background={{ image: background, attachment: this.props.background?.attachment, size: this.props.background?.size }}
+                            header={{
+                                enabled: this.props.header?.enabled,
+                                right: {
+                                    icons: [...icons, ...(this.props.header?.right?.icons ?? [])],
+                                },
+                                left: {
+                                    title: this.props.header?.left?.title
+                                },
+                                mega_menu: this.props.header?.mega_menu,
+                                onCollapse: () =>
                                 {
-                                    try
-                                    {
-                                        let ids = getIDs ? getIDs() : [];
-                                        if (ids.length === 0)
-                                            throw new Error("Nothing was found to delete.");
-                                        this.runDelete(ids, name);
-                                    }
-                                    catch (error: any)
-                                    {
-                                        this.props.notifier.onError(error);
-                                    }
-                                    this.setState(prev => ({ ...prev, showDeleteDialog: false }));
-                                    onFinished();
-                                }
+                                    this.setState((prev) => ({ showMasterMenu: !prev.showMasterMenu }))
+                                },
+                                filters_postprocessor: (filters) => NSALayout_Field.postprocess(filters, ctf_rows),
                             }}
+                            action={{
+                                title: action_title,
+                                description: action_description,
+                                menus: action.menus,
+                                children: this.props.action?.children
+                            }}
+                            isLoggedIn={this.props.account?.token_manager?.exists}
+                            notifications={this.props.notifier.getNotifications()}
                         >
-                            <></>
-                        </NSDialogDelete>}
-                    {
-                        (!this.state.ctf_enabled || (this.state.ctf_rows))
-                            ?
-                            content
-                            :
-                            <NSLoading />
-                    }
-                </NSLayout>
+                            <Helmet>
+                                <meta name="ns-account-user-id" content={user_id} />
+                                <meta name="ns-account-user-first-name" content={user_first_name} />
+                                <meta name="ns-account-user-last-name" content={user_last_name} />
+                                <meta name="ns-account-user-email" content={user_email} />
+                                <meta name="ns-account-user-phone" content={user_phone} />
+                            </Helmet>
+                            {
+                                this.state.showDeleteDialog &&
+                                <NSDialogDelete
+                                    title={"Delete Confirmation"}
+                                    description={
+                                        (getIDs && getIDs().length > 1)
+                                            ? `Are you sure you want to delete ${getIDs().length} ${name}s?`
+                                            : `Are you sure you want to delete ${name}?`
+                                    }
+                                    onClose={hideDeleteDialog}
+                                    onNo={{ action: hideDeleteDialog, showLoading: false }}
+                                    show_as_code={false}
+                                    onYes={{
+                                        showLoading: false,
+                                        action: (onFinished) =>
+                                        {
+                                            try
+                                            {
+                                                let ids = getIDs ? getIDs() : [];
+                                                if (ids.length === 0)
+                                                    throw new Error("Nothing was found to delete.");
+                                                this.runDelete(ids, name);
+                                            }
+                                            catch (error: any)
+                                            {
+                                                this.props.notifier.onError(error);
+                                            }
+                                            this.setState(prev => ({ ...prev, showDeleteDialog: false }));
+                                            onFinished();
+                                        }
+                                    }}
+                                >
+                                    <></>
+                                </NSDialogDelete>}
+                            {
+                                content
+                            }
+                        </NSLayout>
+                    )}
+                />
                 <NSATaskBar<string>
                     ref={this.NSATaskBar_Ref}
                     title={this.state.delete_title}

package/src/layouts/NSASectionEdit.tsx

@@ -4,11 +4,11 @@ import { IBaseComponentProps, NSButtonBlue, NSID, NSLine, NSLoading, NSPanel, NS
 import { Component, createRef, FormHTMLAttributes, ReactNode } from "react";
 import { NSANavigationGuard } from "../components/NSANavigationGuard";
 import { IEntityInfo } from "../IEntityInfo";
-import { NSARouterMakerProps } from "../NSARouterMakerProps";
+import { NSARouterMakerResult } from "../NSARouterMakerResult";
 import { NSASectionEditTabPage, NSASectionEditTabPageEditorProps, NSASectionEditTabPageUIProps } from "./NSASectionEditTabPage";
 import { NSASectionViewTabPage, NSASectionViewTabPageUIProps } from "./NSASectionViewTabPage";
 
-export interface NSASectionEditCustomProps<RowType extends { id: string }, RowTypeInput = RowType> extends NSARouterMakerProps, IBaseComponentProps
+export interface NSASectionEditCustomProps<RowType extends { id: string }, RowTypeInput = RowType> extends NSARouterMakerResult, IBaseComponentProps
 {
     isEdit: boolean;
     ui: {
@@ -27,7 +27,7 @@ export interface NSASectionEditCustomProps<RowType extends { id: string }, RowTy
     children?: React.ReactNode;
 }
 
-export interface NSASectionEditProps<RowType extends { id: string }, RowTypeInput = RowType> extends NSASectionEditCustomProps<RowType, RowTypeInput>, NSARouterMakerProps
+export interface NSASectionEditProps<RowType extends { id: string }, RowTypeInput = RowType> extends NSASectionEditCustomProps<RowType, RowTypeInput>, NSARouterMakerResult
 {
     model: {
         id: string | null;
@@ -38,7 +38,6 @@ export interface NSASectionEditProps<RowType extends { id: string }, RowTypeInpu
         enabled: boolean;
         rows: EntityResolveResponseRow | null;
     };
-    deleteFieldCache: () => void;
     children: ReactNode;
 }
 

package/src/layouts/NSASectionEditTabPage.tsx

@@ -5,7 +5,7 @@ import { NSFBoxSlot } from "../components/NSFBoxSlot";
 import { NSFBoxWrapper } from "../components/NSFBoxWrapper";
 import { CTFRow } from "../CTFRow";
 import { IEntityInfo } from "../IEntityInfo";
-import { NSARouterMakerProps } from "../NSARouterMakerProps";
+import { NSARouterMakerResult } from "../NSARouterMakerResult";
 import { CFTUtil } from "./CFTUtil";
 import Styles from "./NSASectionEditTabPage.module.css";
 import { NSASectionViewTabMore } from "./NSASectionViewTabMore";
@@ -29,7 +29,7 @@ export interface NSASectionEditTabPageCustomProps<RowType extends { id: string }
 	children: ReactNode;
 }
 export interface NSASectionEditTabPageProps<RowType extends { id: string }, RowTypeInput = RowType>
-	extends NSARouterMakerProps, NSASectionEditTabPageCustomProps<RowType, RowTypeInput>
+	extends NSARouterMakerResult, NSASectionEditTabPageCustomProps<RowType, RowTypeInput>
 {
 	entity: IEntityInfo<RowType & { id: string }, RowTypeInput>;
 	ctf: {
@@ -40,7 +40,6 @@ export interface NSASectionEditTabPageProps<RowType extends { id: string }, RowT
 		id: string | null;
 		row: RowType | null;
 	};
-	deleteFieldCache: () => void;
 }
 
 interface NSASectionEditTabPageState<RowType> 
@@ -244,7 +243,7 @@ export class NSASectionEditTabPage<RowType extends { id: string }, RowTypeInput
 				title: "More",
 				clicked: true,
 				getContent: () => <NSASectionViewTabMore
-					deleteFieldCache={this.props.deleteFieldCache}
+					{...this.props}
 				/>
 			});
 		}

package/src/layouts/NSASectionList.tsx

@@ -2,7 +2,7 @@ import { EntityResolveResponseRow } from "namirasoft-field";
 import { IBaseComponentProps, NSBoxCombo, NSRow, NSSpace, NSSpaceSizeType, NSSplitter } from "namirasoft-site-react";
 import { Component, ReactNode, createRef } from "react";
 import { IEntityInfo } from "../IEntityInfo";
-import { NSARouterMakerProps } from "../NSARouterMakerProps";
+import { NSARouterMakerResult } from "../NSARouterMakerResult";
 import { NSATable, NSATableUIProps } from "../components/NSATable";
 import Styles from "./NSASectionList.module.css";
 import { NSASectionViewTabPage, NSASectionViewTabPageUIProps } from "./NSASectionViewTabPage";
@@ -18,14 +18,13 @@ export interface NSASectionListCustomProps<RowType extends { id: string }, RowTy
 	children?: React.ReactNode;
 }
 
-export interface NSASectionListProps<RowType extends { id: string }, RowTypeInput = RowType> extends IBaseComponentProps, NSARouterMakerProps, NSASectionListCustomProps<RowType, RowTypeInput>
+export interface NSASectionListProps<RowType extends { id: string }, RowTypeInput = RowType> extends IBaseComponentProps, NSARouterMakerResult, NSASectionListCustomProps<RowType, RowTypeInput>
 {
 	entity: IEntityInfo<RowType, RowTypeInput>;
 	ctf: {
 		enabled: boolean;
 		rows: EntityResolveResponseRow | null;
 	};
-	deleteFieldCache: () => void;
 	children?: ReactNode;
 }
 

package/src/layouts/NSASectionView.tsx

@@ -2,7 +2,7 @@ import { EntityResolveResponseRow } from "namirasoft-field";
 import { IBaseComponentProps, NSLoading } from "namirasoft-site-react";
 import { Component, createRef, ReactNode } from "react";
 import { IEntityInfo } from "../IEntityInfo";
-import { NSARouterMakerProps } from "../NSARouterMakerProps";
+import { NSARouterMakerResult } from "../NSARouterMakerResult";
 import { NSASectionViewTabPage, NSASectionViewTabPageUIProps } from "./NSASectionViewTabPage";
 
 export interface NSASectionViewCutomProps<RowType> extends IBaseComponentProps
@@ -16,7 +16,7 @@ export interface NSASectionViewCutomProps<RowType> extends IBaseComponentProps
 	children?: React.ReactNode;
 }
 
-export interface NSASectionViewProps<RowType extends { id: string }, RowTypeInput = RowType> extends NSARouterMakerProps, NSASectionViewCutomProps<RowType>
+export interface NSASectionViewProps<RowType extends { id: string }, RowTypeInput = RowType> extends NSARouterMakerResult, NSASectionViewCutomProps<RowType>
 {
 	entity: IEntityInfo<RowType, RowTypeInput>;
 	ctf: {
@@ -27,7 +27,6 @@ export interface NSASectionViewProps<RowType extends { id: string }, RowTypeInpu
 		id: string | null;
 		row: RowType | null;
 	};
-	deleteFieldCache: () => void;
 }
 
 interface NSASectionViewState<RowType>

package/src/layouts/NSASectionViewTabMore.tsx

@@ -1,11 +1,11 @@
 import { EnvService } from "namirasoft-core";
 import { LinkOperation, NSButtonGreen, NSColumn, NSLabel, NSLine, NSRow } from "namirasoft-site-react";
 import { Component } from "react";
+import { FieldCacheService } from "../FieldCacheService";
+import { NSARouterMakerResult } from "../NSARouterMakerResult";
 
-export interface NSASectionViewTabMoreProps
-{
-	deleteFieldCache: () => void;
-}
+export interface NSASectionViewTabMoreProps extends NSARouterMakerResult
+{ }
 
 export interface NSASectionViewTabMoreState
 { }
@@ -28,7 +28,7 @@ export class NSASectionViewTabMore extends Component<NSASectionViewTabMoreProps,
 							action: () =>
 							{
 								let REACT_APP_BASE_URL_FIELD_CONSOLE = new EnvService("REACT_APP_BASE_URL_FIELD_CONSOLE", true).getString();
-                                LinkOperation.open(REACT_APP_BASE_URL_FIELD_CONSOLE + "/field/list");
+								LinkOperation.open(REACT_APP_BASE_URL_FIELD_CONSOLE + "/field/list");
 							},
 							showLoading: false
 						}}
@@ -47,7 +47,7 @@ export class NSASectionViewTabMore extends Component<NSASectionViewTabMoreProps,
 							action: () =>
 							{
 								let REACT_APP_BASE_URL_FIELD_CONSOLE = new EnvService("REACT_APP_BASE_URL_FIELD_CONSOLE", true).getString();
-                                LinkOperation.open(REACT_APP_BASE_URL_FIELD_CONSOLE + "/category/list");
+								LinkOperation.open(REACT_APP_BASE_URL_FIELD_CONSOLE + "/category/list");
 							},
 							showLoading: false
 						}}
@@ -65,7 +65,8 @@ export class NSASectionViewTabMore extends Component<NSASectionViewTabMoreProps,
 						onClick={{
 							action: () =>
 							{
-								this.props.deleteFieldCache?.();
+								let cache = FieldCacheService.get(this.props.account.token_manager, this.props.product_id, this.props.notifier.onError);
+								cache.del();
 								document.location.reload();
 							},
 							showLoading: false

package/src/layouts/NSASectionViewTabPage.tsx

@@ -6,7 +6,7 @@ import { BaseColumnFormatter, DateTimeFormatter, IBaseComponentProps, IDFormatte
 import { Component, createRef, Fragment, ReactNode } from "react";
 import { NSFBoxWrapper } from "../components/NSFBoxWrapper";
 import { IEntityInfo } from "../IEntityInfo";
-import { NSARouterMakerProps } from "../NSARouterMakerProps";
+import { NSARouterMakerResult } from "../NSARouterMakerResult";
 import { CFTUtil } from "./CFTUtil";
 import { NSASectionViewTabMore } from "./NSASectionViewTabMore";
 import Styles from "./NSASectionViewTabPage.module.css";
@@ -64,7 +64,7 @@ export interface NSASectionViewTabPageCutomProps<RowType>
     onRowLoaded?: (row: RowType) => void;
 }
 
-export interface NSASectionViewTabPageProps<RowType extends { id: string }, RowTypeInput = RowType> extends NSARouterMakerProps, NSASectionViewTabPageCutomProps<RowType>
+export interface NSASectionViewTabPageProps<RowType extends { id: string }, RowTypeInput = RowType> extends NSARouterMakerResult, NSASectionViewTabPageCutomProps<RowType>
 {
     entity: IEntityInfo<RowType, RowTypeInput>;
     ctf: {
@@ -75,7 +75,6 @@ export interface NSASectionViewTabPageProps<RowType extends { id: string }, RowT
         id: string | null;
         row: RowType | null;
     };
-    deleteFieldCache: () => void;
 }
 
 interface NSASectionViewTabPageState<RowType>
@@ -374,7 +373,7 @@ export class NSASectionViewTabPage<RowType extends { id: string }, RowTypeInput
                             title: "More",
                             clicked: true,
                             getContent: () => <NSASectionViewTabMore
-                                deleteFieldCache={this.props.deleteFieldCache}
+                                {...this.props}
                             />
                         });
         pushTabs(this.props.ui?.tabs?.extra?.after_more);

package/src/main.ts

@@ -4,8 +4,6 @@ export * from "./components/NSAMasterMenu";
 export * from "./components/NSAMasterMenuItem";
 export * from "./components/NSAMessageListDialog";
 export * from "./components/NSAProductListDialog";
-export * from "./components/NSAReorderDialog";
-export * from "./components/NSASortDialog";
 export * from "./components/NSATable";
 export * from "./components/NSAUserDialog";
 export * from "./components/NSAWorkspaceListDialog";
@@ -35,10 +33,10 @@ export * from "./layouts/NSASectionViewTabMore";
 export * from "./layouts/NSASectionViewTabPage";
 export * from "./NSACacheService";
 export * from "./NSAFilterOperators";
-export * from "./NSARouter";
 export * from "./NSARouterMaker";
-export * from "./NSARouterMakerConfig";
 export * from "./NSARouterMakerProps";
+export * from "./NSARouterMakerResult";
+export * from "./NSFRouterMaker";
 export * from "./NSFRoutes";
 export * from "./pages/NSAConsentPage";
 export * from "./pages/NSAEmailVerificationPage";

package/src/pages/NSAConsentPage.tsx

@@ -4,10 +4,10 @@ import { VersionOperation } from 'namirasoft-core';
 import { IBackgroundProps, NSBox, NSBoxBoolean, NSButtonBlue, NSLoading, NSSpace, NSSpaceSizeType, ProductCacheService } from 'namirasoft-site-react';
 import React, { useEffect, useRef, useState } from 'react';
 import { NSACacheService } from '../NSACacheService';
-import { NSARouterMakerProps } from '../NSARouterMakerProps';
+import { NSARouterMakerResult } from '../NSARouterMakerResult';
 import Styles from './NSAConsentPage.module.css';
 
-export interface NSAConsentPageProps extends NSARouterMakerProps
+export interface NSAConsentPageProps extends NSARouterMakerResult
 {
 	custom?: {
 		name?: string;