diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 8f1a9c35..e56a456a 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -30,6 +30,7 @@ jobs: node-version: 12 registry-url: https://registry.npmjs.org/ - run: npm i + - run: sed -i "s|releaseNoForDocumentation|${{ github.event.release.tag_name }}|g" config/default.json - run: npm run build:prod --if-present - uses: TheDoctor0/zip-release@0.4.1 with: diff --git a/config/default.json b/config/default.json index 15f40bc3..29c4edee 100644 --- a/config/default.json +++ b/config/default.json @@ -10,5 +10,9 @@ "images": { "url": "https://api.erpya.com/adempiere-api/img" } + }, + "repository": { + "url": "https://api.github.com", + "releaseNo": "releaseNoForDocumentation" } } diff --git a/src/api/ADempiere/browser.js b/src/api/ADempiere/browser.js index 82fc738a..cf98168a 100644 --- a/src/api/ADempiere/browser.js +++ b/src/api/ADempiere/browser.js @@ -1,6 +1,5 @@ // Get Instance for connection -import request from '@/utils/request' -import { config } from '@/utils/ADempiere/config' +import { request } from '@/utils/ADempiere/request' /** * Request a browser search @@ -39,7 +38,6 @@ export function requestBrowserSearch({ }) return request({ - baseURL: config.adempiere.api.url, url: '/ui/list-browser-items', data: { // Running Parameters diff --git a/src/api/ADempiere/dashboard/dashboard.js b/src/api/ADempiere/dashboard/dashboard.js index 8e95e47a..c7010dd3 100644 --- a/src/api/ADempiere/dashboard/dashboard.js +++ b/src/api/ADempiere/dashboard/dashboard.js @@ -2,8 +2,7 @@ // please if you want to implement a custom dashboard create a new fielwith api definition // Get Instance for connection -import request from '@/utils/request' -import { config } from '@/utils/ADempiere/config' +import { request } from '@/utils/ADempiere/request' // Get Recent Items based on selection option export function requestListRecentItems({ @@ -13,7 +12,6 @@ export function requestListRecentItems({ pageSize }) { return request({ - baseURL: config.adempiere.api.url, url: '/logs/list-recent-items', method: 'post', data: { @@ -45,7 +43,6 @@ export function getFavoritesFromServer({ pageSize }) { return request({ - baseURL: config.adempiere.api.url, url: '/dashboard/list-favorites', method: 'post', data: { @@ -81,7 +78,6 @@ export function getPendingDocumentsFromServer({ pageSize }) { return request({ - baseURL: config.adempiere.api.url, url: '/dashboard/list-pending-documents', method: 'post', data: { @@ -117,7 +113,6 @@ export function requestLisDashboards({ pageSize }) { return request({ - baseURL: config.adempiere.api.url, url: '/dashboard/list-dashboards', method: 'post', data: { diff --git a/src/api/ADempiere/dictionary.js b/src/api/ADempiere/dictionary.js index 0d641189..f53bc75f 100644 --- a/src/api/ADempiere/dictionary.js +++ b/src/api/ADempiere/dictionary.js @@ -1,6 +1,5 @@ // Get Instance for connection -import request from '@/utils/request' -import { config } from '@/utils/ADempiere/config' +import { request } from '@/utils/ADempiere/request' /** * Request dictionary Window metadata @@ -12,7 +11,6 @@ export function requestWindowMetadata({ id }) { return request({ - baseURL: config.adempiere.api.url, url: '/dictionary/window', method: 'get', params: { @@ -37,7 +35,6 @@ export function requestProcessMetadata({ id }) { return request({ - baseURL: config.adempiere.api.url, url: '/dictionary/process', method: 'get', params: { @@ -62,7 +59,6 @@ export function requestBrowserMetadata({ id }) { return request({ - baseURL: config.adempiere.api.url, url: '/dictionary/browser', method: 'get', params: { @@ -87,7 +83,6 @@ export function requestForm({ id }) { return request({ - baseURL: config.adempiere.api.url, url: '/dictionary/form', method: 'get', params: { @@ -113,7 +108,6 @@ export function requestFieldMetadata({ elementColumnName }) { return request({ - baseURL: config.adempiere.api.url, url: '/dictionary/field', method: 'get', params: { @@ -158,7 +152,6 @@ export function requestValidationRule({ id }) { return request({ - baseURL: config.adempiere.api.url, url: '/dictionary/validation', method: 'get', params: { diff --git a/src/api/ADempiere/enrollment.js b/src/api/ADempiere/enrollment.js index cc879bb6..3fb6fd04 100644 --- a/src/api/ADempiere/enrollment.js +++ b/src/api/ADempiere/enrollment.js @@ -1,6 +1,5 @@ // Get Instance for connection -import request from '@/utils/request' -import { config } from '@/utils/ADempiere/config' +import { request } from '@/utils/ADempiere/request' const clientVersion = '1.0.0' const applicationType = 'ADempiere-Vue' @@ -18,7 +17,6 @@ export function requestEnrollUser({ eMail }) { return request({ - baseURL: config.adempiere.api.url, url: '/enrollment/enroll', data: { user_name: userName, @@ -51,7 +49,6 @@ export function requestForgotPassword(eMailOrUserName) { } return request({ - baseURL: config.adempiere.api.url, url: '/enrollment/reset-password', data: { user_name: userName, @@ -78,7 +75,6 @@ export function requestChangePassword({ password }) { return request({ - baseURL: config.adempiere.api.url, url: '/enrollment/change-password', data: { token, @@ -104,7 +100,6 @@ export function requestActivateUser({ token }) { return request({ - baseURL: config.adempiere.api.url, url: '/enrollment/activate-user', data: { token, diff --git a/src/api/ADempiere/field/preference.js b/src/api/ADempiere/field/preference.js index ddd1fcb4..010443ff 100644 --- a/src/api/ADempiere/field/preference.js +++ b/src/api/ADempiere/field/preference.js @@ -1,7 +1,6 @@ // Service for backend based on API // use this service for consume all related to preference of field -import request from '@/utils/request' -import { config } from '@/utils/ADempiere/config' +import { request } from '@/utils/ADempiere/request' // Update preference from API using criteria export function setPreference({ @@ -15,7 +14,6 @@ export function setPreference({ isForCurrentContainer }) { return request({ - baseURL: config.adempiere.api.url, url: '/ui/set-preference', method: 'post', data: { @@ -41,7 +39,6 @@ export function deletePreference({ isForCurrentContainer }) { return request({ - baseURL: config.adempiere.api.url, url: '/ui/delete-preference', method: 'post', data: { diff --git a/src/api/ADempiere/form/point-of-sales.js b/src/api/ADempiere/form/point-of-sales.js index bdf687c7..5b5f3613 100644 --- a/src/api/ADempiere/form/point-of-sales.js +++ b/src/api/ADempiere/form/point-of-sales.js @@ -1,6 +1,5 @@ // Get Instance for connection -import request from '@/utils/request' -import { config } from '@/utils/ADempiere/config' +import { request } from '@/utils/ADempiere/request' import { isEmptyValue } from '@/utils/ADempiere' @@ -16,7 +15,6 @@ export function requestGetPointOfSales({ posUuid }) { return request({ - baseURL: config.adempiere.api.url, url: '/pos/get-point-of-sales', method: 'post', data: { @@ -37,7 +35,6 @@ export function requestListPointOfSales({ pageToken }) { return request({ - baseURL: config.adempiere.api.url, url: '/pos/list-point-of-sales', method: 'post', data: { @@ -69,7 +66,6 @@ export function requestCreateOrder({ salesRepresentativeUuid }) { return request({ - baseURL: config.adempiere.api.url, url: '/pos/create-order', method: 'post', data: { @@ -94,7 +90,6 @@ export function requestUpdateOrder({ description }) { return request({ - baseURL: config.adempiere.api.url, url: '/pos/update-order', method: 'post', data: { @@ -114,7 +109,6 @@ export function requestUpdateOrder({ // Get order from uuid export function requestGetOrder(orderUuid) { return request({ - baseURL: config.adempiere.api.url, url: '/pos/get-order', method: 'post', data: { @@ -137,7 +131,6 @@ export function requestDeleteOrder({ // salesRepresentativeUuid }) { return request({ - baseURL: config.adempiere.api.url, url: '/pos/delete-order', method: 'post', data: { @@ -213,7 +206,6 @@ export function requestListOrders({ */ return request({ - baseURL: config.adempiere.api.url, url: '/pos/list-orders', method: 'post', data: { @@ -260,7 +252,6 @@ export function requestCreateOrderLine({ discountRate }) { return request({ - baseURL: config.adempiere.api.url, url: '/pos/create-order-line', method: 'post', data: { @@ -290,7 +281,6 @@ export function requestUpdateOrderLine({ discountRate }) { return request({ - baseURL: config.adempiere.api.url, url: '/pos/update-order-line', method: 'post', data: { @@ -314,7 +304,6 @@ export function requestDeleteOrderLine({ orderLineUuid }) { return request({ - baseURL: config.adempiere.api.url, url: '/pos/delete-order-line', method: 'post', data: { @@ -332,7 +321,6 @@ export function requestListOrderLines({ pageToken }) { return request({ - baseURL: config.adempiere.api.url, url: '/pos/list-order-lines', method: 'post', data: { @@ -358,7 +346,6 @@ export function requestListOrderLines({ export function getKeyLayout({ keyLayoutUuid }) { return request({ - baseURL: config.adempiere.api.url, url: '/pos/get-key-layout', method: 'post', data: { @@ -385,7 +372,6 @@ export function getProductPriceList({ pageToken }) { return request({ - baseURL: config.adempiere.api.url, url: '/pos/list-product-prices', method: 'post', data: { @@ -473,7 +459,6 @@ export function createPayment({ currencyUuid }) { return request({ - baseURL: config.adempiere.api.url, url: '/pos/create-payment', method: 'post', data: { @@ -506,7 +491,6 @@ export function updatePayment({ tenderTypeCode }) { return request({ - baseURL: config.adempiere.api.url, url: '/pos/update-payment', method: 'post', data: { @@ -530,7 +514,6 @@ export function deletePayment({ paymentUuid }) { return request({ - baseURL: config.adempiere.api.url, url: '/pos/delete-payment', method: 'post', data: { @@ -549,7 +532,6 @@ export function getPaymentsList({ orderUuid }) { return request({ - baseURL: config.adempiere.api.url, url: '/pos/list-payments', method: 'post', data: { @@ -611,7 +593,6 @@ export function processOrder({ }) } return request({ - baseURL: config.adempiere.api.url, url: '/pos/process-order', method: 'post', data: { diff --git a/src/api/ADempiere/form/price-checking.js b/src/api/ADempiere/form/price-checking.js index e296c43d..d0639ae5 100644 --- a/src/api/ADempiere/form/price-checking.js +++ b/src/api/ADempiere/form/price-checking.js @@ -1,6 +1,5 @@ // Get Instance for connectionimport { -import request from '@/utils/request' -import { config } from '@/utils/ADempiere/config' +import { request } from '@/utils/ADempiere/request' // List Point of sales export function requestGetProductPrice({ @@ -14,7 +13,6 @@ export function requestGetProductPrice({ validFrom }) { return request({ - baseURL: config.adempiere.api.url, url: '/pos/get-product-price', method: 'post', data: { diff --git a/src/api/ADempiere/persistence.js b/src/api/ADempiere/persistence.js index 2d4c1266..d0979c8c 100644 --- a/src/api/ADempiere/persistence.js +++ b/src/api/ADempiere/persistence.js @@ -1,6 +1,5 @@ // Get Instance for connection -import request from '@/utils/request' -import { config } from '@/utils/ADempiere/config' +import { request } from '@/utils/ADempiere/request' /** * Create entity @@ -19,7 +18,6 @@ export function requestCreateEntity({ }) return request({ - baseURL: config.adempiere.api.url, url: '/data/create', method: 'post', data: { @@ -55,7 +53,6 @@ export function requestUpdateEntity({ }) return request({ - baseURL: config.adempiere.api.url, url: '/data/update', method: 'post', data: { @@ -84,7 +81,6 @@ export function requestDeleteEntity({ recordUuid }) { return request({ - baseURL: config.adempiere.api.url, url: '/data/delete', method: 'post', data: { @@ -110,7 +106,6 @@ export function rollbackEntity({ eventType }) { return request({ - baseURL: config.adempiere.api.url, url: '/data/rollback-entity', method: 'post', data: { @@ -134,7 +129,6 @@ export function requestGetEntity({ recordUuid }) { return request({ - baseURL: config.adempiere.api.url, url: '/data/entity', method: 'get', params: { @@ -183,7 +177,6 @@ export function requestListEntities({ }) return request({ - baseURL: config.adempiere.api.url, url: '/data/list', method: 'post', data: { @@ -226,7 +219,6 @@ export function requestTranslations({ pageSize }) { return request({ - baseURL: config.adempiere.api.url, url: '/ui/list-translations', method: 'post', data: { @@ -261,7 +253,6 @@ export function requestResource({ resourceUuid }, callBack = { onEnd: () => {} }) { const stream = request({ - baseURL: config.adempiere.api.url, url: '/resource', method: 'get', params: { @@ -302,7 +293,6 @@ export function requestImage({ }) return request({ - baseURL: config.adempiere.api.url, url: urn, method: 'get', responseType: 'arraybuffer' diff --git a/src/api/ADempiere/private-access.js b/src/api/ADempiere/private-access.js index 781d2d68..c360d53d 100644 --- a/src/api/ADempiere/private-access.js +++ b/src/api/ADempiere/private-access.js @@ -1,6 +1,5 @@ // Get Instance for connection -import request from '@/utils/request' -import { config } from '@/utils/ADempiere/config' +import { request } from '@/utils/ADempiere/request' import { convertPrivateAccess } from '@/utils/ADempiere/apiConverts/privateAccess.js' @@ -11,7 +10,6 @@ export function requestGetPrivateAccess({ recordUuid }) { return request({ - baseURL: config.adempiere.api.url, url: '/ui/get-private-access', method: 'post', data: { @@ -32,7 +30,6 @@ export function requestLockPrivateAccess({ recordUuid }) { return request({ - baseURL: config.adempiere.api.url, url: '/ui/lock-private-access', method: 'post', data: { @@ -53,7 +50,6 @@ export function requestUnlockPrivateAccess({ recordUuid }) { return request({ - baseURL: config.adempiere.api.url, url: '/ui/unlock-private-access', method: 'post', data: { @@ -81,7 +77,6 @@ export function getAccessList({ sessionUuid }) { return request({ - baseURL: config.adempiere.api.url, url: '/ui/update-access-record', method: 'post', params: { @@ -110,7 +105,6 @@ export function updateAccessRecord({ listRecord }) { return request({ - baseURL: config.adempiere.api.url, url: '/ui/update-access-record', method: 'post', params: { diff --git a/src/api/ADempiere/process.js b/src/api/ADempiere/process.js index 4cb97ec5..32b84626 100644 --- a/src/api/ADempiere/process.js +++ b/src/api/ADempiere/process.js @@ -1,6 +1,5 @@ // Get Instance for connection -import request from '@/utils/request' -import { config } from '@/utils/ADempiere/config' +import { request } from '@/utils/ADempiere/request' /** * Request a process @@ -42,7 +41,6 @@ export function requestRunProcess({ }) return request({ - baseURL: config.adempiere.api.url, url: '/data/process', method: 'post', data: { @@ -78,7 +76,6 @@ export function requestListProcessesLogs({ }) { // Get Process Activity return request({ - baseURL: config.adempiere.api.url, url: '/logs/list-process-logs', method: 'post', data: { diff --git a/src/api/ADempiere/report.js b/src/api/ADempiere/report.js index fc5d27df..53c36790 100644 --- a/src/api/ADempiere/report.js +++ b/src/api/ADempiere/report.js @@ -1,6 +1,5 @@ // Get Instance for connection -import request from '@/utils/request' -import { config } from '@/utils/ADempiere/config' +import { request } from '@/utils/ADempiere/request' /** * Request Pending Documents List @@ -14,7 +13,6 @@ export function requestListReportsViews({ pageSize }) { return request({ - baseURL: config.adempiere.api.url, url: '/ui/list-report-views', method: 'post', data: { @@ -48,7 +46,6 @@ export function requestListPrintFormats({ pageSize }) { return request({ - baseURL: config.adempiere.api.url, url: '/ui/list-print-formats', method: 'post', data: { @@ -75,7 +72,6 @@ export function requestListDrillTables({ pageSize }) { return request({ - baseURL: config.adempiere.api.url, url: '/ui/list-drill-tables', method: 'post', data: { @@ -114,7 +110,6 @@ export function requestGetReportOutput({ orderByClause }) { return request({ - baseURL: config.adempiere.api.url, url: '/ui/get-report-output', method: 'post', data: { diff --git a/src/api/ADempiere/rule.js b/src/api/ADempiere/rule.js index e5627c2b..e650d6a8 100644 --- a/src/api/ADempiere/rule.js +++ b/src/api/ADempiere/rule.js @@ -1,6 +1,5 @@ // Get Instance for connection -import request from '@/utils/request' -import { config } from '@/utils/ADempiere/config' +import { request } from '@/utils/ADempiere/request' /** * Run callout request @@ -27,7 +26,6 @@ export function runCallOutRequest({ attributesList = [] }) { return request({ - baseURL: config.adempiere.api.url, url: '/ui/run-callout', method: 'post', data: { diff --git a/src/api/ADempiere/system-core.js b/src/api/ADempiere/system-core.js index fb25c437..ee65ecbe 100644 --- a/src/api/ADempiere/system-core.js +++ b/src/api/ADempiere/system-core.js @@ -1,6 +1,5 @@ // Get Instance for connection -import request from '@/utils/request' -import { config } from '@/utils/ADempiere/config' +import { request } from '@/utils/ADempiere/request' // Get Organization list from role export function requestOrganizationsList({ @@ -10,7 +9,6 @@ export function requestOrganizationsList({ pageSize }) { return request({ - baseURL: config.adempiere.api.url, url: '/core/list-organizations', method: 'post', data: { @@ -44,7 +42,6 @@ export function requestWarehousesList({ pageSize }) { return request({ - baseURL: config.adempiere.api.url, url: '/core/list-warehouses', method: 'post', data: { @@ -76,7 +73,6 @@ export function requestGetCountryDefinition({ uuid }) { return request({ - baseURL: config.adempiere.api.url, url: '/core/country', method: 'get', params: { @@ -97,7 +93,6 @@ export function requestLanguagesList({ pageSize }) { return request({ - baseURL: config.adempiere.api.url, url: '/core/list-languages', method: 'post', params: { @@ -145,7 +140,6 @@ export function requestCreateBusinessPartner({ posUuid }) { return request({ - baseURL: config.adempiere.api.url, url: '/core/create-business-partner', method: 'post', data: { @@ -185,7 +179,6 @@ export function requestGetBusinessPartner({ searchValue }) { return request({ - baseURL: config.adempiere.api.url, url: '/core/get-business-partner', method: 'get', params: { @@ -213,7 +206,6 @@ export function requestListBusinessPartner({ pageToken }) { return request({ - baseURL: config.adempiere.api.url, url: '/core/list-business-partner', method: 'post', data: { @@ -259,7 +251,6 @@ export function requestGetConversionRate({ conversionDate }) { return request({ - baseURL: config.adempiere.api.url, url: '/core/get-conversion-rate', method: 'post', data: { diff --git a/src/api/ADempiere/user-interface.js b/src/api/ADempiere/user-interface.js index 8b9824f6..30d2e41d 100644 --- a/src/api/ADempiere/user-interface.js +++ b/src/api/ADempiere/user-interface.js @@ -1,6 +1,5 @@ // Get Instance for connection -import request from '@/utils/request' -import { config } from '@/utils/ADempiere/config' +import { request } from '@/utils/ADempiere/request' /** * Get Attachment @@ -12,7 +11,6 @@ export function requestResourceReference({ recordUuid }) { return request({ - baseURL: config.adempiere.api.url, url: '/ui/resource-reference', method: 'get', params: { @@ -37,7 +35,6 @@ export function requestAttachment({ recordUuid }) { return request({ - baseURL: config.adempiere.api.url, url: '/ui/attachment', method: 'get', params: { diff --git a/src/api/ADempiere/values.js b/src/api/ADempiere/values.js index 5a91c480..cbb63a19 100644 --- a/src/api/ADempiere/values.js +++ b/src/api/ADempiere/values.js @@ -1,6 +1,5 @@ // Get Instance for connection -import request from '@/utils/request' -import { config } from '@/utils/ADempiere/config' +import { request } from '@/utils/ADempiere/request' import { isEmptyValue } from '@/utils/ADempiere/valueUtils.js' @@ -23,7 +22,6 @@ export function requestLookup({ }] } return request({ - baseURL: config.adempiere.api.url, url: '/ui/get-lookup-item', method: 'post', data: { @@ -65,7 +63,6 @@ export function requestLookupList({ } return request({ - baseURL: config.adempiere.api.url, url: '/ui/list-lookup-items', method: 'post', data: { @@ -105,7 +102,6 @@ export function requestReferencesList({ pageSize }) { return request({ - baseURL: config.adempiere.api.url, url: '/ui/list-references', method: 'post', data: { @@ -130,7 +126,6 @@ export function requestReferencesList({ // Get default value for a field export function requestDefaultValue(query) { return request({ - baseURL: config.adempiere.api.url, url: '/ui/get-default-value', method: 'post', data: { @@ -154,7 +149,6 @@ export function requestGetContextInfoValue({ query }) { return request({ - baseURL: config.adempiere.api.url, url: '/ui/get-context-info-value', method: 'post', data: { diff --git a/src/api/ADempiere/window.js b/src/api/ADempiere/window.js index 0858d6bb..e0a52d3f 100644 --- a/src/api/ADempiere/window.js +++ b/src/api/ADempiere/window.js @@ -1,6 +1,5 @@ // Get Instance for connection -import request from '@/utils/request' -import { config } from '@/utils/ADempiere/config' +import { request } from '@/utils/ADempiere/request' // Get list of log for a records export function requestListEntityLogs({ @@ -11,7 +10,6 @@ export function requestListEntityLogs({ pageSize }) { return request({ - baseURL: config.adempiere.api.url, url: '/logs/list-entity-logs', method: 'post', data: { @@ -47,7 +45,6 @@ export function requestListWorkflowsLogs({ pageSize }) { return request({ - baseURL: config.adempiere.api.url, url: '/logs/list-workflow-logs', method: 'post', data: { @@ -81,7 +78,6 @@ export function requestListWorkflows({ pageSize }) { return request({ - baseURL: config.adempiere.api.url, url: '/workflow/list-workflow', method: 'post', data: { @@ -120,7 +116,6 @@ export function requestListEntityChats({ pageSize }) { return request({ - baseURL: config.adempiere.api.url, url: '/logs/list-entity-chats', method: 'post', data: { @@ -159,7 +154,6 @@ export function requestListChatsEntries({ pageSize }) { return request({ - baseURL: config.adempiere.api.url, url: '/logs/list-chat-entries', method: 'post', data: { @@ -198,7 +192,6 @@ export function requestCreateChatEntry({ comment }) { return request({ - baseURL: config.adempiere.api.url, url: '/ui/create-chat-entry', method: 'post', data: { @@ -234,7 +227,6 @@ export function requestListDocumentStatuses({ pageToken }) { return request({ - baseURL: config.adempiere.api.url, url: '/workflow/list-document-statuses', method: 'post', data: { @@ -269,7 +261,6 @@ export function requestListDocumentActions({ pageToken }) { return request({ - baseURL: config.adempiere.api.url, url: '/workflow/list-document-actions', method: 'post', data: { diff --git a/src/api/documentation/releases.js b/src/api/documentation/releases.js new file mode 100644 index 00000000..356f572f --- /dev/null +++ b/src/api/documentation/releases.js @@ -0,0 +1,16 @@ +// Service for get ADempiere Vue releases from repo. +// Add here any service related with it +import request from '@/utils/request' +import { config } from '@/utils/ADempiere/config' + +// Fetch releases from repository +export function fetchReleasesList() { + return request({ + baseURL: config.repository.url, + url: '/repos/adempiere/adempiere-vue/releases', + method: 'get', + headers: { + 'Accept': 'application/vnd.github.v3+json' + } + }) +} diff --git a/src/api/role.js b/src/api/role.js index 93589e6b..95535116 100644 --- a/src/api/role.js +++ b/src/api/role.js @@ -1,9 +1,7 @@ -import request from '@/utils/request' -import { config } from '@/utils/ADempiere/config' +import { request } from '@/utils/ADempiere/request' export function getRoutes() { return request({ - baseURL: config.adempiere.api.url, url: '/vue-element-admin/routes', method: 'get' }) @@ -11,7 +9,6 @@ export function getRoutes() { export function getRoles() { return request({ - baseURL: config.adempiere.api.url, url: '/vue-element-admin/roles', method: 'get' }) @@ -19,7 +16,6 @@ export function getRoles() { export function requestRolesList(token) { return request({ - baseURL: config.adempiere.api.url, url: 'user/roles', method: 'get', params: { @@ -38,7 +34,6 @@ export function requestRolesList(token) { export function addRole(data) { return request({ - baseURL: config.adempiere.api.url, url: '/vue-element-admin/role', method: 'post', data @@ -47,7 +42,6 @@ export function addRole(data) { export function updateRole(id, data) { return request({ - baseURL: config.adempiere.api.url, url: `/vue-element-admin/role/${id}`, method: 'put', data @@ -56,7 +50,6 @@ export function updateRole(id, data) { export function deleteRole(id) { return request({ - baseURL: config.adempiere.api.url, url: `/vue-element-admin/role/${id}`, method: 'delete' }) @@ -74,7 +67,6 @@ export function requestChangeRole({ warehouseUuid }) { return request({ - baseURL: config.adempiere.api.url, url: 'user/change-role', method: 'post', data: { diff --git a/src/api/user.js b/src/api/user.js index cd098f2c..2dc8a912 100644 --- a/src/api/user.js +++ b/src/api/user.js @@ -1,6 +1,5 @@ // Instance for connection -import request from '@/utils/request' -import { config } from '@/utils/ADempiere/config' +import { request } from '@/utils/ADempiere/request' /** * Make login by UserName and password, this function can return user data for show @@ -15,7 +14,6 @@ export function login({ token }) { return request({ - baseURL: config.adempiere.api.url, url: '/user/login', method: 'post', data: { @@ -34,7 +32,6 @@ export function login({ */ export function requestUserInfoFromSession(token) { return request({ - baseURL: config.adempiere.api.url, url: '/user/info', method: 'get', params: { @@ -52,7 +49,6 @@ export function requestUserInfoFromSession(token) { */ export function requestSessionInfo(token) { return request({ - baseURL: config.adempiere.api.url, url: '/user/session', method: 'get', params: { @@ -74,7 +70,6 @@ export function requestMenu({ sessionUuid }) { return request({ - baseURL: config.adempiere.api.url, url: '/user/menu', method: 'get', params: { @@ -92,7 +87,6 @@ export function requestMenu({ */ export function logout(token) { return request({ - baseURL: config.adempiere.api.url, method: 'post', url: '/user/logout', data: { diff --git a/src/lang/ADempiere/en.js b/src/lang/ADempiere/en.js index 5ade9467..47360819 100644 --- a/src/lang/ADempiere/en.js +++ b/src/lang/ADempiere/en.js @@ -97,7 +97,8 @@ export default { }, documentation: { documentation: 'Documentation', - github: 'Github Repository' + github: 'Github Repository', + releases: 'Releases' }, permission: { addRole: 'New Role', diff --git a/src/lang/ADempiere/es.js b/src/lang/ADempiere/es.js index 43a4eac7..2884a029 100644 --- a/src/lang/ADempiere/es.js +++ b/src/lang/ADempiere/es.js @@ -97,7 +97,8 @@ export default { }, documentation: { documentation: 'Documentación', - github: 'Repositorio Github' + github: 'Repositorio Github', + releases: 'Liberaciones' }, permission: { addRole: 'Nuevo rol', diff --git a/src/utils/ADempiere/request.js b/src/utils/ADempiere/request.js new file mode 100644 index 00000000..9cd6353d --- /dev/null +++ b/src/utils/ADempiere/request.js @@ -0,0 +1,23 @@ +// Default request connection for ADempiere with default url +import requestAPI from '@/utils/request' +import { config } from '@/utils/ADempiere/config' +import { getToken } from '@/utils/auth' +import { getLanguage } from '@/lang/index' + +// Request with default parameters +export function request(requestValues) { + if (!requestValues) { + requestValues = {} + } + if (!requestValues.params) { + requestValues.params = {} + } + requestValues.baseURL = config.adempiere.api.url + requestValues.params.token = getToken() + requestValues.params.language = getLanguage() || 'en_US' + return new Promise(resolve => { + requestAPI(requestValues).then(response => { + resolve(response.result) + }) + }) +} diff --git a/src/utils/request.js b/src/utils/request.js index d2da3ee2..35927e76 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -1,8 +1,6 @@ import axios from 'axios' import { MessageBox, Message } from 'element-ui' import store from '@/store' -import { getToken } from '@/utils/auth' -import { getLanguage } from '@/lang/index' // create an axios instance const service = axios.create({ @@ -19,14 +17,12 @@ service.interceptors.request.use( if (!config.params) { config.params = {} } - config.params.token = getToken() - config.params.language = getLanguage() || 'en_US' // Set header if (store.getters.token) { // let each request carry token // ['X-Token'] is a custom headers key // please modify it according to the actual situation - config.headers['X-Token'] = getToken() + // config.headers['X-Token'] = getToken() } return config }, @@ -74,7 +70,7 @@ service.interceptors.response.use( } return Promise.reject(new Error(res.message || res.result || 'Error')) } else { - return res.result + return res } }, error => { diff --git a/src/views/documentation/index.vue b/src/views/documentation/index.vue index 09f5951b..26d8c259 100644 --- a/src/views/documentation/index.vue +++ b/src/views/documentation/index.vue @@ -1,33 +1,56 @@