fix remove mb class, add highlighting on search

phac-nml · Oct 31, 2024 · b01a2cb · b01a2cb
1 parent 5e9bec3
commit b01a2cb
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 7 deletions.
diff --git a/app/components/workflow_executions/table_component.html.erb b/app/components/workflow_executions/table_component.html.erb
@@ -97,13 +97,21 @@
                 <% end %>
                 <% if column == :id %>
                   <%= link_to(
-                    workflow_execution.id,
                     individual_path(workflow_execution),
                     data: {
                       turbo: false,
                     },
                     class: "text-slate-900 dark:text-slate-100 font-semibold hover:underline",
-                  ) %>
+                  ) do %>
+                    <span class="font-semibold">
+                      <%= highlight(
+                        workflow_execution.id,
+                        defined?(@search_params[:name_or_id_cont]) &&
+                          @search_params[:name_or_id_cont],
+                        highlighter: '<mark class="bg-primary-300 dark:bg-primary-600">\1</mark>',
+                      ) %>
+                    </span>
+                  <% end %>
                 <% elsif column == :state %>
                   <%= viral_pill(
                     text: t(:"workflow_executions.state.#{workflow_execution[column]}"),
@@ -118,6 +126,15 @@
                   <% if workflow_execution[column].present? %>
                     <%= helpers.local_time_ago(workflow_execution[column]) %>
                   <% end %>
+                <% elsif column == :name %>
+                  <span class="font-semibold">
+                    <%= highlight(
+                      workflow_execution.name,
+                      defined?(@search_params[:name_or_id_cont]) &&
+                        @search_params[:name_or_id_cont],
+                      highlighter: '<mark class="bg-primary-300 dark:bg-primary-600">\1</mark>',
+                    ) %>
+                    </span>
                 <% else %>
                   <%= workflow_execution[column.to_sym] %>
                 <% end %>

diff --git a/app/components/workflow_executions/table_component.rb b/app/components/workflow_executions/table_component.rb
@@ -14,6 +14,7 @@ def initialize(
       q,
       namespace: nil,
       row_actions: false,
+      search_params: nil,
       abilities: {},
       empty: {},
       **system_arguments
@@ -23,6 +24,7 @@ def initialize(
       @q = q
       @namespace = namespace
       @abilities = abilities
+      @search_params = search_params
       @row_actions = row_actions
       @empty = empty
       @renders_row_actions = @row_actions.select { |_key, value| value }.count.positive?

diff --git a/app/controllers/concerns/workflow_execution_actions.rb b/app/controllers/concerns/workflow_execution_actions.rb
@@ -16,6 +16,8 @@ def index
     authorize! @namespace, to: :view_workflow_executions? unless @namespace.nil?
 
     @q = load_workflows.ransack(params[:q])
+    @search_params = search_params
+
     set_default_sort
     @pagy, @workflow_executions = pagy_with_metadata_sort(@q.result)
   end
@@ -153,4 +155,10 @@ def format_attachment(samplesheet)
     end
     attachments
   end
+
+  def search_params
+    search_params = {}
+    search_params[:name_or_id_cont] = params.dig(:q, :name_or_id_cont)
+    search_params
+  end
 end
diff --git a/app/controllers/projects/samples_controller.rb b/app/controllers/projects/samples_controller.rb
@@ -151,7 +151,8 @@ def process_samples
 
     def search_params
       updated_params = update_store(search_key, params[:q].present? ? params[:q].to_unsafe_h : {})
-
+      puts 'hihihihi'
+      puts updated_params
       if updated_params[:metadata].to_i.zero? && updated_params[:s].present? && updated_params[:s].match?(/metadata_/)
         updated_params[:s] = default_sort
         update_store(search_key, updated_params)

diff --git a/app/views/projects/workflow_executions/_table.html.erb b/app/views/projects/workflow_executions/_table.html.erb
@@ -4,6 +4,7 @@
   pagy,
   q,
   namespace: namespace,
+  search_params: @search_params,
   abilities: {
     select_workflow_executions: allowed_to?(:export_data?, namespace)
   },

diff --git a/app/views/projects/workflow_executions/index.html.erb b/app/views/projects/workflow_executions/index.html.erb
@@ -28,7 +28,7 @@
 <div class="flow-root">
   <div class="flex mb-2">
   <% if allowed_to?(:export_data?, @project.namespace) %>
-    <div class="inline-flex grow space-x-2 mb-4">
+    <div class="inline-flex grow space-x-2">
       <%= search_form_for(
                 @q,
                 url: select_namespace_project_workflow_executions_url(**request.query_parameters),
@@ -62,11 +62,10 @@
     </div>
   </div>
 </div>
-
 <%= render partial: "table",
 locals: {
   workflow_executions: @workflow_executions,
   pagy: @pagy,
   q: @q,
-  namespace: @namespace,
+  namespace: @namespace
 } %>
diff --git a/app/views/workflow_executions/_table.html.erb b/app/views/workflow_executions/_table.html.erb
@@ -3,6 +3,7 @@
   workflow_executions,
   pagy,
   q,
+  search_params: @search_params,
   abilities: {
     select_workflow_executions: true
   },

diff --git a/app/views/workflow_executions/index.html.erb b/app/views/workflow_executions/index.html.erb
@@ -60,5 +60,5 @@
 locals: {
   workflow_executions: @workflow_executions,
   pagy: @pagy,
-  q: @q,
+  q: @q
 } %>