namirasoft-account-react 1.5.12 → 1.5.13

package/dist/NSARouter.d.ts

@@ -0,0 +1,16 @@
+import { EntityResolveResponseRow } from 'namirasoft-field';
+import { Component, ReactNode } from 'react';
+import { NSARouterMakerProps } from './NSARouterMakerProps';
+export interface NSARoutesProps extends NSARouterMakerProps {
+    children: ReactNode;
+}
+interface NSARoutesState {
+    rows: EntityResolveResponseRow | null;
+}
+export declare class NSARouter extends Component<NSARoutesProps, NSARoutesState> {
+    private cache_field;
+    constructor(props: NSARoutesProps);
+    componentDidMount(): void;
+    render(): import("react/jsx-runtime").JSX.Element;
+}
+export {};

package/dist/NSARouter.js

@@ -0,0 +1,42 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { EnvService } from 'namirasoft-core';
+import { NamirasoftFieldServer, SlotEntityType } from 'namirasoft-field';
+import { NSRoutes } from 'namirasoft-site-react';
+import { Component } from 'react';
+import { Route } from 'react-router-dom';
+import { FieldCacheService } from './FieldCacheService';
+import { NSFRoutes } from './NSFRoutes';
+import { NSFCategoryEditPage } from './pages/NSFCategoryEditPage';
+import { NSFCategoryListPage } from './pages/NSFCategoryListPage';
+import { NSFCategoryViewPage } from './pages/NSFCategoryViewPage';
+export class NSARouter extends Component {
+    constructor(props) {
+        super(props);
+        this.cache_field = FieldCacheService.get(this.props.account.token_manager, this.props.product_id, this.props.notifier.onError);
+        this.state = {
+            rows: null,
+        };
+    }
+    componentDidMount() {
+        this.cache_field.get().then(rows => {
+            this.setState(prev => (Object.assign(Object.assign({}, prev), { rows })));
+        });
+    }
+    render() {
+        var _a;
+        const { rows } = this.state;
+        const scope_slots = (_a = rows === null || rows === void 0 ? void 0 : rows.slots.filter(s => s.entity_type === SlotEntityType.CategoryScope)) !== null && _a !== void 0 ? _a : [];
+        let pairs = scope_slots.map(slot => ({ slot, category_scope: rows === null || rows === void 0 ? void 0 : rows.category_scopes.find(c => c.id === slot.entity_id) })).filter(i => i.category_scope);
+        let REACT_APP_BASE_URL_FIELD = new EnvService("REACT_APP_BASE_URL_FIELD", true).getString();
+        let field = new NamirasoftFieldServer(REACT_APP_BASE_URL_FIELD, this.props.account.token_manager, this.props.notifier.onError);
+        let servers = { field };
+        return (_jsxs(NSRoutes, { children: [this.props.children, pairs.flatMap(({ slot, category_scope }) => [
+                    _jsx(Route, { path: NSFRoutes.CategoryList(slot.id, slot.name), element: _jsx(NSFCategoryListPage, Object.assign({}, this.props, { servers: servers, slot: slot, category_scope: category_scope })) }, `${slot.id}-category-list`),
+                    _jsx(Route, { path: NSFRoutes.CategoryNew(slot.id, slot.name), element: _jsx(NSFCategoryEditPage, Object.assign({}, this.props, { servers: servers, isEdit: false, slot: slot, category_scope: category_scope })) }, `${slot.id}-category-new`),
+                    _jsx(Route, { path: NSFRoutes.CategoryCopy(slot.id, slot.name, ":id"), element: _jsx(NSFCategoryEditPage, Object.assign({}, this.props, { servers: servers, isEdit: false, slot: slot, category_scope: category_scope })) }, `${slot.id}-category-copy`),
+                    _jsx(Route, { path: NSFRoutes.CategoryEdit(slot.id, slot.name, ":id"), element: _jsx(NSFCategoryEditPage, Object.assign({}, this.props, { servers: servers, isEdit: true, slot: slot, category_scope: category_scope })) }, `${slot.id}-category-edit`),
+                    _jsx(Route, { path: NSFRoutes.CategoryView(slot.id, slot.name, ":id"), element: _jsx(NSFCategoryViewPage, Object.assign({}, this.props, { servers: servers, slot: slot, category_scope: category_scope })) }, `${slot.id}-category-view`),
+                ])] }));
+    }
+}
+//# sourceMappingURL=NSARouter.js.map

package/dist/NSARouter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"NSARouter.js","sourceRoot":"","sources":["../src/NSARouter.tsx"],"names":[],"mappings":"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"}

package/dist/NSFRouterProps.d.ts

@@ -0,0 +1,6 @@
+import { NamirasoftFieldServer } from "namirasoft-field";
+export interface NSFRouterProps {
+    servers: {
+        field: NamirasoftFieldServer;
+    };
+}

package/dist/NSFRouterProps.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=NSFRouterProps.js.map

package/dist/NSFRouterProps.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"NSFRouterProps.js","sourceRoot":"","sources":["../src/NSFRouterProps.ts"],"names":[],"mappings":""}

package/dist/layouts/NSALayout.js

@@ -26,7 +26,7 @@ import { FieldCacheService } from '../FieldCacheService';
 import { NSACacheService } from '../NSACacheService';
 import { UseParams } from '../UseParams';
 import { Actions } from './Actions';
-import { NSARouter_Field } from './NSARouter_Field';
+import { NSALayout_Field } from './NSALayout_Field';
 import { NSASectionEdit } from './NSASectionEdit';
 import { NSASectionList } from './NSASectionList';
 import { NSASectionView } from './NSASectionView';
