klastera 1.4 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef7788eb1826bb5f7ee15fe495ee69f181d3c028b4e51250bee6adfe8be4acbc
-  data.tar.gz: d703b16d95ef2704ad7fcc01ed7d578f957744e362c2c968edea434eb97c167e
+  metadata.gz: dc8d3414d044460f33127e9eef4f0cb7cc6e6b83333697a944e5248cfe4970fd
+  data.tar.gz: 063dbb2a15f6b98b0219ac5af5059b40fa1da440c2e298a6140be4637ad1a504
 SHA512:
-  metadata.gz: 3927e49fb28dceb261c9400a214f7a84a074e2330425eada935086023e235c25c8c6b530c109a46b6c934a22183200669c2afd7ac481a7090c5249b9580b55d1
-  data.tar.gz: 8d812d8f464d26c10c4b97dfcbbcecf03d0ec62171269da18452e75aa91b88d71224300065b5b8b93a5c0c1af319ba008a9f3e600639bb881df42d4b2cb9c4f5
+  metadata.gz: af3e0d45ee32b14aa1f5b5bb27b246af015bfd6191b93846e52ca5e7789d245c7f068dc741afaa872a76244059dd31e71d543a8c1c8696c0346d183ac1bbb90b
+  data.tar.gz: 715adddc9f158ceb9c5eaa60e1318c986355d3f8a9e0c875b72903c053cc21fcf207cae038aefac9a51c4e65ffcf4a76ee13047e4a7dd70f908bcdbb0f202428

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

@@ -8,5 +8,11 @@ module Klastera::Concerns::ClusterEntity
   end
   
   module ClassMethods
+    def left_join_sources_of(scope_klass)
+      scope_klass_arel_table = scope_klass.arel_table
+      scope_klass_arel_table.join(arel_table, Arel::Nodes::OuterJoin).on(
+        scope_klass_arel_table[:id].eq(arel_table[:entity_id]), arel_table[:entity_type].eq(scope_klass.name)
+      ).join_sources
+    end
   end
 end

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 }.merge(and_user_id) ).order(order: :asc)
     end
 
     ##

data/app/views/layouts/klastera/_cluster_role.html.erb

@@ -1,5 +1,12 @@
-<% user_cluster_roles = user_cluster_roles.nil? ? User::CLUSTER_ROLES : user_cluster_roles %>
-<% other_visibility_reason = other_visibility_reason.nil? ? false : other_visibility_reason %>
+<%
+  user_cluster_roles = user_cluster_roles.nil? ? User::CLUSTER_ROLES : user_cluster_roles
+  other_visibility_reason = other_visibility_reason.nil? ? false : other_visibility_reason
+  if @user.try(:organization).present?
+    normal_user_help = @user.try(:organization).optional_suborganization_mode? ? :optional : :required
+  else
+    normal_user_help = :new
+  end
+%>
 <% if @user.try(:organization).try(:is_in_cluster_mode?) || other_visibility_reason %>
   <div class="form-group">
     <%= f.label t('klastera.cluster_role') %>
@@ -10,7 +17,7 @@
       data-content="<%=
         t('klastera.help.popover.content.cluster_role',
           m1: t('klastera.help.roles.description', r: t('klastera.roles.admin'), d: t('klastera.help.roles.admin')),
-          m2: t('klastera.help.roles.description', r: t('klastera.roles.user'), d: t("klastera.help.roles.user.#{@user.organization.optional_suborganization_mode? ? :optional : :required}"))
+          m2: t('klastera.help.roles.description', r: t('klastera.roles.user'), d: t("klastera.help.roles.user.#{normal_user_help}"))
       )%>"
     >
       <%= fa_icon 'info-circle', class: 'btn-link' %>

data/config/locales/es.yml

@@ -79,6 +79,7 @@ es:
         root: Ve todos los clusters y no necesita asignación
         admin: Ve todos los clusters y no necesita asignación
         user:
+          new: Usuario al que se le puede restringir la cosas que puede ver a través de su asignación con los clusters
           required: Necesita que se le asigne uno o más clusters, de lo contrario no verá las entidades clusterizadas.
           optional: Si no tiene clusters asignados verá todas la entidades CON y SIN clusters. Si se le asigna un cluster, verá las entidades de ese cluster + las entidades SIN cluster.
   activemodel:

data/lib/klastera.rb

@@ -5,8 +5,9 @@ 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
+  KLSTR_HELPERS = %i[ cluster_user cluster_organization cluster_list cluster_scope cluster_scope_through_of user_clusters_string_list cluster_scope_left_join ].freeze
 
   class << self
 
@@ -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
@@ -107,7 +110,7 @@ module Klastera
       unclusterized_scope = scope_class(scope_klass)
 
       if organization.is_in_cluster_mode? && ( force_cluster_clause || user.cannot_skip_cluster_clause? )
-        unclusterized_scope = unclusterized_scope.joins(relation => :cluster_entities)
+        unclusterized_scope = unclusterized_scope.joins(relation).joins(Klastera::ClusterEntity.left_join_sources_of(cluster_entity_klass))
       end
 
       if scope_klass.respond_to?(:organization)
@@ -117,22 +120,51 @@ 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
+
+    #
+    # A helper that returns a CLUSTER SCOPE to build queries that need explicit LEFT OUTER JOIN clause,
+    # instead of the default INNER JOIN provide by ActiveRecord's joins method
+    #
+    def cluster_scope_left_join!(scope_klass,organization)
+      cluster_entities_arel_table = Klastera::ClusterEntity.arel_table
+      cluster_arel_table = ::Cluster.arel_table
+      cluster_entities_cluster = cluster_entities_arel_table.join(cluster_arel_table, Arel::Nodes::OuterJoin).on(
+        cluster_entities_arel_table[:cluster_id].eq(cluster_arel_table[:id]),
+      ).join_sources
+
+      scope_class(scope_klass).where(organization_id: organization).joins(Klastera::ClusterEntity.left_join_sources_of(scope_klass)).joins(cluster_entities_cluster)
     end
   end
 
@@ -175,6 +207,10 @@ module Klastera
     Klastera.user_clusters_string_list!(cluster_user, cluster_organization, object_entity.try(:cluster_entities), separator, attribute)
   end
 
+  def cluster_scope_left_join(scope_klass)
+    Klastera.cluster_scope_left_join!(scope_klas,cluster_organization)
+  end
+
   included do
     Klastera::KLSTR_HELPERS.each do |action|
       if respond_to?(:helper_method)

data/lib/klastera/version.rb

@@ -1,3 +1,3 @@
 module Klastera
-  VERSION = "1.4"
+  VERSION = "1.4.2"
 end

metadata

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