From 5e565dc92efa8b672c688a26c675ea43015e8751 Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Thu, 3 Jan 2019 23:45:19 +0530
Subject: [PATCH] refactor(recorder): Use vue-router

---
 .../js/frappe/recorder/RecorderDetail.vue     |  2 +-
 .../js/frappe/recorder/RecorderRoot.vue       | 41 +------------------
 .../js/frappe/recorder/RequestDetail.vue      |  2 +-
 frappe/public/js/frappe/recorder/recorder.js  | 26 ++++++++++++
 package.json                                  |  3 +-
 yarn.lock                                     |  5 +++
 6 files changed, 36 insertions(+), 43 deletions(-)

diff --git a/frappe/public/js/frappe/recorder/RecorderDetail.vue b/frappe/public/js/frappe/recorder/RecorderDetail.vue
index 43bfe5e560..ec4dddfef7 100644
--- a/frappe/public/js/frappe/recorder/RecorderDetail.vue
+++ b/frappe/public/js/frappe/recorder/RecorderDetail.vue
@@ -12,7 +12,7 @@
 		<tbody>
 			<tr v-for="request in requests" :key="request.uuid" v-bind="request">
 				<td>
-					<a :href="'#Request/' + request.uuid ">{{ request.uuid }}</a>
+					<router-link :to="{name: 'request-detail', params: {request_uuid: request.uuid}} ">{{ request.uuid }}</router-link>
 				</td>
 				<td>
 					{{ request.path }}
diff --git a/frappe/public/js/frappe/recorder/RecorderRoot.vue b/frappe/public/js/frappe/recorder/RecorderRoot.vue
index 46e647f225..142fdc35e0 100644
--- a/frappe/public/js/frappe/recorder/RecorderRoot.vue
+++ b/frappe/public/js/frappe/recorder/RecorderRoot.vue
@@ -1,50 +1,11 @@
 <template>
 	<div>
-		<component :is="current_component"/>
+		<router-view/>
 	</div>
 </template>
 
 <script>
-import Vue from 'vue/dist/vue.js'
-Vue.prototype.$route = { param: null }
-
-import RecorderDetail from "./RecorderDetail.vue"
-import RequestDetail from "./RequestDetail.vue"
-
 export default {
 	name: "RecorderRoot",
-	data () {
-		return {
-			current_component: RecorderDetail
-		}
-	},
-	mounted () {
-		this.set_component()
-		window.onhashchange = this.set_component
-	},
-	methods: {
-		set_component: function () {
-			var routes = {
-				"#": RecorderDetail,
-				"#Request": RequestDetail,
-			}
-			var route = this.get_route()
-			this.$route.param = route.param
-			this.current_component = routes[route.route]
-		},
-		get_route: function () {
-			var hash = window.location.hash
-			if (hash) {
-				var array = hash.split("/")
-				var route = array[0]
-				var param = array.slice(1).join("/")
-			}
-			else {
-				var route = "#"
-				var param = ""
-			}
-			return { route, param }
-		},
-	},
 };
 </script>
diff --git a/frappe/public/js/frappe/recorder/RequestDetail.vue b/frappe/public/js/frappe/recorder/RequestDetail.vue
index 1199cb32d0..f87a219704 100644
--- a/frappe/public/js/frappe/recorder/RequestDetail.vue
+++ b/frappe/public/js/frappe/recorder/RequestDetail.vue
@@ -34,7 +34,7 @@ export default {
 		frappe.call({
 			method: "frappe.www.recorder.get_request_data",
 			args: {
-				uuid: this.$route.param
+				uuid: this.$route.params.request_uuid
 			}
 		}).then( r => {
 			this.calls = r.message.calls
diff --git a/frappe/public/js/frappe/recorder/recorder.js b/frappe/public/js/frappe/recorder/recorder.js
index 320cc7b1cc..dcfc35174d 100644
--- a/frappe/public/js/frappe/recorder/recorder.js
+++ b/frappe/public/js/frappe/recorder/recorder.js
@@ -1,9 +1,35 @@
 import Vue from 'vue/dist/vue.js'
+import VueRouter from 'vue-router/dist/vue-router.js'
+
 import RecorderRoot from "./RecorderRoot.vue"
 
+import RecorderDetail from "./RecorderDetail.vue"
+import RequestDetail from "./RequestDetail.vue"
+
 frappe.ready(function() {
+	Vue.use(VueRouter)
+	const routes = [
+		{
+			name: "recorder-detail",
+			path: '/',
+			component: RecorderDetail,
+		},
+		{
+			name: "request-detail",
+			path: '/request/:request_uuid',
+			component: RequestDetail,
+		},
+	  ]
+
+	const router = new VueRouter({
+		mode: 'history',
+		base: "/recorder",
+		routes: routes,
+	})
+
 	new Vue({
 		el: "#recorder",
+		router: router,
 		template: "<recorder-root/>",
 		components: {
 			RecorderRoot,
diff --git a/package.json b/package.json
index 9311bca89b..33f140e9c4 100644
--- a/package.json
+++ b/package.json
@@ -35,7 +35,8 @@
     "socket.io": "^2.0.4",
     "superagent": "^3.8.2",
     "touch": "^3.1.0",
-    "vue": "^2.5.17"
+    "vue": "^2.5.17",
+    "vue-router": "^2.0.0"
   },
   "devDependencies": {
     "babel-runtime": "^6.26.0",
diff --git a/yarn.lock b/yarn.lock
index 3cfa50aeeb..e69a8683c1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4572,6 +4572,11 @@ vlq@^1.0.0:
   resolved "https://registry.yarnpkg.com/vlq/-/vlq-1.0.0.tgz#8101be90843422954c2b13eb27f2f3122bdcc806"
   integrity sha512-o3WmXySo+oI5thgqr7Qy8uBkT/v9Zr+sRyrh1lr8aWPUkgDWdWt4Nae2WKBrLsocgE8BuWWD0jLc+VW8LeU+2g==
 
+vue-router@^2.0.0:
+  version "2.8.1"
+  resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-2.8.1.tgz#9833c9ee57ac83beb0269056fefee71713f20695"
+  integrity sha512-MC4jacHBhTPKtmcfzvaj2N7g6jgJ/Z/eIjZdt+yUaUOM1iKC0OUIlO/xCtz6OZFFTNUJs/1YNro2GN/lE+nOXA==
+
 vue-template-compiler@^2.5.17:
   version "2.5.17"
   resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.5.17.tgz#52a4a078c327deb937482a509ae85c06f346c3cb"