diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-09-13 15:11:29 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-09-13 15:11:29 +0300 |
commit | 3c293d24c3408d204be7d84d6319b373c83ff6ae (patch) | |
tree | bb64f9751f7d859b43b7a0f58c184c503135373b /app/assets/javascripts/ci | |
parent | 2ea5c7c9c919b801d5039722e271ba077cc05986 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/ci')
-rw-r--r-- | app/assets/javascripts/ci/ci_variable_list/components/ci_variable_table.vue | 49 |
1 files changed, 23 insertions, 26 deletions
diff --git a/app/assets/javascripts/ci/ci_variable_list/components/ci_variable_table.vue b/app/assets/javascripts/ci/ci_variable_list/components/ci_variable_table.vue index a14cd1e387a..3d62313815c 100644 --- a/app/assets/javascripts/ci/ci_variable_list/components/ci_variable_table.vue +++ b/app/assets/javascripts/ci/ci_variable_list/components/ci_variable_table.vue @@ -32,24 +32,20 @@ export default { label: s__('CiVariables|Key'), tdClass: 'text-plain', sortable: true, + thClass: 'gl-w-40p', }, { key: 'value', label: s__('CiVariables|Value'), }, { - key: 'Attributes', - label: s__('CiVariables|Attributes'), - thClass: 'gl-w-40p', - }, - { key: 'environmentScope', label: s__('CiVariables|Environments'), }, { key: 'actions', label: __('Actions'), - thClass: 'gl-text-right', + thClass: 'gl-text-right gl-w-15', }, ], inheritedVarsFields: [ @@ -287,7 +283,7 @@ export default { </template> <template #cell(key)="{ item }"> <div - class="gl-display-flex gl-align-items-flex-start gl-justify-content-end gl-lg-justify-content-start gl-mr-n3" + class="gl-display-flex gl-align-items-flex-start gl-justify-content-end gl-md-justify-content-start gl-mr-n3" > <span :id="`ci-variable-key-${item.id}`" @@ -298,16 +294,28 @@ export default { v-gl-tooltip category="tertiary" icon="copy-to-clipboard" - class="gl-my-n3 gl-ml-2" + class="gl-my-n2 gl-ml-2" + size="small" :title="__('Copy key')" :data-clipboard-text="item.key" :aria-label="__('Copy to clipboard')" /> </div> + <div data-testid="ci-variable-table-row-attributes" class="gl-mt-2"> + <gl-badge + v-for="attribute in item.attributes" + :key="`${item.key}-${attribute}`" + class="gl-mr-2" + variant="info" + size="sm" + > + {{ attribute }} + </gl-badge> + </div> </template> <template v-if="!isInheritedGroupVars" #cell(value)="{ item }"> <div - class="gl-display-flex gl-align-items-flex-start gl-justify-content-end gl-lg-justify-content-start gl-mr-n3" + class="gl-display-flex gl-align-items-flex-start gl-justify-content-end gl-md-justify-content-start gl-mr-n3" > <span v-if="areValuesHidden" data-testid="hiddenValue">*****</span> <span @@ -321,29 +329,17 @@ export default { v-gl-tooltip category="tertiary" icon="copy-to-clipboard" - class="gl-my-n3 gl-ml-2" + class="gl-my-n2 gl-ml-2" + size="small" :title="__('Copy value')" :data-clipboard-text="item.value" :aria-label="__('Copy to clipboard')" /> </div> </template> - <template #cell(attributes)="{ item }"> - <span data-testid="ci-variable-table-row-attributes"> - <gl-badge - v-for="attribute in item.attributes" - :key="`${item.key}-${attribute}`" - class="gl-mr-2" - variant="info" - size="sm" - > - {{ attribute }} - </gl-badge> - </span> - </template> <template #cell(environmentScope)="{ item }"> <div - class="gl-display-flex gl-align-items-flex-start gl-justify-content-end gl-lg-justify-content-start gl-mr-n3" + class="gl-display-flex gl-align-items-flex-start gl-justify-content-end gl-md-justify-content-start gl-mr-n3" > <span :id="`ci-variable-env-${item.id}`" @@ -354,7 +350,8 @@ export default { v-gl-tooltip category="tertiary" icon="copy-to-clipboard" - class="gl-my-n3 gl-ml-2" + class="gl-my-n2 gl-ml-2" + size="small" :title="__('Copy environment')" :data-clipboard-text="convertEnvironmentScopeValue(item.environmentScope)" :aria-label="__('Copy to clipboard')" @@ -363,7 +360,7 @@ export default { </template> <template v-if="isInheritedGroupVars" #cell(group)="{ item }"> <div - class="gl-display-flex gl-align-items-flex-start gl-justify-content-end gl-lg-justify-content-start gl-mr-n3" + class="gl-display-flex gl-align-items-flex-start gl-justify-content-end gl-md-justify-content-start gl-mr-n3" > <gl-link :id="`ci-variable-group-${item.id}`" |