From c027493ca97f55b379c1ca6cece81d63460720ee Mon Sep 17 00:00:00 2001
From: Yamel Senih <ysenih@erpya.com>
Date: Tue, 22 Jun 2021 18:13:49 -0400
Subject: [PATCH] Add support to dashboard as chart (#938)

---
 src/api/ADempiere/dashboard/dashboard.js               |  4 ++--
 src/components/ADempiere/Dashboard/index.vue           |  6 +++---
 .../apiConverts/objects/converted/dashboard.json       | 10 ++++++----
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/api/ADempiere/dashboard/dashboard.js b/src/api/ADempiere/dashboard/dashboard.js
index ddb1c473..2073a155 100644
--- a/src/api/ADempiere/dashboard/dashboard.js
+++ b/src/api/ADempiere/dashboard/dashboard.js
@@ -41,8 +41,8 @@ export function requestLisDashboards({
 
       return {
         recordCount: dashboardsListResponse.record_count,
-        dashboardsList: dashboardsListResponse.records.map(favorite => {
-          return convertDashboard(favorite)
+        dashboardsList: dashboardsListResponse.records.map(dashboard => {
+          return convertDashboard(dashboard)
         }),
         nextPageToken: dashboardsListResponse.next_page_token
       }
diff --git a/src/components/ADempiere/Dashboard/index.vue b/src/components/ADempiere/Dashboard/index.vue
index 1ebf4e3a..d4d6a082 100644
--- a/src/components/ADempiere/Dashboard/index.vue
+++ b/src/components/ADempiere/Dashboard/index.vue
@@ -22,7 +22,7 @@
     accordion
   >
     <el-collapse-item
-      :name="dashboard.dashboardName"
+      :name="dashboard.name"
       :disabled="!dashboard.isCollapsible"
       class="custom-collapse-item"
     >
@@ -33,7 +33,7 @@
       </template>
       <component
         :is="renderDashboard"
-        :ref="dashboard.dashboardName"
+        :ref="dashboard.name"
         :metadata="dashboard"
       />
     </el-collapse-item>
@@ -53,7 +53,7 @@ export default {
     return {
       dashboard: this.metadata,
       unsupportedDashboards: ['activities', 'views', 'performance'],
-      activeDashboard: this.metadata.isOpenByDefault ? this.metadata.dashboardName : undefined
+      activeDashboard: this.metadata.isOpenByDefault ? this.metadata.name : undefined
     }
   },
   computed: {
diff --git a/tests/unit/utils/ADempiere/apiConverts/objects/converted/dashboard.json b/tests/unit/utils/ADempiere/apiConverts/objects/converted/dashboard.json
index ecc43460..814d6531 100644
--- a/tests/unit/utils/ADempiere/apiConverts/objects/converted/dashboard.json
+++ b/tests/unit/utils/ADempiere/apiConverts/objects/converted/dashboard.json
@@ -1,13 +1,15 @@
 {
   "windowUuid": "953269ba-a67b-11eb-bcbc-0242ac130002",
   "browserUuid": "95326a6e-a67b-11eb-bcbc-0242ac130002",
-  "dashboardName": "dashboard name",
-  "dashboardDescription": "dashboard description",
-  "dashboardHtml": "dashboard html",
+  "name": "dashboard name",
+  "description": "dashboard description",
+  "html": "dashboard html",
   "columnNo": 0,
   "lineNo": 1,
   "isCollapsible": true,
   "isOpenByDefault": true,
   "isEventRequired": false,
-  "fileName": "dashboard file name"
+  "fileName": "dashboard file name",
+  "dashboardType": "dashboard",
+  "chartType": ""
 }