@etsoo/appscript 1.3.7 → 1.3.8

package/lib/mjs/index.d.ts

@@ -16,15 +16,19 @@ export * from './business/EntityStatus';
 export * from './business/ProductUnit';
 export * from './business/RepeatOption';
 export * from './def/ListItem';
-export * from './dto/IdLabelDto';
-export * from './dto/IdLabelPrimaryDto';
-export * from './dto/InitCallDto';
 export * from './erp/dto/CurrencyDto';
 export * from './erp/dto/ExchangeRateDto';
 export * from './erp/dto/ExchangeRateHistoryDto';
+export * from './erp/dto/IdLabelDto';
+export * from './erp/dto/IdLabelPrimaryDto';
+export * from './erp/dto/InitCallDto';
 export * from './erp/dto/PublicProductDto';
+export * from './erp/rq/QueryRQ';
+export * from './erp/rq/RefreshTokenRQ';
+export * from './erp/rq/TiplistRQ';
 export * from './erp/AddressApi';
 export * from './erp/BaseApi';
+export * from './erp/EntityApi';
 export * from './erp/OrgApi';
 export * from './erp/PublicApi';
 export * from './i18n/enUS';
@@ -36,10 +40,6 @@ export * from './result/ActionResult';
 export * from './result/ActionResultError';
 export * from './result/IActionResult';
 export * from './result/InitCallResult';
-export * from './rq/LoginIdRQ';
-export * from './rq/LoginRQ';
-export * from './rq/QueryRQ';
-export * from './rq/TiplistRQ';
 export * from './state/Culture';
 export * from './state/State';
 export * from './state/User';

package/lib/mjs/index.js

@@ -21,17 +21,22 @@ export * from './business/ProductUnit';
 export * from './business/RepeatOption';
 // def
 export * from './def/ListItem';
-// dto
-export * from './dto/IdLabelDto';
-export * from './dto/IdLabelPrimaryDto';
-export * from './dto/InitCallDto';
-// erp
+// erp dto
 export * from './erp/dto/CurrencyDto';
 export * from './erp/dto/ExchangeRateDto';
 export * from './erp/dto/ExchangeRateHistoryDto';
+export * from './erp/dto/IdLabelDto';
+export * from './erp/dto/IdLabelPrimaryDto';
+export * from './erp/dto/InitCallDto';
 export * from './erp/dto/PublicProductDto';
+// erp rq
+export * from './erp/rq/QueryRQ';
+export * from './erp/rq/RefreshTokenRQ';
+export * from './erp/rq/TiplistRQ';
+// erp api
 export * from './erp/AddressApi';
 export * from './erp/BaseApi';
+export * from './erp/EntityApi';
 export * from './erp/OrgApi';
 export * from './erp/PublicApi';
 // i18n
@@ -45,11 +50,6 @@ export * from './result/ActionResult';
 export * from './result/ActionResultError';
 export * from './result/IActionResult';
 export * from './result/InitCallResult';
-// rq
-export * from './rq/LoginIdRQ';
-export * from './rq/LoginRQ';
-export * from './rq/QueryRQ';
-export * from './rq/TiplistRQ';
 // state
 export * from './state/Culture';
 export * from './state/State';

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/appscript",
-    "version": "1.3.7",
+    "version": "1.3.8",
     "description": "Applications shared TypeScript framework",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",
@@ -54,7 +54,7 @@
     "dependencies": {
         "@etsoo/notificationbase": "^1.1.12",
         "@etsoo/restclient": "^1.0.74",
-        "@etsoo/shared": "^1.1.60",
+        "@etsoo/shared": "^1.1.62",
         "@types/crypto-js": "^4.1.1",
         "crypto-js": "^4.1.1"
     },

package/src/app/CoreApp.ts

@@ -33,7 +33,7 @@ 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';
+import { InitCallDto } from '../erp/dto/InitCallDto';
 import { ActionResultError } from '../result/ActionResultError';
 import { IActionResult } from '../result/IActionResult';
 import { InitCallResult, InitCallResultData } from '../result/InitCallResult';

package/src/erp/AddressApi.ts

