@etsoo/appscript 1.3.2 → 1.3.3

package/README.md

@@ -33,7 +33,6 @@ $ yarn add @etsoo/appscript
 -   AddressRegion - Address or region
 
 #### AddressUtils.ts ####
--   getContinents - Get all continents
 -   getRegion - Get region from regions and detected region and language
 
 ### app - Application related

package/__tests__/app/CoreApp.ts

@@ -8,7 +8,14 @@ import {
 } from '@etsoo/notificationbase';
 import { ApiAuthorizationScheme, createClient } from '@etsoo/restclient';
 import { DataTypes, DomUtils, Utils, WindowStorage } from '@etsoo/shared';
-import { BusinessUtils, IUser, UserRole } from '../../src';
+import {
+    AddressApi,
+    enUS,
+    ExternalSettings,
+    IUser,
+    PublicApi,
+    UserRole
+} from '../../src';
 import { AddressUtils } from '../../src/address/AddressUtils';
 import { IAppSettings } from '../../src/app/AppSettings';
 import { CoreApp } from '../../src/app/CoreApp';
@@ -22,7 +29,7 @@ const { detectedCountry } = DomUtils;
 const { detectedCulture } = DomUtils;
 
 // Supported cultures
-const supportedCultures: DataTypes.CultureDefinition[] = [zhCN({})];
+const supportedCultures: DataTypes.CultureDefinition[] = [zhCN({}), enUS({})];
 
 // Supported regions
 const supportedRegions = ['CN'];
@@ -41,7 +48,7 @@ class NotificationContainerTest extends NotificationContainer<
     protected addRaw(
         data: INotificaseBase<any, NotificationCallProps>
     ): INotification<any, NotificationCallProps> {
-        throw new Error('Method not implemented.');
+        return new NotificationTest(data.type, data.content);
     }
 }
 
@@ -62,7 +69,7 @@ class CoreAppTest extends CoreApp<
      */
     constructor() {
         super(
-            {
+            ExternalSettings.format({
                 /**
                  * Endpoint of the API service
                  */
@@ -105,7 +112,7 @@ class CoreAppTest extends CoreApp<
                     supportedCultures,
                     detectedCulture
                 )!
-            },
+            }),
             createClient(),
             container,
             new WindowStorage(),
@@ -123,7 +130,18 @@ class CoreAppTest extends CoreApp<
     }
 }
 
