@etsoo/appscript 1.3.2 → 1.3.3

package/src/address/AddressRegion.ts

@@ -1,9 +1,10 @@
-import { AddressContinent } from './AddressContinent';
+import { Currency } from '../business/Currency';
+import { AddressContinent, AddressContinentId } from './AddressContinent';
 
 /**
- * Country or region interface
+ * Address region in database
  */
-export interface IAddressRegion {
+export interface AddressRegionDb {
     /**
      * Id, like CN for China
      * https://www.iban.com/country-codes
@@ -24,10 +25,10 @@ export interface IAddressRegion {
     readonly nid: string;
 
     /**
-     * Continent
-     * 洲
+     * Continent id
+     * 洲编号
      */
-    readonly continent: AddressContinent;
+    readonly continentId: AddressContinentId;
 
     /**
      * Phone exit code for international dial, like 00 in China
@@ -45,19 +46,30 @@ export interface IAddressRegion {
      * Currency, like CNY for China's currency
      * 币种
      */
-    readonly currency: string;
+    readonly currency: Currency;
 
     /**
-     * Languages
-     * 语言
+     * Name
+     * 名称
      */
-    readonly languages: string[];
+    label: string;
+}
 
+/**
+ * Country or region interface
+ */
+export interface IAddressRegion extends AddressRegionDb {
     /**
-     * Name
-     * 名称
+     * Continent
+     * 洲
+     */
+    readonly continent: AddressContinent;
+
+    /**
+     * Languages
+     * 语言
      */
-    name: string;
+    readonly languages: string[];
 }
 
 /**
@@ -269,6 +281,12 @@ export class AddressRegion implements IAddressRegion {
         return AddressRegion.all.find((c) => c.id === id);
     }
 
+    /**
+     * Continent id
+     * 洲编号
+     */
+    readonly continentId: AddressContinentId;
+
     // Typescript constructor shorthand
     constructor(
         public id: string,
@@ -277,8 +295,10 @@ export class AddressRegion implements IAddressRegion {
         public continent: AddressContinent,
         public exitCode: string,
         public idd: string,
-        public currency: string,
+        public currency: Currency,
         public languages: string[],
-        public name: string = id
-    ) {}
+        public label: string = id
+    ) {
+        this.continentId = AddressContinent[continent] as AddressContinentId;
+    }
 }

package/src/address/AddressState.ts

@@ -0,0 +1,19 @@
+/**
+ * Address state
+ */
+export type AddressState = {
+    /**
+     * Id
+     */
+    id: string;
+
+    /**
+     * Abbreviation
+     */
+    abbr?: string;
+
+    /**
+     * Name
+     */
+    label: string;
+};

package/src/address/AddressUtils.ts

@@ -1,33 +1,9 @@
-import { DataTypes } from '@etsoo/shared';
-import { AddressRegion } from '..';
-import { IdLabelConditional } from '../dto/IdLabelDto';
-import { ICultureGet } from '../state/Culture';
-import { AddressContinent } from './AddressContinent';
+import { AddressRegion } from './AddressRegion';
 
 /**
  * Address utils
  */
 export namespace AddressUtils {
-    /**
-     * Get all continents
-     * @param func Label delegate
-     * @param isNumberKey Is number key or key as id
-     * @returns Continents
-     */
-    export function getContinents<T extends boolean>(
-        func: ICultureGet,
-        isNumberKey = <T>false
-    ): IdLabelConditional<T> {
-        return <IdLabelConditional<T>>DataTypes.getEnumKeys(
-            AddressContinent
-        ).map((key) => ({
-            id: isNumberKey
-                ? <number>DataTypes.getEnumByKey(AddressContinent, key)!
-                : key.toString(),
-            label: func('continent' + key) ?? key
-        }));
-    }
-
     /**
      * Get region from regions and detected region and language
      * @param regions Supported regions
@@ -56,14 +32,4 @@ export namespace AddressUtils {
         // Default
         return AddressRegion.getById(regions[0])!;
     }
-
-    /**
-     * Get region label
-     * @param region Region id
-     * @param func Label delegate
-     * @returns Label
-     */
-    export function getRegionLabel(region: string, func: ICultureGet) {
-        return func('region' + region) ?? region;
-    }
 }

package/src/app/CoreApp.ts

@@ -30,11 +30,8 @@ import {
     SHA3
 } from 'crypto-js';
 import { AddressRegion } from '../address/AddressRegion';
-import { AddressUtils } from '../address/AddressUtils';
 import { BridgeUtils } from '../bridges/BridgeUtils';
-import { BusinessUtils } from '../business/BusinessUtils';
 import { EntityStatus } from '../business/EntityStatus';
-import { ProductUnit } from '../business/ProductUnit';
 import { InitCallDto } from '../dto/InitCallDto';
 import { ActionResultError } from '../result/ActionResultError';
 import { IActionResult } from '../result/IActionResult';
