From a4642701711fad3ca366b977026cd7a3a4a36a29 Mon Sep 17 00:00:00 2001
From: Chad Derya <scd@onlinefuels.com>
Date: Wed, 11 Sep 2019 13:56:33 +0100
Subject: [PATCH] Show region name in the DE terminals table

---
 src/api/region.js            |  5 +++--
 src/views/terminals/list.vue | 21 +++++++++++++++------
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/api/region.js b/src/api/region.js
index c222a0ca..46604e90 100644
--- a/src/api/region.js
+++ b/src/api/region.js
@@ -1,9 +1,10 @@
 import axios from 'axios'
+import store from '../store/modules/settings.js'
 
 const RegionEndpointUrl = 'https://metadata.service.development.therig.onlinefuelslabs.io'
 
-export function fetchList(query) {
-  return axios.get(`${RegionEndpointUrl}/regions`, { params: query })
+export function fetchList() {
+  return axios.get(`${RegionEndpointUrl}/regions?platform=${store.state.platform}`)
 }
 
 export function fetchRegion(id) {
diff --git a/src/views/terminals/list.vue b/src/views/terminals/list.vue
index c2f1d849..b259bcdb 100644
--- a/src/views/terminals/list.vue
+++ b/src/views/terminals/list.vue
@@ -26,7 +26,7 @@
       </el-table-column>
       <el-table-column v-if="$store.state.settings.platform === 'OLFDE'" align="center" label="Region Id" width="200">
         <template slot-scope="scope">
-          <span>{{ scope.row.region_id }}</span>
+          <span>{{ scope.row.regionName }}</span>
         </template>
       </el-table-column>
       <el-table-column v-if="$store.state.settings.platform === 'OLFDE'" align="center" label="Phone" width="200">
@@ -34,11 +34,11 @@
           <span>{{ scope.row.contactNumber }}</span>
         </template>
       </el-table-column>
-      <el-table-column v-if="$store.state.settings.platform === 'OLFDE'" align="center" label="Meta" width="200">
+      <!-- <el-table-column v-if="$store.state.settings.platform === 'OLFDE'" align="center" label="Meta" width="200">
         <template slot-scope="scope">
           <span>{{ scope.row.meta }}</span>
         </template>
-      </el-table-column>
+      </el-table-column> -->
 
       <el-table-column align="center" label="Actions" width="120">
         <template slot-scope="scope">
@@ -60,7 +60,8 @@
 </template>
 
 <script>
-import { fetchList } from '@/api/terminal'
+const fetchTerminalList = require('@/api/terminal').fetchList
+const fetchRegionList = require('@/api/region').fetchList
 // import Pagination from '@/components/Pagination' // Secondary package based on el-pagination
 import DeletePopUp from '@/components/PopUps/Delete'
 
@@ -93,12 +94,20 @@ export default {
   methods: {
     getList() {
       this.listLoading = true
-      fetchList().then(response => {
+      fetchTerminalList().then(response => {
         this.originaList = response.data.terminals
         this.filteredList = this.originaList
-        console.log(this.originaList)
         this.total = response.data.terminals.length
         this.listLoading = false
+      }).then(() => {
+        fetchRegionList().then(regions => {
+          this.filteredList.forEach(terminal => {
+            const region = regions.data.regions.find(function(region) {
+              if (region._id === terminal.region_id) { return region }
+            })
+            if (region) { terminal.regionName = region.name }
+          })
+        })
       })
     },
     handleFilter() {