namirasoft-account-react 1.5.20 → 1.5.21

package/src/NSAFilterOperators.ts

@@ -1,93 +1,93 @@
-import { FilterItemColumnType, FilterItemOperator } from "namirasoft-core";
-import { VariableType } from "namirasoft-schema";
-
-const all = FilterItemOperator.all as any;
-
-if (!all["between"])
-    all["between"] = new FilterItemOperator(
-        "Between", "><", 2,
-        (type: FilterItemColumnType) => [FilterItemColumnType.Number, FilterItemColumnType.Date, FilterItemColumnType.DateTime, FilterItemColumnType.Time].includes(type)
-    );
-
-if (!all["notequals"])
-    all["notequals"] = new FilterItemOperator(
-        "Not Equals", "!=", 1,
-        (type: FilterItemColumnType) => type !== FilterItemColumnType.Unknown
-    );
-
-if (!all["notcontains"])
-    all["notcontains"] = new FilterItemOperator(
-        "Not Contains", "!:", 1,
-        (type: FilterItemColumnType) => type !== FilterItemColumnType.Unknown && type !== FilterItemColumnType.Boolean
-    );
-
-export const NUMERIC_OPERATORS = ["equals", "notequals", "lessthan", "lessthanequal", "morethan", "morethanequal", "between", "empty", "exists"] as const;
-export const STRING_OPERATORS = ["contains", "equals", "startswith", "empty", "exists", "notequals", "notcontains"] as const;
-export const DATE_OPERATORS = ["equals", "lessthan", "lessthanequal", "morethan", "morethanequal", "between", "empty", "exists"] as const;
-export const ENUM_OPERATORS = ["equals", "empty", "exists"] as const;
-
-export type NumericOperatorKey = typeof NUMERIC_OPERATORS[number];
-export type StringOperatorKey = typeof STRING_OPERATORS[number];
-export type DateOperatorKey = typeof DATE_OPERATORS[number];
-export type EnumOperatorKey = typeof ENUM_OPERATORS[number];
-
-type OperatorKeyForType<T> =
-    T extends boolean ? never :
-    T extends number ? NumericOperatorKey :
-    T extends Date ? DateOperatorKey :
-    T extends string ? StringOperatorKey :
-    keyof typeof FilterItemOperator.all;
-
-export type QuickFilterDef<EntityType> = NonNullable<{
-    [K in keyof EntityType]:
-        NonNullable<EntityType[K]> extends boolean
-            ? { column: K; operator?: never }
-            : { column: K; operator: OperatorKeyForType<NonNullable<EntityType[K]>> };
-}[keyof EntityType]>;
-
-export class NSAFilterOperators
-{
-    private static readonly NUMERIC_TYPES = new Set<VariableType>([
-        VariableType.TinyInt, VariableType.SmallInt, VariableType.MediumInt,
-        VariableType.Integer, VariableType.BigInt, VariableType.Float,
-        VariableType.Double, VariableType.Decimal, VariableType.Real, VariableType.Money,
-    ]);
-
-    private static readonly STRING_TYPES = new Set<VariableType>([
-        VariableType.String, VariableType.Email, VariableType.Phone, VariableType.URL,
-        VariableType.Color, VariableType.Font, VariableType.FilePath, VariableType.Version,
-        VariableType.IPV4, VariableType.IPV6, VariableType.IPV4Range, VariableType.IPV6Range,
-    ]);
-
-    private static pick(keys: readonly string[]): FilterItemOperator[]
-    {
-        return keys.map(k => all[k]).filter(Boolean);
-    }
-
-    static getQuickFilterOperators(type: VariableType): FilterItemOperator[]
-    {
-        if (NSAFilterOperators.NUMERIC_TYPES.has(type))
-            return NSAFilterOperators.pick(NUMERIC_OPERATORS);
-
-        if (NSAFilterOperators.STRING_TYPES.has(type))
-            return NSAFilterOperators.pick(STRING_OPERATORS);
-
-        switch (type)
-        {
-            case VariableType.Date:
-            case VariableType.DateTime:
-            case VariableType.Time:
-                return NSAFilterOperators.pick(DATE_OPERATORS);
-            case VariableType.Enum:
-            case VariableType.Entity:
-                return NSAFilterOperators.pick(ENUM_OPERATORS);
-            default:
-                return [];
-        }
-    }
-
-    static getOperatorKey(op: FilterItemOperator): string
-    {
-        return Object.keys(all).find(k => all[k] === op) ?? op.name.toLowerCase().replace(/\s+/g, "");
-    }
+import { FilterItemColumnType, FilterItemOperator } from "namirasoft-core";
+import { VariableType } from "namirasoft-schema";
+
+const all = FilterItemOperator.all as any;
+
+if (!all["between"])
+    all["between"] = new FilterItemOperator(
+        "Between", "><", 2,
+        (type: FilterItemColumnType) => [FilterItemColumnType.Number, FilterItemColumnType.Date, FilterItemColumnType.DateTime, FilterItemColumnType.Time].includes(type)
+    );
+
+if (!all["notequals"])
+    all["notequals"] = new FilterItemOperator(
+        "Not Equals", "!=", 1,
+        (type: FilterItemColumnType) => type !== FilterItemColumnType.Unknown
+    );
+
+if (!all["notcontains"])
+    all["notcontains"] = new FilterItemOperator(
+        "Not Contains", "!:", 1,
+        (type: FilterItemColumnType) => type !== FilterItemColumnType.Unknown && type !== FilterItemColumnType.Boolean
+    );
+
+export const NUMERIC_OPERATORS = ["equals", "notequals", "lessthan", "lessthanequal", "morethan", "morethanequal", "between", "empty", "exists"] as const;
+export const STRING_OPERATORS = ["contains", "equals", "startswith", "empty", "exists", "notequals", "notcontains"] as const;
+export const DATE_OPERATORS = ["equals", "lessthan", "lessthanequal", "morethan", "morethanequal", "between", "empty", "exists"] as const;
+export const ENUM_OPERATORS = ["equals", "empty", "exists"] as const;
+
+export type NumericOperatorKey = typeof NUMERIC_OPERATORS[number];
+export type StringOperatorKey = typeof STRING_OPERATORS[number];
+export type DateOperatorKey = typeof DATE_OPERATORS[number];
+export type EnumOperatorKey = typeof ENUM_OPERATORS[number];
+
+type OperatorKeyForType<T> =
+    T extends boolean ? never :
+    T extends number ? NumericOperatorKey :
+    T extends Date ? DateOperatorKey :
+    T extends string ? StringOperatorKey :
+    keyof typeof FilterItemOperator.all;
+
+export type QuickFilterDef<EntityType> = NonNullable<{
+    [K in keyof EntityType]:
+        NonNullable<EntityType[K]> extends boolean
+            ? { column: K; operator?: never }
+            : { column: K; operator: OperatorKeyForType<NonNullable<EntityType[K]>> };
+}[keyof EntityType]>;
+
+export class NSAFilterOperators
+{
+    private static readonly NUMERIC_TYPES = new Set<VariableType>([
+        VariableType.TinyInt, VariableType.SmallInt, VariableType.MediumInt,
+        VariableType.Integer, VariableType.BigInt, VariableType.Float,
+        VariableType.Double, VariableType.Decimal, VariableType.Real, VariableType.Money,
+    ]);
+
+    private static readonly STRING_TYPES = new Set<VariableType>([
+        VariableType.String, VariableType.Email, VariableType.Phone, VariableType.URL,
+        VariableType.Color, VariableType.Font, VariableType.FilePath, VariableType.Version,
+        VariableType.IPV4, VariableType.IPV6, VariableType.IPV4Range, VariableType.IPV6Range,
+    ]);
+
+    private static pick(keys: readonly string[]): FilterItemOperator[]
+    {
+        return keys.map(k => all[k]).filter(Boolean);
+    }
+
+    static getQuickFilterOperators(type: VariableType): FilterItemOperator[]
+    {
+        if (NSAFilterOperators.NUMERIC_TYPES.has(type))
+            return NSAFilterOperators.pick(NUMERIC_OPERATORS);
+
+        if (NSAFilterOperators.STRING_TYPES.has(type))
+            return NSAFilterOperators.pick(STRING_OPERATORS);
+
+        switch (type)
+        {
+            case VariableType.Date:
+            case VariableType.DateTime:
+            case VariableType.Time:
+                return NSAFilterOperators.pick(DATE_OPERATORS);
+            case VariableType.Enum:
+            case VariableType.Entity:
+                return NSAFilterOperators.pick(ENUM_OPERATORS);
+            default:
+                return [];
+        }
+    }
+
+    static getOperatorKey(op: FilterItemOperator): string
+    {
+        return Object.keys(all).find(k => all[k] === op) ?? op.name.toLowerCase().replace(/\s+/g, "");
+    }
 }

package/src/NSARouterMaker.tsx

@@ -1,141 +1,141 @@
-import { NamirasoftAccountServer, TokenManager } from "namirasoft-account";
-import { EncodingOperation, EnvService, IStorageCookie, ObjectService, ParsedNameValue, URLOperation } from "namirasoft-core";
-import { KeyOperation, LinkOperation, NSRouterMaker, NSRouterMakerResult } from 'namirasoft-site-react';
-import queryString, { ParsedQuery } from 'query-string';
-import React, { cloneElement } from 'react';
-import { NSALayoutCustomProps } from "./main";
-import { NSARouterMakerProps } from "./NSARouterMakerProps";
-import { NSARouterMakerResult } from "./NSARouterMakerResult";
-import { NSAConsentPage } from './pages/NSAConsentPage';
-import { NSAEmailVerificationPage } from './pages/NSAEmailVerificationPage';
-import { NSAPhoneVerificationPage } from './pages/NSAPhoneVerificationPage';
-
-export class NSARouterMaker extends React.Component<NSARouterMakerProps>
-{
-    constructor(props: NSARouterMakerProps)
-    {
-        super(props);
-        LinkOperation.setNavigate(props.navigate);
-        KeyOperation.start();
-        this.getResult = this.getResult.bind(this);
-        this.getQueryStrings = this.getQueryStrings.bind(this);
-        this.getQuery = this.getQuery.bind(this);
-        this.getLink = this.getLink.bind(this);
-        this.redirect = this.redirect.bind(this);
-        this.render = this.render.bind(this);
-    }
-    private getResult(ns_router_maker_props: NSRouterMakerResult): NSARouterMakerResult
-    {
-        let Cookies = process.env.REACT_APP_ACCOUNT_TOKEN;
-        let storage = new IStorageCookie({ domain: ".namirasoft.com", path: "/" }, Cookies);
-        let token_manager = new TokenManager(storage, () => { });
-
-        let REACT_APP_BASE_URL_ACCOUNT = new EnvService("REACT_APP_BASE_URL_ACCOUNT", true).getString();
-        let server = new NamirasoftAccountServer(REACT_APP_BASE_URL_ACCOUNT, token_manager, ns_router_maker_props.notifier.onError);
-
-        return {
-            product_id: this.props.product_id,
-            account: {
-                token_manager,
-                server,
-            },
-            url: {
-                getLink: this.getLink,
-                redirect: this.redirect,
-                getQueryStrings: this.getQueryStrings,
-                getQuery: this.getQuery,
-                navigate: this.props.navigate,
-            },
-            layout: {
-                getNSALayout: (props: NSALayoutCustomProps<any, any>, key: string) =>
-                {
-                    let layout = this.props.getNSALayout(props);
-                    return cloneElement(layout, { key });
-                }
-            },
-            ...ns_router_maker_props
-        };
-    }
-    getQueryStrings(): ParsedQuery
-    {
-        return queryString.parse(window.location.search);
-    }
-    getQuery(name: string, base64: boolean = false, remove: boolean = false): string
-    {
-        let query = this.getQueryStrings();
-        let item = query[name];
-        let ans = new ObjectService(item).getString();
-        if (base64)
-            try
-            {
-                ans = EncodingOperation.Base64Decode(ans);
-            } catch (error)
-            {
-                ans = "";
-            }
-        if (remove)
-        {
-            const url = new URL(window.location.href);
-            url.searchParams.delete(name);
-            window.history.replaceState({}, '', url);
-        }
-
-        return ans;
-    }
-    getLink(sub: string, customQuery: { [name: string]: ParsedNameValue })
-    {
-        if (!customQuery)
-            customQuery = {};
-        return URLOperation.getLink("", sub, customQuery);
-    }
-    redirect(sub: string, customQuery: { [name: string]: ParsedNameValue }): void
-    {
-        let ans = this.getLink(sub, customQuery);
-        LinkOperation.open(ans);
-    }
-    override render(): React.JSX.Element
-    {
-        return <NSRouterMaker
-            notifier_storage={this.props.notifier_storage}
-            page_force_update={this.props.page_force_update}
-            render={(ns_result: NSRouterMakerResult) =>
-            {
-                let nsa_result = this.getResult(ns_result);
-
-                let banned = false;
-                if (nsa_result.account.token_manager.exists())
-                {
-                    banned = nsa_result.account.token_manager.getUserData(user => user.banned, false);
-                    if (!banned)
-                    {
-                        let custom_render = this.props.getCustomRender?.(nsa_result);
-                        if (custom_render)
-                            return custom_render;
-                        return <NSAConsentPage
-                            {...nsa_result}
-                            product_id={this.props.product_id}
-                            onAccepted={() =>
-                            {
-                                if (this.props.requirement.verification.email)
-                                {
-                                    let e_verified = nsa_result.account.token_manager.getUserData(u => u.e_verified, false);
-                                    if (!e_verified)
-                                        return nsa_result.layout.getNSALayout({ ...nsa_result, children: <NSAEmailVerificationPage {...nsa_result} callback='' /> }, "nsa-page-email-verification");
-                                }
-                                if (this.props.requirement.verification.phone)
-                                {
-                                    let p_verified = nsa_result.account.token_manager.getUserData(u => u.p_verified, false);
-                                    if (!p_verified)
-                                        return nsa_result.layout.getNSALayout({ ...nsa_result, children: <NSAPhoneVerificationPage {...nsa_result} callback='' /> }, "nsa-page-phone-verification");
-                                }
-                                return this.props.renderOnLogin(nsa_result);
-                            }}
-                        />;
-                    }
-                }
-                return this.props.renderOnLogout(nsa_result, banned);
-
-            }}
-        />;
-    }
+import { NamirasoftAccountServer, TokenManager } from "namirasoft-account";
+import { EncodingOperation, EnvService, IStorageCookie, ObjectService, ParsedNameValue, URLOperation } from "namirasoft-core";
+import { KeyOperation, LinkOperation, NSRouterMaker, NSRouterMakerResult } from 'namirasoft-site-react';
+import queryString, { ParsedQuery } from 'query-string';
+import React, { cloneElement } from 'react';
+import { NSALayoutCustomProps } from "./main";
+import { NSARouterMakerProps } from "./NSARouterMakerProps";
+import { NSARouterMakerResult } from "./NSARouterMakerResult";
+import { NSAConsentPage } from './pages/NSAConsentPage';
+import { NSAEmailVerificationPage } from './pages/NSAEmailVerificationPage';
+import { NSAPhoneVerificationPage } from './pages/NSAPhoneVerificationPage';
+
+export class NSARouterMaker extends React.Component<NSARouterMakerProps>
+{
+    constructor(props: NSARouterMakerProps)
+    {
+        super(props);
+        LinkOperation.setNavigate(props.navigate);
+        KeyOperation.start();
+        this.getResult = this.getResult.bind(this);
+        this.getQueryStrings = this.getQueryStrings.bind(this);
+        this.getQuery = this.getQuery.bind(this);
+        this.getLink = this.getLink.bind(this);
+        this.redirect = this.redirect.bind(this);
+        this.render = this.render.bind(this);
+    }
+    private getResult(ns_router_maker_props: NSRouterMakerResult): NSARouterMakerResult
+    {
+        let Cookies = process.env.REACT_APP_ACCOUNT_TOKEN;
+        let storage = new IStorageCookie({ domain: ".namirasoft.com", path: "/" }, Cookies);
+        let token_manager = new TokenManager(storage, () => { });
+
+        let REACT_APP_BASE_URL_ACCOUNT = new EnvService("REACT_APP_BASE_URL_ACCOUNT", true).getString();
+        let server = new NamirasoftAccountServer(REACT_APP_BASE_URL_ACCOUNT, token_manager, ns_router_maker_props.notifier.onError);
+
+        return {
+            product_id: this.props.product_id,
+            account: {
+                token_manager,
+                server,
+            },
+            url: {
+                getLink: this.getLink,
+                redirect: this.redirect,
+                getQueryStrings: this.getQueryStrings,
+                getQuery: this.getQuery,
+                navigate: this.props.navigate,
+            },
+            layout: {
+                getNSALayout: (props: NSALayoutCustomProps<any, any>, key: string) =>
+                {
+                    let layout = this.props.getNSALayout(props);
+                    return cloneElement(layout, { key });
+                }
+            },
+            ...ns_router_maker_props
+        };
+    }
+    getQueryStrings(): ParsedQuery
+    {
+        return queryString.parse(window.location.search);
+    }
+    getQuery(name: string, base64: boolean = false, remove: boolean = false): string
+    {
+        let query = this.getQueryStrings();
+        let item = query[name];
+        let ans = new ObjectService(item).getString();
+        if (base64)
+            try
+            {
+                ans = EncodingOperation.Base64Decode(ans);
+            } catch (error)
+            {
+                ans = "";
+            }
+        if (remove)
+        {
+            const url = new URL(window.location.href);
+            url.searchParams.delete(name);
+            window.history.replaceState({}, '', url);
+        }
+
+        return ans;
+    }
+    getLink(sub: string, customQuery: { [name: string]: ParsedNameValue })
+    {
+        if (!customQuery)
+            customQuery = {};
+        return URLOperation.getLink("", sub, customQuery);
+    }
+    redirect(sub: string, customQuery: { [name: string]: ParsedNameValue }): void
+    {
+        let ans = this.getLink(sub, customQuery);
+        LinkOperation.open(ans);
+    }
+    override render(): React.JSX.Element
+    {
+        return <NSRouterMaker
+            notifier_storage={this.props.notifier_storage}
+            page_force_update={this.props.page_force_update}
+            render={(ns_result: NSRouterMakerResult) =>
+            {
+                let nsa_result = this.getResult(ns_result);
+
+                let banned = false;
+                if (nsa_result.account.token_manager.exists())
+                {
+                    banned = nsa_result.account.token_manager.getUserData(user => user.banned, false);
+                    if (!banned)
+                    {
+                        let custom_render = this.props.getCustomRender?.(nsa_result);
+                        if (custom_render)
+                            return custom_render;
+                        return <NSAConsentPage
+                            {...nsa_result}
+                            product_id={this.props.product_id}
+                            onAccepted={() =>
+                            {
+                                if (this.props.requirement.verification.email)
+                                {
+                                    let e_verified = nsa_result.account.token_manager.getUserData(u => u.e_verified, false);
+                                    if (!e_verified)
+                                        return nsa_result.layout.getNSALayout({ ...nsa_result, children: <NSAEmailVerificationPage {...nsa_result} callback='' /> }, "nsa-page-email-verification");
+                                }
+                                if (this.props.requirement.verification.phone)
+                                {
+                                    let p_verified = nsa_result.account.token_manager.getUserData(u => u.p_verified, false);
+                                    if (!p_verified)
+                                        return nsa_result.layout.getNSALayout({ ...nsa_result, children: <NSAPhoneVerificationPage {...nsa_result} callback='' /> }, "nsa-page-phone-verification");
+                                }
+                                return this.props.renderOnLogin(nsa_result);
+                            }}
+                        />;
+                    }
+                }
+                return this.props.renderOnLogout(nsa_result, banned);
+
+            }}
+        />;
+    }
 };

package/src/NSARouterMakerProps.ts

@@ -1,24 +1,24 @@
-import { IStorage } from "namirasoft-core";
-import { ReactElement } from "react";
-import type { NavigateFunction } from "react-router-dom";
-import { NSARouterMakerResult } from "./NSARouterMakerResult";
-import { NSALayoutCustomProps } from "./layouts/NSALayout";
-
-export interface NSARouterMakerProps
-{
-    notifier_storage: IStorage;
-    page_force_update: () => void;
-
-    product_id: string;
-    navigate: NavigateFunction;
-    renderOnLogin(result: NSARouterMakerResult): ReactElement;
-    renderOnLogout(result: NSARouterMakerResult, banned: boolean): ReactElement;
-    getNSALayout<RowType extends { id: string }, RowTypeInput = RowType>(props: NSALayoutCustomProps<RowType, RowTypeInput>): ReactElement;
-    requirement: {
-        verification: {
-            email: boolean;
-            phone: boolean;
-        };
-    };
-    getCustomRender?: (result: NSARouterMakerResult) => ReactElement | null;
+import { IStorage } from "namirasoft-core";
+import { ReactElement } from "react";
+import type { NavigateFunction } from "react-router-dom";
+import { NSARouterMakerResult } from "./NSARouterMakerResult";
+import { NSALayoutCustomProps } from "./layouts/NSALayout";
+
+export interface NSARouterMakerProps
+{
+    notifier_storage: IStorage;
+    page_force_update: () => void;
+
+    product_id: string;
+    navigate: NavigateFunction;
+    renderOnLogin(result: NSARouterMakerResult): ReactElement;
+    renderOnLogout(result: NSARouterMakerResult, banned: boolean): ReactElement;
+    getNSALayout<RowType extends { id: string }, RowTypeInput = RowType>(props: NSALayoutCustomProps<RowType, RowTypeInput>): ReactElement;
+    requirement: {
+        verification: {
+            email: boolean;
+            phone: boolean;
+        };
+    };
+    getCustomRender?: (result: NSARouterMakerResult) => ReactElement | null;
 }

package/src/NSARouterMakerResult.ts

@@ -1,25 +1,25 @@
-import { NamirasoftAccountServer, TokenManager } from "namirasoft-account";
-import { ParsedNameValue } from "namirasoft-core";
-import { NSRouterMakerResult } from "namirasoft-site-react";
-import { ParsedQuery } from "query-string";
-import { NavigateFunction } from "react-router-dom";
-import { NSALayoutCustomProps } from "./layouts/NSALayout";
-
-export interface NSARouterMakerResult extends NSRouterMakerResult
-{
-    product_id: string;
-    account: {
-        token_manager: TokenManager
-        server: NamirasoftAccountServer;
-    },
-    url: {
-        getQueryStrings(): ParsedQuery;
-        getQuery(name: string, base64?: boolean, remove?: boolean): string;
-        getLink(sub: string, customQuery: { [name: string]: ParsedNameValue }): string;
-        redirect(sub: string, customQuery: { [name: string]: ParsedNameValue }): void;
-        navigate: NavigateFunction;
-    },
-    layout: {
-        getNSALayout<RowType extends { id: string }, RowTypeInput = RowType>(props: NSALayoutCustomProps<RowType, RowTypeInput>, key: string): React.JSX.Element;
-    }
+import { NamirasoftAccountServer, TokenManager } from "namirasoft-account";
+import { ParsedNameValue } from "namirasoft-core";
+import { NSRouterMakerResult } from "namirasoft-site-react";
+import { ParsedQuery } from "query-string";
+import { NavigateFunction } from "react-router-dom";
+import { NSALayoutCustomProps } from "./layouts/NSALayout";
+
+export interface NSARouterMakerResult extends NSRouterMakerResult
+{
+    product_id: string;
+    account: {
+        token_manager: TokenManager
+        server: NamirasoftAccountServer;
+    },
+    url: {
+        getQueryStrings(): ParsedQuery;
+        getQuery(name: string, base64?: boolean, remove?: boolean): string;
+        getLink(sub: string, customQuery: { [name: string]: ParsedNameValue }): string;
+        redirect(sub: string, customQuery: { [name: string]: ParsedNameValue }): void;
+        navigate: NavigateFunction;
+    },
+    layout: {
+        getNSALayout<RowType extends { id: string }, RowTypeInput = RowType>(props: NSALayoutCustomProps<RowType, RowTypeInput>, key: string): React.JSX.Element;
+    }
 }

package/src/NSFRouterMaker.tsx

@@ -1,36 +1,36 @@
-import { EnvService } from 'namirasoft-core';
-import { CategoryScopeRow, EntityResolveResponseRow, NamirasoftFieldServer, SlotEntityType, SlotRow } from 'namirasoft-field';
-import { ReactNode } from 'react';
-import { Route } from 'react-router-dom';
-import { NSALayoutCustomProps } from './main';
-import { NSFRoutes } from './NSFRoutes';
-import { NSFCategoryEditPage } from './pages/NSFCategoryEditPage';
-import { NSFCategoryListPage } from './pages/NSFCategoryListPage';
-import { NSFCategoryViewPage } from './pages/NSFCategoryViewPage';
-
-export interface NSFRouterMakerProps extends NSALayoutCustomProps<any, any>
-{
-    rows: EntityResolveResponseRow;
-}
-
-export class NSFRouterMaker
-{
-    static getRoutes(props: NSFRouterMakerProps): ReactNode[]
-    {
-        const { rows } = props;
-        const scope_slots = rows?.slots.filter(s => s.entity_type === SlotEntityType.CategoryScope) ?? [];
-        let pairs = scope_slots.map(slot => ({ slot, category_scope: rows?.category_scopes.find(c => c.id === slot.entity_id) })).filter(i => i.category_scope) as { slot: SlotRow, category_scope: CategoryScopeRow }[];
-
-        let REACT_APP_BASE_URL_FIELD = new EnvService("REACT_APP_BASE_URL_FIELD", true).getString();
-        let field = new NamirasoftFieldServer(REACT_APP_BASE_URL_FIELD, props.account.token_manager, props.notifier.onError);
-        let servers = { field };
-
-        return pairs.flatMap(({ slot, category_scope }) => [
-            <Route key={`${slot.id}-category-list`} path={NSFRoutes.CategoryList(slot.id, slot.name)} element={<NSFCategoryListPage {...props} servers={servers} slot={slot} category_scope={category_scope} />} />,
-            <Route key={`${slot.id}-category-new`} path={NSFRoutes.CategoryNew(slot.id, slot.name)} element={<NSFCategoryEditPage {...props} servers={servers} isEdit={false} slot={slot} category_scope={category_scope} />} />,
-            <Route key={`${slot.id}-category-copy`} path={NSFRoutes.CategoryCopy(slot.id, slot.name, ":id")} element={<NSFCategoryEditPage {...props} servers={servers} isEdit={false} slot={slot} category_scope={category_scope} />} />,
-            <Route key={`${slot.id}-category-edit`} path={NSFRoutes.CategoryEdit(slot.id, slot.name, ":id")} element={<NSFCategoryEditPage {...props} servers={servers} isEdit={true} slot={slot} category_scope={category_scope} />} />,
-            <Route key={`${slot.id}-category-view`} path={NSFRoutes.CategoryView(slot.id, slot.name, ":id")} element={<NSFCategoryViewPage {...props} servers={servers} slot={slot} category_scope={category_scope} />} />,
-        ]);
-    }
+import { EnvService } from 'namirasoft-core';
+import { CategoryScopeRow, EntityResolveResponseRow, NamirasoftFieldServer, SlotEntityType, SlotRow } from 'namirasoft-field';
+import { ReactNode } from 'react';
+import { Route } from 'react-router-dom';
+import { NSALayoutCustomProps } from './main';
+import { NSFRoutes } from './NSFRoutes';
+import { NSFCategoryEditPage } from './pages/NSFCategoryEditPage';
+import { NSFCategoryListPage } from './pages/NSFCategoryListPage';
+import { NSFCategoryViewPage } from './pages/NSFCategoryViewPage';
+
+export interface NSFRouterMakerProps extends NSALayoutCustomProps<any, any>
+{
+    rows: EntityResolveResponseRow;
+}
+
+export class NSFRouterMaker
+{
+    static getRoutes(props: NSFRouterMakerProps): ReactNode[]
+    {
+        const { rows } = props;
+        const scope_slots = rows?.slots.filter(s => s.entity_type === SlotEntityType.CategoryScope) ?? [];
+        let pairs = scope_slots.map(slot => ({ slot, category_scope: rows?.category_scopes.find(c => c.id === slot.entity_id) })).filter(i => i.category_scope) as { slot: SlotRow, category_scope: CategoryScopeRow }[];
+
+        let REACT_APP_BASE_URL_FIELD = new EnvService("REACT_APP_BASE_URL_FIELD", true).getString();
+        let field = new NamirasoftFieldServer(REACT_APP_BASE_URL_FIELD, props.account.token_manager, props.notifier.onError);
+        let servers = { field };
+
+        return pairs.flatMap(({ slot, category_scope }) => [
+            <Route key={`${slot.id}-category-list`} path={NSFRoutes.CategoryList(slot.id, slot.name)} element={<NSFCategoryListPage {...props} servers={servers} slot={slot} category_scope={category_scope} />} />,
+            <Route key={`${slot.id}-category-new`} path={NSFRoutes.CategoryNew(slot.id, slot.name)} element={<NSFCategoryEditPage {...props} servers={servers} isEdit={false} slot={slot} category_scope={category_scope} />} />,
+            <Route key={`${slot.id}-category-copy`} path={NSFRoutes.CategoryCopy(slot.id, slot.name, ":id")} element={<NSFCategoryEditPage {...props} servers={servers} isEdit={false} slot={slot} category_scope={category_scope} />} />,
+            <Route key={`${slot.id}-category-edit`} path={NSFRoutes.CategoryEdit(slot.id, slot.name, ":id")} element={<NSFCategoryEditPage {...props} servers={servers} isEdit={true} slot={slot} category_scope={category_scope} />} />,
+            <Route key={`${slot.id}-category-view`} path={NSFRoutes.CategoryView(slot.id, slot.name, ":id")} element={<NSFCategoryViewPage {...props} servers={servers} slot={slot} category_scope={category_scope} />} />,
+        ]);
+    }
 }