-const app = new CoreAppTest();
+function EnhanceApp<TBase extends DataTypes.MConstructor<CoreAppTest>>(
+    Base: TBase
+) {
+    return class extends Base {
+        readonly addressApi = new AddressApi(this);
+        readonly publicApi = new PublicApi(this);
+    };
+}
+
+const appClass = EnhanceApp(CoreAppTest);
+const app = new appClass();
+app.changeCulture(app.settings.cultures[0]);
 
 test('Tests for addRootUrl', () => {
     expect(app.addRootUrl('/home')).toBe('/cms/home');
@@ -173,22 +191,42 @@ test('Tests for getRoles', () => {
     expect(roles.map((r) => r.id)).toEqual([8, 128, 8192]);
 });
 
-test('Tests for getUnitLabel', () => {
-    expect(app.getUnitLabel(12, true)).toBe('每年');
-});
-
 test('Tests for isValidPassword', () => {
     expect(app.isValidPassword('12345678')).toBeFalsy();
     expect(app.isValidPassword('abcd3')).toBeFalsy();
     expect(app.isValidPassword('1234abcd')).toBeTruthy();
 });
 
-test('Tests for getRepeatOptions', () => {
-    const options = BusinessUtils.getRepeatOptions(app.labelDelegate, [
-        'MONTH',
-        'QUATER',
-        'YEAR'
-    ]);
+test('Tests for addressApi', async () => {
+    const continents = await app.addressApi.continents();
+    expect(continents.length).toBe(7);
+
+    const labels = await app.addressApi.getLabels('en-NZ');
+    expect(labels['regionHK']).toBe('Hong Kong, China');
+
+    const regions = await app.addressApi.regions('zh-CN');
+    const cn = regions.find((r) => r.id === 'CN');
+    expect(cn?.label).toBe('中国大陆');
+});
+
+test('Tests for publicApi', async () => {
+    expect(app.publicApi.getUnitLabel(12, true)).toBe('每年');
 
+    const options = app.publicApi.repeatOptions(['MONTH', 'QUATER', 'YEAR']);
     expect(options[2]).toStrictEqual({ id: 12, label: '每年' });
+
+    const currencies = await app.publicApi.currencies(['NZD', 'AUD', 'USD']);
+    expect(currencies[1].id).toBe('AUD');
+
+    //const currenciesRemote = await app.publicApi.currencies();
+    //console.log(currenciesRemote);
+
+    //const history = await app.publicApi.exchangeRateHistory(['NZD', 'AUD'], 24);
+    //console.log(history);
+
+    //const qrcode = await app.publicApi.mobileQRCode('xz@etsoo.com');
+    //console.log(qrcode);
+
+    //const exchangeRate = await app.publicApi.exchangeRate('USD');
+    //console.log(exchangeRate);
 });

package/lib/cjs/address/AddressContinent.d.ts

@@ -1,5 +1,5 @@
 /**
- * Continent
+ * Address continent
  */
 export declare enum AddressContinent {
     AF = 1,
@@ -10,3 +10,7 @@ export declare enum AddressContinent {
     OC = 6,
     SA = 7
 }
+/**
+ * Address continent ids
+ */
+export declare type AddressContinentId = keyof typeof AddressContinent;

package/lib/cjs/address/AddressContinent.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AddressContinent = void 0;
 /**
- * Continent
+ * Address continent
  */
 var AddressContinent;
 (function (AddressContinent) {

package/lib/cjs/address/AddressRegion.d.ts

@@ -1,8 +1,9 @@
-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
@@ -20,10 +21,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
      * 国际拨号的电话退出代码
@@ -38,17 +39,27 @@ export interface IAddressRegion {
      * Currency, like CNY for China's currency
      * 币种
      */
-    readonly currency: string;
+    readonly currency: Currency;
+    /**
+     * Name
+     * 名称
+     */
+    label: string;
+}
+/**
+ * Country or region interface
+ */
+export interface IAddressRegion extends AddressRegionDb {
+    /**
+     * Continent
+     * 洲
+     */
+    readonly continent: AddressContinent;
     /**
      * Languages
      * 语言
      */
     readonly languages: string[];
-    /**
-     * Name
-     * 名称
-     */
-    name: string;
 }
 /**
  * Address or region
@@ -60,9 +71,9 @@ export declare class AddressRegion implements IAddressRegion {
     continent: AddressContinent;
     exitCode: string;
     idd: string;
-    currency: string;
+    currency: Currency;
     languages: string[];
-    name: string;
+    label: string;
     /**
      * CN - China
      */
@@ -131,5 +142,10 @@ export declare class AddressRegion implements IAddressRegion {
      * @param id Country id
      */
     static getById(id: string): AddressRegion | undefined;
-    constructor(id: string, id3: string, nid: string, continent: AddressContinent, exitCode: string, idd: string, currency: string, languages: string[], name?: string);
+    /**
+     * Continent id
+     * 洲编号
+     */
+    readonly continentId: AddressContinentId;
+    constructor(id: string, id3: string, nid: string, continent: AddressContinent, exitCode: string, idd: string, currency: Currency, languages: string[], label?: string);
 }

package/lib/cjs/address/AddressRegion.js

@@ -7,7 +7,7 @@ const AddressContinent_1 = require("./AddressContinent");
  */
 class AddressRegion {
     // Typescript constructor shorthand
-    constructor(id, id3, nid, continent, exitCode, idd, currency, languages, name = id) {
+    constructor(id, id3, nid, continent, exitCode, idd, currency, languages, label = id) {
         this.id = id;
         this.id3 = id3;
         this.nid = nid;
@@ -16,7 +16,8 @@ class AddressRegion {
         this.idd = idd;
         this.currency = currency;
         this.languages = languages;
-        this.name = name;
+        this.label = label;
+        this.continentId = AddressContinent_1.AddressContinent[continent];
     }
     /**
      * Get country or region by id

package/lib/cjs/address/AddressState.d.ts

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

package/lib/cjs/address/AddressState.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/cjs/address/AddressUtils.d.ts

@@ -1,17 +1,8 @@
-import { AddressRegion } from '..';
-import { IdLabelConditional } from '../dto/IdLabelDto';
-import { ICultureGet } from '../state/Culture';
+import { AddressRegion } from './AddressRegion';
 /**
  * Address utils
  */
 export declare namespace AddressUtils {
-    /**
-     * Get all continents
-     * @param func Label delegate
-     * @param isNumberKey Is number key or key as id
-     * @returns Continents
-     */
-    function getContinents<T extends boolean>(func: ICultureGet, isNumberKey?: T): IdLabelConditional<T>;
     /**
      * Get region from regions and detected region and language
      * @param regions Supported regions
@@ -19,11 +10,4 @@ export declare namespace AddressUtils {
      * @param detectedLanguage Detected language
      */
     function getRegion(regions: string[], detectedRegion?: string | null, detectedLanguage?: string | null): AddressRegion;
-    /**
-     * Get region label
-     * @param region Region id
-     * @param func Label delegate
-     * @returns Label
-     */
-    function getRegionLabel(region: string, func: ICultureGet): string;
 }

package/lib/cjs/address/AddressUtils.js

@@ -1,32 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AddressUtils = void 0;
-const shared_1 = require("@etsoo/shared");
-const __1 = require("..");
-const AddressContinent_1 = require("./AddressContinent");
+const AddressRegion_1 = require("./AddressRegion");
 /**
  * Address utils
  */
 var AddressUtils;
 (function (AddressUtils) {
-    /**
-     * Get all continents
-     * @param func Label delegate
-     * @param isNumberKey Is number key or key as id
-     * @returns Continents
-     */
-    function getContinents(func, isNumberKey = false) {
-        return shared_1.DataTypes.getEnumKeys(AddressContinent_1.AddressContinent).map((key) => {
-            var _a;
-            return ({
-                id: isNumberKey
-                    ? shared_1.DataTypes.getEnumByKey(AddressContinent_1.AddressContinent, key)
-                    : key.toString(),
-                label: (_a = func('continent' + key)) !== null && _a !== void 0 ? _a : key
-            });
-        });
-    }
-    AddressUtils.getContinents = getContinents;
     /**
      * Get region from regions and detected region and language
      * @param regions Supported regions
@@ -36,31 +16,20 @@ var AddressUtils;
     function getRegion(regions, detectedRegion, detectedLanguage) {
         // Exactly match
         if (detectedRegion && regions.includes(detectedRegion)) {
-            const region = __1.AddressRegion.getById(detectedRegion);
+            const region = AddressRegion_1.AddressRegion.getById(detectedRegion);
             if (region)
                 return region;
         }
         // Match with language
         if (detectedLanguage) {
             const region = regions
-                .map((id) => __1.AddressRegion.getById(id))
+                .map((id) => AddressRegion_1.AddressRegion.getById(id))
                 .find((item) => item.languages.includes(detectedLanguage));
             if (region)
                 region;
         }
         // Default
-        return __1.AddressRegion.getById(regions[0]);
+        return AddressRegion_1.AddressRegion.getById(regions[0]);
     }
     AddressUtils.getRegion = getRegion;
-    /**
-     * Get region label
-     * @param region Region id
-     * @param func Label delegate
-     * @returns Label
-     */
-    function getRegionLabel(region, func) {
-        var _a;
-        return (_a = func('region' + region)) !== null && _a !== void 0 ? _a : region;
-    }
-    AddressUtils.getRegionLabel = getRegionLabel;
 })(AddressUtils = exports.AddressUtils || (exports.AddressUtils = {}));

package/lib/cjs/app/CoreApp.d.ts

@@ -2,7 +2,6 @@ import { INotifier, NotificationAlign, NotificationCallProps, NotificationConten
 import { ApiDataError, IApi, IPData } from '@etsoo/restclient';
 import { DataTypes, DateUtils, IStorage, ListType, ListType1 } from '@etsoo/shared';
 import { AddressRegion } from '../address/AddressRegion';
-import { ProductUnit } from '../business/ProductUnit';
 import { InitCallDto } from '../dto/InitCallDto';
 import { IActionResult } from '../result/IActionResult';
 import { InitCallResult, InitCallResultData } from '../result/InitCallResult';
@@ -40,9 +39,9 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      */
     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
      */
@@ -217,6 +216,12 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @param culture New culture definition
      */
     changeCulture(culture: DataTypes.CultureDefinition): void;
+    /**
+     * Check language is supported or not, return a valid language when supported
+     * @param language Language
+     * @returns Result
+     */
+    checkLanguage(language?: string): string;
     /**
      * Clear cache data
      */
@@ -386,12 +391,6 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @returns Time zone
      */
     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/
@@ -447,19 +446,6 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @param apiUrl Signout API URL
      */
     signout(): Promise<void>;
-    /**
-     * Get organization list
-     * @param items Max items
-     * @param serviceId Service id
-     * @returns Result
-     */
-    orgList(items?: number, serviceId?: number): Promise<ListType[] | undefined>;
-    /**
-     * 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/lib/cjs/app/CoreApp.js

@@ -6,9 +6,7 @@ const restclient_1 = require("@etsoo/restclient");
 const shared_1 = require("@etsoo/shared");
 const crypto_js_1 = require("crypto-js");
 const AddressRegion_1 = require("../address/AddressRegion");
-const AddressUtils_1 = require("../address/AddressUtils");
 const BridgeUtils_1 = require("../bridges/BridgeUtils");
-const BusinessUtils_1 = require("../business/BusinessUtils");
 const EntityStatus_1 = require("../business/EntityStatus");
 const ActionResultError_1 = require("../result/ActionResultError");
 const IApp_1 = require("./IApp");
@@ -240,6 +238,8 @@ class CoreApp {
      * @param api Api
      */
     setApi(api) {
+        // 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) {
@@ -507,12 +507,20 @@ class CoreApp {
         this._culture = name;
         // Hold the current resources
         this.settings.currentCulture = culture;
-        // Update all supported regions' name
-        this.settings.regions.forEach((id) => {
-            const region = AddressRegion_1.AddressRegion.getById(id);
-            if (region)
-                region.name = AddressUtils_1.AddressUtils.getRegionLabel(id, this.labelDelegate);
-        });
+    }
+    /**
+     * Check language is supported or not, return a valid language when supported
+     * @param language Language
+     * @returns Result
+     */
+    checkLanguage(language) {
+        if (language) {
+            const item = this.settings.cultures.find((c) => { var _a; return c.name === language || ((_a = c.compatibleName) === null || _a === void 0 ? void 0 : _a.includes(language)); });
+            if (item)
+                return item.name;
+        }
+        // Default language
+        return this.culture;
     }
     /**
      * Clear cache data
@@ -941,16 +949,6 @@ class CoreApp {
         // settings.timeZone = Utils.getTimeZone()
         return (_a = this.settings.timeZone) !== null && _a !== void 0 ? _a : (_b = this.ipData) === null || _b === void 0 ? void 0 : _b.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, isJoined) {
-        if (unit == null)
-            return '';
-        return BusinessUtils_1.BusinessUtils.getUnitLabel(unit, this.labelDelegate, isJoined);
-    }
     /**
      * Hash message, SHA3 or HmacSHA512, 512 as Base64
      * https://cryptojs.gitbook.io/docs/
@@ -1089,34 +1087,6 @@ class CoreApp {
         // Go to login page
         this.toLoginPage();
     }
-    /**
-     * Get organization list
-     * @param items Max items
-     * @param serviceId Service id
-     * @returns Result
-     */
-    async orgList(items, serviceId) {
-        return await this.api.post('Organization/List', {
-            items,
-            serviceId
-        }, { defaultValue: [], showLoading: false });
-    }
-    /**
-     * Switch organization
-     * @param id Organization id
-     * @param serviceId Service id
-     */
-    async switchOrg(id, serviceId) {
-        const api = `Organization/Switch`;
-        const result = await this.api.put(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/lib/cjs/app/ExternalSettings.d.ts

@@ -31,4 +31,5 @@ export declare namespace ExternalSettings {
      * Create instance
      */
     function Create(): IExternalSettings | undefined;
+    function format(settings: any, hostname?: string): any;
 }

package/lib/cjs/app/ExternalSettings.js

@@ -15,17 +15,9 @@ var 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;
             }
@@ -33,4 +25,18 @@ var ExternalSettings;
         return undefined;
     }
     ExternalSettings.Create = Create;
+    function format(settings, hostname) {
+        // 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;
+    }
+    ExternalSettings.format = format;
 })(ExternalSettings = exports.ExternalSettings || (exports.ExternalSettings = {}));

package/lib/cjs/app/IApp.d.ts

@@ -1,8 +1,7 @@
 import { INotifier, NotificationAlign, NotificationCallProps, NotificationContent, NotificationReturn } from '@etsoo/notificationbase';
-import { ApiDataError, IPData } from '@etsoo/restclient';
+import { ApiDataError, IApi, IPData } from '@etsoo/restclient';
 import { DataTypes, DateUtils, IStorage, ListType } from '@etsoo/shared';
 import { AddressRegion } from '../address/AddressRegion';
-import { ProductUnit } from '../business/ProductUnit';
 import { IActionResult } from '../result/IActionResult';
 import { IUser } from '../state/User';
 import { IAppSettings } from './AppSettings';
@@ -69,6 +68,10 @@ export interface IApp {
      * Fields
      */
     readonly fields: IAppFields;
+    /**
+     * API, not recommend to use it directly in code, wrap to separate methods
+     */
+    readonly api: IApi;
     /**
      * Notifier
      */
@@ -159,6 +162,12 @@ export interface IApp {
      * @returns true means device is invalid
      */
     checkDeviceResult(result: IActionResult): boolean;
+    /**
+     * Check language is supported or not
+     * @param language Language
+     * @returns Result
+     */
+    checkLanguage(language?: string): string;
     /**
      * Clear cache data
      */
@@ -306,12 +315,6 @@ export interface IApp {
      * @returns Time zone
      */
     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/
@@ -363,23 +366,10 @@ export interface IApp {
      * Signout
      */
     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