Merge pull request #929 from ElixirTeSS/source-improvements

Source improvements & fixes
ElixirTeSS · Feb 28, 2024 · e874ee1 · e874ee1
2 parents 39dbca7 + cb6d5da
commit e874ee1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/app/models/source.rb b/app/models/source.rb
@@ -1,6 +1,7 @@
 class Source < ApplicationRecord
   include LogParameterChanges
   include HasTestJob
+  include HasAssociatedNodes
 
   APPROVAL_STATUS = {
     0 => :not_approved,
@@ -43,6 +44,9 @@ class Source < ApplicationRecord
       string :content_provider do
         self.content_provider.try(:title)
       end
+      string :node, multiple: true do
+        associated_nodes.pluck(:name)
+      end
       string :approval_status do
         I18n.t("sources.approval_status.#{approval_status}")
       end
@@ -66,7 +70,9 @@ def ingestor_class
   end
 
   def self.facet_fields
-    %w( content_provider method enabled approval_status )
+    field_list = %w( content_provider node method enabled approval_status )
+    field_list.delete('node') unless TeSS::Config.feature['nodes']
+    field_list
   end
 
   def self.check_exists(source_params)

diff --git a/app/views/bioschemas/_preview_button.html.erb b/app/views/bioschemas/_preview_button.html.erb
@@ -9,5 +9,5 @@
     <% end %>
   </div>
 
-  <%= f.submit('Preview', class: 'btn btn-primary', formtarget: '_blank') %>
+  <%= f.submit('Preview', class: 'btn btn-primary', formtarget: '_blank', data: { disable_with: false }) %>
 <% end %>
diff --git a/app/views/sources/index.html.erb b/app/views/sources/index.html.erb
@@ -19,6 +19,7 @@
     <hr>
     <%= render partial: 'common/masonry_grid', locals: { objects: @sources } %>
 
+    <%= render partial: "search/common/pagination_bar", locals: { resources: @sources } %>
   </div>
 
 </div>
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,6 +19,7 @@ @@
         <hr>
         <%= render partial: 'common/masonry_grid', locals: { objects: @sources } %>
+        <%= render partial: "search/common/pagination_bar", locals: { resources: @sources } %>
       </div>
     </div>