klastera 1.4.0.1 → 1.4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a400414db24740d7888bd0627051715a8b81c6d6f481e15b3819958b043a984f
-  data.tar.gz: 782575cb6ffd02a17dc9318878bc9b3b678e98760feb936038f18dd73dd99326
+  metadata.gz: 2c6ed8465fe9fcf78e96af1ad4d137ecdc867cc26242e0c4aada31557668b5db
+  data.tar.gz: 045d77f5c652c11aa1badd03c404c26b07a04ddd8d7bd7886b72ba47195d9339
 SHA512:
-  metadata.gz: c5fe5cd793facd2af1ed367485daaac3822b7f2dda768d90d5aa92e5bc2a296860585d220076de1277e4bc0b5716daa4c560f9d93cc1464ff0839fb48cfa4ba8
-  data.tar.gz: 9c01bd79e3df23f2e514ed9aab6b7e0c544a74bde7e2e88f98e18977d8e20833815e05ea0b85d36f9e72818ffe3edf34ee8c9ced19f5d81de7b4876f22a70e98
+  metadata.gz: 70bb42f25ded9aa221049e3d2fc25a88eb467514f562a99b5ffbc26e575a9bbf692e41af450201d82f00452f7d924e5b4f3a71409539d091ab60397de65fc379
+  data.tar.gz: 53e3902628bfac1f1353e0d6760483df4d82a51aa4ee32066c579e23b81bdb3832ab3ef9fc79ccff94d576971958ca4d00a8920ed7860ba7df1356c894b3c2c4

data/app/models/klastera/concerns/cluster_user.rb

@@ -14,7 +14,7 @@ module Klastera::Concerns::ClusterUser
      #
     def clusters_of(organization,and_user=nil)
       and_user_id = and_user.present? ? { users: { id: and_user } }  : {}
-      ::Cluster.eager_load(cluster_users: :user).where({ organization_id: organization }.merge(and_user_id) )
+      ::Cluster.eager_load(cluster_users: :user).where({ organization_id: organization }.order(order: :asc).merge(and_user_id) )
     end
 
     ##

data/lib/klastera.rb

@@ -5,6 +5,7 @@ module Klastera
 
   extend ActiveSupport::Concern
 
+  UNCLUSTERED_POSITION = 9999
   UNCLUSTERED_ENTITY = 'without_cluster'.freeze
   KLSTR_HELPERS = %i[ cluster_user cluster_organization cluster_list cluster_scope cluster_scope_through_of user_clusters_string_list ].freeze
 
@@ -29,13 +30,15 @@ module Klastera
       if organization.is_in_cluster_mode? && user.cannot_skip_cluster_clause?
         active_record_collection = ::ClusterUser.clusters_of(organization,user)
       else
-        active_record_collection = ::Cluster.where({ organization_id: organization })
+        active_record_collection = ::Cluster.where({ organization_id: organization }).order(order: :asc)
       end
 
       active_record_collection = active_record_collection.order(order: :asc)
 
       if include_unclustered && organization.optional_suborganization_mode? # For show and use modes only
-        active_record_collection << ::Cluster.new({nid: UNCLUSTERED_ENTITY, name: I18n.t("klastera.#{UNCLUSTERED_ENTITY}")})
+        active_record_collection.append(
+          ::Cluster.new({nid: UNCLUSTERED_ENTITY, name: I18n.t("klastera.#{UNCLUSTERED_ENTITY}")}, order: UNCLUSTERED_POSITION )
+        )
       end
       active_record_collection
     end
@@ -85,7 +88,7 @@ module Klastera
         if cluster_filter.present?
           cluster_ids = cluster_filter.is_a?(Array) ? cluster_filter : [cluster_filter]
         elsif force_cluster_clause
-          cluster_ids = ::ClusterUser.clusters_of(organization,user).map(&:id).sort
+          cluster_ids = ::ClusterUser.clusters_of(organization,user).map(&:id)
         end
         # We will avoid the query unless cluster_ids is having values OR force_cluster_clause is set (see method description)
         if cluster_ids.present? || force_cluster_clause
@@ -117,22 +120,37 @@ module Klastera
       unclusterized_scope.where("#{relation}_id" => cluster_scope!(cluster_entity_klass, user, organization, cluster_filter, force_cluster_clause))
     end
 
-    # 
+    #
     # Returns an array with a clusterized scoped result and its grouped version
     #
     def group_by_cluster_scope!(scope_klass, user, organization, cluster_filter=[], scope_scopes=[])
       cluster_ids = cluster_filter.is_a?(Array) ? cluster_filter : [cluster_filter]
-      kluster_scope = cluster_scope!(scope_klass, user, organization, cluster_ids, organization.optional_suborganization_mode? )
+      kluster_scope = cluster_scope!(scope_klass, user, organization, cluster_ids, organization.is_in_cluster_mode? )
+
       scope_scopes.each do |tuple_scope|
         scope_name, scope_arg = tuple_scope
         kluster_scope = scope_arg.present? ? kluster_scope.send(scope_name,scope_arg) : kluster_scope.send(scope_name)
       end
-      [
-        kluster_scope,
-        kluster_scope.order(:cluster_id).group_by do |e|
-          e.cluster.present? ? e.cluster.name : I18n.t("klastera.#{UNCLUSTERED_ENTITY}")
+
+      group_by_block = ->(o) {
+        if organization.is_in_cluster_mode?
+          o.cluster.present? ? o.cluster.name : UNCLUSTERED_POSITION
+        else
+          I18n.t("klastera.group_by_cluster_scope.#{scope_klass.model_name.plural}")
         end
-      ]
+      }
+
+      grouped_cluster_scope = kluster_scope.group_by(&group_by_block).sort_by{|k,v|k.to_s}
+
+      grouped_cluster_scope.dup.each do |group|
+        if group.first == UNCLUSTERED_POSITION
+          grouped_cluster_scope.delete(group)
+          group[0] = I18n.t("klastera.#{UNCLUSTERED_ENTITY}")
+          grouped_cluster_scope.append(group)
+        end
+      end
+
+      [ kluster_scope, grouped_cluster_scope ]
     end
   end
 

data/lib/klastera/version.rb

@@ -1,3 +1,3 @@
 module Klastera
-  VERSION = "1.4.0.1"
+  VERSION = "1.4.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: klastera
 version: !ruby/object:Gem::Version
-  version: 1.4.0.1
+  version: 1.4.0.2
 platform: ruby
 authors:
 - Gino Barahona
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-30 00:00:00.000000000 Z
+date: 2020-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails