Merge branch 'jivanvl-migrate-dropdown-tags-page' into 'master'

Move tags dropdown to gl-dropdown [RUN ALL RSPEC] [RUN AS-IF-FOSS]

See merge request gitlab-org/gitlab!58589

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

+import TagSortDropdown from '~/tags';
 import { initRemoveTag } from '../remove_tag';
 
 initRemoveTag({
@@ -5,3 +6,4 @@ initRemoveTag({
     document.querySelector(`[data-path="${path}"]`).closest('.js-tag-list').remove();
   },
 });
+TagSortDropdown();

app/assets/javascripts/tags/components/sort_dropdown.vue

+<script>
+import { GlDropdown, GlDropdownItem, GlSearchBoxByClick } from '@gitlab/ui';
+import { mergeUrlParams, visitUrl, getParameterValues } from '~/lib/utils/url_utility';
+import { s__ } from '~/locale';
+
+export default {
+  i18n: {
+    searchPlaceholder: s__('TagsPage|Filter by tag name'),
+  },
+  components: {
+    GlDropdown,
+    GlDropdownItem,
+    GlSearchBoxByClick,
+  },
+  inject: ['sortOptions', 'filterTagsPath'],
+  data() {
+    return {
+      selectedKey: 'updated_desc',
+      searchTerm: '',
+    };
+  },
+  computed: {
+    selectedSortMethod() {
+      return this.sortOptions[this.selectedKey];
+    },
+  },
+  created() {
+    const sortValue = getParameterValues('sort');
+    const searchValue = getParameterValues('search');
+
+    if (sortValue.length > 0) {
+      [this.selectedKey] = sortValue;
+    }
+
+    if (searchValue.length > 0) {
+      [this.searchTerm] = searchValue;
+    }
+  },
+  methods: {
+    isSortMethodSelected(sortKey) {
+      return sortKey === this.selectedKey;
+    },
+    visitUrlFromOption(sortKey) {
+      this.selectedKey = sortKey;
+      const urlParams = {};
+
+      urlParams.search = this.searchTerm.length > 0 ? this.searchTerm : null;
+      urlParams.sort = sortKey;
+
+      const newUrl = mergeUrlParams(urlParams, this.filterTagsPath);
+      visitUrl(newUrl);
+    },
+  },
+};
+</script>
+<template>
+  <div class="gl-display-flex gl-pr-3">
+    <gl-search-box-by-click
+      v-model="searchTerm"
+      :placeholder="$options.i18n.searchPlaceholder"
+      class="gl-pr-3"
+      data-testid="tag-search"
+      @submit="visitUrlFromOption(selectedKey)"
+    />
+    <gl-dropdown :text="selectedSortMethod" right data-testid="tags-dropdown">
+      <gl-dropdown-item
+        v-for="(value, key) in sortOptions"
+        :key="key"
+        :is-checked="isSortMethodSelected(key)"
+        is-check-item
+        @click="visitUrlFromOption(key)"
+      >
+        {{ value }}
+      </gl-dropdown-item>
+    </gl-dropdown>
+  </div>
+</template>

app/assets/javascripts/tags/index.js

+import Vue from 'vue';
+import SortDropdown from './components/sort_dropdown.vue';
+
+const mountDropdownApp = (el) => {
+  const { sortOptions, filterTagsPath } = el.dataset;
+
+  return new Vue({
+    el,
+    name: 'SortTagsDropdownApp',
+    components: {
+      SortDropdown,
+    },
+    provide: {
+      sortOptions: JSON.parse(sortOptions),
+      filterTagsPath,
+    },
+    render: (createElement) => createElement(SortDropdown),
+  });
+};
+
+export default () => {
+  const el = document.getElementById('js-tags-sort-dropdown');
+  return el ? mountDropdownApp(el) : null;
+};

app/controllers/projects/tags_controller.rb

@@ -9,6 +9,9 @@ class Projects::TagsController < Projects::ApplicationController
   before_action :require_non_empty_project
   before_action :authorize_download_code!
   before_action :authorize_admin_tag!, only: [:new, :create, :destroy]
+  before_action do
+    push_frontend_feature_flag(:gldropdown_tags, default_enabled: :yaml)
+  end
 
   feature_category :source_code_management, [:index, :show, :new, :destroy]
   feature_category :release_evidence, [:create]

app/views/projects/tags/index.html.haml

@@ -9,6 +9,7 @@
       = s_('TagsPage|Tags give the ability to mark specific points in history as being important')
 
     .nav-controls
+      - unless Gitlab::Ci::Features.gldropdown_tags_enabled?
         = form_tag(filter_tags_path, method: :get) do
           = search_field_tag :search, params[:search], { placeholder: s_('TagsPage|Filter by tag name'), id: 'tag-search', class: 'form-control search-text-input input-short', spellcheck: false }
 
@@ -23,6 +24,8 @@
             - tags_sort_options_hash.each do |value, title|
               %li
                 = link_to title, filter_tags_path(sort: value), class: ("is-active" if @sort == value)
+      - else
+        #js-tags-sort-dropdown{ data: { filter_tags_path: filter_tags_path, sort_options: tags_sort_options_hash.to_json } }
       - if can?(current_user, :admin_tag, @project)
         = link_to new_project_tag_path(@project), class: 'btn gl-button btn-confirm', data: { qa_selector: "new_tag_button" } do
           = s_('TagsPage|New tag')

config/feature_flags/development/gldropdown_tags.yml

+---
+name: gldropdown_tags
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58589
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/327055
+milestone: '13.11'
+type: development
+group: group::continuous integration
+default_enabled: false

lib/gitlab/ci/features.rb

@@ -63,6 +63,10 @@ module Gitlab
       def self.multiple_cache_per_job?
         ::Feature.enabled?(:multiple_cache_per_job, default_enabled: :yaml)
       end
+
+      def self.gldropdown_tags_enabled?
+        ::Feature.enabled?(:gldropdown_tags, default_enabled: :yaml)
+      end
     end
   end
 end

spec/frontend/tags/components/sort_dropdown_spec.js

+import { GlDropdownItem, GlSearchBoxByClick } from '@gitlab/ui';
+import { mount } from '@vue/test-utils';
+import { extendedWrapper } from 'helpers/vue_test_utils_helper';
+import * as urlUtils from '~/lib/utils/url_utility';
+import SortDropdown from '~/tags/components/sort_dropdown.vue';
+
+describe('Tags sort dropdown', () => {
+  let wrapper;
+
+  const createWrapper = (props = {}) => {
+    return extendedWrapper(
+      mount(SortDropdown, {
+        provide: {
+          filterTagsPath: '/root/ci-cd-project-demo/-/tags',
+          sortOptions: {
+            name_asc: 'Name',
+            updated_asc: 'Oldest updated',
+            updated_desc: 'Last updated',
+          },
+          ...props,
+        },
+      }),
+    );
+  };
+
+  const findSearchBox = () => wrapper.findComponent(GlSearchBoxByClick);
+  const findTagsDropdown = () => wrapper.findByTestId('tags-dropdown');
+
+  afterEach(() => {
+    if (wrapper) {
+      wrapper.destroy();
+    }
+  });
+
+  describe('default state', () => {
+    beforeEach(() => {
+      wrapper = createWrapper();
+    });
+
+    it('should have a search box with a placeholder', () => {
+      const searchBox = findSearchBox();
+
+      expect(searchBox.exists()).toBe(true);
+      expect(searchBox.find('input').attributes('placeholder')).toBe('Filter by tag name');
+    });
+
+    it('should have a sort order dropdown', () => {
+      const branchesDropdown = findTagsDropdown();
+
+      expect(branchesDropdown.exists()).toBe(true);
+    });
+  });
+
+  describe('when submitting a search term', () => {
+    beforeEach(() => {
+      urlUtils.visitUrl = jest.fn();
+
+      wrapper = createWrapper();
+    });
+
+    it('should call visitUrl', () => {
+      const searchBox = findSearchBox();
+
+      searchBox.vm.$emit('submit');
+
+      expect(urlUtils.visitUrl).toHaveBeenCalledWith(
+        '/root/ci-cd-project-demo/-/tags?sort=updated_desc',
+      );
+    });
+
+    it('should send a sort parameter', () => {
+      const sortDropdownItems = findTagsDropdown().findAllComponents(GlDropdownItem).at(0);
+
+      sortDropdownItems.vm.$emit('click');
+
+      expect(urlUtils.visitUrl).toHaveBeenCalledWith(
+        '/root/ci-cd-project-demo/-/tags?sort=name_asc',
+      );
+    });
+  });
+});

spec/views/projects/tags/index.html.haml_spec.rb

@@ -21,6 +21,7 @@ RSpec.describe 'projects/tags/index.html.haml' do
   end
 
   it 'defaults sort dropdown toggle to last updated' do
+    stub_feature_flags(gldropdown_tags: false)
     render
     expect(rendered).to have_button('Last updated')
   end