Skip to content

Commit

Permalink
Remove unnecessary request utility (#706)
Browse files Browse the repository at this point in the history 
- Use default request utility from legacy source code
- Improve calling structure
- Implement posibility of create endpoint for request
- Allows define a generic calling for backend service
- Remove unnecessary functions
  • Loading branch information
@yamelsenih
yamelsenih authored Apr 1, 2021
1 parent c474244 commit 6f128a0
Show file tree
Hide file tree
Showing 22 changed files with 336 additions and 339 deletions.
8 changes: 2 additions & 6 deletions config/default.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,10 @@
},
"adempiere": {
"api": {
"url": "https://api.erpya.com",
"service": "/adempiere-api",
"fullPath": "https://api.erpya.com/adempiere-api"
"url": "https://api.erpya.com/adempiere-api"
},
"images": {
"url": "https://api.erpya.com",
"service": "/adempiere-api/img",
"fullPath": "https://api.erpya.com/adempiere-api/img"
"url": "https://api.erpya.com/adempiere-api/img"
}
}
}
10 changes: 4 additions & 6 deletions src/api/ADempiere/browser.js
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
// Get Instance for connection
import {
ApiRest as requestRest,
evaluateResponse
} from '@/api/ADempiere/instances.js'
import request from '@/utils/request'
import { config } from '@/utils/ADempiere/config'

