Revert filter dropdown changes to be consistent with GitLab Core

app/views/dashboard/todos/index.html.haml

@@ -31,7 +31,31 @@
   .todos-filters
     .row-content-block.second-block
       = form_tag todos_filter_path(without: [:project_id, :author_id, :type, :action_id]), method: :get, class: 'filter-form' do
-        = render_if_exists 'shared/dashboard/todo_filter_dropdowns'
+        .filter-item.inline
+          - if params[:group_id].present?
+            = hidden_field_tag(:group_id, params[:group_id])
+          = dropdown_tag(group_dropdown_label(params[:group_id], 'Group'), options: { toggle_class: 'js-group-search js-filter-submit', title: 'Filter by group', filter: true, filterInput: 'input#group-search', dropdown_class: 'dropdown-menu-selectable dropdown-menu-group js-filter-submit',
+            placeholder: 'Search groups', data: { data: todo_group_options, default_label: 'Group', display: 'static' } })
+        .filter-item.inline
+          - if params[:project_id].present?
+            = hidden_field_tag(:project_id, params[:project_id])
+          = dropdown_tag(project_dropdown_label(params[:project_id], 'Project'), options: { toggle_class: 'js-project-search js-filter-submit', title: 'Filter by project', filter: true, filterInput: 'input#project-search', dropdown_class: 'dropdown-menu-selectable dropdown-menu-project js-filter-submit',
+            placeholder: 'Search projects', data: { data: todo_projects_options, default_label: 'Project', display: 'static' } })
+        .filter-item.inline
+          - if params[:author_id].present?
+            = hidden_field_tag(:author_id, params[:author_id])
+          = dropdown_tag(user_dropdown_label(params[:author_id], 'Author'), options: { toggle_class: 'js-user-search js-filter-submit js-author-search', title: 'Filter by author', filter: true, filterInput: 'input#author-search', dropdown_class: 'dropdown-menu-user dropdown-menu-selectable dropdown-menu-author js-filter-submit',
+            placeholder: 'Search authors', data: { any_user: 'Any Author', first_user: (current_user.username if current_user), project_id: (@project.id if @project), selected: params[:author_id], field_name: 'author_id', default_label: 'Author', todo_filter: true, todo_state_filter: params[:state] || 'pending' } })
+        .filter-item.inline
+          - if params[:type].present?
+            = hidden_field_tag(:type, params[:type])
+          = dropdown_tag(todo_types_dropdown_label(params[:type], 'Type'), options: { toggle_class: 'js-type-search js-filter-submit', dropdown_class: 'dropdown-menu-selectable dropdown-menu-type js-filter-submit',
+            data: { data: todo_types_options, default_label: 'Type' } })
+        .filter-item.inline.actions-filter
+          - if params[:action_id].present?
+            = hidden_field_tag(:action_id, params[:action_id])
+          = dropdown_tag(todo_actions_dropdown_label(params[:action_id], 'Action'), options: { toggle_class: 'js-action-search js-filter-submit', dropdown_class: 'dropdown-menu-selectable dropdown-menu-action js-filter-submit',
+            data: { data: todo_actions_options, default_label: 'Action' } })
         .filter-item.sort-filter
           .dropdown
             %button.dropdown-menu-toggle.dropdown-menu-toggle-sort{ type: 'button', 'data-toggle' => 'dropdown' }

app/views/shared/dashboard/_todo_filter_actions_dropdown.html.haml

-.filter-item.inline.actions-filter
-  - if params[:action_id].present?
-    = hidden_field_tag(:action_id, params[:action_id])
-  = dropdown_tag(todo_actions_dropdown_label(params[:action_id], 'Action'), options: { toggle_class: 'js-action-search js-filter-submit', dropdown_class: 'dropdown-menu-selectable dropdown-menu-action js-filter-submit',
-    data: { data: todo_actions_options, default_label: 'Action' } })

app/views/shared/dashboard/_todo_filter_dropdowns.html.haml

-= render 'shared/dashboard/todo_filter_project_dropdown'
-= render 'shared/dashboard/todo_filter_user_dropdown'
-= render 'shared/dashboard/todo_filter_types_dropdown'
-= render 'shared/dashboard/todo_filter_actions_dropdown'

app/views/shared/dashboard/_todo_filter_project_dropdown.html.haml

-.filter-item.inline
-  - if params[:project_id].present?
-    = hidden_field_tag(:project_id, params[:project_id])
-  = dropdown_tag(project_dropdown_label(params[:project_id], 'Project'), options: { toggle_class: 'js-project-search js-filter-submit', title: 'Filter by project', filter: true, filterInput: 'input#project-search', dropdown_class: 'dropdown-menu-selectable dropdown-menu-project js-filter-submit',
-    placeholder: 'Search projects', data: { data: todo_projects_options, default_label: 'Project', display: 'static' } })

app/views/shared/dashboard/_todo_filter_types_dropdown.html.haml

-.filter-item.inline
-  - if params[:type].present?
-    = hidden_field_tag(:type, params[:type])
-  = dropdown_tag(todo_types_dropdown_label(params[:type], 'Type'), options: { toggle_class: 'js-type-search js-filter-submit', dropdown_class: 'dropdown-menu-selectable dropdown-menu-type js-filter-submit',
-    data: { data: todo_types_options, default_label: 'Type' } })

app/views/shared/dashboard/_todo_filter_user_dropdown.html.haml

-.filter-item.inline
-  - if params[:author_id].present?
-    = hidden_field_tag(:author_id, params[:author_id])
-  = dropdown_tag(user_dropdown_label(params[:author_id], 'Author'), options: { toggle_class: 'js-user-search js-filter-submit js-author-search', title: 'Filter by author', filter: true, filterInput: 'input#author-search', dropdown_class: 'dropdown-menu-user dropdown-menu-selectable dropdown-menu-author js-filter-submit',
-    placeholder: 'Search authors', data: { any_user: 'Any Author', first_user: (current_user.username if current_user), project_id: (@project.id if @project), selected: params[:author_id], field_name: 'author_id', default_label: 'Author', todo_filter: true, todo_state_filter: params[:state] || 'pending' } })

ee/app/views/shared/dashboard/_todo_filter_dropdowns.html.haml

-= render 'shared/dashboard/todo_filter_group_dropdown'
-= render 'shared/dashboard/todo_filter_project_dropdown'
-= render 'shared/dashboard/todo_filter_user_dropdown'
-= render 'shared/dashboard/todo_filter_types_dropdown'
-= render 'shared/dashboard/todo_filter_actions_dropdown'

ee/app/views/shared/dashboard/_todo_filter_group_dropdown.html.haml

-.filter-item.inline
-  - if params[:group_id].present?
-    = hidden_field_tag(:group_id, params[:group_id])
-  = dropdown_tag(group_dropdown_label(params[:group_id], 'Group'), options: { toggle_class: 'js-group-search js-filter-submit', title: 'Filter by group', filter: true, filterInput: 'input#group-search', dropdown_class: 'dropdown-menu-selectable dropdown-menu-group js-filter-submit',
-    placeholder: 'Search groups', data: { data: todo_group_options, default_label: 'Group', display: 'static' } })