@etsoo/appscript 1.2.8 → 1.2.12

package/lib/cjs/app/CoreApp.js

@@ -140,32 +140,31 @@ class CoreApp {
     restore() {
         // Devices
         const devices = this.storage.getPersistedData(CoreApp.devicesField, []);
-        // Current device id, '' means new, or reload (not included) or duplicate (included)
         if (this.deviceId === '') {
-            // First vist, restore
-            this.storage.copyFrom(this.persistedFields, true);
+            // First vist, restore and keep the source
+            this.storage.copyFrom(this.persistedFields, false);
             // Reset device id
             this._deviceId = this.storage.getData(CoreApp.deviceIdField, '');
-        }
-        else {
-            const d = this.getDeviceId();
-            if (devices.includes(d)) {
-                // Duplicate tab, session data copied
-                // Remove the token, deviceId, and passphrase
-                this.resetKeys();
+            // Totally new, no data restored
+            if (this._deviceId === '')
                 return false;
-            }
+        }
+        // Device exists or not
+        const d = this.getDeviceId();
+        if (devices.includes(d)) {
+            // Duplicate tab, session data copied
+            // Remove the token, deviceId, and passphrase
+            this.resetKeys();
+            return false;
         }
         const passphraseEncrypted = this.storage.getData(CoreApp.devicePassphraseField);
         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.passphrase = passphraseDecrypted;
-                const d = this.getDeviceId();
-                if (!devices.includes(d)) {
-                    devices.push(d);
-                    this.storage.setPersistedData(CoreApp.devicesField, devices);
-                }
                 return true;
             }
             // Failed, reset keys
@@ -182,6 +181,7 @@ class CoreApp {
         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);
             }

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

@@ -21,6 +21,7 @@
     "expiry": "Expiry",
     "failed": "Operation failed",
     "id": "Number#",
+    "itemExists": "'{0}' already exists",
     "loading": "Loading...",
     "login": "Login",
     "menuHome": "Home",
@@ -37,6 +38,7 @@
     "ok": "OK",
     "open": "Open",
     "openMenu": "Open menu",
+    "operationSucceeded": "Operation succeeded",
     "pageNotFound": "Page Not Found",
     "prompt": "Input",
     "pullToRefresh": "Pull down to refresh",
@@ -46,6 +48,7 @@
     "reloginTip": "Please enter your password, resubmit the data after successful login",
     "remove": "Remove",
     "renew": "Renew",
+    "reports": "Reports",
     "resending": "Resending",
     "reset": "Reset",
     "rotateLeft": "Rotate left 90°",
@@ -54,6 +57,7 @@
     "scrollToTop": "Scroll to top",
     "send": "Send",
     "setAsDefault": "Set as default",
+    "settings": "Settings",
     "signout": "Sign out",
     "smartERP": "SmartERP",
     "status": "Status",

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

@@ -21,6 +21,7 @@
     "expiry": "到期时间",
     "failed": "操作失败",
     "id": "编号",
+    "itemExists": "'{0}'已经存在",
     "loading": "正在加载...",
     "login": "登录",
     "menuHome": "首页",
@@ -37,6 +38,7 @@
     "ok": "确定",
     "open": "打开",
     "openMenu": "打开菜单",
+    "operationSucceeded": "操作成功",
     "pageNotFound": "找不到页面",
     "prompt": "输入",
     "pullToRefresh": "下拉刷新",
@@ -46,6 +48,7 @@
     "reloginTip": "请输入您的登录密码，登录成功后请重新提交数据",
     "remove": "移除",
     "renew": "续费",
+    "reports": "统计报表",
     "resending": "重新发送",
     "reset": "重置",
     "rotateLeft": "左旋转90°",
@@ -54,6 +57,7 @@
     "scrollToTop": "回到顶部",
     "send": "发送",
     "setAsDefault": "设为默认",
+    "settings": "系统设置",
     "signout": "退出",
     "smartERP": "司友云ERP",
     "status": "状态",

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

@@ -21,6 +21,7 @@
     "expiry": "到期時間",
     "failed": "操作失敗",
     "id": "編號",
+    "itemExists": "'{0}'已经存在",
     "loading": "正在加載...",
     "login": "登錄",
     "menuHome": "首頁",
@@ -37,6 +38,7 @@
     "ok": "確定",
     "open": "打開",
     "openMenu": "打開菜單",
