Merge branch 'master' into ingestion_filters

Author: eilmiv

app/assets/javascripts/application.js

@@ -17,7 +17,6 @@
 //= require bootstrap-tab-history
 //= require cytoscape
 //= require cytoscape-panzoom
-//= require jscolor
 //= require jquery.simplecolorpicker.js
 //= require split
 //= require handlebars.runtime
@@ -41,36 +40,41 @@
 //= require ol
 //= require ol-geocoder
 
-function redirect_to_sort_url(){
-    url = new URL(window.location.href);
-    url.searchParams.set(
-        "sort",
-        $("#sort").find(":selected").val()
-    );
-    window.location.replace(url.toString());
-}
-
-function redirect_with_updated_search(param, paramVal) {
-    url = new URL(window.location.href);
-    // special case for empty range types
-    if (param == 'start' && paramVal == '/') {
-        url.searchParams.delete(param);
-    } else {
-        url.searchParams.set(param, paramVal);
-    }
-    window.location.replace(url.toString());
-}
+const Index = {
+    applySorting: function () {
+        Index.setParam("sort", $("#sort").val());
+    },
 
-function reposition_tiles(container, tileClass){
-    var $container = $("." + container);
+    applyPerPage: function () {
+        Index.setParam("per_page", $("#per_page").val());
+    },
 
-    $container.imagesLoaded(function () {
-        $container.masonry({
-            // options...
-            itemSelector: "." + tileClass,
-            columnWidth: 20
+    applyDateParam: function (param, value) {
+        const url = new URL(window.location.href);
+        if (param === 'start' && value === '/') {
+            url.searchParams.delete(param);
+        } else {
+            url.searchParams.set(param, value);
+        }
+        window.location.replace(url.toString());
+    },
+
+    setParam: function (param, value) {
+        const url = new URL(window.location.href);
+        url.searchParams.set(param, value);
+        window.location.replace(url.toString());
+    },
+
+    repositionTiles(containerSelector, itemSelector) {
+        const container = $(containerSelector);
+        container.imagesLoaded(function () {
+            container.masonry({
+                // options...
+                itemSelector: itemSelector,
+                columnWidth: 20
+            });
         });
-    });
+    }
 }
 
 // Perform an ajax request to load the calendar and replace the contents
@@ -152,7 +156,7 @@ document.addEventListener("turbolinks:load", function(e) {
     $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) {
         addTabToFilters(e.target.href.split('#').pop());
         // and reposition masonry tiles
-        reposition_tiles('masonry', 'masonry-brick');
+        Index.repositionTiles('.masonry', '.masonry-brick');
     });
 
     // Manually trigger bootstrap tab history (we should probably remove the dependency and reimplement in a turbolink-compatible way)
@@ -168,12 +172,14 @@ document.addEventListener("turbolinks:load", function(e) {
 
     // Masonry
     $(".nav-tabs a").on("shown.bs.tab", function(e) {
-        reposition_tiles('masonry', 'masonry-brick');
+        Index.repositionTiles('.masonry', '.masonry-brick');
     });
+
     $(window).on("orientationchange", function() {
-        reposition_tiles("masonry", "masonry-brick");
+        Index.repositionTiles('.masonry', '.masonry-brick');
     });
-    reposition_tiles("masonry", "masonry-brick");
+
+    Index.repositionTiles('.masonry', '.masonry-brick');
 
     new Clipboard(".clipboard-btn");
 

app/assets/javascripts/workflows.js

@@ -192,9 +192,9 @@ var Workflows = {
             $('#node-modal-form-title').val(data.name);
             $('#node-modal-form-description').val(data.description);
             if (data.color) {
-                $('#node-modal-form-colour')[0].jscolor.fromString(data.color);
+                $('#node-modal-form-colour').val(data.color);
             } else if (data.parent) {
-                $('#node-modal-form-colour')[0].jscolor.fromString(cy.$('#' + data.parent).data('color'));
+                $('#node-modal-form-colour').val(cy.$('#' + data.parent).data('color'));
             }
             $('#node-modal-form-parent-id').val(data.parent);
             $('#node-modal-form-x').val(position.x);
@@ -211,7 +211,7 @@ var Workflows = {
                     description: $('#node-modal-form-description').val(),
                     html_description: MarkdownIt.render($('#node-modal-form-description').val()),
                     color: $('#node-modal-form-colour').val(),
-                    font_color: $('#node-modal-form-colour').css("color"),
+                    font_color: Workflows.getTextColor($('#node-modal-form-colour').val()),
                     parent: $('#node-modal-form-parent-id').val(),
                     associatedResources: Workflows.associatedResources.fetch(),
                     ontologyTerms: Workflows.ontologyTerms.fetch()
@@ -470,6 +470,21 @@ var Workflows = {
                 );
             }
         }
+    },
+    getTextColor: function (hex) {
+        // Remove the leading '#', if present
+        hex = hex.replace('#', '');
+
+        // Parse r, g, b values
+        const r = parseInt(hex.substring(0, 2), 16);
+        const g = parseInt(hex.substring(2, 4), 16);
+        const b = parseInt(hex.substring(4, 6), 16);
+
+        // Calculate perceived brightness (luminance)
+        const brightness = (0.299 * r) + (0.587 * g) + (0.114 * b);
+
+        // Threshold of ~186 is a common practical cutoff
+        return brightness > 186 ? '#000000' : '#FFFFFF';
     }
 };
 
@@ -621,7 +636,6 @@ document.addEventListener("turbolinks:load", function() {
             // Initialize
             Workflows.cancelState();
             Workflows.history.initialize();
-            jscolor.installByClassName('jscolor');
         } else {
             // Hiding/revealing of child nodes
             if(hideChildNodes) {

app/assets/stylesheets/application.scss

@@ -419,10 +419,21 @@ ul.unstyled {
 }
 
 .search-results-count {
-  margin-right: 5px;
+  margin-right: 1em;
   display: inline-block
 }
 
+.search-results-per-page {
+  display: inline-block;
+
+  select {
+    border: none;
+    padding: 0;
+    background: transparent;
+    border-bottom: 1px dashed $text-color;
+  }
+}
+
 .index-display-options {
   margin: 5px 0;
 }

app/assets/stylesheets/showcase.scss

@@ -24,4 +24,11 @@
 
 #main-container.showcase-container {
   max-width: 1720px;
-}
+}
+
+.icon-grid {
+  display: flex;
+  gap: 10px;
+  flex-wrap: wrap;
+  margin-bottom: 1em;
+}

app/controllers/application_controller.rb

@@ -96,7 +96,13 @@ def job_status
 
   private
 
-  def feature_enabled?(feature = controller_name)
+  def feature_enabled?(feature)
+    Space.current_space.feature_enabled?(feature)
+  end
+
+  helper_method :feature_enabled?
+
+  def ensure_feature_enabled(feature = controller_name)
     if TeSS::Config.feature.key?(feature) && !TeSS::Config.feature[feature]
       raise ActionController::RoutingError.new('Feature not enabled')
     end

app/controllers/bioschemas_controller.rb

@@ -1,5 +1,5 @@
 class BioschemasController < ApplicationController
-  before_action -> { feature_enabled?('bioschemas_testing') }
+  before_action -> { ensure_feature_enabled('bioschemas_testing') }
 
   def test
 

app/controllers/collections_controller.rb

@@ -1,6 +1,6 @@
 # The controller for actions related to the Collection model
 class CollectionsController < ApplicationController
-  before_action :feature_enabled?
+  before_action :ensure_feature_enabled
   before_action :set_collection, only: %i[show edit curate update_curation add_item remove_item update destroy]
   before_action :set_breadcrumbs
 

app/controllers/communities_controller.rb

@@ -8,9 +8,9 @@ def show
     @resources = []
     if TeSS::Config.solr_enabled
       enabled = []
-      enabled.append(Event) if TeSS::Config.feature['events']
-      enabled.append(Material) if TeSS::Config.feature['materials']
-      enabled.append(Collection) if TeSS::Config.feature['collections']
+      enabled.append(Event) if feature_enabled?('events')
+      enabled.append(Material) if feature_enabled?('materials')
+      enabled.append(Collection) if feature_enabled?('collections')
       enabled.each do |resource|
         @resources += resource.search_and_filter(nil, '', { 'max_age' => '1 month' },
                                                  sort_by: 'new', per_page: 5).results

app/controllers/concerns/searchable_index.rb

@@ -1,5 +1,8 @@
 # The concern for searchable index
 module SearchableIndex
+  DEFAULT_PAGE_SIZE = 10
+  PER_PAGE_OPTIONS = [10, 20, 50, 100]
+
   extend ActiveSupport::Concern
 
   included do
@@ -19,7 +22,7 @@ def count
   def fetch_resources
     if TeSS::Config.solr_enabled
       page = page_param.blank? ? 1 : page_param.to_i
-      per_page = per_page_param.blank? ? 10 : per_page_param.to_i
+      per_page = per_page_param.blank? ? DEFAULT_PAGE_SIZE : per_page_param.to_i
 
       @search_results = @model.search_and_filter(current_user, @search_params, @facet_params,
                                     page: page, per_page: per_page, sort_by: @sort_by)

app/controllers/content_providers_controller.rb

@@ -1,6 +1,6 @@
 # The controller for actions related to the Content Providers model
 class ContentProvidersController < ApplicationController
-  before_action -> { feature_enabled?('content_providers') }
+  before_action :ensure_feature_enabled
   before_action :set_content_provider, only: %i[show edit update destroy]
   before_action :set_breadcrumbs