Add latest changes from gitlab-org/gitlab@14-5-stable-eev14.5.0-rc42

11 files changed, 259 insertions, 7 deletions

diff --git a/lib/sidebars/groups/menus/customer_relations_menu.rb b/lib/sidebars/groups/menus/customer_relations_menu.rb
new file mode 100644
index 00000000000..fdbbd662ad6
--- /dev/null
+++ b/lib/sidebars/groups/menus/customer_relations_menu.rb
@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+module Sidebars
+  module Groups
+    module Menus
+      class CustomerRelationsMenu < ::Sidebars::Menu
+        override :configure_menu_items
+        def configure_menu_items
+          add_item(contacts_menu_item) if can_read_contact?
+          add_item(organizations_menu_item) if can_read_organization?
+
+          true
+        end
+
+        override :title
+        def title
+          _('Customer relations')
+        end
+
+        override :sprite_icon
+        def sprite_icon
+          'users'
+        end
+
+        override :render?
+        def render?
+          can_read_contact? || can_read_organization?
+        end
+
+        private
+
+        def contacts_menu_item
+          ::Sidebars::MenuItem.new(
+            title: _('Contacts'),
+            link: contacts_group_crm_index_path(context.group),
+            active_routes: { path: 'groups/crm#contacts' },
+            item_id: :crm_contacts
+          )
+        end
+
+        def organizations_menu_item
+          ::Sidebars::MenuItem.new(
+            title: _('Organizations'),
+            link: organizations_group_crm_index_path(context.group),
+            active_routes: { path: 'groups/crm#organizations' },
+            item_id: :crm_organizations
+          )
+        end
+
+        def can_read_contact?
+          can?(context.current_user, :read_crm_contact, context.group)
+        end
+
+        def can_read_organization?
+          can?(context.current_user, :read_crm_organization, context.group)
+        end
+      end
+    end
+  end
+end
diff --git a/lib/sidebars/groups/menus/invite_team_members_menu.rb b/lib/sidebars/groups/menus/invite_team_members_menu.rb
new file mode 100644
index 00000000000..0779b696061
--- /dev/null
+++ b/lib/sidebars/groups/menus/invite_team_members_menu.rb
@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module Sidebars
+  module Groups
+    module Menus
+      class InviteTeamMembersMenu < ::Sidebars::Menu
+        override :title
+        def title
+          s_('InviteMember|Invite members')
+        end
+
+        override :render?
+        def render?
+          can?(context.current_user, :admin_group_member, context.group) && all_valid_members.size <= 1
+        end
+
+        override :menu_partial
+        def menu_partial
+          'groups/invite_members_side_nav_link'
+        end
+
+        override :menu_partial_options
+        def menu_partial_options
+          {
+            group: context.group,
+            title: title,
+            sidebar_menu: self
+          }
+        end
+
+        override :extra_nav_link_html_options
+        def extra_nav_link_html_options
+          {
+            'data-test-id': 'side-nav-invite-members'
+          }
+        end
+
+        private
+
+        def all_valid_members
+          GroupMembersFinder.new(context.group, context.current_user).execute
+        end
+      end
+    end
+  end
+end
diff --git a/lib/sidebars/groups/menus/packages_registries_menu.rb b/lib/sidebars/groups/menus/packages_registries_menu.rb
index e81e9355e7e..46fcec9f7b8 100644
--- a/lib/sidebars/groups/menus/packages_registries_menu.rb
+++ b/lib/sidebars/groups/menus/packages_registries_menu.rb
@@ -52,7 +52,7 @@ module Sidebars
         end
 
         def dependency_proxy_menu_item
-          unless context.group.dependency_proxy_feature_available?
+          unless can?(context.current_user, :read_dependency_proxy, context.group)
             return ::Sidebars::NilMenuItem.new(item_id: :dependency_proxy)
           end
 
diff --git a/lib/sidebars/groups/panel.rb b/lib/sidebars/groups/panel.rb
index 6efe89d496a..463c2571b14 100644
--- a/lib/sidebars/groups/panel.rb
+++ b/lib/sidebars/groups/panel.rb
@@ -13,13 +13,24 @@ module Sidebars
         add_menu(Sidebars::Groups::Menus::CiCdMenu.new(context))
         add_menu(Sidebars::Groups::Menus::KubernetesMenu.new(context))
         add_menu(Sidebars::Groups::Menus::PackagesRegistriesMenu.new(context))
