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
adempiere · Apr 4, 2021 · 2b1d8f7 · 2b1d8f7
1 parent e2d23df
commit 2b1d8f7
Show file tree

Hide file tree

Showing 26 changed files with 108 additions and 153 deletions.
diff --git 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/[email protected]
         with:

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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: {