Adding 'is_searchable' status for tables which should be full-text searchable.

diff --git a/services/api/app/models/arvados_model.rb b/services/api/app/models/arvados_model.rb
index 4f2aa72161ef903f638cb4e62d4996d774c3e415..5cbfd58bd032a5dff12d8944d10b728505c52ab9 100644 (file)
--- a/services/api/app/models/arvados_model.rb
+++ b/services/api/app/models/arvados_model.rb
@@ -45,6 +45,13 @@ class ArvadosModel < ActiveRecord::Base
     end.compact
   end
 
+  # is_searchable returns 'true' if a model is subject to full-text
+  # search through the workbench.  Models which are searchable should
+  # return true.
+  def is_searchable
+    false
+  end
+
   def eager_load_associations
     self.class.columns.each do |col|
       re = col.name.match /^(.*)_kind$/

diff --git a/services/api/app/models/collection.rb b/services/api/app/models/collection.rb
index 03e5e4ef44c32948e3f923ad3b849f0d71e28c8e..c6ecee38fd36b16a18d958e98cb3f3c5894eed47 100644 (file)
--- a/services/api/app/models/collection.rb
+++ b/services/api/app/models/collection.rb
@@ -8,6 +8,10 @@ class Collection < ArvadosModel
     t.add :files
   end
 
+  def is_searchable
+    true
+  end
+
   def redundancy_status
     if redundancy_confirmed_as.nil?
       'unconfirmed'

diff --git a/services/api/app/models/group.rb b/services/api/app/models/group.rb
index 9666257ea4875d4bb62d13528bb132c57a51bd14..7a1c9fbb97f5ad994decb52c9adeb919951c0b76 100644 (file)
--- a/services/api/app/models/group.rb
+++ b/services/api/app/models/group.rb
@@ -7,4 +7,8 @@ class Group < ArvadosModel
     t.add :name
     t.add :description
   end
+
+  def is_searchable
+    true
+  end
 end

diff --git a/services/api/app/models/human.rb b/services/api/app/models/human.rb
index 3717f81c8f20faf5c2a867f9e3fc7a30b069d0d8..a87a041cf19bb1a31036378db3ced2bdf3ddce07 100644 (file)
--- a/services/api/app/models/human.rb
+++ b/services/api/app/models/human.rb
@@ -7,4 +7,8 @@ class Human < ArvadosModel
   api_accessible :user, extend: :common do |t|
     t.add :properties
   end
+
+  def is_searchable
+    true
+  end
 end

diff --git a/services/api/app/models/job.rb b/services/api/app/models/job.rb
index f32f001f90b39f3fa311129e2704603c137c3667..7c06142559fda07da45ada343982afbd7b976d0a 100644 (file)
--- a/services/api/app/models/job.rb
+++ b/services/api/app/models/job.rb
@@ -38,6 +38,10 @@ class Job < ArvadosModel
     t.add :log_buffer
   end
 
+  def is_searchable
+    true
+  end
+
   def assert_finished
     update_attributes(finished_at: finished_at || Time.now,
                       success: success.nil? ? false : success,

diff --git a/services/api/app/models/job_task.rb b/services/api/app/models/job_task.rb
index 7d568e952a6c20eb69781708db5d0627bab11080..03310cc88bc6193d8a2b55b50ca63d6b0260c76e 100644 (file)
--- a/services/api/app/models/job_task.rb
+++ b/services/api/app/models/job_task.rb
@@ -17,6 +17,10 @@ class JobTask < ArvadosModel
     t.add :success
   end
 
+  def is_searchable
+    true
+  end
+
   protected
 
   def delete_created_job_tasks_if_failed

diff --git a/services/api/app/models/link.rb b/services/api/app/models/link.rb
index 1d4e13d18618eddb14a98aac80aa60f591b5c58a..3c701bf58fa00e015b7816f1ab8eeb2e28ddd1d0 100644 (file)
--- a/services/api/app/models/link.rb
+++ b/services/api/app/models/link.rb
@@ -29,6 +29,10 @@ class Link < ArvadosModel
     super
   end
 
+  def is_searchable
+    true
+  end
+
   protected
 
   def permission_to_attach_to_objects

diff --git a/services/api/app/models/log.rb b/services/api/app/models/log.rb
index 29efc9dc1136427e471d63ce3aedd0caaf58d193..3e523959dff4819b0da3865d084ad2ab168c5495 100644 (file)
--- a/services/api/app/models/log.rb
+++ b/services/api/app/models/log.rb
@@ -16,6 +16,10 @@ class Log < ArvadosModel
     t.add :info
   end
 
+  def is_searchable
+    true
+  end
+
   protected
 
   def set_default_event_at

diff --git a/services/api/app/models/pipeline_instance.rb b/services/api/app/models/pipeline_instance.rb
index 43497da6f4b4e133865e0492b57e73ce918d2c77..5df8756197c5d6ff9ef625a5f39dabda392fde7f 100644 (file)
--- a/services/api/app/models/pipeline_instance.rb
+++ b/services/api/app/models/pipeline_instance.rb
@@ -21,6 +21,10 @@ class PipelineInstance < ArvadosModel
     t.add :properties
   end
 
+  def is_searchable
+    true
+  end
+
   def dependencies
     dependency_search(self.components).keys
   end

diff --git a/services/api/app/models/specimen.rb b/services/api/app/models/specimen.rb
index bcfcd7a5f2be49f5de232c6b076e17c38a0744bf..37de071519e6a46a4399593472e907eb54606b0d 100644 (file)
--- a/services/api/app/models/specimen.rb
+++ b/services/api/app/models/specimen.rb
@@ -9,6 +9,10 @@ class Specimen < ArvadosModel
     t.add :properties
   end
 
+  def is_searchable
+    true
+  end
+
   def properties
     @properties ||= Hash.new
     super

diff --git a/services/api/app/models/trait.rb b/services/api/app/models/trait.rb
index 85ab2368a837182cab81ec3db4ede5b166464519..ff3db80e25e264999e3505cd49b0cfa6cf7652fc 100644 (file)
--- a/services/api/app/models/trait.rb
+++ b/services/api/app/models/trait.rb
@@ -8,4 +8,8 @@ class Trait < ArvadosModel
     t.add :name
     t.add :properties
   end
+
+  def is_searchable
+    true
+  end
 end