/**
* Request a browser search
Expand Down Expand Up @@ -40,7 +38,8 @@ export function requestBrowserSearch({
}
})

return requestRest({
return request({
baseURL: config.adempiere.api.url,
url: '/ui/list-browser-items',
data: {
// Running Parameters
Expand All @@ -60,7 +59,6 @@ export function requestBrowserSearch({
page_size: pageSize
}
})
.then(evaluateResponse)
.then(responseBrowserSearch => {
const { convertEntityList } = require('@/utils/ADempiere/apiConverts/persistence.js')

Expand Down
26 changes: 14 additions & 12 deletions src/api/ADempiere/dashboard/dashboard.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,8 @@
// please if you want to implement a custom dashboard create a new fielwith api definition

// Get Instance for connection
import {
ApiRest as requestRest,
evaluateResponse
} from '@/api/ADempiere/instances.js'
import request from '@/utils/request'
import { config } from '@/utils/ADempiere/config'

// Get Recent Items based on selection option
export function requestListRecentItems({
Expand All @@ -14,8 +12,10 @@ export function requestListRecentItems({
pageToken,
pageSize
}) {
return requestRest({
return request({
baseURL: config.adempiere.api.url,
url: '/logs/list-recent-items',
method: 'post',
data: {
user_uuid: userUuid,
role_uuid: roleUuid,
Expand All @@ -27,7 +27,6 @@ export function requestListRecentItems({
pageSize
}
})
.then(evaluateResponse)
.then(recentItmesReponse => {
const { convertRecentItemsList } = require('@/utils/ADempiere/apiConverts/dashboard.js')

Expand All @@ -45,8 +44,10 @@ export function getFavoritesFromServer({
pageToken,
pageSize
}) {
return requestRest({
return request({
baseURL: config.adempiere.api.url,
url: '/dashboard/list-favorites',
method: 'post',
data: {
user_id: userId,
user_uuid: userUuid
Expand All @@ -57,7 +58,6 @@ export function getFavoritesFromServer({
pageSize
}
})
.then(evaluateResponse)
.then(favoritesListReponse => {
const { convertFavorite } = require('@/utils/ADempiere/apiConverts/dashboard.js')

Expand All @@ -80,8 +80,10 @@ export function getPendingDocumentsFromServer({
pageToken,
pageSize
}) {
return requestRest({
return request({
baseURL: config.adempiere.api.url,
url: '/dashboard/list-pending-documents',
method: 'post',
data: {
user_id: userId,
user_uuid: userUuid,
Expand All @@ -94,7 +96,6 @@ export function getPendingDocumentsFromServer({
pageSize
}
})
.then(evaluateResponse)
.then(pendingDocumentsListResponse => {
const { convertPendingDocument } = require('@/utils/ADempiere/apiConverts/dashboard.js')

Expand All @@ -115,8 +116,10 @@ export function requestLisDashboards({
pageToken,
pageSize
}) {
return requestRest({
return request({
baseURL: config.adempiere.api.url,
url: '/dashboard/list-dashboards',
method: 'post',
data: {
role_id: roleId,
role_uuid: roleUuid
Expand All @@ -127,7 +130,6 @@ export function requestLisDashboards({
pageSize
}
})
.then(evaluateResponse)
.then(dashboardsListResponse => {
const { convertDashboard } = require('@/utils/ADempiere/apiConverts/dashboard.js')

Expand Down
33 changes: 15 additions & 18 deletions src/api/ADempiere/dictionary.js
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
// Get Instance for connection
import {
ApiRest as requestRest,
evaluateResponse
} from '@/api/ADempiere/instances.js'
import request from '@/utils/request'
import { config } from '@/utils/ADempiere/config'

/**
* Request dictionary Window metadata
Expand All @@ -13,15 +11,15 @@ export function requestWindowMetadata({
uuid,
id
}) {
return requestRest({
return request({
baseURL: config.adempiere.api.url,
url: '/dictionary/window',
method: 'get',
params: {
uuid,
id
}
})
.then(evaluateResponse)
.then(windowResponse => {
const { convertWindow } = require('@/utils/ADempiere/apiConverts/dictionary.js')

Expand All @@ -38,15 +36,15 @@ export function requestProcessMetadata({
uuid,
id
}) {
return requestRest({
return request({
baseURL: config.adempiere.api.url,
url: '/dictionary/process',
method: 'get',
params: {
uuid,
id
}
})
.then(evaluateResponse)
.then(processResponse => {
const { convertProcess } = require('@/utils/ADempiere/apiConverts/dictionary.js')

Expand All @@ -63,15 +61,15 @@ export function requestBrowserMetadata({
uuid,
id
}) {
return requestRest({
return request({
baseURL: config.adempiere.api.url,
url: '/dictionary/browser',
method: 'get',
params: {
uuid,
id
}
})
.then(evaluateResponse)
.then(browserResponse => {
const { convertBrowser } = require('@/utils/ADempiere/apiConverts/dictionary.js')

Expand All @@ -88,15 +86,15 @@ export function requestForm({
uuid,
id
}) {
return requestRest({
return request({
baseURL: config.adempiere.api.url,
url: '/dictionary/form',
method: 'get',
params: {
uuid,
id
}
})
.then(evaluateResponse)
.then(formResponse => {
const { convertForm } = require('@/utils/ADempiere/apiConverts/dictionary.js')

Expand All @@ -114,7 +112,8 @@ export function requestFieldMetadata({
columnName,
elementColumnName
}) {
return requestRest({
return request({
baseURL: config.adempiere.api.url,
url: '/dictionary/field',
method: 'get',
params: {
Expand All @@ -128,7 +127,6 @@ export function requestFieldMetadata({
element_column_name: elementColumnName
}
})
.then(evaluateResponse)
.then(fieldResponse => {
const { convertField } = require('@/utils/ADempiere/apiConverts/field.js')

Expand All @@ -140,15 +138,14 @@ export function requestReference({
uuid,
columnName
}) {
return requestRest({
return request({
url: '/dictionary/reference',
method: 'get',
params: {
uuid,
column_name: columnName
}
})
.then(evaluateResponse)
.then(validationResponse => {
const { convertReference } = require('@/utils/ADempiere/apiConverts/field.js')

Expand All @@ -160,15 +157,15 @@ export function requestValidationRule({
uuid,
id
}) {
return requestRest({
return request({
baseURL: config.adempiere.api.url,
url: '/dictionary/validation',
method: 'get',
params: {
uuid,
id
}
})
.then(evaluateResponse)
.then(validationResponse => {
const { convertValidationRule } = require('@/utils/ADempiere/apiConverts/dictionary.js')

Expand Down
22 changes: 10 additions & 12 deletions src/api/ADempiere/enrollment.js
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
// Get Instance for connection
import {
ApiRest as requestRest,
evaluateResponse
} from '@/api/ADempiere/instances.js'
import request from '@/utils/request'
import { config } from '@/utils/ADempiere/config'

const clientVersion = '1.0.0'
const applicationType = 'ADempiere-Vue'
Expand All @@ -19,7 +17,8 @@ export function requestEnrollUser({
password,
eMail
}) {
return requestRest({
return request({
baseURL: config.adempiere.api.url,
url: '/enrollment/enroll',
data: {
user_name: userName,
Expand All @@ -30,7 +29,6 @@ export function requestEnrollUser({
application_type: applicationType
}
})
.then(evaluateResponse)
.then(enrollResponse => {
return {
userName: enrollResponse.user_name,
Expand All @@ -52,7 +50,8 @@ export function requestForgotPassword(eMailOrUserName) {
userName = eMailOrUserName
}

return requestRest({
return request({
baseURL: config.adempiere.api.url,
url: '/enrollment/reset-password',
data: {
user_name: userName,
Expand All @@ -61,7 +60,6 @@ export function requestForgotPassword(eMailOrUserName) {
application_type: applicationType
}
})
.then(evaluateResponse)
.then(forgotResponse => {
return {
responseType: forgotResponse.response_type,
Expand All @@ -79,7 +77,8 @@ export function requestChangePassword({
token,
password
}) {
return requestRest({
return request({
baseURL: config.adempiere.api.url,
url: '/enrollment/change-password',
data: {
token,
Expand All @@ -88,7 +87,6 @@ export function requestChangePassword({
application_type: applicationType
}
})
.then(evaluateResponse)
.then(changePasswordResponse => {
return {
responseType: changePasswordResponse.response_type,
Expand All @@ -105,15 +103,15 @@ export function requestChangePassword({
export function requestActivateUser({
token
}) {
return requestRest({
return request({
baseURL: config.adempiere.api.url,
url: '/enrollment/activate-user',
data: {
token,
client_version: clientVersion,
application_type: applicationType
}
})
.then(evaluateResponse)
.then(activateUserResponse => {
return {
responseType: activateUserResponse.response_type,
Expand Down
13 changes: 8 additions & 5 deletions src/api/ADempiere/field/preference.js
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
// Service for backend based on API
// use this service for consume all related to preference of field
import {
ApiRest as serviceApi
} from '@/api/ADempiere/instances.js'
import request from '@/utils/request'
import { config } from '@/utils/ADempiere/config'

// Update preference from API using criteria
export function setPreference({
Expand All @@ -15,8 +14,10 @@ export function setPreference({
isForCurrentOrganization,
isForCurrentContainer
}) {
return serviceApi({
return request({
baseURL: config.adempiere.api.url,
url: '/ui/set-preference',
method: 'post',
data: {
container_uuid: parentUuid,
column_name: attribute,
Expand All @@ -39,8 +40,10 @@ export function deletePreference({
isForCurrentOrganization,
isForCurrentContainer
}) {
return serviceApi({
return request({
baseURL: config.adempiere.api.url,
url: '/ui/delete-preference',
method: 'post',
data: {
container_uuid: parentUuid,
column_name: attribute,
Expand Down
Loading

0 comments on commit 6f128a0

Please sign in to comment.