*: rename user local run to user direct run
This commit is contained in:
parent
932e2346dd
commit
fbed07059e
|
@ -131,7 +131,7 @@
|
||||||
import vClickOutside from "v-click-outside";
|
import vClickOutside from "v-click-outside";
|
||||||
|
|
||||||
import { cancelRun, stopRun, restartRun } from "@/util/data.js";
|
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";
|
import { runStatus, runResultClass } from "@/util/run.js";
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
|
@ -210,7 +210,7 @@ export default {
|
||||||
data.id
|
data.id
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
runLink = userLocalRunLink(this.ownername, data.id);
|
runLink = userDirectRunLink(this.ownername, data.id);
|
||||||
}
|
}
|
||||||
this.$router.push(runLink);
|
this.$router.push(runLink);
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,7 +23,7 @@
|
||||||
>
|
>
|
||||||
<span class>{{run.name}}</span>
|
<span class>{{run.name}}</span>
|
||||||
</router-link>
|
</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>
|
<span>{{run.name}}</span>
|
||||||
</router-link>
|
</router-link>
|
||||||
<div class="w-1/3">{{run.annotations.message}}</div>
|
<div class="w-1/3">{{run.annotations.message}}</div>
|
||||||
|
@ -87,7 +87,7 @@
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import { fetchUser, fetchProject, fetchRuns } from "@/util/data.js";
|
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";
|
import { runResultClass } from "@/util/run.js";
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
|
@ -117,7 +117,7 @@ export default {
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
projectRunLink: projectRunLink,
|
projectRunLink: projectRunLink,
|
||||||
userLocalRunLink: userLocalRunLink,
|
userDirectRunLink: userDirectRunLink,
|
||||||
runResultClass: runResultClass,
|
runResultClass: runResultClass,
|
||||||
stillRunning(run) {
|
stillRunning(run) {
|
||||||
return run.result != "unknown" && run.phase == "running";
|
return run.result != "unknown" && run.phase == "running";
|
||||||
|
|
|
@ -39,7 +39,7 @@
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import { fetchRun } from "@/util/data.js";
|
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 rundetail from "@/components/rundetail.vue";
|
||||||
import task from "@/components/task.vue";
|
import task from "@/components/task.vue";
|
||||||
|
@ -71,7 +71,7 @@ export default {
|
||||||
task.id
|
task.id
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
return userLocalRunTaskLink(this.ownername, this.runid, task.id);
|
return userDirectRunTaskLink(this.ownername, this.runid, task.id);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
parents(task) {
|
parents(task) {
|
||||||
|
|
|
@ -80,19 +80,19 @@ const router = new VueRouter({
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: "runs",
|
path: "runs",
|
||||||
name: "user local runs",
|
name: "user direct runs",
|
||||||
component: runs,
|
component: runs,
|
||||||
props: (route) => ({ ownertype: "user", ownername: route.params.username })
|
props: (route) => ({ ownertype: "user", ownername: route.params.username })
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: "runs/:runid",
|
path: "runs/:runid",
|
||||||
name: "user local run",
|
name: "user direct run",
|
||||||
component: runsummary,
|
component: runsummary,
|
||||||
props: (route) => ({ ownertype: "user", ownername: route.params.username, runid: route.params.runid })
|
props: (route) => ({ ownertype: "user", ownername: route.params.username, runid: route.params.runid })
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: "runs/:runid/tasks/:taskid",
|
path: "runs/:runid/tasks/:taskid",
|
||||||
name: "user local run task",
|
name: "user direct run task",
|
||||||
component: tasksummary,
|
component: tasksummary,
|
||||||
props: (route) => ({ ownertype: "user", ownername: route.params.username, runid: route.params.runid, taskid: route.params.taskid })
|
props: (route) => ({ ownertype: "user", ownername: route.params.username, runid: route.params.runid, taskid: route.params.taskid })
|
||||||
},
|
},
|
||||||
|
|
|
@ -27,16 +27,16 @@ export function ownerSettingsLink(ownertype, ownername) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export function userLocalRunsLink(username) {
|
export function userDirectRunsLink(username) {
|
||||||
return { name: "user local runs", params: { username: username } }
|
return { name: "user direct runs", params: { username: username } }
|
||||||
}
|
}
|
||||||
|
|
||||||
export function userLocalRunLink(username, runid) {
|
export function userDirectRunLink(username, runid) {
|
||||||
return { name: "user local run", params: { username: username, runid: runid } }
|
return { name: "user direct run", params: { username: username, runid: runid } }
|
||||||
}
|
}
|
||||||
|
|
||||||
export function userLocalRunTaskLink(username, runid, taskid) {
|
export function userDirectRunTaskLink(username, runid, taskid) {
|
||||||
return { name: "user local run task", params: { username: username, runid: runid, taskid: taskid } }
|
return { name: "user direct run task", params: { username: username, runid: runid, taskid: taskid } }
|
||||||
}
|
}
|
||||||
|
|
||||||
export function userAddLinkedAccountLink(username, remotesourcename) {
|
export function userAddLinkedAccountLink(username, remotesourcename) {
|
||||||
|
|
|
@ -32,38 +32,38 @@
|
||||||
</li>
|
</li>
|
||||||
<li
|
<li
|
||||||
class="tab-element"
|
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"/>
|
<i class="mr-1 mdi mdi-run-fast"/>
|
||||||
<span>Local Runs</span>
|
<span>Direct Runs</span>
|
||||||
</router-link>
|
</router-link>
|
||||||
</li>
|
</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/>
|
<tabarrow/>
|
||||||
</li>
|
</li>
|
||||||
<li
|
<li
|
||||||
class="tab-element"
|
class="tab-element"
|
||||||
v-if="$route.name === 'user local run' || $route.name == 'user local run task'"
|
v-if="$route.name === 'user direct run' || $route.name == 'user direct run task'"
|
||||||
:class="[{ 'tab-element-selected': $route.name === 'user local run' }]"
|
: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">
|
<span v-if="run">
|
||||||
Run
|
Run
|
||||||
<strong>#{{run.counter}}</strong>
|
<strong>#{{run.counter}}</strong>
|
||||||
</span>
|
</span>
|
||||||
</router-link>
|
</router-link>
|
||||||
</li>
|
</li>
|
||||||
<li v-if="$route.name === 'user local run task'">
|
<li v-if="$route.name === 'user direct run task'">
|
||||||
<tabarrow/>
|
<tabarrow/>
|
||||||
</li>
|
</li>
|
||||||
<li
|
<li
|
||||||
class="tab-element"
|
class="tab-element"
|
||||||
v-if="$route.name == 'user local run task'"
|
v-if="$route.name == 'user direct run task'"
|
||||||
:class="[{ 'tab-element-selected': $route.name === 'user local run task' }]"
|
:class="[{ 'tab-element-selected': $route.name === 'user direct run task' }]"
|
||||||
>
|
>
|
||||||
<router-link
|
<router-link
|
||||||
:to="userLocalRunTaskLink(username, $route.params.runid, $route.params.taskid)"
|
:to="userDirectRunTaskLink(username, $route.params.runid, $route.params.taskid)"
|
||||||
>
|
>
|
||||||
<span v-if="run">
|
<span v-if="run">
|
||||||
Task
|
Task
|
||||||
|
@ -137,9 +137,9 @@ import vClickOutside from "v-click-outside";
|
||||||
import {
|
import {
|
||||||
ownerLink,
|
ownerLink,
|
||||||
ownerProjectsLink,
|
ownerProjectsLink,
|
||||||
userLocalRunsLink,
|
userDirectRunsLink,
|
||||||
userLocalRunLink,
|
userDirectRunLink,
|
||||||
userLocalRunTaskLink,
|
userDirectRunTaskLink,
|
||||||
ownerSettingsLink,
|
ownerSettingsLink,
|
||||||
projectGroupCreateProjectGroupLink,
|
projectGroupCreateProjectGroupLink,
|
||||||
projectGroupCreateProjectLink,
|
projectGroupCreateProjectLink,
|
||||||
|
@ -181,9 +181,9 @@ export default {
|
||||||
methods: {
|
methods: {
|
||||||
ownerLink: ownerLink,
|
ownerLink: ownerLink,
|
||||||
ownerProjectsLink: ownerProjectsLink,
|
ownerProjectsLink: ownerProjectsLink,
|
||||||
userLocalRunsLink: userLocalRunsLink,
|
userDirectRunsLink: userDirectRunsLink,
|
||||||
userLocalRunLink: userLocalRunLink,
|
userDirectRunLink: userDirectRunLink,
|
||||||
userLocalRunTaskLink: userLocalRunTaskLink,
|
userDirectRunTaskLink: userDirectRunTaskLink,
|
||||||
ownerSettingsLink: ownerSettingsLink,
|
ownerSettingsLink: ownerSettingsLink,
|
||||||
projectGroupCreateProjectGroupLink: projectGroupCreateProjectGroupLink,
|
projectGroupCreateProjectGroupLink: projectGroupCreateProjectGroupLink,
|
||||||
projectGroupCreateProjectLink: projectGroupCreateProjectLink,
|
projectGroupCreateProjectLink: projectGroupCreateProjectLink,
|
||||||
|
|
Loading…
Reference in New Issue