namirasoft-account-react 1.5.37 → 1.5.39

package/src/CTFRow.ts

@@ -1,8 +1,8 @@
-import { EntityCategoryInputRow, EntityFieldInputRow, EntityTagInputRow } from "namirasoft-field";
-
-export interface CTFRow
-{
-    categories: EntityCategoryInputRow[];
-    fields: EntityFieldInputRow[];
-    tags: EntityTagInputRow[];
+import { EntityCategoryInputRow, EntityFieldInputRow, EntityTagInputRow } from "namirasoft-field";
+
+export interface CTFRow
+{
+    categories: EntityCategoryInputRow[];
+    fields: EntityFieldInputRow[];
+    tags: EntityTagInputRow[];
 }

package/src/FieldCacheService.tsx

@@ -1,109 +1,114 @@
-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>
-{
-    private static pendings: { [key: string]: Promise<EntityResolveResponseRow> } = {};
-
-    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 ?? "*"}`;
-        let cache = 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);
-                // A failed resolve is deliberately not swallowed here: returning the empty
-                // fallback would cache "this product has no fields" under the current version,
-                // and every page would then render without fields until the cache expires.
-                // The caller falls back to the empty set for this page load only.
-                return await server.entity.Resolve(product_id);
-            }
-        );
-
-        let innerGet = cache.get.bind(cache);
-        cache.get = () =>
-        {
-            if (!FieldCacheService.pendings[key_field])
-                FieldCacheService.pendings[key_field] = innerGet().finally(() =>
-                {
-                    delete FieldCacheService.pendings[key_field];
-                });
-            return FieldCacheService.pendings[key_field];
-        };
-
-        return cache;
-    }
-
-    constructor(props: FieldCacheServiceProps)
-    {
-        super(props);
-        this.state = {
-            rows: null,
-        };
-
-    }
-    private static getEmpty(): EntityResolveResponseRow
-    {
-        return {
-            slots: [],
-            category_scopes: [],
-            categories: [],
-            fields: [],
-        };
-    }
-    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 }));
-        }).catch(() =>
-        {
-            // Nothing was cached, so the next page load retries; render the app meanwhile.
-            this.setState(prev => ({ ...prev, rows: FieldCacheService.getEmpty() }));
-        });
-    }
-    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>
+{
+    private static pendings: { [key: string]: Promise<EntityResolveResponseRow> } = {};
+
+    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 ?? "*"}`;
+        let cache = 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);
+                // A failed resolve is deliberately not swallowed here: returning the empty
+                // fallback would cache "this product has no fields" under the current version,
+                // and every page would then render without fields until the cache expires.
+                // The caller falls back to the empty set for this page load only.
+                return await server.entity.Resolve(product_id);
+            }
+        );
+
+        let innerGet = cache.get.bind(cache);
+        cache.get = () =>
+        {
+            if (!FieldCacheService.pendings[key_field])
+                FieldCacheService.pendings[key_field] = innerGet().finally(() =>
+                {
+                    delete FieldCacheService.pendings[key_field];
+                });
+            return FieldCacheService.pendings[key_field];
+        };
+
+        return cache;
+    }
+
+    constructor(props: FieldCacheServiceProps)
+    {
+        super(props);
+        this.state = {
+            rows: null,
+        };
+
+    }
+    private static getEmpty(): EntityResolveResponseRow
+    {
+        return {
+            slots: [],
+            category_scopes: [],
+            categories: [],
+            fields: [],
+        };
+    }
+    override componentDidMount(): void
+    {
+        if (!this.props.account.token_manager.exists())
+        {
+            this.setState(prev => ({ ...prev, rows: FieldCacheService.getEmpty() }));
+            return;
+        }
+        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 }));
+        }).catch(() =>
+        {
+            // Nothing was cached, so the next page load retries; render the app meanwhile.
+            this.setState(prev => ({ ...prev, rows: FieldCacheService.getEmpty() }));
+        });
+    }
+    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/IEntityInfo.ts

