Skip to content

Commit 2b1d8f7

Browse files
author
Yamel Senih
authored
Improve request util (#712)
* Improve request util - Improve request util based on basic and generic request - Add ADempiere request layer (use it as template for others) - Add Release information from github - Chamge ADempiere request API fos a custom request * Add release version * Add rt-3.2 version * Minmor change * Add default action for release * Add echo * just a test * Test release * Add Release no version for test * Add test for publish * Add release no from tag
1 parent e2d23df commit 2b1d8f7

File tree

26 files changed

+108
-153
lines changed

26 files changed

+108
-153
lines changed

‎.github/workflows/publish.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ jobs:
3030
node-version: 12
3131
registry-url: https://registry.npmjs.org/
3232
- run: npm i
33+
- run: sed -i "s|releaseNoForDocumentation|${{ github.event.release.tag_name }}|g" config/default.json
3334
- run: npm run build:prod --if-present
3435
- uses: TheDoctor0/zip-release@0.4.1
3536
with:

‎config/default.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,9 @@
1010
"images": {
1111
"url": "https://api.erpya.com/adempiere-api/img"
1212
}
13+
},
14+
"repository": {
15+
"url": "https://api.github.com",
16+
"releaseNo": "releaseNoForDocumentation"
1317
}
1418
}

‎src/api/ADempiere/browser.js‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
// Get Instance for connection
2-
import request from '@/utils/request'
3-
import { config } from '@/utils/ADempiere/config'
2+
import { request } from '@/utils/ADempiere/request'
43

