namirasoft-account-react 1.5.19 → 1.5.21

package/dist/Router.js

@@ -2,15 +2,15 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { ProductUUID } from 'namirasoft-api-product';
 import { IStorageSession } from 'namirasoft-core';
 import { NSNotFoundPage } from 'namirasoft-site-react';
-import { useState } from 'react';
+import { useReducer } from 'react';
 import { Route, Routes, useNavigate } from 'react-router-dom';
-import { App } from './App';
 import { NSARouterMaker } from './NSARouterMaker';
+import { App } from './App';
 export default function Router() {
-    let [state, setState] = useState(Math.random());
+    let [, page_force_update] = useReducer((x) => x + 1, 0);
     let navigate = useNavigate();
-    return _jsx(NSARouterMaker, { product_id: ProductUUID.NAMIRASOFT_INFRA, notifier_storage: new IStorageSession(), page_force_update: () => { setState(state + Math.random()); }, navigate: navigate, renderOnLogin: (props) => {
-            return (_jsxs(Routes, { children: [_jsx(Route, { path: "/:id/view", element: _jsx(App, Object.assign({}, props)) }), _jsx(Route, { path: "*", element: _jsx(App, Object.assign({}, props)) })] }));
+    return _jsx(NSARouterMaker, { product_id: ProductUUID.NAMIRASOFT_INFRA, notifier_storage: new IStorageSession(), page_force_update: page_force_update, navigate: navigate, renderOnLogin: (props) => {
+            return (_jsxs(Routes, { children: [_jsx(Route, { path: "/", element: _jsx(App, Object.assign({}, props)) }), _jsx(Route, { path: "*", element: _jsx(App, Object.assign({}, props)) })] }));
         }, renderOnLogout: (_, __) => {
             return (_jsx(Routes, { children: _jsx(Route, { path: "*", element: _jsx(NSNotFoundPage, {}) }) }));
         }, getNSALayout: (props) => {

package/dist/Router.js.map

@@ -1 +1 @@
-{"version":3,"file":"Router.js","sourceRoot":"","sources":["../src/Router.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACjC,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC;AAC5B,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAGlD,MAAM,CAAC,OAAO,UAAU,MAAM;IAE1B,IAAI,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,CAAS,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;IAExD,IAAI,QAAQ,GAAG,WAAW,EAAE,CAAC;IAE7B,OAAO,KAAC,cAAc,IAClB,UAAU,EAAE,WAAW,CAAC,gBAAgB,EACxC,gBAAgB,EAAE,IAAI,eAAe,EAAE,EACvC,iBAAiB,EAAE,GAAG,EAAE,GAAG,QAAQ,CAAC,KAAK,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC,EAC7D,QAAQ,EAAE,QAAQ,EAClB,aAAa,EAAE,CAAC,KAA2B,EAAE,EAAE;YAE3C,OAAO,CACH,MAAC,MAAM,eACH,KAAC,KAAK,IAAC,IAAI,EAAC,WAAW,EAAC,OAAO,EAAE,KAAC,GAAG,oBAAK,KAAK,EAAQ,GAAI,EAC3D,KAAC,KAAK,IAAC,IAAI,EAAC,GAAG,EAAC,OAAO,EAAE,KAAC,GAAG,oBAAK,KAAK,EAAQ,GAAI,IAC9C,CACZ,CAAC;QACN,CAAC,EACD,cAAc,EAAE,CAAC,CAAuB,EAAE,EAAW,EAAE,EAAE;YAErD,OAAO,CACH,KAAC,MAAM,cACH,KAAC,KAAK,IAAC,IAAI,EAAC,GAAG,EAAC,OAAO,EAAE,KAAC,cAAc,KAAkB,GAAI,GACzD,CACZ,CAAC;QACN,CAAC,EACD,YAAY,EAAE,CAAC,KAAK,EAAE,EAAE;YAEpB,OAAO,KAAK,CAAC,QAAQ,CAAC;QAC1B,CAAC,EACD,WAAW,EAAE;YACT,YAAY,EAAE;gBACV,KAAK,EAAE,IAAI;gBACX,KAAK,EAAE,IAAI;aACd;SACJ,GACH,CAAC;AACP,CAAC"}
+{"version":3,"file":"Router.js","sourceRoot":"","sources":["../src/Router.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AACnC,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,OAAO,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC;AAE5B,MAAM,CAAC,OAAO,UAAU,MAAM;IAE1B,IAAI,CAAC,EAAE,iBAAiB,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;IAExD,IAAI,QAAQ,GAAG,WAAW,EAAE,CAAC;IAE7B,OAAO,KAAC,cAAc,IAClB,UAAU,EAAE,WAAW,CAAC,gBAAgB,EACxC,gBAAgB,EAAE,IAAI,eAAe,EAAE,EACvC,iBAAiB,EAAE,iBAAiB,EACpC,QAAQ,EAAE,QAAQ,EAClB,aAAa,EAAE,CAAC,KAA2B,EAAE,EAAE;YAE3C,OAAO,CACH,MAAC,MAAM,eACH,KAAC,KAAK,IAAC,IAAI,EAAC,GAAG,EAAC,OAAO,EAAE,KAAC,GAAG,oBAAK,KAAK,EAAI,GAAI,EAC/C,KAAC,KAAK,IAAC,IAAI,EAAC,GAAG,EAAC,OAAO,EAAE,KAAC,GAAG,oBAAK,KAAK,EAAI,GAAI,IAC1C,CACZ,CAAC;QACN,CAAC,EACD,cAAc,EAAE,CAAC,CAAuB,EAAE,EAAW,EAAE,EAAE;YAErD,OAAO,CACH,KAAC,MAAM,cACH,KAAC,KAAK,IAAC,IAAI,EAAC,GAAG,EAAC,OAAO,EAAE,KAAC,cAAc,KAAkB,GAAI,GACzD,CACZ,CAAC;QACN,CAAC,EACD,YAAY,EAAE,CAAC,KAAK,EAAE,EAAE;YAEpB,OAAO,KAAK,CAAC,QAAQ,CAAC;QAC1B,CAAC,EACD,WAAW,EAAE;YACT,YAAY,EAAE;gBACV,KAAK,EAAE,IAAI;gBACX,KAAK,EAAE,IAAI;aACd;SACJ,GACH,CAAC;AACP,CAAC"}

package/dist/components/NSAMasterMenu.module.css

@@ -3,11 +3,13 @@
     z-index: -1;
     width: 100dvw;
     height: 100dvh;
+    display: none;
     background-color: #00000080;
 }
 
 .nsa_master_menu_aside.open {
     z-index: 999;
+    display: flex;
 }
 
 .nsa_master_menu_wrapper {

package/package.json

@@ -8,7 +8,7 @@
     "framework": "npm",
     "application": "package",
     "private": false,
-    "version": "1.5.19",
+    "version": "1.5.21",
     "author": "Amir Abolhasani",
     "license": "MIT",
     "main": "./dist/main.js",
@@ -50,7 +50,7 @@
         "react-dev-utils": "^12.0.1",
         "react-dom": "^18.3.1",
         "react-helmet": "^6.1.0",
-        "react-router-dom": "7.6.3",
+        "react-router-dom": "7.9.1",
         "react-scripts": "5.0.1",
         "webpack": "^5.108.4"
     },

package/src/FieldCacheService.tsx

@@ -1,85 +1,85 @@
-import { TokenManager } from "namirasoft-account";
-import { CacheService, CookieService, EnvService, IStorageLocal, NamingConvention } from "namirasoft-core";
-import { EntityResolveResponseRow, NamirasoftFieldHeader, NamirasoftFieldServer } from "namirasoft-field";
-import { NSLoading } from "namirasoft-site-react";
-import { Component, ReactNode } from "react";
-import { NSARouterMakerResult } from "./NSARouterMakerResult";
-
-export interface FieldCacheServiceProps extends NSARouterMakerResult
-{
-    entity_name?: string | null;
-    render: (rows: EntityResolveResponseRow) => ReactNode;
-}
-
-interface FieldCacheServiceState
-{
-    rows: EntityResolveResponseRow | null;
-}
-
-export class FieldCacheService extends Component<FieldCacheServiceProps, FieldCacheServiceState>
-{
-    static get(token_manager: TokenManager, product_id: string, onError: (error: Error | string) => void): CacheService<EntityResolveResponseRow>
-    {
-        // todo this must be owner_id, otherwise switching between owners does not work correctly
-        let user_id: string = token_manager?.getUserData(x => x.id, "") ?? "";
-        let key_field = `ns-field-user:${user_id}-product:${product_id ?? "*"}`;
-        return new CacheService<EntityResolveResponseRow>(key_field, new IStorageLocal(), 24 * 60, async () =>
-        {
-            let service = new CookieService(document.cookie, NamirasoftFieldHeader.cookie.VERSION());
-            return user_id + "" + service.getString();
-        }, async () =>
-        {
-            let REACT_APP_BASE_URL_FIELD = new EnvService("REACT_APP_BASE_URL_FIELD", true).getString();
-            let server = new NamirasoftFieldServer(REACT_APP_BASE_URL_FIELD, token_manager, onError);
-            let ans: EntityResolveResponseRow = {
-                slots: [],
-                category_scopes: [],
-                categories: [],
-                fields: [],
-            };
-
-            try
-            {
-                ans = await server.entity.Resolve(product_id);
-            } catch (error: any)
-            {
-            }
-
-            return ans;
-        });
-    }
-
-    constructor(props: FieldCacheServiceProps)
-    {
-        super(props);
-        this.state = {
-            rows: null,
-        };
-
-    }
-    override componentDidMount(): void
-    {
-        let cache = FieldCacheService.get(this.props.account.token_manager, this.props.product_id, this.props.notifier.onError);
-        cache.get().then(rows =>
-        {
-            this.setState(prev => ({ ...prev, rows }));
-        });
-    }
-    override render(): ReactNode
-    {
-        let { rows } = this.state;
-        if (!rows)
-            return <NSLoading title="Loading Namirasoft Field" />;
-
-        if (this.props.entity_name)
-        {
-            const entity_name = NamingConvention.auto.convert((this.props.entity_name ?? "").trim(), NamingConvention.lower_case);
-            rows = {
-                ...rows,
-                slots: rows.slots.filter(slot => NamingConvention.auto.convert((slot.entity ?? "").trim(), NamingConvention.lower_case) === entity_name),
-            }
-        }
-
-        return this.props.render(rows);
-    }
+import { TokenManager } from "namirasoft-account";
+import { CacheService, CookieService, EnvService, IStorageLocal, NamingConvention } from "namirasoft-core";
+import { EntityResolveResponseRow, NamirasoftFieldHeader, NamirasoftFieldServer } from "namirasoft-field";
+import { NSLoading } from "namirasoft-site-react";
+import { Component, ReactNode } from "react";
+import { NSARouterMakerResult } from "./NSARouterMakerResult";
+
+export interface FieldCacheServiceProps extends NSARouterMakerResult
+{
+    entity_name?: string | null;
+    render: (rows: EntityResolveResponseRow) => ReactNode;
+}
+
+interface FieldCacheServiceState
+{
+    rows: EntityResolveResponseRow | null;
+}
+
+export class FieldCacheService extends Component<FieldCacheServiceProps, FieldCacheServiceState>
+{
+    static get(token_manager: TokenManager, product_id: string, onError: (error: Error | string) => void): CacheService<EntityResolveResponseRow>
+    {
+        // todo this must be owner_id, otherwise switching between owners does not work correctly
+        let user_id: string = token_manager?.getUserData(x => x.id, "") ?? "";
+        let key_field = `ns-field-user:${user_id}-product:${product_id ?? "*"}`;
+        return new CacheService<EntityResolveResponseRow>(key_field, new IStorageLocal(), 24 * 60, async () =>
+        {
+            let service = new CookieService(document.cookie, NamirasoftFieldHeader.cookie.VERSION());
+            return user_id + "" + service.getString();
+        }, async () =>
+        {
+            let REACT_APP_BASE_URL_FIELD = new EnvService("REACT_APP_BASE_URL_FIELD", true).getString();
+            let server = new NamirasoftFieldServer(REACT_APP_BASE_URL_FIELD, token_manager, onError);
+            let ans: EntityResolveResponseRow = {
+                slots: [],
+                category_scopes: [],
+                categories: [],
+                fields: [],
+            };
+
+            try
+            {
+                ans = await server.entity.Resolve(product_id);
+            } catch (error: any)
+            {
+            }
+
+            return ans;
+        });
+    }
+
+    constructor(props: FieldCacheServiceProps)
+    {
+        super(props);
+        this.state = {
+            rows: null,
+        };
+
+    }
+    override componentDidMount(): void
+    {
+        let cache = FieldCacheService.get(this.props.account.token_manager, this.props.product_id, this.props.notifier.onError);
+        cache.get().then(rows =>
+        {
+            this.setState(prev => ({ ...prev, rows }));
+        });
+    }
+    override render(): ReactNode
+    {
+        let { rows } = this.state;
+        if (!rows)
+            return <NSLoading title="Loading Namirasoft Field" />;
+
+        if (this.props.entity_name)
+        {
+            const entity_name = NamingConvention.auto.convert((this.props.entity_name ?? "").trim(), NamingConvention.lower_case);
+            rows = {
+                ...rows,
+                slots: rows.slots.filter(slot => NamingConvention.auto.convert((slot.entity ?? "").trim(), NamingConvention.lower_case) === entity_name),
+            }
+        }
+
+        return this.props.render(rows);
+    }
 }

package/src/NSFRouterProps.ts

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

package/src/NSFRoutes.ts

@@ -1,31 +1,31 @@
-import { NamingConvention } from 'namirasoft-core';
-
-export class NSFRoutes
-{
-	// Category
-	static CategoryList(slot_id: string, slot_name: string)
-	{
-		const name = NamingConvention.auto.convert(slot_name, NamingConvention.lower_case_underscore);
-		return `/slot/${slot_id}/${name}/category/list`;
-	};
-	static CategoryNew(slot_id: string, slot_name: string)
-	{
-		const name = NamingConvention.auto.convert(slot_name, NamingConvention.lower_case_underscore);
-		return `/slot/${slot_id}/${name}/category/new`;
-	};
-	static CategoryCopy(slot_id: string, slot_name: string, id: string)
-	{
-		const name = NamingConvention.auto.convert(slot_name, NamingConvention.lower_case_underscore);
-		return `/slot/${slot_id}/${name}/category/${id}/copy`;
-	};
-	static CategoryEdit(slot_id: string, slot_name: string, id: string)
-	{
-		const name = NamingConvention.auto.convert(slot_name, NamingConvention.lower_case_underscore);
-		return `/slot/${slot_id}/${name}/category/${id}/edit`;
-	};
-	static CategoryView(slot_id: string, slot_name: string, id: string)
-	{
-		const name = NamingConvention.auto.convert(slot_name, NamingConvention.lower_case_underscore);
-		return `/slot/${slot_id}/${name}/category/${id}/view`;
-	};
+import { NamingConvention } from 'namirasoft-core';
+
+export class NSFRoutes
+{
+	// Category
+	static CategoryList(slot_id: string, slot_name: string)
+	{
+		const name = NamingConvention.auto.convert(slot_name, NamingConvention.lower_case_underscore);
+		return `/slot/${slot_id}/${name}/category/list`;
+	};
+	static CategoryNew(slot_id: string, slot_name: string)
+	{
+		const name = NamingConvention.auto.convert(slot_name, NamingConvention.lower_case_underscore);
+		return `/slot/${slot_id}/${name}/category/new`;
+	};
+	static CategoryCopy(slot_id: string, slot_name: string, id: string)
+	{
+		const name = NamingConvention.auto.convert(slot_name, NamingConvention.lower_case_underscore);
+		return `/slot/${slot_id}/${name}/category/${id}/copy`;
+	};
+	static CategoryEdit(slot_id: string, slot_name: string, id: string)
+	{
+		const name = NamingConvention.auto.convert(slot_name, NamingConvention.lower_case_underscore);
+		return `/slot/${slot_id}/${name}/category/${id}/edit`;
+	};
+	static CategoryView(slot_id: string, slot_name: string, id: string)
+	{
+		const name = NamingConvention.auto.convert(slot_name, NamingConvention.lower_case_underscore);
+		return `/slot/${slot_id}/${name}/category/${id}/view`;
+	};
 }

package/src/Router.tsx

@@ -1,29 +1,29 @@
 import { ProductUUID } from 'namirasoft-api-product';
 import { IStorageSession } from 'namirasoft-core';
 import { NSNotFoundPage } from 'namirasoft-site-react';
-import { useState } from 'react';
+import { useReducer } from 'react';
 import { Route, Routes, useNavigate } from 'react-router-dom';
-import { App } from './App';
 import { NSARouterMaker } from './NSARouterMaker';
 import { NSARouterMakerResult } from './NSARouterMakerResult';
+import { App } from './App';
 
 export default function Router()
 {
-    let [state, setState] = useState<number>(Math.random());
+    let [, page_force_update] = useReducer((x) => x + 1, 0);
 
     let navigate = useNavigate();
 
     return <NSARouterMaker
         product_id={ProductUUID.NAMIRASOFT_INFRA}
         notifier_storage={new IStorageSession()}
-        page_force_update={() => { setState(state + Math.random()); }}
+        page_force_update={page_force_update}
         navigate={navigate}
         renderOnLogin={(props: NSARouterMakerResult) =>
         {
             return (
                 <Routes>
-                    <Route path="/:id/view" element={<App {...props}></App>} />
-                    <Route path="*" element={<App {...props}></App>} />
+                    <Route path="/" element={<App {...props} />} />
+                    <Route path="*" element={<App {...props} />} />
                 </Routes>
             );
         }}

package/src/components/NSAMasterMenu.module.css

@@ -3,11 +3,13 @@
     z-index: -1;
     width: 100dvw;
     height: 100dvh;
+    display: none;
     background-color: #00000080;
 }
 
 .nsa_master_menu_aside.open {
     z-index: 999;
+    display: flex;
 }
 
 .nsa_master_menu_wrapper {

package/src/layouts/NSALayout_Field.ts

@@ -1,126 +1,126 @@
-import { FilterLinkFullRow } from 'namirasoft-api-link';
-import { NamingConvention } from 'namirasoft-core';
-import { EntityResolveResponseRow, SlotEntityType, SlotRow } from 'namirasoft-field';
-import { NSFRoutes } from '../NSFRoutes';
-
-export class NSALayout_Field
-{
-    static postprocess(
-        filters: FilterLinkFullRow[],
-        rows: EntityResolveResponseRow | null,
-    ): FilterLinkFullRow[]
-    {
-        if (!rows || rows.slots.length === 0)
-            return filters;
-
-        const result: FilterLinkFullRow[] = [...filters];
-        const id_counter = { value: -1_000_000 };
-        const matched = new Set<string>();
-
-        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;
-        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, slot.description ?? "", "");
-            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;
-    }
-
-    private static findEntityRow(filter_name: string | null | undefined, rows: EntityResolveResponseRow): SlotRow | null
-    {
-        const n = NamingConvention.auto.convert((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((slot.entity ?? "").trim(), NamingConvention.lower_case) === n)
-                return slot;
-        }
-        return null;
-    }
-
-    private static make(
-        id_counter: { value: number },
-        parent_id: number | null,
-        filter_id: number,
-        filter_ref: any,
-        label: string,
-        description: string,
-        url: string,
-    ): FilterLinkFullRow
-    {
-        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 as any,
-                domain: null as any,
-            }
-        };
-    }
-
-    private static walk(
-        filters: FilterLinkFullRow[],
-        parent_id: number | null,
-        rows: EntityResolveResponseRow,
-        result: FilterLinkFullRow[],
-        id_counter: { value: number },
-        matched: Set<string>,
-    ): void
-    {
-        const children = filters.filter(f => f.parent_id === parent_id);
-        for (const filter of children)
-        {
-            const filter_name = filter.name ?? filter.link?.name ?? "";
-            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, 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(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);
-        }
-    }
+import { FilterLinkFullRow } from 'namirasoft-api-link';
+import { NamingConvention } from 'namirasoft-core';
+import { EntityResolveResponseRow, SlotEntityType, SlotRow } from 'namirasoft-field';
+import { NSFRoutes } from '../NSFRoutes';
+
+export class NSALayout_Field
+{
+    static postprocess(
+        filters: FilterLinkFullRow[],
+        rows: EntityResolveResponseRow | null,
+    ): FilterLinkFullRow[]
+    {
+        if (!rows || rows.slots.length === 0)
+            return filters;
+
+        const result: FilterLinkFullRow[] = [...filters];
+        const id_counter = { value: -1_000_000 };
+        const matched = new Set<string>();
+
+        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;
+        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, slot.description ?? "", "");
+            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;
+    }
+
+    private static findEntityRow(filter_name: string | null | undefined, rows: EntityResolveResponseRow): SlotRow | null
+    {
+        const n = NamingConvention.auto.convert((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((slot.entity ?? "").trim(), NamingConvention.lower_case) === n)
+                return slot;
+        }
+        return null;
+    }
+
+    private static make(
+        id_counter: { value: number },
+        parent_id: number | null,
+        filter_id: number,
+        filter_ref: any,
+        label: string,
+        description: string,
+        url: string,
+    ): FilterLinkFullRow
+    {
+        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 as any,
+                domain: null as any,
+            }
+        };
+    }
+
+    private static walk(
+        filters: FilterLinkFullRow[],
+        parent_id: number | null,
+        rows: EntityResolveResponseRow,
+        result: FilterLinkFullRow[],
+        id_counter: { value: number },
+        matched: Set<string>,
+    ): void
+    {
+        const children = filters.filter(f => f.parent_id === parent_id);
+        for (const filter of children)
+        {
+            const filter_name = filter.name ?? filter.link?.name ?? "";
+            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, 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(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);
+        }
+    }
 }

package/src/pages/NSFCategoryEditPage.tsx

@@ -1,88 +1,88 @@
-import { CategoryInputRow, CategoryRow, CategoryScopeRow, SlotRow } from "namirasoft-field";
-import { NSBox, NSBoxString, NSBoxTextArea, NSColumn, NSRow } from "namirasoft-site-react";
-import { Component, createRef } from "react";
-import { NSALayoutCustomProps } from "../layouts/NSALayout";
-import { NSFRouterProps } from "../NSFRouterProps";
-import { NSFEntities } from "./NSFEntities";
-
-export interface NSFCategoryEditPageProps extends NSALayoutCustomProps<CategoryRow>, NSFRouterProps
-{
-	slot: SlotRow;
-	category_scope: CategoryScopeRow;
-	isEdit: boolean;
-}
-
-interface NSFCategoryEditPageState { }
-
-export class NSFCategoryEditPage extends Component<NSFCategoryEditPageProps, NSFCategoryEditPageState>
-{
-	NSBoxString_Name = createRef<NSBoxString>();
-	NSBoxTexArea_Description = createRef<NSBoxTextArea>();
-
-	constructor(props: NSFCategoryEditPageProps)
-	{
-		super(props);
-		this.state = {};
-	}
-
-	override render()
-	{
-		return this.props.layout.getNSALayout<CategoryRow, CategoryInputRow>({
-			...this.props,
-			action: {
-				description: this.props.isEdit ? "This section allows you to update the details of an existing category." : "This section allows you to add a new category by entering its details."
-			},
-			pages: {
-				entity: NSFEntities.category(this.props, this.props.slot, this.props.category_scope),
-				edit: {
-					...this.props,
-					ui: {
-						tab_page_edit: {
-							editor: {
-								getInputRow: () =>
-								{
-									let category_scope_id = this.props.category_scope.id;
-									let name = this.NSBoxString_Name.current?.getValue() ?? "";
-									let description = this.NSBoxTexArea_Description.current?.getValue() ?? "";
-
-									return {
-										workspace_id: "",
-										category_scope_id,
-										name,
-										description,
-										category_category: [],
-										category_field: [],
-										category_tag: [],
-									};
-								},
-								setRow: (row) =>
-								{
-									this.NSBoxString_Name.current?.setValue(row.name);
-									this.NSBoxTexArea_Description.current?.setValue(row.description ?? "");
-								}
-							}
-						}
-					}
-				}
-			},
-			children: <NSColumn>
-				<NSRow>
-					<NSBoxString
-						ref={this.NSBoxString_Name}
-						title="Name"
-						required
-						style={{ width: NSBox.width.double }}
-						info={{ link: "https://namirasoft.com/field/console-guide/category/#field-name" }}
-					/>
-				</NSRow>
-				<NSBoxTextArea
-					ref={this.NSBoxTexArea_Description}
-					title="Description"
-					required={false}
-					style={{ width: NSBox.width.double }}
-					info={{ link: "https://namirasoft.com/field/console-guide/category/#field-description" }}
-				/>
-			</NSColumn>
-		}, "nsf-page-category-view");
-	}
+import { CategoryInputRow, CategoryRow, CategoryScopeRow, SlotRow } from "namirasoft-field";
+import { NSBox, NSBoxString, NSBoxTextArea, NSColumn, NSRow } from "namirasoft-site-react";
+import { Component, createRef } from "react";
+import { NSALayoutCustomProps } from "../layouts/NSALayout";
+import { NSFRouterProps } from "../NSFRouterProps";
+import { NSFEntities } from "./NSFEntities";
+
+export interface NSFCategoryEditPageProps extends NSALayoutCustomProps<CategoryRow>, NSFRouterProps
+{
+	slot: SlotRow;
+	category_scope: CategoryScopeRow;
+	isEdit: boolean;
+}
+
+interface NSFCategoryEditPageState { }
+
+export class NSFCategoryEditPage extends Component<NSFCategoryEditPageProps, NSFCategoryEditPageState>
+{
+	NSBoxString_Name = createRef<NSBoxString>();
+	NSBoxTexArea_Description = createRef<NSBoxTextArea>();
+
+	constructor(props: NSFCategoryEditPageProps)
+	{
+		super(props);
+		this.state = {};
+	}
+
+	override render()
+	{
+		return this.props.layout.getNSALayout<CategoryRow, CategoryInputRow>({
+			...this.props,
+			action: {
+				description: this.props.isEdit ? "This section allows you to update the details of an existing category." : "This section allows you to add a new category by entering its details."
+			},
+			pages: {
+				entity: NSFEntities.category(this.props, this.props.slot, this.props.category_scope),
+				edit: {
+					...this.props,
+					ui: {
+						tab_page_edit: {
+							editor: {
+								getInputRow: () =>
+								{
+									let category_scope_id = this.props.category_scope.id;
+									let name = this.NSBoxString_Name.current?.getValue() ?? "";
+									let description = this.NSBoxTexArea_Description.current?.getValue() ?? "";
+
+									return {
+										workspace_id: "",
+										category_scope_id,
+										name,
+										description,
+										category_category: [],
+										category_field: [],
+										category_tag: [],
+									};
+								},
+								setRow: (row) =>
+								{
+									this.NSBoxString_Name.current?.setValue(row.name);
+									this.NSBoxTexArea_Description.current?.setValue(row.description ?? "");
+								}
+							}
+						}
+					}
+				}
+			},
+			children: <NSColumn>
+				<NSRow>
+					<NSBoxString
+						ref={this.NSBoxString_Name}
+						title="Name"
+						required
+						style={{ width: NSBox.width.double }}
+						info={{ link: "https://namirasoft.com/field/console-guide/category/#field-name" }}
+					/>
+				</NSRow>
+				<NSBoxTextArea
+					ref={this.NSBoxTexArea_Description}
+					title="Description"
+					required={false}
+					style={{ width: NSBox.width.double }}
+					info={{ link: "https://namirasoft.com/field/console-guide/category/#field-description" }}
+				/>
+			</NSColumn>
+		}, "nsf-page-category-view");
+	}
 }

package/src/pages/NSFCategoryListPage.tsx

@@ -1,24 +1,24 @@
-import { CategoryRow, CategoryScopeRow, SlotRow } from "namirasoft-field";
-import { NSALayoutCustomProps } from "../layouts/NSALayout";
-import { NSFRouterProps } from "../NSFRouterProps";
-import { NSFEntities } from "./NSFEntities";
-
-export interface NSFCategoryListPageProps extends NSALayoutCustomProps<CategoryRow>, NSFRouterProps
-{
-	slot: SlotRow;
-	category_scope: CategoryScopeRow;
-}
-
-export function NSFCategoryListPage(props: NSFCategoryListPageProps)
-{
-	return props.layout.getNSALayout({
-		...props,
-		action: {
-			description: "This section displays all categories you have created with their basic information."
-		},
-		pages: {
-			entity: NSFEntities.category(props, props.slot, props.category_scope),
-			list: {}
-		}
-	}, "nsf-page-category-list");
+import { CategoryRow, CategoryScopeRow, SlotRow } from "namirasoft-field";
+import { NSALayoutCustomProps } from "../layouts/NSALayout";
+import { NSFRouterProps } from "../NSFRouterProps";
+import { NSFEntities } from "./NSFEntities";
+
+export interface NSFCategoryListPageProps extends NSALayoutCustomProps<CategoryRow>, NSFRouterProps
+{
+	slot: SlotRow;
+	category_scope: CategoryScopeRow;
+}
+
+export function NSFCategoryListPage(props: NSFCategoryListPageProps)
+{
+	return props.layout.getNSALayout({
+		...props,
+		action: {
+			description: "This section displays all categories you have created with their basic information."
+		},
+		pages: {
+			entity: NSFEntities.category(props, props.slot, props.category_scope),
+			list: {}
+		}
+	}, "nsf-page-category-list");
 }

package/src/pages/NSFCategoryViewPage.tsx

@@ -1,24 +1,24 @@
-import { CategoryRow, CategoryScopeRow, SlotRow } from "namirasoft-field";
-import { NSALayoutCustomProps } from "../layouts/NSALayout";
-import { NSFRouterProps } from "../NSFRouterProps";
-import { NSFEntities } from "./NSFEntities";
-
-export interface NSFCategoryViewPageProps extends NSALayoutCustomProps<CategoryRow>, NSFRouterProps
-{
-	slot: SlotRow;
-	category_scope: CategoryScopeRow;
-}
-
-export function NSFCategoryViewPage(props: NSFCategoryViewPageProps)
-{
-	return props.layout.getNSALayout({
-		...props,
-		action: {
-			description: "This section displays detailed information about a selected category."
-		},
-		pages: {
-			entity: NSFEntities.category(props, props.slot, props.category_scope),
-			view: {}
-		}
-	}, "nsf-page-category-view");
+import { CategoryRow, CategoryScopeRow, SlotRow } from "namirasoft-field";
+import { NSALayoutCustomProps } from "../layouts/NSALayout";
+import { NSFRouterProps } from "../NSFRouterProps";
+import { NSFEntities } from "./NSFEntities";
+
+export interface NSFCategoryViewPageProps extends NSALayoutCustomProps<CategoryRow>, NSFRouterProps
+{
+	slot: SlotRow;
+	category_scope: CategoryScopeRow;
+}
+
+export function NSFCategoryViewPage(props: NSFCategoryViewPageProps)
+{
+	return props.layout.getNSALayout({
+		...props,
+		action: {
+			description: "This section displays detailed information about a selected category."
+		},
+		pages: {
+			entity: NSFEntities.category(props, props.slot, props.category_scope),
+			view: {}
+		}
+	}, "nsf-page-category-view");
 }

package/src/pages/NSFEntities.ts

@@ -1,59 +1,59 @@
-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 { NSARouterMakerResult } from "../NSARouterMakerResult";
-import { NSFRouterProps } from "../NSFRouterProps";
-import { NSFRoutes } from "../NSFRoutes";
-
-export class NSFEntities
-{
-	static category(props: NSARouterMakerResult & NSFRouterProps, slot: SlotRow, category_scope: CategoryScopeRow): IEntityInfo<CategoryRow, CategoryInputRow>
-	{
-		let namirasoft = new NamirasoftMap(props.account.token_manager, console.error);
-
-		return {
-			product_id: ProductUUID.NAMIRASOFT_FIELD,
-			name: "category",
-			tables: [{ table: namirasoft.field.tables.category, required: true }],
-			client: {
-				getColumns()
-				{
-					return [
-						BaseColumnFormatter.getColumn(namirasoft.field.tables.category.columns.id, new IDFormatter(namirasoft, null)),
-						BaseColumnFormatter.getColumn(namirasoft.field.tables.category.columns.user_id, new IDFormatter(namirasoft, new IStorageLocal())),
-						BaseColumnFormatter.getColumn(namirasoft.field.tables.category.columns.workspace_id, new IDFormatter(namirasoft, new IStorageLocal())),
-						BaseColumnFormatter.getColumn(namirasoft.field.tables.category.columns.category_scope_id, new IDFormatter(namirasoft, new IStorageLocal())),
-						BaseColumnFormatter.getColumn(namirasoft.field.tables.category.columns.name, new StringFormatter(StringFormatterSizeType.Sentence)),
-						BaseColumnFormatter.getColumn(namirasoft.field.tables.category.columns.description, new StringFormatter(StringFormatterSizeType.Description)),
-						BaseColumnFormatter.getColumn(namirasoft.field.tables.category.columns.created_at, new DateTimeFormatter()),
-						BaseColumnFormatter.getColumn(namirasoft.field.tables.category.columns.updated_at, new DateTimeFormatter()),
-					];
-				},
-				getListURL: () => NSFRoutes.CategoryList(slot.id, slot.name),
-				getNewURL: () => NSFRoutes.CategoryNew(slot.id, slot.name),
-				getCopyURL: (id: string) => NSFRoutes.CategoryCopy(slot.id, slot.name, id),
-				getEditURL: (id: string) => NSFRoutes.CategoryEdit(slot.id, slot.name, id),
-				getViewURL: (id: string) => NSFRoutes.CategoryView(slot.id, slot.name, id),
-			},
-			server: {
-				value_list: props.servers.field.value.List,
-				get: props.servers.field.category.Get,
-				list: async (filters, page, size, sorts, all_workspaces) =>
-				{
-					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 meta = new NamirasoftFieldMetaDatabase(props.account.token_manager);
-					let filter_category_scope = new FilterItem(meta.tables.category, meta.tables.category.columns.category_scope_id, false, FilterItemOperator.all.equals, category_scope.id);
-					filters = [filter_category_scope, ...(filters ?? [])];
-					return await field.category.List(filters, page, size, sorts, all_workspaces);
-				},
-				create: props.servers.field.category.Create,
-				update: props.servers.field.category.Update,
-				delete: props.servers.field.category.Delete
-			}
-		};
-	}
+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 { NSARouterMakerResult } from "../NSARouterMakerResult";
+import { NSFRouterProps } from "../NSFRouterProps";
+import { NSFRoutes } from "../NSFRoutes";
+
+export class NSFEntities
+{
+	static category(props: NSARouterMakerResult & NSFRouterProps, slot: SlotRow, category_scope: CategoryScopeRow): IEntityInfo<CategoryRow, CategoryInputRow>
+	{
+		let namirasoft = new NamirasoftMap(props.account.token_manager, console.error);
+
+		return {
+			product_id: ProductUUID.NAMIRASOFT_FIELD,
+			name: "category",
+			tables: [{ table: namirasoft.field.tables.category, required: true }],
+			client: {
+				getColumns()
+				{
+					return [
+						BaseColumnFormatter.getColumn(namirasoft.field.tables.category.columns.id, new IDFormatter(namirasoft, null)),
+						BaseColumnFormatter.getColumn(namirasoft.field.tables.category.columns.user_id, new IDFormatter(namirasoft, new IStorageLocal())),
+						BaseColumnFormatter.getColumn(namirasoft.field.tables.category.columns.workspace_id, new IDFormatter(namirasoft, new IStorageLocal())),
+						BaseColumnFormatter.getColumn(namirasoft.field.tables.category.columns.category_scope_id, new IDFormatter(namirasoft, new IStorageLocal())),
+						BaseColumnFormatter.getColumn(namirasoft.field.tables.category.columns.name, new StringFormatter(StringFormatterSizeType.Sentence)),
+						BaseColumnFormatter.getColumn(namirasoft.field.tables.category.columns.description, new StringFormatter(StringFormatterSizeType.Description)),
+						BaseColumnFormatter.getColumn(namirasoft.field.tables.category.columns.created_at, new DateTimeFormatter()),
+						BaseColumnFormatter.getColumn(namirasoft.field.tables.category.columns.updated_at, new DateTimeFormatter()),
+					];
+				},
+				getListURL: () => NSFRoutes.CategoryList(slot.id, slot.name),
+				getNewURL: () => NSFRoutes.CategoryNew(slot.id, slot.name),
+				getCopyURL: (id: string) => NSFRoutes.CategoryCopy(slot.id, slot.name, id),
+				getEditURL: (id: string) => NSFRoutes.CategoryEdit(slot.id, slot.name, id),
+				getViewURL: (id: string) => NSFRoutes.CategoryView(slot.id, slot.name, id),
+			},
+			server: {
+				value_list: props.servers.field.value.List,
+				get: props.servers.field.category.Get,
+				list: async (filters, page, size, sorts, all_workspaces) =>
+				{
+					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 meta = new NamirasoftFieldMetaDatabase(props.account.token_manager);
+					let filter_category_scope = new FilterItem(meta.tables.category, meta.tables.category.columns.category_scope_id, false, FilterItemOperator.all.equals, category_scope.id);
+					filters = [filter_category_scope, ...(filters ?? [])];
+					return await field.category.List(filters, page, size, sorts, all_workspaces);
+				},
+				create: props.servers.field.category.Create,
+				update: props.servers.field.category.Update,
+				delete: props.servers.field.category.Delete
+			}
+		};
+	}
 }