From de220506330804d3c9972dbe61e0ae65cdb5bc5c Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Tue, 25 Jan 2022 15:03:17 +0530
Subject: [PATCH] feat: add Repor Issue button - Change db switcher location

---
 src/components/Sidebar.vue | 46 ++++++++++++++++++++++++--------------
 src/errorHandling.ts       | 29 ++++++++++++------------
 2 files changed, 44 insertions(+), 31 deletions(-)

diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue
index 36d14fed..a06d72ef 100644
--- a/src/components/Sidebar.vue
+++ b/src/components/Sidebar.vue
@@ -1,26 +1,37 @@
 <template>
   <div
-    class="
-      pt-6
-      pb-2
-      px-2
-      h-full
-      block
-      flex
-      justify-between
-      flex-col
-      bg-gray-100
-    "
+    class="pt-6 pb-2 px-2 h-full flex justify-between flex-col bg-gray-100"
     :class="{
       'window-drag': platform !== 'Windows',
     }"
   >
     <div class="window-no-drag">
       <WindowControls v-if="platform === 'Mac'" class="px-3 mb-6" />
-      <div class="px-3">
-        <h6 class="text-lg font-semibold" @click="routeTo('/')">
+      <div class="px-3 flex flex-row items-center">
+        <h6
+          class="
+            text-xl
+            font-semibold
+            whitespace-nowrap
+            overflow-scroll
+            no-scrollbar
+          "
+        >
           {{ companyName }}
         </h6>
+        <feather-icon
+          class="
+            w-5
+            h-5
+            ml-1
+            stroke-2
+            cursor-pointer
+            text-gray-600
+            hover:text-gray-800
+          "
+          name="chevron-down"
+          @click="$emit('change-db-file')"
+        />
       </div>
       <div class="mt-3">
         <div class="mt-1 first:mt-0" v-for="group in groups" :key="group.title">
@@ -74,16 +85,17 @@
     </div>
     <div class="px-5 window-no-drag">
       <button
-        class="pb-1 text-sm text-gray-600 hover:text-gray-800 w-full whitespace-nowrap overflow-scroll no-scrollbar text-left"
-        @click="$emit('change-db-file')"
+        class="pb-1 text-sm text-gray-600 hover:text-gray-800 w-full text-left"
+        @click="() => reportIssue()"
       >
-        {{ dbPath }}
+        Report Issue
       </button>
       <p class="pb-3 text-sm text-gray-600">v{{ appVersion }}</p>
     </div>
   </div>
 </template>
 <script>
+import { reportIssue } from '@/errorHandling';
 import sidebarConfig from '../sidebarConfig';
 import Button from '@/components/Button';
 import WindowControls from './WindowControls';
@@ -145,7 +157,6 @@ export default {
       }
     }
 
-
     this.groups = groups;
 
     this.setActiveGroup();
@@ -155,6 +166,7 @@ export default {
   },
   methods: {
     routeTo,
+    reportIssue,
     setActiveGroup() {
       const { fullPath } = this.$router.currentRoute;
       const fallBackGroup = this.activeGroup;
diff --git a/src/errorHandling.ts b/src/errorHandling.ts
index b5a48029..50c0ab3d 100644
--- a/src/errorHandling.ts
+++ b/src/errorHandling.ts
@@ -40,7 +40,7 @@ function getToastProps(errorLogObj: ErrorLog) {
       actionText: t`Report Error`,
       action: () => {
         reportError(errorLogObj);
-        createIssue(errorLogObj);
+        reportIssue(errorLogObj);
       },
     });
   }
@@ -137,24 +137,25 @@ export function getErrorHandledSync(func: Function) {
   };
 }
 
-function getIssueUrlQuery(errorLogObj: ErrorLog): string {
+function getIssueUrlQuery(errorLogObj?: ErrorLog): string {
   const baseUrl = 'https://github.com/frappe/books/issues/new?labels=bug';
 
-  const body = [
-    '<h2>Description</h2>',
-    'Add some description...',
-    '',
-    '<h2>Error Info</h2>',
-    '',
-    `**Error**: _${errorLogObj.name}: ${errorLogObj.message}_`,
-    '',
-  ];
+  const body = ['<h2>Description</h2>', 'Add some description...', ''];
 
-  if (errorLogObj.stack) {
+  if (errorLogObj) {
+    body.push(
+      '<h2>Error Info</h2>',
+      '',
+      `**Error**: _${errorLogObj.name}: ${errorLogObj.message}_`,
+      ''
+    );
+  }
+
+  if (errorLogObj?.stack) {
     body.push('**Stack**:', '```', errorLogObj.stack, '```', '');
   }
 
-  const { fullPath } = errorLogObj.more as { fullPath?: string };
+  const { fullPath } = (errorLogObj?.more as { fullPath?: string }) ?? {};
   if (fullPath) {
     body.push(`**Path**: \`${fullPath}\``);
   }
@@ -163,7 +164,7 @@ function getIssueUrlQuery(errorLogObj: ErrorLog): string {
   return encodeURI(url);
 }
 
-function createIssue(errorLogObj: ErrorLog) {
+export function reportIssue(errorLogObj?: ErrorLog) {
   const urlQuery = getIssueUrlQuery(errorLogObj);
   ipcRenderer.send(IPC_MESSAGES.OPEN_EXTERNAL, urlQuery);
 }