+    "operationSucceeded": "操作成功",
     "pageNotFound": "找不到頁面",
     "prompt": "輸入",
     "pullToRefresh": "下拉刷新",
@@ -46,6 +48,7 @@
     "reloginTip": "請輸入您的登錄密碼，登錄成功後請重新提交數據",
     "remove": "移除",
     "renew": "續費",
+    "reports": "統計報表",
     "resending": "重新發送",
     "reset": "重置",
     "rotateLeft": "左旋轉90°",
@@ -54,6 +57,7 @@
     "scrollToTop": "回到頂部",
     "send": "發送",
     "setAsDefault": "設為默認",
+    "settings": "系統設置",
     "signout": "退出",
     "smartERP": "司友雲ERP",
     "status": "狀態",

package/lib/mjs/app/CoreApp.js

@@ -137,32 +137,31 @@ export class CoreApp {
     restore() {
         // Devices
         const devices = this.storage.getPersistedData(CoreApp.devicesField, []);
-        // Current device id, '' means new, or reload (not included) or duplicate (included)
         if (this.deviceId === '') {
-            // First vist, restore
-            this.storage.copyFrom(this.persistedFields, true);
+            // First vist, restore and keep the source
+            this.storage.copyFrom(this.persistedFields, false);
             // Reset device id
             this._deviceId = this.storage.getData(CoreApp.deviceIdField, '');
-        }
-        else {
-            const d = this.getDeviceId();
-            if (devices.includes(d)) {
-                // Duplicate tab, session data copied
-                // Remove the token, deviceId, and passphrase
-                this.resetKeys();
+            // Totally new, no data restored
+            if (this._deviceId === '')
                 return false;
-            }
+        }
+        // Device exists or not
+        const d = this.getDeviceId();
+        if (devices.includes(d)) {
+            // Duplicate tab, session data copied
+            // Remove the token, deviceId, and passphrase
+            this.resetKeys();
+            return false;
         }
         const passphraseEncrypted = this.storage.getData(CoreApp.devicePassphraseField);
         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.passphrase = passphraseDecrypted;
-                const d = this.getDeviceId();
-                if (!devices.includes(d)) {
-                    devices.push(d);
-                    this.storage.setPersistedData(CoreApp.devicesField, devices);
-                }
                 return true;
             }
             // Failed, reset keys
@@ -179,6 +178,7 @@ export class CoreApp {
         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);
             }

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

@@ -21,6 +21,7 @@
     "expiry": "Expiry",
     "failed": "Operation failed",
     "id": "Number#",
+    "itemExists": "'{0}' already exists",
     "loading": "Loading...",
     "login": "Login",
     "menuHome": "Home",
@@ -37,6 +38,7 @@
     "ok": "OK",
     "open": "Open",
     "openMenu": "Open menu",
+    "operationSucceeded": "Operation succeeded",
     "pageNotFound": "Page Not Found",
     "prompt": "Input",
     "pullToRefresh": "Pull down to refresh",
@@ -46,6 +48,7 @@
     "reloginTip": "Please enter your password, resubmit the data after successful login",
     "remove": "Remove",
     "renew": "Renew",
+    "reports": "Reports",
     "resending": "Resending",
     "reset": "Reset",
     "rotateLeft": "Rotate left 90°",
@@ -54,6 +57,7 @@
     "scrollToTop": "Scroll to top",
     "send": "Send",
     "setAsDefault": "Set as default",
+    "settings": "Settings",
     "signout": "Sign out",
     "smartERP": "SmartERP",
     "status": "Status",

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

@@ -21,6 +21,7 @@
     "expiry": "到期时间",
     "failed": "操作失败",
     "id": "编号",
+    "itemExists": "'{0}'已经存在",
     "loading": "正在加载...",
     "login": "登录",
     "menuHome": "首页",
@@ -37,6 +38,7 @@
     "ok": "确定",
     "open": "打开",
     "openMenu": "打开菜单",
+    "operationSucceeded": "操作成功",
     "pageNotFound": "找不到页面",
     "prompt": "输入",
     "pullToRefresh": "下拉刷新",
@@ -46,6 +48,7 @@
     "reloginTip": "请输入您的登录密码，登录成功后请重新提交数据",
     "remove": "移除",
     "renew": "续费",