@@ -405,7 +405,7 @@ export class NSALayout extends Component {
                         onCollapse: () => {
                             this.setState((prev) => ({ showMasterMenu: !prev.showMasterMenu }));
                         },
-                        filters_postprocessor: (filters) => NSARouter_Field.postprocess(filters, this.state.ctf_rows),
+                        filters_postprocessor: (filters) => NSALayout_Field.postprocess(filters, this.state.ctf_rows),
                     }, action: {
                         title: action_title,
                         description: action_description,

package/dist/layouts/NSALayout_Field.d.ts

@@ -0,0 +1,8 @@
+import { FilterLinkFullRow } from 'namirasoft-api-link';
+import { EntityResolveResponseRow } from 'namirasoft-field';
+export declare class NSALayout_Field {
+    static postprocess(filters: FilterLinkFullRow[], rows: EntityResolveResponseRow | null): FilterLinkFullRow[];
+    private static findEntityRow;
+    private static make;
+    private static walk;
+}

package/dist/layouts/NSALayout_Field.js

@@ -0,0 +1,92 @@
+import { NamingConvention } from 'namirasoft-core';
+import { SlotEntityType } from 'namirasoft-field';
+import { NSFRoutes } from '../NSFRoutes';
+export class NSALayout_Field {
+    static postprocess(filters, rows) {
+        var _a, _b, _c, _d, _e;
+        if (!rows || rows.slots.length === 0)
+            return filters;
+        const result = [...filters];
+        const id_counter = { value: -1000000 };
+        const matched = new Set();
+        NSALayout_Field.walk(filters, null, rows, result, id_counter, matched);
+        const fallback_filter_id = (_b = (_a = filters[0]) === null || _a === void 0 ? void 0 : _a.filter_id) !== null && _b !== void 0 ? _b : 0;
+        const fallback_filter_ref = (_d = (_c = filters[0]) === null || _c === void 0 ? void 0 : _c.filter) !== null && _d !== void 0 ? _d : null;
+        for (const slot of rows.slots) {
+            if (matched.has(slot.id))
+                continue;
+            const parent = NSALayout_Field.make(id_counter, null, fallback_filter_id, fallback_filter_ref, slot.name, (_e = slot.description) !== null && _e !== void 0 ? _e : "", "");
+            result.push(parent);
+            result.push(NSALayout_Field.make(id_counter, parent.id, fallback_filter_id, fallback_filter_ref, "Create", "", NSFRoutes.CategoryNew(slot.id, slot.name)));
+            result.push(NSALayout_Field.make(id_counter, parent.id, fallback_filter_id, fallback_filter_ref, "List", "", NSFRoutes.CategoryList(slot.id, slot.name)));
+        }
+        return result;
+    }
+    static findEntityRow(filter_name, rows) {
+        var _a;
+        const n = NamingConvention.auto.convert((filter_name !== null && filter_name !== void 0 ? filter_name : "").trim(), NamingConvention.lower_case);
+        if (n.length === 0)
+            return null;
+        for (const slot of rows.slots) {
+            if (slot.entity_type != SlotEntityType.CategoryScope)
+                continue;
+            if (NamingConvention.auto.convert(((_a = slot.entity) !== null && _a !== void 0 ? _a : "").trim(), NamingConvention.lower_case) === n)
+                return slot;
+        }
+        return null;
+    }
+    static make(id_counter, parent_id, filter_id, filter_ref, label, description, url) {
+        const now = new Date();
+        const id = id_counter.value--;
+        return {
+            id,
+            parent_id,
+            filter_id,
+            link_id: null,
+            name: label,
+            logo: "https://static.namirasoft.com/image/namirasoft/field/logo/base.png",
+            order: 0,
+            created_at: now,
+            updated_at: now,
+            filter: filter_ref,
+            link: {
+                id: 0,
+                category_id: 0,
+                domain_id: 0,
+                name: label,
+                url: url,
+                logo: "https://static.namirasoft.com/image/namirasoft/field/logo/base.png",
+                public: true,
+                private: true,
+                importance: 0,
+                description,
+                created_at: now,
+                updated_at: now,
+                category: null,
+                domain: null,
+            }
+        };
+    }
+    static walk(filters, parent_id, rows, result, id_counter, matched) {
+        var _a, _b, _c, _d, _e;
+        const children = filters.filter(f => f.parent_id === parent_id);
+        for (const filter of children) {
+            const filter_name = (_c = (_a = filter.name) !== null && _a !== void 0 ? _a : (_b = filter.link) === null || _b === void 0 ? void 0 : _b.name) !== null && _c !== void 0 ? _c : "";
+            const slot = NSALayout_Field.findEntityRow(filter_name, rows);
+            if (slot) {
+                matched.add(slot.id);
+                const parent = NSALayout_Field.make(id_counter, filter.parent_id, filter.filter_id, filter.filter, slot.name, (_d = slot.description) !== null && _d !== void 0 ? _d : "", "");
+                parent.order = ((_e = filter.order) !== null && _e !== void 0 ? _e : 0) - 1;
+                const idx = result.indexOf(filter);
+                if (idx >= 0)
+                    result.splice(idx, 0, parent);
+                else
+                    result.push(parent);
+                result.push(NSALayout_Field.make(id_counter, parent.id, filter.filter_id, filter.filter, "Create", "", NSFRoutes.CategoryNew(slot.id, slot.name)));
+                result.push(NSALayout_Field.make(id_counter, parent.id, filter.filter_id, filter.filter, "List", "", NSFRoutes.CategoryList(slot.id, slot.name)));
+            }
+            NSALayout_Field.walk(filters, filter.id, rows, result, id_counter, matched);
+        }
+    }
+}
+//# sourceMappingURL=NSALayout_Field.js.map

package/dist/layouts/NSALayout_Field.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"NSALayout_Field.js","sourceRoot":"","sources":["../../src/layouts/NSALayout_Field.ts"],"names":[],"mappings":"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"}

package/dist/layouts/NSARouter.d.ts

@@ -1,17 +1,16 @@
 import { EntityResolveResponseRow } from 'namirasoft-field';
 import { Component, ReactNode } from 'react';
 import { NSARouterMakerProps } from '../NSARouterMakerProps';
