@etsoo/appscript 1.3.6 → 1.3.8

package/README.md

@@ -91,20 +91,6 @@ $ yarn add @etsoo/appscript
 #### ListItem.ts ####
 -   ListItem - List item definition
 
-### dto - Data transfer object
-
-#### IdDto.ts ####
--   IdDto - Dto with id field
-
-#### IdLabelDto.ts ####
--   IdLabelDto - Dto with id and label field
-
-#### IdLabelPrimaryDto.ts ####
--   IdLabelPrimaryDto - Dto with id, label and primary field
-
-#### IdLabelPrimaryDto.ts ####
--   InitCallDto - Init call dto
-
 ### i18n - Multiple cultures
 
 ### result - API action result
@@ -126,6 +112,8 @@ $ yarn add @etsoo/appscript
 -   InitCallResultData - Init call result data
 -   InitCallResult - Init call result
 
+### erp - SmartERP APIs
+
 ### state - State management
 
 #### Culture.ts ####

package/__tests__/app/CoreApp.ts

@@ -13,6 +13,7 @@ import {
     enUS,
     ExternalSettings,
     IUser,
+    OrgApi,
     PublicApi,
     UserRole
 } from '../../src';
@@ -130,12 +131,14 @@ class CoreAppTest extends CoreApp<
     }
 }
 
+// Mixins example
 function EnhanceApp<TBase extends DataTypes.MConstructor<CoreAppTest>>(
     Base: TBase
 ) {
     return class extends Base {
         readonly addressApi = new AddressApi(this);
         readonly publicApi = new PublicApi(this);
+        readonly orgApi = new OrgApi(this);
     };
 }
 
@@ -143,6 +146,10 @@ const appClass = EnhanceApp(CoreAppTest);
 const app = new appClass();
 app.changeCulture(app.settings.cultures[0]);
 
