diff --git a/.rubocop_todo/gitlab/bounded_contexts.yml b/.rubocop_todo/gitlab/bounded_contexts.yml index 008a7bdf603af8506aba47c5f1703a0e9a826c2f..4b105faa13b9132dda0709bf9ef360bc752b18d7 100644 --- a/.rubocop_todo/gitlab/bounded_contexts.yml +++ b/.rubocop_todo/gitlab/bounded_contexts.yml @@ -3561,11 +3561,13 @@ Gitlab/BoundedContexts: - 'ee/lib/ee/sidebars/explore/menus/dependencies_menu.rb' - 'ee/lib/ee/sidebars/explore/panel.rb' - 'ee/lib/ee/sidebars/groups/menus/issues_menu.rb' + - 'ee/lib/ee/sidebars/groups/menus/work_items_menu.rb' - 'ee/lib/ee/sidebars/groups/menus/settings_menu.rb' - 'ee/lib/ee/sidebars/groups/panel.rb' - 'ee/lib/ee/sidebars/projects/menus/analytics_menu.rb' - 'ee/lib/ee/sidebars/projects/menus/ci_cd_menu.rb' - 'ee/lib/ee/sidebars/projects/menus/issues_menu.rb' + - 'ee/lib/ee/sidebars/projects/menus/work_items_menu.rb' - 'ee/lib/ee/sidebars/projects/menus/monitor_menu.rb' - 'ee/lib/ee/sidebars/projects/menus/packages_registries_menu.rb' - 'ee/lib/ee/sidebars/projects/menus/repository_menu.rb' @@ -3656,6 +3658,7 @@ Gitlab/BoundedContexts: - 'ee/lib/sidebars/admin/menus/subscription_menu.rb' - 'ee/lib/sidebars/groups/menus/analytics_menu.rb' - 'ee/lib/sidebars/groups/menus/epics_menu.rb' + - 'ee/lib/sidebars/groups/menus/work_item_epics_menu.rb' - 'ee/lib/sidebars/groups/menus/security_compliance_menu.rb' - 'ee/lib/sidebars/groups/menus/wiki_menu.rb' - 'ee/lib/sidebars/projects/menus/learn_gitlab_menu.rb' @@ -3966,6 +3969,7 @@ Gitlab/BoundedContexts: - 'lib/sidebars/groups/menus/customer_relations_menu.rb' - 'lib/sidebars/groups/menus/group_information_menu.rb' - 'lib/sidebars/groups/menus/issues_menu.rb' + - 'lib/sidebars/groups/menus/work_items_menu.rb' - 'lib/sidebars/groups/menus/kubernetes_menu.rb' - 'lib/sidebars/groups/menus/merge_requests_menu.rb' - 'lib/sidebars/groups/menus/packages_registries_menu.rb' @@ -4000,6 +4004,7 @@ Gitlab/BoundedContexts: - 'lib/sidebars/projects/menus/hidden_menu.rb' - 'lib/sidebars/projects/menus/infrastructure_menu.rb' - 'lib/sidebars/projects/menus/issues_menu.rb' + - 'lib/sidebars/projects/menus/work_items_menu.rb' - 'lib/sidebars/projects/menus/merge_requests_menu.rb' - 'lib/sidebars/projects/menus/monitor_menu.rb' - 'lib/sidebars/projects/menus/packages_registries_menu.rb' diff --git a/.rubocop_todo/gitlab/strong_memoize_attr.yml b/.rubocop_todo/gitlab/strong_memoize_attr.yml index 0d6414b09aecb02c1b45a399a9c019b824aa8287..b61c890dda7e247f7b94b34f639f908569f00c85 100644 --- a/.rubocop_todo/gitlab/strong_memoize_attr.yml +++ b/.rubocop_todo/gitlab/strong_memoize_attr.yml @@ -358,6 +358,7 @@ Gitlab/StrongMemoizeAttr: - 'ee/lib/ee/gitlab/security/scan_configuration.rb' - 'ee/lib/ee/gitlab/web_hooks/rate_limiter.rb' - 'ee/lib/ee/sidebars/groups/menus/issues_menu.rb' + - 'ee/lib/ee/sidebars/groups/menus/work_items_menu.rb' - 'ee/lib/elastic/multi_version_util.rb' - 'ee/lib/gitlab/auth/group_saml/auth_hash.rb' - 'ee/lib/gitlab/auth/group_saml/membership_updater.rb' @@ -562,5 +563,6 @@ Gitlab/StrongMemoizeAttr: - 'lib/safe_zip/extract_params.rb' - 'lib/sidebars/projects/menus/analytics_menu.rb' - 'lib/sidebars/projects/menus/issues_menu.rb' + - 'lib/sidebars/projects/menus/work_items_menu.rb' - 'lib/unnested_in_filters/rewriter.rb' - 'tooling/graphql/docs/helper.rb' diff --git a/.rubocop_todo/rspec/avoid_conditional_statements.yml b/.rubocop_todo/rspec/avoid_conditional_statements.yml index aa94593d1dad4a8daad45d59804eaff8f1c05820..ef65040453f710e8ebfcec366c5384e5bf374814 100644 --- a/.rubocop_todo/rspec/avoid_conditional_statements.yml +++ b/.rubocop_todo/rspec/avoid_conditional_statements.yml @@ -10,6 +10,7 @@ RSpec/AvoidConditionalStatements: - 'ee/spec/features/epics/gfm_autocomplete_spec.rb' - 'ee/spec/features/group_protected_branches_spec.rb' - 'ee/spec/features/groups/iterations/user_views_iteration_spec.rb' + - 'ee/spec/features/groups/navbar_spec.rb' - 'ee/spec/features/incidents/incident_details_spec.rb' - 'ee/spec/features/issues/user_sees_empty_state_spec.rb' - 'ee/spec/features/labels_hierarchy_spec.rb' diff --git a/.rubocop_todo/rspec/be_eq.yml b/.rubocop_todo/rspec/be_eq.yml index 4c75d7ba238da89c4f3b1e086198f399bb0f3295..a91e41f53a96583884c3399d9cae273c4809c7fe 100644 --- a/.rubocop_todo/rspec/be_eq.yml +++ b/.rubocop_todo/rspec/be_eq.yml @@ -1004,6 +1004,7 @@ RSpec/BeEq: - 'spec/lib/sidebars/projects/menus/ci_cd_menu_spec.rb' - 'spec/lib/sidebars/projects/menus/confluence_menu_spec.rb' - 'spec/lib/sidebars/projects/menus/issues_menu_spec.rb' + - 'spec/lib/sidebars/projects/menus/work_items_menu_spec.rb' - 'spec/lib/sidebars/projects/menus/merge_requests_menu_spec.rb' - 'spec/lib/sidebars/projects/menus/packages_registries_menu_spec.rb' - 'spec/lib/sidebars/projects/menus/repository_menu_spec.rb' diff --git a/.rubocop_todo/rspec/factory_bot/avoid_create.yml b/.rubocop_todo/rspec/factory_bot/avoid_create.yml index 36eaf7c51a79035c8c001c5aac4b8ceaaff7dc6a..cd51e58ef5266881f1027400c68f2058d3d971dc 100644 --- a/.rubocop_todo/rspec/factory_bot/avoid_create.yml +++ b/.rubocop_todo/rspec/factory_bot/avoid_create.yml @@ -74,6 +74,7 @@ RSpec/FactoryBot/AvoidCreate: - 'ee/spec/helpers/vulnerabilities_helper_spec.rb' - 'ee/spec/lib/sidebars/groups/menus/analytics_menu_spec.rb' - 'ee/spec/lib/sidebars/groups/menus/epics_menu_spec.rb' + - 'ee/spec/lib/sidebars/groups/menus/work_item_epics_menu_spec.rb' - 'ee/spec/lib/sidebars/groups/menus/security_compliance_menu_spec.rb' - 'ee/spec/lib/sidebars/groups/menus/wiki_menu_spec.rb' - 'ee/spec/lib/sidebars/groups/super_sidebar_panel_spec.rb' @@ -311,6 +312,7 @@ RSpec/FactoryBot/AvoidCreate: - 'spec/lib/sidebars/groups/menus/ci_cd_menu_spec.rb' - 'spec/lib/sidebars/groups/menus/group_information_menu_spec.rb' - 'spec/lib/sidebars/groups/menus/issues_menu_spec.rb' + - 'spec/lib/sidebars/groups/menus/work_items_menu_spec.rb' - 'spec/lib/sidebars/groups/menus/kubernetes_menu_spec.rb' - 'spec/lib/sidebars/groups/menus/merge_requests_menu_spec.rb' - 'spec/lib/sidebars/groups/menus/packages_registries_menu_spec.rb' diff --git a/.rubocop_todo/rspec/named_subject.yml b/.rubocop_todo/rspec/named_subject.yml index 5a6721e5ea60133bd4d42136a654ca7dd6d96296..29f8f1f7cc0c9ad3056fd8c27a1aea20cd84eeff 100644 --- a/.rubocop_todo/rspec/named_subject.yml +++ b/.rubocop_todo/rspec/named_subject.yml @@ -438,6 +438,7 @@ RSpec/NamedSubject: - 'ee/spec/lib/projects/project_changes_auditor_spec.rb' - 'ee/spec/lib/repositories/project_push_rules_changes_auditor_spec.rb' - 'ee/spec/lib/sidebars/groups/menus/epics_menu_spec.rb' + - 'ee/spec/lib/sidebars/groups/menus/work_item_epics_menu_spec.rb' - 'ee/spec/lib/sidebars/projects/menus/learn_gitlab_menu_spec.rb' - 'ee/spec/lib/sidebars/user_settings/menus/profile_billing_menu_spec.rb' - 'ee/spec/lib/system_check/geo/authorized_keys_check_spec.rb' @@ -2272,6 +2273,7 @@ RSpec/NamedSubject: - 'spec/lib/sidebars/projects/menus/hidden_menu_spec.rb' - 'spec/lib/sidebars/projects/menus/infrastructure_menu_spec.rb' - 'spec/lib/sidebars/projects/menus/issues_menu_spec.rb' + - 'spec/lib/sidebars/projects/menus/work_items_menu_spec.rb' - 'spec/lib/sidebars/projects/menus/merge_requests_menu_spec.rb' - 'spec/lib/sidebars/projects/menus/monitor_menu_spec.rb' - 'spec/lib/sidebars/projects/menus/packages_registries_menu_spec.rb' diff --git a/app/assets/javascripts/pages/groups/work_items/index.js b/app/assets/javascripts/pages/groups/work_items/index.js index a1e1a1ee30fe7b15eaadb8cc4b3d0046d94fddd7..17f77eae9d0dcd6e693cc621c463faf5f4f0017e 100644 --- a/app/assets/javascripts/pages/groups/work_items/index.js +++ b/app/assets/javascripts/pages/groups/work_items/index.js @@ -4,7 +4,7 @@ import { initWorkItemsRoot } from '~/work_items'; import { initWorkItemsFeedback } from '~/work_items_feedback'; import { __ } from '~/locale'; -initWorkItemsRoot({ workspaceType: WORKSPACE_GROUP }); +initWorkItemsRoot({ workspaceType: WORKSPACE_GROUP, withTabs: false }); initWorkItemsFeedback({ feedbackIssue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/463598', feedbackIssueText: __('Provide feedback on the experience'), diff --git a/app/assets/javascripts/pages/projects/work_items/index.js b/app/assets/javascripts/pages/projects/work_items/index.js index b44ca708b287e98a05ee33b7645328362ef92c4e..c1130f5ab9a7156fcc86261c10718e1fe666dbc8 100644 --- a/app/assets/javascripts/pages/projects/work_items/index.js +++ b/app/assets/javascripts/pages/projects/work_items/index.js @@ -1,3 +1,3 @@ import { initWorkItemsRoot } from '~/work_items'; -initWorkItemsRoot(); +initWorkItemsRoot({ withTabs: false }); diff --git a/app/assets/javascripts/super_sidebar/components/menu_section.vue b/app/assets/javascripts/super_sidebar/components/menu_section.vue index e8233e7749ace560817c92d5999c9cddf730c8cf..be1c1810101cb2bca60a1c39769cee3c752ba096 100644 --- a/app/assets/javascripts/super_sidebar/components/menu_section.vue +++ b/app/assets/javascripts/super_sidebar/components/menu_section.vue @@ -54,6 +54,14 @@ export default { }; }, computed: { + navItems() { + return this.item.items.filter((item) => { + if (item.link_classes) { + return !item.link_classes.includes('js-super-sidebar-nav-item-hidden'); + } + return true; + }); + }, buttonProps() { return { 'aria-controls': this.itemId, @@ -146,9 +154,9 @@ export default {