namirasoft-account-react 1.5.13 → 1.5.15

package/src/Router.tsx

@@ -1,5 +1,5 @@
 import { NSARouterMaker } from './NSARouterMaker';
-import { NSARouterMakerProps } from './NSARouterMakerProps';
+import { NSARouterMakerResult } from './NSARouterMakerResult';
 import { Routes, Route, useNavigate } from 'react-router-dom';
 import { NSNotFoundPage } from 'namirasoft-site-react';
 import { App } from './App';
@@ -13,8 +13,12 @@ export default function Router()
 
     let navigate = useNavigate();
 
-    let maker = new NSARouterMaker(ProductUUID.NAMIRASOFT_INFRA, new IStorageSession(), () => { setState(state + Math.random()); }, {
-        onRenderOnLogin: (props: NSARouterMakerProps) =>
+    return <NSARouterMaker
+        product_id={ProductUUID.NAMIRASOFT_INFRA}
+        notifier_storage={new IStorageSession()}
+        page_force_update={() => { setState(state + Math.random()); }}
+        navigate={navigate}
+        renderOnLogin={(props: NSARouterMakerResult) =>
         {
             return (
                 <Routes>
@@ -22,25 +26,24 @@ export default function Router()
                     <Route path="*" element={<App {...props}></App>} />
                 </Routes>
             );
-        },
-        onRenderOnLogout: (_: NSARouterMakerProps, __: boolean) =>
+        }}
+        renderOnLogout={(_: NSARouterMakerResult, __: boolean) =>
         {
             return (
                 <Routes>
                     <Route path="*" element={<NSNotFoundPage></NSNotFoundPage>} />
                 </Routes>
             );
-        },
-        renderOnNSALayout: (_, children) =>
+        }}
+        getNSALayout={(_, children) =>
         {
             return children;
-        },
-        requirement: {
+        }}
+        requirement={{
             verification: {
                 email: true,
                 phone: true
             }
-        }
-    }, navigate);
-    return maker.onRender();
+        }}
+    />;
 }

package/src/components/NSAAccessListDialog.tsx

@@ -2,10 +2,10 @@ import { NamirasoftAccessServer, PermissionRow } from 'namirasoft-access';
 import { EnvService } from 'namirasoft-core';
 import { NSCopy, NSDialog, NSDialogProps, NSLine, NSLoading, NSSpace, NSSpaceSizeType } from 'namirasoft-site-react';
 import React, { Component, createRef } from 'react';
-import { NSARouterMakerProps } from '../NSARouterMakerProps';
+import { NSARouterMakerResult } from '../NSARouterMakerResult';
 import Styles from './NSAAccessListDialog.module.css';
 
-export interface NSAAccessListDialogProps extends NSARouterMakerProps, NSDialogProps
+export interface NSAAccessListDialogProps extends NSARouterMakerResult, NSDialogProps
 {
 	onClose: () => void;
 }

package/src/components/NSABoxSecret.tsx

@@ -2,10 +2,10 @@ import { BaseUUID, EnvService } from "namirasoft-core";
 import { NamirasoftSecretMetaDatabase, NamirasoftSecretServer } from "namirasoft-secret";
 import { IBaseComponentProps, INSBox, INSBoxBaseLayoutProps, IValidationProps, IValidationStringProps, NSBoxBoolean, NSBoxSensitive, NSBoxString, NSColumn, safeMenuMenuItem } from "namirasoft-site-react";
 import React, { createRef, HTMLInputAutoCompleteAttribute } from "react";
-import { NSARouterMakerProps } from "../NSARouterMakerProps";
+import { NSARouterMakerResult } from "../NSARouterMakerResult";
 import Styles from "./NSABoxSecret.module.css";
 
