From 1c97aedeb7a46eac3b4f3b7b752df4d3f43da3e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gerg=C5=91=20Jedlicska?= <gergo@jedlicska.com>
Date: Thu, 24 Feb 2022 14:29:08 +0100
Subject: [PATCH] refactor(frontend): add resource type identifier helper
 function

---
 .../frontend/src/main/dialogs/ShareStream.vue |  7 +++++--
 .../main/pages/stream/CommitObjectViewer.vue  | 20 +++++++++++--------
 .../src/plugins/resourceIdentifier.js         |  3 +++
 3 files changed, 20 insertions(+), 10 deletions(-)
 create mode 100644 packages/frontend/src/plugins/resourceIdentifier.js

diff --git a/packages/frontend/src/main/dialogs/ShareStream.vue b/packages/frontend/src/main/dialogs/ShareStream.vue
index 977f6a83e..15a3a3063 100644
--- a/packages/frontend/src/main/dialogs/ShareStream.vue
+++ b/packages/frontend/src/main/dialogs/ShareStream.vue
@@ -34,7 +34,9 @@
           @focus="copyToClipboard"
         ></v-text-field>
         <v-text-field
-          v-if="$route.params.resourceId && $route.params.resourceId.length === 10"
+          v-if="
+            $route.params.resourceId && resourceType($route.params.resourceId.length) === 'commit'
+          "
           ref="commitUrl"
           dark
           filled
@@ -185,6 +187,7 @@
 </template>
 <script>
 import gql from 'graphql-tag'
+import { resourceType } from '@/plugins/resourceIdentifier'
 export default {
   components: {
     UserAvatar: () => import('@/main/components/common/UserAvatar')
@@ -217,7 +220,7 @@ export default {
       let resourceId = this.$route.params.resourceId
       if (!resourceId) return null
       let base = `${window.location.origin}/embed?stream=${this.$route.params.streamId}`
-      return `<iframe src="${base}&${resourceId.length === 10 ? 'commit' : 'object'}=${
+      return `<iframe src="${base}&${resourceType(resourceId)}=${
         this.$route.params.resourceId
       }" width=600 height=400 />"`
     },
diff --git a/packages/frontend/src/main/pages/stream/CommitObjectViewer.vue b/packages/frontend/src/main/pages/stream/CommitObjectViewer.vue
index 0fe13419f..a0f9566cb 100644
--- a/packages/frontend/src/main/pages/stream/CommitObjectViewer.vue
+++ b/packages/frontend/src/main/pages/stream/CommitObjectViewer.vue
@@ -203,6 +203,7 @@ import debounce from 'lodash.debounce'
 import streamCommitQuery from '@/graphql/commit.gql'
 import streamObjectQuery from '@/graphql/objectSingleNoData.gql'
 import Viewer from '@/main/components/common/Viewer' // do not import async
+import { resourceType } from '@/plugins/resourceIdentifier'
 
 export default {
   components: {
@@ -289,10 +290,10 @@ export default {
   async mounted() {
     this.$eventHub.$emit('page-load', true)
     this.resources.push({
-      type: this.$route.params.resourceId.length === 10 ? 'commit' : 'object',
+      type: resourceType(this.$route.params.resourceId),
       id: this.$route.params.resourceId,
       data:
-        this.$route.params.resourceId.length === 10
+        resourceType(this.$route.params.resourceId) === 'commit'
           ? await this.loadCommit(this.$route.params.resourceId)
           : await this.loadObject(this.$route.params.resourceId)
     })
@@ -300,13 +301,14 @@ export default {
     if (this.$route.query.overlay) {
       let ids = this.$route.query.overlay.split(',')
       for (const id of ids) {
-        let cleanedId = id.replace(/\s+/g, '')
+        const cleanedId = id.replace(/\s+/g, '')
         if (!cleanedId || cleanedId === '') continue
+        const resType = resourceType(cleanedId)
         this.resources.push({
-          type: id.length === 10 ? 'commit' : 'object',
+          type: resType,
           id: cleanedId,
           data:
-            cleanedId.length === 10
+            resType === 'commit'
               ? await this.loadCommit(cleanedId)
               : await this.loadObject(cleanedId)
         })
@@ -448,17 +450,19 @@ export default {
     },
     async addResource(resId) {
       this.showAddOverlay = false
+      const resType = resourceType(resId)
       let existing = this.resources.findIndex((res) => res.id === resId)
+
       if (existing !== -1) {
         this.$eventHub.$emit('notification', {
-          text: `${resId.length === 10 ? 'Commit' : 'Object'} is already loaded.`
+          text: `${resType.charAt(0).toUpperCase() + resType.slice(1)} is already loaded.`
         })
         return
       }
       let resource = {
-        type: resId.length === 10 ? 'commit' : 'object',
+        type: resType,
         id: resId,
-        data: resId.length === 10 ? await this.loadCommit(resId) : await this.loadObject(resId)
+        data: resType === 'commit' ? await this.loadCommit(resId) : await this.loadObject(resId)
       }
       this.resources.push(resource)
       this.$mixpanel.track('Viewer Action', {
diff --git a/packages/frontend/src/plugins/resourceIdentifier.js b/packages/frontend/src/plugins/resourceIdentifier.js
new file mode 100644
index 000000000..8e51aa406
--- /dev/null
+++ b/packages/frontend/src/plugins/resourceIdentifier.js
@@ -0,0 +1,3 @@
+export function resourceType(resourceId) {
+  return resourceId.length === 10 ? 'commit' : 'object'
+}