@etsoo/appscript 1.3.8 → 1.3.10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -23,35 +23,35 @@ export declare class EntityApi<T extends IApp = IApp> extends BaseApi<T> {
23
23
  * @param payload Payload
24
24
  * @returns Result
25
25
  */
26
- protected createBase<R extends IActionResult>(data: object, payload?: IApiPayload<R, any>): Promise<R | undefined>;
26
+ protected createBase<R extends IActionResult>(data: object, payload?: IApiPayload<R>): Promise<R | undefined>;
27
27
  /**
28
28
  * Delete
29
29
  * @param id Id or ids
30
30
  * @param payload Payload
31
31
  */
32
- protected deleteBase<R extends IActionResult>(id: DataTypes.IdType, payload?: IApiPayload<R, any>): R;
33
- protected deleteBase<R extends IActionResult>(ids: DataTypes.IdType[], payload?: IApiPayload<R, any>): R;
32
+ protected deleteBase<R extends IActionResult>(id: DataTypes.IdType, payload?: IApiPayload<R>): R;
33
+ protected deleteBase<R extends IActionResult>(ids: DataTypes.IdType[], payload?: IApiPayload<R>): R;
34
34
  /**
35
35
  * List
36
36
  * @param rq Request data
37
37
  * @param payload Payload
38
38
  * @returns Result
39
39
  */
40
- protected listBase<RQ extends TiplistRQ, R extends object>(rq: RQ, payload?: IApiPayload<R[], any>): Promise<R[] | undefined>;
40
+ protected listBase<RQ extends TiplistRQ, R extends object>(rq: RQ, payload?: IApiPayload<R[]>): Promise<R[] | undefined>;
41
41
  /**
42
42
  * Query
43
43
  * @param rq Request data
44
44
  * @param payload Payload
45
45
  * @returns Result
46
46
  */
47
- protected queryBase<RQ extends QueryRQ, R extends object>(rq: RQ, payload?: IApiPayload<R[], any>): Promise<R[] | undefined>;
47
+ protected queryBase<RQ extends QueryRQ, R extends object>(rq: RQ, payload?: IApiPayload<R[]>): Promise<R[] | undefined>;
48
48
  /**
49
49
  * Read
50
50
  * @param id Id
51
51
  * @param payload Payload
52
52
  * @returns Result
53
53
  */
54
- protected readBase<R extends object>(id: DataTypes.IdType, payload?: IApiPayload<R, any>): Promise<R | undefined>;
54
+ protected readBase<R extends object>(id: DataTypes.IdType, payload?: IApiPayload<R>): Promise<R | undefined>;
55
55
  /**
56
56
  * Sort
57
57
  * @param items Items to sort
@@ -60,19 +60,19 @@ export declare class EntityApi<T extends IApp = IApp> extends BaseApi<T> {
60
60
  */
61
61
  protected sortBase<RQ extends {
62
62
  id: DataTypes.IdType;
63
- }>(items: RQ[], payload?: IApiPayload<number, any>): Promise<number | undefined>;
63
+ }>(items: RQ[], payload?: IApiPayload<number>): Promise<number | undefined>;
64
64
  /**
65
65
  * Update
66
66
  * @param data Modal data
67
67
  * @param payload Payload
68
68
  * @returns Result
69
69
  */
70
- protected updateBase<R extends IActionResult>(data: object, payload?: IApiPayload<R, any>): Promise<R | undefined>;
70
+ protected updateBase<R extends IActionResult>(data: object, payload?: IApiPayload<R>): Promise<R | undefined>;
71
71
  /**
72
72
  * Read for update
73
73
  * @param id Id
74
74
  * @param payload Payload
75
75
  * @returns Result
76
76
  */
77
- protected updateReadBase<R extends object>(id: DataTypes.IdType, payload?: IApiPayload<R, any>): Promise<R | undefined>;
77
+ protected updateReadBase<R extends object>(id: DataTypes.IdType, payload?: IApiPayload<R>): Promise<R | undefined>;
78
78
  }
