From 217c1a9f9706092730bf986d51d5666d74df336f Mon Sep 17 00:00:00 2001
From: Jack Chapman <jachapman@gitlab.com>
Date: Fri, 7 Feb 2025 16:57:17 +0000
Subject: [PATCH 01/22] add project work_items index

---
 app/controllers/projects/work_items_controller.rb    | 4 ++++
 app/views/projects/work_items/index.html.haml        | 6 ++++++
 config/feature_flags/wip/work_item_planning_view.yml | 9 +++++++++
 config/routes/project.rb                             | 2 +-
 4 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 app/views/projects/work_items/index.html.haml
 create mode 100644 config/feature_flags/wip/work_item_planning_view.yml

diff --git a/app/controllers/projects/work_items_controller.rb b/app/controllers/projects/work_items_controller.rb
index 83d2ed4c7430a5..c284816f25ede5 100644
--- a/app/controllers/projects/work_items_controller.rb
+++ b/app/controllers/projects/work_items_controller.rb
@@ -35,6 +35,10 @@ def import_csv
     end
   end
 
+  def index
+    not_found unless ::Feature.enabled?(:namespace_level_work_items, project&.group, type: :development)
+  end
+
   def show
     return if show_params[:iid] == 'new'
 
diff --git a/app/views/projects/work_items/index.html.haml b/app/views/projects/work_items/index.html.haml
new file mode 100644
index 00000000000000..fc02fcc3eb3af9
--- /dev/null
+++ b/app/views/projects/work_items/index.html.haml
@@ -0,0 +1,6 @@
+- page_title s_('WorkItem|Work items')
+- add_page_specific_style 'page_bundles/issuable_list'
+- add_work_items_stylesheet
+- add_page_specific_style 'page_bundles/design_management'
+
+#js-work-items{ data: work_items_show_data(@project, current_user) }
diff --git a/config/feature_flags/wip/work_item_planning_view.yml b/config/feature_flags/wip/work_item_planning_view.yml
new file mode 100644
index 00000000000000..c50b02b2c28af3
--- /dev/null
+++ b/config/feature_flags/wip/work_item_planning_view.yml
@@ -0,0 +1,9 @@
+---
+name: work_item_planning_view
+feature_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/512661
+introduced_by_url:
+rollout_issue_url:
+milestone: '17.9'
+group: group::product planning
+type: wip
+default_enabled: false
diff --git a/config/routes/project.rb b/config/routes/project.rb
index b7729169a91e15..4a8ed14ebb59a0 100644
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -362,7 +362,7 @@
 
         get 'alert_management/:id', to: 'alert_management#details', as: 'alert_management_alert'
 
-        resources :work_items, only: [:show], param: :iid do
+        resources :work_items, only: [:show, :index], param: :iid do
           collection do
             post :import_csv
             post 'import_csv/authorize', to: 'work_items#authorize'
-- 
GitLab


From 95a6330bd6d7603dea7da62470d9f163417afa27 Mon Sep 17 00:00:00 2001
From: Jack Chapman <jachapman@gitlab.com>
Date: Mon, 10 Feb 2025 14:46:01 +0000
Subject: [PATCH 02/22] Nav changes for work item lists

---
 .../pages/groups/work_items/index.js          |  2 +-
 .../pages/projects/work_items/index.js        |  2 +-
 .../list/components/issuable_list_root.vue    |  3 +++
 .../list/components/issuable_tabs.vue         |  3 +++
 .../javascripts/work_items/components/app.vue |  7 ++++++-
 .../components/work_item_breadcrumb.vue       |  8 ++------
 app/assets/javascripts/work_items/index.js    |  3 ++-
 .../work_items/pages/work_items_list_app.vue  |  7 +++++--
 .../ee/sidebars/groups/menus/settings_menu.rb |  4 ++--
 ee/lib/ee/sidebars/groups/panel.rb            |  8 ++++----
 ee/lib/sidebars/groups/menus/epics_menu.rb    |  2 +-
 lib/sidebars/groups/menus/issues_menu.rb      | 20 ++++++++++++++-----
 lib/sidebars/projects/menus/issues_menu.rb    | 17 ++++++++++------
 13 files changed, 56 insertions(+), 30 deletions(-)

diff --git a/app/assets/javascripts/pages/groups/work_items/index.js b/app/assets/javascripts/pages/groups/work_items/index.js
index a1e1a1ee30fe7b..17f77eae9d0dcd 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 b44ca708b287e9..c1130f5ab9a715 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/vue_shared/issuable/list/components/issuable_list_root.vue b/app/assets/javascripts/vue_shared/issuable/list/components/issuable_list_root.vue
index dff3c19bc10f01..22f3775faf3f2e 100644
--- a/app/assets/javascripts/vue_shared/issuable/list/components/issuable_list_root.vue
+++ b/app/assets/javascripts/vue_shared/issuable/list/components/issuable_list_root.vue
@@ -340,6 +340,9 @@ export default {
       <template #nav-actions>
         <slot name="nav-actions"></slot>
       </template>
+      <template #title>
+        <slot name="title"></slot>
+      </template>
     </issuable-tabs>
     <filtered-search-bar
       :namespace="namespace"
diff --git a/app/assets/javascripts/vue_shared/issuable/list/components/issuable_tabs.vue b/app/assets/javascripts/vue_shared/issuable/list/components/issuable_tabs.vue
index 3757146c1ba5ae..ebf06b29154cc2 100644
--- a/app/assets/javascripts/vue_shared/issuable/list/components/issuable_tabs.vue
+++ b/app/assets/javascripts/vue_shared/issuable/list/components/issuable_tabs.vue
@@ -50,6 +50,9 @@ export default {
 
 <template>
   <div class="top-area">
+    <div>
+      <slot name="title"></slot>
+    </div>
     <gl-tabs
       class="mobile-separator issuable-state-filters gl-m-0 gl-flex gl-grow gl-p-0"
       nav-class="gl-border-b-0"
diff --git a/app/assets/javascripts/work_items/components/app.vue b/app/assets/javascripts/work_items/components/app.vue
index c5ca1d2d5de583..ee88253d6af09d 100644
--- a/app/assets/javascripts/work_items/components/app.vue
+++ b/app/assets/javascripts/work_items/components/app.vue
@@ -6,10 +6,15 @@ export default {
       required: false,
       default: () => [],
     },
+    withTabs: {
+      type: Boolean,
+      required: false,
+      default: true,
+    },
   },
 };
 </script>
 
 <template>
-  <router-view :new-comment-template-paths="newCommentTemplatePaths" />
+  <router-view :new-comment-template-paths="newCommentTemplatePaths" :with-tabs="withTabs" />
 </template>
diff --git a/app/assets/javascripts/work_items/components/work_item_breadcrumb.vue b/app/assets/javascripts/work_items/components/work_item_breadcrumb.vue
index 720104a42be63d..940ce2301d61f5 100644
--- a/app/assets/javascripts/work_items/components/work_item_breadcrumb.vue
+++ b/app/assets/javascripts/work_items/components/work_item_breadcrumb.vue
@@ -1,6 +1,6 @@
 <script>
 import { GlBreadcrumb } from '@gitlab/ui';
-import { s__, __ } from '~/locale';
+import { s__ } from '~/locale';
 import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 import { ROUTES, WORK_ITEM_TYPE_ENUM_EPIC } from '../constants';
 
