@etsoo/appscript 1.3.5 → 1.3.6

package/__tests__/app/CoreApp.ts

@@ -201,7 +201,7 @@ test('Tests for addressApi', async () => {
     const continents = await app.addressApi.continents();
     expect(continents.length).toBe(7);
 
-    const labels = await app.addressApi.getLabels('en-NZ');
+    const labels = await AddressUtils.getLabels('en-US');
     expect(labels['regionHK']).toBe('Hong Kong, China');
 
     const regions = await app.addressApi.regions('zh-CN');

package/lib/cjs/address/AddressUtils.d.ts

@@ -1,8 +1,15 @@
+import { DataTypes } from '@etsoo/shared';
 import { AddressRegion } from './AddressRegion';
 /**
  * Address utils
  */
 export declare namespace AddressUtils {
+    /**
+     * Get address labels
+     * @param language Language
+     * @returns Result
+     */
+    function getLabels(language: string): Promise<DataTypes.StringRecord>;
     /**
      * Get region from regions and detected region and language
      * @param regions Supported regions
@@ -10,4 +17,17 @@ export declare namespace AddressUtils {
      * @param detectedLanguage Detected language
      */
     function getRegion(regions: string[], detectedRegion?: string | null, detectedLanguage?: string | null): AddressRegion;
+    /**
+     * Get region label
+     * @param id Region id
+     * @param labels Labels
+     * @returns Label
+     */
+    function getRegionLabel(id: string, labels: DataTypes.StringRecord): string;
+    /**
+     * Update region label
+     * @param region Region
+     * @param culture Culture
+     */
+    function updateRegionLabel(region: AddressRegion, culture: string): Promise<void>;
 }

package/lib/cjs/address/AddressUtils.js

@@ -1,12 +1,51 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AddressUtils = void 0;
 const AddressRegion_1 = require("./AddressRegion");
+const languageLabels = {};
 /**
  * Address utils
  */
 var AddressUtils;
 (function (AddressUtils) {
+    /**
+     * Get address labels
+     * @param language Language
+     * @returns Result
+     */
+    async function getLabels(language) {
+        let labels = languageLabels[language];
+        if (labels == null) {
+            labels = await Promise.resolve().then(() => __importStar(require(`./../i18n/address.${language}.json`)));
+            // Cache
+            languageLabels[language] = labels;
+        }
+        return labels;
+    }
+    AddressUtils.getLabels = getLabels;
     /**
      * Get region from regions and detected region and language
      * @param regions Supported regions
@@ -32,4 +71,25 @@ var AddressUtils;
         return AddressRegion_1.AddressRegion.getById(regions[0]);
     }
     AddressUtils.getRegion = getRegion;
+    /**
+     * Get region label
+     * @param id Region id
+     * @param labels Labels
+     * @returns Label
+     */
+    function getRegionLabel(id, labels) {
+        var _a;
+        return (_a = labels['region' + id]) !== null && _a !== void 0 ? _a : id;
+    }
+    AddressUtils.getRegionLabel = getRegionLabel;
+    /**
+     * Update region label
+     * @param region Region
+     * @param culture Culture
+     */
+    async function updateRegionLabel(region, culture) {
+        const labels = await AddressUtils.getLabels(culture);
+        region.label = getRegionLabel(region.id, labels);
+    }
+    AddressUtils.updateRegionLabel = updateRegionLabel;
 })(AddressUtils = exports.AddressUtils || (exports.AddressUtils = {}));

package/lib/cjs/app/CoreApp.js

@@ -6,6 +6,7 @@ const restclient_1 = require("@etsoo/restclient");
 const shared_1 = require("@etsoo/shared");
 const crypto_js_1 = require("crypto-js");
 const AddressRegion_1 = require("../address/AddressRegion");
+const AddressUtils_1 = require("../address/AddressUtils");
 const BridgeUtils_1 = require("../bridges/BridgeUtils");
 const EntityStatus_1 = require("../business/EntityStatus");
 const ActionResultError_1 = require("../result/ActionResultError");
@@ -486,6 +487,7 @@ class CoreApp {
         this._currency = regionItem.currency;
         this._region = regionId;
         // Hold the current country or region
+        AddressUtils_1.AddressUtils.updateRegionLabel(regionItem, this._culture);
         this.settings.currentRegion = regionItem;
     }
     /**

package/lib/cjs/erp/AddressApi.d.ts

@@ -1,4 +1,3 @@
-import { DataTypes } from '@etsoo/shared';
 import { AddressRegion, AddressRegionDb } from '../address/AddressRegion';
 import { AddressState } from '../address/AddressState';
 import { IdLabelConditional } from '../dto/IdLabelDto';
@@ -7,13 +6,6 @@ import { BaseApi } from './BaseApi';
  * Address Api
  */
 export declare class AddressApi extends BaseApi {
-    private languageLabels;
-    /**
-     * Get address labels
-     * @param language Language
-     * @returns Result
-     */
-    getLabels(language?: string): Promise<DataTypes.StringRecord>;
     /**
      * Get all continents
      * @param language Language

package/lib/cjs/erp/AddressApi.js

@@ -1,56 +1,15 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AddressApi = void 0;
 const shared_1 = require("@etsoo/shared");
 const AddressContinent_1 = require("../address/AddressContinent");
 const AddressRegion_1 = require("../address/AddressRegion");
+const AddressUtils_1 = require("../address/AddressUtils");
 const BaseApi_1 = require("./BaseApi");
 /**
  * Address Api
  */
 class AddressApi extends BaseApi_1.BaseApi {
-    constructor() {
-        super(...arguments);
-        this.languageLabels = {};
-    }
-    /**
-     * Get address labels
-     * @param language Language
-     * @returns Result
-     */
-    async getLabels(language) {
-        const l = this.app.checkLanguage(language);
-        let labels = this.languageLabels[l];
-        if (labels == null) {
-            labels = await Promise.resolve().then(() => __importStar(require(`./../i18n/address.${l}.json`)));
-            // Cache
-            this.languageLabels[l] = labels;
-        }
-        return labels;
-    }
     /**
      * Get all continents
      * @param language Language
@@ -58,7 +17,7 @@ class AddressApi extends BaseApi_1.BaseApi {
      * @returns Continents
      */
     async continents(language, isNumberKey = false) {
-        const labels = await this.getLabels(language);
+        const labels = await AddressUtils_1.AddressUtils.getLabels(this.app.checkLanguage(language));
         return shared_1.DataTypes.getEnumKeys(AddressContinent_1.AddressContinent).map((key) => {
             var _a;
             return ({
@@ -78,9 +37,9 @@ class AddressApi extends BaseApi_1.BaseApi {
     async regions(language, isLocal) {
         language = this.app.checkLanguage(language);
         if (isLocal == null || isLocal) {
-            const labels = await this.getLabels(language);
+            const labels = await AddressUtils_1.AddressUtils.getLabels(language);
             return AddressRegion_1.AddressRegion.all.map((region) => {
-                region.label = labels['region' + region.id];
+                region.label = AddressUtils_1.AddressUtils.getRegionLabel(region.id, labels);
                 return { ...region };
             });
         }

package/lib/mjs/address/AddressUtils.d.ts

@@ -1,8 +1,15 @@
+import { DataTypes } from '@etsoo/shared';
 import { AddressRegion } from './AddressRegion';
 /**
  * Address utils
  */
 export declare namespace AddressUtils {
+    /**
+     * Get address labels
+     * @param language Language
+     * @returns Result
+     */
+    function getLabels(language: string): Promise<DataTypes.StringRecord>;
     /**
      * Get region from regions and detected region and language
      * @param regions Supported regions
@@ -10,4 +17,17 @@ export declare namespace AddressUtils {
      * @param detectedLanguage Detected language
      */
     function getRegion(regions: string[], detectedRegion?: string | null, detectedLanguage?: string | null): AddressRegion;
+    /**
+     * Get region label
+     * @param id Region id
+     * @param labels Labels
+     * @returns Label
+     */
+    function getRegionLabel(id: string, labels: DataTypes.StringRecord): string;
+    /**
+     * Update region label
+     * @param region Region
+     * @param culture Culture
+     */
+    function updateRegionLabel(region: AddressRegion, culture: string): Promise<void>;
 }

package/lib/mjs/address/AddressUtils.js

@@ -1,9 +1,25 @@
 import { AddressRegion } from './AddressRegion';
+const languageLabels = {};
 /**
  * Address utils
  */
 export var AddressUtils;
 (function (AddressUtils) {
+    /**
+     * Get address labels
+     * @param language Language
+     * @returns Result
+     */
+    async function getLabels(language) {
+        let labels = languageLabels[language];
+        if (labels == null) {
+            labels = await import(`./../i18n/address.${language}.json`);
+            // Cache
+            languageLabels[language] = labels;
+        }
+        return labels;
+    }
+    AddressUtils.getLabels = getLabels;
     /**
      * Get region from regions and detected region and language
      * @param regions Supported regions
@@ -29,4 +45,25 @@ export var AddressUtils;
         return AddressRegion.getById(regions[0]);
     }
     AddressUtils.getRegion = getRegion;
+    /**
+     * Get region label
+     * @param id Region id
+     * @param labels Labels
+     * @returns Label
+     */
+    function getRegionLabel(id, labels) {
+        var _a;
+        return (_a = labels['region' + id]) !== null && _a !== void 0 ? _a : id;
+    }
+    AddressUtils.getRegionLabel = getRegionLabel;
+    /**
+     * Update region label
+     * @param region Region
+     * @param culture Culture
+     */
+    async function updateRegionLabel(region, culture) {
+        const labels = await AddressUtils.getLabels(culture);
+        region.label = getRegionLabel(region.id, labels);
+    }
+    AddressUtils.updateRegionLabel = updateRegionLabel;
 })(AddressUtils || (AddressUtils = {}));

package/lib/mjs/app/CoreApp.js

@@ -3,6 +3,7 @@ import { ApiDataError } from '@etsoo/restclient';
 import { DataTypes, DateUtils, DomUtils, NumberUtils, Utils } from '@etsoo/shared';
 import { AES, algo, enc, HmacSHA512, lib, mode, pad, PBKDF2, SHA3 } from 'crypto-js';
 import { AddressRegion } from '../address/AddressRegion';
+import { AddressUtils } from '../address/AddressUtils';
 import { BridgeUtils } from '../bridges/BridgeUtils';
 import { EntityStatus } from '../business/EntityStatus';
 import { ActionResultError } from '../result/ActionResultError';
@@ -483,6 +484,7 @@ export class CoreApp {
         this._currency = regionItem.currency;
         this._region = regionId;
         // Hold the current country or region
+        AddressUtils.updateRegionLabel(regionItem, this._culture);
         this.settings.currentRegion = regionItem;
     }
     /**

package/lib/mjs/erp/AddressApi.d.ts

@@ -1,4 +1,3 @@
-import { DataTypes } from '@etsoo/shared';
 import { AddressRegion, AddressRegionDb } from '../address/AddressRegion';
 import { AddressState } from '../address/AddressState';
 import { IdLabelConditional } from '../dto/IdLabelDto';
@@ -7,13 +6,6 @@ import { BaseApi } from './BaseApi';
  * Address Api
  */
 export declare class AddressApi extends BaseApi {
-    private languageLabels;
-    /**
-     * Get address labels
-     * @param language Language
-     * @returns Result
-     */
-    getLabels(language?: string): Promise<DataTypes.StringRecord>;
     /**
      * Get all continents
      * @param language Language

package/lib/mjs/erp/AddressApi.js

@@ -1,30 +1,12 @@
 import { DataTypes } from '@etsoo/shared';
 import { AddressContinent } from '../address/AddressContinent';
 import { AddressRegion } from '../address/AddressRegion';
+import { AddressUtils } from '../address/AddressUtils';
 import { BaseApi } from './BaseApi';
 /**
  * Address Api
  */
 export class AddressApi extends BaseApi {
-    constructor() {
-        super(...arguments);
-        this.languageLabels = {};
-    }
-    /**
-     * Get address labels
-     * @param language Language
-     * @returns Result
-     */
-    async getLabels(language) {
-        const l = this.app.checkLanguage(language);
-        let labels = this.languageLabels[l];
-        if (labels == null) {
-            labels = await import(`./../i18n/address.${l}.json`);
-            // Cache
-            this.languageLabels[l] = labels;
-        }
-        return labels;
-    }
     /**
      * Get all continents
      * @param language Language
@@ -32,7 +14,7 @@ export class AddressApi extends BaseApi {
      * @returns Continents
      */
     async continents(language, isNumberKey = false) {
-        const labels = await this.getLabels(language);
+        const labels = await AddressUtils.getLabels(this.app.checkLanguage(language));
         return DataTypes.getEnumKeys(AddressContinent).map((key) => {
             var _a;
             return ({
@@ -52,9 +34,9 @@ export class AddressApi extends BaseApi {
     async regions(language, isLocal) {
         language = this.app.checkLanguage(language);
         if (isLocal == null || isLocal) {
-            const labels = await this.getLabels(language);
+            const labels = await AddressUtils.getLabels(language);
             return AddressRegion.all.map((region) => {
-                region.label = labels['region' + region.id];
+                region.label = AddressUtils.getRegionLabel(region.id, labels);
                 return { ...region };
             });
         }

package/package.json

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

package/src/address/AddressUtils.ts

@@ -1,9 +1,28 @@
+import { DataTypes } from '@etsoo/shared';
 import { AddressRegion } from './AddressRegion';
 
+const languageLabels: Record<string, DataTypes.StringRecord | undefined> = {};
+
 /**
  * Address utils
  */
 export namespace AddressUtils {
+    /**
+     * Get address labels
+     * @param language Language
+     * @returns Result
+     */
+    export async function getLabels(language: string) {
+        let labels = languageLabels[language];
+        if (labels == null) {
+            labels = await import(`./../i18n/address.${language}.json`);
+
+            // Cache
+            languageLabels[language] = labels;
+        }
+        return labels!;
+    }
+
     /**
      * Get region from regions and detected region and language
      * @param regions Supported regions
@@ -32,4 +51,30 @@ export namespace AddressUtils {
         // Default
         return AddressRegion.getById(regions[0])!;
     }
+
+    /**
+     * Get region label
+     * @param id Region id
+     * @param labels Labels
+     * @returns Label
+     */
+    export function getRegionLabel(
+        id: string,
+        labels: DataTypes.StringRecord
+    ): string {
+        return (labels['region' + id] as string) ?? id;
+    }
+
+    /**
+     * Update region label
+     * @param region Region
+     * @param culture Culture
+     */
+    export async function updateRegionLabel(
+        region: AddressRegion,
+        culture: string
+    ) {
+        const labels = await AddressUtils.getLabels(culture);
+        region.label = getRegionLabel(region.id, labels);
+    }
 }

package/src/app/CoreApp.ts

@@ -30,6 +30,7 @@ import {
     SHA3
 } from 'crypto-js';
 import { AddressRegion } from '../address/AddressRegion';
+import { AddressUtils } from '../address/AddressUtils';
 import { BridgeUtils } from '../bridges/BridgeUtils';
 import { EntityStatus } from '../business/EntityStatus';
 import { InitCallDto } from '../dto/InitCallDto';
@@ -717,6 +718,7 @@ export abstract class CoreApp<
         this._region = regionId;
 
         // Hold the current country or region
+        AddressUtils.updateRegionLabel(regionItem, this._culture);
         this.settings.currentRegion = regionItem;
     }
 

package/src/erp/AddressApi.ts

@@ -2,6 +2,7 @@ import { DataTypes } from '@etsoo/shared';
 import { AddressContinent } from '../address/AddressContinent';
 import { AddressRegion, AddressRegionDb } from '../address/AddressRegion';
 import { AddressState } from '../address/AddressState';
+import { AddressUtils } from '../address/AddressUtils';
 import { IdLabelConditional } from '../dto/IdLabelDto';
 import { BaseApi } from './BaseApi';
 
@@ -9,26 +10,6 @@ import { BaseApi } from './BaseApi';
  * Address Api
  */
 export class AddressApi extends BaseApi {
-    private languageLabels: Record<string, DataTypes.StringRecord | undefined> =
-        {};
-
-    /**
-     * Get address labels
-     * @param language Language
-     * @returns Result
-     */
-    async getLabels(language?: string) {
-        const l = this.app.checkLanguage(language);
-        let labels = this.languageLabels[l];
-        if (labels == null) {
-            labels = await import(`./../i18n/address.${l}.json`);
-
-            // Cache
-            this.languageLabels[l] = labels;
-        }
-        return labels!;
-    }
-
     /**
      * Get all continents
      * @param language Language
@@ -39,7 +20,9 @@ export class AddressApi extends BaseApi {
         language?: string,
         isNumberKey = <T>false
     ): Promise<IdLabelConditional<T>> {
-        const labels = await this.getLabels(language);
+        const labels = await AddressUtils.getLabels(
+            this.app.checkLanguage(language)
+        );
         return <IdLabelConditional<T>>DataTypes.getEnumKeys(
             AddressContinent
         ).map((key) => ({
@@ -66,9 +49,9 @@ export class AddressApi extends BaseApi {
     > {
         language = this.app.checkLanguage(language);
         if (isLocal == null || isLocal) {
-            const labels = await this.getLabels(language);
+            const labels = await AddressUtils.getLabels(language);
             return AddressRegion.all.map((region) => {
-                region.label = labels['region' + region.id] as string;
+                region.label = AddressUtils.getRegionLabel(region.id, labels);
                 return { ...region };
             });
         } else {