Loading collections for a PrefLabel now removes non-unique collection…

…s from the result.
innoq · Oct 17, 2023 · bb00450 · bb00450
1 parent 22b3cdc
commit bb00450
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/app/controllers/collections_controller.rb b/app/controllers/collections_controller.rb
@@ -33,7 +33,12 @@ def index
       end
       format.json do # For the widget and treeview
         response = if params[:root].present?
-          collections = Iqvoc::Collection.base_class.with_pref_labels.published.by_parent_id(params[:root])
+          collections = Iqvoc::Collection.base_class
+                                         .with_pref_labels
+                                         .published
+                                         .by_parent_id(params[:root])
+                                         .sort_by { |c| c.pref_label.to_s }
+
           collections.map do |collection|
             res = {
               id: collection.id,
@@ -46,10 +51,12 @@ def index
             res
           end
         else
-          collections = Iqvoc::Collection.base_class.with_pref_labels.published.merge(Label::Base.by_query_value("#{params[:query]}%"))
-          collections.map do |c|
-            collection_widget_data(c)
-          end
+          collections = Iqvoc::Collection.base_class
+                                         .with_pref_labels
+                                         .published
+                                         .merge(Label::Base.by_query_value("#{params[:query]}%"))
+                                         .sort_by { |c| c.pref_label.to_s }
+                                         .map { |c| collection_widget_data(c) }
         end
         render json: response
       end

diff --git a/app/models/collection/base.rb b/app/models/collection/base.rb
@@ -68,7 +68,10 @@ class Collection::Base < Concept::Base
   validate :circular_subcollections
 
   def self.with_pref_labels
-    super.references(:collection_members)
+    preload(:pref_labels)
+      .joins(:pref_labels)
+      .references(:collection_members)
+      .distinct
   end
 
   def self.by_origin(origin)