Merge branch 'revert-053256d9' into 'master'

Revert "Merge branch '513582-clean-up-header-app' into 'master'"

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/184289



Merged-by: Jacques Erasmus <jerasmus@gitlab.com>
Approved-by: Jacques Erasmus <jerasmus@gitlab.com>
Co-authored-by: Paulina Sedlak-Jakubowska <psedlak-jakubowska@gitlab.com>

.rubocop_todo/gitlab/feature_available_usage.yml

@@ -27,6 +27,7 @@ Gitlab/FeatureAvailableUsage:
     - 'ee/app/helpers/ee/form_helper.rb'
     - 'ee/app/helpers/ee/graph_helper.rb'
     - 'ee/app/helpers/ee/issues_helper.rb'
+    - 'ee/app/helpers/ee/lock_helper.rb'
     - 'ee/app/helpers/ee/operations_helper.rb'
     - 'ee/app/helpers/ee/projects/incidents_helper.rb'
     - 'ee/app/helpers/ee/projects_helper.rb'

.rubocop_todo/layout/line_length.yml

@@ -535,6 +535,7 @@ Layout/LineLength:
     - 'ee/app/helpers/ee/integrations_helper.rb'
     - 'ee/app/helpers/ee/issues_helper.rb'
     - 'ee/app/helpers/ee/labels_helper.rb'
+    - 'ee/app/helpers/ee/lock_helper.rb'
     - 'ee/app/helpers/ee/merge_requests_helper.rb'
     - 'ee/app/helpers/ee/mirror_helper.rb'
     - 'ee/app/helpers/ee/notes_helper.rb'
@@ -4208,6 +4209,7 @@ Layout/LineLength:
     - 'spec/views/projects/settings/ci_cd/_autodevops_form.html.haml_spec.rb'
     - 'spec/views/projects/settings/operations/show.html.haml_spec.rb'
     - 'spec/views/projects/tags/index.html.haml_spec.rb'
+    - 'spec/views/projects/tree/show.html.haml_spec.rb'
     - 'spec/views/shared/milestones/_issuable.html.haml_spec.rb'
     - 'spec/views/shared/projects/_project.html.haml_spec.rb'
     - 'spec/views/shared/snippets/_snippet.html.haml_spec.rb'

.rubocop_todo/lint/unused_method_argument.yml

@@ -204,6 +204,7 @@ Lint/UnusedMethodArgument:
     - 'ee/app/graphql/types/security_orchestration/security_policy_source_type.rb'
     - 'ee/app/graphql/types/vulnerability_detail_type.rb'
     - 'ee/app/graphql/types/vulnerability_location_type.rb'
+    - 'ee/app/helpers/ee/lock_helper.rb'
     - 'ee/app/models/boards/epic_board.rb'
     - 'ee/app/models/burndown.rb'
     - 'ee/app/models/concerns/elastic/application_versioned_search.rb'

.rubocop_todo/rails/helper_instance_variable.yml

@@ -59,6 +59,7 @@ Rails/HelperInstanceVariable:
     - 'ee/app/helpers/ee/integrations_helper.rb'
     - 'ee/app/helpers/ee/kerberos_helper.rb'
     - 'ee/app/helpers/ee/labels_helper.rb'
+    - 'ee/app/helpers/ee/lock_helper.rb'
     - 'ee/app/helpers/ee/mirror_helper.rb'
     - 'ee/app/helpers/ee/notes_helper.rb'
     - 'ee/app/helpers/ee/operations_helper.rb'

.rubocop_todo/rspec/context_wording.yml

@@ -246,6 +246,7 @@ RSpec/ContextWording:
     - 'ee/spec/helpers/ee/groups_helper_spec.rb'
     - 'ee/spec/helpers/ee/issuables_helper_spec.rb'
     - 'ee/spec/helpers/ee/issues_helper_spec.rb'
+    - 'ee/spec/helpers/ee/lock_helper_spec.rb'
     - 'ee/spec/helpers/ee/operations_helper_spec.rb'
     - 'ee/spec/helpers/ee/personal_access_tokens_helper_spec.rb'
     - 'ee/spec/helpers/ee/projects/security/api_fuzzing_configuration_helper_spec.rb'

.rubocop_todo/rspec/factory_bot/avoid_create.yml