@@ -2,7 +2,7 @@ import { DataTypes } from '@etsoo/shared';
 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';
 
 /**
@@ -54,7 +54,7 @@ export class AddressApi extends BaseApi {
                 return { ...region };
             });
         } else {
-            return (await this.app.api.get<AddressRegionDb[]>(
+            return (await this.api.get<AddressRegionDb[]>(
                 `Address/RegionList?language=${this.app.culture}`,
                 undefined,
                 { defaultValue: [] }
@@ -68,7 +68,7 @@ export class AddressApi extends BaseApi {
      * @returns Result
      */
     states(regionId: string) {
-        return this.app.api.get<AddressState[]>(
+        return this.api.get<AddressState[]>(
             `Address/StateList?regionId=${regionId}&language=${this.app.culture}`,
             undefined,
             { defaultValue: [] }

package/src/erp/BaseApi.ts

@@ -3,10 +3,11 @@ import { IApp } from '../app/IApp';
 /**
  * SmartERP base API
  */
-export class BaseApi {
+export class BaseApi<T extends IApp = IApp> {
     /**
      * Constructor
      * @param app Application
+     * @param api API
      */
-    constructor(protected app: IApp) {}
+    constructor(protected app: T, protected api = app.api) {}
 }

package/src/erp/EntityApi.ts

@@ -0,0 +1,142 @@
+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 class EntityApi<T extends IApp = IApp> extends BaseApi<T> {
+    /**
+     * Constructor
+     * @param flag Identity flag, like 'Product' for product APIs
+     * @param app Application
+     */
+    constructor(protected flag: string, app: T, api?: IApi) {
+        super(app, api);
+    }
+
+    /**
+     * Create
+     * @param data Modal data
+     * @param payload Payload
+     * @returns Result
+     */
+    protected createBase<R extends IActionResult>(
+        data: object,
+        payload?: IApiPayload<R, any>
+    ) {
+        return this.api.put<R>(`${this.flag}/Create`, data, payload);
+    }
+
+    /**
+     * 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;
+    protected deleteBase<R extends IActionResult>(
+        id: DataTypes.IdType | DataTypes.IdType[],
+        payload?: IApiPayload<R, any>
+    ) {
+        const query = Array.isArray(id)
+            ? '?' + id.map((item) => `ids=${item}`).join('&')
+            : id;
+        return this.api.delete<R>(
+            `${this.flag}/Delete/${query}`,
+            undefined,
+            payload
+        );
+    }
+
+    /**
+     * List
+     * @param rq Request data
+     * @param payload Payload
+     * @returns Result
+     */
+    protected listBase<RQ extends TiplistRQ, R extends object>(
+        rq: RQ,
+        payload?: IApiPayload<R[], any>
+    ) {
+        return this.api.post<R[]>(`${this.flag}/List`, rq, payload);
+    }
+
+    /**
+     * Query
+     * @param rq Request data
+     * @param payload Payload
+     * @returns Result
+     */
+    protected queryBase<RQ extends QueryRQ, R extends object>(
+        rq: RQ,
+        payload?: IApiPayload<R[], any>
+    ) {
+        return this.api.post<R[]>(`${this.flag}/Query`, rq, payload);
+    }
+
+    /**
+     * Read
+     * @param id Id
+     * @param payload Payload
+     * @returns Result
+     */
+    protected readBase<R extends object>(
+        id: DataTypes.IdType,
+        payload?: IApiPayload<R, any>
+    ) {
+        return this.api.get<R>(`${this.flag}/Read/${id}`, payload);
+    }
+
+    /**
+     * Sort
+     * @param items Items to sort
+     * @param payload Payload
+     * @returns Result
+     */
+    protected sortBase<RQ extends { id: DataTypes.IdType }>(
+        items: RQ[],
+        payload?: IApiPayload<number, any>
+    ) {
+        const rq: Record<DataTypes.IdType, number> = {};
+        items.forEach((item, index) => (rq[item.id] = index));
+        return this.api.put<number>(`${this.flag}/Sort`, rq, payload);
+    }
+
+    /**
+     * Update
+     * @param data Modal data
+     * @param payload Payload
+     * @returns Result
+     */
+    protected updateBase<R extends IActionResult>(
+        data: object,
+        payload?: IApiPayload<R, any>
+    ) {
+        return this.api.put<R>(`${this.flag}/Update`, data, payload);
+    }
+
+    /**
+     * Read for update
+     * @param id Id
+     * @param payload Payload
+     * @returns Result
+     */
+    protected updateReadBase<R extends object>(
+        id: DataTypes.IdType,
+        payload?: IApiPayload<R, any>
+    ) {
+        return this.api.get<R>(`${this.flag}/UpdateRead/${id}`, payload);
+    }
+}

package/src/erp/OrgApi.ts

@@ -1,25 +1,51 @@
-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 class OrgApi extends BaseApi {
+export class OrgApi extends EntityApi {
+    /**
+     * Constructor
+     * @param app Application
+     */
+    constructor(app: IApp) {
+        super('Organization', app);
+    }
+
     /**
      * 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) {
-        return this.app.api.post<ListType[]>(
-            'Organization/List',
-            {
-                items,
-                serviceId
-            },
-            { defaultValue: [], showLoading: false }
-        );
+    list(items?: number, serviceId?: number): Promise<ListType[] | undefined>;
+    list(rq: OrgListRQ): Promise<ListType[] | undefined>;
+    list(
+        items?: number | OrgListRQ,
+        serviceId?: number,
+        payload?: IApiPayload<ListType[], any>
+    ) {
+        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
+     */
+    query(rq: OrgQueryRQ, payload?: IApiPayload<OrgQueryDto[], any>) {
+        return this.queryBase(rq, payload);
     }
 
     /**
@@ -27,13 +53,34 @@ export class OrgApi extends BaseApi {
      * @param id Organization id
      * @param serviceId Service id
      */
-    async switch(id: number, serviceId?: number) {
-        const result = await this.app.api.put<boolean>('Organization/Switch', {
-            id,
-            serviceId,
-            deviceId: this.app.deviceId
-        });
+    async switch(
+        id: number,
+        serviceId?: number,
+        payload?: IApiPayload<boolean, any>
+    ) {
+        const result = await this.app.api.put<boolean>(
+            '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: DataTypes.AddOrEditType<OrgRQ, true>,
+        payload?: IApiPayload<IdActionResult, any>
+    ) {
+        return super.updateBase<IdActionResult>(data, payload);
+    }
 }

package/src/erp/PublicApi.ts

@@ -21,7 +21,7 @@ export class PublicApi extends BaseApi {
         currencyNames?: T
     ): Promise<T extends undefined ? CurrencyDto[] | undefined : ListType1[]> {
         if (currencyNames == null)
-            return (await this.app.api.get<CurrencyDto[]>(
+            return (await this.api.get<CurrencyDto[]>(
                 'Public/GetCurrencies'
             )) as any;
         else
@@ -37,9 +37,7 @@ export class PublicApi extends BaseApi {
      * @returns Result
      */
     exchangeRate(currency: Currency | string) {
-        return this.app.api.get<ExchangeRateDto>(
-            `Public/ExchangeRate/${currency}`
-        );
+        return this.api.get<ExchangeRateDto>(`Public/ExchangeRate/${currency}`);
     }
 
     /**
@@ -49,7 +47,7 @@ export class PublicApi extends BaseApi {
      * @returns Result
      */
     exchangeRateHistory(currencies: (Currency | string)[], months?: number) {
-        return this.app.api.post<ExchangeRateHistoryDto[]>(
+        return this.api.post<ExchangeRateHistoryDto[]>(
             'Public/ExchangeRateHistory',
             { currencies, months },
             { defaultValue: [] }
@@ -87,7 +85,7 @@ export class PublicApi extends BaseApi {
      * @param host Host URL
      */
     mobileQRCode(id?: string, host?: string) {
-        return this.app.api.post<string>('Public/MobileQRCode', { id, host });
+        return this.api.post<string>('Public/MobileQRCode', { id, host });
     }
 
     /**
@@ -101,7 +99,7 @@ export class PublicApi extends BaseApi {
         culture?: string
     ): T extends number ? PublicProductDto : PublicOrgProductDto {
         culture = this.app.checkLanguage(culture);
-        return this.app.api.post<PublicProductDto>(
+        return this.api.post<PublicProductDto>(
             `Public/Product/${id}/${culture}`
         ) as any;
     }

package/src/erp/dto/OrgQueryDto.ts

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

package/src/erp/rq/OrgListRQ.ts

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

package/src/erp/rq/OrgQueryRQ.ts

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

package/src/erp/rq/OrgRQ.ts

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

package/src/erp/rq/RefreshTokenRQ.ts

@@ -0,0 +1,34 @@
+/**
+ * Refresh token request data
+ */
+export 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/src/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/src/i18n/zh-CN.json

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

package/src/i18n/zh-HK.json

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

package/src/index.ts

@@ -26,19 +26,24 @@ export * from './business/RepeatOption';
 // def
 export * from './def/ListItem';
 
-// dto
-export * from './dto/IdLabelDto';
-export * from './dto/IdLabelPrimaryDto';
-export * from './dto/InitCallDto';
-
-// erp
+// erp dto
 export * from './erp/dto/CurrencyDto';
 export * from './erp/dto/ExchangeRateDto';
 export * from './erp/dto/ExchangeRateHistoryDto';
+export * from './erp/dto/IdLabelDto';
+export * from './erp/dto/IdLabelPrimaryDto';
+export * from './erp/dto/InitCallDto';
 export * from './erp/dto/PublicProductDto';
 
+// erp rq
+export * from './erp/rq/QueryRQ';
+export * from './erp/rq/RefreshTokenRQ';
+export * from './erp/rq/TiplistRQ';
+
+// erp api
 export * from './erp/AddressApi';
 export * from './erp/BaseApi';
+export * from './erp/EntityApi';
 export * from './erp/OrgApi';
 export * from './erp/PublicApi';
 
@@ -57,12 +62,6 @@ export * from './result/ActionResultError';
 export * from './result/IActionResult';
 export * from './result/InitCallResult';
 
-// rq
-export * from './rq/LoginIdRQ';
-export * from './rq/LoginRQ';
-export * from './rq/QueryRQ';
-export * from './rq/TiplistRQ';
-
 // state
 export * from './state/Culture';
 export * from './state/State';

package/lib/cjs/rq/LoginIdRQ.d.ts

@@ -1,17 +0,0 @@
-/**
- * Login id request data
- */
-export declare type LoginIdRQ = {
-    /**
-     * Device id
-     */
-    deviceId: string;
-    /**
-     * Username, Email or mobile
-     */
-    id: string;
-    /**
-     * Country or region
-     */
-    region: string;
-};