+    "reports": "统计报表",
     "resending": "重新发送",
     "reset": "重置",
     "rotateLeft": "左旋转90°",
@@ -54,6 +57,7 @@
     "scrollToTop": "回到顶部",
     "send": "发送",
     "setAsDefault": "设为默认",
+    "settings": "系统设置",
     "signout": "退出",
     "smartERP": "司友云ERP",
     "status": "状态",

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

@@ -21,6 +21,7 @@
     "expiry": "到期時間",
     "failed": "操作失敗",
     "id": "編號",
+    "itemExists": "'{0}'已经存在",
     "loading": "正在加載...",
     "login": "登錄",
     "menuHome": "首頁",
@@ -37,6 +38,7 @@
     "ok": "確定",
     "open": "打開",
     "openMenu": "打開菜單",
+    "operationSucceeded": "操作成功",
     "pageNotFound": "找不到頁面",
     "prompt": "輸入",
     "pullToRefresh": "下拉刷新",
@@ -46,6 +48,7 @@
     "reloginTip": "請輸入您的登錄密碼，登錄成功後請重新提交數據",
     "remove": "移除",
     "renew": "續費",
+    "reports": "統計報表",
     "resending": "重新發送",
     "reset": "重置",
     "rotateLeft": "左旋轉90°",
@@ -54,6 +57,7 @@
     "scrollToTop": "回到頂部",
     "send": "發送",
     "setAsDefault": "設為默認",
+    "settings": "系統設置",
     "signout": "退出",
     "smartERP": "司友雲ERP",
     "status": "狀態",

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/appscript",
-    "version": "1.2.8",
+    "version": "1.2.12",
     "description": "Applications shared TypeScript framework",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",
@@ -52,21 +52,21 @@
     },
     "homepage": "https://github.com/ETSOO/AppScript#readme",
     "dependencies": {
-        "@etsoo/notificationbase": "^1.0.95",
-        "@etsoo/restclient": "^1.0.63",
-        "@etsoo/shared": "^1.0.94",
-        "@types/crypto-js": "^4.0.2",
+        "@etsoo/notificationbase": "^1.0.96",
+        "@etsoo/restclient": "^1.0.64",
+        "@etsoo/shared": "^1.0.97",
+        "@types/crypto-js": "^4.1.0",
         "crypto-js": "^4.1.1"
     },
     "devDependencies": {
-        "@babel/cli": "^7.16.0",
-        "@babel/core": "^7.16.5",
-        "@babel/plugin-transform-runtime": "^7.16.5",
-        "@babel/preset-env": "^7.16.5",
-        "@babel/runtime-corejs3": "^7.16.5",
-        "@types/jest": "^27.0.3",
-        "@typescript-eslint/eslint-plugin": "^5.8.0",
-        "@typescript-eslint/parser": "^5.8.0",
+        "@babel/cli": "^7.16.7",
+        "@babel/core": "^7.16.7",
+        "@babel/plugin-transform-runtime": "^7.16.7",
+        "@babel/preset-env": "^7.16.7",
+        "@babel/runtime-corejs3": "^7.16.7",
+        "@types/jest": "^27.4.0",
+        "@typescript-eslint/eslint-plugin": "^5.8.1",
+        "@typescript-eslint/parser": "^5.8.1",
         "eslint": "^8.5.0",
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-import": "^2.25.3",

package/src/app/CoreApp.ts

@@ -676,22 +676,24 @@ export abstract class CoreApp<
             []
         );
 
-        // Current device id, '' means new, or reload (not included) or duplicate (included)
         if (this.deviceId === '') {
-            // First vist, restore
-            this.storage.copyFrom(this.persistedFields, true);
+            // First vist, restore and keep the source
+            this.storage.copyFrom(this.persistedFields, false);
 
             // Reset device id
             this._deviceId = this.storage.getData(CoreApp.deviceIdField, '');
-        } else {
-            const d = this.getDeviceId();
 
-            if (devices.includes(d)) {
-                // Duplicate tab, session data copied
-                // Remove the token, deviceId, and passphrase
-                this.resetKeys();
-                return false;
-            }
+            // Totally new, no data restored
+            if (this._deviceId === '') return false;
+        }
+
+        // Device exists or not
+        const d = this.getDeviceId();
+        if (devices.includes(d)) {
+            // Duplicate tab, session data copied
+            // Remove the token, deviceId, and passphrase
+            this.resetKeys();
+            return false;
         }
 
         const passphraseEncrypted = this.storage.getData<string>(
@@ -703,16 +705,11 @@ export abstract class CoreApp<
                 this.name
             );
             if (passphraseDecrypted != null) {
-                this.passphrase = passphraseDecrypted;
+                // Add the device to the list
+                devices.push(d);
+                this.storage.setPersistedData(CoreApp.devicesField, devices);
 
-                const d = this.getDeviceId();
-                if (!devices.includes(d)) {
-                    devices.push(d);
-                    this.storage.setPersistedData(
-                        CoreApp.devicesField,
-                        devices
-                    );
-                }
+                this.passphrase = passphraseDecrypted;
 
                 return true;
             }
