a
/
agola-web
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

*: rename user local run to user direct run

This commit is contained in:
Simone Gotti 2019-06-11 12:06:06 +02:00
parent 932e2346dd
commit fbed07059e
6 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/rundetail.vue
View File

@ -131,7 +131,7 @@
import vClickOutside from "v-click-outside";
import { cancelRun, stopRun, restartRun } from "@/util/data.js";
import { userLocalRunLink, projectRunLink } from "@/util/link.js";
import { userDirectRunLink, projectRunLink } from "@/util/link.js";
import { runStatus, runResultClass } from "@/util/run.js";
export default {
@ -210,7 +210,7 @@ export default {
data.id
);
} else {
runLink = userLocalRunLink(this.ownername, data.id);
runLink = userDirectRunLink(this.ownername, data.id);
}
this.$router.push(runLink);
}

6
src/components/runs.vue
View File

@ -23,7 +23,7 @@
>
<span class>{{run.name}}</span>
</router-link>
<router-link v-else class="w-1/3 font-bold" :to="userLocalRunLink(ownername, run.id)">
<router-link v-else class="w-1/3 font-bold" :to="userDirectRunLink(ownername, run.id)">
<span>{{run.name}}</span>
</router-link>
<div class="w-1/3">{{run.annotations.message}}</div>
@ -87,7 +87,7 @@
<script>
import { fetchUser, fetchProject, fetchRuns } from "@/util/data.js";
import { userLocalRunLink, projectRunLink } from "@/util/link.js";
import { userDirectRunLink, projectRunLink } from "@/util/link.js";
import { runResultClass } from "@/util/run.js";
export default {
@ -117,7 +117,7 @@ export default {
},
methods: {
projectRunLink: projectRunLink,
userLocalRunLink: userLocalRunLink,
userDirectRunLink: userDirectRunLink,
runResultClass: runResultClass,
stillRunning(run) {
return run.result != "unknown" && run.phase == "running";

4
src/components/runsummary.vue
View File

@ -39,7 +39,7 @@
<script>
import { fetchRun } from "@/util/data.js";
import { userLocalRunTaskLink, projectRunTaskLink } from "@/util/link.js";
import { userDirectRunTaskLink, projectRunTaskLink } from "@/util/link.js";
import rundetail from "@/components/rundetail.vue";
import task from "@/components/task.vue";
@ -71,7 +71,7 @@ export default {
task.id
);
} else {
return userLocalRunTaskLink(this.ownername, this.runid, task.id);
return userDirectRunTaskLink(this.ownername, this.runid, task.id);
}
},
parents(task) {

6
src/router.js
View File

@ -80,19 +80,19 @@ const router = new VueRouter({
},
{
path: "runs",
name: "user local runs",
name: "user direct runs",
component: runs,
props: (route) => ({ ownertype: "user", ownername: route.params.username })
},
{
path: "runs/:runid",
name: "user local run",
name: "user direct run",
component: runsummary,
props: (route) => ({ ownertype: "user", ownername: route.params.username, runid: route.params.runid })
},
{
path: "runs/:runid/tasks/:taskid",
name: "user local run task",
name: "user direct run task",
component: tasksummary,
props: (route) => ({ ownertype: "user", ownername: route.params.username, runid: route.params.runid, taskid: route.params.taskid })
},

12
src/util/link.js
View File

@ -27,16 +27,16 @@ export function ownerSettingsLink(ownertype, ownername) {
}
}
export function userLocalRunsLink(username) {
return { name: "user local runs", params: { username: username } }
export function userDirectRunsLink(username) {
return { name: "user direct runs", params: { username: username } }
}
export function userLocalRunLink(username, runid) {
return { name: "user local run", params: { username: username, runid: runid } }
export function userDirectRunLink(username, runid) {
return { name: "user direct run", params: { username: username, runid: runid } }
}
export function userLocalRunTaskLink(username, runid, taskid) {
return { name: "user local run task", params: { username: username, runid: runid, taskid: taskid } }
export function userDirectRunTaskLink(username, runid, taskid) {
return { name: "user direct run task", params: { username: username, runid: runid, taskid: taskid } }
}
export function userAddLinkedAccountLink(username, remotesourcename) {

34
src/views/User.vue
View File

@ -32,38 +32,38 @@
</li>
<li
class="tab-element"
:class="[{ 'tab-element-selected': $route.name === 'user local runs' }]"
:class="[{ 'tab-element-selected': $route.name === 'user direct runs' }]"
>
<router-link :to="userLocalRunsLink(username)">
<router-link :to="userDirectRunsLink(username)">
<i class="mr-1 mdi mdi-run-fast"/>
<span>Local Runs</span>
<span>Direct Runs</span>
</router-link>
</li>
<li v-if="$route.name === 'user local run' || $route.name == 'user local run task'">
<li v-if="$route.name === 'user direct run' || $route.name == 'user direct run task'">
<tabarrow/>
</li>
<li
class="tab-element"
v-if="$route.name === 'user local run' || $route.name == 'user local run task'"
:class="[{ 'tab-element-selected': $route.name === 'user local run' }]"
v-if="$route.name === 'user direct run' || $route.name == 'user direct run task'"
:class="[{ 'tab-element-selected': $route.name === 'user direct run' }]"
>
<router-link :to="userLocalRunLink(username, $route.params.runid)">
<router-link :to="userDirectRunLink(username, $route.params.runid)">
<span v-if="run">
Run
<strong>#{{run.counter}}</strong>
</span>
</router-link>
</li>
<li v-if="$route.name === 'user local run task'">
<li v-if="$route.name === 'user direct run task'">
<tabarrow/>
</li>
<li
class="tab-element"
v-if="$route.name == 'user local run task'"
:class="[{ 'tab-element-selected': $route.name === 'user local run task' }]"
v-if="$route.name == 'user direct run task'"
:class="[{ 'tab-element-selected': $route.name === 'user direct run task' }]"
>
<router-link
:to="userLocalRunTaskLink(username, $route.params.runid, $route.params.taskid)"
:to="userDirectRunTaskLink(username, $route.params.runid, $route.params.taskid)"
>
<span v-if="run">
Task
@ -137,9 +137,9 @@ import vClickOutside from "v-click-outside";
import {
ownerLink,
ownerProjectsLink,
userLocalRunsLink,
userLocalRunLink,
userLocalRunTaskLink,
userDirectRunsLink,
userDirectRunLink,
userDirectRunTaskLink,
ownerSettingsLink,
projectGroupCreateProjectGroupLink,
projectGroupCreateProjectLink,
@ -181,9 +181,9 @@ export default {
methods: {
ownerLink: ownerLink,
ownerProjectsLink: ownerProjectsLink,
userLocalRunsLink: userLocalRunsLink,
userLocalRunLink: userLocalRunLink,
userLocalRunTaskLink: userLocalRunTaskLink,
userDirectRunsLink: userDirectRunsLink,
userDirectRunLink: userDirectRunLink,
userDirectRunTaskLink: userDirectRunTaskLink,
ownerSettingsLink: ownerSettingsLink,
projectGroupCreateProjectGroupLink: projectGroupCreateProjectGroupLink,
projectGroupCreateProjectLink: projectGroupCreateProjectLink,