@@ -31,6 +31,7 @@ RSpec/FactoryBot/AvoidCreate:
     - 'ee/spec/helpers/ee/issuables_helper_spec.rb'
     - 'ee/spec/helpers/ee/issues_helper_spec.rb'
     - 'ee/spec/helpers/ee/labels_helper_spec.rb'
+    - 'ee/spec/helpers/ee/lock_helper_spec.rb'
     - 'ee/spec/helpers/ee/namespace_user_cap_reached_alert_helper_spec.rb'
     - 'ee/spec/helpers/ee/namespaces_helper_spec.rb'
     - 'ee/spec/helpers/ee/operations_helper_spec.rb'
@@ -584,6 +585,7 @@ RSpec/FactoryBot/AvoidCreate:
     - 'spec/views/projects/settings/merge_requests/show.html.haml_spec.rb'
     - 'spec/views/projects/settings/operations/show.html.haml_spec.rb'
     - 'spec/views/projects/tags/index.html.haml_spec.rb'
+    - 'spec/views/projects/tree/show.html.haml_spec.rb'
     - 'spec/views/search/_results.html.haml_spec.rb'
     - 'spec/views/shared/_label_row.html.haml_spec.rb'
     - 'spec/views/shared/issuable/_sidebar.html.haml_spec.rb'

.rubocop_todo/rspec/feature_category.yml

@@ -363,6 +363,7 @@ RSpec/FeatureCategory:
     - 'ee/spec/helpers/ee/groups/settings_helper_spec.rb'
     - 'ee/spec/helpers/ee/hooks_helper_spec.rb'
     - 'ee/spec/helpers/ee/labels_helper_spec.rb'
+    - 'ee/spec/helpers/ee/lock_helper_spec.rb'
     - 'ee/spec/helpers/ee/namespace_user_cap_reached_alert_helper_spec.rb'
     - 'ee/spec/helpers/ee/operations_helper_spec.rb'
     - 'ee/spec/helpers/ee/profiles_helper_spec.rb'
@@ -3965,6 +3966,7 @@ RSpec/FeatureCategory:
     - 'spec/views/projects/settings/integrations/edit.html.haml_spec.rb'
     - 'spec/views/projects/settings/operations/show.html.haml_spec.rb'
     - 'spec/views/projects/tags/index.html.haml_spec.rb'
+    - 'spec/views/projects/tree/show.html.haml_spec.rb'
     - 'spec/views/shared/_label_row.html.haml_spec.rb'
     - 'spec/views/shared/_milestones_sort_dropdown.html.haml_spec.rb'
     - 'spec/views/shared/gitlab_version/_security_patch_upgrade_alert.html.haml_spec.rb'

.rubocop_todo/rspec/named_subject.yml

@@ -184,6 +184,7 @@ RSpec/NamedSubject:
     - 'ee/spec/helpers/ee/gitlab_routing_helper_spec.rb'
     - 'ee/spec/helpers/ee/groups/group_members_helper_spec.rb'
     - 'ee/spec/helpers/ee/groups_helper_spec.rb'
+    - 'ee/spec/helpers/ee/lock_helper_spec.rb'
     - 'ee/spec/helpers/ee/merge_requests_helper_spec.rb'
     - 'ee/spec/helpers/ee/operations_helper_spec.rb'
     - 'ee/spec/helpers/ee/projects/incidents_helper_spec.rb'

.rubocop_todo/rspec/receive_messages.yml

@@ -25,6 +25,7 @@ RSpec/ReceiveMessages:
     - 'ee/spec/helpers/ee/ide_helper_spec.rb'
     - 'ee/spec/helpers/ee/issuables_helper_spec.rb'
     - 'ee/spec/helpers/ee/issues_helper_spec.rb'
+    - 'ee/spec/helpers/ee/lock_helper_spec.rb'
     - 'ee/spec/helpers/ee/namespaces_helper_spec.rb'
     - 'ee/spec/helpers/ee/registrations_helper_spec.rb'
     - 'ee/spec/helpers/ee/subscribable_banner_helper_spec.rb'
@@ -570,6 +571,7 @@ RSpec/ReceiveMessages:
     - 'spec/views/projects/settings/operations/show.html.haml_spec.rb'
     - 'spec/views/projects/settings/repository/_protected_branches.html.haml_spec.rb'
     - 'spec/views/projects/tags/index.html.haml_spec.rb'