+        add_menu(Sidebars::Groups::Menus::CustomerRelationsMenu.new(context))
         add_menu(Sidebars::Groups::Menus::SettingsMenu.new(context))
+        add_invite_members_menu
       end
 
       override :aria_label
       def aria_label
         context.group.subgroup? ? _('Subgroup navigation') : _('Group navigation')
       end
+
+      private
+
+      def add_invite_members_menu
+        experiment(:invite_members_in_side_nav, group: context.group) do |e|
+          e.control {}
+          e.candidate { add_menu(Sidebars::Groups::Menus::InviteTeamMembersMenu.new(context)) }
+        end
+      end
     end
   end
 end
diff --git a/lib/sidebars/panel.rb b/lib/sidebars/panel.rb
index 75b3ba65729..e8c02a2d707 100644
--- a/lib/sidebars/panel.rb
+++ b/lib/sidebars/panel.rb
@@ -4,6 +4,7 @@ module Sidebars
   class Panel
     extend ::Gitlab::Utils::Override
     include ::Sidebars::Concerns::PositionableList
+    include Gitlab::Experiment::Dsl
 
     attr_reader :context, :scope_menu, :hidden_menu
 
diff --git a/lib/sidebars/projects/menus/confluence_menu.rb b/lib/sidebars/projects/menus/confluence_menu.rb
index 0d83238fa82..0fd42a57da3 100644
--- a/lib/sidebars/projects/menus/confluence_menu.rb
+++ b/lib/sidebars/projects/menus/confluence_menu.rb
@@ -37,6 +37,11 @@ module Sidebars
         def render?
           context.project.has_confluence?
         end
+
+        override :active_routes
+        def active_routes
+          { controller: :confluences }
+        end
       end
     end
   end
diff --git a/lib/sidebars/projects/menus/infrastructure_menu.rb b/lib/sidebars/projects/menus/infrastructure_menu.rb
index 92e9cbb7040..ccc4787601a 100644
--- a/lib/sidebars/projects/menus/infrastructure_menu.rb
+++ b/lib/sidebars/projects/menus/infrastructure_menu.rb
@@ -91,7 +91,7 @@ module Sidebars
 
         def google_cloud_menu_item
           feature_is_enabled = Feature.enabled?(:incubation_5mp_google_cloud)
-          user_has_permissions = can?(context.current_user, :manage_project_google_cloud, context.project)
+          user_has_permissions = can?(context.current_user, :admin_project_google_cloud, context.project)
 
           unless feature_is_enabled && user_has_permissions
             return ::Sidebars::NilMenuItem.new(item_id: :incubation_5mp_google_cloud)
@@ -100,7 +100,7 @@ module Sidebars
           ::Sidebars::MenuItem.new(
             title: _('Google Cloud'),
             link: project_google_cloud_index_path(context.project),
-            active_routes: {},
+            active_routes: { controller: :google_cloud },
             item_id: :google_cloud
           )
         end
diff --git a/lib/sidebars/projects/menus/invite_team_members_menu.rb b/lib/sidebars/projects/menus/invite_team_members_menu.rb
new file mode 100644
index 00000000000..0db49f1e12a
--- /dev/null
+++ b/lib/sidebars/projects/menus/invite_team_members_menu.rb
@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+module Sidebars
+  module Projects
+    module Menus
+      class InviteTeamMembersMenu < ::Sidebars::Menu
+        override :title
+        def title
+          s_('InviteMember|Invite members')
+        end
+
+        override :render?
+        def render?
+          can?(context.current_user, :admin_project_member, context.project) && all_valid_members.size <= 1
+        end
+
+        override :menu_partial
+        def menu_partial
+          'projects/invite_members_side_nav_link'
+        end
+
+        override :menu_partial_options
+        def menu_partial_options
+          {
+            project: context.project,
+            title: title,
+            sidebar_menu: self
+          }
+        end
+
+        override :extra_nav_link_html_options
+        def extra_nav_link_html_options
+          {
+            'data-test-id': 'side-nav-invite-members'
+          }
+        end
+
+        private
+
+        def all_valid_members
+          MembersFinder.new(context.project, context.current_user)
+                       .execute(include_relations: [:inherited, :direct, :invited_groups])
+        end
+      end
+    end
+  end
+end
diff --git a/lib/sidebars/projects/menus/settings_menu.rb b/lib/sidebars/projects/menus/settings_menu.rb
index 6439c97d0bc..2411ca8263a 100644
--- a/lib/sidebars/projects/menus/settings_menu.rb
+++ b/lib/sidebars/projects/menus/settings_menu.rb
@@ -144,10 +144,6 @@ module Sidebars
         end
 
         def usage_quotas_menu_item
