diff --git a/app/assets/javascripts/search-and-sort.js b/app/assets/javascripts/search-and-sort.js deleted file mode 100644 index 88a043b322..0000000000 --- a/app/assets/javascripts/search-and-sort.js +++ /dev/null @@ -1,40 +0,0 @@ -$(document).ready(function() { - var debounce = (function() { - var timer; - timer = 0; - return function(callback, ms) { - if (timer) { - clearTimeout(timer); - } - timer = setTimeout(callback, ms); - }; - })(); - - $("#js-search-and-sort-component #search-query-field").on("keyup", function(e) { - var componentContext = $(e.target).closest("#js-search-and-sort-component"); - var $searchForm = componentContext.find("#search-form"); - var $sortMenu = componentContext.find(".select-menu") - - var query = $searchForm.find("#search-query-field").val(); - var currentLinks = $sortMenu[0].getOptionLinks(); - var newLinks = currentLinks.map(function(link) { - var url = new URL(link); - var urlParams = new URLSearchParams(url.search.slice(1)); - urlParams.set("query", query); - - return url.pathname + "?" + urlParams.toString(); - }); - $sortMenu[0].setOptionLinks(newLinks); - - formData = $searchForm.find('input[name!=utf8]').serialize(); - history.replaceState(null, '', '?' + formData); - debounce(function() { $searchForm.submit(); }, 300); - }); - - $("#js-search-and-sort-component .select-menu").on("select", function(e) { - var selectedItem = $(e.target); - var componentContext = selectedItem.closest("#js-search-and-sort-component"); - - componentContext.find("#sort-mode-field").val($.trim(selectedItem.text())); - }); -}); diff --git a/app/controllers/assignments_controller.rb b/app/controllers/assignments_controller.rb index 35f24e1a01..829df8b645 100644 --- a/app/controllers/assignments_controller.rb +++ b/app/controllers/assignments_controller.rb @@ -144,13 +144,6 @@ def set_filter_options @current_sort_mode = params[:sort_by] || @assignment_sort_modes.keys.first @query = params[:query] - - @assignment_sort_modes_links = @assignment_sort_modes.keys.map do |mode| - organization_assignment_path( - sort_by: mode, - query: @query - ) - end end def deadline_param diff --git a/app/controllers/group_assignments_controller.rb b/app/controllers/group_assignments_controller.rb index aa89906c0e..3fec7d60c0 100644 --- a/app/controllers/group_assignments_controller.rb +++ b/app/controllers/group_assignments_controller.rb @@ -159,15 +159,6 @@ def set_filter_options @current_sort_mode = params[:sort_by] || @assignment_sort_modes.keys.first @query = params[:query] - - @assignment_sort_modes_links = @assignment_sort_modes.keys.map do |mode| - organization_group_assignment_path( - sort_by: mode, - query: @query - ) - end - - @current_sort_mode = params[:sort_by] || @assignment_sort_modes.keys.first end def set_pagination_key diff --git a/app/views/assignments/_filterable_assignment_roster_list.html.erb b/app/views/assignments/_filterable_assignment_roster_list.html.erb index 240ed0ecd2..d1f7f284cd 100644 --- a/app/views/assignments/_filterable_assignment_roster_list.html.erb +++ b/app/views/assignments/_filterable_assignment_roster_list.html.erb @@ -11,7 +11,6 @@ search_placeholder: placeholder, query: @query, options: @assignment_sort_modes.keys, - option_links: @assignment_sort_modes_links, selected_option: @current_sort_mode } %> diff --git a/app/views/group_assignments/_filterable_group_assignment_repo_list.html.erb b/app/views/group_assignments/_filterable_group_assignment_repo_list.html.erb index 83eca65ce9..f8a02e4c1a 100644 --- a/app/views/group_assignments/_filterable_group_assignment_repo_list.html.erb +++ b/app/views/group_assignments/_filterable_group_assignment_repo_list.html.erb @@ -4,7 +4,6 @@ search_placeholder: "Search group assignments by team name...", query: @query, options: @assignment_sort_modes.keys, - option_links: @assignment_sort_modes_links, selected_option: @current_sort_mode } %> diff --git a/app/views/organizations/_organization_filters.html.erb b/app/views/organizations/_organization_filters.html.erb index caa6a1c8da..b2d608dff1 100644 --- a/app/views/organizations/_organization_filters.html.erb +++ b/app/views/organizations/_organization_filters.html.erb @@ -1,12 +1,7 @@ <% submit_url = local_assigns.fetch(:submit_url) %> <% query = local_assigns.fetch(:query, nil) %> -<% search_placeholder = local_assigns.fetch(:search_placeholder, "Search...") %> -<% sort_menu_title = local_assigns.fetch(:sort_menu_title, "Sort by:") %> -<% view_menu_title = local_assigns.fetch(:view_menu_title, "View:") %> <% sort_options = local_assigns.fetch(:sort_options, []) %> <% view_options = local_assigns.fetch(:view_options, []) %> -<% sort_option_links = local_assigns.fetch(:sort_option_links, []) %> -<% view_option_links = local_assigns.fetch(:view_option_links, []) %> <% active_sort_option = local_assigns.fetch(:active_sort_option, sort_options.first) %> <% active_view_option = local_assigns.fetch(:active_view_option, view_options.first) %> diff --git a/app/views/shared/_search_and_sort.html.erb b/app/views/shared/_search_and_sort.html.erb index a080162c23..2bdac94fb6 100644 --- a/app/views/shared/_search_and_sort.html.erb +++ b/app/views/shared/_search_and_sort.html.erb @@ -1,29 +1,46 @@ <% submit_url = local_assigns.fetch(:submit_url) %> <% query = local_assigns.fetch(:query, nil) %> <% search_placeholder = local_assigns.fetch(:search_placeholder, "Search...") %> -<% select_menu_title = local_assigns.fetch(:select_menu_title, "Sort by:") %> -<% options = local_assigns.fetch(:options, []) %> -<% option_links = local_assigns.fetch(:option_links, []) %> +<% title = local_assigns.fetch(:select_menu_title, "Sort by:") %> <% selected_option = local_assigns.fetch(:selected_option, options.first) %> +<% options = local_assigns.fetch(:options, []) %> -
-
- <%= form_tag submit_url, id: "search-form", method: :get, remote: true do %> - <%= text_field_tag :query, query, class: "input-block form-control", placeholder: search_placeholder, autofocus: true, autocomplete: :off, id: "search-query-field" %> - <%= hidden_field_tag :sort_by, @current_sort_mode, id: "sort-mode-field" %> - <% end %> +<%= form_tag submit_url, method: :get, remote: :true, role: "search", id: "js-filtering-form", class: "d-block d-sm-flex" do %> +
+
-
-
- <%= render partial: "shared/select_menu", - locals: { - title: select_menu_title, - options: options, - option_links: option_links, - selected_option: selected_option, - remote: true - } - %> -
+ +
+
+ + <%= title %> + + <%= selected_option %> + + + + + +
+
+ Sort by: + +
+
+ <% options.each do |name, value| %> + + <% end %> +
+
+ +
-
+<% end %>