+test('Test for properties', () => {
+    expect(app.settings.currentRegion.label).toBe('中国大陆');
+});
+
 test('Tests for addRootUrl', () => {
     expect(app.addRootUrl('/home')).toBe('/cms/home');
     expect(app.addRootUrl('./home')).toBe('/cms/./home');
@@ -201,10 +208,7 @@ test('Tests for addressApi', async () => {
     const continents = await app.addressApi.continents();
     expect(continents.length).toBe(7);
 
-    const labels = await AddressUtils.getLabels('en-US');
-    expect(labels['regionHK']).toBe('Hong Kong, China');
-
-    const regions = await app.addressApi.regions('zh-CN');
+    const regions = await app.addressApi.regions();
     const cn = regions.find((r) => r.id === 'CN');
     expect(cn?.label).toBe('中国大陆');
 });
@@ -218,15 +222,11 @@ test('Tests for publicApi', async () => {
     const currencies = await app.publicApi.currencies(['NZD', 'AUD', 'USD']);
     expect(currencies[1].id).toBe('AUD');
 
-    //const currenciesRemote = await app.publicApi.currencies();
-    //console.log(currenciesRemote);
-
-    //const history = await app.publicApi.exchangeRateHistory(['NZD', 'AUD'], 24);
-    //console.log(history);
-
-    //const qrcode = await app.publicApi.mobileQRCode('xz@etsoo.com');
-    //console.log(qrcode);
+    /*
+    const orgs = await app.orgApi.list();
+    console.log(orgs);
 
-    //const exchangeRate = await app.publicApi.exchangeRate('USD');
-    //console.log(exchangeRate);
+    const orgsQuery = await app.orgApi.query({ currentPage: 1, batchSize: 2 });
+    console.log(orgsQuery);
+    */
 });

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

@@ -1,15 +1,8 @@
-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
@@ -17,17 +10,4 @@ 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,51 +1,12 @@
 "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
@@ -71,25 +32,4 @@ 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.d.ts

@@ -2,7 +2,7 @@ import { INotifier, NotificationAlign, NotificationCallProps, NotificationConten
 import { ApiDataError, IApi, IPData } from '@etsoo/restclient';
 import { DataTypes, DateUtils, IStorage, ListType, ListType1 } from '@etsoo/shared';
 import { AddressRegion } from '../address/AddressRegion';
-import { InitCallDto } from '../dto/InitCallDto';
+import { InitCallDto } from '../erp/dto/InitCallDto';
 import { IActionResult } from '../result/IActionResult';
 import { InitCallResult, InitCallResultData } from '../result/InitCallResult';
 import { IUser } from '../state/User';
@@ -216,6 +216,10 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @param culture New culture definition
      */
     changeCulture(culture: DataTypes.CultureDefinition): void;
+    /**
+     * Update current region label
+     */
+    protected updateRegionLabel(): void;
     /**
      * Check language is supported or not, return a valid language when supported
      * @param language Language
@@ -360,6 +364,12 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @returns List
      */
     protected getEnumStrList<E extends DataTypes.EnumBase = DataTypes.EnumBase>(em: E, prefix: string, filter?: (id: E[keyof E], key: keyof E & string) => E[keyof E] | undefined): ListType1[];
+    /**
+     * Get region label
+     * @param id Region id
+     * @returns Label
+     */
+    getRegionLabel(id: string): string;
     /**
      * Get all regions
      * @returns Regions

package/lib/cjs/app/CoreApp.js

@@ -6,7 +6,6 @@ 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");
@@ -487,8 +486,8 @@ 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;
+        this.updateRegionLabel();
     }
     /**
      * Change culture
@@ -509,6 +508,14 @@ class CoreApp {
         this._culture = name;
         // Hold the current resources
         this.settings.currentCulture = culture;
+        this.updateRegionLabel();
+    }
+    /**
+     * Update current region label
+     */
+    updateRegionLabel() {
+        const region = this.settings.currentRegion;
+        region.label = this.getRegionLabel(region.id);
     }
     /**
      * Check language is supported or not, return a valid language when supported
@@ -896,6 +903,15 @@ class CoreApp {
         }
         return list;
     }
+    /**
+     * Get region label
+     * @param id Region id
+     * @returns Label
+     */
+    getRegionLabel(id) {
+        var _a;
+        return (_a = this.get('region' + id)) !== null && _a !== void 0 ? _a : id;
+    }
     /**
      * Get all regions
      * @returns Regions

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

@@ -284,6 +284,12 @@ export interface IApp {
      * @returns Cached token
      */
     getCacheToken(): string | undefined;
+    /**
+     * Get region label
+     * @param id Region id
+     * @returns Label
+     */
+    getRegionLabel(id: string): string;
     /**
      * Get all regions
      * @returns Regions

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

@@ -1,6 +1,7 @@
+import { AddressContinent } from '../address/AddressContinent';
 import { AddressRegion, AddressRegionDb } from '../address/AddressRegion';
 import { AddressState } from '../address/AddressState';
-import { IdLabelConditional } from '../dto/IdLabelDto';
+import { IdLabelConditional } from './dto/IdLabelDto';
 import { BaseApi } from './BaseApi';
 /**
  * Address Api
@@ -8,23 +9,26 @@ import { BaseApi } from './BaseApi';
 export declare class AddressApi extends BaseApi {
     /**
      * Get all continents
-     * @param language Language
      * @param isNumberKey Is number key or key as id
      * @returns Continents
      */
-    continents<T extends boolean>(language?: string, isNumberKey?: T): Promise<IdLabelConditional<T>>;
+    continents<T extends boolean>(isNumberKey?: T): Promise<IdLabelConditional<T>>;
     /**
-     * Get region list from database
-     * @param language Language
+     * Get continent label
+     * @param id Region id
+     * @returns Label
+     */
+    getContinentLabel(id: AddressContinent | string): string;
+    /**
+     * Get region list
      * @param isLocal Is local version
      * @returns Result
      */
-    regions<T extends boolean = true>(language?: string, isLocal?: T): Promise<T extends true | undefined ? AddressRegion[] : AddressRegionDb[] | undefined>;
+    regions<T extends boolean = true>(isLocal?: T): Promise<T extends true | undefined ? AddressRegion[] : AddressRegionDb[] | undefined>;
     /**
-     * Get state list from database
+     * Get state list
      * @param regionId Region id
-     * @param language Language
      * @returns Result
      */
-    states(regionId: string, language?: string): Promise<AddressState[] | undefined>;
+    states(regionId: string): Promise<AddressState[] | undefined>;
 }

package/lib/cjs/erp/AddressApi.js

@@ -4,7 +4,6 @@ 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
@@ -12,50 +11,49 @@ const BaseApi_1 = require("./BaseApi");
 class AddressApi extends BaseApi_1.BaseApi {
     /**
      * Get all continents
-     * @param language Language
      * @param isNumberKey Is number key or key as id
      * @returns Continents
      */
-    async continents(language, isNumberKey = false) {
-        const labels = await AddressUtils_1.AddressUtils.getLabels(this.app.checkLanguage(language));
-        return shared_1.DataTypes.getEnumKeys(AddressContinent_1.AddressContinent).map((key) => {
-            var _a;
-            return ({
-                id: isNumberKey
-                    ? shared_1.DataTypes.getEnumByKey(AddressContinent_1.AddressContinent, key)
-                    : key.toString(),
-                label: (_a = labels['continent' + key]) !== null && _a !== void 0 ? _a : key
-            });
-        });
+    async continents(isNumberKey = false) {
+        return shared_1.DataTypes.getEnumKeys(AddressContinent_1.AddressContinent).map((key) => ({
+            id: isNumberKey
+                ? shared_1.DataTypes.getEnumByKey(AddressContinent_1.AddressContinent, key)
+                : key.toString(),
+            label: this.getContinentLabel(key)
+        }));
+    }
+    /**
+     * Get continent label
+     * @param id Region id
+     * @returns Label
+     */
+    getContinentLabel(id) {
+        var _a;
+        return (_a = this.app.get('continent' + id)) !== null && _a !== void 0 ? _a : id;
     }
     /**
-     * Get region list from database
-     * @param language Language
+     * Get region list
      * @param isLocal Is local version
      * @returns Result
      */
-    async regions(language, isLocal) {
-        language = this.app.checkLanguage(language);
+    async regions(isLocal) {
         if (isLocal == null || isLocal) {
-            const labels = await AddressUtils_1.AddressUtils.getLabels(language);
             return AddressRegion_1.AddressRegion.all.map((region) => {
-                region.label = AddressUtils_1.AddressUtils.getRegionLabel(region.id, labels);
+                region.label = this.app.getRegionLabel(region.id);
                 return { ...region };
             });
         }
         else {
-            return (await this.app.api.get(`Address/RegionList?language=${language}`, undefined, { defaultValue: [] }));
+            return (await this.api.get(`Address/RegionList?language=${this.app.culture}`, undefined, { defaultValue: [] }));
         }
     }
     /**
-     * Get state list from database
+     * Get state list
      * @param regionId Region id
-     * @param language Language
      * @returns Result
      */
-    states(regionId, language) {
-        language = this.app.checkLanguage(language);
-        return this.app.api.get(`Address/StateList?regionId=${regionId}&language=${language}`, undefined, { defaultValue: [] });
+    states(regionId) {
+        return this.api.get(`Address/StateList?regionId=${regionId}&language=${this.app.culture}`, undefined, { defaultValue: [] });
     }
 }
 exports.AddressApi = AddressApi;

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

@@ -2,11 +2,13 @@ import { IApp } from '../app/IApp';
 /**
  * SmartERP base API
  */
-export declare class BaseApi {
-    protected app: IApp;
+export declare class BaseApi<T extends IApp = IApp> {
+    protected app: T;
+    protected api: import("@etsoo/restclient").IApi<any>;
     /**
      * Constructor
      * @param app Application
+     * @param api API
      */
-    constructor(app: IApp);
+    constructor(app: T, api?: import("@etsoo/restclient").IApi<any>);
 }

package/lib/cjs/erp/BaseApi.js

@@ -8,9 +8,11 @@ class BaseApi {
     /**
      * Constructor
      * @param app Application
+     * @param api API
      */
-    constructor(app) {
+    constructor(app, api = app.api) {
         this.app = app;
+        this.api = api;
     }
 }
 exports.BaseApi = BaseApi;

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

@@ -0,0 +1,78 @@
+import { IApi, IApiPayload } from '@etsoo/restclient';
+import { DataTypes } from '@etsoo/shared';
+import { IApp } from '../app/IApp';
+import { IActionResult } from '../result/IActionResult';
+import { BaseApi } from './BaseApi';
+import { QueryRQ } from './rq/QueryRQ';
+import { TiplistRQ } from './rq/TiplistRQ';
+/**
+ * Entity API
+ * Follow com.etsoo.CoreFramework.Services.EntityServiceBase
+ */
+export declare class EntityApi<T extends IApp = IApp> extends BaseApi<T> {
+    protected flag: string;
+    /**
+     * Constructor
+     * @param flag Identity flag, like 'Product' for product APIs
+     * @param app Application
+     */
+    constructor(flag: string, app: T, api?: IApi);
+    /**
+     * Create
+     * @param data Modal data
+     * @param payload Payload
+     * @returns Result
+     */
+    protected createBase<R extends IActionResult>(data: object, payload?: IApiPayload<R, any>): Promise<R | undefined>;
+    /**
+     * Delete
+     * @param id Id or ids
+     * @param payload Payload
+     */
+    protected deleteBase<R extends IActionResult>(id: DataTypes.IdType, payload?: IApiPayload<R, any>): R;
+    protected deleteBase<R extends IActionResult>(ids: DataTypes.IdType[], payload?: IApiPayload<R, any>): R;
+    /**
+     * List
+     * @param rq Request data
+     * @param payload Payload
+     * @returns Result
+     */
+    protected listBase<RQ extends TiplistRQ, R extends object>(rq: RQ, payload?: IApiPayload<R[], any>): Promise<R[] | undefined>;
+    /**
+     * Query
+     * @param rq Request data
+     * @param payload Payload
+     * @returns Result
+     */
+    protected queryBase<RQ extends QueryRQ, R extends object>(rq: RQ, payload?: IApiPayload<R[], any>): Promise<R[] | undefined>;
+    /**
+     * Read
+     * @param id Id
+     * @param payload Payload
+     * @returns Result
+     */
+    protected readBase<R extends object>(id: DataTypes.IdType, payload?: IApiPayload<R, any>): Promise<R | undefined>;
+    /**
+     * Sort
+     * @param items Items to sort
+     * @param payload Payload
+     * @returns Result
+     */
+    protected sortBase<RQ extends {
+        id: DataTypes.IdType;
+    }>(items: RQ[], payload?: IApiPayload<number, any>): Promise<number | undefined>;
+    /**
+     * Update
+     * @param data Modal data
+     * @param payload Payload
+     * @returns Result
+     */
+    protected updateBase<R extends IActionResult>(data: object, payload?: IApiPayload<R, any>): Promise<R | undefined>;
+    /**
+     * Read for update
+     * @param id Id
+     * @param payload Payload
+     * @returns Result
+     */
+    protected updateReadBase<R extends object>(id: DataTypes.IdType, payload?: IApiPayload<R, any>): Promise<R | undefined>;
+}

package/lib/cjs/erp/EntityApi.js

@@ -0,0 +1,91 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EntityApi = void 0;
+const BaseApi_1 = require("./BaseApi");
+/**
+ * Entity API
+ * Follow com.etsoo.CoreFramework.Services.EntityServiceBase
+ */
+class EntityApi extends BaseApi_1.BaseApi {
+    /**
+     * Constructor
+     * @param flag Identity flag, like 'Product' for product APIs
+     * @param app Application
+     */
+    constructor(flag, app, api) {
+        super(app, api);
+        this.flag = flag;
+    }
+    /**
+     * Create
+     * @param data Modal data
+     * @param payload Payload
+     * @returns Result
+     */
+    createBase(data, payload) {
+        return this.api.put(`${this.flag}/Create`, data, payload);
+    }
+    deleteBase(id, payload) {
+        const query = Array.isArray(id)
+            ? '?' + id.map((item) => `ids=${item}`).join('&')
+            : id;
+        return this.api.delete(`${this.flag}/Delete/${query}`, undefined, payload);
+    }
+    /**
+     * List
+     * @param rq Request data
+     * @param payload Payload
+     * @returns Result
+     */
+    listBase(rq, payload) {
+        return this.api.post(`${this.flag}/List`, rq, payload);
+    }
+    /**
+     * Query
+     * @param rq Request data
+     * @param payload Payload
+     * @returns Result
+     */
+    queryBase(rq, payload) {
+        return this.api.post(`${this.flag}/Query`, rq, payload);
+    }
+    /**
+     * Read
+     * @param id Id
+     * @param payload Payload
+     * @returns Result
+     */
+    readBase(id, payload) {
+        return this.api.get(`${this.flag}/Read/${id}`, payload);
+    }
+    /**
+     * Sort
+     * @param items Items to sort
+     * @param payload Payload
+     * @returns Result
+     */
+    sortBase(items, payload) {
+        const rq = {};
+        items.forEach((item, index) => (rq[item.id] = index));
+        return this.api.put(`${this.flag}/Sort`, rq, payload);
+    }
+    /**
+     * Update
+     * @param data Modal data
+     * @param payload Payload
+     * @returns Result
+     */
+    updateBase(data, payload) {
+        return this.api.put(`${this.flag}/Update`, data, payload);
+    }
+    /**
+     * Read for update
+     * @param id Id
+     * @param payload Payload
+     * @returns Result
+     */
+    updateReadBase(id, payload) {
+        return this.api.get(`${this.flag}/UpdateRead/${id}`, payload);
+    }
+}
+exports.EntityApi = EntityApi;