@@ -30,11 +30,7 @@ export default {
       return this.workItemType === WORK_ITEM_TYPE_ENUM_EPIC;
     },
     listName() {
-      if (this.isEpicsList) {
-        return __('Epics');
-      }
-
-      return this.isGroup ? s__('WorkItem|Work items') : __('Issues');
+      return s__('WorkItem|Work items');
     },
     issueAsWorkItem() {
       return (
diff --git a/app/assets/javascripts/work_items/index.js b/app/assets/javascripts/work_items/index.js
index 1cd94e17ae4725..8097d79a73beea 100644
--- a/app/assets/javascripts/work_items/index.js
+++ b/app/assets/javascripts/work_items/index.js
@@ -16,7 +16,7 @@ import { createRouter } from './router';
 
 Vue.use(VueApollo);
 
-export const initWorkItemsRoot = ({ workItemType, workspaceType } = {}) => {
+export const initWorkItemsRoot = ({ workItemType, workspaceType, withTabs } = {}) => {
   const el = document.querySelector('#js-work-items');
 
   if (!el) {
@@ -148,6 +148,7 @@ export const initWorkItemsRoot = ({ workItemType, workspaceType } = {}) => {
       return createElement(App, {
         props: {
           newCommentTemplatePaths: JSON.parse(newCommentTemplatePaths),
+          withTabs,
         },
       });
     },
diff --git a/app/assets/javascripts/work_items/pages/work_items_list_app.vue b/app/assets/javascripts/work_items/pages/work_items_list_app.vue
index 4e5a5e2e7eaec9..bffbd022f1f6f3 100644
--- a/app/assets/javascripts/work_items/pages/work_items_list_app.vue
+++ b/app/assets/javascripts/work_items/pages/work_items_list_app.vue
@@ -181,8 +181,7 @@ export default {
 
         if (data?.[this.namespace]) {
           if (this.isGroup) {
-            const rootBreadcrumbName = this.isEpicsList ? __('Epics') : s__('WorkItem|Work items');
-            document.title = `${rootBreadcrumbName} · ${data.group.name} · GitLab`;
+            document.title = `Work items · ${data.group.name} · GitLab`;
           } else {
             document.title = `Issues · ${data.project.name} · GitLab`;
           }
@@ -746,6 +745,10 @@ export default {
         <slot name="nav-actions"></slot>
       </template>
 
+      <template v-if="!withTabs" #title>
+        <h2>{{ s__('WorkItem|Work items') }}</h2>
+      </template>
+
       <template #timeframe="{ issuable = {} }">
         <issue-card-time-info :issue="issuable" :is-work-item-list="true" />
       </template>
diff --git a/ee/lib/ee/sidebars/groups/menus/settings_menu.rb b/ee/lib/ee/sidebars/groups/menus/settings_menu.rb
index 3ee42cb5cdcc8d..2ba57423b8ada9 100644
--- a/ee/lib/ee/sidebars/groups/menus/settings_menu.rb
+++ b/ee/lib/ee/sidebars/groups/menus/settings_menu.rb
@@ -228,14 +228,14 @@ def gitlab_duo_settings_menu_item
 
           def group_work_items_menu_item
             unless show_group_work_items_settings_menu_item?
-              return ::Sidebars::NilMenuItem.new(item_id: :group_work_items)
+              return ::Sidebars::NilMenuItem.new(item_id: :group_work_items_settings)
             end
 
             ::Sidebars::MenuItem.new(
               title: _('Issues'),
               link: group_settings_issues_path(context.group),
               active_routes: { controller: :work_items },
-              item_id: :group_work_items
+              item_id: :group_work_items_settings
             )
           end
 
diff --git a/ee/lib/ee/sidebars/groups/panel.rb b/ee/lib/ee/sidebars/groups/panel.rb
index 6e47ffb5fe7b2d..e219f8a25d1664 100644
--- a/ee/lib/ee/sidebars/groups/panel.rb
+++ b/ee/lib/ee/sidebars/groups/panel.rb
@@ -10,10 +10,10 @@ module Panel
         def configure_menus
           super
 
-          insert_menu_after(
-            context.is_super_sidebar ? ::Sidebars::Groups::Menus::SettingsMenu : ::Sidebars::Groups::Menus::GroupInformationMenu,
-            ::Sidebars::Groups::Menus::EpicsMenu.new(context)
-          )
+          # insert_menu_after(
+          #   context.is_super_sidebar ? ::Sidebars::Groups::Menus::SettingsMenu : ::Sidebars::Groups::Menus::GroupInformationMenu
+          #   # ::Sidebars::Groups::Menus::EpicsMenu.new(context)
+          # )
 
           insert_menu_after(
             context.is_super_sidebar ? ::Sidebars::Groups::Menus::CiCdMenu : ::Sidebars::Groups::Menus::MergeRequestsMenu,
diff --git a/ee/lib/sidebars/groups/menus/epics_menu.rb b/ee/lib/sidebars/groups/menus/epics_menu.rb
index 79589db6e6d976..cdd2204a120ca0 100644
--- a/ee/lib/sidebars/groups/menus/epics_menu.rb
+++ b/ee/lib/sidebars/groups/menus/epics_menu.rb
@@ -49,7 +49,7 @@ def serialize_as_menu_item_args
             pill_count_field: pill_count_field,
             has_pill: has_pill?,
             super_sidebar_parent: ::Sidebars::Groups::SuperSidebarMenus::PlanMenu,
-            item_id: :group_epic_list
+            item_id: :group_issues_list
           })
         end
 
diff --git a/lib/sidebars/groups/menus/issues_menu.rb b/lib/sidebars/groups/menus/issues_menu.rb
index 2eed72ba844e13..a3d6c687fdfe33 100644
--- a/lib/sidebars/groups/menus/issues_menu.rb
+++ b/lib/sidebars/groups/menus/issues_menu.rb
@@ -19,7 +19,7 @@ def configure_menu_items
 
         override :title
         def title
-          _('Issues')
+          s_('WorkItem|Work items')
         end
 
         override :sprite_icon
@@ -32,6 +32,16 @@ def has_pill?
           true
         end
 
+        override :active_routes
+        def active_routes
+          {
+            path: %w[
+              groups/issues#index groups/issues#show groups/issues#new
+              groups/work_items#index groups/work_items#show groups/work_items#new
+            ]
+          }
+        end
+
         override :pill_count_field
         def pill_count_field
           'openIssuesCount'
@@ -60,11 +70,11 @@ def serialize_as_menu_item_args
 
         def list_menu_item
           ::Sidebars::MenuItem.new(
-            title: _('List'),
-            link: issues_group_path(context.group),
+            title: s_('WorkItem|Work items'),
+            link: group_work_items_path(context.group),
             super_sidebar_parent: ::Sidebars::NilMenuItem,
-            active_routes: { path: 'groups#issues' },
-            container_html_options: { aria: { label: _('Issues') } },
+            active_routes: active_routes,
+            container_html_options: { aria: { label: s_('WorkItem|Work items') } },
             item_id: :issue_list
           )
         end
diff --git a/lib/sidebars/projects/menus/issues_menu.rb b/lib/sidebars/projects/menus/issues_menu.rb
index 148b7d1c6ce396..73683ba00dc52a 100644
--- a/lib/sidebars/projects/menus/issues_menu.rb
+++ b/lib/sidebars/projects/menus/issues_menu.rb
@@ -27,7 +27,7 @@ def extra_container_html_options
 
         override :title
         def title
-          _('Issues')
+          s_('WorkItem|Work items')
         end
 
         override :sprite_icon
@@ -37,7 +37,12 @@ def sprite_icon
 
         override :active_routes
         def active_routes
-          { path: %w[projects/issues#index projects/issues#show projects/issues#new] }
+          {
+            path: %w[
+              projects/issues#index projects/issues#show projects/issues#new
+              projects/work_items#index projects/work_items#show projects/work_items#new
+            ]
+          }
         end
 
         override :has_pill?
@@ -82,11 +87,11 @@ def multi_issue_boards?
 
         def list_menu_item
           ::Sidebars::MenuItem.new(
-            title: _('List'),
-            link: project_issues_path(context.project),
+            title: s_('WorkItem|Work items'),
+            link: project_work_items_path(context.project),
             super_sidebar_parent: ::Sidebars::NilMenuItem,
-            active_routes: { path: 'projects/issues#index' },
-            container_html_options: { aria: { label: _('Issues') } },
+            active_routes: { path: 'projects/work_items#index' },
+            container_html_options: { aria: { label: s_('WorkItem|Work items') } },
             item_id: :issue_list
           )
         end
-- 
GitLab


From a8a47ffd21aac60fdece1b7f6911b5eba56ad99f Mon Sep 17 00:00:00 2001
From: Jack Chapman <jachapman@gitlab.com>
Date: Tue, 11 Feb 2025 16:31:08 +0000
Subject: [PATCH 03/22] Add Work Item menu variants

---
 .rubocop_todo/gitlab/bounded_contexts.yml     |   3 +
 .rubocop_todo/gitlab/strong_memoize_attr.yml  |   1 +
 .../wip/work_item_planning_view.yml           |   2 +-
 .../ee/sidebars/groups/menus/settings_menu.rb |   2 +-
 ee/lib/ee/sidebars/groups/panel.rb            |  15 +-
 ee/lib/sidebars/groups/menus/epics_menu.rb    |   2 +-
 .../groups/menus/work_item_epics_menu.rb      |  70 +++++++++
 lib/sidebars/groups/menus/issues_menu.rb      |  20 +--
 lib/sidebars/groups/menus/work_items_menu.rb  | 120 +++++++++++++++
 lib/sidebars/groups/panel.rb                  |   8 +-
 lib/sidebars/projects/menus/issues_menu.rb    |  17 +--
 .../projects/menus/work_items_menu.rb         | 142 ++++++++++++++++++
 lib/sidebars/projects/panel.rb                |   8 +-
 13 files changed, 375 insertions(+), 35 deletions(-)
 create mode 100644 ee/lib/sidebars/groups/menus/work_item_epics_menu.rb
 create mode 100644 lib/sidebars/groups/menus/work_items_menu.rb
 create mode 100644 lib/sidebars/projects/menus/work_items_menu.rb

diff --git a/.rubocop_todo/gitlab/bounded_contexts.yml b/.rubocop_todo/gitlab/bounded_contexts.yml
index 008a7bdf603af8..03bc317899317d 100644
--- a/.rubocop_todo/gitlab/bounded_contexts.yml
+++ b/.rubocop_todo/gitlab/bounded_contexts.yml
@@ -3656,6 +3656,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 +3967,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 +4002,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 0d6414b09aecb0..2ee8cbb18b6686 100644
--- a/.rubocop_todo/gitlab/strong_memoize_attr.yml
+++ b/.rubocop_todo/gitlab/strong_memoize_attr.yml
@@ -562,5 +562,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/config/feature_flags/wip/work_item_planning_view.yml b/config/feature_flags/wip/work_item_planning_view.yml
index c50b02b2c28af3..3f5302dbec0b92 100644
--- a/config/feature_flags/wip/work_item_planning_view.yml
+++ b/config/feature_flags/wip/work_item_planning_view.yml
@@ -1,7 +1,7 @@
 ---
 name: work_item_planning_view
 feature_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/512661
-introduced_by_url:
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/180972
 rollout_issue_url:
 milestone: '17.9'
 group: group::product planning
diff --git a/ee/lib/ee/sidebars/groups/menus/settings_menu.rb b/ee/lib/ee/sidebars/groups/menus/settings_menu.rb
index 2ba57423b8ada9..8bb408eb09fc2f 100644
--- a/ee/lib/ee/sidebars/groups/menus/settings_menu.rb
+++ b/ee/lib/ee/sidebars/groups/menus/settings_menu.rb
@@ -234,7 +234,7 @@ def group_work_items_menu_item
             ::Sidebars::MenuItem.new(
               title: _('Issues'),
               link: group_settings_issues_path(context.group),
-              active_routes: { controller: :work_items },
+              active_routes: { controller: 'groups/settings/work_items' },
               item_id: :group_work_items_settings
             )
           end
diff --git a/ee/lib/ee/sidebars/groups/panel.rb b/ee/lib/ee/sidebars/groups/panel.rb
index e219f8a25d1664..62ffe433c1c2e9 100644
--- a/ee/lib/ee/sidebars/groups/panel.rb
+++ b/ee/lib/ee/sidebars/groups/panel.rb
@@ -10,10 +10,17 @@ module Panel
         def configure_menus
           super
 
-          # insert_menu_after(
-          #   context.is_super_sidebar ? ::Sidebars::Groups::Menus::SettingsMenu : ::Sidebars::Groups::Menus::GroupInformationMenu
-          #   # ::Sidebars::Groups::Menus::EpicsMenu.new(context)
-          # )
+          if ::Feature.enabled?(:work_item_planning_view, context.group)
+            insert_menu_after(
+              context.is_super_sidebar ? ::Sidebars::Groups::Menus::SettingsMenu : ::Sidebars::Groups::Menus::GroupInformationMenu,
+              ::Sidebars::Groups::Menus::WorkItemEpicsMenu.new(context)
+            )
+          else
+            insert_menu_after(
+              context.is_super_sidebar ? ::Sidebars::Groups::Menus::SettingsMenu : ::Sidebars::Groups::Menus::GroupInformationMenu,
+              ::Sidebars::Groups::Menus::EpicsMenu.new(context)
+            )
+          end
 
           insert_menu_after(
             context.is_super_sidebar ? ::Sidebars::Groups::Menus::CiCdMenu : ::Sidebars::Groups::Menus::MergeRequestsMenu,
diff --git a/ee/lib/sidebars/groups/menus/epics_menu.rb b/ee/lib/sidebars/groups/menus/epics_menu.rb
index cdd2204a120ca0..79589db6e6d976 100644
--- a/ee/lib/sidebars/groups/menus/epics_menu.rb
+++ b/ee/lib/sidebars/groups/menus/epics_menu.rb
@@ -49,7 +49,7 @@ def serialize_as_menu_item_args
             pill_count_field: pill_count_field,
             has_pill: has_pill?,
             super_sidebar_parent: ::Sidebars::Groups::SuperSidebarMenus::PlanMenu,
-            item_id: :group_issues_list
+            item_id: :group_epic_list
           })
         end
 
diff --git a/ee/lib/sidebars/groups/menus/work_item_epics_menu.rb b/ee/lib/sidebars/groups/menus/work_item_epics_menu.rb
new file mode 100644
index 00000000000000..38d9a075cf4a78
--- /dev/null
+++ b/ee/lib/sidebars/groups/menus/work_item_epics_menu.rb
@@ -0,0 +1,70 @@
+# frozen_string_literal: true
+
+module Sidebars
+  module Groups
+    module Menus
+      class WorkItemEpicsMenu < ::Sidebars::Menu
+        include Gitlab::Utils::StrongMemoize
+
+        override :configure_menu_items
+        def configure_menu_items
+          return false unless can?(context.current_user, :read_epic, context.group)
+
+          add_item(roadmap_menu_item)
+
+          true
+        end
+
+        override :title
+        def title
+          context.is_super_sidebar ? _('Epic boards') : _('Boards')
+        end
+
+        override :sprite_icon
+        def sprite_icon
+          'epic'
+        end
+
+        override :active_routes
+        def active_routes
+          { controller: :epics }
+        end
+
+        override :has_pill?
+        def has_pill?
+          false
+        end
+
+        override :pill_count_field
+        def pill_count_field
+          'openEpicsCount'
+        end
+
+        override :serialize_as_menu_item_args
+        def serialize_as_menu_item_args
+          super.merge({
+            pill_count: pill_count,
+            pill_count_field: pill_count_field,
+            has_pill: has_pill?,
+            super_sidebar_parent: ::Sidebars::Groups::SuperSidebarMenus::PlanMenu,
+            item_id: context.is_super_sidebar ? :epic_boards : :boards,
+            link: group_epic_boards_path(context.group)
+          })
+        end
+
+        private
+
+        def roadmap_menu_item
+          ::Sidebars::MenuItem.new(
+            title: _('Roadmap'),
+            link: group_roadmap_path(context.group),
+            super_sidebar_parent: ::Sidebars::Groups::SuperSidebarMenus::PlanMenu,
+            active_routes: { path: 'roadmap#show' },
+            container_html_options: { class: 'home' },
+            item_id: :roadmap
+          )
+        end
+      end
+    end
+  end
+end
diff --git a/lib/sidebars/groups/menus/issues_menu.rb b/lib/sidebars/groups/menus/issues_menu.rb
index a3d6c687fdfe33..2eed72ba844e13 100644
--- a/lib/sidebars/groups/menus/issues_menu.rb
+++ b/lib/sidebars/groups/menus/issues_menu.rb
@@ -19,7 +19,7 @@ def configure_menu_items
 
         override :title
         def title
-          s_('WorkItem|Work items')
+          _('Issues')
         end
 
         override :sprite_icon
@@ -32,16 +32,6 @@ def has_pill?
           true
         end
 
-        override :active_routes
-        def active_routes
-          {
-            path: %w[
-              groups/issues#index groups/issues#show groups/issues#new
-              groups/work_items#index groups/work_items#show groups/work_items#new
-            ]
-          }
-        end
-
         override :pill_count_field
         def pill_count_field
           'openIssuesCount'
@@ -70,11 +60,11 @@ def serialize_as_menu_item_args
 
         def list_menu_item
           ::Sidebars::MenuItem.new(
-            title: s_('WorkItem|Work items'),
-            link: group_work_items_path(context.group),
+            title: _('List'),
+            link: issues_group_path(context.group),
             super_sidebar_parent: ::Sidebars::NilMenuItem,
-            active_routes: active_routes,
-            container_html_options: { aria: { label: s_('WorkItem|Work items') } },
+            active_routes: { path: 'groups#issues' },
+            container_html_options: { aria: { label: _('Issues') } },
             item_id: :issue_list
           )
         end
diff --git a/lib/sidebars/groups/menus/work_items_menu.rb b/lib/sidebars/groups/menus/work_items_menu.rb
new file mode 100644
index 00000000000000..44c16cfbed21d2
--- /dev/null
+++ b/lib/sidebars/groups/menus/work_items_menu.rb
@@ -0,0 +1,120 @@
+# frozen_string_literal: true
+
+module Sidebars
+  module Groups
+    module Menus
+      class WorkItemsMenu < ::Sidebars::Menu
+        include Gitlab::Utils::StrongMemoize
+
+        override :configure_menu_items
+        def configure_menu_items
+          return unless can?(context.current_user, :read_group_issues, context.group)
+
+          add_item(list_menu_item)
+          add_item(boards_menu_item)
+          add_item(milestones_menu_item)
+
+          true
+        end
+
+        override :title
+        def title
+          s_('WorkItem|Work items')
+        end
+
+        override :sprite_icon
+        def sprite_icon
+          'issues'
+        end
+
+        override :has_pill?
+        def has_pill?
+          true
+        end
+
+        override :active_routes
+        def active_routes
+          {
+            path: %w[
+              groups/issues#index groups/issues#show groups/issues#new
+              groups/work_items#index groups/work_items#show groups/work_items#new
+            ]
+          }
+        end
+
+        override :pill_count_field
+        def pill_count_field
+          'openIssuesCount'
+        end
+
+        override :pill_html_options
+        def pill_html_options
+          {
+            class: 'issue_counter'
+          }
+        end
+
+        override :serialize_as_menu_item_args
+        def serialize_as_menu_item_args
+          super.merge({
+            active_routes: list_menu_item.active_routes,
+            pill_count: pill_count,
+            pill_count_field: pill_count_field,
+            has_pill: has_pill?,
+            super_sidebar_parent: ::Sidebars::Groups::SuperSidebarMenus::PlanMenu,
+            item_id: :group_issue_list
+          })
+        end
+
+        private
+
+        def list_menu_item
+          ::Sidebars::MenuItem.new(
+            title: s_('WorkItem|Work items'),
+            link: group_work_items_path(context.group),
+            super_sidebar_parent: ::Sidebars::NilMenuItem,
+            active_routes: active_routes,
+            container_html_options: { aria: { label: s_('WorkItem|Work items') } },
+            item_id: :issue_list
+          )
+        end
+
+        def boards_menu_item
+          unless can?(context.current_user, :read_group_boards, context.group)
+            return ::Sidebars::NilMenuItem.new(item_id: :boards)
+          end
+
+          title = if context.is_super_sidebar
+                    context.group.multiple_issue_boards_available? ? s_('Issue boards') : s_('Issue board')
+                  else
+                    context.group.multiple_issue_boards_available? ? s_('Boards|Boards') : s_('Boards|Board')
+                  end
+
+          ::Sidebars::MenuItem.new(
+            title: title,
+            link: group_boards_path(context.group),
+            super_sidebar_parent: ::Sidebars::Groups::SuperSidebarMenus::PlanMenu,
+            active_routes: { path: %w[boards#index boards#show] },
+            item_id: context.is_super_sidebar ? :issue_boards : :boards
+          )
+        end
+
+        def milestones_menu_item
+          unless can?(context.current_user, :read_group_milestones, context.group)
+            return ::Sidebars::NilMenuItem.new(item_id: :milestones)
+          end
+
+          ::Sidebars::MenuItem.new(
+            title: _('Milestones'),
+            link: group_milestones_path(context.group),
+            super_sidebar_parent: ::Sidebars::Groups::SuperSidebarMenus::PlanMenu,
+            active_routes: { path: 'milestones#index' },
+            item_id: :milestones
+          )
+        end
+      end
+    end
+  end
+end
+
+Sidebars::Groups::Menus::WorkItemsMenu.prepend_mod_with('Sidebars::Groups::Menus::WorkItemsMenu')
diff --git a/lib/sidebars/groups/panel.rb b/lib/sidebars/groups/panel.rb
index 185e49938eff32..583c770f160171 100644
--- a/lib/sidebars/groups/panel.rb
+++ b/lib/sidebars/groups/panel.rb
@@ -8,7 +8,13 @@ def configure_menus
         set_scope_menu(Sidebars::Groups::Menus::ScopeMenu.new(context))
 
         add_menu(Sidebars::Groups::Menus::GroupInformationMenu.new(context))
-        add_menu(Sidebars::Groups::Menus::IssuesMenu.new(context))
+
+        if ::Feature.enabled?(:work_item_planning_view, context.group)
+          add_menu(Sidebars::Groups::Menus::WorkItemsMenu.new(context))
+        else
+          add_menu(Sidebars::Groups::Menus::IssuesMenu.new(context))
+        end
+
         add_menu(Sidebars::Groups::Menus::MergeRequestsMenu.new(context))
         add_menu(Sidebars::Groups::Menus::CiCdMenu.new(context))
         add_menu(Sidebars::Groups::Menus::KubernetesMenu.new(context))
diff --git a/lib/sidebars/projects/menus/issues_menu.rb b/lib/sidebars/projects/menus/issues_menu.rb
index 73683ba00dc52a..148b7d1c6ce396 100644
--- a/lib/sidebars/projects/menus/issues_menu.rb
+++ b/lib/sidebars/projects/menus/issues_menu.rb
@@ -27,7 +27,7 @@ def extra_container_html_options
 
         override :title
         def title
-          s_('WorkItem|Work items')
+          _('Issues')
         end
 
         override :sprite_icon
@@ -37,12 +37,7 @@ def sprite_icon
 
         override :active_routes
         def active_routes
-          {
-            path: %w[
-              projects/issues#index projects/issues#show projects/issues#new
-              projects/work_items#index projects/work_items#show projects/work_items#new
-            ]
-          }
+          { path: %w[projects/issues#index projects/issues#show projects/issues#new] }
         end
 
         override :has_pill?
@@ -87,11 +82,11 @@ def multi_issue_boards?
 
         def list_menu_item
           ::Sidebars::MenuItem.new(
-            title: s_('WorkItem|Work items'),
-            link: project_work_items_path(context.project),
+            title: _('List'),
+            link: project_issues_path(context.project),
             super_sidebar_parent: ::Sidebars::NilMenuItem,
-            active_routes: { path: 'projects/work_items#index' },
-            container_html_options: { aria: { label: s_('WorkItem|Work items') } },
+            active_routes: { path: 'projects/issues#index' },
+            container_html_options: { aria: { label: _('Issues') } },
             item_id: :issue_list
           )
         end
diff --git a/lib/sidebars/projects/menus/work_items_menu.rb b/lib/sidebars/projects/menus/work_items_menu.rb
new file mode 100644
index 00000000000000..764c2a80ca6f08
--- /dev/null
+++ b/lib/sidebars/projects/menus/work_items_menu.rb
@@ -0,0 +1,142 @@
+# frozen_string_literal: true
+
+module Sidebars
+  module Projects
+    module Menus
+      class WorkItemsMenu < ::Sidebars::Menu
+        include Gitlab::Utils::StrongMemoize
+
+        override :configure_menu_items
+        def configure_menu_items
+          return false unless show_issues_menu_items?
+
+          add_item(list_menu_item)
+          add_item(boards_menu_item)
+          add_item(service_desk_menu_item)
+          add_item(milestones_menu_item)
+
+          true
+        end
+
+        override :extra_container_html_options
+        def extra_container_html_options
+          {
+            class: 'shortcuts-issues'
+          }
+        end
+
+        override :title
+        def title
+          s_('WorkItem|Work items')
+        end
+
+        override :sprite_icon
+        def sprite_icon
+          'issues'
+        end
+
+        override :active_routes
+        def active_routes
+          {
+            path: %w[
+              projects/issues#index projects/issues#show projects/issues#new
+              projects/work_items#index projects/work_items#show projects/work_items#new
+            ]
+          }
+        end
+
+        override :has_pill?
+        def has_pill?
+          strong_memoize(:has_pill) do
+            context.project.issues_enabled?
+          end
+        end
+
+        override :pill_count_field
+        def pill_count_field
+          'openIssuesCount'
+        end
+
+        override :pill_html_options
+        def pill_html_options
+          {
+            class: 'issue_counter'
+          }
+        end
+
+        override :serialize_as_menu_item_args
+        def serialize_as_menu_item_args
+          super.merge({
+            pill_count: pill_count,
+            pill_count_field: pill_count_field,
+            has_pill: has_pill?,
+            super_sidebar_parent: ::Sidebars::Projects::SuperSidebarMenus::PlanMenu,
+            item_id: :project_issue_list
+          })
+        end
+
+        private
+
+        def show_issues_menu_items?
+          can?(context.current_user, :read_issue, context.project)
+        end
+
+        def multi_issue_boards?
+          context.project.multiple_issue_boards_available?
+        end
+
+        def list_menu_item
+          ::Sidebars::MenuItem.new(
+            title: s_('WorkItem|Work items'),
+            link: project_work_items_path(context.project),
+            super_sidebar_parent: ::Sidebars::NilMenuItem,
+            active_routes: { path: 'projects/work_items#index' },
+            container_html_options: { aria: { label: s_('WorkItem|Work items') } },
+            item_id: :issue_list
+          )
+        end
+
+        def boards_menu_item
+          title = if context.is_super_sidebar
+                    multi_issue_boards? ? s_('Issue boards') : s_('Issue board')
+                  else
+                    multi_issue_boards? ? s_('Boards|Boards') : s_('Boards|Board')
+                  end
+
+          ::Sidebars::MenuItem.new(
+            title: title,
+            link: project_boards_path(context.project),
+            super_sidebar_parent: ::Sidebars::Projects::SuperSidebarMenus::PlanMenu,
+            active_routes: { controller: :boards },
+            container_html_options: { class: 'shortcuts-issue-boards' },
+            item_id: :boards
+          )
+        end
+
+        def service_desk_menu_item
+          return ::Sidebars::NilMenuItem.new(item_id: :service_desk) unless ::ServiceDesk.enabled?(context.project)
+
+          ::Sidebars::MenuItem.new(
+            title: _('Service Desk'),
+            link: service_desk_project_issues_path(context.project),
+            super_sidebar_parent: ::Sidebars::Projects::SuperSidebarMenus::MonitorMenu,
+            active_routes: { path: 'issues#service_desk' },
+            item_id: :service_desk
+          )
+        end
+
+        def milestones_menu_item
+          ::Sidebars::MenuItem.new(
+            title: _('Milestones'),
+            link: project_milestones_path(context.project),
+            super_sidebar_parent: ::Sidebars::Projects::SuperSidebarMenus::PlanMenu,
+            active_routes: { controller: :milestones },
+            item_id: :milestones
+          )
+        end
+      end
+    end
+  end
+end
+
+Sidebars::Projects::Menus::WorkItemsMenu.prepend_mod_with('Sidebars::Projects::Menus::WorkItemsMenu')
diff --git a/lib/sidebars/projects/panel.rb b/lib/sidebars/projects/panel.rb
index 738a3fba9c6d6d..3a6bc0d11a2163 100644
--- a/lib/sidebars/projects/panel.rb
+++ b/lib/sidebars/projects/panel.rb
@@ -20,7 +20,13 @@ def aria_label
       def add_menus
         add_menu(Sidebars::Projects::Menus::ProjectInformationMenu.new(context))
         add_menu(Sidebars::Projects::Menus::RepositoryMenu.new(context))
-        add_menu(Sidebars::Projects::Menus::IssuesMenu.new(context))
+
+        if ::Feature.enabled?(:work_item_planning_view, context.project.group)
+          add_menu(Sidebars::Projects::Menus::WorkItemsMenu.new(context))
+        else
+          add_menu(Sidebars::Projects::Menus::IssuesMenu.new(context))
+        end
+
         add_menu(Sidebars::Projects::Menus::ExternalIssueTrackerMenu.new(context))
         add_menu(Sidebars::Projects::Menus::ZentaoMenu.new(context))
         add_menu(Sidebars::Projects::Menus::MergeRequestsMenu.new(context))
-- 
GitLab


From 7c01c2c3713119b33d6334f82f325013209cea68 Mon Sep 17 00:00:00 2001
From: Jack Chapman <jachapman@gitlab.com>
Date: Wed, 12 Feb 2025 15:04:51 +0000
Subject: [PATCH 04/22] Add conditional breadcrumb config

---
 .../components/work_item_breadcrumb.vue       | 15 +++++++++++++--
 .../work_items/pages/work_items_list_app.vue  | 19 ++++++++++++++-----
 2 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/app/assets/javascripts/work_items/components/work_item_breadcrumb.vue b/app/assets/javascripts/work_items/components/work_item_breadcrumb.vue
index 940ce2301d61f5..2e88013e2046dc 100644
--- a/app/assets/javascripts/work_items/components/work_item_breadcrumb.vue
+++ b/app/assets/javascripts/work_items/components/work_item_breadcrumb.vue
@@ -1,6 +1,6 @@
 <script>
 import { GlBreadcrumb } from '@gitlab/ui';
-import { s__ } from '~/locale';
+import { s__, __ } from '~/locale';
 import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 import { ROUTES, WORK_ITEM_TYPE_ENUM_EPIC } from '../constants';
 
@@ -26,11 +26,22 @@ export default {
     },
   },
   computed: {
+    isWorkItemOnly() {
+      return this.glFeatures.workItemPlanningView;
+    },
     isEpicsList() {
       return this.workItemType === WORK_ITEM_TYPE_ENUM_EPIC;
     },
     listName() {
-      return s__('WorkItem|Work items');
+      if (this.isWorkItemOnly) {
+        return s__('WorkItem|Work items');
+      }
+
+      if (this.isEpicsList) {
+        return __('Epics');
+      }
+
+      return this.isGroup ? s__('WorkItem|Work items') : __('Issues');
     },
     issueAsWorkItem() {
       return (
diff --git a/app/assets/javascripts/work_items/pages/work_items_list_app.vue b/app/assets/javascripts/work_items/pages/work_items_list_app.vue
index bffbd022f1f6f3..ba47072b8f80df 100644
--- a/app/assets/javascripts/work_items/pages/work_items_list_app.vue
+++ b/app/assets/javascripts/work_items/pages/work_items_list_app.vue
@@ -180,11 +180,7 @@ export default {
         this.pageInfo = data?.[this.namespace].workItems.pageInfo ?? {};
 
         if (data?.[this.namespace]) {
-          if (this.isGroup) {
-            document.title = `Work items · ${data.group.name} · GitLab`;
-          } else {
-            document.title = `Issues · ${data.project.name} · GitLab`;
-          }
+          document.title = this.calculateDocumentTitle(data);
         }
         if (!this.withTabs) {
           this.hasAnyIssues = Boolean(data?.[this.namespace].workItems.nodes);
@@ -496,6 +492,19 @@ export default {
     handleSelect(item) {
       this.activeItem = item;
     },
+    calculateDocumentTitle(data) {
+      const middle = this.isGroup ? data.group.name : data.project.name;
+      if (this.glFeatures.workItemPlanningView) {
+        return `${s__('WorkItem|Work items')} · ${middle} · GitLab`;
+      }
+      if (this.isGroup && this.isEpicsList) {
+        return `${__('Epics')} · ${middle} · GitLab`;
+      }
+      if (this.isGroup) {
+        return `${s__('WorkItem|Work items')} · ${middle} · GitLab`;
+      }
+      return `${__('Issues')} · ${middle} · GitLab`;
+    },
     fetchEmojis(search) {
       return this.autocompleteCache.fetch({
         url: this.autocompleteAwardEmojisPath,
-- 
GitLab


From 867a9eec85663e692c860d962e26585b5dd10ae7 Mon Sep 17 00:00:00 2001
From: Jack Chapman <jachapman@gitlab.com>
Date: Wed, 12 Feb 2025 17:08:01 +0000
Subject: [PATCH 05/22] Fix some tests

---
 .rubocop_todo/gitlab/bounded_contexts.yml     |   1 +
 .../projects/menus/work_items_menu.rb         | 142 ++++++++++++++++++
 .../groups/menus/settings_menu_spec.rb        |   2 +-
 spec/features/groups/navbar_spec.rb           |   1 +
 spec/features/projects/navbar_spec.rb         |   1 +
 .../projects/user_uses_shortcuts_spec.rb      |   5 +
 .../work_items/work_item_detail_spec.rb       |   2 +-
 7 files changed, 152 insertions(+), 2 deletions(-)
 create mode 100644 ee/lib/ee/sidebars/projects/menus/work_items_menu.rb

diff --git a/.rubocop_todo/gitlab/bounded_contexts.yml b/.rubocop_todo/gitlab/bounded_contexts.yml
index 03bc317899317d..4fe9638e79386e 100644
--- a/.rubocop_todo/gitlab/bounded_contexts.yml
+++ b/.rubocop_todo/gitlab/bounded_contexts.yml
@@ -3566,6 +3566,7 @@ Gitlab/BoundedContexts:
     - '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'
diff --git a/ee/lib/ee/sidebars/projects/menus/work_items_menu.rb b/ee/lib/ee/sidebars/projects/menus/work_items_menu.rb
new file mode 100644
index 00000000000000..aeca8311397587
--- /dev/null
+++ b/ee/lib/ee/sidebars/projects/menus/work_items_menu.rb
@@ -0,0 +1,142 @@
+# frozen_string_literal: true
+
+module EE
+  module Sidebars
+    module Projects
+      module Menus
+        module WorkItemsMenu
+          extend ::Gitlab::Utils::Override
+
+          override :configure_menu_items
+          def configure_menu_items
+            return false unless super || show_jira_menu_items? \
+              || show_zentao_menu_items?
+
+            add_item(iterations_menu_item)
+            add_item(requirements_menu_item)
+            add_item(jira_issue_list_menu_item)
+            add_item(jira_external_link_menu_item)
+            add_item(zentao_issue_list_menu_item)
+            add_item(zentao_external_link_menu_item)
+
+            true
+          end
+
+          def show_jira_menu_items?
+            external_issue_tracker.is_a?(Integrations::Jira) && context.jira_issues_integration
+          end
+
+          def show_zentao_menu_items?
+            zentao_active? && \
+              ::Integrations::Zentao.issues_license_available?(context.project)
+          end
+
+          private
+
+          def iterations_menu_item
+            if !show_issues_menu_items? ||
+                context.project.personal? ||
+                !context.project.licensed_feature_available?(:iterations) ||
+                !can?(context.current_user, :read_iteration, context.project)
+              return ::Sidebars::NilMenuItem.new(item_id: :iterations)
+            end
+
+            ::Sidebars::MenuItem.new(
+              title: _('Iterations'),
+              link: project_iteration_cadences_path(context.project),
+              super_sidebar_parent: ::Sidebars::Projects::SuperSidebarMenus::PlanMenu,
+              active_routes: { controller: :iteration_cadences },
+              item_id: :iterations
+            )
+          end
+
+          def requirements_menu_item
+            if !show_issues_menu_items? ||
+                !context.project.licensed_feature_available?(:requirements) ||
+                !can?(context.current_user, :read_requirement, context.project)
+              return ::Sidebars::NilMenuItem.new(item_id: :requirements)
+            end
+
+            ::Sidebars::MenuItem.new(
+              title: _('Requirements'),
+              link: project_requirements_management_requirements_path(context.project),
+              super_sidebar_parent: ::Sidebars::Projects::SuperSidebarMenus::PlanMenu,
+              active_routes: { path: 'requirements#index' },
+              item_id: :requirements
+            )
+          end
+
+          def external_issue_tracker
+            @external_issue_tracker ||= context.project.external_issue_tracker
+          end
+
+          def jira_issue_list_menu_item
+            return ::Sidebars::NilMenuItem.new(item_id: :jira_issue_list) unless show_jira_menu_items?
+
+            ::Sidebars::MenuItem.new(
+              title: s_('JiraService|Jira issues'),
+              link: project_integrations_jira_issues_path(context.project),
+              super_sidebar_parent: ::Sidebars::Projects::SuperSidebarMenus::PlanMenu,
+              active_routes: { controller: 'projects/integrations/jira/issues' },
+              item_id: :jira_issue_list
+            )
+          end
+
+          def jira_external_link_menu_item
+            return ::Sidebars::NilMenuItem.new(item_id: :jira_external_link) unless show_jira_menu_items?
+
+            ::Sidebars::MenuItem.new(
+              title: s_('JiraService|Open Jira'),
+              link: external_issue_tracker.issue_tracker_path,
+              super_sidebar_parent: ::Sidebars::Projects::SuperSidebarMenus::PlanMenu,
+              active_routes: {},
+              item_id: :jira_external_link,
+              sprite_icon: context.is_super_sidebar ? nil : 'external-link',
+              container_html_options: {
+                target: '_blank',
+                rel: 'noopener noreferrer'
+              }
+            )
+          end
+
+          def zentao_active?
+            !!zentao_integration&.active?
+          end
+
+          def zentao_issue_list_menu_item
+            return ::Sidebars::NilMenuItem.new(item_id: :zentao_issue_list) unless show_zentao_menu_items?
+
+            ::Sidebars::MenuItem.new(
+              title: s_('ZentaoIntegration|ZenTao issues'),
+              link: project_integrations_zentao_issues_path(context.project),
+              super_sidebar_parent: ::Sidebars::Projects::SuperSidebarMenus::PlanMenu,
+              active_routes: { controller: 'projects/integrations/zentao/issues' },
+              item_id: :zentao_issue_list
+            )
+          end
+
+          def zentao_integration
+            @zentao_integration ||= context.project.zentao_integration
+          end
+
+          def zentao_external_link_menu_item
+            return ::Sidebars::NilMenuItem.new(item_id: :zentao_external_link) unless show_zentao_menu_items?
+
+            ::Sidebars::MenuItem.new(
+              title: s_('ZentaoIntegration|Open ZenTao'),
+              link: zentao_integration.url,
+              super_sidebar_parent: ::Sidebars::Projects::SuperSidebarMenus::PlanMenu,
+              active_routes: {},
+              item_id: :zentao_external_link,
+              sprite_icon: context.is_super_sidebar ? nil : 'external-link',
+              container_html_options: {
+                target: '_blank',
+                rel: 'noopener noreferrer'
+              }
+            )
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/ee/spec/lib/ee/sidebars/groups/menus/settings_menu_spec.rb b/ee/spec/lib/ee/sidebars/groups/menus/settings_menu_spec.rb
index 32a1b3de8105e7..727f5aea570ad0 100644
--- a/ee/spec/lib/ee/sidebars/groups/menus/settings_menu_spec.rb
+++ b/ee/spec/lib/ee/sidebars/groups/menus/settings_menu_spec.rb
@@ -353,7 +353,7 @@
       subject { menu.renderable_items.find { |e| e.item_id == item_id } }
 
       describe 'Issues menu item' do
-        let(:item_id) { :group_work_items }
+        let(:item_id) { :group_work_items_settings }
         let(:custom_fields_licensed) { true }
         let(:feature_flag_enabled) { true }
 
diff --git a/spec/features/groups/navbar_spec.rb b/spec/features/groups/navbar_spec.rb
index 702630b0100532..cfff3b9d2c976e 100644
--- a/spec/features/groups/navbar_spec.rb
+++ b/spec/features/groups/navbar_spec.rb
@@ -16,6 +16,7 @@
     create_package_nav(_('Operate'))
     insert_after_nav_item(_('Analyze'), new_nav_item: settings_for_maintainer_nav_item) if Gitlab.ee?
     insert_infrastructure_registry_nav(_('Kubernetes'))
+    stub_feature_flags(work_item_planning_view: false)
 
     if group.crm_enabled? && group.parent.nil?
       insert_customer_relations_nav(Gitlab.ee? ? _('Iterations') : _('Milestones'))
diff --git a/spec/features/projects/navbar_spec.rb b/spec/features/projects/navbar_spec.rb
index 358cbe7a7332cd..7e19a2695121c5 100644
--- a/spec/features/projects/navbar_spec.rb
+++ b/spec/features/projects/navbar_spec.rb
@@ -15,6 +15,7 @@
     sign_in(user)
 
     stub_config(registry: { enabled: false })
+    stub_feature_flags(work_item_planning_view: false)
     insert_package_nav
     insert_infrastructure_registry_nav(s_('Terraform|Terraform states'))
     insert_infrastructure_google_cloud_nav
diff --git a/spec/features/projects/user_uses_shortcuts_spec.rb b/spec/features/projects/user_uses_shortcuts_spec.rb
index a000c9e1da8e31..633bff62b0298b 100644
--- a/spec/features/projects/user_uses_shortcuts_spec.rb
+++ b/spec/features/projects/user_uses_shortcuts_spec.rb
@@ -76,6 +76,11 @@
   end
 
   context 'when navigating to the Issues pages' do
+    before do
+      stub_feature_flags(work_item_planning_view: false)
+      visit(project_path(project))
+    end
+
     it 'redirects to the issues list page' do
       find('body').native.send_key('g')
       find('body').native.send_key('i')
diff --git a/spec/features/work_items/work_item_detail_spec.rb b/spec/features/work_items/work_item_detail_spec.rb
index e546f655d14838..62369acced5531 100644
--- a/spec/features/work_items/work_item_detail_spec.rb
+++ b/spec/features/work_items/work_item_detail_spec.rb
@@ -40,7 +40,7 @@
     end
 
     before do
-      stub_feature_flags(notifications_todos_buttons: false)
+      stub_feature_flags(notifications_todos_buttons: false, work_item_planning_view: false)
       stub_const("AutocompleteSources::ExpiresIn::AUTOCOMPLETE_EXPIRES_IN", 0)
       sign_in(user)
       visit work_items_path
-- 
GitLab


From ab4a2ac76020f2e410cccc7a075d821b60ee79eb Mon Sep 17 00:00:00 2001
From: Jack Chapman <jachapman@gitlab.com>
Date: Thu, 13 Feb 2025 12:05:24 +0000
Subject: [PATCH 06/22] Fix more specs

---
 .../group_page_with_external_authorization_service_spec.rb      | 1 +
 ee/spec/features/groups/iterations/user_views_iteration_spec.rb | 1 +
 ee/spec/features/groups/navbar_spec.rb                          | 2 ++
 ee/spec/features/pending_group_memberships_spec.rb              | 1 +
 ee/spec/features/projects/navbar_spec.rb                        | 2 +-
 ee/spec/lib/sidebars/groups/super_sidebar_panel_spec.rb         | 1 +
 .../group_page_with_external_authorization_service_spec.rb      | 1 +
 spec/features/issues/user_uses_quick_actions_spec.rb            | 1 +
 spec/features/nav/pinned_nav_items_spec.rb                      | 1 +
 spec/features/users/terms_spec.rb                               | 1 +
 10 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/ee/spec/features/groups/group_page_with_external_authorization_service_spec.rb b/ee/spec/features/groups/group_page_with_external_authorization_service_spec.rb
index 1000d362da414f..9a94e51384eeac 100644
--- a/ee/spec/features/groups/group_page_with_external_authorization_service_spec.rb
+++ b/ee/spec/features/groups/group_page_with_external_authorization_service_spec.rb
@@ -26,6 +26,7 @@
     context 'when epics are available' do
       before do
         stub_licensed_features(epics: true)
+        stub_feature_flags(work_item_planning_view: false)
       end
 
       it 'shows the link to epics' do
diff --git a/ee/spec/features/groups/iterations/user_views_iteration_spec.rb b/ee/spec/features/groups/iterations/user_views_iteration_spec.rb
index 0d7d56383a9e11..3e81580ce287eb 100644
--- a/ee/spec/features/groups/iterations/user_views_iteration_spec.rb
+++ b/ee/spec/features/groups/iterations/user_views_iteration_spec.rb
@@ -26,6 +26,7 @@
   context 'with license', :js do
     before do
       stub_licensed_features(iterations: true)
+      stub_feature_flags(work_item_planning_view: false)
     end
 
     shared_examples 'shows iteration info' do
diff --git a/ee/spec/features/groups/navbar_spec.rb b/ee/spec/features/groups/navbar_spec.rb
index 31488ea4a7f02f..330a9a2a72339f 100644
--- a/ee/spec/features/groups/navbar_spec.rb
+++ b/ee/spec/features/groups/navbar_spec.rb
@@ -14,6 +14,7 @@
 
   context 'for maintainers' do
     before do
+      stub_feature_flags(work_item_planning_view: false)
       group.add_maintainer(user)
       stub_group_wikis(false)
       stub_config(registry: { enabled: false })
@@ -186,6 +187,7 @@
 
   context 'for owners', :saas do
     before do
+      stub_feature_flags(work_item_planning_view: false)
       group.add_owner(user)
       stub_config(registry: { enabled: false })
       stub_group_wikis(false)
diff --git a/ee/spec/features/pending_group_memberships_spec.rb b/ee/spec/features/pending_group_memberships_spec.rb
index ed2de722914134..8ed7bce3b30ef0 100644
--- a/ee/spec/features/pending_group_memberships_spec.rb
+++ b/ee/spec/features/pending_group_memberships_spec.rb
@@ -137,6 +137,7 @@
     end
 
     it 'a member with an active group membership and a pending subgroup membership sees a subgroup project as if the pending membership does not exist' do
+      stub_feature_flags(work_item_planning_view: false)
       project = create(:project, :private, namespace: subgroup)
       create(:group_member, :guest, source: group, user: developer)
       create(:group_member, :awaiting, :maintainer, source: subgroup, user: developer)
diff --git a/ee/spec/features/projects/navbar_spec.rb b/ee/spec/features/projects/navbar_spec.rb
index 9a02e3a037a131..cca8e3b52c561f 100644
--- a/ee/spec/features/projects/navbar_spec.rb
+++ b/ee/spec/features/projects/navbar_spec.rb
@@ -27,7 +27,7 @@
 
     allow(Gitlab::CurrentSettings).to receive(:product_analytics_enabled?).and_return(true)
     stub_licensed_features(product_analytics: true)
-    stub_feature_flags(product_analytics_features: true)
+    stub_feature_flags(product_analytics_features: true, work_item_planning_view: false)
   end
 
   context 'with default navbar' do
diff --git a/ee/spec/lib/sidebars/groups/super_sidebar_panel_spec.rb b/ee/spec/lib/sidebars/groups/super_sidebar_panel_spec.rb
index 2c2b54bdba544b..e46f88066db36b 100644
--- a/ee/spec/lib/sidebars/groups/super_sidebar_panel_spec.rb
+++ b/ee/spec/lib/sidebars/groups/super_sidebar_panel_spec.rb
@@ -38,6 +38,7 @@
     create(:gitlab_subscription_add_on_purchase, quantity: 50, namespace: group, add_on: add_on)
     # Needed for Roles and permissions
     stub_saas_features(gitlab_com_subscriptions: true)
+    stub_feature_flags(work_item_planning_view: false)
   end
 
   it_behaves_like 'a panel with uniquely identifiable menu items'
diff --git a/spec/features/groups/group_page_with_external_authorization_service_spec.rb b/spec/features/groups/group_page_with_external_authorization_service_spec.rb
index f69fec56d35441..9e188b9b457744 100644
--- a/spec/features/groups/group_page_with_external_authorization_service_spec.rb
+++ b/spec/features/groups/group_page_with_external_authorization_service_spec.rb
@@ -10,6 +10,7 @@
 
   before do
     sign_in user
+    stub_feature_flags(work_item_planning_view: false)
     group.add_owner(user)
   end
 
diff --git a/spec/features/issues/user_uses_quick_actions_spec.rb b/spec/features/issues/user_uses_quick_actions_spec.rb
index e375ade2ba6bf4..b8814a224059d8 100644
--- a/spec/features/issues/user_uses_quick_actions_spec.rb
+++ b/spec/features/issues/user_uses_quick_actions_spec.rb
@@ -12,6 +12,7 @@
 
   before do
     allow(Gitlab::QueryLimiting::Transaction).to receive(:threshold).and_return(105)
+    stub_feature_flags(work_item_planning_view: false)
   end
 
   context "issuable common quick actions" do
diff --git a/spec/features/nav/pinned_nav_items_spec.rb b/spec/features/nav/pinned_nav_items_spec.rb
index 24f32e06ecf45a..61c5c8c9255c0d 100644
--- a/spec/features/nav/pinned_nav_items_spec.rb
+++ b/spec/features/nav/pinned_nav_items_spec.rb
@@ -8,6 +8,7 @@
 
   before do
     sign_in(user)
+    stub_feature_flags(work_item_planning_view: false)
   end
 
   describe 'non-pinnable navigation menu' do
diff --git a/spec/features/users/terms_spec.rb b/spec/features/users/terms_spec.rb
index 281915875729eb..de09c6c7ff0477 100644
--- a/spec/features/users/terms_spec.rb
+++ b/spec/features/users/terms_spec.rb
@@ -105,6 +105,7 @@
       let(:project) { create(:project) }
 
       before do
+        stub_feature_flags(work_item_planning_view: false)
         project.add_developer(user)
       end
 
-- 
GitLab


From 213327d1dbf92fa8e6a5128927a0fd8a6159cd54 Mon Sep 17 00:00:00 2001
From: Jack Chapman <jachapman@gitlab.com>
Date: Thu, 13 Feb 2025 16:39:09 +0000
Subject: [PATCH 07/22] Remove pill from nav

---
 app/controllers/projects/work_items_controller.rb | 1 +
 lib/sidebars/groups/menus/work_items_menu.rb      | 2 +-
 lib/sidebars/projects/menus/work_items_menu.rb    | 4 +---
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/controllers/projects/work_items_controller.rb b/app/controllers/projects/work_items_controller.rb
index c284816f25ede5..b70ad87a1569e2 100644
--- a/app/controllers/projects/work_items_controller.rb
+++ b/app/controllers/projects/work_items_controller.rb
@@ -16,6 +16,7 @@ class Projects::WorkItemsController < Projects::ApplicationController
     push_force_frontend_feature_flag(:glql_load_on_click, !!project&.glql_load_on_click_feature_flag_enabled?)
     push_force_frontend_feature_flag(:continue_indented_text, !!project&.continue_indented_text_feature_flag_enabled?)
     push_frontend_feature_flag(:namespace_level_work_items, project&.group)
+    push_frontend_feature_flag(:work_item_planning_view, project&.group)
   end
 
   feature_category :team_planning
diff --git a/lib/sidebars/groups/menus/work_items_menu.rb b/lib/sidebars/groups/menus/work_items_menu.rb
index 44c16cfbed21d2..b0fa71ff35c6cf 100644
--- a/lib/sidebars/groups/menus/work_items_menu.rb
+++ b/lib/sidebars/groups/menus/work_items_menu.rb
@@ -29,7 +29,7 @@ def sprite_icon
 
         override :has_pill?
         def has_pill?
-          true
+          false
         end
 
         override :active_routes
diff --git a/lib/sidebars/projects/menus/work_items_menu.rb b/lib/sidebars/projects/menus/work_items_menu.rb
index 764c2a80ca6f08..d7c2911583fa3d 100644
--- a/lib/sidebars/projects/menus/work_items_menu.rb
+++ b/lib/sidebars/projects/menus/work_items_menu.rb
@@ -47,9 +47,7 @@ def active_routes
 
         override :has_pill?
         def has_pill?
-          strong_memoize(:has_pill) do
-            context.project.issues_enabled?
-          end
+          false
         end
 
         override :pill_count_field
-- 
GitLab


From 10ef39f850db5e2d43e9922ee5b30b451f29f839 Mon Sep 17 00:00:00 2001
From: Jack Chapman <jachapman@gitlab.com>
Date: Fri, 14 Feb 2025 15:33:34 +0000
Subject: [PATCH 08/22] Add work item breadcrumb to issues list

---
 .../javascripts/work_items/components/work_item_breadcrumb.vue  | 2 +-
 app/controllers/projects/issues_controller.rb                   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/work_items/components/work_item_breadcrumb.vue b/app/assets/javascripts/work_items/components/work_item_breadcrumb.vue
index 2e88013e2046dc..8d4f1176587afe 100644
--- a/app/assets/javascripts/work_items/components/work_item_breadcrumb.vue
+++ b/app/assets/javascripts/work_items/components/work_item_breadcrumb.vue
@@ -56,7 +56,7 @@ export default {
         text: this.listName,
       };
 
-      if (this.glFeatures.workItemEpicsList || this.issueAsWorkItem) {
+      if (this.isWorkItemOnly || this.glFeatures.workItemEpicsList || this.issueAsWorkItem) {
         indexCrumb.to = { name: ROUTES.index, query: this.$route.query };
       } else {
         indexCrumb.href = this.listPath;
diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb
index 7b172887469a9f..a4c9da5e4e84d0 100644
--- a/app/controllers/projects/issues_controller.rb
+++ b/app/controllers/projects/issues_controller.rb
@@ -49,6 +49,7 @@ class Projects::IssuesController < Projects::ApplicationController
     push_frontend_feature_flag(:service_desk_ticket)
     push_frontend_feature_flag(:issues_list_drawer, project)
     push_frontend_feature_flag(:notifications_todos_buttons, current_user)
+    push_frontend_feature_flag(:work_item_planning_view, project&.group)
     push_force_frontend_feature_flag(:glql_integration, !!project&.glql_integration_feature_flag_enabled?)
     push_force_frontend_feature_flag(:glql_load_on_click, !!project&.glql_load_on_click_feature_flag_enabled?)
     push_force_frontend_feature_flag(:continue_indented_text, !!project&.continue_indented_text_feature_flag_enabled?)
-- 
GitLab


From 2e1d8a2702f0fdac40c7b0c1edd55da5e246b693 Mon Sep 17 00:00:00 2001
From: Jack Chapman <jachapman@gitlab.com>
Date: Mon, 17 Feb 2025 14:26:22 +0000
Subject: [PATCH 09/22] Handle pinned epic and issue links

---
 .../super_sidebar/components/menu_section.vue      | 14 +++++++++++---
 .../super_sidebar/components/sidebar_menu.vue      |  6 +++++-
 .../sidebars/groups/menus/work_item_epics_menu.rb  | 12 ++++++++++++
 3 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/super_sidebar/components/menu_section.vue b/app/assets/javascripts/super_sidebar/components/menu_section.vue
index e8233e7749ace5..0a5c224bb7e55b 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((i) => {
+        if (i.link_classes) {
+          return !i.link_classes.includes('js-super-sidebar-nav-item-hidden');
+        }
+        return true;
+      });
+    },
     buttonProps() {
       return {
         'aria-controls': this.itemId,
@@ -146,9 +154,9 @@ export default {
     </button>
 
     <flyout-menu
-      v-if="hasFlyout && isMouseOver && !isExpanded && !keepFlyoutClosed && item.items.length > 0"
+      v-if="hasFlyout && isMouseOver && !isExpanded && !keepFlyoutClosed && navItems.length > 0"
       :target-id="`menu-section-button-${itemId}`"
-      :items="item.items"
+      :items="navItems"
       :async-count="asyncCount"
       @mouseover="isMouseOverFlyout = true"
       @mouseleave="isMouseOverFlyout = false"
@@ -167,7 +175,7 @@ export default {
       <slot>
         <ul :aria-label="item.title" class="gl-m-0 gl-list-none gl-p-0">
           <nav-item
-            v-for="subItem of item.items"
+            v-for="subItem of navItems"
             :key="`${item.title}-${subItem.title}`"
             :item="subItem"
             :async-count="asyncCount"
diff --git a/app/assets/javascripts/super_sidebar/components/sidebar_menu.vue b/app/assets/javascripts/super_sidebar/components/sidebar_menu.vue
index be55f8f48ed023..694c9a20dcbcbe 100644
--- a/app/assets/javascripts/super_sidebar/components/sidebar_menu.vue
+++ b/app/assets/javascripts/super_sidebar/components/sidebar_menu.vue
@@ -1,5 +1,6 @@
 <script>
 import { GlBreakpointInstance, breakpoints } from '@gitlab/ui/dist/utils';
+import { uniqBy } from 'lodash';
 import superSidebarDataQuery from '~/super_sidebar/graphql/queries/super_sidebar.query.graphql';
 import { s__, sprintf } from '~/locale';
 import * as Sentry from '~/sentry/sentry_browser_wrapper';
@@ -116,9 +117,12 @@ export default {
     },
 
     pinnedItems() {
-      return this.changedPinnedItemIds.ids
+      const baseItems = this.changedPinnedItemIds.ids
         .map((id) => this.flatPinnableItems.find((item) => item.id === id))
         .filter(Boolean);
+
+      // Deduplicate Work items pinned items during migration from Issues + Epics
+      return uniqBy(baseItems, (item) => item.title);
     },
     supportsPins() {
       return this.isLoggedIn && PANELS_WITH_PINS.includes(this.panelType);
diff --git a/ee/lib/sidebars/groups/menus/work_item_epics_menu.rb b/ee/lib/sidebars/groups/menus/work_item_epics_menu.rb
index 38d9a075cf4a78..82c43b7a752fb0 100644
--- a/ee/lib/sidebars/groups/menus/work_item_epics_menu.rb
+++ b/ee/lib/sidebars/groups/menus/work_item_epics_menu.rb
@@ -10,6 +10,7 @@ class WorkItemEpicsMenu < ::Sidebars::Menu
         def configure_menu_items
           return false unless can?(context.current_user, :read_epic, context.group)
 
+          add_item(work_item_list_menu_item)
           add_item(roadmap_menu_item)
 
           true
@@ -54,6 +55,17 @@ def serialize_as_menu_item_args
 
         private
 
+        def work_item_list_menu_item
+          ::Sidebars::MenuItem.new(
+            title: s_('WorkItem|Work items'),
+            link: group_work_items_path(context.group),
+            super_sidebar_parent: ::Sidebars::Groups::SuperSidebarMenus::PlanMenu,
+            active_routes: { path: 'work_items#index' },
+            container_html_options: { class: 'js-super-sidebar-nav-item-hidden' },
+            item_id: :group_epic_list
+          )
+        end
+
         def roadmap_menu_item
           ::Sidebars::MenuItem.new(
             title: _('Roadmap'),
-- 
GitLab


From b3ccad4aed85fe00f07b0967eb4f65a824cb7d19 Mon Sep 17 00:00:00 2001
From: Jack Chapman <jachapman@gitlab.com>
Date: Mon, 17 Feb 2025 16:57:26 +0000
Subject: [PATCH 10/22] Add missing work_item menu for ee

---
 .rubocop_todo/gitlab/bounded_contexts.yml     |  1 +
 .rubocop_todo/gitlab/strong_memoize_attr.yml  |  1 +
 .../sidebars/groups/menus/work_items_menu.rb  | 59 +++++++++++++++++++
 .../groups/super_sidebar_panel_spec.rb        |  1 -
 4 files changed, 61 insertions(+), 1 deletion(-)
 create mode 100644 ee/lib/ee/sidebars/groups/menus/work_items_menu.rb

diff --git a/.rubocop_todo/gitlab/bounded_contexts.yml b/.rubocop_todo/gitlab/bounded_contexts.yml
index 4fe9638e79386e..4b105faa13b913 100644
--- a/.rubocop_todo/gitlab/bounded_contexts.yml
+++ b/.rubocop_todo/gitlab/bounded_contexts.yml
@@ -3561,6 +3561,7 @@ 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'
diff --git a/.rubocop_todo/gitlab/strong_memoize_attr.yml b/.rubocop_todo/gitlab/strong_memoize_attr.yml
index 2ee8cbb18b6686..b61c890dda7e24 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'
diff --git a/ee/lib/ee/sidebars/groups/menus/work_items_menu.rb b/ee/lib/ee/sidebars/groups/menus/work_items_menu.rb
new file mode 100644
index 00000000000000..45ade3d757843b
--- /dev/null
+++ b/ee/lib/ee/sidebars/groups/menus/work_items_menu.rb
@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+module EE
+  module Sidebars
+    module Groups
+      module Menus
+        module WorkItemsMenu
+          extend ::Gitlab::Utils::Override
+
+          override :configure_menu_items
+          def configure_menu_items
+            return false unless super
+
+            add_item(iterations_menu_item)
+
+            true
+          end
+
+          private
+
+          def iterations_menu_item
+            if !iterations_enabled? || !user_can_access_iterations?
+              return ::Sidebars::NilMenuItem.new(item_id: :iterations)
+            end
+
+            ::Sidebars::MenuItem.new(
+              title: _('Iterations'),
+              link: iterations_link,
+              super_sidebar_parent: ::Sidebars::Groups::SuperSidebarMenus::PlanMenu,
+              active_routes: { path: iterations_paths },
+              item_id: :iterations
+            )
+          end
+
+          def iterations_enabled?
+            context.group.licensed_feature_available?(:iterations)
+          end
+
+          def user_can_access_iterations?
+            can?(context.current_user, :read_iteration_cadence, context.group) ||
+              can?(context.current_user, :read_iteration, context.group)
+          end
+
+          def iterations_link
+            group_iteration_cadences_path(context.group)
+          end
+
+          def iterations_paths
+            strong_memoize(:iterations_paths) do
+              %w[iterations#index iterations#show iterations#new].tap do |paths|
+                paths << 'iteration_cadences#index'
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/ee/spec/lib/sidebars/groups/super_sidebar_panel_spec.rb b/ee/spec/lib/sidebars/groups/super_sidebar_panel_spec.rb
index e46f88066db36b..2c2b54bdba544b 100644
--- a/ee/spec/lib/sidebars/groups/super_sidebar_panel_spec.rb
+++ b/ee/spec/lib/sidebars/groups/super_sidebar_panel_spec.rb
@@ -38,7 +38,6 @@
     create(:gitlab_subscription_add_on_purchase, quantity: 50, namespace: group, add_on: add_on)
     # Needed for Roles and permissions
     stub_saas_features(gitlab_com_subscriptions: true)
-    stub_feature_flags(work_item_planning_view: false)
   end
 
   it_behaves_like 'a panel with uniquely identifiable menu items'
-- 
GitLab


From 02721a0ec72a34d821f119889552ce6ba8312941 Mon Sep 17 00:00:00 2001
From: Jack Chapman <jachapman@gitlab.com>
Date: Mon, 17 Feb 2025 17:45:45 +0000
Subject: [PATCH 11/22] Related spec updates

---
 ...ith_external_authorization_service_spec.rb | 32 ++++++++++++++++---
 .../iterations/user_views_iteration_spec.rb   |  1 -
 ee/spec/features/groups/navbar_spec.rb        |  7 ----
 .../pending_group_memberships_spec.rb         |  3 +-
 ee/spec/features/projects/navbar_spec.rb      |  2 +-
 ...ith_external_authorization_service_spec.rb |  5 ++-
 spec/features/groups/navbar_spec.rb           |  1 -
 .../issues/user_uses_quick_actions_spec.rb    |  1 -
 spec/features/nav/pinned_nav_items_spec.rb    | 21 ++++++------
 spec/features/projects/navbar_spec.rb         |  1 -
 .../projects/user_uses_shortcuts_spec.rb      |  3 +-
 spec/features/users/terms_spec.rb             |  5 ++-
 .../navbar_structure_context.rb               |  4 +--
 13 files changed, 46 insertions(+), 40 deletions(-)

diff --git a/ee/spec/features/groups/group_page_with_external_authorization_service_spec.rb b/ee/spec/features/groups/group_page_with_external_authorization_service_spec.rb
index 9a94e51384eeac..4f8c2c5ccaf0e1 100644
--- a/ee/spec/features/groups/group_page_with_external_authorization_service_spec.rb
+++ b/ee/spec/features/groups/group_page_with_external_authorization_service_spec.rb
@@ -26,23 +26,45 @@
     context 'when epics are available' do
       before do
         stub_licensed_features(epics: true)
-        stub_feature_flags(work_item_planning_view: false)
       end
 
-      it 'shows the link to epics' do
+      it 'shows the link to work items' do
         visit group_path(group)
 
         within_testid('super-sidebar') do
-          expect(page).to have_link('Epics')
+          expect(page).to have_link('Work items')
         end
       end
 
-      it 'hides the epics link when an external authorization service is enabled' do
+      it 'hides the work items link when an external authorization service is enabled' do
         enable_external_authorization_service_check
         visit group_path(group)
 
         within_testid('super-sidebar') do
-          expect(page).not_to have_link('Epics')
+          expect(page).not_to have_link('Work items')
+        end
+      end
+
+      context 'and work_item_planning_view feature flag is disabled' do
+        before do
+          stub_feature_flags(work_item_planning_view: false)
+        end
+
+        it 'shows the link to epics' do
+          visit group_path(group)
+
+          within_testid('super-sidebar') do
+            expect(page).to have_link('Epics')
+          end
+        end
+
+        it 'hides the epics link when an external authorization service is enabled' do
+          enable_external_authorization_service_check
+          visit group_path(group)
+
+          within_testid('super-sidebar') do
+            expect(page).not_to have_link('Epics')
+          end
         end
       end
     end
diff --git a/ee/spec/features/groups/iterations/user_views_iteration_spec.rb b/ee/spec/features/groups/iterations/user_views_iteration_spec.rb
index 3e81580ce287eb..0d7d56383a9e11 100644
--- a/ee/spec/features/groups/iterations/user_views_iteration_spec.rb
+++ b/ee/spec/features/groups/iterations/user_views_iteration_spec.rb
@@ -26,7 +26,6 @@
   context 'with license', :js do
     before do
       stub_licensed_features(iterations: true)
-      stub_feature_flags(work_item_planning_view: false)
     end
 
     shared_examples 'shows iteration info' do
diff --git a/ee/spec/features/groups/navbar_spec.rb b/ee/spec/features/groups/navbar_spec.rb
index 330a9a2a72339f..f48967e0de6128 100644
--- a/ee/spec/features/groups/navbar_spec.rb
+++ b/ee/spec/features/groups/navbar_spec.rb
@@ -14,7 +14,6 @@
 
   context 'for maintainers' do
     before do
-      stub_feature_flags(work_item_planning_view: false)
       group.add_maintainer(user)
       stub_group_wikis(false)
       stub_config(registry: { enabled: false })
@@ -77,11 +76,6 @@
       before do
         stub_licensed_features(epics: true)
 
-        insert_after_sub_nav_item(
-          _('Issues'),
-          within: _('Plan'),
-          new_sub_nav_item_name: _('Epics')
-        )
         insert_after_sub_nav_item(
           _('Issue board'),
           within: _('Plan'),
@@ -187,7 +181,6 @@
 
   context 'for owners', :saas do
     before do
-      stub_feature_flags(work_item_planning_view: false)
       group.add_owner(user)
       stub_config(registry: { enabled: false })
       stub_group_wikis(false)
diff --git a/ee/spec/features/pending_group_memberships_spec.rb b/ee/spec/features/pending_group_memberships_spec.rb
index 8ed7bce3b30ef0..da47dbddc56a0e 100644
--- a/ee/spec/features/pending_group_memberships_spec.rb
+++ b/ee/spec/features/pending_group_memberships_spec.rb
@@ -137,7 +137,6 @@
     end
 
     it 'a member with an active group membership and a pending subgroup membership sees a subgroup project as if the pending membership does not exist' do
-      stub_feature_flags(work_item_planning_view: false)
       project = create(:project, :private, namespace: subgroup)
       create(:group_member, :guest, source: group, user: developer)
       create(:group_member, :awaiting, :maintainer, source: subgroup, user: developer)
@@ -146,7 +145,7 @@
 
       expect(page).to have_content project.name
       expect(page).to have_content 'Manage'
-      expect(page).to have_content 'Issues'
+      expect(page).to have_content 'Work items'
       expect(page).not_to have_content 'Settings'
     end
   end
diff --git a/ee/spec/features/projects/navbar_spec.rb b/ee/spec/features/projects/navbar_spec.rb
index cca8e3b52c561f..9a02e3a037a131 100644
--- a/ee/spec/features/projects/navbar_spec.rb
+++ b/ee/spec/features/projects/navbar_spec.rb
@@ -27,7 +27,7 @@
 
     allow(Gitlab::CurrentSettings).to receive(:product_analytics_enabled?).and_return(true)
     stub_licensed_features(product_analytics: true)
-    stub_feature_flags(product_analytics_features: true, work_item_planning_view: false)
+    stub_feature_flags(product_analytics_features: true)
   end
 
   context 'with default navbar' do
diff --git a/spec/features/groups/group_page_with_external_authorization_service_spec.rb b/spec/features/groups/group_page_with_external_authorization_service_spec.rb
index 9e188b9b457744..b43211e00b6031 100644
--- a/spec/features/groups/group_page_with_external_authorization_service_spec.rb
+++ b/spec/features/groups/group_page_with_external_authorization_service_spec.rb
@@ -10,7 +10,6 @@
 
   before do
     sign_in user
-    stub_feature_flags(work_item_planning_view: false)
     group.add_owner(user)
   end
 
@@ -19,7 +18,7 @@ def expect_all_sidebar_links
       click_button 'Manage'
       click_button 'Plan'
       expect(page).to have_link('Activity')
-      expect(page).to have_link('Issues')
+      expect(page).to have_link('Work items')
       expect(page).to have_link('Merge requests')
       expect(page).to have_link('Members')
     end
@@ -52,7 +51,7 @@ def expect_all_sidebar_links
         expect(page).not_to have_link('Activity')
         expect(page).not_to have_link('Contribution')
 
-        expect(page).not_to have_link('Issues')
+        expect(page).not_to have_link('Work items')
         expect(page).not_to have_link('Merge requests')
         expect(page).to have_link('Members')
       end
diff --git a/spec/features/groups/navbar_spec.rb b/spec/features/groups/navbar_spec.rb
index cfff3b9d2c976e..702630b0100532 100644
--- a/spec/features/groups/navbar_spec.rb
+++ b/spec/features/groups/navbar_spec.rb
@@ -16,7 +16,6 @@
     create_package_nav(_('Operate'))
     insert_after_nav_item(_('Analyze'), new_nav_item: settings_for_maintainer_nav_item) if Gitlab.ee?
     insert_infrastructure_registry_nav(_('Kubernetes'))
-    stub_feature_flags(work_item_planning_view: false)
 
     if group.crm_enabled? && group.parent.nil?
       insert_customer_relations_nav(Gitlab.ee? ? _('Iterations') : _('Milestones'))
diff --git a/spec/features/issues/user_uses_quick_actions_spec.rb b/spec/features/issues/user_uses_quick_actions_spec.rb
index b8814a224059d8..e375ade2ba6bf4 100644
--- a/spec/features/issues/user_uses_quick_actions_spec.rb
+++ b/spec/features/issues/user_uses_quick_actions_spec.rb
@@ -12,7 +12,6 @@
 
   before do
     allow(Gitlab::QueryLimiting::Transaction).to receive(:threshold).and_return(105)
-    stub_feature_flags(work_item_planning_view: false)
   end
 
   context "issuable common quick actions" do
diff --git a/spec/features/nav/pinned_nav_items_spec.rb b/spec/features/nav/pinned_nav_items_spec.rb
index 61c5c8c9255c0d..578d35378dffc7 100644
--- a/spec/features/nav/pinned_nav_items_spec.rb
+++ b/spec/features/nav/pinned_nav_items_spec.rb
@@ -8,7 +8,6 @@
 
   before do
     sign_in(user)
-    stub_feature_flags(work_item_planning_view: false)
   end
 
   describe 'non-pinnable navigation menu' do
@@ -34,7 +33,7 @@
 
     it 'adds sensible defaults' do
       within_testid 'pinned-nav-items' do
-        expect(page).to have_link 'Issues'
+        expect(page).to have_link 'Work items'
       end
     end
 
@@ -52,7 +51,7 @@
       end
 
       within_testid 'pinned-nav-items' do
-        expect(page).to have_link 'Issues'
+        expect(page).to have_link 'Work items'
         expect(page).to have_link 'Activity'
         expect(page).to have_link 'Members'
       end
@@ -60,7 +59,7 @@
 
     describe 'when all pins are removed' do
       before do
-        remove_pin('Issues')
+        remove_pin('Work items')
       end
 
       it 'shows the Pinned section as expanded by default' do
@@ -155,7 +154,7 @@
         pinned_items = page.find_all('a', wait: false)
           .map(&:text)
           .map { |text| text.split("\n").first } # to drop the counter badge text from "Issues\n0"
-        expect(pinned_items).to eq ["Issues", "Merge requests", "Commits", "Members", "Activity"]
+        expect(pinned_items).to eq ["Work items", "Merge requests", "Commits", "Members", "Activity"]
       end
     end
   end
@@ -169,17 +168,17 @@
     context 'when a pinned item is clicked in the Pinned section' do
       before do
         within_testid 'pinned-nav-items' do
-          click_on 'Issues'
+          click_on 'Work items'
         end
       end
 
       it 'shows the Pinned section as expanded and the original section as collapsed' do
         within_testid 'pinned-nav-items' do
-          expect(page).to have_link 'Issues'
+          expect(page).to have_link 'Work items'
         end
 
         within '#menu-section-button-plan' do
-          expect(page).not_to have_link 'Issues'
+          expect(page).not_to have_link 'Work items'
         end
       end
     end
@@ -190,16 +189,16 @@
           click_on 'Plan'
         end
         within '#super-sidebar #plan' do
-          click_on 'Issues'
+          click_on 'Work items'
         end
       end
 
       it 'shows the Pinned section as collapsed and the original section as expanded' do
         within '#menu-section-button-plan' do
-          expect(page).not_to have_link 'Issues'
+          expect(page).not_to have_link 'Work items'
         end
         within '#super-sidebar #plan' do
-          expect(page).to have_link 'Issues'
+          expect(page).to have_link 'Work items'
         end
       end
     end
diff --git a/spec/features/projects/navbar_spec.rb b/spec/features/projects/navbar_spec.rb
index 7e19a2695121c5..358cbe7a7332cd 100644
--- a/spec/features/projects/navbar_spec.rb
+++ b/spec/features/projects/navbar_spec.rb
@@ -15,7 +15,6 @@
     sign_in(user)
 
     stub_config(registry: { enabled: false })
-    stub_feature_flags(work_item_planning_view: false)
     insert_package_nav
     insert_infrastructure_registry_nav(s_('Terraform|Terraform states'))
     insert_infrastructure_google_cloud_nav
diff --git a/spec/features/projects/user_uses_shortcuts_spec.rb b/spec/features/projects/user_uses_shortcuts_spec.rb
index 633bff62b0298b..021bc453acb206 100644
--- a/spec/features/projects/user_uses_shortcuts_spec.rb
+++ b/spec/features/projects/user_uses_shortcuts_spec.rb
@@ -77,7 +77,6 @@
 
   context 'when navigating to the Issues pages' do
     before do
-      stub_feature_flags(work_item_planning_view: false)
       visit(project_path(project))
     end
 
@@ -86,7 +85,7 @@
       find('body').native.send_key('i')
 
       expect(page).to have_active_navigation('Pinned')
-      expect(page).to have_active_sub_navigation('Issues')
+      expect(page).to have_active_sub_navigation('Work items')
     end
 
     it 'redirects to the issue board page' do
diff --git a/spec/features/users/terms_spec.rb b/spec/features/users/terms_spec.rb
index de09c6c7ff0477..093d1b3f2f97b8 100644
--- a/spec/features/users/terms_spec.rb
+++ b/spec/features/users/terms_spec.rb
@@ -105,7 +105,6 @@
       let(:project) { create(:project) }
 
       before do
-        stub_feature_flags(work_item_planning_view: false)
         project.add_developer(user)
       end
 
@@ -117,14 +116,14 @@
         # Application settings are cached for a minute
         travel_to 2.minutes.from_now do
           within('.contextual-nav') do
-            click_link 'Issues'
+            click_link 'Work items'
           end
 
           expect_to_be_on_terms_page
 
           click_button('Accept terms')
 
-          expect(page).to have_current_path(project_issues_path(project), ignore_query: true)
+          expect(page).to have_current_path(project_work_items_path(project), ignore_query: true)
         end
       end
 
diff --git a/spec/support/shared_contexts/navbar_structure_context.rb b/spec/support/shared_contexts/navbar_structure_context.rb
index 15aa7db0045937..af84c3762a9b02 100644
--- a/spec/support/shared_contexts/navbar_structure_context.rb
+++ b/spec/support/shared_contexts/navbar_structure_context.rb
@@ -26,7 +26,7 @@
       {
         nav_item: _('Plan'),
         nav_sub_items: [
-          _('Issues'),
+          s_('WorkItem|Work items'),
           _('Issue boards'),
           _('Milestones'),
           _('Wiki')
@@ -166,7 +166,7 @@
   end
 
   let(:plan_nav_items) do
-    [_("Issues"), _("Issue board"), _("Milestones"), (_('Iterations') if Gitlab.ee?)]
+    [s_("WorkItem|Work items"), _("Issue board"), _("Milestones"), (_('Iterations') if Gitlab.ee?)]
   end
 
   let(:customer_relations_nav_item) do
-- 
GitLab


From f6a9ddedd1c51bb1b87ea0d800f105ea5893d8e9 Mon Sep 17 00:00:00 2001
From: Jack Chapman <jachapman@gitlab.com>
Date: Wed, 19 Feb 2025 14:53:41 +0000
Subject: [PATCH 12/22] Fix quick actions specs

---
 .../issue/clone_quick_action_shared_examples.rb      | 12 ++++++------
 .../issue/move_quick_action_shared_examples.rb       |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/spec/support/shared_examples/quick_actions/issue/clone_quick_action_shared_examples.rb b/spec/support/shared_examples/quick_actions/issue/clone_quick_action_shared_examples.rb
index d42e925ed22ebe..c2b349b2208aa9 100644
--- a/spec/support/shared_examples/quick_actions/issue/clone_quick_action_shared_examples.rb
+++ b/spec/support/shared_examples/quick_actions/issue/clone_quick_action_shared_examples.rb
@@ -13,7 +13,7 @@
 
         visit project_issue_path(project, issue)
 
-        expect(page).to have_content 'Issues 2'
+        expect(page).to have_content issue.title
       end
     end
 
@@ -30,7 +30,7 @@
 
         visit project_issue_path(target_project, issue)
 
-        expect(page).to have_content 'Issues 1'
+        expect(page).to have_content issue.title
       end
 
       context 'when cloning with notes', :aggregate_failures do
@@ -45,7 +45,7 @@
 
           visit project_issue_path(target_project, issue)
 
-          expect(page).to have_content 'Issues 1'
+          expect(page).to have_content issue.title
           expect(page).to have_content 'Some random note'
           expect(page).to have_content 'Another note'
         end
@@ -71,7 +71,7 @@
 
         visit project_issue_path(target_project, issue)
 
-        expect(page).not_to have_content 'Issues 1'
+        expect(page).not_to have_content issue.title
       end
     end
 
@@ -158,7 +158,7 @@
         visit project_issue_path(target_project, issue)
         wait_for_all_requests
 
-        expect(page).to have_content 'Issues 1'
+        expect(page).to have_content issue.title
       end
 
       it 'deletes the note if it was updated to just contain a command' do
@@ -175,7 +175,7 @@
         visit project_issue_path(target_project, issue)
         wait_for_all_requests
 
-        expect(page).to have_content 'Issues 1'
+        expect(page).to have_content issue.title
       end
     end
   end
diff --git a/spec/support/shared_examples/quick_actions/issue/move_quick_action_shared_examples.rb b/spec/support/shared_examples/quick_actions/issue/move_quick_action_shared_examples.rb
index e3ae167164209f..c0fb52c03dd555 100644
--- a/spec/support/shared_examples/quick_actions/issue/move_quick_action_shared_examples.rb
+++ b/spec/support/shared_examples/quick_actions/issue/move_quick_action_shared_examples.rb
@@ -21,7 +21,7 @@
 
         visit project_issue_path(target_project, issue)
 
-        expect(page).to have_content 'Issues 1'
+        expect(page).to have_content issue.title
       end
     end
 
@@ -117,7 +117,7 @@
         visit project_issue_path(target_project, issue)
         wait_for_all_requests
 
-        expect(page).to have_content 'Issues 1'
+        expect(page).to have_content issue.title
       end
 
       it 'deletes the note if it was updated to just contain a command' do
@@ -135,7 +135,7 @@
         visit project_issue_path(target_project, issue)
         wait_for_all_requests
 
-        expect(page).to have_content 'Issues 1'
+        expect(page).to have_content issue.title
       end
     end
   end
-- 
GitLab


From b122b61ee8ccd03e3523f1914cfaf026f2a37215 Mon Sep 17 00:00:00 2001
From: Jack Chapman <jachapman@gitlab.com>
Date: Thu, 20 Feb 2025 12:05:23 +0000
Subject: [PATCH 13/22] Fix and add additional specs

---
 .../rspec/avoid_conditional_statements.yml    |   1 +
 .rubocop_todo/rspec/be_eq.yml                 |   1 +
 .../rspec/factory_bot/avoid_create.yml        |   2 +
 .rubocop_todo/rspec/named_subject.yml         |   2 +
 .../projects/work_items_controller.rb         |   2 +-
 .../wip/work_item_planning_view.yml           |   4 +-
 ee/spec/features/groups/navbar_spec.rb        |  21 ++++
 .../pending_group_memberships_spec.rb         |  19 ++++
 .../groups/menus/work_item_epics_menu_spec.rb |  55 +++++++++
 .../groups/menus/work_items_menu_spec.rb      |  72 ++++++++++++
 .../projects/menus/work_items_menu_spec.rb    | 105 ++++++++++++++++++
 spec/requests/projects/work_items_spec.rb     |  40 +++++++
 12 files changed, 321 insertions(+), 3 deletions(-)
 create mode 100644 ee/spec/lib/sidebars/groups/menus/work_item_epics_menu_spec.rb
 create mode 100644 spec/lib/sidebars/groups/menus/work_items_menu_spec.rb
 create mode 100644 spec/lib/sidebars/projects/menus/work_items_menu_spec.rb

diff --git a/.rubocop_todo/rspec/avoid_conditional_statements.yml b/.rubocop_todo/rspec/avoid_conditional_statements.yml
index aa94593d1dad4a..ef65040453f710 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 4c75d7ba238da8..a91e41f53a9658 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 36eaf7c51a7903..cd51e58ef52668 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 5a6721e5ea6013..29f8f1f7cc0c9a 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/controllers/projects/work_items_controller.rb b/app/controllers/projects/work_items_controller.rb
index b70ad87a1569e2..d56bd4dec04b45 100644
--- a/app/controllers/projects/work_items_controller.rb
+++ b/app/controllers/projects/work_items_controller.rb
@@ -37,7 +37,7 @@ def import_csv
   end
 
   def index
-    not_found unless ::Feature.enabled?(:namespace_level_work_items, project&.group, type: :development)
+    not_found unless ::Feature.enabled?(:work_item_planning_view, project&.group, type: :wip)
   end
 
   def show
diff --git a/config/feature_flags/wip/work_item_planning_view.yml b/config/feature_flags/wip/work_item_planning_view.yml
index 3f5302dbec0b92..b727b6afb62e2b 100644
--- a/config/feature_flags/wip/work_item_planning_view.yml
+++ b/config/feature_flags/wip/work_item_planning_view.yml
@@ -2,8 +2,8 @@
 name: work_item_planning_view
 feature_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/512661
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/180972
-rollout_issue_url:
-milestone: '17.9'
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/520452
+milestone: '17.10'
 group: group::product planning
 type: wip
 default_enabled: false
diff --git a/ee/spec/features/groups/navbar_spec.rb b/ee/spec/features/groups/navbar_spec.rb
index f48967e0de6128..d20ed619331173 100644
--- a/ee/spec/features/groups/navbar_spec.rb
+++ b/ee/spec/features/groups/navbar_spec.rb
@@ -91,6 +91,27 @@
       end
 
       it_behaves_like 'verified navigation bar'
+
+      context 'when work_item_planning_view feature flag is disabled' do
+        let(:plan_nav_items) do
+          [_("Issues"), _("Issue board"), _("Milestones"), (_('Iterations') if Gitlab.ee?)]
+        end
+
+        before do
+          stub_licensed_features(epics: true)
+          stub_feature_flags(work_item_planning_view: false)
+
+          insert_after_sub_nav_item(
+            _('Issues'),
+            within: _('Plan'),
+            new_sub_nav_item_name: _('Epics')
+          )
+
+          visit group_path(group)
+        end
+
+        it_behaves_like 'verified navigation bar'
+      end
     end
 
     context 'when packages are available' do
diff --git a/ee/spec/features/pending_group_memberships_spec.rb b/ee/spec/features/pending_group_memberships_spec.rb
index da47dbddc56a0e..0f72f56b40c0a9 100644
--- a/ee/spec/features/pending_group_memberships_spec.rb
+++ b/ee/spec/features/pending_group_memberships_spec.rb
@@ -148,6 +148,25 @@
       expect(page).to have_content 'Work items'
       expect(page).not_to have_content 'Settings'
     end
+
+    context 'when the work_item_planning_view feature flag is disabled' do
+      before do
+        stub_feature_flags(work_item_planning_view: false)
+      end
+
+      it 'a member with an active group membership and a pending subgroup membership sees a subgroup project as if the pending membership does not exist' do
+        project = create(:project, :private, namespace: subgroup)
+        create(:group_member, :guest, source: group, user: developer)
+        create(:group_member, :awaiting, :maintainer, source: subgroup, user: developer)
+
+        visit project_path(project)
+
+        expect(page).to have_content project.name
+        expect(page).to have_content 'Manage'
+        expect(page).to have_content 'Issues'
+        expect(page).not_to have_content 'Settings'
+      end
+    end
   end
 
   context 'with a shared group' do
diff --git a/ee/spec/lib/sidebars/groups/menus/work_item_epics_menu_spec.rb b/ee/spec/lib/sidebars/groups/menus/work_item_epics_menu_spec.rb
new file mode 100644
index 00000000000000..3b1cfb0c2641d0
--- /dev/null
+++ b/ee/spec/lib/sidebars/groups/menus/work_item_epics_menu_spec.rb
@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Sidebars::Groups::Menus::WorkItemEpicsMenu, feature_category: :navigation do
+  let_it_be(:owner) { create(:user) }
+  let_it_be(:group) do
+    build(:group, :private).tap do |g|
+      g.add_owner(owner)
+    end
+  end
+
+  let(:user) { owner }
+  let(:context) { Sidebars::Groups::Context.new(current_user: user, container: group) }
+  let(:menu) { described_class.new(context) }
+
+  describe 'Menu Items' do
+    subject { menu.renderable_items }
+
+    before do
+      stub_licensed_features(epics: true)
+    end
+
+    describe 'when the user has access to epics' do
+      it 'has all the menus' do
+        expect(subject.map(&:item_id)).to include(:group_epic_list, :roadmap)
+      end
+    end
+
+    describe 'when the user does not have access' do
+      let(:user) { nil }
+
+      it { is_expected.to be_empty }
+    end
+  end
+
+  it_behaves_like 'serializable as super_sidebar_menu_args' do
+    let(:extra_attrs) do
+      {
+        item_id: :boards,
+        pill_count: menu.pill_count,
+        pill_count_field: menu.pill_count_field,
+        has_pill: menu.has_pill?,
+        link: "/groups/group1/-/epic_boards",
+        super_sidebar_parent: Sidebars::Groups::SuperSidebarMenus::PlanMenu
+      }
+    end
+  end
+
+  describe '#pill_count_field' do
+    it 'returns the correct GraphQL field name' do
+      expect(menu.pill_count_field).to eq('openEpicsCount')
+    end
+  end
+end
diff --git a/spec/lib/sidebars/groups/menus/work_items_menu_spec.rb b/spec/lib/sidebars/groups/menus/work_items_menu_spec.rb
new file mode 100644
index 00000000000000..703c9c2102b590
--- /dev/null
+++ b/spec/lib/sidebars/groups/menus/work_items_menu_spec.rb
@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Sidebars::Groups::Menus::WorkItemsMenu, feature_category: :navigation do
+  let_it_be(:owner) { create(:user) }
+  let_it_be(:group) do
+    build(:group, :private).tap do |g|
+      g.add_owner(owner)
+    end
+  end
+
+  let(:user) { owner }
+  let(:context) { Sidebars::Groups::Context.new(current_user: user, container: group) }
+  let(:menu) { described_class.new(context) }
+
+  describe 'Menu Items' do
+    subject { menu.renderable_items.index { |e| e.item_id == item_id } }
+
+    shared_examples 'menu access rights' do
+      it { is_expected.not_to be_nil }
+
+      describe 'when the user does not have access' do
+        let(:user) { nil }
+
+        it { is_expected.to be_nil }
+      end
+    end
+
+    describe 'List' do
+      let(:item_id) { :issue_list }
+
+      it { is_expected.not_to be_nil }
+
+      it_behaves_like 'menu access rights'
+    end
+
+    describe 'Boards' do
+      let(:item_id) { :boards }
+
+      it_behaves_like 'menu access rights'
+    end
+
+    describe 'Milestones' do
+      let(:item_id) { :milestones }
+
+      it_behaves_like 'menu access rights'
+    end
+  end
+
+  describe '#pill_count_field' do
+    it 'returns the correct GraphQL field name' do
+      expect(menu.pill_count_field).to eq('openIssuesCount')
+    end
+  end
+
+  it_behaves_like 'serializable as super_sidebar_menu_args' do
+    let(:extra_attrs) do
+      {
+        item_id: :group_issue_list,
+        active_routes: { path: %w[
+          groups/issues#index groups/issues#show groups/issues#new
+          groups/work_items#index groups/work_items#show groups/work_items#new
+        ] },
+        pill_count: menu.pill_count,
+        pill_count_field: menu.pill_count_field,
+        has_pill: menu.has_pill?,
+        super_sidebar_parent: Sidebars::Groups::SuperSidebarMenus::PlanMenu
+      }
+    end
+  end
+end
diff --git a/spec/lib/sidebars/projects/menus/work_items_menu_spec.rb b/spec/lib/sidebars/projects/menus/work_items_menu_spec.rb
new file mode 100644
index 00000000000000..b95264d9f375f9
--- /dev/null
+++ b/spec/lib/sidebars/projects/menus/work_items_menu_spec.rb
@@ -0,0 +1,105 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Sidebars::Projects::Menus::WorkItemsMenu, feature_category: :navigation do
+  let(:project) { build(:project) }
+  let(:user) { project.first_owner }
+  let(:context) { Sidebars::Projects::Context.new(current_user: user, container: project) }
+
+  subject { described_class.new(context) }
+
+  it_behaves_like 'serializable as super_sidebar_menu_args' do
+    let(:menu) { subject }
+    let(:extra_attrs) do
+      {
+        item_id: :project_issue_list,
+        active_routes: { path: %w[
+          projects/issues#index projects/issues#show projects/issues#new
+          projects/work_items#index projects/work_items#show projects/work_items#new
+        ] },
+        pill_count: menu.pill_count,
+        pill_count_field: menu.pill_count_field,
+        has_pill: menu.has_pill?,
+        super_sidebar_parent: Sidebars::Projects::SuperSidebarMenus::PlanMenu
+      }
+    end
+  end
+
+  describe '#render?' do
+    context 'when user can read issues' do
+      it 'returns true' do
+        expect(subject.render?).to eq true
+      end
+    end
+
+    context 'when user cannot read issues' do
+      let(:user) { nil }
+
+      it 'returns false' do
+        expect(subject.render?).to eq false
+      end
+    end
+  end
+
+  describe '#has_pill?' do
+    context 'when issues feature is enabled' do
+      it 'returns true' do
+        expect(subject.has_pill?).to eq false
+      end
+    end
+
+    context 'when issue feature is disabled' do
+      it 'returns false' do
+        allow(project).to receive(:issues_enabled?).and_return(false)
+
+        expect(subject.has_pill?).to eq false
+      end
+    end
+  end
+
+  describe '#pill_count_field' do
+    it 'returns the correct GraphQL field name' do
+      expect(subject.pill_count_field).to eq('openIssuesCount')
+    end
+  end
+
+  describe 'Menu Items' do
+    subject { described_class.new(context).renderable_items.index { |e| e.item_id == item_id } }
+
+    describe 'Service Desk' do
+      let(:item_id) { :service_desk }
+
+      describe 'when service desk is supported' do
+        before do
+          allow(::ServiceDesk).to receive(:supported?).and_return(true)
+        end
+
+        describe 'when service desk is enabled' do
+          before do
+            project.update!(service_desk_enabled: true)
+          end
+
+          it { is_expected.not_to be_nil }
+        end
+
+        describe 'when service desk is disabled' do
+          before do
+            project.update!(service_desk_enabled: false)
+          end
+
+          it { is_expected.to be_nil }
+        end
+      end
+
+      describe 'when service desk is unsupported' do
+        before do
+          allow(::ServiceDesk).to receive(:supported?).and_return(false)
+          project.update!(service_desk_enabled: true)
+        end
+
+        it { is_expected.to be_nil }
+      end
+    end
+  end
+end
diff --git a/spec/requests/projects/work_items_spec.rb b/spec/requests/projects/work_items_spec.rb
index 34782edf9f8e5c..a4ab33f1d1e92a 100644
--- a/spec/requests/projects/work_items_spec.rb
+++ b/spec/requests/projects/work_items_spec.rb
@@ -35,6 +35,46 @@
     end
   end
 
+  describe 'GET /:namespace/:project/-/work_items' do
+    context 'when the user can read the group' do
+      before do
+        sign_in(current_user)
+      end
+
+      it 'renders index' do
+        get project_work_items_url(work_item.project)
+
+        expect(response).to have_gitlab_http_status(:ok)
+      end
+    end
+
+    context 'when the work_item_planning_view feature flag is disabled' do
+      before do
+        sign_in(current_user)
+        stub_feature_flags(work_item_planning_view: false)
+      end
+
+      it 'returns not found' do
+        get project_work_items_url(work_item.project)
+
+        expect(response).to have_gitlab_http_status(:not_found)
+      end
+    end
+
+    context 'when the user cannot read the group' do
+      before do
+        sign_in(current_user)
+        work_item.project.team.truncate
+      end
+
+      it 'returns not found' do
+        get project_work_items_path(work_item.project)
+
+        expect(response).to have_gitlab_http_status(:not_found)
+      end
+    end
+  end
+
   describe 'GET /:namespace/:project/work_items/:id' do
     context 'when authenticated' do
       before do
-- 
GitLab


From d6df818dba7b1ecc32d1160d9f66b0a7135bee5b Mon Sep 17 00:00:00 2001
From: Jack Chapman <jachapman@gitlab.com>
Date: Fri, 21 Feb 2025 13:35:45 +0000
Subject: [PATCH 14/22] Fix failing spec

---
 ee/spec/lib/sidebars/groups/menus/work_item_epics_menu_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ee/spec/lib/sidebars/groups/menus/work_item_epics_menu_spec.rb b/ee/spec/lib/sidebars/groups/menus/work_item_epics_menu_spec.rb
index 3b1cfb0c2641d0..c1f494d4cdf592 100644
--- a/ee/spec/lib/sidebars/groups/menus/work_item_epics_menu_spec.rb
+++ b/ee/spec/lib/sidebars/groups/menus/work_item_epics_menu_spec.rb
@@ -41,7 +41,7 @@
         pill_count: menu.pill_count,
         pill_count_field: menu.pill_count_field,
         has_pill: menu.has_pill?,
-        link: "/groups/group1/-/epic_boards",
+        link: "/groups/#{group.full_path}/-/epic_boards",
         super_sidebar_parent: Sidebars::Groups::SuperSidebarMenus::PlanMenu
       }
     end
-- 
GitLab


From 1c86c68c422cef6d535dfa29ef2ab74b6f0f47dc Mon Sep 17 00:00:00 2001
From: Jack Chapman <jachapman@gitlab.com>
Date: Fri, 21 Feb 2025 14:20:00 +0000
Subject: [PATCH 15/22] Frontend review feedback changes

---
 .../super_sidebar/components/menu_section.vue          |  6 +++---
 .../issuable/list/components/issuable_tabs.vue         |  4 +---
 .../work_items/pages/work_items_list_app.vue           | 10 +++++-----
 .../issuable/list/components/issuable_tabs_spec.js     |  9 +++++++++
 4 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/app/assets/javascripts/super_sidebar/components/menu_section.vue b/app/assets/javascripts/super_sidebar/components/menu_section.vue
index 0a5c224bb7e55b..be1c1810101cb2 100644
--- a/app/assets/javascripts/super_sidebar/components/menu_section.vue
+++ b/app/assets/javascripts/super_sidebar/components/menu_section.vue
@@ -55,9 +55,9 @@ export default {
   },
   computed: {
     navItems() {
-      return this.item.items.filter((i) => {
-        if (i.link_classes) {
-          return !i.link_classes.includes('js-super-sidebar-nav-item-hidden');
+      return this.item.items.filter((item) => {
+        if (item.link_classes) {
+          return !item.link_classes.includes('js-super-sidebar-nav-item-hidden');
         }
         return true;
       });
diff --git a/app/assets/javascripts/vue_shared/issuable/list/components/issuable_tabs.vue b/app/assets/javascripts/vue_shared/issuable/list/components/issuable_tabs.vue
index ebf06b29154cc2..fb28cc5e6f0aec 100644
--- a/app/assets/javascripts/vue_shared/issuable/list/components/issuable_tabs.vue
+++ b/app/assets/javascripts/vue_shared/issuable/list/components/issuable_tabs.vue
@@ -50,9 +50,7 @@ export default {
 
 <template>
   <div class="top-area">
-    <div>
-      <slot name="title"></slot>
-    </div>
+    <slot name="title"></slot>
     <gl-tabs
       class="mobile-separator issuable-state-filters gl-m-0 gl-flex gl-grow gl-p-0"
       nav-class="gl-border-b-0"
diff --git a/app/assets/javascripts/work_items/pages/work_items_list_app.vue b/app/assets/javascripts/work_items/pages/work_items_list_app.vue
index ba47072b8f80df..705b375b42d1dc 100644
--- a/app/assets/javascripts/work_items/pages/work_items_list_app.vue
+++ b/app/assets/javascripts/work_items/pages/work_items_list_app.vue
@@ -493,17 +493,17 @@ export default {
       this.activeItem = item;
     },
     calculateDocumentTitle(data) {
-      const middle = this.isGroup ? data.group.name : data.project.name;
+      const middleCrumb = this.isGroup ? data.group.name : data.project.name;
       if (this.glFeatures.workItemPlanningView) {
-        return `${s__('WorkItem|Work items')} · ${middle} · GitLab`;
+        return `${s__('WorkItem|Work items')} · ${middleCrumb} · GitLab`;
       }
       if (this.isGroup && this.isEpicsList) {
-        return `${__('Epics')} · ${middle} · GitLab`;
+        return `${__('Epics')} · ${middleCrumb} · GitLab`;
       }
       if (this.isGroup) {
-        return `${s__('WorkItem|Work items')} · ${middle} · GitLab`;
+        return `${s__('WorkItem|Work items')} · ${middleCrumb} · GitLab`;
       }
-      return `${__('Issues')} · ${middle} · GitLab`;
+      return `${__('Issues')} · ${middleCrumb} · GitLab`;
     },
     fetchEmojis(search) {
       return this.autocompleteCache.fetch({
diff --git a/spec/frontend/vue_shared/issuable/list/components/issuable_tabs_spec.js b/spec/frontend/vue_shared/issuable/list/components/issuable_tabs_spec.js
index 9cdd4d75c42c34..7e774127fd32ee 100644
--- a/spec/frontend/vue_shared/issuable/list/components/issuable_tabs_spec.js
+++ b/spec/frontend/vue_shared/issuable/list/components/issuable_tabs_spec.js
@@ -23,6 +23,7 @@ const createComponent = ({
     },
     slots: {
       'nav-actions': `<button class="js-new-issuable">New issuable</button>`,
+      title: '<h1 class="title">Tab title slot</h1>',
     },
   });
 
@@ -85,6 +86,14 @@ describe('IssuableTabs', () => {
 
       expect(button.text()).toBe('New issuable');
     });
+
+    it('renders contents for slot "title"', () => {
+      wrapper = createComponent();
+
+      const title = wrapper.find('h1.title');
+
+      expect(title.text()).toBe('Tab title slot');
+    });
   });
 
   describe('counts', () => {
-- 
GitLab


From 6254f5522d0655b7869f22cd980d13c318fb3b4c Mon Sep 17 00:00:00 2001
From: Jack Chapman <jachapman@gitlab.com>
Date: Fri, 21 Feb 2025 14:51:21 +0000
Subject: [PATCH 16/22] Try fix QA specs

---
 qa/qa/page/project/sub_menus/plan.rb                      | 8 ++++++--
 qa/qa/page/sub_menus/main.rb                              | 8 ++++++++
 .../1_manage/integrations/jira/jira_issue_import_spec.rb  | 4 ++--
 .../features/browser_ui/2_plan/issue/create_issue_spec.rb | 4 ++--
 .../browser_ui/2_plan/issue/export_as_csv_spec.rb         | 2 +-
 .../ee/browser_ui/12_systems/geo/issue_attachment_spec.rb | 2 +-
 .../issues_weight/issue_weight_visualization_spec.rb      | 2 +-
 .../multiple_assignees_for_issues/four_assignees_spec.rb  | 2 +-
 .../more_than_four_assignees_spec.rb                      | 2 +-
 9 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/qa/qa/page/project/sub_menus/plan.rb b/qa/qa/page/project/sub_menus/plan.rb
index a7fe00f3c6025b..a0c5e2ddcf065a 100644
--- a/qa/qa/page/project/sub_menus/plan.rb
+++ b/qa/qa/page/project/sub_menus/plan.rb
@@ -25,8 +25,12 @@ def go_to_open_jira
             open_plan_submenu("Open Jira")
           end
 
-          def go_to_issues
-            open_plan_submenu("Issues")
+          def go_to_work_items
+            if has_element?('nav-item-link', submenu_item: 'Work items')
+              open_plan_submenu("Work items")
+            else
+              open_plan_submenu("Issues")
+            end
           end
         end
       end
diff --git a/qa/qa/page/sub_menus/main.rb b/qa/qa/page/sub_menus/main.rb
index 25732672dd4040..fc24d38b098e96 100644
--- a/qa/qa/page/sub_menus/main.rb
+++ b/qa/qa/page/sub_menus/main.rb
@@ -10,6 +10,14 @@ def go_to_issues
           click_element('nav-item-link', submenu_item: 'Issues')
         end
 
+        def go_to_work_items
+          if has_element?('nav-item-link', submenu_item: 'Work items')
+            click_element('nav-item-link', submenu_item: 'Work items')
+          else
+            click_element('nav-item-link', submenu_item: 'Issues')
+          end
+        end
+
         def go_to_merge_requests
           click_element('nav-item-link', submenu_item: 'Merge requests')
         end
diff --git a/qa/qa/specs/features/browser_ui/1_manage/integrations/jira/jira_issue_import_spec.rb b/qa/qa/specs/features/browser_ui/1_manage/integrations/jira/jira_issue_import_spec.rb
index 6666fea62ccd04..05c3c09520df0e 100644
--- a/qa/qa/specs/features/browser_ui/1_manage/integrations/jira/jira_issue_import_spec.rb
+++ b/qa/qa/specs/features/browser_ui/1_manage/integrations/jira/jira_issue_import_spec.rb
@@ -14,7 +14,7 @@ module QA
         set_up_jira_integration
         import_jira_issues
 
-        Page::Project::Menu.perform(&:go_to_issues)
+        Page::Project::Menu.perform(&:go_to_work_items)
         Page::Project::Issue::Index.perform do |issues_page|
           expect { issues_page }.to eventually_have_content(jira_issue_title).within(
             max_attempts: 5, sleep_interval: 1, reload_page: issues_page
@@ -52,7 +52,7 @@ def set_up_jira_integration
       end
 
       def import_jira_issues
-        Page::Project::Menu.perform(&:go_to_issues)
+        Page::Project::Menu.perform(&:go_to_work_items)
         Page::Project::Issue::Index.perform(&:go_to_jira_import_form)
 
         Page::Project::Issue::JiraImport.perform do |form|
diff --git a/qa/qa/specs/features/browser_ui/2_plan/issue/create_issue_spec.rb b/qa/qa/specs/features/browser_ui/2_plan/issue/create_issue_spec.rb
index c9ad0db9591f37..f5d207e30c185c 100644
--- a/qa/qa/specs/features/browser_ui/2_plan/issue/create_issue_spec.rb
+++ b/qa/qa/specs/features/browser_ui/2_plan/issue/create_issue_spec.rb
@@ -26,7 +26,7 @@ module QA
       ) do
         issue = Resource::Issue.fabricate_via_browser_ui! { |issue| issue.project = project }
 
-        Page::Project::Menu.perform(&:go_to_issues)
+        Page::Project::Menu.perform(&:go_to_work_items)
 
         Page::Project::Issue::Index.perform do |index|
           expect(index).to have_issue(issue)
@@ -46,7 +46,7 @@ module QA
           expect(issue_page).to have_reopen_issue_button
         end
 
-        Page::Project::Menu.perform(&:go_to_issues)
+        Page::Project::Menu.perform(&:go_to_work_items)
 
         Page::Project::Issue::Index.perform do |index|
           expect(index).not_to have_issue(closed_issue)
diff --git a/qa/qa/specs/features/browser_ui/2_plan/issue/export_as_csv_spec.rb b/qa/qa/specs/features/browser_ui/2_plan/issue/export_as_csv_spec.rb
index 622f1b966d06b3..795f70af142372 100644
--- a/qa/qa/specs/features/browser_ui/2_plan/issue/export_as_csv_spec.rb
+++ b/qa/qa/specs/features/browser_ui/2_plan/issue/export_as_csv_spec.rb
@@ -11,7 +11,7 @@ module QA
         create_list(:issue, 2, project: project)
 
         project.visit!
-        Page::Project::Menu.perform(&:go_to_issues)
+        Page::Project::Menu.perform(&:go_to_work_items)
       end
 
       it 'successfully exports issues list as CSV', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347968' do
diff --git a/qa/qa/specs/features/ee/browser_ui/12_systems/geo/issue_attachment_spec.rb b/qa/qa/specs/features/ee/browser_ui/12_systems/geo/issue_attachment_spec.rb
index b0317de45d3d88..1c37dccd2374bf 100644
--- a/qa/qa/specs/features/ee/browser_ui/12_systems/geo/issue_attachment_spec.rb
+++ b/qa/qa/specs/features/ee/browser_ui/12_systems/geo/issue_attachment_spec.rb
@@ -31,7 +31,7 @@ module QA
             dashboard.go_to_project(project.name)
           end
 
-          Page::Project::Menu.act { go_to_issues }
+          Page::Project::Menu.act { go_to_work_items }
 
           Page::Project::Issue::Index.perform do |index|
             index.wait_for_issue_replication(issue)
diff --git a/qa/qa/specs/features/ee/browser_ui/2_plan/issues_weight/issue_weight_visualization_spec.rb b/qa/qa/specs/features/ee/browser_ui/2_plan/issues_weight/issue_weight_visualization_spec.rb
index 78b508013d538e..5451679867a731 100644
--- a/qa/qa/specs/features/ee/browser_ui/2_plan/issues_weight/issue_weight_visualization_spec.rb
+++ b/qa/qa/specs/features/ee/browser_ui/2_plan/issues_weight/issue_weight_visualization_spec.rb
@@ -24,7 +24,7 @@ module QA
           expect(show.total_issue_weight_value).to have_content(weight)
         end
 
-        Page::Project::Menu.perform(&:go_to_issues)
+        Page::Project::Menu.perform(&:go_to_work_items)
 
         Page::Project::Issue::Index.perform do |index|
           expect(index.issuable_weight).to have_content(weight)
diff --git a/qa/qa/specs/features/ee/browser_ui/2_plan/multiple_assignees_for_issues/four_assignees_spec.rb b/qa/qa/specs/features/ee/browser_ui/2_plan/multiple_assignees_for_issues/four_assignees_spec.rb
index ca14ee4010b707..7bb9a87e14a730 100644
--- a/qa/qa/specs/features/ee/browser_ui/2_plan/multiple_assignees_for_issues/four_assignees_spec.rb
+++ b/qa/qa/specs/features/ee/browser_ui/2_plan/multiple_assignees_for_issues/four_assignees_spec.rb
@@ -30,7 +30,7 @@ module QA
       end
 
       it 'shows four assignees in the issues list', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347960' do
-        Page::Project::Menu.perform(&:go_to_issues)
+        Page::Project::Menu.perform(&:go_to_work_items)
 
         Page::Project::Issue::Index.perform do |index|
           expect(index).to have_assignee_link_count(4)
diff --git a/qa/qa/specs/features/ee/browser_ui/2_plan/multiple_assignees_for_issues/more_than_four_assignees_spec.rb b/qa/qa/specs/features/ee/browser_ui/2_plan/multiple_assignees_for_issues/more_than_four_assignees_spec.rb
index 926f8fe3746f5b..467174c30b0963 100644
--- a/qa/qa/specs/features/ee/browser_ui/2_plan/multiple_assignees_for_issues/more_than_four_assignees_spec.rb
+++ b/qa/qa/specs/features/ee/browser_ui/2_plan/multiple_assignees_for_issues/more_than_four_assignees_spec.rb
@@ -37,7 +37,7 @@ module QA
       it 'shows the first three assignees and a +n sign in the issues list', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347976' do
         project.visit!
 
-        Page::Project::Menu.perform(&:go_to_issues)
+        Page::Project::Menu.perform(&:go_to_work_items)
 
         Page::Project::Issue::Index.perform do |index|
           expect(index).to have_assignee_link_count(3)
-- 
GitLab


From 8d635eb113549a06d45dc4933d7b509bf32e4ff9 Mon Sep 17 00:00:00 2001
From: Jack Chapman <jachapman@gitlab.com>
Date: Mon, 24 Feb 2025 10:21:47 +0000
Subject: [PATCH 17/22] Epics QA specs

---
 qa/qa/ee/page/group/sub_menus/plan.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/qa/qa/ee/page/group/sub_menus/plan.rb b/qa/qa/ee/page/group/sub_menus/plan.rb
index cbf7a191465e56..b5029a25ebc129 100644
--- a/qa/qa/ee/page/group/sub_menus/plan.rb
+++ b/qa/qa/ee/page/group/sub_menus/plan.rb
@@ -9,7 +9,11 @@ module Plan
             extend QA::Page::PageConcern
 
             def go_to_epics
-              open_plan_submenu("Epics")
+              if has_element?('nav-item-link', submenu_item: 'Work items')
+                open_plan_submenu("Work items")
+              else
+                open_plan_submenu("Epics")
+              end
             end
 
             def go_to_roadmap
-- 
GitLab


From 0258a43fa842acaf5dcab0453f66a8b279a4a87b Mon Sep 17 00:00:00 2001
From: Jack Chapman <jachapman@gitlab.com>
Date: Mon, 24 Feb 2025 11:41:30 +0000
Subject: [PATCH 18/22] Prevent attribute inheritance for prefetch component

---
 .../javascripts/work_items/components/work_item_prefetch.vue     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/assets/javascripts/work_items/components/work_item_prefetch.vue b/app/assets/javascripts/work_items/components/work_item_prefetch.vue
index 82bad5dfd7c325..da0ed07b5be4d1 100644
--- a/app/assets/javascripts/work_items/components/work_item_prefetch.vue
+++ b/app/assets/javascripts/work_items/components/work_item_prefetch.vue
@@ -9,6 +9,7 @@ export default {
       default: '',
     },
   },
+  inheritAttrs: false,
   props: {
     workItemIid: {
       type: String,
-- 
GitLab


From 5b05a8c2fe19a529517dd43263040dd1d48bac64 Mon Sep 17 00:00:00 2001
From: Jack Chapman <jachapman@gitlab.com>
Date: Wed, 26 Feb 2025 11:21:11 +0000
Subject: [PATCH 19/22] QA specs again

---
 .../work_items/pages/work_items_list_app.vue         |  3 +++
 qa/qa/ee/page/group/work_item/epic/new.rb            |  4 ++++
 qa/qa/ee/resource/work_item_epic.rb                  |  1 +
 .../browser_ui/2_plan/issue/export_as_csv_spec.rb    | 12 +++++++-----
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/ee/app/assets/javascripts/work_items/pages/work_items_list_app.vue b/ee/app/assets/javascripts/work_items/pages/work_items_list_app.vue
index ea3d5e0f89ba66..65730ad843de37 100644
--- a/ee/app/assets/javascripts/work_items/pages/work_items_list_app.vue
+++ b/ee/app/assets/javascripts/work_items/pages/work_items_list_app.vue
@@ -77,6 +77,9 @@ export default {
   },
   computed: {
     allowedWorkItemTypes() {
+      if (this.isGroup) {
+        return [];
+      }
       if (this.workItemTypeName === WORK_ITEM_TYPE_ENUM_ISSUE) {
         return BASE_ALLOWED_CREATE_TYPES;
       }
diff --git a/qa/qa/ee/page/group/work_item/epic/new.rb b/qa/qa/ee/page/group/work_item/epic/new.rb
index 7bb2628ae247af..5ee30b3b32ac6c 100644
--- a/qa/qa/ee/page/group/work_item/epic/new.rb
+++ b/qa/qa/ee/page/group/work_item/epic/new.rb
@@ -27,6 +27,10 @@ def enable_confidential_epic
               def set_title(title)
                 fill_element('work-item-title-input', title)
               end
+
+              def select_epic_type
+                select 'Epic', from: 'Type'
+              end
             end
           end
         end
diff --git a/qa/qa/ee/resource/work_item_epic.rb b/qa/qa/ee/resource/work_item_epic.rb
index d7785d5a6a9019..c9b14f22f41a91 100644
--- a/qa/qa/ee/resource/work_item_epic.rb
+++ b/qa/qa/ee/resource/work_item_epic.rb
@@ -39,6 +39,7 @@ def fabricate!
           QA::EE::Page::Group::WorkItem::Epic::Index.perform(&:click_new_epic)
 
           QA::EE::Page::Group::WorkItem::Epic::New.perform do |new_epic_page|
+            new_epic_page.select_epic_type
             new_epic_page.set_title(title)
             new_epic_page.enable_confidential_epic if @confidential
             new_epic_page.create_new_epic
diff --git a/qa/qa/specs/features/browser_ui/2_plan/issue/export_as_csv_spec.rb b/qa/qa/specs/features/browser_ui/2_plan/issue/export_as_csv_spec.rb
index 795f70af142372..1e0c25f59b17df 100644
--- a/qa/qa/specs/features/browser_ui/2_plan/issue/export_as_csv_spec.rb
+++ b/qa/qa/specs/features/browser_ui/2_plan/issue/export_as_csv_spec.rb
@@ -16,15 +16,17 @@ module QA
 
       it 'successfully exports issues list as CSV', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347968' do
         Page::Project::Issue::Index.perform do |index|
-          index.click_issues_list_more_actions_dropdown
+          if has_element?('issues-list-more-actions-dropdown')
+            index.click_issues_list_more_actions_dropdown
 
-          index.click_export_as_csv_button
+            index.click_export_as_csv_button
 
-          expect(index.export_issues_modal).to have_content('2 issues selected')
+            expect(index.export_issues_modal).to have_content('2 issues selected')
 
-          index.click_export_issues_button
+            index.click_export_issues_button
 
-          expect(index).to have_content(/Your CSV export has started. It will be emailed to (\S+) when complete./)
+            expect(index).to have_content(/Your CSV export has started. It will be emailed to (\S+) when complete./)
+          end
         end
       end
     end
-- 
GitLab


From b18baf1940984a879c561ab8f56140dd84da7dcf Mon Sep 17 00:00:00 2001
From: Jack Chapman <jachapman@gitlab.com>
Date: Wed, 26 Feb 2025 13:03:50 +0000
Subject: [PATCH 20/22] Only select type if available

---
 qa/qa/ee/page/group/work_item/epic/new.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/qa/qa/ee/page/group/work_item/epic/new.rb b/qa/qa/ee/page/group/work_item/epic/new.rb
index 5ee30b3b32ac6c..431582a3546d60 100644
--- a/qa/qa/ee/page/group/work_item/epic/new.rb
+++ b/qa/qa/ee/page/group/work_item/epic/new.rb
@@ -29,6 +29,8 @@ def set_title(title)
               end
 
               def select_epic_type
+                return unless has_element?('work-item-types-select')
+
                 select 'Epic', from: 'Type'
               end
             end
-- 
GitLab


From 9395baa542ee55e3d00de21ff918a720ba810e33 Mon Sep 17 00:00:00 2001
From: Jack Chapman <jachapman@gitlab.com>
Date: Wed, 26 Feb 2025 14:03:45 +0000
Subject: [PATCH 21/22] Click search tokens instead of tabs

---
 qa/qa/page/project/issue/index.rb | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/qa/qa/page/project/issue/index.rb b/qa/qa/page/project/issue/index.rb
index f3ec160d26ec14..0860c4ddaebec6 100644
--- a/qa/qa/page/project/issue/index.rb
+++ b/qa/qa/page/project/issue/index.rb
@@ -46,7 +46,16 @@ def click_issue_link(title)
           end
 
           def click_closed_issues_tab
-            click_element('closed-issuables-tab')
+            if has_element?('closed-issuables-tab')
+              click_element('closed-issuables-tab')
+            else
+              # When we no longer use tabs for open/closed/all lists
+              click_element('clear-icon')
+              click_element('filtered-search-token-segment')
+              click_link('State')
+              click_link('Closed')
+              click_element('search-button')
+            end
           end
 
           def click_export_as_csv_button
-- 
GitLab


From 6e5c9d038160ffba54c2c9a032f613e29fe623c1 Mon Sep 17 00:00:00 2001
From: Jack Chapman <jachapman@gitlab.com>
Date: Fri, 28 Feb 2025 12:03:01 +0000
Subject: [PATCH 22/22] Add missing coverage to new code

---
 .../groups/menus/work_item_epics_menu_spec.rb |  6 +++++
 .../groups/menus/work_items_menu_spec.rb      | 22 +++++++++++++++++--
 .../projects/menus/work_items_menu_spec.rb    | 15 +++++++++++--
 3 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/ee/spec/lib/sidebars/groups/menus/work_item_epics_menu_spec.rb b/ee/spec/lib/sidebars/groups/menus/work_item_epics_menu_spec.rb
index c1f494d4cdf592..f4875265b3beed 100644
--- a/ee/spec/lib/sidebars/groups/menus/work_item_epics_menu_spec.rb
+++ b/ee/spec/lib/sidebars/groups/menus/work_item_epics_menu_spec.rb
@@ -52,4 +52,10 @@
       expect(menu.pill_count_field).to eq('openEpicsCount')
     end
   end
+
+  describe '#sprite_icon' do
+    subject { menu.sprite_icon }
+
+    it { is_expected.to eq 'epic' }
+  end
 end
diff --git a/spec/lib/sidebars/groups/menus/work_items_menu_spec.rb b/spec/lib/sidebars/groups/menus/work_items_menu_spec.rb
index 703c9c2102b590..77d2a23540cf2c 100644
--- a/spec/lib/sidebars/groups/menus/work_items_menu_spec.rb
+++ b/spec/lib/sidebars/groups/menus/work_items_menu_spec.rb
@@ -21,14 +21,18 @@
       it { is_expected.not_to be_nil }
 
       describe 'when the user does not have access' do
-        let(:user) { nil }
+        it 'does not include item' do
+          allow(Ability).to receive(:allowed?).and_call_original
+          allow(Ability).to receive(:allowed?).with(user, policy, group).and_return(false)
 
-        it { is_expected.to be_nil }
+          is_expected.to be_nil
+        end
       end
     end
 
     describe 'List' do
       let(:item_id) { :issue_list }
+      let(:policy) { :read_group_issues }
 
       it { is_expected.not_to be_nil }
 
@@ -37,12 +41,14 @@
 
     describe 'Boards' do
       let(:item_id) { :boards }
+      let(:policy) { :read_group_boards }
 
       it_behaves_like 'menu access rights'
     end
 
     describe 'Milestones' do
       let(:item_id) { :milestones }
+      let(:policy) { :read_group_milestones }
 
       it_behaves_like 'menu access rights'
     end
@@ -54,6 +60,18 @@
     end
   end
 
+  describe '#pill_html_options' do
+    it 'returns the pill options' do
+      expect(menu.pill_html_options).to eq({ class: 'issue_counter' })
+    end
+  end
+
+  describe '#sprite_icon' do
+    subject { menu.sprite_icon }
+
+    it { is_expected.to eq 'issues' }
+  end
+
   it_behaves_like 'serializable as super_sidebar_menu_args' do
     let(:extra_attrs) do
       {
diff --git a/spec/lib/sidebars/projects/menus/work_items_menu_spec.rb b/spec/lib/sidebars/projects/menus/work_items_menu_spec.rb
index b95264d9f375f9..1693dc5565963b 100644
--- a/spec/lib/sidebars/projects/menus/work_items_menu_spec.rb
+++ b/spec/lib/sidebars/projects/menus/work_items_menu_spec.rb
@@ -7,10 +7,9 @@
   let(:user) { project.first_owner }
   let(:context) { Sidebars::Projects::Context.new(current_user: user, container: project) }
 
-  subject { described_class.new(context) }
+  subject(:menu) { described_class.new(context) }
 
   it_behaves_like 'serializable as super_sidebar_menu_args' do
-    let(:menu) { subject }
     let(:extra_attrs) do
       {
         item_id: :project_issue_list,
@@ -64,6 +63,18 @@
     end
   end
 
+  describe '#pill_html_options' do
+    it 'returns the pill options' do
+      expect(menu.pill_html_options).to eq({ class: 'issue_counter' })
+    end
+  end
+
+  describe '#sprite_icon' do
+    subject { menu.sprite_icon }
+
+    it { is_expected.to eq 'issues' }
+  end
+
   describe 'Menu Items' do
     subject { described_class.new(context).renderable_items.index { |e| e.item_id == item_id } }
 
-- 
GitLab