54
/**
65
* Request a browser search
@@ -39,7 +38,6 @@ export function requestBrowserSearch({
3938
})
4039

4140
return request({
42-
baseURL: config.adempiere.api.url,
4341
url: '/ui/list-browser-items',
4442
data: {
4543
// Running Parameters

‎src/api/ADempiere/dashboard/dashboard.js‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
// please if you want to implement a custom dashboard create a new fielwith api definition
33

44
// Get Instance for connection
5-
import request from '@/utils/request'
6-
import { config } from '@/utils/ADempiere/config'
5+
import { request } from '@/utils/ADempiere/request'
76

87
// Get Recent Items based on selection option
98
export function requestListRecentItems({
@@ -13,7 +12,6 @@ export function requestListRecentItems({
1312
pageSize
1413
}) {
1514
return request({
16-
baseURL: config.adempiere.api.url,
1715
url: '/logs/list-recent-items',
1816
method: 'post',
1917
data: {
@@ -45,7 +43,6 @@ export function getFavoritesFromServer({
4543
pageSize
4644
}) {
4745
return request({
48-
baseURL: config.adempiere.api.url,
4946
url: '/dashboard/list-favorites',
5047
method: 'post',
5148
data: {
@@ -81,7 +78,6 @@ export function getPendingDocumentsFromServer({
8178
pageSize
8279
}) {
8380
return request({
84-
baseURL: config.adempiere.api.url,
8581
url: '/dashboard/list-pending-documents',
8682
method: 'post',
8783
data: {
@@ -117,7 +113,6 @@ export function requestLisDashboards({
117113
pageSize
118114
}) {
119115
return request({
120-
baseURL: config.adempiere.api.url,
121116
url: '/dashboard/list-dashboards',
122117
method: 'post',
123118
data: {

‎src/api/ADempiere/dictionary.js‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
// Get Instance for connection
2-
import request from '@/utils/request'
3-
import { config } from '@/utils/ADempiere/config'
2+
import { request } from '@/utils/ADempiere/request'
43

54
/**
65
* Request dictionary Window metadata
@@ -12,7 +11,6 @@ export function requestWindowMetadata({
1211
id
1312
}) {
1413
return request({
15-
baseURL: config.adempiere.api.url,
1614
url: '/dictionary/window',
1715
method: 'get',
1816
params: {
@@ -37,7 +35,6 @@ export function requestProcessMetadata({
3735
id
3836
}) {
3937
return request({
40-
baseURL: config.adempiere.api.url,
4138
url: '/dictionary/process',
4239
method: 'get',
4340
params: {
@@ -62,7 +59,6 @@ export function requestBrowserMetadata({
6259
id
6360
}) {
6461
return request({
65-
baseURL: config.adempiere.api.url,
6662
url: '/dictionary/browser',
6763
method: 'get',
6864
params: {
@@ -87,7 +83,6 @@ export function requestForm({
8783
id
8884
}) {
8985
return request({
90-
baseURL: config.adempiere.api.url,
9186
url: '/dictionary/form',
9287
method: 'get',
9388
params: {
@@ -113,7 +108,6 @@ export function requestFieldMetadata({
113108
elementColumnName
114109
}) {
115110
return request({
116-
baseURL: config.adempiere.api.url,
117111
url: '/dictionary/field',
118112
method: 'get',
119113
params: {
@@ -158,7 +152,6 @@ export function requestValidationRule({
158152
id
159153
}) {
160154
return request({
161-
baseURL: config.adempiere.api.url,
162155
url: '/dictionary/validation',
163156
method: 'get',
164157
params: {

‎src/api/ADempiere/enrollment.js‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
// Get Instance for connection
2-
import request from '@/utils/request'
3-
import { config } from '@/utils/ADempiere/config'
2+
import { request } from '@/utils/ADempiere/request'
43

54
const clientVersion = '1.0.0'
65
const applicationType = 'ADempiere-Vue'
@@ -18,7 +17,6 @@ export function requestEnrollUser({
1817
eMail
1918
}) {
2019
return request({
21-
baseURL: config.adempiere.api.url,
2220
url: '/enrollment/enroll',
2321
data: {
2422
user_name: userName,
@@ -51,7 +49,6 @@ export function requestForgotPassword(eMailOrUserName) {
5149
}
5250

5351
return request({
54-
baseURL: config.adempiere.api.url,
5552
url: '/enrollment/reset-password',
5653
data: {
5754
user_name: userName,
@@ -78,7 +75,6 @@ export function requestChangePassword({
7875
password
7976
}) {
8077
return request({
81-
baseURL: config.adempiere.api.url,
8278
url: '/enrollment/change-password',
8379
data: {
8480
token,
@@ -104,7 +100,6 @@ export function requestActivateUser({
104100
token
105101
}) {
106102
return request({
107-
baseURL: config.adempiere.api.url,
108103
url: '/enrollment/activate-user',
109104
data: {
110105
token,

‎src/api/ADempiere/field/preference.js‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// Service for backend based on API
22
// use this service for consume all related to preference of field
3-
import request from '@/utils/request'
4-
import { config } from '@/utils/ADempiere/config'
3+
import { request } from '@/utils/ADempiere/request'
54

65
// Update preference from API using criteria
76
export function setPreference({
@@ -15,7 +14,6 @@ export function setPreference({
1514
isForCurrentContainer
1615
}) {
1716
return request({
18-
baseURL: config.adempiere.api.url,
1917
url: '/ui/set-preference',
2018
method: 'post',
2119
data: {
@@ -41,7 +39,6 @@ export function deletePreference({
4139
isForCurrentContainer
4240
}) {
4341
return request({
44-
baseURL: config.adempiere.api.url,
4542
url: '/ui/delete-preference',
4643
method: 'post',
4744
data: {

‎src/api/ADempiere/form/point-of-sales.js‎

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
// Get Instance for connection
2-
import request from '@/utils/request'
3-
import { config } from '@/utils/ADempiere/config'
2+
import { request } from '@/utils/ADempiere/request'
43

54
import { isEmptyValue } from '@/utils/ADempiere'
65

@@ -16,7 +15,6 @@ export function requestGetPointOfSales({
1615
posUuid
1716
}) {
1817
return request({
19-
baseURL: config.adempiere.api.url,
2018
url: '/pos/get-point-of-sales',
2119
method: 'post',
2220
data: {
@@ -37,7 +35,6 @@ export function requestListPointOfSales({
3735
pageToken
3836
}) {
3937
return request({
40-
baseURL: config.adempiere.api.url,
4138
url: '/pos/list-point-of-sales',
4239
method: 'post',
4340
data: {
@@ -69,7 +66,6 @@ export function requestCreateOrder({
6966
salesRepresentativeUuid
7067
}) {
7168
return request({
72-
baseURL: config.adempiere.api.url,
7369
url: '/pos/create-order',
7470
method: 'post',
7571
data: {
@@ -94,7 +90,6 @@ export function requestUpdateOrder({
9490
description
9591
}) {
9692
return request({
97-
baseURL: config.adempiere.api.url,
9893
url: '/pos/update-order',
9994
method: 'post',
10095
data: {
@@ -114,7 +109,6 @@ export function requestUpdateOrder({
114109
// Get order from uuid
115110
export function requestGetOrder(orderUuid) {
116111
return request({
117-
baseURL: config.adempiere.api.url,
118112
url: '/pos/get-order',
119113
method: 'post',
120114
data: {
@@ -137,7 +131,6 @@ export function requestDeleteOrder({
137131
// salesRepresentativeUuid
138132
}) {
139133
return request({
140-
baseURL: config.adempiere.api.url,
141134
url: '/pos/delete-order',
142135
method: 'post',
143136
data: {
@@ -213,7 +206,6 @@ export function requestListOrders({
213206
*/
214207

