diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-14 21:09:48 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-14 21:09:48 +0300 |
commit | a8caa9ce4922947ba057f259bccd017c2177e1b5 (patch) | |
tree | c2d3e86b3c0336630edc7604ea575ca605fd1dd0 /app/assets/javascripts/monitoring/components/dashboards_dropdown.vue | |
parent | a483e9271bccdd2cb98cb4f3874fff5d3264d07d (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/monitoring/components/dashboards_dropdown.vue')
-rw-r--r-- | app/assets/javascripts/monitoring/components/dashboards_dropdown.vue | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/app/assets/javascripts/monitoring/components/dashboards_dropdown.vue b/app/assets/javascripts/monitoring/components/dashboards_dropdown.vue index c9f6e4bd2f5..a84977d9da9 100644 --- a/app/assets/javascripts/monitoring/components/dashboards_dropdown.vue +++ b/app/assets/javascripts/monitoring/components/dashboards_dropdown.vue @@ -3,9 +3,9 @@ import { mapState, mapGetters } from 'vuex'; import { GlIcon, GlDropdown, - GlNewDropdownItem, + GlDropdownItem, GlNewDropdownHeader, - GlNewDropdownDivider, + GlDropdownDivider, GlSearchBoxByType, GlModalDirective, } from '@gitlab/ui'; @@ -18,9 +18,9 @@ export default { components: { GlIcon, GlDropdown, - GlNewDropdownItem, + GlDropdownItem, GlNewDropdownHeader, - GlNewDropdownDivider, + GlDropdownDivider, GlSearchBoxByType, }, directives: { @@ -87,7 +87,7 @@ export default { /> <div class="flex-fill overflow-auto"> - <gl-new-dropdown-item + <gl-dropdown-item v-for="dashboard in starredDashboards" :key="dashboard.path" :is-check-item="true" @@ -100,13 +100,13 @@ export default { </span> <gl-icon class="text-muted gl-flex-shrink-0 gl-ml-3 gl-align-self-center" name="star" /> </div> - </gl-new-dropdown-item> - <gl-new-dropdown-divider + </gl-dropdown-item> + <gl-dropdown-divider v-if="starredDashboards.length && nonStarredDashboards.length" ref="starredListDivider" /> - <gl-new-dropdown-item + <gl-dropdown-item v-for="dashboard in nonStarredDashboards" :key="dashboard.path" :is-check-item="true" @@ -116,7 +116,7 @@ export default { <span class="gl-overflow-hidden gl-overflow-wrap-break"> {{ dashboardDisplayName(dashboard) }} </span> - </gl-new-dropdown-item> + </gl-dropdown-item> </div> <div |