@etsoo/appscript 1.6.28 → 1.6.30

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

@@ -354,6 +354,12 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @param onReady On ready callback
      */
     changeCulture(culture: DataTypes.CultureDefinition): Promise<DataTypes.StringRecord>;
+    /**
+     * Load custom resources, override to implement custom resources
+     * @param resources Resources
+     * @param culture Culture name
+     */
+    protected loadCustomResources(resources: DataTypes.StringRecord, culture: string): Promise<void> | void;
     /**
      * Update current region label
      */

package/lib/cjs/app/CoreApp.js

@@ -829,9 +829,17 @@ class CoreApp {
             // Set static resources back
             culture.resources = resources;
         }
+        // Load system custom resources
+        await this.loadCustomResources(resources, name);
         this.updateRegionLabel();
         return resources;
     }
+    /**
+     * Load custom resources, override to implement custom resources
+     * @param resources Resources
+     * @param culture Culture name
+     */
+    loadCustomResources(resources, culture) { }
     /**
      * Update current region label
      */

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

@@ -1,4 +1,5 @@
-import { ListType } from "@etsoo/shared";
+import { DataTypes, ListType } from "@etsoo/shared";
+import { CustomCultureData } from "../def/CustomCulture";
 /**
  * Business utils
  */
@@ -18,4 +19,11 @@ export declare namespace BusinessUtils {
      * @returns 12 months
      */
     function getMonths(monthLabels: string[], startMonth?: number): ListType[];
+    /**
+     * Merge custom resources to target collection
+     * @param target Target collection merges to
+     * @param resources New resources to merge
+     */
+    function mergeCustomResources(target: DataTypes.StringRecord, resources: CustomCultureData[]): void;
+    function restoreResources(target?: DataTypes.StringRecord): void;
 }

package/lib/cjs/business/BusinessUtils.js

@@ -6,6 +6,7 @@ exports.BusinessUtils = void 0;
  */
 var BusinessUtils;
 (function (BusinessUtils) {
+    let resourcesCache = {};
     /**
      * Format avatar title
      * @param title Title
@@ -55,4 +56,41 @@ var BusinessUtils;
         return months;
     }
     BusinessUtils.getMonths = getMonths;
+    /**
+     * Merge custom resources to target collection
+     * @param target Target collection merges to
+     * @param resources New resources to merge
+     */
+    function mergeCustomResources(target, resources) {
+        for (const item of resources) {
+            if (item.organizationId) {
+                // Backup
+                const backup = target[item.key];
+                if (backup != null &&
+                    (typeof backup !== "object" || !("organizationId" in backup))) {
+                    resourcesCache[item.key] = backup;
+                }
+            }
+            if (item.description || item.jsonData) {
+                const { key, ...rest } = item;
+                target[key] = rest;
+            }
+            else {
+                target[item.key] = item.title;
+            }
+        }
+    }
+    BusinessUtils.mergeCustomResources = mergeCustomResources;
+    function restoreResources(target) {
+        // Clear cache if no target
+        if (target == null) {
+            resourcesCache = {};
+            return;
+        }
+        // Restore resources
+        for (const key in resourcesCache) {
+            target[key] = resourcesCache[key];
+        }
+    }
+    BusinessUtils.restoreResources = restoreResources;
 })(BusinessUtils || (exports.BusinessUtils = BusinessUtils = {}));

package/lib/cjs/def/CustomCulture.d.ts

@@ -1,15 +1,11 @@
 /**
- * Custom culture
+ * Custom culture data
  */
