@etsoo/appscript 1.1.55 → 1.1.59

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

@@ -22,14 +22,22 @@ export declare type RefreshTokenResult = boolean | string | ApiDataError | IActi
  * Refresh token props
  */
 export interface RefreshTokenProps<D extends {}> {
+    /**
+     * Callback
+     */
+    callback?: (result: RefreshTokenResult) => void;
     /**
      * Data to pass
      */
     data?: D;
     /**
-     * Callback
+     * Support relogin or not
      */
-    callback?: (result: RefreshTokenResult) => void;
+    relogin?: boolean;
+    /**
+     * Show loading bar or not
+     */
+    showLoading?: boolean;
 }
 /**
  * Core application interface
@@ -118,6 +126,12 @@ export interface ICoreApp<S extends IAppSettings, N, C extends NotificationCallP
      * @returns string
      */
     formatDate(input?: Date | string, options?: DateUtils.FormatOptions, timeZone?: string): string | undefined;
+    /**
+     * Format error
+     * @param error Error
+     * @returns Error message
+     */
+    formatError(error: ApiDataError): string;
     /**
      * Format money number
      * @param input Input money number
@@ -133,6 +147,12 @@ export interface ICoreApp<S extends IAppSettings, N, C extends NotificationCallP
      * @returns Result
      */
     formatNumber(input?: number | bigint, options?: Intl.NumberFormatOptions): string | undefined;
+    /**
+     * Format refresh token result
+     * @param result Refresh token result
+     * @returns Message
+     */
+    formatRefreshTokenResult(result: RefreshTokenResult): string | undefined;
     /**
      * Format result text
      * @param result Action result
@@ -215,8 +235,10 @@ export interface ICoreApp<S extends IAppSettings, N, C extends NotificationCallP
     transformUrl(url: string): string;
     /**
      * Try login, returning false means is loading
+     * UI get involved while refreshToken not intended
+     * @param data Additional request data
      */
-    tryLogin(): Promise<boolean>;
+    tryLogin<D extends {} = {}>(data?: D): Promise<boolean>;
     /**
      * User login
      * @param user User data
@@ -377,6 +399,12 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      * @returns Error message
      */
     formatError(error: ApiDataError): string;
+    /**
+     * Format refresh token result
+     * @param result Refresh token result
+     * @returns Message
+     */
+    formatRefreshTokenResult(result: RefreshTokenResult): string | undefined;
     /**
      * Format result text
      * @param result Action result
@@ -440,7 +468,7 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
     abstract freshCountdownUI(callback?: () => PromiseLike<unknown>): void;
     /**
      * Refresh token
-     * @param callback Callback
+     * @param props Props
      */
     refreshToken<D extends {} = {}>(props?: RefreshTokenProps<D>): Promise<boolean>;
     /**
@@ -470,8 +498,9 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
     /**
      * Try login, returning false means is loading
      * UI get involved while refreshToken not intended
+     * @param data Additional request data
      */
