diff --git a/app/assets/javascripts/projects/show.js b/app/assets/javascripts/projects/show.js index 1fef0b09a..9a4d87e13 100644 --- a/app/assets/javascripts/projects/show.js +++ b/app/assets/javascripts/projects/show.js @@ -78,8 +78,12 @@ archived_on_to: archivedOnToFilter }, success: function(data) { - viewContainer.find('.card').remove(); + viewContainer.find('.card, .no-results-container').remove(); + viewContainer.removeClass('no-results'); viewContainer.append(data.cards_html); + if (viewContainer.find('.no-results-container').length) { + viewContainer.addClass('no-results'); + } selectedExperiments.length = 0; updateExperimentsToolbar(); }, diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 429b9a51f..bb5d14f51 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -268,10 +268,10 @@ class ProjectsController < ApplicationController render json: { cards_html: render_to_string( partial: 'projects/show/experiments_list.html.erb', - locals: { cards: overview_service.experiments } + locals: { cards: overview_service.experiments, + filters_included: filters_included? } ) } - end def notifications @@ -351,7 +351,8 @@ class ProjectsController < ApplicationController end def filters_included? - %i(search created_on_from created_on_to members archived_on_from archived_on_to folders_search) + %i(search created_on_from created_on_to updated_on_from updated_on_to members + archived_on_from archived_on_to folders_search) .any? { |param_name| params.dig(param_name).present? } end diff --git a/app/views/projects/show/_experiments_list.html.erb b/app/views/projects/show/_experiments_list.html.erb index 13009eb54..287a865d7 100644 --- a/app/views/projects/show/_experiments_list.html.erb +++ b/app/views/projects/show/_experiments_list.html.erb @@ -1,5 +1,13 @@ -<% cards.each do |card| %> - <% cache [current_user, card] do %> - <%= render partial: 'projects/show/experiment_card', locals: { experiment: card } %> +<% if filters_included && cards.blank? %> +