-export interface NSABoxSecretProps extends IBaseComponentProps, IValidationProps, IValidationStringProps, NSARouterMakerProps, INSBoxBaseLayoutProps<NSABoxSecret | NSBoxString, string>
+export interface NSABoxSecretProps extends IBaseComponentProps, IValidationProps, IValidationStringProps, NSARouterMakerResult, INSBoxBaseLayoutProps<NSABoxSecret | NSBoxString, string>
 {
     input?: IBaseComponentProps;
     auto_complete?: HTMLInputAutoCompleteAttribute | undefined;

package/src/components/NSAMasterMenu.tsx

@@ -4,11 +4,11 @@ import { SetTimeouService } from "namirasoft-core";
 import { NSBoxSearch, NSLoading } from "namirasoft-site-react";
 import { Component, createRef } from "react";
 import { NSACacheService } from "../NSACacheService";
-import { NSARouterMakerProps } from "../NSARouterMakerProps";
+import { NSARouterMakerResult } from "../NSARouterMakerResult";
 import Styles from "./NSAMasterMenu.module.css";
 import NSAMasterMenuItem from "./NSAMasterMenuItem";
 
-export interface NSAMasterMenuProps extends NSARouterMakerProps
+export interface NSAMasterMenuProps extends NSARouterMakerResult
 {
     open: boolean;
     setOpen: (open: boolean) => void;
@@ -26,21 +26,21 @@ export interface NSAMasterMenuState
 class NSAMasterMenu extends Component<NSAMasterMenuProps, NSAMasterMenuState>
 {
     private TimeoutSearch: SetTimeouService;
-    
+
     private MasterMenuAsideEl_Ref = createRef<HTMLElement>();
     private MasterMenuEl_Ref = createRef<HTMLDivElement>();
 
     constructor(props: NSAMasterMenuProps)
     {
         super(props);
-        
+
         this.TimeoutSearch = new SetTimeouService();
-        
+
         this.state = {
             loading: true,
             show_footer: false,
         };
-        
+
         this.load = this.load.bind(this);
     }
 

package/src/components/NSAMasterMenuItem.tsx

@@ -2,11 +2,11 @@ import { FilterLinkFullRow } from "namirasoft-api-link";
 import { ProductFullRow } from 'namirasoft-api-product';
 import { NSLoading } from 'namirasoft-site-react';
 import { useEffect, useMemo, useState } from 'react';
-import { NSARouterMakerProps } from '../NSARouterMakerProps';
+import { NSARouterMakerResult } from '../NSARouterMakerResult';
 import Styles from "./NSAMasterMenu.module.css";
 import { SearchOperation } from "namirasoft-core";
 
-export interface NSAMasterMenuItemProps extends NSARouterMakerProps
+export interface NSAMasterMenuItemProps extends NSARouterMakerResult
 {
     product: ProductFullRow;
     fls: FilterLinkFullRow[];

package/src/components/NSAMessageListDialog.tsx

@@ -1,11 +1,11 @@
-import { Component } from 'react';
 import { EnvService, FilterItem, FilterItemOperator, SortItem } from 'namirasoft-core';
+import { MessageRow, NamirasoftMessageMetaDatabase, NamirasoftMessageServer } from 'namirasoft-message';
 import { IBaseComponentProps, LinkOperation, NSButtonBlue, NSDialog, NSDialogProps, NSLoading, NSNoData, StringFormatter } from "namirasoft-site-react";
-import { NamirasoftMessageMetaDatabase, MessageRow, NamirasoftMessageServer } from 'namirasoft-message';
-import { NSARouterMakerProps } from '../NSARouterMakerProps';
+import { Component } from 'react';
+import { NSARouterMakerResult } from '../NSARouterMakerResult';
 import Styles from './NSAMessageListDialog.module.css';
 
-export interface NSAMessageListDialogProps extends NSARouterMakerProps, NSDialogProps, IBaseComponentProps
+export interface NSAMessageListDialogProps extends NSARouterMakerResult, NSDialogProps, IBaseComponentProps
 {
 	onClose: () => void;
 	onSeenAll: () => void;

package/src/components/NSAProductListDialog.tsx

@@ -3,10 +3,10 @@ import { CacheService, SearchOperation } from 'namirasoft-core';
 import { NSBoxSearch, NSDialog, NSDialogProps, NSLoading } from 'namirasoft-site-react';
 import { Component } from 'react';
 import { NSACacheService } from '../NSACacheService';
-import { NSARouterMakerProps } from '../NSARouterMakerProps';
+import { NSARouterMakerResult } from '../NSARouterMakerResult';
 import Styles from './NSAProductListDialog.module.css';
 
-export interface NSAProductListDialogProps extends NSARouterMakerProps, NSDialogProps { }
+export interface NSAProductListDialogProps extends NSARouterMakerResult, NSDialogProps { }
 
 interface NSAProductListState
 {

package/src/components/NSATable.tsx

@@ -5,8 +5,6 @@ import { IBaseComponentProps, NSButtonProps, NSFilterBox, NSFilterBoxItems, NSFi
 import { Component, ReactNode, createRef } from "react";
 import { IEntityInfo } from "../IEntityInfo";
 import { NSACacheService } from "../NSACacheService";
-import { NSAReorderDialog } from "./NSAReorderDialog";
-import { NSASortDialog } from "./NSASortDialog";
 import { NSAQuickFilterBar } from "./quickfilter/NSAQuickFilterBar";
 import { NSAQuickFilterDialog, QuickFilterConfig } from "./quickfilter/NSAQuickFilterDialog";
 
@@ -43,11 +41,8 @@ export interface NSATableProps<RowType extends { id: string }, RowTypeInput = Ro
 interface NSATableState<RowType>
 {
     res: { rows: RowType[]; count: number; } | null;
-    sorts: SortItem[];
     visible_column_keys: string[];
     quick_filter_configs: QuickFilterConfig[];
-    show_sort_dialog: boolean;
-    show_reorder_dialog: boolean;
     show_quick_filter_dialog: boolean;
     filter_revision: number;
 }
@@ -68,11 +63,8 @@ export class NSATable<RowType extends { id: string }, RowTypeInput = RowType>
             quick_filter_configs = this.buildDefaultQuickFilters();
         this.state = {
             res: null,
-            sorts: [],
             visible_column_keys: [],
             quick_filter_configs,
-            show_sort_dialog: false,
-            show_reorder_dialog: false,
             show_quick_filter_dialog: false,
             filter_revision: 0,
         };
@@ -250,24 +242,6 @@ export class NSATable<RowType extends { id: string }, RowTypeInput = RowType>
     private buildButtons(): NSButtonProps[]
     {
         const buttons: NSButtonProps[] = [
-            {
-                title: "",
-                icon: { src: "https://static.namirasoft.com/image/concept/grip-vertical/blue.svg", alt: "reorder" },
-                attributes: { title: "Reorder" },
-                onClick: {
-                    action: () => this.setState({ show_reorder_dialog: true, visible_column_keys: this.getVisibleColumns().map(c => c.table + "." + c.column) }),
-                    showLoading: false,
-                },
-            },
-            {
-                title: "",
-                icon: { src: "https://static.namirasoft.com/image/concept/arrow-down-short-wide/blue.svg", alt: "sort" },
-                attributes: { title: "Sort" },
-                onClick: {
-                    action: () => this.setState({ show_sort_dialog: true, sorts: this.getSortItems() }),
-                    showLoading: false,
-                },
-            },
             {
                 title: "",
                 icon: { src: "https://static.namirasoft.com/image/concept/sliders/blue.svg", alt: "filter" },
@@ -484,6 +458,9 @@ export class NSATable<RowType extends { id: string }, RowTypeInput = RowType>
                         return res;
                     }}
                     getRowKey={(row) => row.value.id.toString()}
+                    sort={{
+                        onSort: () => { this.NSTable_Main.current?.reload(null, null); },
+                    }}
                     getRowAttributes={(row_value, row_index) => this.props.ui?.getRowAttributes?.(row_value, row_index, this.state.res) ?? {}}
                     getColumnAttributes={this.props.ui?.getColumnAttributes}
                     getCellFormattedValue={this.props.ui?.getCellFormattedValue}
@@ -493,34 +470,6 @@ export class NSATable<RowType extends { id: string }, RowTypeInput = RowType>
                     {filterChips}
                     {quickFilterBar}
                 </NSTable>
-                {
-                    this.state.show_sort_dialog &&
-                    <NSASortDialog
-                        sorts={this.state.sorts}
-                        getColumns={() => this.getColumns()}
-                        onCancel={() => this.setState({ show_sort_dialog: false })}
-                        onApply={sorts =>
-                        {
-                            this.setSortItems(sorts);
-                            this.setState({ show_sort_dialog: false, sorts: sorts ?? [] });
-                        }}
-                    />
-                }
-                {
-                    this.state.show_reorder_dialog &&
-                    <NSAReorderDialog
-                        visibleColumnKeys={this.state.visible_column_keys}
-                        getColumns={() => this.getColumns()}
-                        onCancel={() => this.setState({ show_reorder_dialog: false })}
-                        onApply={orderedKeys =>
-                        {
-                            const cs_all = this.getColumns();
-                            const cs = orderedKeys.map((v: string) => cs_all.find((c: TableColumnInfo) => v === c.table.name + "." + c.name)).filter(Boolean) as TableColumnInfo[];
-                            this.setVisibleColumns(cs.map(c => ({ table: c.table.name, column: c.name })));
-                            this.setState({ show_reorder_dialog: false, visible_column_keys: orderedKeys });
-                        }}
-                    />
-                }
                 {
                     this.state.show_quick_filter_dialog &&
                     <NSAQuickFilterDialog

package/src/components/NSAUserDialog.tsx

@@ -1,10 +1,10 @@
 import { NamirasoftAccountClient } from 'namirasoft-account-client';
 import { NSButton, NSCopy, NSDialog, NSDialogProps, NSLine, NSLink, NSLoading, NSSpace, NSSpaceSizeType } from 'namirasoft-site-react';
 import { Component } from 'react';
-import { NSARouterMakerProps } from '../NSARouterMakerProps';
+import { NSARouterMakerResult } from '../NSARouterMakerResult';
 import Styles from "./NSAUserDialog.module.css";
 
-export interface NSAUserDialogProps extends NSARouterMakerProps, NSDialogProps
+export interface NSAUserDialogProps extends NSARouterMakerResult, NSDialogProps
 {
     client: NamirasoftAccountClient;
 }

package/src/components/NSAWorkspaceListDialog.tsx

@@ -1,11 +1,11 @@
 import { NSBoxSearch, NSCopy, NSDialog, NSDialogProps, NSLoading } from 'namirasoft-site-react';
 import { Component } from 'react';
 import { NamirasoftWorkspaceServer, WorkspaceRow } from 'namirasoft-workspace';
-import { NSARouterMakerProps } from '../NSARouterMakerProps';
+import { NSARouterMakerResult } from '../NSARouterMakerResult';
 import { EnvService, SearchOperation } from 'namirasoft-core';
 import Styles from './NSAWorkspaceListDialog.module.css';
 
-export interface NSAWorkspaceListDialogProps extends NSARouterMakerProps, NSDialogProps { }
+export interface NSAWorkspaceListDialogProps extends NSARouterMakerResult, NSDialogProps { }
 
 export interface NSAWorkspaceListDialogState
 {

package/src/components/NSFBoxCategoryScope.tsx

@@ -2,10 +2,10 @@ import { EnvService, FilterItem, FilterItemOperator } from "namirasoft-core";
 import { CategoryRow, CategoryScopeRow, NamirasoftFieldMetaDatabase, NamirasoftFieldServer, SlotRow } from "namirasoft-field";
 import { NSBoxEntity } from "namirasoft-site-react";
 import { Component, createRef } from "react";
-import { NSARouterMakerProps } from "../NSARouterMakerProps";
+import { NSARouterMakerResult } from "../NSARouterMakerResult";
 import { NSFBoxSlot } from "./NSFBoxSlot";
 
-export interface NSFBoxCategoryScopeProps extends NSARouterMakerProps
+export interface NSFBoxCategoryScopeProps extends NSARouterMakerResult
 {
     slot: SlotRow;
     category_scope: CategoryScopeRow;

package/src/components/NSFBoxSlot.tsx

@@ -1,11 +1,11 @@
 import { CategoryScopeRow, FieldRow, SlotEntityType, SlotRow, SlotSize } from "namirasoft-field";
 import { NSBox } from "namirasoft-site-react";
 import { Component, createRef } from "react";
-import { NSARouterMakerProps } from "../NSARouterMakerProps";
+import { NSARouterMakerResult } from "../NSARouterMakerResult";
 import { NSFBoxCategoryScope } from "./NSFBoxCategoryScope";
 import { NSFBoxField } from "./NSFBoxField";
 
-export interface NSFBoxSlotProps extends NSARouterMakerProps
+export interface NSFBoxSlotProps extends NSARouterMakerResult
 {
     slot: SlotRow;
     getField: () => FieldRow;

package/src/layouts/Actions.ts

@@ -2,7 +2,7 @@ import { EnvService, FilterItem, FilterItemOperator } from "namirasoft-core";
 import { NamirasoftHistoryMetaDatabase } from "namirasoft-history";
 import { LinkOperation, NSButtonOnClickProps, NSMenuActionProps } from "namirasoft-site-react";
 import { IEntityInfo } from "../IEntityInfo";
-import { NSARouterMakerProps } from "../NSARouterMakerProps";
+import { NSARouterMakerResult } from "../NSARouterMakerResult";
 
 export class Actions
 {
@@ -15,7 +15,7 @@ export class Actions
             isActive() { return true; }
         }
     }
-    static _new(props: NSARouterMakerProps, entity: IEntityInfo<any>): NSMenuActionProps
+    static _new(props: NSARouterMakerResult, entity: IEntityInfo<any>): NSMenuActionProps
     {
         return {
             id: "1",
@@ -34,7 +34,7 @@ export class Actions
             isActive() { return true; }
         };
     }
-    static list(props: NSARouterMakerProps, entity: IEntityInfo<any>): NSMenuActionProps
+    static list(props: NSARouterMakerResult, entity: IEntityInfo<any>): NSMenuActionProps
     {
         return {
             id: "2",
@@ -53,7 +53,7 @@ export class Actions
             isActive() { return true; }
         };
     }
-    static view(props: NSARouterMakerProps, entity: IEntityInfo<any>, getIDs: () => string[]): NSMenuActionProps
+    static view(props: NSARouterMakerResult, entity: IEntityInfo<any>, getIDs: () => string[]): NSMenuActionProps
     {
         return {
             id: "3",
@@ -95,7 +95,7 @@ export class Actions
             isActive() { return getIDs().length === 1; }
         };
     }
-    static copy(props: NSARouterMakerProps, entity: IEntityInfo<any>, getIDs: () => string[]): NSMenuActionProps
+    static copy(props: NSARouterMakerResult, entity: IEntityInfo<any>, getIDs: () => string[]): NSMenuActionProps
     {
         return {
             id: "5",
@@ -115,7 +115,7 @@ export class Actions
             isActive() { return getIDs().length === 1; }
         };
     }
-    static edit(props: NSARouterMakerProps, entity: IEntityInfo<any>, getIDs: () => string[]): NSMenuActionProps
+    static edit(props: NSARouterMakerResult, entity: IEntityInfo<any>, getIDs: () => string[]): NSMenuActionProps
     {
         return {
             id: "6",