@@ -30,18 +30,18 @@ export declare class OrgApi extends EntityApi {
30
30
  * @param payload Payload
31
31
  * @returns Result
32
32
  */
33
- query(rq: OrgQueryRQ, payload?: IApiPayload<OrgQueryDto[], any>): Promise<OrgQueryDto[] | undefined>;
33
+ query(rq: OrgQueryRQ, payload?: IApiPayload<OrgQueryDto[]>): Promise<OrgQueryDto[] | undefined>;
34
34
  /**
35
35
  * Switch organization
36
36
  * @param id Organization id
37
37
  * @param serviceId Service id
38
38
  */
39
- switch(id: number, serviceId?: number, payload?: IApiPayload<boolean, any>): Promise<boolean | undefined>;
39
+ switch(id: number, serviceId?: number, payload?: IApiPayload<boolean>): Promise<boolean | undefined>;
40
40
  /**
41
41
  * Update
42
42
  * @param data Modal data
43
43
  * @param payload Payload
44
44
  * @returns Result
45
45
  */
46
- update(data: DataTypes.AddOrEditType<OrgRQ, true>, payload?: IApiPayload<IdActionResult, any>): Promise<IdActionResult<number> | undefined>;
46
+ update(data: DataTypes.AddOrEditType<OrgRQ, true>, payload?: IApiPayload<IdActionResult>): Promise<IdActionResult<number> | undefined>;
47
47
  }
@@ -2,6 +2,10 @@
2
2
  * Organization add/edit request data
3
3
  */
4
4
  export declare type OrgRQ = {
5
+ /**
6
+ * Id
7
+ */
8
+ id: number;
5
9
  /**
6
10
  * Region id
7
11
  */
@@ -23,35 +23,35 @@ export declare class EntityApi<T extends IApp = IApp> extends BaseApi<T> {
23
23
  * @param payload Payload
24
24
  * @returns Result
25
25
  */
26
- protected createBase<R extends IActionResult>(data: object, payload?: IApiPayload<R, any>): Promise<R | undefined>;
26
+ protected createBase<R extends IActionResult>(data: object, payload?: IApiPayload<R>): Promise<R | undefined>;
27
27
  /**
28
28
  * Delete
29
29
  * @param id Id or ids
30
30
  * @param payload Payload
31
31
  */
32
- protected deleteBase<R extends IActionResult>(id: DataTypes.IdType, payload?: IApiPayload<R, any>): R;
33
- protected deleteBase<R extends IActionResult>(ids: DataTypes.IdType[], payload?: IApiPayload<R, any>): R;
32
+ protected deleteBase<R extends IActionResult>(id: DataTypes.IdType, payload?: IApiPayload<R>): R;
33
+ protected deleteBase<R extends IActionResult>(ids: DataTypes.IdType[], payload?: IApiPayload<R>): R;
34
34
  /**
35
35
  * List
36
36
  * @param rq Request data
37
37
  * @param payload Payload
38
38
  * @returns Result
39
39
  */
40
- protected listBase<RQ extends TiplistRQ, R extends object>(rq: RQ, payload?: IApiPayload<R[], any>): Promise<R[] | undefined>;
40
+ protected listBase<RQ extends TiplistRQ, R extends object>(rq: RQ, payload?: IApiPayload<R[]>): Promise<R[] | undefined>;
41
41
  /**
42
42
  * Query
43
43
  * @param rq Request data
44
44
  * @param payload Payload
45
45
  * @returns Result
46
46
  */
47
- protected queryBase<RQ extends QueryRQ, R extends object>(rq: RQ, payload?: IApiPayload<R[], any>): Promise<R[] | undefined>;
47
+ protected queryBase<RQ extends QueryRQ, R extends object>(rq: RQ, payload?: IApiPayload<R[]>): Promise<R[] | undefined>;
48
48
  /**
49
49
  * Read
50
50
  * @param id Id
51
51
  * @param payload Payload
52
52
  * @returns Result
53
53
  */
54
- protected readBase<R extends object>(id: DataTypes.IdType, payload?: IApiPayload<R, any>): Promise<R | undefined>;
54
+ protected readBase<R extends object>(id: DataTypes.IdType, payload?: IApiPayload<R>): Promise<R | undefined>;
55
55
  /**
56
56
  * Sort
57
57
  * @param items Items to sort
@@ -60,19 +60,19 @@ export declare class EntityApi<T extends IApp = IApp> extends BaseApi<T> {
60
60
  */
61
61
  protected sortBase<RQ extends {
62
62
  id: DataTypes.IdType;
63
- }>(items: RQ[], payload?: IApiPayload<number, any>): Promise<number | undefined>;
63
+ }>(items: RQ[], payload?: IApiPayload<number>): Promise<number | undefined>;
64
64
  /**
65
65
  * Update
66
66
  * @param data Modal data
67
67
  * @param payload Payload
68
68
  * @returns Result
69
69
  */
70
- protected updateBase<R extends IActionResult>(data: object, payload?: IApiPayload<R, any>): Promise<R | undefined>;
70
+ protected updateBase<R extends IActionResult>(data: object, payload?: IApiPayload<R>): Promise<R | undefined>;
71
71
  /**
72
72
  * Read for update
73
73
  * @param id Id
74
74
  * @param payload Payload
75
75
  * @returns Result
76
76
  */
77
- protected updateReadBase<R extends object>(id: DataTypes.IdType, payload?: IApiPayload<R, any>): Promise<R | undefined>;
77
+ protected updateReadBase<R extends object>(id: DataTypes.IdType, payload?: IApiPayload<R>): Promise<R | undefined>;
78
78
  }