-    tryLogin(): Promise<boolean>;
+    tryLogin<D extends {} = {}>(_data?: D): Promise<boolean>;
     /**
      * User login
      * @param user User data

package/lib/cjs/app/CoreApp.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CoreApp = void 0;
 const notificationbase_1 = require("@etsoo/notificationbase");
+const restclient_1 = require("@etsoo/restclient");
 const shared_1 = require("@etsoo/shared");
 const AddressRegion_1 = require("../address/AddressRegion");
 const AddressUtils_1 = require("../address/AddressUtils");
@@ -266,6 +267,21 @@ class CoreApp {
     formatError(error) {
         return error.toString();
     }
+    /**
+     * Format refresh token result
+     * @param result Refresh token result
+     * @returns Message
+     */
+    formatRefreshTokenResult(result) {
+        // Undefined for boolean
+        if (typeof result === 'boolean')
+            return undefined;
+        return result instanceof restclient_1.ApiDataError
+            ? this.formatError(result)
+            : typeof result !== 'string'
+                ? ActionResultError_1.ActionResultError.format(result)
+                : result;
+    }
     /**
      * Format result text
      * @param result Action result
@@ -399,7 +415,7 @@ class CoreApp {
     }
     /**
      * Refresh token
-     * @param callback Callback
+     * @param props Props
      */
     async refreshToken(props) {
         if (props && props.callback)
@@ -471,8 +487,9 @@ class CoreApp {
     /**
      * Try login, returning false means is loading
      * UI get involved while refreshToken not intended
+     * @param data Additional request data
      */
-    async tryLogin() {
+    async tryLogin(_data) {
         if (this._isTryingLogin)
             return false;
         this._isTryingLogin = true;

package/lib/cjs/i18n/en-US.json

@@ -22,6 +22,7 @@
     "failed": "Operation failed",
     "id": "Number#",
     "loading": "Loading...",
+    "login": "Login",
     "menuHome": "Home",
     "message": "Message",
     "mobile": "Mobile number",
@@ -42,6 +43,7 @@
     "refresh": "Refresh",
     "refreshing": "Refreshing",
     "releaseToRefresh": "Release to refresh",
+    "reloginTip": "Please enter your password, resubmit the data after successful login",
     "remove": "Remove",
     "renew": "Renew",
     "resending": "Resending",

package/lib/cjs/i18n/zh-CN.json

@@ -22,6 +22,7 @@
     "failed": "操作失败",
     "id": "编号",
     "loading": "正在加载...",
+    "login": "登录",
     "menuHome": "首页",
     "message": "留言",
     "mobile": "手机号码",
@@ -42,6 +43,7 @@
     "refresh": "刷新",
     "refreshing": "正在刷新",
     "releaseToRefresh": "释放刷新",
+    "reloginTip": "请输入您的登录密码，登录成功后请重新提交数据",
     "remove": "移除",
     "renew": "续费",
     "resending": "重新发送",

package/lib/cjs/i18n/zh-HK.json

@@ -22,6 +22,7 @@
     "failed": "操作失敗",
     "id": "編號",
     "loading": "正在加載...",
+    "login": "登錄",
     "menuHome": "首頁",
     "message": "留言",
     "mobilePhone": "手機號碼",
@@ -42,6 +43,7 @@
     "refresh": "刷新",
     "refreshing": "正在刷新",
     "releaseToRefresh": "釋放刷新",
+    "reloginTip": "請輸入您的登錄密碼，登錄成功後請重新提交數據",
     "remove": "移除",
     "renew": "續費",
     "resending": "重新發送",

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

@@ -22,14 +22,22 @@ export declare type RefreshTokenResult = boolean | string | ApiDataError | IActi
  * Refresh token props
  */
 export interface RefreshTokenProps<D extends {}> {
+    /**
+     * Callback
+     */
+    callback?: (result: RefreshTokenResult) => void;
     /**
      * Data to pass
      */
     data?: D;
     /**
-     * Callback
+     * Support relogin or not
      */
-    callback?: (result: RefreshTokenResult) => void;
+    relogin?: boolean;
+    /**
+     * Show loading bar or not
+     */
+    showLoading?: boolean;
 }
 /**
  * Core application interface
@@ -118,6 +126,12 @@ export interface ICoreApp<S extends IAppSettings, N, C extends NotificationCallP
      * @returns string
      */
     formatDate(input?: Date | string, options?: DateUtils.FormatOptions, timeZone?: string): string | undefined;
+    /**
+     * Format error
+     * @param error Error
+     * @returns Error message
+     */
+    formatError(error: ApiDataError): string;
     /**
      * Format money number
      * @param input Input money number
@@ -133,6 +147,12 @@ export interface ICoreApp<S extends IAppSettings, N, C extends NotificationCallP
      * @returns Result
      */
     formatNumber(input?: number | bigint, options?: Intl.NumberFormatOptions): string | undefined;
+    /**
+     * Format refresh token result
+     * @param result Refresh token result
+     * @returns Message
+     */
+    formatRefreshTokenResult(result: RefreshTokenResult): string | undefined;
     /**
      * Format result text
      * @param result Action result
@@ -215,8 +235,10 @@ export interface ICoreApp<S extends IAppSettings, N, C extends NotificationCallP
     transformUrl(url: string): string;
     /**
      * Try login, returning false means is loading
+     * UI get involved while refreshToken not intended
+     * @param data Additional request data
      */
-    tryLogin(): Promise<boolean>;
+    tryLogin<D extends {} = {}>(data?: D): Promise<boolean>;
     /**
      * User login
      * @param user User data
@@ -377,6 +399,12 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      * @returns Error message
      */
     formatError(error: ApiDataError): string;
+    /**
+     * Format refresh token result
+     * @param result Refresh token result
+     * @returns Message
+     */
+    formatRefreshTokenResult(result: RefreshTokenResult): string | undefined;
     /**
      * Format result text
      * @param result Action result
@@ -440,7 +468,7 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
     abstract freshCountdownUI(callback?: () => PromiseLike<unknown>): void;
     /**
      * Refresh token
-     * @param callback Callback
+     * @param props Props
      */
     refreshToken<D extends {} = {}>(props?: RefreshTokenProps<D>): Promise<boolean>;
     /**
@@ -470,8 +498,9 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
     /**
      * Try login, returning false means is loading
      * UI get involved while refreshToken not intended
+     * @param data Additional request data
      */
-    tryLogin(): Promise<boolean>;
+    tryLogin<D extends {} = {}>(_data?: D): Promise<boolean>;
     /**
      * User login
      * @param user User data

package/lib/mjs/app/CoreApp.js

@@ -1,4 +1,5 @@
 import { NotificationAlign, NotificationMessageType } from '@etsoo/notificationbase';
+import { ApiDataError } from '@etsoo/restclient';
 import { DateUtils, DomUtils, NumberUtils, StorageUtils } from '@etsoo/shared';
 import { AddressRegion } from '../address/AddressRegion';
 import { AddressUtils } from '../address/AddressUtils';
@@ -263,6 +264,21 @@ export class CoreApp {
     formatError(error) {
         return error.toString();
     }
+    /**
+     * Format refresh token result
+     * @param result Refresh token result
+     * @returns Message
+     */
+    formatRefreshTokenResult(result) {
+        // Undefined for boolean
+        if (typeof result === 'boolean')
+            return undefined;
+        return result instanceof ApiDataError
+            ? this.formatError(result)
+            : typeof result !== 'string'
+                ? ActionResultError.format(result)
+                : result;
+    }
     /**
      * Format result text
      * @param result Action result
@@ -396,7 +412,7 @@ export class CoreApp {
     }
     /**
      * Refresh token
-     * @param callback Callback
+     * @param props Props
      */
     async refreshToken(props) {
         if (props && props.callback)
@@ -468,8 +484,9 @@ export class CoreApp {
     /**
      * Try login, returning false means is loading
      * UI get involved while refreshToken not intended
+     * @param data Additional request data
      */
-    async tryLogin() {
+    async tryLogin(_data) {
         if (this._isTryingLogin)
             return false;
         this._isTryingLogin = true;

package/lib/mjs/i18n/en-US.json

@@ -22,6 +22,7 @@
     "failed": "Operation failed",
     "id": "Number#",
     "loading": "Loading...",
+    "login": "Login",
     "menuHome": "Home",
     "message": "Message",
     "mobile": "Mobile number",
@@ -42,6 +43,7 @@
     "refresh": "Refresh",
     "refreshing": "Refreshing",
     "releaseToRefresh": "Release to refresh",
+    "reloginTip": "Please enter your password, resubmit the data after successful login",
     "remove": "Remove",
     "renew": "Renew",
     "resending": "Resending",

package/lib/mjs/i18n/zh-CN.json

@@ -22,6 +22,7 @@
     "failed": "操作失败",
     "id": "编号",
     "loading": "正在加载...",
+    "login": "登录",
     "menuHome": "首页",
     "message": "留言",
     "mobile": "手机号码",
@@ -42,6 +43,7 @@
     "refresh": "刷新",
     "refreshing": "正在刷新",
     "releaseToRefresh": "释放刷新",
+    "reloginTip": "请输入您的登录密码，登录成功后请重新提交数据",
     "remove": "移除",
     "renew": "续费",
     "resending": "重新发送",

package/lib/mjs/i18n/zh-HK.json

@@ -22,6 +22,7 @@
     "failed": "操作失敗",
     "id": "編號",
     "loading": "正在加載...",
+    "login": "登錄",
     "menuHome": "首頁",
     "message": "留言",
     "mobilePhone": "手機號碼",
@@ -42,6 +43,7 @@
     "refresh": "刷新",
     "refreshing": "正在刷新",
     "releaseToRefresh": "釋放刷新",
+    "reloginTip": "請輸入您的登錄密碼，登錄成功後請重新提交數據",
     "remove": "移除",
     "renew": "續費",
     "resending": "重新發送",

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/appscript",
-    "version": "1.1.55",
+    "version": "1.1.59",
     "description": "Applications shared TypeScript framework",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",

package/src/app/CoreApp.ts

@@ -44,15 +44,25 @@ export type RefreshTokenResult =
  * Refresh token props
  */
 export interface RefreshTokenProps<D extends {}> {
+    /**
+     * Callback
+     */
+    callback?: (result: RefreshTokenResult) => void;
+
     /**
      * Data to pass
      */
     data?: D;
 
     /**
-     * Callback
+     * Support relogin or not
      */
-    callback?: (result: RefreshTokenResult) => void;
+    relogin?: boolean;
+
+    /**
+     * Show loading bar or not
+     */
+    showLoading?: boolean;
 }
 
 /**
@@ -168,6 +178,13 @@ export interface ICoreApp<
         timeZone?: string
     ): string | undefined;
 
+    /**
+     * Format error
+     * @param error Error
+     * @returns Error message
+     */
+    formatError(error: ApiDataError): string;
+
     /**
      * Format money number
      * @param input Input money number
@@ -192,6 +209,13 @@ export interface ICoreApp<
         options?: Intl.NumberFormatOptions
     ): string | undefined;
 
+    /**
+     * Format refresh token result
+     * @param result Refresh token result
+     * @returns Message
+     */
+    formatRefreshTokenResult(result: RefreshTokenResult): string | undefined;
+
     /**
      * Format result text
      * @param result Action result
@@ -289,8 +313,10 @@ export interface ICoreApp<
 
     /**
      * Try login, returning false means is loading
+     * UI get involved while refreshToken not intended
+     * @param data Additional request data
      */
-    tryLogin(): Promise<boolean>;
+    tryLogin<D extends {} = {}>(data?: D): Promise<boolean>;
 
     /**
      * User login
@@ -696,6 +722,22 @@ export abstract class CoreApp<
         return error.toString();
     }
 
+    /**
+     * Format refresh token result
+     * @param result Refresh token result
+     * @returns Message
+     */
+    formatRefreshTokenResult(result: RefreshTokenResult) {
+        // Undefined for boolean
+        if (typeof result === 'boolean') return undefined;
+
+        return result instanceof ApiDataError
+            ? this.formatError(result)
+            : typeof result !== 'string'
+            ? ActionResultError.format(result)
+            : result;
+    }
+
     /**
      * Format result text
      * @param result Action result
@@ -852,7 +894,7 @@ export abstract class CoreApp<
 
     /**
      * Refresh token
-     * @param callback Callback
+     * @param props Props
      */
     async refreshToken<D extends {} = {}>(props?: RefreshTokenProps<D>) {
         if (props && props.callback) props.callback(true);
@@ -933,8 +975,9 @@ export abstract class CoreApp<
     /**
      * Try login, returning false means is loading
      * UI get involved while refreshToken not intended
+     * @param data Additional request data
      */
-    async tryLogin() {
+    async tryLogin<D extends {} = {}>(_data?: D) {
         if (this._isTryingLogin) return false;
         this._isTryingLogin = true;
         return true;

package/src/i18n/en-US.json

@@ -22,6 +22,7 @@
     "failed": "Operation failed",
     "id": "Number#",
     "loading": "Loading...",
+    "login": "Login",
     "menuHome": "Home",
     "message": "Message",
     "mobile": "Mobile number",
@@ -42,6 +43,7 @@
     "refresh": "Refresh",
     "refreshing": "Refreshing",
     "releaseToRefresh": "Release to refresh",
+    "reloginTip": "Please enter your password, resubmit the data after successful login",
     "remove": "Remove",
     "renew": "Renew",
     "resending": "Resending",

package/src/i18n/zh-CN.json

@@ -22,6 +22,7 @@
     "failed": "操作失败",
     "id": "编号",
     "loading": "正在加载...",
+    "login": "登录",
     "menuHome": "首页",
     "message": "留言",
     "mobile": "手机号码",
@@ -42,6 +43,7 @@
     "refresh": "刷新",
     "refreshing": "正在刷新",
     "releaseToRefresh": "释放刷新",
+    "reloginTip": "请输入您的登录密码，登录成功后请重新提交数据",
     "remove": "移除",
     "renew": "续费",
     "resending": "重新发送",

package/src/i18n/zh-HK.json

@@ -22,6 +22,7 @@
     "failed": "操作失敗",
     "id": "編號",
     "loading": "正在加載...",
+    "login": "登錄",
     "menuHome": "首頁",
     "message": "留言",
     "mobilePhone": "手機號碼",
@@ -42,6 +43,7 @@
     "refresh": "刷新",
     "refreshing": "正在刷新",
     "releaseToRefresh": "釋放刷新",
+    "reloginTip": "請輸入您的登錄密碼，登錄成功後請重新提交數據",
     "remove": "移除",
     "renew": "續費",
     "resending": "重新發送",