fix: Duplicated resource /api/api.

EdwinBetanc0urt · Sep 17, 2024 · add6cfa · add6cfa
1 parent 7440042
commit add6cfa
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 21 deletions.
diff --git a/src/api/ADempiere/file-management/resource-reference.ts b/src/api/ADempiere/file-management/resource-reference.ts
@@ -15,7 +15,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
-import { config } from '@/utils/ADempiere/config'
 
 // Get Instance for connection
 import { request } from '@/utils/ADempiere/request'
@@ -32,15 +31,27 @@ import { isEmptyValue } from '@/utils/ADempiere/valueUtils'
  * Presigned Url
  * @param {Object} options
  */
-export function requestPresignedUrl(options) {
-  const { containerType, containerId, columnName, clientId, tableName, recordId, fileName } = options
-  const baseURL = `${config.adempiere.api.url}resources` // remove trailing slash
-  const path = [baseURL, 'presigned-url']
+export function requestPresignedUrl({
+  clientId,
+  containerType,
+  containerId,
+  tableName,
+  columnName,
+  recordId,
+  fileName
+}) {
+  const path = ['/resources', 'presigned-url']
 
   // Add parameters to the route only if they exist
-  if (clientId) path.push(clientId)
-  if (containerId) path.push(containerId)
-  if (fileName) path.push(fileName)
+  if (clientId) {
+    path.push(clientId)
+  }
+  if (containerId) {
+    path.push(containerId)
+  }
+  if (fileName) {
+    path.push(fileName)
+  }
 
   const params = {
     table_name: tableName,
@@ -49,8 +60,9 @@ export function requestPresignedUrl(options) {
     container_type: containerType
   }
 
+  const url = path.join('/')
   return request({
-    url: path.join('/'),
+    url: url,
     method: 'get',
     isWithoutAuthorization: true,
     params
@@ -83,7 +95,7 @@ export function requestGetResource({
   fileName
 }) {
   return request({
-    url: `${config.adempiere.api.url}resources/${fileName}`,
+    url: `/resources/${fileName}`,
     method: 'get',
     isWithoutAuthorization: true,
     params: {
@@ -103,7 +115,7 @@ export function requestListResources({
   containerType
 }) {
   return request({
-    url: `${config.adempiere.api.url}resources/`,
+    url: `/resources/`,
     method: 'get',
     isWithoutAuthorization: true,
     params: {
@@ -123,7 +135,7 @@ export function requestDeleteResources({
   fileName
 }) {
   return request({
-    url: `${config.adempiere.api.url}resources/${fileName}`,
+    url: `/resources/${fileName}`,
     method: 'delete',
     isWithoutAuthorization: true
   })
@@ -138,7 +150,7 @@ export function requestShareResources({
   seconds
 }) {
   return request({
-    baseURL: `${config.adempiere.api.url}resources/download-url/${fileName}`,
+    url: `/resources/download-url/${fileName}`,
     isWithoutAuthorization: true,
     method: 'get',
     params: {

diff --git a/src/components/ADempiere/PanelInfo/Component/AttachmentManager/attachment.js b/src/components/ADempiere/PanelInfo/Component/AttachmentManager/attachment.js
@@ -210,7 +210,7 @@ export default defineComponent({
       const imageURL = `${config.adempiere.api.url}resources/${file.fullName}`
       if (!isEmptyValue(file.content_type) && file.content_type.includes('image')) {
         const linkImage = document.createElement('a')
-        linkImage.href = `${config.adempiere.api.url}resources/${file.fullName}`
+        linkImage.href = imageURL
         linkImage.download = `${file.fullName}`
         linkImage.target = '_blank'
         linkImage.click()
@@ -221,7 +221,7 @@ export default defineComponent({
       link.download = file.fullName
       link.click()
       // const file = document.createElement('a')
-      // file.href = `${config.adempiere.resource.url}${file.fullName}`
+      // file.href = imageURL
       // file.download = `${file.name}`
       // file.target = '_blank'
       // file.click()

diff --git a/src/utils/ADempiere/resource.js b/src/utils/ADempiere/resource.js
@@ -148,12 +148,8 @@ function getImageUrl({
   width,
   height
 }) {
-  let baseUrl = config.adempiere.images.url
-  if (baseUrl.endsWith('/')) {
-    baseUrl = config.adempiere.images.url.substring(0, baseUrl.length - 1)
-  }
   return request({
-    url: `${baseUrl}/resources/file-name/${file}`,
+    url: `/resources/file-name/${file}`,
     method: 'get',
     params: {
       width,

diff --git a/src/views/ADempiere/ReportViewerEngine/dialog/index.vue b/src/views/ADempiere/ReportViewerEngine/dialog/index.vue
@@ -410,7 +410,7 @@ export default defineComponent({
 
     function handleDownload() {
       const link = document.createElement('a')
-      const imageURL = config.adempiere.resource.url + titleDocument.value
+      const imageURL = config.adempiere.api.url + 'resources/' + titleDocument.value
       link.href = imageURL
       link.download = titleDocument.value
       link.click()