summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/jobs
diff options
context:
space:
mode:
authorjhampton <jhampton@gitlab.com>2018-12-04 16:26:16 -0500
committerjhampton <jhampton@gitlab.com>2018-12-04 16:26:16 -0500
commit1621123078f145f1d41e0488fb646111fc4d3237 (patch)
tree31d4f2115813db24ebef19a0c61c7eede6917adc /app/assets/javascripts/jobs
parentaaf22b668f5a2489f9729f445eb4eaa769036446 (diff)
downloadgitlab-ce-1621123078f145f1d41e0488fb646111fc4d3237.tar.gz
Updates per MR feedback
- Adjusts il8n implementation - Removes unnecessary type check - Adjusts to use Vue shorthand directives - Adjusts class names
Diffstat (limited to 'app/assets/javascripts/jobs')
-rw-r--r--app/assets/javascripts/jobs/components/trigger_block.vue32
1 files changed, 13 insertions, 19 deletions
diff --git a/app/assets/javascripts/jobs/components/trigger_block.vue b/app/assets/javascripts/jobs/components/trigger_block.vue
index 8aded3192f7..ce98474256f 100644
--- a/app/assets/javascripts/jobs/components/trigger_block.vue
+++ b/app/assets/javascripts/jobs/components/trigger_block.vue
@@ -1,11 +1,8 @@
<script>
+import { __ } from '~/locale';
import { GlButton } from '@gitlab/ui';
const HIDDEN_VALUE = '••••••';
-const TOGGLE_BUTTON_TEXT = {
- HIDE: 'Hide',
- REVEAL: 'Reveal',
-};
export default {
components: {
@@ -24,14 +21,13 @@ export default {
},
computed: {
hasVariables() {
- return Array.isArray(this.trigger.variables) && this.trigger.variables.length > 0;
+ return this.trigger.variables && this.trigger.variables.length > 0;
},
getToggleButtonText() {
- const { HIDE, REVEAL } = TOGGLE_BUTTON_TEXT;
- return `${this.showVariableValues ? HIDE : REVEAL} Values`;
+ return this.showVariableValues ? __('Hide values') : __('Reveal values');
},
hasValues() {
- return (this.trigger.variables || []).some(v => v.value);
+ return this.trigger.variables.some(v => v.value);
},
},
methods: {
@@ -61,25 +57,23 @@ export default {
<p class="trigger-variables-btn-container">
<span class="build-light-text"> {{ __('Variables:') }} </span>
- <gl-button
- v-if="hasValues"
- type="button"
- class="btn btn-default group js-reveal-variables"
- @click="toggleValues"
- >
- {{ __(getToggleButtonText) }}
+ <gl-button v-if="hasValues" class="group js-reveal-variables" @click="toggleValues">
+ {{ getToggleButtonText }}
</gl-button>
</p>
- <table class="js-build-variables trigger-variables-table trigger-build-variables">
+ <table class="js-build-variables trigger-build-variables">
<tr v-for="variable in trigger.variables">
<td
- v-bind:key="`${variable.key}-variable`"
- class="js-build-variable trigger-build-variable"
+ :key="`${variable.key}-variable`"
+ class="js-build-variable trigger-build-variable trigger-variables-table-cell"
>
{{ variable.key }}
</td>
- <td v-bind:key="`${variable.key}-value`" class="js-build-value trigger-build-value">
+ <td
+ :key="`${variable.key}-value`"
+ class="js-build-value trigger-build-value trigger-variables-table-cell"
+ >
{{ getDisplayValue(variable.value) }}
</td>
</tr>