+    - 'spec/views/projects/tree/show.html.haml_spec.rb'
     - 'spec/views/shared/_broadcast_message.html.haml_spec.rb'
     - 'spec/views/shared/projects/_list.html.haml_spec.rb'
     - 'spec/views/shared/projects/_project_card.html.haml_spec.rb'

.rubocop_todo/rspec/subject_declaration.yml

@@ -2,6 +2,7 @@
 RSpec/SubjectDeclaration:
   Exclude:
     - 'ee/spec/finders/app_sec/fuzzing/coverage/corpuses_finder_spec.rb'
+    - 'ee/spec/helpers/ee/lock_helper_spec.rb'
     - 'ee/spec/helpers/nav/new_dropdown_helper_spec.rb'
     - 'ee/spec/lib/ee/api/helpers/notes_helpers_spec.rb'
     - 'ee/spec/lib/gitlab/expiring_subscription_message_spec.rb'

app/assets/javascripts/pages/projects/show/index.js

@@ -72,9 +72,10 @@ const initCodeDropdown = () => {
 
   const { sshUrl, httpUrl, kerberosUrl } = codeDropdownEl.dataset;
 
-  const CodeDropdownComponent = gon.features.directoryCodeDropdownUpdates
-    ? CompactCodeDropdown
-    : CodeDropdown;
+  const CodeDropdownComponent =
+    gon.features.directoryCodeDropdownUpdates && gon.features.blobRepositoryVueHeaderApp
+      ? CompactCodeDropdown
+      : CodeDropdown;
 
   return new Vue({
     el: codeDropdownEl,

app/assets/javascripts/repository/components/header_area.vue

@@ -265,7 +265,7 @@ export default {
           :upload-path="uploadPath"
           :new-dir-path="newDirPath"
         />
-        <!-- EE lock directory -->
+        <!-- EE: = render_if_exists 'projects/tree/lock_link' -->
         <lock-directory-button v-if="!isRoot" :project-path="projectPath" :path="currentPath" />
         <gl-button
           v-gl-tooltip.html="findFileTooltip"

app/assets/javascripts/repository/index.js

@@ -188,9 +188,10 @@ export default function setupVueRepositoryList() {
     const { sshUrl, httpUrl, kerberosUrl, xcodeUrl, directoryDownloadLinks } =
       codeDropdownEl.dataset;
 
-    const CodeDropdownComponent = gon.features.directoryCodeDropdownUpdates
-      ? CompactCodeDropdown
-      : CodeDropdown;
+    const CodeDropdownComponent =
+      gon.features.directoryCodeDropdownUpdates && gon.features.blobRepositoryVueHeaderApp
+        ? CompactCodeDropdown
+        : CodeDropdown;
 
     return new Vue({
       el: codeDropdownEl,

app/controllers/projects/blob_controller.rb

@@ -47,6 +47,7 @@ class Projects::BlobController < Projects::ApplicationController
     push_frontend_feature_flag(:inline_blame, @project)
     push_frontend_feature_flag(:blob_overflow_menu, current_user)
     push_frontend_feature_flag(:filter_blob_path, current_user)
+    push_frontend_feature_flag(:blob_repository_vue_header_app, @project)
     push_licensed_feature(:file_locks) if @project.licensed_feature_available?(:file_locks)
     push_frontend_feature_flag(:directory_code_dropdown_updates, current_user)
   end

app/controllers/projects/tree_controller.rb

@@ -19,6 +19,7 @@ class Projects::TreeController < Projects::ApplicationController
 
   before_action do
     push_frontend_feature_flag(:inline_blame, @project)
+    push_frontend_feature_flag(:blob_repository_vue_header_app, @project)
     push_frontend_feature_flag(:blob_overflow_menu, current_user)
     push_frontend_feature_flag(:filter_blob_path, current_user)
     push_licensed_feature(:file_locks) if @project.licensed_feature_available?(:file_locks)

app/controllers/projects_controller.rb

@@ -42,6 +42,7 @@ class ProjectsController < Projects::ApplicationController
     push_frontend_feature_flag(:edit_branch_rules, @project)
     # TODO: We need to remove the FF eventually when we rollout page_specific_styles
     push_frontend_feature_flag(:page_specific_styles, current_user)
+    push_frontend_feature_flag(:blob_repository_vue_header_app, @project)
     push_frontend_feature_flag(:blob_overflow_menu, current_user)
     push_frontend_feature_flag(:filter_blob_path, current_user)
     push_licensed_feature(:file_locks) if @project.present? && @project.licensed_feature_available?(:file_locks)

app/views/projects/_files.html.haml

@@ -8,7 +8,12 @@
 - add_page_specific_style 'page_bundles/projects'
 
 #tree-holder.tree-holder.clearfix.js-per-page.gl-mt-5{ data: { blame_per_page: Gitlab::Git::BlamePagination::PAGINATION_PER_PAGE } }
-  #js-repository-blob-header-app{ data: vue_tree_header_app_data(project, repository, ref, pipeline) }
+  - if Feature.enabled?(:blob_repository_vue_header_app, project)
+    #js-repository-blob-header-app{ data: vue_tree_header_app_data(project, repository, ref, pipeline) }
+
+  - else
+    .nav-block.gl-flex.gl-flex-col.sm:gl-flex-row.gl-items-stretch
+      = render 'projects/tree/tree_header', tree: @tree
 
   - if project.forked?
     #js-fork-info{ data: vue_fork_divergence_data(project, ref) }

app/views/projects/_readme.html.haml

@@ -8,18 +8,23 @@
 
 - if (readme = @repository.readme) && readme.rich_viewer
   .tree-holder.gl-mt-5
-    #js-repository-blob-header-app{ data: {
-      project_id: @project.id,
-      ref: ref,
-      ref_type: @ref_type.to_s,
-      breadcrumbs: breadcrumb_data_attributes,
-      project_root_path: project_path(@project),
-      project_path: project.full_path,
-      compare_path: compare_path,
-      web_ide_button_options: web_ide_button_data.merge(fork_options).to_json,
-      web_ide_button_default_branch: @project.default_branch_or_main,
-      escaped_ref: ActionDispatch::Journey::Router::Utils.escape_path(ref)
-    } }
+    - if Feature.enabled?(:blob_repository_vue_header_app, project)
+      #js-repository-blob-header-app{ data: {
+        project_id: @project.id,
+        ref: ref,
+        ref_type: @ref_type.to_s,
+        breadcrumbs: breadcrumb_data_attributes,
+        project_root_path: project_path(@project),
+        project_path: project.full_path,
+        compare_path: compare_path,
+        web_ide_button_options: web_ide_button_data.merge(fork_options).to_json,
+        web_ide_button_default_branch: @project.default_branch_or_main,
+        escaped_ref: ActionDispatch::Journey::Router::Utils.escape_path(ref)
+      } }
+
+    - else
+      .nav-block.mt-0
+        = render 'projects/tree/tree_header', tree: @tree
 
   %article.file-holder.readme-holder{ id: 'readme', class: ("limited-width-container" unless fluid_layout) }
     .js-file-title.file-title-flex-parent

app/views/projects/blob/_blob.html.haml

@@ -6,7 +6,10 @@
 - if blob.rich_viewer && blob.extension != 'geojson'
   - add_page_startup_api_call local_assigns.fetch(:viewer_url) { url_for(safe_params.merge(viewer: blob.rich_viewer.type, format: :json)) }
 
-#js-repository-blob-header-app{ data: vue_blob_header_app_data(project, blob, ref) }
+- if Feature.enabled?(:blob_repository_vue_header_app, project)
+  #js-repository-blob-header-app{ data: vue_blob_header_app_data(project, blob, ref) }
+- else
+  = render "projects/blob/breadcrumb", blob: blob
 
 - if project.forked?
   #js-fork-info{ data: vue_fork_divergence_data(project, ref) }

app/views/projects/buttons/_compare.html.haml

+- project = local_assigns.fetch(:project)
+- ref = local_assigns.fetch(:ref, nil)
+- root_ref = local_assigns.fetch(:root_ref, nil)
+- unless ref.blank? || root_ref == ref
+  - compare_path = project_compare_index_path(project, from: root_ref, to: ref)
+
+  = link_button_to compare_path, class: 'shortcuts-compare', rel: 'nofollow' do
+    = _('Compare')