@@ -735,6 +732,7 @@ export abstract class CoreApp<
         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);
             }

package/src/i18n/en-US.json

@@ -21,6 +21,7 @@
     "expiry": "Expiry",
     "failed": "Operation failed",
     "id": "Number#",
+    "itemExists": "'{0}' already exists",
     "loading": "Loading...",
     "login": "Login",
     "menuHome": "Home",
@@ -37,6 +38,7 @@
     "ok": "OK",
     "open": "Open",
     "openMenu": "Open menu",
+    "operationSucceeded": "Operation succeeded",
     "pageNotFound": "Page Not Found",
     "prompt": "Input",
     "pullToRefresh": "Pull down to refresh",
@@ -46,6 +48,7 @@
     "reloginTip": "Please enter your password, resubmit the data after successful login",
     "remove": "Remove",
     "renew": "Renew",
+    "reports": "Reports",
     "resending": "Resending",
     "reset": "Reset",
     "rotateLeft": "Rotate left 90°",
@@ -54,6 +57,7 @@
     "scrollToTop": "Scroll to top",
     "send": "Send",
     "setAsDefault": "Set as default",
+    "settings": "Settings",
     "signout": "Sign out",
     "smartERP": "SmartERP",
     "status": "Status",

package/src/i18n/zh-CN.json

@@ -21,6 +21,7 @@
     "expiry": "到期时间",
     "failed": "操作失败",
     "id": "编号",
+    "itemExists": "'{0}'已经存在",
     "loading": "正在加载...",
     "login": "登录",
     "menuHome": "首页",
@@ -37,6 +38,7 @@
     "ok": "确定",
     "open": "打开",
     "openMenu": "打开菜单",
+    "operationSucceeded": "操作成功",
     "pageNotFound": "找不到页面",
     "prompt": "输入",
     "pullToRefresh": "下拉刷新",
@@ -46,6 +48,7 @@
     "reloginTip": "请输入您的登录密码，登录成功后请重新提交数据",
     "remove": "移除",
     "renew": "续费",
+    "reports": "统计报表",
     "resending": "重新发送",
     "reset": "重置",
     "rotateLeft": "左旋转90°",
@@ -54,6 +57,7 @@
     "scrollToTop": "回到顶部",
     "send": "发送",
     "setAsDefault": "设为默认",
+    "settings": "系统设置",
     "signout": "退出",
     "smartERP": "司友云ERP",
     "status": "状态",

package/src/i18n/zh-HK.json

@@ -21,6 +21,7 @@
     "expiry": "到期時間",
     "failed": "操作失敗",
     "id": "編號",
+    "itemExists": "'{0}'已经存在",
     "loading": "正在加載...",
     "login": "登錄",
     "menuHome": "首頁",
@@ -37,6 +38,7 @@
     "ok": "確定",
     "open": "打開",
     "openMenu": "打開菜單",
+    "operationSucceeded": "操作成功",
     "pageNotFound": "找不到頁面",
     "prompt": "輸入",
     "pullToRefresh": "下拉刷新",
@@ -46,6 +48,7 @@
     "reloginTip": "請輸入您的登錄密碼，登錄成功後請重新提交數據",
     "remove": "移除",
     "renew": "續費",
+    "reports": "統計報表",
     "resending": "重新發送",
     "reset": "重置",
     "rotateLeft": "左旋轉90°",
@@ -54,6 +57,7 @@
     "scrollToTop": "回到頂部",
     "send": "發送",
     "setAsDefault": "設為默認",
+    "settings": "系統設置",
     "signout": "退出",
     "smartERP": "司友雲ERP",
     "status": "狀態",