From 88acb270dceb6abc44d11a16bb080976644b6ce2 Mon Sep 17 00:00:00 2001
From: Elsio Sanchez <45974454+elsiosanchez@users.noreply.github.com>
Date: Tue, 25 May 2021 16:58:54 -0400
Subject: [PATCH] Support for image loading at the point of sale (#868)

* Support for image loading at the point of sale

* minimal changes

* rename variables

* change defaul

* remove comment

Co-authored-by: elsiosanchez <elsiossanches@gmail.com>
---
 config/default.json                           |  2 +-
 .../ADempiere/Form/VPOS/KeyLayout/index.vue   | 94 ++++---------------
 src/utils/ADempiere/resource.js               |  6 +-
 3 files changed, 24 insertions(+), 78 deletions(-)

diff --git a/config/default.json b/config/default.json
index d66b32d4..0e75c8f0 100644
--- a/config/default.json
+++ b/config/default.json
@@ -9,7 +9,7 @@
       "timeout": 10000
     },
     "images": {
-      "url": "https://api.erpya.com/api/adempiere/"
+      "url": "https://api.erpya.com/adempiere-api/img/"
     }
   },
   "repository": {
diff --git a/src/components/ADempiere/Form/VPOS/KeyLayout/index.vue b/src/components/ADempiere/Form/VPOS/KeyLayout/index.vue
index 604827ea..fcefaf18 100644
--- a/src/components/ADempiere/Form/VPOS/KeyLayout/index.vue
+++ b/src/components/ADempiere/Form/VPOS/KeyLayout/index.vue
@@ -47,27 +47,19 @@
             <el-col :key="key" :span="size">
               <el-card
                 :body-style="{ padding: '0px' }"
-                :data="getImage(keyValue.resourceReference)"
                 shadow="always"
               >
                 <span>
                   <p style="padding-left: 10px; font-size: 12px; color: #0e2ea4">
                     <b>{{ keyValue.name }}</b>
                   </p>
-                  <!--
-                  <b style="padding-left: 10px; font-size: 10px; color: #359e43">
-                    Available
-                  </b>
-                  -->
                 </span>
                 <div @click="setKeyActionToOrderLine(keyValue)">
                   <el-image
-                    v-if="getDefaultImage(keyValue)"
                     :src="getImageFromSource(keyValue)"
                     class="key-layout"
                     fit="contain"
                   />
-                  <vue-content-loading v-else :width="300" :height="300" />
                 </div>
                 <div class="footer-product">
                   <p class="quantity">
@@ -101,16 +93,10 @@
 </template>
 
 <script>
-import VueContentLoading from '@/components/ADempiere/ContentLoader'
-import { requestImage } from '@/api/ADempiere/common/resource.js'
-import { buildImageFromArrayBuffer } from '@/utils/ADempiere/resource.js'
+import { getImagePath } from '@/utils/ADempiere/resource.js'
 import { formatQuantity } from '@/utils/ADempiere/valueFormat.js'
-
 export default {
   name: 'KeyLayout',
-  components: {
-    VueContentLoading
-  },
   data() {
     return {
       resource: {},
@@ -119,7 +105,8 @@ export default {
         identifier: 'undefined',
         value: '',
         isLoaded: true
-      }]
+      }],
+      hola: ''
     }
   },
   computed: {
@@ -133,7 +120,16 @@ export default {
       return this.$store.getters.getKeyLayout
     },
     getKeyList() {
-      return this.getKeyLayout.keysList
+      const keylist = this.getKeyLayout.keysList
+      if (!this.isEmptyValue) {
+        return keylist.map(item => {
+          return {
+            ...item,
+            isLoaded: true
+          }
+        })
+      }
+      return keylist
     },
     getLayoutHeader() {
       const keyLayout = this.getKeyLayout
@@ -188,55 +184,6 @@ export default {
           this.isLoadedKeyLayout = true
         })
     },
-    getImage(resource) {
-      if (this.isEmptyValue(resource) || this.isEmptyValue(resource.fileName)) {
-        return
-      }
-
-      const { fileName, contentType } = resource
-      if (!this.valuesImage.some(item => item.identifier === fileName)) {
-        this.valuesImage.push({
-          identifier: fileName,
-          value: '',
-          isLoaded: false
-        })
-      }
-      if (this.resource[fileName]) {
-        this.valuesImage.forEach(item => {
-          if (item.identifier === fileName) {
-            item.value = this.resource[fileName]
-            item.isLoaded = true
-          }
-        })
-      } else { // Reload
-        if (!this.valuesImage.some(item => item.identifier === fileName)) {
-          this.valuesImage.push({
-            identifier: fileName,
-            value: '',
-            isLoaded: false
-          })
-        }
-        // the name of the image plus the height and width of the container is sent
-        requestImage({
-          file: fileName,
-          width: 300,
-          height: 300
-        }).then(responseImage => {
-          const arrayBufferAsImage = buildImageFromArrayBuffer({
-            arrayBuffer: responseImage,
-            contentType
-          })
-
-          this.resource[fileName] = arrayBufferAsImage
-          this.valuesImage.forEach(item => {
-            if (item.identifier === fileName) {
-              item.value = arrayBufferAsImage
-              item.isLoaded = true
-            }
-          })
-        })
-      }
-    },
     setKeyActionToOrderLine(keyValue) {
       if (!this.isEmptyValue(keyValue.subKeyLayoutUuid)) {
         this.loadKeyLayout(keyValue.subKeyLayoutUuid)
@@ -274,18 +221,17 @@ export default {
       return image.isLoaded
     },
     getImageFromSource(keyValue) {
-      const { fileName } = keyValue.resourceReference
+      const fileName = keyValue.resourceReference.fileName
 
       if (this.isEmptyValue(fileName)) {
         return this.defaultImage
       }
-
-      // const image = this.valuesImage.find(item => item.identifier === fileName).value
-      const image = this.resource[fileName]
-      if (this.isEmptyValue(image)) {
-        return this.defaultImage
-      }
-      return image
+      const image = getImagePath({
+        file: fileName,
+        width: 300,
+        height: 300
+      })
+      return image.uri
     }
   }
 }
diff --git a/src/utils/ADempiere/resource.js b/src/utils/ADempiere/resource.js
index 647faf8d..3088fa04 100644
--- a/src/utils/ADempiere/resource.js
+++ b/src/utils/ADempiere/resource.js
@@ -71,11 +71,11 @@ export function buildImageFromArrayBuffer({
  */
 export function getImagePath({
   file,
-  width = 300,
-  height = 300,
+  width,
+  height,
   operation = 'fit'
 }) {
-  const url = config.adempiere.images.fullPath
+  const url = config.adempiere.images.url
   const urn = `/img?action=${operation}&width=${width}&height=${height}&url=${file}`
   const uri = `${url}${urn}`