Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app/assets/javascripts/runner/components/cells')
-rw-r--r--app/assets/javascripts/runner/components/cells/runner_actions_cell.vue19
-rw-r--r--app/assets/javascripts/runner/components/cells/runner_summary_cell.vue13
2 files changed, 25 insertions, 7 deletions
diff --git a/app/assets/javascripts/runner/components/cells/runner_actions_cell.vue b/app/assets/javascripts/runner/components/cells/runner_actions_cell.vue
index c69321de001..7a4760f81ee 100644
--- a/app/assets/javascripts/runner/components/cells/runner_actions_cell.vue
+++ b/app/assets/javascripts/runner/components/cells/runner_actions_cell.vue
@@ -23,7 +23,7 @@ export default {
required: false,
},
},
- emits: ['deleted'],
+ emits: ['toggledPaused', 'deleted'],
computed: {
canUpdate() {
return this.runner.userPermissions?.updateRunner;
@@ -33,6 +33,9 @@ export default {
},
},
methods: {
+ onToggledPaused() {
+ this.$emit('toggledPaused');
+ },
onDeleted(value) {
this.$emit('deleted', value);
},
@@ -43,7 +46,17 @@ export default {
<template>
<gl-button-group>
<runner-edit-button v-if="canUpdate && editUrl" :href="editUrl" />
- <runner-pause-button v-if="canUpdate" :runner="runner" :compact="true" />
- <runner-delete-button v-if="canDelete" :runner="runner" :compact="true" @deleted="onDeleted" />
+ <runner-pause-button
+ v-if="canUpdate"
+ :runner="runner"
+ :compact="true"
+ @toggledPaused="onToggledPaused"
+ />
+ <runner-delete-button
+ :disabled="!canDelete"
+ :runner="runner"
+ :compact="true"
+ @deleted="onDeleted"
+ />
</gl-button-group>
</template>
diff --git a/app/assets/javascripts/runner/components/cells/runner_summary_cell.vue b/app/assets/javascripts/runner/components/cells/runner_summary_cell.vue
index 937ec631633..1eb383a1904 100644
--- a/app/assets/javascripts/runner/components/cells/runner_summary_cell.vue
+++ b/app/assets/javascripts/runner/components/cells/runner_summary_cell.vue
@@ -33,6 +33,9 @@ export default {
description() {
return this.runner.description;
},
+ ipAddress() {
+ return this.runner.ipAddress;
+ },
},
i18n: {
I18N_LOCKED_RUNNER_DESCRIPTION,
@@ -53,10 +56,12 @@ export default {
:title="$options.i18n.I18N_LOCKED_RUNNER_DESCRIPTION"
name="lock"
/>
- <tooltip-on-truncate class="gl-display-block" :title="description" truncate-target="child">
- <div class="gl-text-truncate">
- {{ description }}
- </div>
+ <tooltip-on-truncate class="gl-display-block gl-text-truncate" :title="description">
+ {{ description }}
+ </tooltip-on-truncate>
+ <tooltip-on-truncate class="gl-display-block gl-text-truncate" :title="ipAddress">
+ <span class="gl-md-display-none gl-lg-display-inline">{{ __('IP Address') }}</span>
+ <strong>{{ ipAddress }}</strong>
</tooltip-on-truncate>
</div>
</template>