@@ -30,18 +30,18 @@ export declare class OrgApi extends EntityApi {
30
30
  * @param payload Payload
31
31
  * @returns Result
32
32
  */
33
- query(rq: OrgQueryRQ, payload?: IApiPayload<OrgQueryDto[], any>): Promise<OrgQueryDto[] | undefined>;
33
+ query(rq: OrgQueryRQ, payload?: IApiPayload<OrgQueryDto[]>): Promise<OrgQueryDto[] | undefined>;
34
34
  /**
35
35
  * Switch organization
36
36
  * @param id Organization id
37
37
  * @param serviceId Service id
38
38
  */
39
- switch(id: number, serviceId?: number, payload?: IApiPayload<boolean, any>): Promise<boolean | undefined>;
39
+ switch(id: number, serviceId?: number, payload?: IApiPayload<boolean>): Promise<boolean | undefined>;
40
40
  /**
41
41
  * Update
42
42
  * @param data Modal data
43
43
  * @param payload Payload
44
44
  * @returns Result
45
45
  */
46
- update(data: DataTypes.AddOrEditType<OrgRQ, true>, payload?: IApiPayload<IdActionResult, any>): Promise<IdActionResult<number> | undefined>;
46
+ update(data: DataTypes.AddOrEditType<OrgRQ, true>, payload?: IApiPayload<IdActionResult>): Promise<IdActionResult<number> | undefined>;
47
47
  }
@@ -2,6 +2,10 @@
2
2
  * Organization add/edit request data
3
3
  */
4
4
  export declare type OrgRQ = {
5
+ /**
6
+ * Id
7
+ */
8
+ id: number;
5
9
  /**
6
10
  * Region id
7
11
  */
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@etsoo/appscript",
3
- "version": "1.3.8",
3
+ "version": "1.3.10",
4
4
  "description": "Applications shared TypeScript framework",
5
5
  "main": "lib/cjs/index.js",
6
6
  "module": "lib/mjs/index.js",
@@ -52,9 +52,9 @@
52
52
  },
53
53
  "homepage": "https://github.com/ETSOO/AppScript#readme",
54
54
  "dependencies": {
55
- "@etsoo/notificationbase": "^1.1.12",
56
- "@etsoo/restclient": "^1.0.74",
57
- "@etsoo/shared": "^1.1.62",
55
+ "@etsoo/notificationbase": "^1.1.13",
56
+ "@etsoo/restclient": "^1.0.75",
57
+ "@etsoo/shared": "^1.1.65",
58
58
  "@types/crypto-js": "^4.1.1",
59
59
  "crypto-js": "^4.1.1"
60
60
  },
