Remove folder from environment name

Before this commit, environments grouped together in a "folder" would
include the folder name in the UI.  This information was unnecessary
since the folder is also shown in the UI.

In addition, this commit also makes some minor changes to how tooltips
are displayed for both environments and folders.
This commit is contained in:
Nathan Friend 2019-02-27 12:55:36 -04:00
parent bbbaa7078b
commit 9072a70108
No known key found for this signature in database
GPG Key ID: 3D430247AEED8395
2 changed files with 24 additions and 10 deletions

View File

@ -459,12 +459,7 @@ export default {
class="gl-responsive-table-row"
role="row"
>
<div
v-gl-tooltip
:title="model.name"
class="table-section section-wrap section-15 text-truncate"
role="gridcell"
>
<div class="table-section section-wrap section-15 text-truncate" role="gridcell">
<div v-if="!model.isFolder" class="table-mobile-header" role="rowheader">
{{ s__('Environments|Environment') }}
</div>
@ -473,14 +468,28 @@ export default {
<icon :name="deployIconName" />
</span>
<span v-if="!model.isFolder" class="environment-name table-mobile-content">
<a class="qa-environment-link" :href="environmentPath"> {{ model.name }} </a>
<span
v-if="!model.isFolder"
v-gl-tooltip
:title="model.name"
class="environment-name table-mobile-content"
>
<a class="qa-environment-link" :href="environmentPath">
<span v-if="model.size === 1">{{ model.name }}</span>
<span v-else>{{ model.name_without_type }}</span>
</a>
<span v-if="isProtected" class="badge badge-success">
{{ s__('Environments|protected') }}
</span>
</span>
<span v-else class="folder-name" role="button" @click="onClickFolder">
<span
v-else
v-gl-tooltip
:title="model.folderName"
class="folder-name"
role="button"
@click="onClickFolder"
>
<icon :name="folderIconName" class="folder-icon" />
<icon name="folder" class="folder-icon" />

View File

@ -0,0 +1,5 @@
---
title: Remove unnecessary folder prefix from environment name
merge_request: 25600
author:
type: changed