Fix links and job restart redirect, fixes #228

Author: ib-steffen

src/dashboard-client/src/components/job/JobDetail.vue

@@ -257,6 +257,14 @@ export default {
         'ib-tab': Tab,
         'ib-archive': Archive
     },
+    watch: {
+        '$route' (to, from) {
+            this.jobName = to.params.jobName
+            this.project = null
+            this.build = null
+            this.job = null
+        }
+    },
     data () {
         return {
             build: null,

src/dashboard-client/src/components/test/TestDetail.vue

@@ -4,25 +4,24 @@
             <md-card-header class="main-card-header" style="padding-bottom: 10px">
             <md-card-header-text>
                 <h3 class="md-title card-title">
-                <router-link :to="{name: 'ProjectDetail', params: {
-                    projectName: encodeURIComponent(data.project.name)
-                }}">
+                <router-link :to="{name: 'ProjectDetailBuilds', params: {
+                    projectName: encodeURIComponent(data.project.name)}}">
                     <span v-if="data.project.isGit()"><i class="fa fa-github"></i></span>
                     <span v-if="!data.project.isGit()"><i class="fa fa-home"></i></span>
                     {{ data.project.name }}
                 </router-link>
-                / <router-link :to="{name: 'BuildDetail', params: {
+                / <router-link :to="{name: 'BuildDetailGraph', params: {
                     projectName: encodeURIComponent(data.project.name),
                     buildNumber: data.build.number,
                     buildRestartCounter: data.build.restartCounter
                     }}">
                     Build {{ data.build.number }}.{{ data.build.restartCounter }}
                 </router-link>
                 / <router-link :to="{name: 'JobDetail', params: {
-                projectName: encodeURIComponent(data.project.name),
-                buildNumber: data.build.number,
-                buildRestartCounter: data.build.restartCounter,
-                jobId: data.job.name
+                    projectName: encodeURIComponent(data.project.name),
+                    buildNumber: data.build.number,
+                    buildRestartCounter: data.build.restartCounter,
+                    jobName: data.job.name
                 }}">
                 {{ data.job.name}}
                 </router-link>

src/dashboard-client/src/models/Build.js

@@ -54,7 +54,7 @@ export default class Build {
         return NewAPIService.get(`projects/${this.project.id}/builds/${this.id}/restart`)
             .then((message) => {
                 NotificationService.$emit('NOTIFICATION', new Notification(message, 'done'))
-                router.push(`/project/${this.project.name}/build/${this.number}/${message.data.build.restartCounter}/`)
+                router.push(`/project/${encodeURIComponent(this.project.name)}/build/${this.number}/${message.data.build.restartCounter}/`)
             })
             .catch((err) => {
                 NotificationService.$emit('NOTIFICATION', new Notification(err))

src/dashboard-client/src/models/Job.js

@@ -347,6 +347,8 @@ export default class Job {
         return NewAPIService.get(`projects/${this.project.id}/jobs/${this.id}/restart`)
             .then((message) => {
                 NotificationService.$emit('NOTIFICATION', new Notification(message, 'done'))
+                return this.project._loadBuild(this.build.number, this.build.restartCounter)
+            }).then((build) => {
                 let a = this.name.split('.')
                 let name = a[0] + '.'
 
@@ -356,7 +358,15 @@ export default class Job {
                     name += '1'
                 }
 
-                router.push(`/project/${this.project.name}/build/${this.build.number}/${this.build.restartCounter}/job/${name}`)
+                router.push({
+                    name: 'JobDetail',
+                    params: {
+                        projectName: encodeURIComponent(this.project.name),
+                        buildNumber: this.build.number,
+                        buildRestartCounter: this.build.restartCounter,
+                        jobName: encodeURIComponent(name)
+                    }
+                })
             })
             .catch((err) => {
                 NotificationService.$emit('NOTIFICATION', new Notification(err))

src/dashboard-client/src/models/Project.js

@@ -36,7 +36,6 @@ export default class Project {
     }
 
     userHasDevRights () {
-        console.log(this.userHasAdminRights() || this.userrole === 'Developer')
         return this.userHasAdminRights() || this.userrole === 'Developer'
     }
 
@@ -58,6 +57,10 @@ export default class Project {
             return new Promise((resolve) => { resolve(b) })
         }
 
+        return this._loadBuild(number, restartCounter)
+    }
+
+    _loadBuild (number, restartCounter) {
         return NewAPIService.get(`projects/${this.id}/builds/${number}/${restartCounter}`)
             .then((jobs) => {
                 this._addJobs(jobs)