@etsoo/appscript 1.2.45 → 1.2.49

package/lib/mjs/app/CoreApp.js

@@ -6,6 +6,16 @@ import { AddressRegion } from '../address/AddressRegion';
 import { AddressUtils } from '../address/AddressUtils';
 import { BusinessUtils } from '../business/BusinessUtils';
 import { ActionResultError } from '../result/ActionResultError';
+/**
+ * App fields
+ */
+const appFields = [
+    'headerToken',
+    'serversideDeviceId',
+    'deviceId',
+    'devices',
+    'devicePassphrase'
+];
 /**
  * Core application
  */
@@ -42,8 +52,10 @@ export class CoreApp {
         this.notifier = notifier;
         this.storage = storage;
         this.name = name;
+        // Fields, attach with the name identifier
+        this.fields = appFields.reduce((a, v) => ({ ...a, [v]: 'smarterp-' + v + '-' + name }), {});
         // Device id
-        this._deviceId = storage.getData(CoreApp.deviceIdField, '');
+        this._deviceId = storage.getData(this.fields.deviceId, '');
         // Restore
         this.restore();
         this.setApi(api);
@@ -115,10 +127,10 @@ export class CoreApp {
      */
     get persistedFields() {
         return [
-            CoreApp.deviceIdField,
-            this.addIdentifier(CoreApp.devicePassphraseField),
-            CoreApp.serversideDeviceIdField,
-            CoreApp.headerTokenField
+            this.fields.deviceId,
+            this.fields.devicePassphrase,
+            this.fields.serversideDeviceId,
+            this.fields.headerToken
         ];
     }
     getDeviceId() {
@@ -126,23 +138,31 @@ export class CoreApp {
     }
     resetKeys() {
         this.storage.clear([
-            this.addIdentifier(CoreApp.devicePassphraseField),
-            CoreApp.headerTokenField,
-            CoreApp.serversideDeviceIdField
+            this.fields.devicePassphrase,
+            this.fields.headerToken,
+            this.fields.serversideDeviceId
         ], false);
         this.passphrase = '';
     }
+    /**
+     * Add app name as identifier
+     * @param field Field
+     * @returns Result
+     */
+    addIdentifier(field) {
+        return field + '-' + this.name;
+    }
     /**
      * Restore settings from persisted source
      */
     restore() {
         // Devices
-        const devices = this.storage.getPersistedData(CoreApp.devicesField, []);
+        const devices = this.storage.getPersistedData(this.fields.devices, []);
         if (this.deviceId === '') {
             // First vist, restore and keep the source
             this.storage.copyFrom(this.persistedFields, false);
             // Reset device id
-            this._deviceId = this.storage.getData(CoreApp.deviceIdField, '');
+            this._deviceId = this.storage.getData(this.fields.deviceId, '');
             // Totally new, no data restored
             if (this._deviceId === '')
                 return false;
@@ -156,13 +176,13 @@ export class CoreApp {
             return false;
         }
         // this.name to identifier different app's secret
-        const passphraseEncrypted = this.storage.getData(this.addIdentifier(CoreApp.devicePassphraseField));
+        const passphraseEncrypted = this.storage.getData(this.fields.devicePassphrase);
         if (passphraseEncrypted) {
             const passphraseDecrypted = this.decrypt(passphraseEncrypted, this.name);
             if (passphraseDecrypted != null) {
                 // Add the device to the list
                 devices.push(d);
-                this.storage.setPersistedData(CoreApp.devicesField, devices);
+                this.storage.setPersistedData(this.fields.devices, devices);
                 this.passphrase = passphraseDecrypted;
                 return true;
             }
@@ -176,27 +196,19 @@ export class CoreApp {
      */
     persist() {
         // Devices
-        const devices = this.storage.getPersistedData(CoreApp.devicesField);
+        const devices = this.storage.getPersistedData(this.fields.devices);
         if (devices != null) {
             const index = devices.indexOf(this.getDeviceId());
             if (index !== -1) {
                 // Remove current device from the list
                 devices.splice(index, 1);
-                this.storage.setPersistedData(CoreApp.devicesField, devices);
+                this.storage.setPersistedData(this.fields.devices, devices);
             }
         }
         if (!this.authorized)
             return;
         this.storage.copyTo(this.persistedFields);
     }
-    /**
-     * Add app name as identifier
-     * @param field Field
-     * @returns Result
-     */
-    addIdentifier(field) {
-        return field + '-' + this.name;
-    }
     /**
      * Setup Api
      * @param api Api
@@ -253,7 +265,7 @@ export class CoreApp {
             return;
         }
         // Serverside encrypted device id
-        const identifier = this.storage.getData(CoreApp.serversideDeviceIdField);
+        const identifier = this.storage.getData(this.fields.serversideDeviceId);
         // Timestamp
         const timestamp = new Date().getTime();
         // Request data
@@ -289,7 +301,7 @@ export class CoreApp {
             if (callback)
                 callback(false);
             // Clear device id
-            this.storage.setData(CoreApp.deviceIdField, undefined);
+            this.storage.setData(this.fields.deviceId, undefined);
             return;
         }
         this.initCallUpdate(result.data, data.timestamp);
@@ -312,14 +324,14 @@ export class CoreApp {
             return;
         // Update device id and cache it
         this._deviceId = data.deviceId;
-        this.storage.setData(CoreApp.deviceIdField, this._deviceId);
+        this.storage.setData(this.fields.deviceId, this._deviceId);
         // Devices
-        const devices = this.storage.getPersistedData(CoreApp.devicesField, []);
+        const devices = this.storage.getPersistedData(this.fields.devices, []);
         devices.push(this.getDeviceId());
-        this.storage.setPersistedData(CoreApp.devicesField, devices);
+        this.storage.setPersistedData(this.fields.devices, devices);
         // Current passphrase
         this.passphrase = passphrase;
-        this.storage.setData(this.addIdentifier(CoreApp.devicePassphraseField), this.encrypt(passphrase, this.name));
+        this.storage.setData(this.fields.devicePassphrase, this.encrypt(passphrase, this.name));
         // Previous passphrase
         if (data.previousPassphrase) {
             const prev = this.decrypt(data.previousPassphrase, timestamp.toString());
@@ -351,7 +363,7 @@ export class CoreApp {
      * @returns Fields
      */
     initCallEncryptedUpdateFields() {
-        return [CoreApp.headerTokenField];
+        return [this.fields.headerToken];
     }
     /**
      * Alert action result
@@ -376,7 +388,7 @@ export class CoreApp {
         if (refreshToken !== '') {
             if (refreshToken != null)
                 refreshToken = this.encrypt(refreshToken);
-            this.storage.setData(CoreApp.headerTokenField, refreshToken);
+            this.storage.setData(this.fields.headerToken, refreshToken);
         }
         // Reset tryLogin state
         this._isTryingLogin = false;
@@ -449,14 +461,14 @@ export class CoreApp {
      */
     clearCacheData() {
         this.clearCacheToken();
-        this.storage.setData(this.addIdentifier(CoreApp.devicePassphraseField), undefined);
+        this.storage.setData(this.fields.devicePassphrase, undefined);
     }
     /**
      * Clear cached token
      */
     clearCacheToken() {
         this.cachedRefreshToken = undefined;
-        this.storage.setPersistedData(CoreApp.headerTokenField, undefined);
+        this.storage.setPersistedData(this.fields.headerToken, undefined);
     }
     /**
      * Decrypt message
@@ -711,7 +723,7 @@ export class CoreApp {
         // Temp refresh token
         if (this.cachedRefreshToken)
             return this.cachedRefreshToken;
-        return this.storage.getData(CoreApp.headerTokenField);
+        return this.storage.getData(this.fields.headerToken);
     }
     /**
      * Get all regions
@@ -738,7 +750,7 @@ export class CoreApp {
      */
     getResponseToken(rawResponse) {
         const response = this.api.transformResponse(rawResponse);
-        return this.api.getHeaderValue(response.headers, CoreApp.headerTokenField);
+        return this.api.getHeaderValue(response.headers, 'SmartERPRefreshToken');
     }
     /**
      * Get time zone
@@ -941,8 +953,9 @@ export class CoreApp {
      * Try login, returning false means is loading
      * UI get involved while refreshToken not intended
      * @param data Additional request data
+     * @param showLoading Show loading bar or not during call
      */
-    async tryLogin(_data) {
+    async tryLogin(_data, _showLoading) {
         if (this._isTryingLogin)
             return false;
         this._isTryingLogin = true;
@@ -957,7 +970,7 @@ export class CoreApp {
     userLogin(user, refreshToken, keep) {
         this.userData = user;
         // Cache the encrypted serverside device id
-        this.storage.setData(CoreApp.serversideDeviceIdField, user.deviceId);
+        this.storage.setData(this.fields.serversideDeviceId, user.deviceId);
         if (keep) {
             this.authorize(user.token, refreshToken);
         }
@@ -994,25 +1007,3 @@ export class CoreApp {
         });
     }
 }
-(function (CoreApp) {
-    /**
-     * Response token header field name
-     */
-    CoreApp.headerTokenField = 'SmartERPRefreshToken';
-    /**
-     * Serverside device id encrypted field name
-     */
-    CoreApp.serversideDeviceIdField = 'SmartERPServersideDeviceId';
-    /**
-     * Device id field name
-     */
-    CoreApp.deviceIdField = 'SmartERPDeviceId';
-    /**
-     * Devices field name
-     */
-    CoreApp.devicesField = 'SmartERPDevices';
-    /**
-     * Device passphrase field name
-     */
-    CoreApp.devicePassphraseField = 'SmartERPDevicePassphrase';
-})(CoreApp || (CoreApp = {}));

package/lib/mjs/business/BusinessUtils.d.ts

@@ -1,3 +1,4 @@
+import { DataTypes } from '@etsoo/shared';
 import { IdLabelDto } from '../dto/IdLabelDto';
 import { ICultureGet } from '../state/Culture';
 import { EntityStatus } from './EntityStatus';
@@ -31,6 +32,13 @@ export declare namespace BusinessUtils {
         id: EntityStatus;
         label: string;
     }[];
+    /**
+     * Get 12-month items
+     * @param monthLabels Month labels
+     * @param startMonth Start month, 0 as Jan.
+     * @returns 12 months
+     */
+    function getMonths(monthLabels: string[], startMonth?: number): DataTypes.IdLabelItem[];
     /**
      * Get product unit's label
      * Please define the label in culture with key 'unitPC' for ProductUnit.PC like that

package/lib/mjs/business/BusinessUtils.js

@@ -52,6 +52,23 @@ export var BusinessUtils;
         });
     }
     BusinessUtils.getEntityStatus = getEntityStatus;
+    /**
+     * Get 12-month items
+     * @param monthLabels Month labels
+     * @param startMonth Start month, 0 as Jan.
+     * @returns 12 months
+     */
+    function getMonths(monthLabels, startMonth = 0) {
+        const months = [];
+        for (let i = 0; i < 12; i++) {
+            if (startMonth >= 12)
+                startMonth = 0;
+            months.push({ id: startMonth, label: monthLabels[startMonth] });
+            startMonth++;
+        }
+        return months;
+    }
+    BusinessUtils.getMonths = getMonths;
     /**
      * Get product unit's label
      * Please define the label in culture with key 'unitPC' for ProductUnit.PC like that

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

@@ -50,6 +50,20 @@
     "message": "Message",
     "mobile": "Mobile number",
     "mobilePhones": "Mobile numbers",
+    "months": [
+        "Jan.",
+        "Feb.",
+        "Mar.",
+        "Apr.",
+        "May.",
+        "Jun.",
+        "Jul.",
+        "Aug.",
+        "Sep.",
+        "Oct.",
+        "Nov.",
+        "Dec."
+    ],
     "more": "More",
     "moreTag": "{0} more",
     "name": "Name",
@@ -67,6 +81,7 @@
     "pageNotFound": "Page Not Found",
     "prompt": "Input",
     "pullToRefresh": "Pull down to refresh",
+    "quarters": ["Q1", "Q2", "Q3", "Q4"],
     "record": "Record",
     "refresh": "Refresh",
     "refreshing": "Refreshing",

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

@@ -50,6 +50,20 @@
     "message": "留言",
     "mobile": "手机号码",
     "mobilePhones": "手机号码",
+    "months": [
+        "1月",
+        "2月",
+        "3月",
+        "4月",
+        "5月",
+        "6月",
+        "7月",
+        "8月",
+        "9月",
+        "10月",
+        "11月",
+        "12月"
+    ],
     "more": "更多",
     "moreTag": "({0}+)",
     "name": "姓名",
@@ -67,6 +81,7 @@
     "pageNotFound": "找不到页面",
     "prompt": "输入",
     "pullToRefresh": "下拉刷新",
+    "quarters": ["一季度", "二季度", "三季度", "四季度"],
     "record": "记录",
     "refresh": "刷新",
     "refreshing": "正在刷新",

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

@@ -50,6 +50,20 @@
     "message": "留言",
     "mobilePhone": "手機號碼",
     "mobilePhones": "手機號碼",
+    "months": [
+        "1月",
+        "2月",
+        "3月",
+        "4月",
+        "5月",
+        "6月",
+        "7月",
+        "8月",
+        "9月",
+        "10月",
+        "11月",
+        "12月"
+    ],
     "more": "更多",
     "moreTag": "({0}+)",
     "name": "姓名",
@@ -67,6 +81,7 @@
     "pageNotFound": "找不到頁面",
     "prompt": "輸入",
     "pullToRefresh": "下拉刷新",
+    "quarters": ["一季度", "二季度", "三季度", "四季度"],
     "record": "記錄",
     "refresh": "刷新",
     "refreshing": "正在刷新",

package/package.json

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