Merge branch 'vij-snippet-blob-search-views' into 'master'

Remove snippet blob search instances in views

See merge request gitlab-org/gitlab!29599

app/helpers/search_helper.rb

@@ -58,8 +58,6 @@ module SearchHelper
       ns_('SearchResults|comment', 'SearchResults|comments', count)
     when 'projects'
       ns_('SearchResults|project', 'SearchResults|projects', count)
-    when 'snippet_blobs'
-      ns_('SearchResults|snippet result', 'SearchResults|snippet results', count)
     when 'snippet_titles'
       ns_('SearchResults|snippet', 'SearchResults|snippets', count)
     when 'users'

app/helpers/snippets_helper.rb

@@ -42,72 +42,6 @@ module SnippetsHelper
     (lower..upper).to_a
   end
 
-  # Returns a sorted set of lines to be included in a snippet preview.
-  # This ensures matching adjacent lines do not display duplicated
-  # surrounding code.
-  #
-  # @returns Array, unique and sorted.
-  def matching_lines(lined_content, surrounding_lines, query)
-    used_lines = []
-    lined_content.each_with_index do |line, line_number|
-      used_lines.concat bounded_line_numbers(
-        line_number,
-        0,
-        lined_content.size,
-        surrounding_lines
-      ) if line.downcase.include?(query.downcase)
-    end
-
-    used_lines.uniq.sort
-  end
-
-  # 'Chunkify' entire snippet.  Splits the snippet data into matching lines +
-  # surrounding_lines() worth of unmatching lines.
-  #
-  # @returns a hash with {snippet_object, snippet_chunks:{data,start_line}}
-  def chunk_snippet(snippet, query, surrounding_lines = 3)
-    lined_content = snippet.content.split("\n")
-    used_lines = matching_lines(lined_content, surrounding_lines, query)
-
-    snippet_chunk = []
-    snippet_chunks = []
-    snippet_start_line = 0
-    last_line = -1
-
-    # Go through each used line, and add consecutive lines as a single chunk
-    # to the snippet chunk array.
-    used_lines.each do |line_number|
-      if last_line < 0
-        # Start a new chunk.
-        snippet_start_line = line_number
-        snippet_chunk << lined_content[line_number]
-      elsif last_line == line_number - 1
-        # Consecutive line, continue chunk.
-        snippet_chunk << lined_content[line_number]
-      else
-        # Non-consecutive line, add chunk to chunk array.
-        snippet_chunks << {
-          data: snippet_chunk.join("\n"),
-          start_line: snippet_start_line + 1
-        }
-
-        # Start a new chunk.
-        snippet_chunk = [lined_content[line_number]]
-        snippet_start_line = line_number
-      end
-
-      last_line = line_number
-    end
-    # Add final chunk to chunk array
-    snippet_chunks << {
-      data: snippet_chunk.join("\n"),
-      start_line: snippet_start_line + 1
-    }
-
-    # Return snippet with chunk array
-    { snippet_object: snippet, snippet_chunks: snippet_chunks }
-  end
-
   def snippet_embed_tag(snippet)
     content_tag(:script, nil, src: gitlab_snippet_url(snippet, format: :js))
   end

app/views/search/_category.html.haml

@@ -24,7 +24,7 @@
       = users
 
     - elsif @show_snippets
-      = search_filter_link 'snippet_titles', _("Titles and Filenames"), search: { snippets: true, group_id: nil, project_id: nil }
+      = search_filter_link 'snippet_titles', _("Titles and Descriptions"), search: { snippets: true, group_id: nil, project_id: nil }
     - else
       = search_filter_link 'projects', _("Projects"), data: { qa_selector: 'projects_tab' }
       = search_filter_link 'issues', _("Issues")

app/views/search/results/_snippet_blob.html.haml

-- snippet_blob = chunk_snippet(snippet_blob, @search_term)
-- snippet = snippet_blob[:snippet_object]
-- snippet_chunks = snippet_blob[:snippet_chunks]
-- snippet_path = gitlab_snippet_path(snippet)
-
-.search-result-row.snippet-row
-  = image_tag avatar_icon_for_user(snippet.author), class: "avatar s40 d-none d-sm-block", alt: ''
-  .title
-    = link_to gitlab_snippet_path(snippet) do
-      = snippet.title
-  .snippet-info
-    = snippet.to_reference
-    ·
-    authored
-    = time_ago_with_tooltip(snippet.created_at)
-    by
-    = link_to user_snippets_path(snippet.author) do
-      = snippet.author_name
-
-  .file-holder.my-2
-    .js-file-title.file-title-flex-parent
-      = link_to snippet_path do
-        %i.fa.fa-file
-        %strong= snippet.file_name
-    - if markup?(snippet.file_name)
-      .file-content.md
-        - snippet_chunks.each do |chunk|
-          - unless chunk[:data].empty?
-            = markup(snippet.file_name, chunk[:data])
-          - else
-            .file-content.code
-              .nothing-here-block= _("Empty file")
-    - else
-      .file-content.code.js-syntax-highlight
-        .line-numbers
-          - snippet_chunks.each do |chunk|
-            - unless chunk[:data].empty?
-              - Gitlab::Git::Util.count_lines(chunk[:data]).times do |index|
-                - offset = defined?(chunk[:start_line]) ? chunk[:start_line] : 1
-                - i = index + offset
-                = link_to snippet_path+"#L#{i}", id: "L#{i}", rel: "#L#{i}", class: "diff-line-num" do
-                  %i.fa.fa-link
-                  = i
-        .blob-content
-          - snippet_chunks.each do |chunk|
-            - unless chunk[:data].empty?
-              = highlight(snippet.file_name, chunk[:data])
-            - else
-              .file-content.code
-                .nothing-here-block= _("Empty file")

changelogs/unreleased/vij-snippet-blob-search-views.yml

+---
+title: Rename Snippet search results title
+merge_request: 29599
+author:
+type: other

locale/gitlab.pot

@@ -18104,11 +18104,6 @@ msgid_plural "SearchResults|snippets"
 msgstr[0] ""
 msgstr[1] ""
 
-msgid "SearchResults|snippet result"
-msgid_plural "SearchResults|snippet results"
-msgstr[0] ""
-msgstr[1] ""
-
 msgid "SearchResults|user"
 msgid_plural "SearchResults|users"
 msgstr[0] ""
@@ -21755,7 +21750,7 @@ msgstr ""
 msgid "Title:"
 msgstr ""
 
-msgid "Titles and Filenames"
+msgid "Titles and Descriptions"
 msgstr ""
 
 msgid "To"

spec/features/snippets/search_snippets_spec.rb

@@ -11,7 +11,7 @@ describe 'Search Snippets' do
     visit dashboard_snippets_path
 
     submit_search('Middle')
-    select_search_scope('Titles and Filenames')
+    select_search_scope('Titles and Descriptions')
 
     expect(page).to have_link(public_snippet.title)
     expect(page).to have_link(private_snippet.title)

spec/helpers/search_helper_spec.rb

@@ -112,7 +112,6 @@ describe SearchHelper do
       'milestones'     | 'milestone'
       'notes'          | 'comment'
       'projects'       | 'project'
-      'snippet_blobs'  | 'snippet result'
       'snippet_titles' | 'snippet'
       'users'          | 'user'
       'wiki_blobs'     | 'wiki result'