@@ -1,34 +1,34 @@
-import { BaseMetaTable, FilterItem, SortItem } from "namirasoft-core";
-import { NSMenuActionProps, TableColumnInfo } from "namirasoft-site-react";
-import { QuickFilterDef } from "./NSAFilterOperators";
-
-export interface IEntityInfo<EntityType extends { id: string }, EntityTypeInput = EntityType>
-{
-    product_id: string;
-    name: string;
-    tables: { table: BaseMetaTable, required: boolean }[];
-    server: {
-        value_list: (table: string, column: string, search: string | null, field_id: string | null, limit: number | null) => Promise<string[]>;
-        get: null | ((id: string) => Promise<EntityType>);
-        list: null | ((filters: FilterItem[] | null, page: (number | null), size: (number | null), sorts: SortItem[], all_workspaces: (boolean | null)) => Promise<{
-            rows: EntityType[];
-            count: number;
-        }>);
-        create: null | ((entity: EntityTypeInput) => Promise<EntityType>);
-        update: null | ((id: string, entity: EntityTypeInput) => Promise<EntityType>);
-        delete: null | ((id: string) => Promise<void>);
-    };
-    client: {
-        getListURL: null | (() => string);
-        getNewURL: null | (() => string);
-        getCopyURL: null | ((id: string) => string);
-        getEditURL: null | ((id: string) => string);
-        getViewURL: null | ((id: string) => string);
-        getColumns: () => TableColumnInfo[];
-        onCreate?: (entity: EntityTypeInput) => Promise<EntityType | null>;
-        onUpdate?: (id: string, entity: EntityTypeInput) => Promise<EntityType | null>;
-        onSuccess?: (entity: EntityType) => boolean;
-        getMenus?: (getIDs: () => string[], getRows: (() => EntityType[])) => { [group: string]: NSMenuActionProps[]; }
-        getQuickFilters?: () => QuickFilterDef<EntityType>[]
-    }
+import { BaseMetaTable, FilterItem, SortItem } from "namirasoft-core";
+import { NSMenuActionProps, TableColumnInfo } from "namirasoft-site-react";
+import { QuickFilterDef } from "./NSAFilterOperators";
+
+export interface IEntityInfo<EntityType extends { id: string }, EntityTypeInput = EntityType>
+{
+    product_id: string;
+    name: string;
+    tables: { table: BaseMetaTable, required: boolean }[];
+    server: {
+        value_list: (table: string, column: string, search: string | null, field_id: string | null, limit: number | null) => Promise<string[]>;
+        get: null | ((id: string) => Promise<EntityType>);
+        list: null | ((filters: FilterItem[] | null, page: (number | null), size: (number | null), sorts: SortItem[], all_workspaces: (boolean | null)) => Promise<{
+            rows: EntityType[];
+            count: number;
+        }>);
+        create: null | ((entity: EntityTypeInput) => Promise<EntityType>);
+        update: null | ((id: string, entity: EntityTypeInput) => Promise<EntityType>);
+        delete: null | ((id: string) => Promise<void>);
+    };
+    client: {
+        getListURL: null | (() => string);
+        getNewURL: null | (() => string);
+        getCopyURL: null | ((id: string) => string);
+        getEditURL: null | ((id: string) => string);
+        getViewURL: null | ((id: string) => string);
+        getColumns: () => TableColumnInfo[];
+        onCreate?: (entity: EntityTypeInput) => Promise<EntityType | null>;
+        onUpdate?: (id: string, entity: EntityTypeInput) => Promise<EntityType | null>;
+        onSuccess?: (entity: EntityType) => boolean;
+        getMenus?: (getIDs: () => string[], getRows: (() => EntityType[])) => { [group: string]: NSMenuActionProps[]; }
+        getQuickFilters?: () => QuickFilterDef<EntityType>[]
+    }
 }

package/src/NSACacheService.ts

@@ -1,127 +1,127 @@
-import { NamirasoftAPIProductServer, ProductFullRow } from "namirasoft-api-product";
-import { CacheService, EnvService, IStorageLocal, PackageService } from "namirasoft-core";
-import { ConsentRow, NamirasoftAccountServer, TokenManager } from "namirasoft-account";
-import { FilterLinkFullRow, NamirasoftAPILinkServer } from "namirasoft-api-link";
-import { NSNotifier } from "namirasoft-site-react";
-import { QuickFilterConfig } from "./components/quickfilter/NSAQuickFilterDialog";
-
-export class NSACacheService
-{
-    static getProducts(notifier: NSNotifier)
-    {
-        let cache = new CacheService<{ rows: ProductFullRow[]; count: number; }>(
-            "ns-products",
-            new IStorageLocal(),
-            7 * 24 * 60, // a week
-            async () => "1.0.0",
-            async () =>
-            {
-                let REACT_APP_BASE_URL_API_PRODUCT = new EnvService("REACT_APP_BASE_URL_API_PRODUCT", true).getString();
-                let server = new NamirasoftAPIProductServer(REACT_APP_BASE_URL_API_PRODUCT, notifier.onError);
-                let ans = await server.filter.ListProducts("Namirasoft Console", "Header", null, null, null, []);
-                if (PackageService.MainJson)
-                {
-                    let CurrentProjectName = PackageService.MainJson?.title.replace("Console", "").trim();
-                    ans.rows = ans.rows.filter(r => r.name !== CurrentProjectName);
-                    ans.count = ans.rows.length;
-                }
-                return ans;
-            }
-        );
-        return cache;
-    }
-
-    static getConsent(manager: TokenManager, product_id: string, onError: (error: Error | string, timout?: number) => void)
-    {
-        let user_id = manager.getUserData(user => user.id, "");
-        let key = `ns-account-consent-user-${user_id}-product-${product_id}`;
-
-        let cache = new CacheService<ConsentRow | null>(
-            key,
-            new IStorageLocal(),
-            7 * 24 * 60,
-            async () => "1.0.0",
-            async () =>
-            {
-                let REACT_APP_BASE_URL_ACCOUNT = new EnvService("REACT_APP_BASE_URL_ACCOUNT", true).getString();
-                let server = new NamirasoftAccountServer(REACT_APP_BASE_URL_ACCOUNT, manager, onError);
-                try
-                {
-                    let ans = await server.consent.GetByProduct(product_id);
-                    return ans;
-                }
-                catch (error)
-                {
-                    return null;
-                }
-            }
-        );
-        return cache;
-    }
-
-    static getFilterLinks(scopes: string[])
-    {
-        let cache = new CacheService<{ [scope: string]: FilterLinkFullRow[] }>(
-            `ns-master-menu-filter-links`,
-            new IStorageLocal(),
-            7 * 24 * 60, // a week
-            async () => "1.0.0",
-            async () =>
-            {
-                let REACT_APP_BASE_URL_API_LINK = new EnvService("REACT_APP_BASE_URL_API_LINK", true).getString();
-                let server = new NamirasoftAPILinkServer(REACT_APP_BASE_URL_API_LINK, console.error);
-
-                let entries = await Promise.all(
-                    scopes.map(async (scope) =>
-                    {
-                        try
-                        {
-                            let response = await server.filter.ListFilterLinks(scope, "Header", [], null, null, []);
-                            return [scope, response.rows];
-                        }
-                        catch (error)
-                        {
-                            return [scope, []];
-                        }
-                    })
-                );
-
-                return Object.fromEntries(entries);
-            }
-        );
-        return cache;
-    }
-
-    static getMasterMenuStatus()
-    {
-        return new CacheService<{ open: boolean }>(
-            `ns-master-menu-status`,
-            new IStorageLocal(),
-            30 * 24 * 60, // a month
-            async () => "1.0.0",
-            async () => ({ open: false })
-        );
-    }
-
-    static loadQuickFilters(entityName: string): QuickFilterConfig[] | null
-    {
-        const storage = new IStorageLocal();
-        const raw = storage.get(`ns-quick-filters-${entityName}`, "");
-        if (!raw)
-            return null;
-        try
-        {
-            return JSON.parse(raw);
-        }
-        catch
-        {
-            return null;
-        }
-    }
-
-    static saveQuickFilters(entityName: string, configs: QuickFilterConfig[]): void
-    {
-        const storage = new IStorageLocal();
-        storage.set(`ns-quick-filters-${entityName}`, JSON.stringify(configs));
-    }
+import { NamirasoftAPIProductServer, ProductFullRow } from "namirasoft-api-product";
+import { CacheService, EnvService, IStorageLocal, PackageService } from "namirasoft-core";
+import { ConsentRow, NamirasoftAccountServer, TokenManager } from "namirasoft-account";
+import { FilterLinkFullRow, NamirasoftAPILinkServer } from "namirasoft-api-link";
+import { NSNotifier } from "namirasoft-site-react";
+import { QuickFilterConfig } from "./components/quickfilter/NSAQuickFilterDialog";
+
+export class NSACacheService
+{
+    static getProducts(notifier: NSNotifier)
+    {
+        let cache = new CacheService<{ rows: ProductFullRow[]; count: number; }>(
+            "ns-products",
+            new IStorageLocal(),
+            7 * 24 * 60, // a week
+            async () => "1.0.0",
+            async () =>
+            {
+                let REACT_APP_BASE_URL_API_PRODUCT = new EnvService("REACT_APP_BASE_URL_API_PRODUCT", true).getString();
+                let server = new NamirasoftAPIProductServer(REACT_APP_BASE_URL_API_PRODUCT, notifier.onError);
+                let ans = await server.filter.ListProducts("Namirasoft Console", "Header", null, null, null, []);
+                if (PackageService.MainJson)
+                {
+                    let CurrentProjectName = PackageService.MainJson?.title.replace("Console", "").trim();
+                    ans.rows = ans.rows.filter(r => r.name !== CurrentProjectName);
+                    ans.count = ans.rows.length;
+                }
+                return ans;
+            }
+        );
+        return cache;
+    }
+
+    static getConsent(manager: TokenManager, product_id: string, onError: (error: Error | string, timout?: number) => void)
+    {
+        let user_id = manager.getUserData(user => user.id, "");
+        let key = `ns-account-consent-user-${user_id}-product-${product_id}`;
+
+        let cache = new CacheService<ConsentRow | null>(
+            key,
+            new IStorageLocal(),
+            7 * 24 * 60,
+            async () => "1.0.0",
+            async () =>
+            {
+                let REACT_APP_BASE_URL_ACCOUNT = new EnvService("REACT_APP_BASE_URL_ACCOUNT", true).getString();
+                let server = new NamirasoftAccountServer(REACT_APP_BASE_URL_ACCOUNT, manager, onError);
+                try
+                {
+                    let ans = await server.consent.GetByProduct(product_id);
+                    return ans;
+                }
+                catch (error)
+                {
+                    return null;
+                }
+            }
+        );
+        return cache;
+    }
+
+    static getFilterLinks(scopes: string[])
+    {
+        let cache = new CacheService<{ [scope: string]: FilterLinkFullRow[] }>(
+            `ns-master-menu-filter-links`,
+            new IStorageLocal(),
+            7 * 24 * 60, // a week
+            async () => "1.0.0",
+            async () =>
+            {
+                let REACT_APP_BASE_URL_API_LINK = new EnvService("REACT_APP_BASE_URL_API_LINK", true).getString();
+                let server = new NamirasoftAPILinkServer(REACT_APP_BASE_URL_API_LINK, console.error);
+
+                let entries = await Promise.all(
+                    scopes.map(async (scope) =>
+                    {
+                        try
+                        {
+                            let response = await server.filter.ListFilterLinks(scope, "Header", [], null, null, []);
+                            return [scope, response.rows];
+                        }
+                        catch (error)
+                        {
+                            return [scope, []];
+                        }
+                    })
+                );
+
+                return Object.fromEntries(entries);
+            }
+        );
+        return cache;
+    }
+
+    static getMasterMenuStatus()
+    {
+        return new CacheService<{ open: boolean }>(
+            `ns-master-menu-status`,
+            new IStorageLocal(),
+            30 * 24 * 60, // a month
+            async () => "1.0.0",
+            async () => ({ open: false })
+        );
+    }
+
+    static loadQuickFilters(entityName: string): QuickFilterConfig[] | null
+    {
+        const storage = new IStorageLocal();
+        const raw = storage.get(`ns-quick-filters-${entityName}`, "");
+        if (!raw)
+            return null;
+        try
+        {
+            return JSON.parse(raw);
+        }
+        catch
+        {
+            return null;
+        }
+    }
+
+    static saveQuickFilters(entityName: string, configs: QuickFilterConfig[]): void
+    {
+        const storage = new IStorageLocal();
+        storage.set(`ns-quick-filters-${entityName}`, JSON.stringify(configs));
+    }
 }