215208
return request({
216-
baseURL: config.adempiere.api.url,
217209
url: '/pos/list-orders',
218210
method: 'post',
219211
data: {
@@ -260,7 +252,6 @@ export function requestCreateOrderLine({
260252
discountRate
261253
}) {
262254
return request({
263-
baseURL: config.adempiere.api.url,
264255
url: '/pos/create-order-line',
265256
method: 'post',
266257
data: {
@@ -290,7 +281,6 @@ export function requestUpdateOrderLine({
290281
discountRate
291282
}) {
292283
return request({
293-
baseURL: config.adempiere.api.url,
294284
url: '/pos/update-order-line',
295285
method: 'post',
296286
data: {
@@ -314,7 +304,6 @@ export function requestDeleteOrderLine({
314304
orderLineUuid
315305
}) {
316306
return request({
317-
baseURL: config.adempiere.api.url,
318307
url: '/pos/delete-order-line',
319308
method: 'post',
320309
data: {
@@ -332,7 +321,6 @@ export function requestListOrderLines({
332321
pageToken
333322
}) {
334323
return request({
335-
baseURL: config.adempiere.api.url,
336324
url: '/pos/list-order-lines',
337325
method: 'post',
338326
data: {
@@ -358,7 +346,6 @@ export function requestListOrderLines({
358346

359347
export function getKeyLayout({ keyLayoutUuid }) {
360348
return request({
361-
baseURL: config.adempiere.api.url,
362349
url: '/pos/get-key-layout',
363350
method: 'post',
364351
data: {
@@ -385,7 +372,6 @@ export function getProductPriceList({
385372
pageToken
386373
}) {
387374
return request({
388-
baseURL: config.adempiere.api.url,
389375
url: '/pos/list-product-prices',
390376
method: 'post',
391377
data: {
@@ -473,7 +459,6 @@ export function createPayment({
473459
currencyUuid
474460
}) {
475461
return request({
476-
baseURL: config.adempiere.api.url,
477462
url: '/pos/create-payment',
478463
method: 'post',
479464
data: {
@@ -506,7 +491,6 @@ export function updatePayment({
506491
tenderTypeCode
507492
}) {
508493
return request({
509-
baseURL: config.adempiere.api.url,
510494
url: '/pos/update-payment',
511495
method: 'post',
512496
data: {
@@ -530,7 +514,6 @@ export function deletePayment({
530514
paymentUuid
531515
}) {
532516
return request({
533-
baseURL: config.adempiere.api.url,
534517
url: '/pos/delete-payment',
535518
method: 'post',
536519
data: {
@@ -549,7 +532,6 @@ export function getPaymentsList({
549532
orderUuid
550533
}) {
551534
return request({
552-
baseURL: config.adempiere.api.url,
553535
url: '/pos/list-payments',
554536
method: 'post',
555537
data: {
@@ -611,7 +593,6 @@ export function processOrder({
611593
})
612594
}
613595
return request({
614-
baseURL: config.adempiere.api.url,
615596
url: '/pos/process-order',
616597
method: 'post',
617598
data: {

‎src/api/ADempiere/form/price-checking.js‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
// Get Instance for connectionimport {
2-
import request from '@/utils/request'
3-
import { config } from '@/utils/ADempiere/config'
2+
import { request } from '@/utils/ADempiere/request'
43

54
// List Point of sales
65
export function requestGetProductPrice({
@@ -14,7 +13,6 @@ export function requestGetProductPrice({
1413
validFrom
1514
}) {
1615
return request({
17-
baseURL: config.adempiere.api.url,
1816
url: '/pos/get-product-price',
1917
method: 'post',
2018
data: {

0 commit comments

Comments
 (0)