-import { NSFFieldServersProps } from '../pages/NSFEntities';
-export interface NSARoutesProps {
-    props: NSARouterMakerProps;
-    servers: NSFFieldServersProps['servers'];
-    rows: EntityResolveResponseRow | null;
+export interface NSARoutesProps extends NSARouterMakerProps {
     children: ReactNode;
 }
 interface NSARoutesState {
+    rows: EntityResolveResponseRow | null;
 }
 export declare class NSARouter extends Component<NSARoutesProps, NSARoutesState> {
+    private cache_field;
     constructor(props: NSARoutesProps);
+    componentDidMount(): void;
     render(): import("react/jsx-runtime").JSX.Element;
 }
 export {};

package/dist/layouts/NSARouter.js

@@ -3,6 +3,7 @@ import { SlotEntityType } from 'namirasoft-field';
 import { NSRoutes } from 'namirasoft-site-react';
 import { Component } from 'react';
 import { Route } from 'react-router-dom';
+import { FieldCacheService } from '../FieldCacheService';
 import { NSFRoutes } from '../NSFRoutes';
 import { NSFCategoryEditPage } from '../pages/NSFCategoryEditPage';
 import { NSFCategoryListPage } from '../pages/NSFCategoryListPage';
@@ -10,19 +11,27 @@ import { NSFCategoryViewPage } from '../pages/NSFCategoryViewPage';
 export class NSARouter extends Component {
     constructor(props) {
         super(props);
-        this.state = {};
+        this.cache_field = FieldCacheService.get(this.props.account.token_manager, this.props.product_id, this.props.notifier.onError);
+        this.state = {
+            rows: null,
+        };
+    }
+    componentDidMount() {
+        this.cache_field.get().then(rows => {
+            this.setState(prev => (Object.assign(Object.assign({}, prev), { rows })));
+        });
     }
     render() {
         var _a;
-        const { props, servers, rows, children } = this.props;
+        const { rows } = this.state;
         const scope_slots = (_a = rows === null || rows === void 0 ? void 0 : rows.slots.filter(s => s.entity_type === SlotEntityType.CategoryScope)) !== null && _a !== void 0 ? _a : [];
         let pairs = scope_slots.map(slot => ({ slot, category_scope: rows === null || rows === void 0 ? void 0 : rows.category_scopes.find(c => c.id === slot.entity_id) })).filter(i => i.category_scope);
-        return (_jsxs(NSRoutes, { children: [children, pairs.flatMap(({ slot, category_scope }) => [
-                    _jsx(Route, { path: NSFRoutes.CategoryList(slot.id, slot.name), element: _jsx(NSFCategoryListPage, Object.assign({}, props, { servers: servers, slot: slot, category_scope: category_scope })) }, `${slot.id}-category-list`),
-                    _jsx(Route, { path: NSFRoutes.CategoryNew(slot.id, slot.name), element: _jsx(NSFCategoryEditPage, Object.assign({ isEdit: false }, props, { servers: servers, slot: slot, category_scope: category_scope })) }, `${slot.id}-category-new`),
-                    _jsx(Route, { path: NSFRoutes.CategoryCopy(slot.id, slot.name, ":id"), element: _jsx(NSFCategoryEditPage, Object.assign({ isEdit: false }, props, { servers: servers, slot: slot, category_scope: category_scope })) }, `${slot.id}-category-copy`),
-                    _jsx(Route, { path: NSFRoutes.CategoryEdit(slot.id, slot.name, ":id"), element: _jsx(NSFCategoryEditPage, Object.assign({ isEdit: true }, props, { servers: servers, slot: slot, category_scope: category_scope })) }, `${slot.id}-category-edit`),
-                    _jsx(Route, { path: NSFRoutes.CategoryView(slot.id, slot.name, ":id"), element: _jsx(NSFCategoryViewPage, Object.assign({}, props, { servers: servers, slot: slot, category_scope: category_scope })) }, `${slot.id}-category-view`),
+        return (_jsxs(NSRoutes, { children: [this.props.children, pairs.flatMap(({ slot, category_scope }) => [
+                    _jsx(Route, { path: NSFRoutes.CategoryList(slot.id, slot.name), element: _jsx(NSFCategoryListPage, Object.assign({}, this.props, { slot: slot, category_scope: category_scope })) }, `${slot.id}-category-list`),
+                    _jsx(Route, { path: NSFRoutes.CategoryNew(slot.id, slot.name), element: _jsx(NSFCategoryEditPage, Object.assign({}, this.props, { isEdit: false, slot: slot, category_scope: category_scope })) }, `${slot.id}-category-new`),
+                    _jsx(Route, { path: NSFRoutes.CategoryCopy(slot.id, slot.name, ":id"), element: _jsx(NSFCategoryEditPage, Object.assign({}, this.props, { isEdit: false, slot: slot, category_scope: category_scope })) }, `${slot.id}-category-copy`),
+                    _jsx(Route, { path: NSFRoutes.CategoryEdit(slot.id, slot.name, ":id"), element: _jsx(NSFCategoryEditPage, Object.assign({}, this.props, { isEdit: true, slot: slot, category_scope: category_scope })) }, `${slot.id}-category-edit`),
+                    _jsx(Route, { path: NSFRoutes.CategoryView(slot.id, slot.name, ":id"), element: _jsx(NSFCategoryViewPage, Object.assign({}, this.props, { slot: slot, category_scope: category_scope })) }, `${slot.id}-category-view`),
                 ])] }));
     }
 }

package/dist/layouts/NSARouter.js.map

@@ -1 +1 @@
-{"version":3,"file":"NSARouter.js","sourceRoot":"","sources":["../../src/layouts/NSARouter.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"NSARouter.js","sourceRoot":"","sources":["../../src/layouts/NSARouter.tsx"],"names":[],"mappings":"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"}

package/dist/main.d.ts

@@ -26,8 +26,7 @@ export * from "./IEntityInfo";
 export * from "./layouts/Actions";
 export * from "./layouts/CFTUtil";
 export * from "./layouts/NSALayout";
-export * from "./layouts/NSARouter";
-export * from "./layouts/NSARouter_Field";
+export * from "./layouts/NSALayout_Field";
 export * from "./layouts/NSASectionEdit";
 export * from "./layouts/NSASectionEditTabPage";
 export * from "./layouts/NSASectionList";
@@ -36,6 +35,7 @@ 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";

package/dist/main.js

@@ -26,8 +26,7 @@ export * from "./IEntityInfo";
 export * from "./layouts/Actions";
 export * from "./layouts/CFTUtil";
 export * from "./layouts/NSALayout";
-export * from "./layouts/NSARouter";
-export * from "./layouts/NSARouter_Field";
+export * from "./layouts/NSALayout_Field";
 export * from "./layouts/NSASectionEdit";
 export * from "./layouts/NSASectionEditTabPage";
 export * from "./layouts/NSASectionList";
@@ -36,6 +35,7 @@ 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";

package/dist/main.js.map

@@ -1 +1 @@
-{"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":"AAAA,cAAc,kCAAkC,CAAC;AACjD,cAAc,2BAA2B,CAAC;AAC1C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,gCAAgC,CAAC;AAC/C,cAAc,mCAAmC,CAAC;AAClD,cAAc,mCAAmC,CAAC;AAClD,cAAc,+BAA+B,CAAC;AAC9C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,uBAAuB,CAAC;AACtC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,qCAAqC,CAAC;AACpD,cAAc,4BAA4B,CAAC;AAC3C,cAAc,2CAA2C,CAAC;AAC1D,cAAc,8CAA8C,CAAC;AAC7D,cAAc,2CAA2C,CAAC;AAC1D,cAAc,+CAA+C,CAAC;AAC9D,cAAc,2CAA2C,CAAC;AAC1D,cAAc,6CAA6C,CAAC;AAC5D,cAAc,6CAA6C,CAAC;AAC5D,cAAc,2CAA2C,CAAC;AAC1D,cAAc,4CAA4C,CAAC;AAC3D,cAAc,+CAA+C,CAAC;AAC9D,cAAc,UAAU,CAAC;AACzB,cAAc,8BAA8B,CAAC;AAC7C,cAAc,eAAe,CAAC;AAC9B,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAClC,cAAc,qBAAqB,CAAC;AACpC,cAAc,qBAAqB,CAAC;AACpC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,0BAA0B,CAAC;AACzC,cAAc,iCAAiC,CAAC;AAChD,cAAc,0BAA0B,CAAC;AACzC,cAAc,0BAA0B,CAAC;AACzC,cAAc,iCAAiC,CAAC;AAChD,cAAc,iCAAiC,CAAC;AAChD,cAAc,mBAAmB,CAAC;AAClC,cAAc,sBAAsB,CAAC;AACrC,cAAc,kBAAkB,CAAC;AACjC,cAAc,wBAAwB,CAAC;AACvC,cAAc,uBAAuB,CAAC;AACtC,cAAc,aAAa,CAAC;AAC5B,cAAc,wBAAwB,CAAC;AACvC,cAAc,kCAAkC,CAAC;AACjD,cAAc,qBAAqB,CAAC;AACpC,cAAc,sBAAsB,CAAC;AACrC,cAAc,kCAAkC,CAAC;AACjD,cAAc,6BAA6B,CAAC;AAC5C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,qBAAqB,CAAC;AACpC,cAAc,yBAAyB,CAAC;AACxC,cAAc,aAAa,CAAC"}
+{"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":"AAAA,cAAc,kCAAkC,CAAC;AACjD,cAAc,2BAA2B,CAAC;AAC1C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,gCAAgC,CAAC;AAC/C,cAAc,mCAAmC,CAAC;AAClD,cAAc,mCAAmC,CAAC;AAClD,cAAc,+BAA+B,CAAC;AAC9C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,uBAAuB,CAAC;AACtC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,qCAAqC,CAAC;AACpD,cAAc,4BAA4B,CAAC;AAC3C,cAAc,2CAA2C,CAAC;AAC1D,cAAc,8CAA8C,CAAC;AAC7D,cAAc,2CAA2C,CAAC;AAC1D,cAAc,+CAA+C,CAAC;AAC9D,cAAc,2CAA2C,CAAC;AAC1D,cAAc,6CAA6C,CAAC;AAC5D,cAAc,6CAA6C,CAAC;AAC5D,cAAc,2CAA2C,CAAC;AAC1D,cAAc,4CAA4C,CAAC;AAC3D,cAAc,+CAA+C,CAAC;AAC9D,cAAc,UAAU,CAAC;AACzB,cAAc,8BAA8B,CAAC;AAC7C,cAAc,eAAe,CAAC;AAC9B,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAClC,cAAc,qBAAqB,CAAC;AACpC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,0BAA0B,CAAC;AACzC,cAAc,iCAAiC,CAAC;AAChD,cAAc,0BAA0B,CAAC;AACzC,cAAc,0BAA0B,CAAC;AACzC,cAAc,iCAAiC,CAAC;AAChD,cAAc,iCAAiC,CAAC;AAChD,cAAc,mBAAmB,CAAC;AAClC,cAAc,sBAAsB,CAAC;AACrC,cAAc,aAAa,CAAC;AAC5B,cAAc,kBAAkB,CAAC;AACjC,cAAc,wBAAwB,CAAC;AACvC,cAAc,uBAAuB,CAAC;AACtC,cAAc,aAAa,CAAC;AAC5B,cAAc,wBAAwB,CAAC;AACvC,cAAc,kCAAkC,CAAC;AACjD,cAAc,qBAAqB,CAAC;AACpC,cAAc,sBAAsB,CAAC;AACrC,cAAc,kCAAkC,CAAC;AACjD,cAAc,6BAA6B,CAAC;AAC5C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,qBAAqB,CAAC;AACpC,cAAc,yBAAyB,CAAC;AACxC,cAAc,aAAa,CAAC"}

package/dist/pages/NSFCategoryEditPage.d.ts

@@ -2,8 +2,8 @@ import { CategoryScopeRow, SlotRow } from "namirasoft-field";
 import { NSBoxString, NSBoxTextArea } from "namirasoft-site-react";
 import { Component } from "react";
 import { NSARouterMakerProps } from "../NSARouterMakerProps";
-import { NSFFieldServersProps } from "./NSFEntities";
-export interface NSFCategoryEditPageProps extends NSARouterMakerProps, NSFFieldServersProps {
+import { NSFRouterProps } from "../NSFRouterProps";
+export interface NSFCategoryEditPageProps extends NSARouterMakerProps, NSFRouterProps {
     slot: SlotRow;
     category_scope: CategoryScopeRow;
     isEdit: boolean;

package/dist/pages/NSFCategoryEditPage.js.map

@@ -1 +1 @@
-{"version":3,"file":"NSFCategoryEditPage.js","sourceRoot":"","sources":["../../src/pages/NSFCategoryEditPage.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,aAAa,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAC3F,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEjD,OAAO,EAAE,WAAW,EAAwB,MAAM,eAAe,CAAC;AAWlE,MAAM,OAAO,mBAAoB,SAAQ,SAA6D;IAKrG,YAAY,KAA+B;QAE1C,KAAK,CAAC,KAAK,CAAC,CAAC;QALd,qBAAgB,GAAG,SAAS,EAAe,CAAC;QAC5C,6BAAwB,GAAG,SAAS,EAAiB,CAAC;QAKrD,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC;IACjB,CAAC;IAEQ,MAAM;QAEd,OAAO,CACN,KAAC,SAAS,oBACL,IAAI,CAAC,KAAK,IACd,MAAM,EAAE;gBACP,WAAW,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,wEAAwE,CAAC,CAAC,CAAC,wEAAwE;aACpL,EACD,KAAK,EAAE;gBACN,MAAM,EAAE,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC;gBACpF,IAAI,kCACA,IAAI,CAAC,KAAK,KACb,EAAE,EAAE;wBACH,aAAa,EAAE;4BACd,MAAM,EAAE;gCACP,WAAW,EAAE,GAAG,EAAE;;oCAEjB,IAAI,iBAAiB,GAAG,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,EAAE,CAAC;oCACrD,IAAI,IAAI,GAAG,MAAA,MAAA,IAAI,CAAC,gBAAgB,CAAC,OAAO,0CAAE,QAAQ,EAAE,mCAAI,EAAE,CAAC;oCAC3D,IAAI,WAAW,GAAG,MAAA,MAAA,IAAI,CAAC,wBAAwB,CAAC,OAAO,0CAAE,QAAQ,EAAE,mCAAI,EAAE,CAAC;oCAE1E,OAAO;wCACN,YAAY,EAAE,EAAE;wCAChB,iBAAiB;wCACjB,IAAI;wCACJ,WAAW;wCACX,iBAAiB,EAAE,EAAE;wCACrB,cAAc,EAAE,EAAE;wCAClB,YAAY,EAAE,EAAE;qCAChB,CAAC;gCACH,CAAC;gCACD,MAAM,EAAE,CAAC,GAAG,EAAE,EAAE;;oCAEf,MAAA,IAAI,CAAC,gBAAgB,CAAC,OAAO,0CAAE,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;oCAClD,MAAA,IAAI,CAAC,wBAAwB,CAAC,OAAO,0CAAE,QAAQ,CAAC,MAAA,GAAG,CAAC,WAAW,mCAAI,EAAE,CAAC,CAAC;gCACxE,CAAC;6BACD;yBACD;qBACD,GACD;aACD,YAED,MAAC,QAAQ,eACR,KAAC,KAAK,cACL,KAAC,WAAW,IACX,GAAG,EAAE,IAAI,CAAC,gBAAgB,EAC1B,KAAK,EAAC,MAAM,EACZ,QAAQ,QACR,KAAK,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,MAAM,EAAE,EACpC,IAAI,EAAE,EAAE,IAAI,EAAE,iEAAiE,EAAE,GAChF,GACK,EACR,KAAC,aAAa,IACb,GAAG,EAAE,IAAI,CAAC,wBAAwB,EAClC,KAAK,EAAC,aAAa,EACnB,QAAQ,EAAE,KAAK,EACf,KAAK,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,MAAM,EAAE,EACpC,IAAI,EAAE,EAAE,IAAI,EAAE,wEAAwE,EAAE,GACvF,IACQ,IACA,CACZ,CAAC;IACH,CAAC;CACD"}
+{"version":3,"file":"NSFCategoryEditPage.js","sourceRoot":"","sources":["../../src/pages/NSFCategoryEditPage.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,aAAa,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAC3F,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAGjD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAW5C,MAAM,OAAO,mBAAoB,SAAQ,SAA6D;IAKrG,YAAY,KAA+B;QAE1C,KAAK,CAAC,KAAK,CAAC,CAAC;QALd,qBAAgB,GAAG,SAAS,EAAe,CAAC;QAC5C,6BAAwB,GAAG,SAAS,EAAiB,CAAC;QAKrD,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC;IACjB,CAAC;IAEQ,MAAM;QAEd,OAAO,CACN,KAAC,SAAS,oBACL,IAAI,CAAC,KAAK,IACd,MAAM,EAAE;gBACP,WAAW,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,wEAAwE,CAAC,CAAC,CAAC,wEAAwE;aACpL,EACD,KAAK,EAAE;gBACN,MAAM,EAAE,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC;gBACpF,IAAI,kCACA,IAAI,CAAC,KAAK,KACb,EAAE,EAAE;wBACH,aAAa,EAAE;4BACd,MAAM,EAAE;gCACP,WAAW,EAAE,GAAG,EAAE;;oCAEjB,IAAI,iBAAiB,GAAG,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,EAAE,CAAC;oCACrD,IAAI,IAAI,GAAG,MAAA,MAAA,IAAI,CAAC,gBAAgB,CAAC,OAAO,0CAAE,QAAQ,EAAE,mCAAI,EAAE,CAAC;oCAC3D,IAAI,WAAW,GAAG,MAAA,MAAA,IAAI,CAAC,wBAAwB,CAAC,OAAO,0CAAE,QAAQ,EAAE,mCAAI,EAAE,CAAC;oCAE1E,OAAO;wCACN,YAAY,EAAE,EAAE;wCAChB,iBAAiB;wCACjB,IAAI;wCACJ,WAAW;wCACX,iBAAiB,EAAE,EAAE;wCACrB,cAAc,EAAE,EAAE;wCAClB,YAAY,EAAE,EAAE;qCAChB,CAAC;gCACH,CAAC;gCACD,MAAM,EAAE,CAAC,GAAG,EAAE,EAAE;;oCAEf,MAAA,IAAI,CAAC,gBAAgB,CAAC,OAAO,0CAAE,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;oCAClD,MAAA,IAAI,CAAC,wBAAwB,CAAC,OAAO,0CAAE,QAAQ,CAAC,MAAA,GAAG,CAAC,WAAW,mCAAI,EAAE,CAAC,CAAC;gCACxE,CAAC;6BACD;yBACD;qBACD,GACD;aACD,YAED,MAAC,QAAQ,eACR,KAAC,KAAK,cACL,KAAC,WAAW,IACX,GAAG,EAAE,IAAI,CAAC,gBAAgB,EAC1B,KAAK,EAAC,MAAM,EACZ,QAAQ,QACR,KAAK,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,MAAM,EAAE,EACpC,IAAI,EAAE,EAAE,IAAI,EAAE,iEAAiE,EAAE,GAChF,GACK,EACR,KAAC,aAAa,IACb,GAAG,EAAE,IAAI,CAAC,wBAAwB,EAClC,KAAK,EAAC,aAAa,EACnB,QAAQ,EAAE,KAAK,EACf,KAAK,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,MAAM,EAAE,EACpC,IAAI,EAAE,EAAE,IAAI,EAAE,wEAAwE,EAAE,GACvF,IACQ,IACA,CACZ,CAAC;IACH,CAAC;CACD"}

package/dist/pages/NSFCategoryListPage.d.ts

@@ -1,7 +1,7 @@
 import { CategoryScopeRow, SlotRow } from "namirasoft-field";
 import { NSARouterMakerProps } from "../NSARouterMakerProps";
-import { NSFFieldServersProps } from "./NSFEntities";
-export interface NSFCategoryListPageProps extends NSARouterMakerProps, NSFFieldServersProps {
+import { NSFRouterProps } from "../NSFRouterProps";
+export interface NSFCategoryListPageProps extends NSARouterMakerProps, NSFRouterProps {
     slot: SlotRow;
     category_scope: CategoryScopeRow;
 }

package/dist/pages/NSFCategoryListPage.js.map

@@ -1 +1 @@
-{"version":3,"file":"NSFCategoryListPage.js","sourceRoot":"","sources":["../../src/pages/NSFCategoryListPage.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEjD,OAAO,EAAE,WAAW,EAAwB,MAAM,eAAe,CAAC;AAQlE,MAAM,UAAU,mBAAmB,CAAC,KAA+B;IAElE,OAAO,CACN,KAAC,SAAS,oBACL,KAAK,IACT,MAAM,EAAE;YACP,WAAW,EAAE,qFAAqF;SAClG,EACD,KAAK,EAAE;YACN,MAAM,EAAE,WAAW,CAAC,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,cAAc,CAAC;YACrE,IAAI,EAAE,EAAE;SACR,YAED,mBACG,IACQ,CACZ,CAAC;AACH,CAAC"}
+{"version":3,"file":"NSFCategoryListPage.js","sourceRoot":"","sources":["../../src/pages/NSFCategoryListPage.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAGjD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAQ5C,MAAM,UAAU,mBAAmB,CAAC,KAA+B;IAElE,OAAO,CACN,KAAC,SAAS,oBACL,KAAK,IACT,MAAM,EAAE;YACP,WAAW,EAAE,qFAAqF;SAClG,EACD,KAAK,EAAE;YACN,MAAM,EAAE,WAAW,CAAC,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,cAAc,CAAC;YACrE,IAAI,EAAE,EAAE;SACR,YAED,mBACG,IACQ,CACZ,CAAC;AACH,CAAC"}

package/dist/pages/NSFCategoryViewPage.d.ts

@@ -1,7 +1,7 @@
 import { CategoryScopeRow, SlotRow } from "namirasoft-field";
 import { NSARouterMakerProps } from "../NSARouterMakerProps";
-import { NSFFieldServersProps } from "./NSFEntities";
-export interface NSFCategoryViewPageProps extends NSARouterMakerProps, NSFFieldServersProps {
+import { NSFRouterProps } from "../NSFRouterProps";
+export interface NSFCategoryViewPageProps extends NSARouterMakerProps, NSFRouterProps {
     slot: SlotRow;
     category_scope: CategoryScopeRow;
 }

package/dist/pages/NSFCategoryViewPage.js.map

@@ -1 +1 @@
-{"version":3,"file":"NSFCategoryViewPage.js","sourceRoot":"","sources":["../../src/pages/NSFCategoryViewPage.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEjD,OAAO,EAAE,WAAW,EAAwB,MAAM,eAAe,CAAC;AAQlE,MAAM,UAAU,mBAAmB,CAAC,KAA+B;IAElE,OAAO,CACN,KAAC,SAAS,oBACL,KAAK,IACT,MAAM,EAAE;YACP,WAAW,EAAE,uEAAuE;SACpF,EACD,KAAK,EAAE;YACN,MAAM,EAAE,WAAW,CAAC,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,cAAc,CAAC;YACrE,IAAI,EAAE,EAAE;SACR,YAED,kCAAM,IACK,CACZ,CAAC;AACH,CAAC"}
+{"version":3,"file":"NSFCategoryViewPage.js","sourceRoot":"","sources":["../../src/pages/NSFCategoryViewPage.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAGjD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAQ5C,MAAM,UAAU,mBAAmB,CAAC,KAA+B;IAElE,OAAO,CACN,KAAC,SAAS,oBACL,KAAK,IACT,MAAM,EAAE;YACP,WAAW,EAAE,uEAAuE;SACpF,EACD,KAAK,EAAE;YACN,MAAM,EAAE,WAAW,CAAC,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,cAAc,CAAC;YACrE,IAAI,EAAE,EAAE;SACR,YAED,kCAAM,IACK,CACZ,CAAC;AACH,CAAC"}

package/dist/pages/NSFEntities.d.ts

@@ -1,13 +1,7 @@
-import { NamirasoftAPIProductServer } from "namirasoft-api-product";
-import { CategoryInputRow, CategoryRow, CategoryScopeRow, NamirasoftFieldServer, SlotRow } from "namirasoft-field";
+import { CategoryInputRow, CategoryRow, CategoryScopeRow, SlotRow } from "namirasoft-field";
 import { IEntityInfo } from "../IEntityInfo";
 import { NSARouterMakerProps } from "../NSARouterMakerProps";
-export interface NSFFieldServersProps {
-    servers: {
-        field: NamirasoftFieldServer;
-        product: NamirasoftAPIProductServer;
-    };
-}
+import { NSFRouterProps } from "../NSFRouterProps";
 export declare class NSFEntities {
-    static category(props: NSARouterMakerProps & NSFFieldServersProps, slot: SlotRow, category_scope: CategoryScopeRow): IEntityInfo<CategoryRow, CategoryInputRow>;
+    static category(props: NSARouterMakerProps & NSFRouterProps, slot: SlotRow, category_scope: CategoryScopeRow): IEntityInfo<CategoryRow, CategoryInputRow>;
 }

package/dist/pages/NSFEntities.js.map

@@ -1 +1 @@
-{"version":3,"file":"NSFEntities.js","sourceRoot":"","sources":["../../src/pages/NSFEntities.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"NSFEntities.js","sourceRoot":"","sources":["../../src/pages/NSFEntities.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -8,7 +8,7 @@
     "framework": "npm",
     "application": "package",
     "private": false,
-    "version": "1.5.12",
+    "version": "1.5.13",
     "author": "Amir Abolhasani",
     "license": "MIT",
     "main": "./dist/main.js",

package/src/NSARouter.tsx

@@ -0,0 +1,69 @@
+import { CacheService, EnvService } from 'namirasoft-core';
+import { CategoryScopeRow, EntityResolveResponseRow, NamirasoftFieldServer, SlotEntityType, SlotRow } from 'namirasoft-field';
+import { NSRoutes } from 'namirasoft-site-react';
+import { Component, ReactNode } from 'react';
+import { Route } from 'react-router-dom';
+import { FieldCacheService } from './FieldCacheService';
+import { NSARouterMakerProps } from './NSARouterMakerProps';
+import { NSFRoutes } from './NSFRoutes';
+import { NSFCategoryEditPage } from './pages/NSFCategoryEditPage';
+import { NSFCategoryListPage } from './pages/NSFCategoryListPage';
+import { NSFCategoryViewPage } from './pages/NSFCategoryViewPage';
+
+export interface NSARoutesProps extends NSARouterMakerProps
+{
+    children: ReactNode;
+}
+
+interface NSARoutesState
+{
+    rows: EntityResolveResponseRow | null;
+}
+
+export class NSARouter extends Component<NSARoutesProps, NSARoutesState>
+{
+    private cache_field: CacheService<EntityResolveResponseRow>;
+
+    constructor(props: NSARoutesProps)
+    {
+        super(props);
+
+        this.cache_field = FieldCacheService.get(this.props.account.token_manager, this.props.product_id, this.props.notifier.onError);
+
+        this.state = {
+            rows: null,
+        };
+    }
+    override componentDidMount(): void
+    {
+        this.cache_field.get().then(rows =>
+        {
+            this.setState(prev => ({ ...prev, rows }));
+        });
+    }
+    override render()
+    {
+        const { rows } = this.state;
+        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, this.props.account.token_manager, this.props.notifier.onError);
+        let servers = { field };
+
+        return (
+            <NSRoutes>
+                {this.props.children}
+                {
+                    pairs.flatMap(({ slot, category_scope }) => [
+                        <Route key={`${slot.id}-category-list`} path={NSFRoutes.CategoryList(slot.id, slot.name)} element={<NSFCategoryListPage {...this.props} servers={servers} slot={slot} category_scope={category_scope} />} />,
+                        <Route key={`${slot.id}-category-new`} path={NSFRoutes.CategoryNew(slot.id, slot.name)} element={<NSFCategoryEditPage {...this.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 {...this.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 {...this.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 {...this.props} servers={servers} slot={slot} category_scope={category_scope} />} />,
+                    ])
+                }
+            </NSRoutes>
+        );
+    }
+}

package/src/NSFRouterProps.ts

@@ -0,0 +1,8 @@
+import { NamirasoftFieldServer } from "namirasoft-field";
+
+export interface NSFRouterProps
+{
+	servers: {
+		field: NamirasoftFieldServer;
+	}
+}

package/src/layouts/NSALayout.tsx

@@ -21,7 +21,7 @@ import { NSACacheService } from '../NSACacheService';
 import { NSARouterMakerProps } from '../NSARouterMakerProps';
 import { UseParams } from '../UseParams';
 import { Actions } from './Actions';
-import { NSARouter_Field } from './NSARouter_Field';
+import { NSALayout_Field } from './NSALayout_Field';
 import { NSASectionEdit, NSASectionEditCustomProps } from './NSASectionEdit';
 import { NSASectionList, NSASectionListCustomProps } from './NSASectionList';
 import { NSASectionView, NSASectionViewCutomProps } from './NSASectionView';
@@ -670,7 +670,7 @@ export class NSALayout<RowType extends { id: string }, RowTypeInput = RowType> e
                         {
                             this.setState((prev) => ({ showMasterMenu: !prev.showMasterMenu }))
                         },
-                        filters_postprocessor: (filters) => NSARouter_Field.postprocess(filters, this.state.ctf_rows),
+                        filters_postprocessor: (filters) => NSALayout_Field.postprocess(filters, this.state.ctf_rows),
                     }}
                     action={{
                         title: action_title,

package/src/layouts/{NSARouter_Field.ts → NSALayout_Field.ts}

@@ -3,7 +3,7 @@ import { NamingConvention } from 'namirasoft-core';
 import { EntityResolveResponseRow, SlotEntityType, SlotRow } from 'namirasoft-field';
 import { NSFRoutes } from '../NSFRoutes';
 
-export class NSARouter_Field
+export class NSALayout_Field
 {
     static postprocess(
         filters: FilterLinkFullRow[],
@@ -17,7 +17,7 @@ export class NSARouter_Field
         const id_counter = { value: -1_000_000 };
         const matched = new Set<string>();
 
-        NSARouter_Field.walk(filters, null, rows, result, id_counter, matched);
+        NSALayout_Field.walk(filters, null, rows, result, id_counter, matched);
 
         const fallback_filter_id = filters[0]?.filter_id ?? 0;
         const fallback_filter_ref = filters[0]?.filter ?? null;
@@ -26,11 +26,11 @@ export class NSARouter_Field
             if (matched.has(slot.id))
                 continue;
 
-            const parent = NSARouter_Field.make(id_counter, null, fallback_filter_id, fallback_filter_ref, slot.name, slot.description ?? "", "");
+            const parent = NSALayout_Field.make(id_counter, null, fallback_filter_id, fallback_filter_ref, slot.name, slot.description ?? "", "");
             result.push(parent);
 
-            result.push(NSARouter_Field.make(id_counter, parent.id, fallback_filter_id, fallback_filter_ref, "Create", "", NSFRoutes.CategoryNew(slot.id, slot.name)));
-            result.push(NSARouter_Field.make(id_counter, parent.id, fallback_filter_id, fallback_filter_ref, "List", "", NSFRoutes.CategoryList(slot.id, slot.name)));
+            result.push(NSALayout_Field.make(id_counter, parent.id, fallback_filter_id, fallback_filter_ref, "Create", "", NSFRoutes.CategoryNew(slot.id, slot.name)));
+            result.push(NSALayout_Field.make(id_counter, parent.id, fallback_filter_id, fallback_filter_ref, "List", "", NSFRoutes.CategoryList(slot.id, slot.name)));
         }
 
         return result;
@@ -106,21 +106,21 @@ export class NSARouter_Field
         for (const filter of children)
         {
             const filter_name = filter.name ?? filter.link?.name ?? "";
-            const slot = NSARouter_Field.findEntityRow(filter_name, rows);
+            const slot = NSALayout_Field.findEntityRow(filter_name, rows);
             if (slot)
             {
                 matched.add(slot.id);
-                const parent = NSARouter_Field.make(id_counter, filter.parent_id, filter.filter_id, filter.filter, slot.name, slot.description ?? "", "");
+                const parent = NSALayout_Field.make(id_counter, filter.parent_id, filter.filter_id, filter.filter, slot.name, slot.description ?? "", "");
                 parent.order = (filter.order ?? 0) - 1;
                 const idx = result.indexOf(filter);
                 if (idx >= 0)
                     result.splice(idx, 0, parent);
                 else
                     result.push(parent);
-                result.push(NSARouter_Field.make(id_counter, parent.id, filter.filter_id, filter.filter, "Create", "", NSFRoutes.CategoryNew(slot.id, slot.name)));
-                result.push(NSARouter_Field.make(id_counter, parent.id, filter.filter_id, filter.filter, "List", "", NSFRoutes.CategoryList(slot.id, slot.name)));
+                result.push(NSALayout_Field.make(id_counter, parent.id, filter.filter_id, filter.filter, "Create", "", NSFRoutes.CategoryNew(slot.id, slot.name)));
+                result.push(NSALayout_Field.make(id_counter, parent.id, filter.filter_id, filter.filter, "List", "", NSFRoutes.CategoryList(slot.id, slot.name)));
             }
-            NSARouter_Field.walk(filters, filter.id, rows, result, id_counter, matched);
+            NSALayout_Field.walk(filters, filter.id, rows, result, id_counter, matched);
         }
     }
 }

package/src/main.ts

@@ -26,8 +26,7 @@ export * from "./IEntityInfo";
 export * from "./layouts/Actions";
 export * from "./layouts/CFTUtil";
 export * from "./layouts/NSALayout";
-export * from "./layouts/NSARouter";
-export * from "./layouts/NSARouter_Field";
+export * from "./layouts/NSALayout_Field";
 export * from "./layouts/NSASectionEdit";
 export * from "./layouts/NSASectionEditTabPage";
 export * from "./layouts/NSASectionList";
@@ -36,6 +35,7 @@ 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";

package/src/pages/NSFCategoryEditPage.tsx

@@ -3,9 +3,10 @@ import { NSBox, NSBoxString, NSBoxTextArea, NSColumn, NSRow } from "namirasoft-s
 import { Component, createRef } from "react";
 import { NSALayout } from "../layouts/NSALayout";
 import { NSARouterMakerProps } from "../NSARouterMakerProps";
-import { NSFEntities, NSFFieldServersProps } from "./NSFEntities";
+import { NSFRouterProps } from "../NSFRouterProps";
+import { NSFEntities } from "./NSFEntities";
 
-export interface NSFCategoryEditPageProps extends NSARouterMakerProps, NSFFieldServersProps
+export interface NSFCategoryEditPageProps extends NSARouterMakerProps, NSFRouterProps
 {
 	slot: SlotRow;
 	category_scope: CategoryScopeRow;

package/src/pages/NSFCategoryListPage.tsx

@@ -1,9 +1,10 @@
 import { CategoryScopeRow, SlotRow } from "namirasoft-field";
 import { NSALayout } from "../layouts/NSALayout";
 import { NSARouterMakerProps } from "../NSARouterMakerProps";
-import { NSFEntities, NSFFieldServersProps } from "./NSFEntities";
+import { NSFRouterProps } from "../NSFRouterProps";
+import { NSFEntities } from "./NSFEntities";
 
-export interface NSFCategoryListPageProps extends NSARouterMakerProps, NSFFieldServersProps
+export interface NSFCategoryListPageProps extends NSARouterMakerProps, NSFRouterProps
 {
 	slot: SlotRow;
 	category_scope: CategoryScopeRow;

package/src/pages/NSFCategoryViewPage.tsx

@@ -1,9 +1,10 @@
 import { CategoryScopeRow, SlotRow } from "namirasoft-field";
 import { NSALayout } from "../layouts/NSALayout";
 import { NSARouterMakerProps } from "../NSARouterMakerProps";
-import { NSFEntities, NSFFieldServersProps } from "./NSFEntities";
+import { NSFRouterProps } from "../NSFRouterProps";
+import { NSFEntities } from "./NSFEntities";
 
-export interface NSFCategoryViewPageProps extends NSARouterMakerProps, NSFFieldServersProps
+export interface NSFCategoryViewPageProps extends NSARouterMakerProps, NSFRouterProps
 {
 	slot: SlotRow;
 	category_scope: CategoryScopeRow;

package/src/pages/NSFEntities.ts

@@ -1,22 +1,16 @@
-import { NamirasoftAPIProductServer, ProductUUID } from "namirasoft-api-product";
+import { ProductUUID } from "namirasoft-api-product";
 import { EnvService, FilterItem, FilterItemOperator, IStorageLocal } from "namirasoft-core";
 import { CategoryInputRow, CategoryRow, CategoryScopeRow, NamirasoftFieldMetaDatabase, NamirasoftFieldServer, SlotRow } from "namirasoft-field";
 import { NamirasoftMap } from "namirasoft-site-map";
 import { BaseColumnFormatter, DateTimeFormatter, IDFormatter, StringFormatter, StringFormatterSizeType } from "namirasoft-site-react";
 import { IEntityInfo } from "../IEntityInfo";
 import { NSARouterMakerProps } from "../NSARouterMakerProps";
+import { NSFRouterProps } from "../NSFRouterProps";
 import { NSFRoutes } from "../NSFRoutes";
 
-export interface NSFFieldServersProps
-{
-	servers: {
-		field: NamirasoftFieldServer;
-		product: NamirasoftAPIProductServer;
-	}
-}
 export class NSFEntities
 {
-	static category(props: NSARouterMakerProps & NSFFieldServersProps, slot: SlotRow, category_scope: CategoryScopeRow): IEntityInfo<CategoryRow, CategoryInputRow>
+	static category(props: NSARouterMakerProps & NSFRouterProps, slot: SlotRow, category_scope: CategoryScopeRow): IEntityInfo<CategoryRow, CategoryInputRow>
 	{
 		let namirasoft = new NamirasoftMap(props.account.token_manager, console.error);
 

package/src/layouts/NSARouter.tsx

@@ -1,53 +0,0 @@
-import { CategoryScopeRow, EntityResolveResponseRow, SlotEntityType, SlotRow } from 'namirasoft-field';
-import { NSRoutes } from 'namirasoft-site-react';
-import { Component, ReactNode } from 'react';
-import { Route } from 'react-router-dom';
-import { NSARouterMakerProps } from '../NSARouterMakerProps';
-import { NSFRoutes } from '../NSFRoutes';
-import { NSFCategoryEditPage } from '../pages/NSFCategoryEditPage';
-import { NSFFieldServersProps } from '../pages/NSFEntities';
-import { NSFCategoryListPage } from '../pages/NSFCategoryListPage';
-import { NSFCategoryViewPage } from '../pages/NSFCategoryViewPage';
-
-export interface NSARoutesProps
-{
-    props: NSARouterMakerProps;
-    servers: NSFFieldServersProps['servers'];
-    rows: EntityResolveResponseRow | null;
-    children: ReactNode;
-}
-
-interface NSARoutesState
-{
-}
-
-export class NSARouter extends Component<NSARoutesProps, NSARoutesState>
-{
-    constructor(props: NSARoutesProps)
-    {
-        super(props);
-
-        this.state = {};
-    }
-    override render()
-    {
-        const { props, servers, rows, children } = this.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 }[];
-
-        return (
-            <NSRoutes>
-                {children}
-                {
-                    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 isEdit={false} {...props} servers={servers} slot={slot} category_scope={category_scope} />} />,
-                        <Route key={`${slot.id}-category-copy`} path={NSFRoutes.CategoryCopy(slot.id, slot.name, ":id")} element={<NSFCategoryEditPage isEdit={false} {...props} servers={servers} slot={slot} category_scope={category_scope} />} />,
-                        <Route key={`${slot.id}-category-edit`} path={NSFRoutes.CategoryEdit(slot.id, slot.name, ":id")} element={<NSFCategoryEditPage isEdit={true} {...props} servers={servers} 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} />} />,
-                    ])
-                }
-            </NSRoutes>
-        );
-    }
-}