diff --git a/app/assets/javascripts/entrypoints/super_sidebar.js b/app/assets/javascripts/entrypoints/super_sidebar.js index 961ffc56e60d6e911903ad487e91960ecba7045a..6fbb77673cb824bf0bce48bd26adb144f2e59124 100644 --- a/app/assets/javascripts/entrypoints/super_sidebar.js +++ b/app/assets/javascripts/entrypoints/super_sidebar.js @@ -5,10 +5,12 @@ import { initSuperSidebarToggle, initPageBreadcrumbs, getSuperSidebarData, + initSuperTopbar, } from '~/super_sidebar/super_sidebar_bundle'; const superSidebarData = getSuperSidebarData(); initSuperSidebar(superSidebarData); initSuperSidebarToggle(); +initSuperTopbar(superSidebarData); initPageBreadcrumbs(); diff --git a/app/assets/javascripts/super_sidebar/components/topbar.vue b/app/assets/javascripts/super_sidebar/components/topbar.vue new file mode 100644 index 0000000000000000000000000000000000000000..e087d1c7341a49f821972384849bf10c10f8ab11 --- /dev/null +++ b/app/assets/javascripts/super_sidebar/components/topbar.vue @@ -0,0 +1,105 @@ + + + diff --git a/app/assets/javascripts/super_sidebar/components/user_bar.vue b/app/assets/javascripts/super_sidebar/components/user_bar.vue index 68693b5dadb60755b032c0c1f29986920b0588f9..66d1b46acef914136412baf68ee81ccd241a89d9 100644 --- a/app/assets/javascripts/super_sidebar/components/user_bar.vue +++ b/app/assets/javascripts/super_sidebar/components/user_bar.vue @@ -13,10 +13,9 @@ import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; import BrandLogo from 'jh_else_ce/super_sidebar/components/brand_logo.vue'; import { JS_TOGGLE_COLLAPSE_CLASS } from '../constants'; import CreateMenu from './create_menu.vue'; -import Counter from './counter.vue'; -import MergeRequestMenu from './merge_request_menu.vue'; import UserMenu from './user_menu.vue'; import SuperSidebarToggle from './super_sidebar_toggle.vue'; +import UserCounts from './user_counts.vue'; import { SEARCH_MODAL_ID } from './global_search/constants'; const trackingMixin = InternalEvents.mixin(); @@ -28,12 +27,11 @@ export default { JS_TOGGLE_COLLAPSE_CLASS, SEARCH_MODAL_ID, components: { - Counter, CreateMenu, GlBadge, GlButton, - MergeRequestMenu, UserMenu, + UserCounts, SearchModal: () => import( /* webpackChunkName: 'global_search_modal' */ './global_search/components/global_search.vue' @@ -45,14 +43,11 @@ export default { import(/* webpackChunkName: 'organization_switcher' */ './organization_switcher.vue'), }, i18n: { - issues: __('Assigned issues'), - mergeRequests: __('Merge requests'), searchKbdHelp: sprintf( s__('GlobalSearch|Type %{kbdOpen}/%{kbdClose} to search'), { kbdOpen: '', kbdClose: '' }, false, ), - todoList: __('To-Do List'), stopImpersonating: __('Stop impersonating'), searchBtnText: __('Search or go to…'), }, @@ -75,21 +70,19 @@ export default { }, data() { return { - mrMenuShown: false, searchTooltip: this.$options.i18n.searchKbdHelp, - userCounts, isLoggedIn: isLoggedIn(), }; }, computed: { - mergeRequestMenuComponent() { - return this.sidebarData.merge_request_menu ? 'merge-request-menu' : 'div'; - }, shouldShowOrganizationSwitcher() { return ( this.glFeatures.uiForOrganizations && this.isLoggedIn && window.gon.current_organization ); }, + appHasTopbar() { + return gon.features.globalTopbar; + }, }, created() { Object.assign(userCounts, this.sidebarData.user_counts); @@ -126,7 +119,7 @@ export default { class="gl-flex gl-items-center gl-gap-1" >