namirasoft-account-react 1.4.429 → 1.4.430

package/src/NSACacheService.ts

@@ -1,121 +1,121 @@
-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)
-    {
-        return 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;
-            }
-        );
-    }
-
-    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}`;
-
-        return 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;
-                }
-            }
-        );
-    }
-
-    static getFilterLinks(scopes: string[])
-    {
-        return 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);
-            }
-        );
-    }
-
-    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[]
-    {
-        const storage = new IStorageLocal();
-        try
-        {
-            return JSON.parse(storage.get(`ns-quick-filters-${entityName}`, "[]"));
-        }
-        catch
-        {
-            return [];
-        }
-    }
-
-    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)
+    {
+        return 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;
+            }
+        );
+    }
+
+    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}`;
+
+        return 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;
+                }
+            }
+        );
+    }
+
+    static getFilterLinks(scopes: string[])
+    {
+        return 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);
+            }
+        );
+    }
+
+    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[]
+    {
+        const storage = new IStorageLocal();
+        try
+        {
+            return JSON.parse(storage.get(`ns-quick-filters-${entityName}`, "[]"));
+        }
+        catch
+        {
+            return [];
+        }
+    }
+
+    static saveQuickFilters(entityName: string, configs: QuickFilterConfig[]): void
+    {
+        const storage = new IStorageLocal();
+        storage.set(`ns-quick-filters-${entityName}`, JSON.stringify(configs));
+    }
 }

package/src/NSAFilterOperators.ts

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