@etsoo/appscript 1.1.0 → 1.1.4

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

@@ -1,4 +1,4 @@
-import { INotifier } from '@etsoo/notificationbase';
+import { INotifier, NotificationCallProps } from '@etsoo/notificationbase';
 import { ApiDataError, IApi, IPData } from '@etsoo/restclient';
 import { DataTypes, DateUtils } from '@etsoo/shared';
 import { AddressRegion } from '../address/AddressRegion';
@@ -14,7 +14,7 @@ export interface IDetectIPCallback {
 /**
  * Core application interface
  */
-export interface ICoreApp<S extends IAppSettings, N> {
+export interface ICoreApp<S extends IAppSettings, N, C extends NotificationCallProps> {
     /**
      * Settings
      */
@@ -26,7 +26,11 @@ export interface ICoreApp<S extends IAppSettings, N> {
     /**
      * Notifier
      */
-    readonly notifier: INotifier<N>;
+    readonly notifier: INotifier<N, C>;
+    /**
+     * Label delegate
+     */
+    readonly labelDelegate: <T extends DataTypes.SimpleType = string>(key: string) => T | undefined;
     /**
      * Culture, like zh-CN
      */
@@ -39,6 +43,10 @@ export interface ICoreApp<S extends IAppSettings, N> {
      * Country or region, like CN
      */
     readonly region: string;
+    /**
+     * Is current authorized
+     */
+    readonly authorized: boolean;
     /**
      * IP data
      */
@@ -145,6 +153,10 @@ export interface ICoreApp<S extends IAppSettings, N> {
      * @returns Transformed url
      */
     transformUrl(url: string): string;
+    /**
+     * Try login, returning false means is loading
+     */
+    tryLogin(): boolean;
     /**
      * User login
      * @param user User data
@@ -160,7 +172,7 @@ export interface ICoreApp<S extends IAppSettings, N> {
 /**
  * Core application
  */
-export declare abstract class CoreApp<S extends IAppSettings, N> implements ICoreApp<S, N> {
+export declare abstract class CoreApp<S extends IAppSettings, N, C extends NotificationCallProps> implements ICoreApp<S, N, C> {
     /**
      * Settings
      */
@@ -172,7 +184,7 @@ export declare abstract class CoreApp<S extends IAppSettings, N> implements ICor
     /**
      * Notifier
      */
-    readonly notifier: INotifier<N>;
+    readonly notifier: INotifier<N, C>;
     private _culture;
     /**
      * Culture, like zh-CN
@@ -188,6 +200,10 @@ export declare abstract class CoreApp<S extends IAppSettings, N> implements ICor
      * Country or region, like CN
      */
     get region(): string;
+    /**
+     * Label delegate
+     */
+    get labelDelegate(): <T extends DataTypes.SimpleType = string>(key: string) => T | undefined;
     /**
      * IP data
      */
@@ -205,13 +221,20 @@ export declare abstract class CoreApp<S extends IAppSettings, N> implements ICor
      * Search input element
      */
     searchInput?: HTMLInputElement;
+    private _authorized;
+    /**
+     * Is current authorized
+     */
+    get authorized(): boolean;
+    private set authorized(value);
+    private _isTryingLogin;
     /**
      * Protected constructor
      * @param settings Settings
      * @param api API
      * @param notifier Notifier
      */
-    protected constructor(settings: S, api: IApi, notifier: INotifier<N>);
+    protected constructor(settings: S, api: IApi, notifier: INotifier<N, C>);
     /**
      * Alert action result
      * @param result Action result
@@ -318,9 +341,9 @@ export declare abstract class CoreApp<S extends IAppSettings, N> implements ICor
      */
     transformUrl(url: string): string;
     /**
-     * Try login
+     * Try login, returning false means is loading
      */
-    abstract tryLogin(): void;
+    tryLogin(): boolean;
     /**
      * User login
      * @param user User data

package/lib/cjs/app/CoreApp.js

@@ -19,6 +19,8 @@ class CoreApp {
          * Response token header field name
          */
         this.headerTokenField = 'SmartERPRefreshToken';
+        this._authorized = false;
+        this._isTryingLogin = false;
         // onRequest, show loading or not, rewrite the property to override default action
         api.onRequest = (data) => {
             if (data.showLoading == null || data.showLoading) {
@@ -73,6 +75,21 @@ class CoreApp {
     get region() {
         return this._region;
     }
+    /**
+     * Label delegate
+     */
+    get labelDelegate() {
+        return this.get.bind(this);
+    }
+    /**
+     * Is current authorized
+     */
+    get authorized() {
+        return this._authorized;
+    }
+    set authorized(value) {
+        this._authorized = value;
+    }
     /**
      * Alert action result
      * @param result Action result
@@ -87,10 +104,15 @@ class CoreApp {
      * @param keep Keep in local storage or not
      */
     authorize(token, refreshToken, keep = false) {
+        // State, when token is null, means logout
+        this.authorized = token != null;
+        // Token
         this.api.authorize(this.settings.authScheme, token);
         // Cover the current value
         shared_1.StorageUtils.setLocalData(this.headerTokenField, keep ? refreshToken : undefined);
         shared_1.StorageUtils.setSessionData(this.headerTokenField, keep ? undefined : refreshToken);
+        // Reset tryLogin state
+        this._isTryingLogin = false;
     }
     /**
      * Change country or region
@@ -195,7 +217,7 @@ class CoreApp {
      * @returns Result
      */
     formatMoney(input, isInteger = false, options) {
-        return shared_1.NumberUtils.formatMoney(input, this.region, this.culture, isInteger, options);
+        return shared_1.NumberUtils.formatMoney(input, this.currency, this.culture, isInteger, options);
     }
     /**
      * Format number
@@ -306,6 +328,15 @@ class CoreApp {
         // To /a/b/../ => /a
         return pathname.endsWith('/') ? pathname + url : pathname + '/' + url;
     }
+    /**
+     * Try login, returning false means is loading
+     */
+    tryLogin() {
+        if (this._isTryingLogin)
+            return false;
+        this._isTryingLogin = true;
+        return true;
+    }
     /**
      * User login
      * @param user User data

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

@@ -1,4 +1,4 @@
-import { INotifier } from '@etsoo/notificationbase';
+import { INotifier, NotificationCallProps } from '@etsoo/notificationbase';
 import { ApiDataError, IApi, IPData } from '@etsoo/restclient';
 import { DataTypes, DateUtils } from '@etsoo/shared';
 import { AddressRegion } from '../address/AddressRegion';
@@ -14,7 +14,7 @@ export interface IDetectIPCallback {
 /**
  * Core application interface
  */
-export interface ICoreApp<S extends IAppSettings, N> {
+export interface ICoreApp<S extends IAppSettings, N, C extends NotificationCallProps> {
     /**
      * Settings
      */
@@ -26,7 +26,11 @@ export interface ICoreApp<S extends IAppSettings, N> {
     /**
      * Notifier
      */
-    readonly notifier: INotifier<N>;
+    readonly notifier: INotifier<N, C>;
+    /**
+     * Label delegate
+     */
+    readonly labelDelegate: <T extends DataTypes.SimpleType = string>(key: string) => T | undefined;
     /**
      * Culture, like zh-CN
      */
@@ -39,6 +43,10 @@ export interface ICoreApp<S extends IAppSettings, N> {
      * Country or region, like CN
      */
     readonly region: string;
+    /**
+     * Is current authorized
+     */
+    readonly authorized: boolean;
     /**
      * IP data
      */
@@ -145,6 +153,10 @@ export interface ICoreApp<S extends IAppSettings, N> {
      * @returns Transformed url
      */
     transformUrl(url: string): string;
+    /**
+     * Try login, returning false means is loading
+     */
+    tryLogin(): boolean;
     /**
      * User login
      * @param user User data
@@ -160,7 +172,7 @@ export interface ICoreApp<S extends IAppSettings, N> {
 /**
  * Core application
  */
-export declare abstract class CoreApp<S extends IAppSettings, N> implements ICoreApp<S, N> {
+export declare abstract class CoreApp<S extends IAppSettings, N, C extends NotificationCallProps> implements ICoreApp<S, N, C> {
     /**
      * Settings
      */
@@ -172,7 +184,7 @@ export declare abstract class CoreApp<S extends IAppSettings, N> implements ICor
     /**
      * Notifier
      */
-    readonly notifier: INotifier<N>;
+    readonly notifier: INotifier<N, C>;
     private _culture;
     /**
      * Culture, like zh-CN
@@ -188,6 +200,10 @@ export declare abstract class CoreApp<S extends IAppSettings, N> implements ICor
      * Country or region, like CN
      */
     get region(): string;
+    /**
+     * Label delegate
+     */
+    get labelDelegate(): <T extends DataTypes.SimpleType = string>(key: string) => T | undefined;
     /**
      * IP data
      */
@@ -205,13 +221,20 @@ export declare abstract class CoreApp<S extends IAppSettings, N> implements ICor
      * Search input element
      */
     searchInput?: HTMLInputElement;
+    private _authorized;
+    /**
+     * Is current authorized
+     */
+    get authorized(): boolean;
+    private set authorized(value);
+    private _isTryingLogin;
     /**
      * Protected constructor
      * @param settings Settings
      * @param api API
      * @param notifier Notifier
      */
-    protected constructor(settings: S, api: IApi, notifier: INotifier<N>);
+    protected constructor(settings: S, api: IApi, notifier: INotifier<N, C>);
     /**
      * Alert action result
      * @param result Action result
@@ -318,9 +341,9 @@ export declare abstract class CoreApp<S extends IAppSettings, N> implements ICor
      */
     transformUrl(url: string): string;
     /**
-     * Try login
+     * Try login, returning false means is loading
      */
-    abstract tryLogin(): void;
+    tryLogin(): boolean;
     /**
      * User login
      * @param user User data

package/lib/mjs/app/CoreApp.js

@@ -16,6 +16,8 @@ export class CoreApp {
          * Response token header field name
          */
         this.headerTokenField = 'SmartERPRefreshToken';
+        this._authorized = false;
+        this._isTryingLogin = false;
         // onRequest, show loading or not, rewrite the property to override default action
         api.onRequest = (data) => {
             if (data.showLoading == null || data.showLoading) {
@@ -70,6 +72,21 @@ export class CoreApp {
     get region() {
         return this._region;
     }
+    /**
+     * Label delegate
+     */
+    get labelDelegate() {
+        return this.get.bind(this);
+    }
+    /**
+     * Is current authorized
+     */
+    get authorized() {
+        return this._authorized;
+    }
+    set authorized(value) {
+        this._authorized = value;
+    }
     /**
      * Alert action result
      * @param result Action result
@@ -84,10 +101,15 @@ export class CoreApp {
      * @param keep Keep in local storage or not
      */
     authorize(token, refreshToken, keep = false) {
+        // State, when token is null, means logout
+        this.authorized = token != null;
+        // Token
         this.api.authorize(this.settings.authScheme, token);
         // Cover the current value
         StorageUtils.setLocalData(this.headerTokenField, keep ? refreshToken : undefined);
         StorageUtils.setSessionData(this.headerTokenField, keep ? undefined : refreshToken);
+        // Reset tryLogin state
+        this._isTryingLogin = false;
     }
     /**
      * Change country or region
@@ -192,7 +214,7 @@ export class CoreApp {
      * @returns Result
      */
     formatMoney(input, isInteger = false, options) {
-        return NumberUtils.formatMoney(input, this.region, this.culture, isInteger, options);
+        return NumberUtils.formatMoney(input, this.currency, this.culture, isInteger, options);
     }
     /**
      * Format number
@@ -303,6 +325,15 @@ export class CoreApp {
         // To /a/b/../ => /a
         return pathname.endsWith('/') ? pathname + url : pathname + '/' + url;
     }
+    /**
+     * Try login, returning false means is loading
+     */
+    tryLogin() {
+        if (this._isTryingLogin)
+            return false;
+        this._isTryingLogin = true;
+        return true;
+    }
     /**
      * User login
      * @param user User data

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/appscript",
-    "version": "1.1.0",
+    "version": "1.1.4",
     "description": "Applications shared TypeScript framework",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",
@@ -47,9 +47,9 @@
     },
     "homepage": "https://github.com/ETSOO/NotificationBase#readme",
     "dependencies": {
-        "@etsoo/notificationbase": "^1.0.78",
+        "@etsoo/notificationbase": "^1.0.79",
         "@etsoo/restclient": "^1.0.51",
-        "@etsoo/shared": "^1.0.45"
+        "@etsoo/shared": "^1.0.46"
     },
     "devDependencies": {
         "@babel/cli": "^7.15.7",

package/src/app/CoreApp.ts

@@ -1,4 +1,4 @@
-import { INotifier } from '@etsoo/notificationbase';
+import { INotifier, NotificationCallProps } from '@etsoo/notificationbase';
 import { ApiDataError, IApi, IPData } from '@etsoo/restclient';
 import {
     DataTypes,
@@ -23,7 +23,11 @@ export interface IDetectIPCallback {
 /**
  * Core application interface
  */
-export interface ICoreApp<S extends IAppSettings, N> {
+export interface ICoreApp<
+    S extends IAppSettings,
+    N,
+    C extends NotificationCallProps
+> {
     /**
      * Settings
      */
@@ -37,7 +41,14 @@ export interface ICoreApp<S extends IAppSettings, N> {
     /**
      * Notifier
      */
-    readonly notifier: INotifier<N>;
+    readonly notifier: INotifier<N, C>;
+
+    /**
+     * Label delegate
+     */
+    readonly labelDelegate: <T extends DataTypes.SimpleType = string>(
+        key: string
+    ) => T | undefined;
 
     /**
      * Culture, like zh-CN
@@ -54,6 +65,11 @@ export interface ICoreApp<S extends IAppSettings, N> {
      */
     readonly region: string;
 
+    /**
+     * Is current authorized
+     */
+    readonly authorized: boolean;
+
     /**
      * IP data
      */
@@ -188,6 +204,11 @@ export interface ICoreApp<S extends IAppSettings, N> {
      */
     transformUrl(url: string): string;
 
+    /**
+     * Try login, returning false means is loading
+     */
+    tryLogin(): boolean;
+
     /**
      * User login
      * @param user User data
@@ -205,8 +226,11 @@ export interface ICoreApp<S extends IAppSettings, N> {
 /**
  * Core application
  */
-export abstract class CoreApp<S extends IAppSettings, N>
-    implements ICoreApp<S, N>
+export abstract class CoreApp<
+    S extends IAppSettings,
+    N,
+    C extends NotificationCallProps
+> implements ICoreApp<S, N, C>
 {
     /**
      * Settings
@@ -221,7 +245,7 @@ export abstract class CoreApp<S extends IAppSettings, N>
     /**
      * Notifier
      */
-    readonly notifier: INotifier<N>;
+    readonly notifier: INotifier<N, C>;
 
     private _culture!: string;
     /**
@@ -247,6 +271,13 @@ export abstract class CoreApp<S extends IAppSettings, N>
         return this._region;
     }
 
+    /**
+     * Label delegate
+     */
+    get labelDelegate() {
+        return this.get.bind(this);
+    }
+
     /**
      * IP data
      */
@@ -270,13 +301,27 @@ export abstract class CoreApp<S extends IAppSettings, N>
      */
     searchInput?: HTMLInputElement;
 
+    private _authorized: boolean = false;
+    /**
+     * Is current authorized
+     */
+    get authorized() {
+        return this._authorized;
+    }
+
+    private set authorized(value: boolean) {
+        this._authorized = value;
+    }
+
+    private _isTryingLogin = false;
+
     /**
      * Protected constructor
      * @param settings Settings
      * @param api API
      * @param notifier Notifier
      */
-    protected constructor(settings: S, api: IApi, notifier: INotifier<N>) {
+    protected constructor(settings: S, api: IApi, notifier: INotifier<N, C>) {
         // onRequest, show loading or not, rewrite the property to override default action
         api.onRequest = (data) => {
             if (data.showLoading == null || data.showLoading) {
@@ -334,6 +379,10 @@ export abstract class CoreApp<S extends IAppSettings, N>
      * @param keep Keep in local storage or not
      */
     authorize(token?: string, refreshToken?: string, keep: boolean = false) {
+        // State, when token is null, means logout
+        this.authorized = token != null;
+
+        // Token
         this.api.authorize(this.settings.authScheme, token);
 
         // Cover the current value
@@ -345,6 +394,9 @@ export abstract class CoreApp<S extends IAppSettings, N>
             this.headerTokenField,
             keep ? undefined : refreshToken
         );
+
+        // Reset tryLogin state
+        this._isTryingLogin = false;
     }
 
     /**
@@ -477,7 +529,7 @@ export abstract class CoreApp<S extends IAppSettings, N>
     ) {
         return NumberUtils.formatMoney(
             input,
-            this.region,
+            this.currency,
             this.culture,
             isInteger,
             options
@@ -611,9 +663,13 @@ export abstract class CoreApp<S extends IAppSettings, N>
     }
 
     /**
-     * Try login
+     * Try login, returning false means is loading
      */
-    abstract tryLogin(): void;
+    tryLogin() {
+        if (this._isTryingLogin) return false;
+        this._isTryingLogin = true;
+        return true;
+    }
 
     /**
      * User login