@etsoo/appscript 1.3.7 → 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);
     };
 }
 
@@ -218,4 +221,12 @@ test('Tests for publicApi', async () => {
 
     const currencies = await app.publicApi.currencies(['NZD', 'AUD', 'USD']);
     expect(currencies[1].id).toBe('AUD');
+
+    /*
+    const orgs = await app.orgApi.list();
+    console.log(orgs);
+
+    const orgsQuery = await app.orgApi.query({ currentPage: 1, batchSize: 2 });
+    console.log(orgsQuery);
+    */
 });

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';

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

@@ -1,7 +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

package/lib/cjs/erp/AddressApi.js

@@ -44,7 +44,7 @@ class AddressApi extends BaseApi_1.BaseApi {
             });
         }
         else {
-            return (await this.app.api.get(`Address/RegionList?language=${this.app.culture}`, undefined, { defaultValue: [] }));
+            return (await this.api.get(`Address/RegionList?language=${this.app.culture}`, undefined, { defaultValue: [] }));
         }
     }
     /**
@@ -53,7 +53,7 @@ class AddressApi extends BaseApi_1.BaseApi {
      * @returns Result
      */
     states(regionId) {
-        return this.app.api.get(`Address/StateList?regionId=${regionId}&language=${this.app.culture}`, undefined, { defaultValue: [] });
+        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;

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

@@ -1,20 +1,47 @@
-import { ListType } from '@etsoo/shared';
-import { BaseApi } from './BaseApi';
+import { IApiPayload } from '@etsoo/restclient';
+import { DataTypes, ListType } from '@etsoo/shared';
+import { IApp } from '../app/IApp';
+import { IdActionResult } from '../result/IActionResult';
+import { OrgQueryDto } from './dto/OrgQueryDto';
+import { EntityApi } from './EntityApi';
+import { OrgListRQ } from './rq/OrgListRQ';
+import { OrgQueryRQ } from './rq/OrgQueryRQ';
+import { OrgRQ } from './rq/OrgRQ';
 /**
  * Organization API
  */
-export declare class OrgApi extends BaseApi {
+export declare class OrgApi extends EntityApi {
+    /**
+     * Constructor
+     * @param app Application
+     */
+    constructor(app: IApp);
     /**
      * Get organization list
-     * @param items Max items
+     * @param items Max items or request data
      * @param serviceId Service id
      * @returns Result
      */
     list(items?: number, serviceId?: number): Promise<ListType[] | undefined>;
+    list(rq: OrgListRQ): Promise<ListType[] | undefined>;
+    /**
+     * Query
+     * @param rq Request data
+     * @param payload Payload
+     * @returns Result
+     */
+    query(rq: OrgQueryRQ, payload?: IApiPayload<OrgQueryDto[], any>): Promise<OrgQueryDto[] | undefined>;
     /**
      * Switch organization
      * @param id Organization id
      * @param serviceId Service id
      */
-    switch(id: number, serviceId?: number): Promise<boolean | undefined>;
+    switch(id: number, serviceId?: number, payload?: IApiPayload<boolean, any>): Promise<boolean | undefined>;
+    /**
+     * Update
+     * @param data Modal data
+     * @param payload Payload
+     * @returns Result
+     */
+    update(data: DataTypes.AddOrEditType<OrgRQ, true>, payload?: IApiPayload<IdActionResult, any>): Promise<IdActionResult<number> | undefined>;
 }

package/lib/cjs/erp/OrgApi.js

@@ -1,37 +1,55 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OrgApi = void 0;
-const BaseApi_1 = require("./BaseApi");
+const EntityApi_1 = require("./EntityApi");
 /**
  * Organization API
  */
-class OrgApi extends BaseApi_1.BaseApi {
+class OrgApi extends EntityApi_1.EntityApi {
     /**
-     * Get organization list
-     * @param items Max items
-     * @param serviceId Service id
+     * Constructor
+     * @param app Application
+     */
+    constructor(app) {
+        super('Organization', app);
+    }
+    list(items, serviceId, payload) {
+        payload !== null && payload !== void 0 ? payload : (payload = { defaultValue: [], showLoading: false });
+        const rq = typeof items === 'object' ? items : { items, serviceId };
+        return this.listBase(rq, payload);
+    }
+    /**
+     * Query
+     * @param rq Request data
+     * @param payload Payload
      * @returns Result
      */
-    list(items, serviceId) {
-        return this.app.api.post('Organization/List', {
-            items,
-            serviceId
-        }, { defaultValue: [], showLoading: false });
+    query(rq, payload) {
+        return this.queryBase(rq, payload);
     }
     /**
      * Switch organization
      * @param id Organization id
      * @param serviceId Service id
      */
-    async switch(id, serviceId) {
+    async switch(id, serviceId, payload) {
         const result = await this.app.api.put('Organization/Switch', {
             id,
             serviceId,
             deviceId: this.app.deviceId
-        });
+        }, payload);
         if (result)
             return await this.app.refreshToken();
         return result;
     }
+    /**
+     * Update
+     * @param data Modal data
+     * @param payload Payload
+     * @returns Result
+     */
+    update(data, payload) {
+        return super.updateBase(data, payload);
+    }
 }
 exports.OrgApi = OrgApi;

package/lib/cjs/erp/PublicApi.js

@@ -16,7 +16,7 @@ class PublicApi extends BaseApi_1.BaseApi {
      */
     async currencies(currencyNames) {
         if (currencyNames == null)
-            return (await this.app.api.get('Public/GetCurrencies'));
+            return (await this.api.get('Public/GetCurrencies'));
         else
             return currencyNames.map((name) => {
                 var _a;
@@ -32,7 +32,7 @@ class PublicApi extends BaseApi_1.BaseApi {
      * @returns Result
      */
     exchangeRate(currency) {
-        return this.app.api.get(`Public/ExchangeRate/${currency}`);
+        return this.api.get(`Public/ExchangeRate/${currency}`);
     }
     /**
      * Get exchange rate history
@@ -41,7 +41,7 @@ class PublicApi extends BaseApi_1.BaseApi {
      * @returns Result
      */
     exchangeRateHistory(currencies, months) {
-        return this.app.api.post('Public/ExchangeRateHistory', { currencies, months }, { defaultValue: [] });
+        return this.api.post('Public/ExchangeRateHistory', { currencies, months }, { defaultValue: [] });
     }
     /**
      * Get product unit's label
@@ -74,7 +74,7 @@ class PublicApi extends BaseApi_1.BaseApi {
      * @param host Host URL
      */
     mobileQRCode(id, host) {
-        return this.app.api.post('Public/MobileQRCode', { id, host });
+        return this.api.post('Public/MobileQRCode', { id, host });
     }
     /**
      * Get public and valid product data
@@ -84,7 +84,7 @@ class PublicApi extends BaseApi_1.BaseApi {
      */
     product(id, culture) {
         culture = this.app.checkLanguage(culture);
-        return this.app.api.post(`Public/Product/${id}/${culture}`);
+        return this.api.post(`Public/Product/${id}/${culture}`);
     }
     /**
      *

package/lib/cjs/erp/dto/OrgQueryDto.d.ts

@@ -0,0 +1,21 @@
+/**
+ * Organization query data
+ */
+export declare type OrgQueryDto = {
+    /**
+     * Id
+     */
+    id: number;
+    /**
+     * Brand, like ETSOO
+     */
+    brand?: string;
+    /**
+     * Name, like ETSOO NZ LIMITED
+     */
+    name: string;
+    /**
+     * Creation
+     */
+    creation: string | Date;
+};

package/lib/cjs/erp/rq/OrgListRQ.d.ts

@@ -0,0 +1,10 @@
+import { TiplistRQ } from './TiplistRQ';
+/**
+ * Organization list request data
+ */
+export declare type OrgListRQ = TiplistRQ & {
+    /**
+     * Service id
+     */
+    serviceId?: number;
+};

package/lib/cjs/erp/rq/OrgQueryRQ.d.ts

@@ -0,0 +1,14 @@
+import { QueryRQ } from './QueryRQ';
+/**
+ * Organization query request data
+ */
+export declare type OrgQueryRQ = QueryRQ & {
+    /**
+     * Name
+     */
+    name?: string;
+    /**
+     * Parent organization id
+     */
+    parentId?: number;
+};

package/lib/cjs/erp/rq/OrgRQ.d.ts

@@ -0,0 +1,25 @@
+/**
+ * Organization add/edit request data
+ */
+export declare type OrgRQ = {
+    /**
+     * Region id
+     */
+    regionId: string;
+    /**
+     * Name
+     */
+    name: string;
+    /**
+     * Identifier
+     */
+    identifier: string;
+    /**
+     * Brand
+     */
+    brand?: string;
+    /**
+     * Trade as
+     */
+    tradeAs?: string;
+};

package/lib/cjs/erp/rq/QueryRQ.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/cjs/erp/rq/RefreshTokenRQ.d.ts

@@ -0,0 +1,29 @@
+/**
+ * Refresh token request data
+ */
+export declare type RefreshTokenRQ = {
+    /**
+     * Device id
+     */
+    deviceId: string;
+    /**
+     * Login password
+     */
+    pwd?: string;
+    /**
+     * Service device id
+     */
+    serviceDeviceId?: string;
+    /**
+     * Service id
+     */
+    serviceId?: number;
+    /**
+     * Service Uid
+     */
+    serviceUid?: string;
+    /**
+     * Time zone
+     */
+    timezone?: string;
+};

package/lib/cjs/erp/rq/RefreshTokenRQ.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/cjs/erp/rq/TiplistRQ.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

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

@@ -113,6 +113,7 @@
     "refresh": "Refresh",
     "refreshing": "Refreshing",
     "releaseToRefresh": "Release to refresh",
+    "region": "Country or region",
     "regionAU": "Australia",
     "regionCA": "Canada",
     "regionCN": "Mainland China",

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

@@ -112,6 +112,7 @@
     "record": "记录",
     "refresh": "刷新",
     "refreshing": "正在刷新",
+    "region": "国家或地区",
     "regionAU": "澳大利亚",
     "regionCA": "加拿大",
     "regionCN": "中国大陆",

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

@@ -112,6 +112,7 @@
     "record": "記錄",
     "refresh": "刷新",
     "refreshing": "正在刷新",
+    "region": "國家或地區",
     "regionAU": "澳大利亞",
     "regionCA": "加拿大",
     "regionCN": "中國大陸",