@@ -98,9 +95,9 @@ export abstract class CoreApp<
     readonly fields: IAppFields;
 
     /**
-     * API
+     * API, not recommend to use it directly in code, wrap to separate methods
      */
-    protected readonly api: IApi;
+    readonly api: IApi;
 
     /**
      * Application name
@@ -419,6 +416,9 @@ export abstract class CoreApp<
      * @param api Api
      */
     protected setApi(api: IApi) {
+        // Base URL of the API
+        api.baseUrl = this.settings.endpoint;
+
         // onRequest, show loading or not, rewrite the property to override default action
         api.onRequest = (data) => {
             if (data.showLoading == null || data.showLoading) {
@@ -743,16 +743,24 @@ export abstract class CoreApp<
 
         // Hold the current resources
         this.settings.currentCulture = culture;
+    }
 
-        // Update all supported regions' name
-        this.settings.regions.forEach((id) => {
-            const region = AddressRegion.getById(id);
-            if (region)
-                region.name = AddressUtils.getRegionLabel(
-                    id,
-                    this.labelDelegate
-                );
-        });
+    /**
+     * Check language is supported or not, return a valid language when supported
+     * @param language Language
+     * @returns Result
+     */
+    checkLanguage(language?: string) {
+        if (language) {
+            const item = this.settings.cultures.find(
+                (c) =>
+                    c.name === language || c.compatibleName?.includes(language)
+            );
+            if (item) return item.name;
+        }
+
+        // Default language
+        return this.culture;
     }
 
     /**
@@ -1269,16 +1277,6 @@ export abstract class CoreApp<
         return this.settings.timeZone ?? this.ipData?.timezone;
     }
 
-    /**
-     * Get product unit and repeat option label
-     * @param unit Product unit or repeat option
-     * @param isJoined Add the join label like 'per Kg' for Kg
-     */
-    getUnitLabel(unit?: ProductUnit, isJoined?: boolean): string {
-        if (unit == null) return '';
-        return BusinessUtils.getUnitLabel(unit, this.labelDelegate, isJoined);
-    }
-
     /**
      * Hash message, SHA3 or HmacSHA512, 512 as Base64
      * https://cryptojs.gitbook.io/docs/
@@ -1434,39 +1432,6 @@ export abstract class CoreApp<
         this.toLoginPage();
     }
 
-    /**
-     * Get organization list
-     * @param items Max items
-     * @param serviceId Service id
-     * @returns Result
-     */
-    async orgList(items?: number, serviceId?: number) {
-        return await this.api.post<ListType[]>(
-            'Organization/List',
-            {
-                items,
-                serviceId
-            },
-            { defaultValue: [], showLoading: false }
-        );
-    }
-
-    /**
-     * Switch organization
-     * @param id Organization id
-     * @param serviceId Service id
-     */
-    async switchOrg(id: number, serviceId?: number) {
-        const api = `Organization/Switch`;
-        const result = await this.api.put<boolean>(api, {
-            id,
-            serviceId,
-            deviceId: this.deviceId
-        });
-        if (result) return await this.refreshToken();
-        return result;
-    }
-
     /**
      * Go to the login page
      * @param tryLogin Try to login again

package/src/app/ExternalSettings.ts

@@ -41,21 +41,10 @@ export namespace ExternalSettings {
             if (typeof settings === 'object') {
                 if (typeof window !== 'undefined') {
                     // Host name
-                    let hostname = window.location.hostname;
-
-                    // Empty string returned under Electron
-                    if (hostname === '') hostname = 'localhost';
+                    const hostname = globalThis.location.hostname;
 
                     // replace {hostname}
-                    for (const key in settings) {
-                        const value = settings[key];
-                        if (typeof value === 'string') {
-                            settings[key] = value.replace(
-                                '{hostname}',
-                                hostname
-                            );
-                        }
-                    }
+                    format(settings, hostname);
                 }
 
                 return settings as IExternalSettings;
@@ -63,4 +52,19 @@ export namespace ExternalSettings {
         }
         return undefined;
     }
+
+    export function format(settings: any, hostname?: string) {
+        // Default hostname
+        if (!hostname) hostname = 'localhost';
+
+        // replace {hostname}
+        for (const key in settings) {
+            const value = settings[key];
+            if (typeof value === 'string') {
+                settings[key] = value.replace('{hostname}', hostname);
+            }
+        }
+
+        return settings;
+    }
 }

package/src/app/IApp.ts

@@ -95,6 +95,11 @@ export interface IApp {
      */
     readonly fields: IAppFields;
 
+    /**
+     * API, not recommend to use it directly in code, wrap to separate methods
+     */
+    readonly api: IApi;
+
     /**
      * Notifier
      */
@@ -208,6 +213,13 @@ export interface IApp {
      */
     checkDeviceResult(result: IActionResult): boolean;
 
+    /**
+     * Check language is supported or not
+     * @param language Language
+     * @returns Result
+     */
+    checkLanguage(language?: string): string;
+
     /**
      * Clear cache data
      */
@@ -400,13 +412,6 @@ export interface IApp {
      */
     getTimeZone(): string | undefined;
 
-    /**
-     * Get product unit and repeat option label
-     * @param unit Product unit or repeat option
-     * @param isJoined Add the join label like 'per Kg' for Kg
-     */
-    getUnitLabel(unit?: ProductUnit, isJoined?: boolean): string;
-
     /**
      * Hash message, SHA3 or HmacSHA512, 512 as Base64
      * https://cryptojs.gitbook.io/docs/
@@ -475,29 +480,11 @@ export interface IApp {
      */
     signout(): Promise<void>;
 
-    /**
-     * Get organization list
-     * @param items Max items
-     * @param serviceId Service id
-     * @returns Result
-     */
-    orgList(
-        items?: number,
-        serviceId?: number
-    ): Promise<ListType[] | undefined>;
-
     /**
      * Persist settings to source when application exit
      */
     persist(): void;
 
-    /**
-     * Switch organization
-     * @param id Organization id
-     * @param serviceId Service id
-     */
-    switchOrg(id: number, serviceId?: number): Promise<boolean | undefined>;
-
     /**
      * Go to the login page
      * @param tryLogin Try to login again

package/src/business/BusinessUtils.ts

@@ -1,7 +1,4 @@
-import { DataTypes, ListType, ListType1 } from '@etsoo/shared';
-import { ICultureGet } from '../state/Culture';
-import { ProductUnit } from './ProductUnit';
-import { RepeatOption } from './RepeatOption';
+import { DataTypes, ListType } from '@etsoo/shared';
 
 /**
  * Business utils
@@ -46,22 +43,6 @@ export namespace BusinessUtils {
         return defaultTitle;
     }
 
-    /**
-     * Get currency collection
-     * @param currencyNames Names like CNY, USD
-     * @param func Label delegate
-     * @returns Collection
-     */
-    export function getCurrencies(
-        currencyNames: string[],
-        func: ICultureGet
-    ): ListType1[] {
-        return currencyNames.map((name) => ({
-            id: name,
-            label: func(`currency${name}`) ?? name
-        }));
-    }
-
     /**
      * Get 12-month items
      * @param monthLabels Month labels
@@ -82,91 +63,6 @@ export namespace BusinessUtils {
         return months;
     }
 
-    /**
-     * Get product unit's label
-     * Please define the label in culture with key 'unitPC' for ProductUnit.PC like that
-     * @param unit Unit
-     * @param func Label delegate
-     * @param isJoined Add the join label like 'per Kg' for Kg
-     * @returns Label
-     */
-    export function getUnitLabel(
-        unit: ProductUnit,
-        func: ICultureGet,
-        isJoined?: boolean
-    ) {
-        const key = ProductUnit[unit];
-        const label = func('unit' + key) ?? key;
-        if (isJoined) {
-            const jLabel = func('unitJoin');
-            if (jLabel) return jLabel.format(label);
-        }
-        return label;
-    }
-
-    /**
-     * Get all product units
-     * @param func Label delegate
-     * @returns Units
-     */
-    export function getUnits(func: ICultureGet): ListType[];
-
-    /**
-     *
-     * Get all product units
-     * @param func Label delegate
-     * @param options Define the order and limit the items
-     * @param isJoined Add the join label like 'per Kg' for Kg
-     * @returns Units
-     */
-    export function getUnits(
-        func: ICultureGet,
-        options?: string[],
-        isJoined?: boolean
-    ): ListType[];
-
-    /**
-     *
-     * Get all product units
-     * @param func Label delegate
-     * @param options Define the order and limit the items
-     * @param isJoined Add the join label like 'per Kg' for Kg
-     * @returns Units
-     */
-    export function getUnits(
-        func: ICultureGet,
-        options?: string[],
-        isJoined?: boolean
-    ): ListType[] {
-        options ??= DataTypes.getEnumKeys(ProductUnit);
-        return options.map((key) => {
-            const id = DataTypes.getEnumByKey(ProductUnit, key)! as number;
-            return {
-                id,
-                label: getUnitLabel(id, func, isJoined).formatInitial(true)
-            };
-        });
-    }
-
-    /**
-     *
-     * Get all repeat options
-     * @param func Label delegate
-     * @param options Define the order and limit the items
-     * @param isJoined Add the join label like 'per Kg' for Kg
-     * @returns Units
-     */
-    export function getRepeatOptions(
-        func: ICultureGet,
-        options?: string[],
-        isJoined: boolean = true
-    ): ListType[] {
-        options ??= DataTypes.getEnumKeys(RepeatOption);
-        isJoined ??= true;
-
-        return getUnits(func, options, isJoined);
-    }
-
     /**
      * Set id value
      * @param item QueryRQ or TiplistRQ or similiar item

package/src/business/Currency.ts

@@ -0,0 +1,20 @@
+/**
+ * Currency array
+ */
+export const Currencies = [
+    'AUD',
+    'CAD',
+    'CNY',
+    'EUR',
+    'GBP',
+    'HKD',
+    'JPY',
+    'NZD',
+    'SGD',
+    'USD'
+] as const;
+
+/**
+ * Currency type
+ */
+export type Currency = typeof Currencies[number];

package/src/erp/AddressApi.ts

@@ -0,0 +1,103 @@
+import { DataTypes } from '@etsoo/shared';
+import { AddressContinent } from '../address/AddressContinent';
+import { AddressRegion, AddressRegionDb } from '../address/AddressRegion';
+import { AddressState } from '../address/AddressState';
+import { IApp } from '../app/IApp';
+import { IdLabelConditional } from '../dto/IdLabelDto';
+
+/**
+ * Address Api
+ */
+export class AddressApi {
+    private languageLabels: Record<string, DataTypes.StringRecord | undefined> =
+        {};
+
+    /**
+     * Constructor
+     * @param app Application
+     */
+    constructor(private app: IApp) {}
+
+    /**
+     * Get address labels
+     * @param language Language
+     * @returns Result
+     */
+    async getLabels(language?: string) {
+        const l = this.app.checkLanguage(language);
+        let labels = this.languageLabels[l];
+        if (labels == null) {
+            labels = await import(`./../i18n/address.${l}.json`);
+
+            // Cache
+            this.languageLabels[l] = labels;
+        }
+        return labels!;
+    }
+
+    /**
+     * Get all continents
+     * @param language Language
+     * @param isNumberKey Is number key or key as id
+     * @returns Continents
+     */
+    async continents<T extends boolean>(
+        language?: string,
+        isNumberKey = <T>false
+    ): Promise<IdLabelConditional<T>> {
+        const labels = await this.getLabels(language);
+        return <IdLabelConditional<T>>DataTypes.getEnumKeys(
+            AddressContinent
+        ).map((key) => ({
+            id: isNumberKey
+                ? <number>DataTypes.getEnumByKey(AddressContinent, key)!
+                : key.toString(),
+            label: labels['continent' + key] ?? key
+        }));
+    }
+
+    /**
+     * Get region list from database
+     * @param language Language
+     * @param isLocal Is local version
+     * @returns Result
+     */
+    async regions<T extends boolean = true>(
+        language?: string,
+        isLocal?: T
+    ): Promise<
+        T extends true | undefined
+            ? AddressRegion[]
+            : AddressRegionDb[] | undefined
+    > {
+        language = this.app.checkLanguage(language);
+        if (isLocal == null || isLocal) {
+            const labels = await this.getLabels(language);
+            return AddressRegion.all.map((region) => {
+                region.label = labels['region' + region.id] as string;
+                return { ...region };
+            });
+        } else {
+            return (await this.app.api.get<AddressRegionDb[]>(
+                `Address/RegionList?language=${language}`,
+                undefined,
+                { defaultValue: [] }
+            )) as any;
+        }
+    }
+
+    /**
+     * Get state list from database
+     * @param regionId Region id
+     * @param language Language
+     * @returns Result
+     */
+    states(regionId: string, language?: string) {
+        language = this.app.checkLanguage(language);
+        return this.app.api.get<AddressState[]>(
+            `Address/StateList?regionId=${regionId}&language=${language}`,
+            undefined,
+            { defaultValue: [] }
+        );
+    }
+}

package/src/erp/OrgApi.ts

@@ -0,0 +1,45 @@
+import { ListType } from '@etsoo/shared';
+import { IApp } from '../app/IApp';
+
+/**
+ * Organization API
+ */
+export class OrgApi {
+    /**
+     * Constructor
+     * @param app Application
+     */
+    constructor(private app: IApp) {}
+
+    /**
+     * Get organization list
+     * @param items Max items
+     * @param serviceId Service id
+     * @returns Result
+     */
+    list(items?: number, serviceId?: number) {
+        return this.app.api.post<ListType[]>(
+            'Organization/List',
+            {
+                items,
+                serviceId
+            },
+            { defaultValue: [], showLoading: false }
+        );
+    }
+
+    /**
+     * Switch organization
+     * @param id Organization id
+     * @param serviceId Service id
+     */
+    async switch(id: number, serviceId?: number) {
+        const result = await this.app.api.put<boolean>('Organization/Switch', {
+            id,
+            serviceId,
+            deviceId: this.app.deviceId
+        });
+        if (result) return await this.app.refreshToken();
+        return result;
+    }
+}