From 08a6eb8ab29aa918324ea0a7b05dd34ca3ee0ace Mon Sep 17 00:00:00 2001
From: KatKatKateryna <kateryna@speckle.systems>
Date: Tue, 30 Nov 2021 23:53:59 +0800
Subject: [PATCH] both buttons done except $matomo

---
 packages/frontend/src/views/stream/Commit.vue | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/packages/frontend/src/views/stream/Commit.vue b/packages/frontend/src/views/stream/Commit.vue
index edaad7bef..993c7bae5 100644
--- a/packages/frontend/src/views/stream/Commit.vue
+++ b/packages/frontend/src/views/stream/Commit.vue
@@ -10,6 +10,7 @@
       <v-col v-else-if="stream.commit" cols="12" class="ma-0 pa-0">
         <portal to="streamActionsBar">
           <v-btn
+            text
             v-if="
               stream &&
               stream.role !== 'stream:reviewer' &&
@@ -31,6 +32,7 @@
           </v-btn>
 
           <v-btn class="ml-2"
+            text
             v-if="
               stream &&
               stream.role !== 'stream:reviewer' &&
@@ -245,7 +247,7 @@ export default {
   watch: {
     stream(val) {
       if (!val) return
-      if (val.commit.branchName === 'globals')
+      if (val && val.commit && val.commit.branchName && val.commit.branchName === 'globals')
         this.$router.push(`/streams/${this.$route.params.streamId}/globals/${val.commit.id}`)
     }
   },
@@ -289,7 +291,10 @@ export default {
             }
           `,
           variables: {
-            myCommit: { ...dialog.commit }
+            myCommit: { 
+              streamId: this.stream.id,
+              id: this.stream.commit.id
+             }
           }
         })
         .then(() => {
@@ -299,6 +304,8 @@ export default {
           // Error
           console.error(error)
         })
+        this.showDeleteDialog =  false
+        this.$router.push(`/streams/` + this.$route.params.streamId )
     }
   }
 }