From 65c66a7f7576cddd8b8f7406e3f75c7683eec21f Mon Sep 17 00:00:00 2001
From: ciniiia <cinia@blocksphere.id>
Date: Wed, 2 Nov 2022 13:55:37 +0700
Subject: [PATCH] fix: order list on dashboard (#568)

* fix: order list on dashboard

* remove console
---
 src/components/DevMenu.vue          | 6 +++---
 src/components/NavigationDrawer.vue | 4 ++--
 src/components/OrderList.vue        | 3 +++
 src/router/routes/lab.js            | 2 +-
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/components/DevMenu.vue b/src/components/DevMenu.vue
index 4bb85212..fff45e79 100644
--- a/src/components/DevMenu.vue
+++ b/src/components/DevMenu.vue
@@ -18,17 +18,17 @@
       <v-list>
         <router-link to="/login">
           <v-list-item link>
-            <v-list-item-title>Customer Login</v-list-item-title>
+            <v-list-item-title>Login</v-list-item-title>
           </v-list-item>
         </router-link>
         <router-link to="/">
           <v-list-item link>
-            <v-list-item-title>Customer Dashboard</v-list-item-title>
+            <v-list-item-title>Dashboard</v-list-item-title>
           </v-list-item>
         </router-link>
         <router-link to="/lab">
           <v-list-item link>
-            <v-list-item-title>Lab Dashboard</v-list-item-title>
+            <v-list-item-title>Orders</v-list-item-title>
           </v-list-item>
         </router-link>
       </v-list>
diff --git a/src/components/NavigationDrawer.vue b/src/components/NavigationDrawer.vue
index 2634adc7..7c09c4fe 100644
--- a/src/components/NavigationDrawer.vue
+++ b/src/components/NavigationDrawer.vue
@@ -117,7 +117,7 @@ export default {
     alertIcon,
     version: "",
     drawerButtons: [
-      { text: "Dashboard", auth: true, route: { name: "lab-dashboard" } },
+      { text: "Orders", auth: true, route: { name: "lab-dashboard" } },
       { text: "Account", auth: false, route: { name: "lab-dashboard-account" } },
       { text: "Services", auth: false, route: { name: "lab-dashboard-services" } },
       { text: "Order History", auth: false, route: { name: "lab-dashboard-order-history" } }
@@ -156,7 +156,7 @@ export default {
 
     computeDisabledCondition() {
       return this.drawerButtons.map(btn => {
-        if (btn.text === "Dashboard" || btn.text === "Customer Care") return { ...btn }
+        if (btn.text === "Orders" || btn.text === "Customer Care") return { ...btn }
         return {
           ...btn,
           auth: this.labAccount?.verificationStatus === "Verified"
diff --git a/src/components/OrderList.vue b/src/components/OrderList.vue
index 333b2b0d..4106f64c 100644
--- a/src/components/OrderList.vue
+++ b/src/components/OrderList.vue
@@ -52,6 +52,7 @@ import ServerSideDataTable from "@/components/DataTable/ServerSideDataTable"
 import { queryDnaSamples, queryDnaTestResults } from "@/lib/polkadotProvider/query/geneticTesting"
 import SearchBar from "@/components/DataTable/SearchBar"
 import { getOrdersData } from "@/lib/api"
+import serviceHandler from "@/lib/serviceHandler"
 
 export default {
   name: "LabOrderHistory",
@@ -61,6 +62,8 @@ export default {
     SearchBar
   },
 
+  mixins: [serviceHandler],
+
   data: () => ({
     headers: [
       { text: "Date", value: "_source.created_at" },
diff --git a/src/router/routes/lab.js b/src/router/routes/lab.js
index b30b2d7e..b1a0c7f5 100644
--- a/src/router/routes/lab.js
+++ b/src/router/routes/lab.js
@@ -11,7 +11,7 @@ const labRoutes = [
         path: "/",
         name: "lab-dashboard",
         meta: {
-          pageHeader: "Lab Dashboard",
+          pageHeader: "Orders",
           breadcrumbs: [
             { text: "Lab", href: "/lab" },
             { text: "Orders", disabled: true }