-          unless Feature.enabled?(:project_storage_ui, context.project&.group, default_enabled: :yaml)
-            return ::Sidebars::NilMenuItem.new(item_id: :usage_quotas)
-          end
-
           ::Sidebars::MenuItem.new(
             title: s_('UsageQuota|Usage Quotas'),
             link: project_usage_quotas_path(context.project),
diff --git a/lib/sidebars/projects/menus/zentao_menu.rb b/lib/sidebars/projects/menus/zentao_menu.rb
new file mode 100644
index 00000000000..db9e60326a4
--- /dev/null
+++ b/lib/sidebars/projects/menus/zentao_menu.rb
@@ -0,0 +1,77 @@
+# frozen_string_literal: true
+
+module Sidebars
+  module Projects
+    module Menus
+      class ZentaoMenu < ::Sidebars::Menu
+        override :configure_menu_items
+        def configure_menu_items
+          render?.tap { |render| add_items if render }
+        end
+
+        override :link
+        def link
+          zentao_integration.url
+        end
+
+        override :title
+        def title
+          s_('ZentaoIntegration|ZenTao issues')
+        end
+
+        override :title_html_options
+        def title_html_options
+          {
+            id: 'js-onboarding-settings-link'
+          }
+        end
+
+        override :image_path
+        def image_path
+          'logos/zentao.svg'
+        end
+
+        # Hardcode sizes so image doesn't flash before CSS loads https://gitlab.com/gitlab-org/gitlab/-/issues/321022
+        override :image_html_options
+        def image_html_options
+          {
+            size: 16
+          }
+        end
+
+        override :render?
+        def render?
+          return false if zentao_integration.blank?
+
+          zentao_integration.active?
+        end
+
+        def add_items
+          add_item(open_zentao_menu_item)
+        end
+
+        private
+
+        def zentao_integration
+          @zentao_integration ||= context.project.zentao_integration
+        end
+
+        def open_zentao_menu_item
+          ::Sidebars::MenuItem.new(
+            title: s_('ZentaoIntegration|Open ZenTao'),
+            link: zentao_integration.url,
+            active_routes: {},
+            item_id: :open_zentao,
+            sprite_icon: 'external-link',
+            container_html_options: {
+              target: '_blank',
+              rel: 'noopener noreferrer'
+            }
+          )
+        end
+      end
+    end
+  end
+end
+
+::Sidebars::Projects::Menus::ZentaoMenu.prepend_mod
diff --git a/lib/sidebars/projects/panel.rb b/lib/sidebars/projects/panel.rb
index d5311c0a0c1..8fbd71c1543 100644
--- a/lib/sidebars/projects/panel.rb
+++ b/lib/sidebars/projects/panel.rb
@@ -23,6 +23,7 @@ module Sidebars
         add_menu(Sidebars::Projects::Menus::RepositoryMenu.new(context))
         add_menu(Sidebars::Projects::Menus::IssuesMenu.new(context))
         add_menu(Sidebars::Projects::Menus::ExternalIssueTrackerMenu.new(context))
+        add_menu(Sidebars::Projects::Menus::ZentaoMenu.new(context))
         add_menu(Sidebars::Projects::Menus::MergeRequestsMenu.new(context))
         add_menu(Sidebars::Projects::Menus::CiCdMenu.new(context))
         add_menu(Sidebars::Projects::Menus::SecurityComplianceMenu.new(context))
@@ -35,6 +36,14 @@ module Sidebars
         add_menu(Sidebars::Projects::Menus::ExternalWikiMenu.new(context))
         add_menu(Sidebars::Projects::Menus::SnippetsMenu.new(context))
         add_menu(Sidebars::Projects::Menus::SettingsMenu.new(context))
+        add_invite_members_menu
+      end
+
+      def add_invite_members_menu
+        experiment(:invite_members_in_side_nav, group: context.project.group) do |e|
+          e.control {}
+          e.candidate { add_menu(Sidebars::Projects::Menus::InviteTeamMembersMenu.new(context)) }
+        end
       end
 
       def confluence_or_wiki_menu