-export type CustomCulture = {
+export type CustomCultureData = {
     /**
-     * Target id
+     * Key
      */
-    id: string;
-    /**
-     * Culture, like zh-Hans
-     */
-    culture: string;
+    key: string;
     /**
      * Organization id
      */
@@ -28,3 +24,12 @@ export type CustomCulture = {
      */
     jsonData?: string;
 };
+/**
+ * Custom culture
+ */
+export type CustomCulture = CustomCultureData & {
+    /**
+     * Culture, like zh-Hans
+     */
+    culture: string;
+};

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

@@ -354,6 +354,12 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @param onReady On ready callback
      */
     changeCulture(culture: DataTypes.CultureDefinition): Promise<DataTypes.StringRecord>;
+    /**
+     * Load custom resources, override to implement custom resources
+     * @param resources Resources
+     * @param culture Culture name
+     */
+    protected loadCustomResources(resources: DataTypes.StringRecord, culture: string): Promise<void> | void;
     /**
      * Update current region label
      */

package/lib/mjs/app/CoreApp.js

@@ -826,9 +826,17 @@ export class CoreApp {
             // Set static resources back
             culture.resources = resources;
         }
+        // Load system custom resources
+        await this.loadCustomResources(resources, name);
         this.updateRegionLabel();
         return resources;
     }
+    /**
+     * Load custom resources, override to implement custom resources
+     * @param resources Resources
+     * @param culture Culture name
+     */
+    loadCustomResources(resources, culture) { }
     /**
      * Update current region label
      */

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

@@ -1,4 +1,5 @@
-import { ListType } from "@etsoo/shared";
+import { DataTypes, ListType } from "@etsoo/shared";
+import { CustomCultureData } from "../def/CustomCulture";
 /**
  * Business utils
  */
@@ -18,4 +19,11 @@ export declare namespace BusinessUtils {
      * @returns 12 months
      */
     function getMonths(monthLabels: string[], startMonth?: number): ListType[];
+    /**
+     * Merge custom resources to target collection
+     * @param target Target collection merges to
+     * @param resources New resources to merge
+     */
+    function mergeCustomResources(target: DataTypes.StringRecord, resources: CustomCultureData[]): void;
+    function restoreResources(target?: DataTypes.StringRecord): void;
 }

package/lib/mjs/business/BusinessUtils.js

@@ -3,6 +3,7 @@
  */
 export var BusinessUtils;
 (function (BusinessUtils) {
+    let resourcesCache = {};
     /**
      * Format avatar title
      * @param title Title
@@ -52,4 +53,41 @@ export var BusinessUtils;
         return months;
     }
     BusinessUtils.getMonths = getMonths;
+    /**
+     * Merge custom resources to target collection
+     * @param target Target collection merges to
+     * @param resources New resources to merge
+     */
+    function mergeCustomResources(target, resources) {
+        for (const item of resources) {
+            if (item.organizationId) {
+                // Backup
+                const backup = target[item.key];
+                if (backup != null &&
+                    (typeof backup !== "object" || !("organizationId" in backup))) {
+                    resourcesCache[item.key] = backup;
+                }
+            }
+            if (item.description || item.jsonData) {
+                const { key, ...rest } = item;
+                target[key] = rest;
+            }
+            else {
+                target[item.key] = item.title;
+            }
+        }
+    }
+    BusinessUtils.mergeCustomResources = mergeCustomResources;
+    function restoreResources(target) {
+        // Clear cache if no target
+        if (target == null) {
+            resourcesCache = {};
+            return;
+        }
+        // Restore resources
+        for (const key in resourcesCache) {
+            target[key] = resourcesCache[key];
+        }
+    }
+    BusinessUtils.restoreResources = restoreResources;
 })(BusinessUtils || (BusinessUtils = {}));

package/lib/mjs/def/CustomCulture.d.ts

@@ -1,15 +1,11 @@
 /**
- * Custom culture
+ * Custom culture data
  */
-export type CustomCulture = {
+export type CustomCultureData = {
     /**
-     * Target id
+     * Key
      */
-    id: string;
-    /**
-     * Culture, like zh-Hans
-     */
-    culture: string;
+    key: string;
     /**
      * Organization id
      */
@@ -28,3 +24,12 @@ export type CustomCulture = {
      */
     jsonData?: string;
 };
+/**
+ * Custom culture
+ */
+export type CustomCulture = CustomCultureData & {
+    /**
+     * Culture, like zh-Hans
+     */
+    culture: string;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etsoo/appscript",
-  "version": "1.6.28",
+  "version": "1.6.30",
   "description": "Applications shared TypeScript framework",
   "main": "lib/cjs/index.js",
   "module": "lib/mjs/index.js",
@@ -37,7 +37,7 @@
   "dependencies": {
     "@etsoo/notificationbase": "^1.1.60",
     "@etsoo/restclient": "^1.1.27",
-    "@etsoo/shared": "^1.2.69",
+    "@etsoo/shared": "^1.2.70",
     "crypto-js": "^4.2.0"
   },
   "devDependencies": {

package/src/app/CoreApp.ts

@@ -1229,11 +1229,25 @@ export abstract class CoreApp<
       // Set static resources back
       culture.resources = resources;
     }
+
+    // Load system custom resources
+    await this.loadCustomResources(resources, name);
+
     this.updateRegionLabel();
 
     return resources;
   }
 
+  /**
+   * Load custom resources, override to implement custom resources
+   * @param resources Resources
+   * @param culture Culture name
+   */
+  protected loadCustomResources(
+    resources: DataTypes.StringRecord,
+    culture: string
+  ): Promise<void> | void {}
+
   /**
    * Update current region label
    */

package/src/business/BusinessUtils.ts

@@ -1,9 +1,12 @@
-import { ListType } from "@etsoo/shared";
+import { DataTypes, ListType } from "@etsoo/shared";
+import { CustomCultureData } from "../def/CustomCulture";
 
 /**
  * Business utils
  */
 export namespace BusinessUtils {
+  let resourcesCache: DataTypes.StringRecord = {};
+
   /**
    * Format avatar title
    * @param title Title
@@ -62,4 +65,47 @@ export namespace BusinessUtils {
 
     return months;
   }
+
+  /**
+   * Merge custom resources to target collection
+   * @param target Target collection merges to
+   * @param resources New resources to merge
+   */
+  export function mergeCustomResources(
+    target: DataTypes.StringRecord,
+    resources: CustomCultureData[]
+  ) {
+    for (const item of resources) {
+      if (item.organizationId) {
+        // Backup
+        const backup = target[item.key];
+        if (
+          backup != null &&
+          (typeof backup !== "object" || !("organizationId" in backup))
+        ) {
+          resourcesCache[item.key] = backup;
+        }
+      }
+
+      if (item.description || item.jsonData) {
+        const { key, ...rest } = item;
+        target[key] = rest;
+      } else {
+        target[item.key] = item.title;
+      }
+    }
+  }
+
+  export function restoreResources(target?: DataTypes.StringRecord) {
+    // Clear cache if no target
+    if (target == null) {
+      resourcesCache = {};
+      return;
+    }
+
+    // Restore resources
+    for (const key in resourcesCache) {
+      target[key] = resourcesCache[key];
+    }
+  }
 }

package/src/def/CustomCulture.ts

@@ -1,16 +1,11 @@
 /**
- * Custom culture
+ * Custom culture data
  */
-export type CustomCulture = {
-  /**
-   * Target id
-   */
-  id: string;
-
+export type CustomCultureData = {
   /**
-   * Culture, like zh-Hans
+   * Key
    */
-  culture: string;
+  key: string;
 
   /**
    * Organization id
@@ -33,3 +28,13 @@ export type CustomCulture = {
    */
   jsonData?: string;
 };
+
+/**
+ * Custom culture
+ */
+export type CustomCulture = CustomCultureData & {
+  /**
+   * Culture, like zh-Hans
+   */
+  culture: string;
+};