@@ -28,7 +28,7 @@ export class EntityApi<T extends IApp = IApp> extends BaseApi<T> {
28
28
  */
29
29
  protected createBase<R extends IActionResult>(
30
30
  data: object,
31
- payload?: IApiPayload<R, any>
31
+ payload?: IApiPayload<R>
32
32
  ) {
33
33
  return this.api.put<R>(`${this.flag}/Create`, data, payload);
34
34
  }
@@ -40,15 +40,15 @@ export class EntityApi<T extends IApp = IApp> extends BaseApi<T> {
40
40
  */
41
41
  protected deleteBase<R extends IActionResult>(
42
42
  id: DataTypes.IdType,
43
- payload?: IApiPayload<R, any>
43
+ payload?: IApiPayload<R>
44
44
  ): R;
45
45
  protected deleteBase<R extends IActionResult>(
46
46
  ids: DataTypes.IdType[],
47
- payload?: IApiPayload<R, any>
47
+ payload?: IApiPayload<R>
48
48
  ): R;
49
49
  protected deleteBase<R extends IActionResult>(
50
50
  id: DataTypes.IdType | DataTypes.IdType[],
51
- payload?: IApiPayload<R, any>
51
+ payload?: IApiPayload<R>
52
52
  ) {
53
53
  const query = Array.isArray(id)
54
54
  ? '?' + id.map((item) => `ids=${item}`).join('&')
@@ -68,7 +68,7 @@ export class EntityApi<T extends IApp = IApp> extends BaseApi<T> {
68
68
  */
69
69
  protected listBase<RQ extends TiplistRQ, R extends object>(
70
70
  rq: RQ,
71
- payload?: IApiPayload<R[], any>
71
+ payload?: IApiPayload<R[]>
72
72
  ) {
73
73
  return this.api.post<R[]>(`${this.flag}/List`, rq, payload);
74
74
  }
@@ -81,7 +81,7 @@ export class EntityApi<T extends IApp = IApp> extends BaseApi<T> {
81
81
  */
82
82
  protected queryBase<RQ extends QueryRQ, R extends object>(
83
83
  rq: RQ,
84
- payload?: IApiPayload<R[], any>
84
+ payload?: IApiPayload<R[]>
85
85
  ) {
86
86
  return this.api.post<R[]>(`${this.flag}/Query`, rq, payload);
87
87
  }
@@ -94,7 +94,7 @@ export class EntityApi<T extends IApp = IApp> extends BaseApi<T> {
94
94
  */
95
95
  protected readBase<R extends object>(
96
96
  id: DataTypes.IdType,
97
- payload?: IApiPayload<R, any>
97
+ payload?: IApiPayload<R>
98
98
  ) {
99
99
  return this.api.get<R>(`${this.flag}/Read/${id}`, payload);
100
100
  }
@@ -107,7 +107,7 @@ export class EntityApi<T extends IApp = IApp> extends BaseApi<T> {
107
107
  */
108
108
  protected sortBase<RQ extends { id: DataTypes.IdType }>(
109
109
  items: RQ[],
110
- payload?: IApiPayload<number, any>
110
+ payload?: IApiPayload<number>
111
111
  ) {
112
112
  const rq: Record<DataTypes.IdType, number> = {};
113
113
  items.forEach((item, index) => (rq[item.id] = index));
@@ -122,7 +122,7 @@ export class EntityApi<T extends IApp = IApp> extends BaseApi<T> {
122
122
  */
123
123
  protected updateBase<R extends IActionResult>(
124
124
  data: object,
125
- payload?: IApiPayload<R, any>
125
+ payload?: IApiPayload<R>
126
126
  ) {
127
127
  return this.api.put<R>(`${this.flag}/Update`, data, payload);
128
128
  }
@@ -135,7 +135,7 @@ export class EntityApi<T extends IApp = IApp> extends BaseApi<T> {
135
135
  */
136
136
  protected updateReadBase<R extends object>(
137
137
  id: DataTypes.IdType,
138
- payload?: IApiPayload<R, any>
138
+ payload?: IApiPayload<R>
139
139
  ) {
140
140
  return this.api.get<R>(`${this.flag}/UpdateRead/${id}`, payload);
141
141
  }
package/src/erp/OrgApi.ts CHANGED
@@ -31,7 +31,7 @@ export class OrgApi extends EntityApi {
31
31
  list(
32
32
  items?: number | OrgListRQ,
33
33
  serviceId?: number,
34
- payload?: IApiPayload<ListType[], any>
34
+ payload?: IApiPayload<ListType[]>
35
35
  ) {
36
36
  payload ??= { defaultValue: [], showLoading: false };
37
37
  const rq = typeof items === 'object' ? items : { items, serviceId };
@@ -44,7 +44,7 @@ export class OrgApi extends EntityApi {
44
44
  * @param payload Payload
45
45
  * @returns Result
46
46
  */
47
- query(rq: OrgQueryRQ, payload?: IApiPayload<OrgQueryDto[], any>) {
47
+ query(rq: OrgQueryRQ, payload?: IApiPayload<OrgQueryDto[]>) {
48
48
  return this.queryBase(rq, payload);
49
49
  }
50
50
 
@@ -56,7 +56,7 @@ export class OrgApi extends EntityApi {
56
56
  async switch(
57
57
  id: number,
58
58
  serviceId?: number,
59
- payload?: IApiPayload<boolean, any>
59
+ payload?: IApiPayload<boolean>
60
60
  ) {
61
61
  const result = await this.app.api.put<boolean>(
62
62
  'Organization/Switch',
@@ -79,7 +79,7 @@ export class OrgApi extends EntityApi {
79
79
  */
80
80
  update(
81
81
  data: DataTypes.AddOrEditType<OrgRQ, true>,
82
- payload?: IApiPayload<IdActionResult, any>
82
+ payload?: IApiPayload<IdActionResult>
83
83
  ) {
84
84
  return super.updateBase<IdActionResult>(data, payload);
85
85
  }
@@ -2,6 +2,11 @@
2
2
  * Organization add/edit request data
3
3
  */
4
4
  export type OrgRQ = {
5
+ /**
6
+ * Id
7
+ */
8
+ id: number;
9
+
5
10
  /**
6
11
  * Region id
7
12
  */