klastera 1.1.4 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9bd206c969548ea6d299cb57564aa67e9f7b88a5ba753ad5d0c112b7670ad4f0
-  data.tar.gz: 62580be564273b2a461808c9edbe2e9ef6c1cefa88f8b813ec9d2d02441a0836
+  metadata.gz: 3d4f51a31ad550a707ac854779af0d6335062752af2bf79eeb41e23eefc0ddce
+  data.tar.gz: 4abd8e21893258c0dd037d7596168a9266247441be74a751c0d6ee8ae2231796
 SHA512:
-  metadata.gz: d5f9073b9968cab43d2a88be5d1bcb9ac4cb6254670b480ac2adeadbe9c00bef78cd35a022f52626c75157844f9ad428c26afaab33b73b55e51b1bcfd0f0c682
-  data.tar.gz: 900d61f55072bfc19110dc4efda73c996dd7ec57e327165279e2c15b5eb86352c1f1aa98a28130b2b1f87a7d753a7891b388badee4a7771e6249fd758b662f5e
+  metadata.gz: 29c527c10bbb047607183891488a773655ff8d394ca28961e9745dd067cf77f0a8aa6012f096d334c3209a70e4adb1359b0623b4f3a28dd3d9dca08594328783
+  data.tar.gz: d55827e7deaa63de06c32a27a0ece3df1217d8eb4a553e1cdedee6b0efd882d33c77e9bcc9a574e89f0c7c7ae4ba4c7380c1ac74e3db79eef5f7892b4c6d62b4

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

@@ -11,10 +11,48 @@ module Klastera::Concerns::ClusterUser
     validates :cluster_id, presence: true
 
     scope :of, -> (user,organization) {
+      Rails.logger.warn("DON'T USE THIS SCOPE DIRECTLY: Use ::ClusterUser.get_from class method instead!")
       includes(:cluster).where(user_id: user, "clusters.organization_id": organization)
     }
   end
   
   module ClassMethods
+
+    ##
+    # Returns a hash with the users with cluster relation
+    #
+    def get_user_clusters_from(organization)
+      users_hash = {}
+      organization_cluster_ids = ::Cluster.of(organization).map(&:id)
+      ::ClusterUser.includes(:user).where(cluster_id: organization_cluster_ids).each do |cluster|
+        user_id = cluster.user.id
+        users_hash[user_id] ||= [];
+        users_hash[user_id] << cluster.id
+      end
+      users_hash
+    end
+
+    ##
+     # Returns a Cluster::ActiveRecord_Relation
+     #
+     ##
+    def get_clusters_from(user,organization)
+      clusters = []
+      unless user.can_admin_clusters?
+        # We could return cu.clusters but you may quering this result and a array can't handle order, where and etc.
+        # So we take only the cluster_ids and perfome a new search in order to get a Cluster::ActiveRecord_Relation 
+        # like the else block.
+        # TODO: resolve it without quering twice
+        clusters_id = ::ClusterUser.of(user,organization).map(&:cluster_id)
+        clusters = ::Cluster.where(id: clusters_id)
+        # Add a empty cluster instance to handle models without a cluster assignation. Only for use and show modes
+        if organization.optional_mode?
+          clusters << ::Cluster.new({nid: :without_cluster, name: I18n.t('klastera.without_cluster')})
+        end
+      else
+        clusters = ::Cluster.of(organization)
+      end
+      clusters
+    end
   end
 end

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

@@ -3,7 +3,12 @@ module Klastera::Concerns::Clusterizable
   included do
     attr_accessor :lonely_cluster
     belongs_to :cluster
+
     validates :cluster_id, presence: true, if: proc { self.organization.required_suborganization_mode? }
+
+    scope :related_clusters, ->() {
+      includes(:cluster).where("#{self.table_name}.cluster_id IS NOT NULL")
+    }
   end
   
   module ClassMethods

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

@@ -4,7 +4,7 @@
 %>
 <% if cluster_organization.is_in_cluster_mode? || other_visibility_reason %>
   <% 
-    cluster_collection = cluster_clusters
+    cluster_collection = @cluster_clusters || cluster_clusters
     label = t('klastera.cluster.title')
   %>
   <% if f.nil? %>

data/lib/klastera/version.rb

@@ -1,3 +1,3 @@
 module Klastera
-  VERSION = "1.1.4"
+  VERSION = "1.1.5"
 end

data/lib/klastera.rb

@@ -7,6 +7,21 @@ module Klastera
   extend ActiveSupport::Concern
 
   class << self
+
+    ##
+     # Returns a ::Cluster::ActiveRecord_Relation from a given scope
+     #
+    def clusters_from!(user,organization,scope,includes=[])
+      _scope_result = scope.respond_to?(:map) ? scope : cluster_scope!(user,organization,scope,includes)
+      ::Cluster.where(id: _scope_result.related_clusters.map(&:cluster_id))
+    end
+
+    ##
+     # Returns a scope with filtered by clusters or
+     # the scope filterd its organization if
+     # the organization haven't active the cluster mode
+     #
+     #
     def cluster_scope!(user,organization,scope,includes=[])
       scope_klass = scope_class(scope)
       raise RelatedClusterEntityComplianceError, "attribute cluster_id was not found in #{scope_klass}" unless scope_klass.try(:column_names).try(:include?,'cluster_id')
@@ -15,15 +30,13 @@ module Klastera
 
       session_clusters(user,organization) do |clusters|
         clusters = clusters.reject{|c|c.id.blank?}
-
         if organization.required_suborganization_mode?
           scope_klass = scope_klass.where("#{scope.table_name}.cluster_id IN (?)",clusters)
-        elsif organization.optional_mode?
+        elsif organization.optional_mode? && user.is_a_cluster_user?
           with_clusters = clusters.present? ? "#{scope.table_name}.cluster_id IN (#{clusters.map(&:id).join(',')})" : nil
           without_clusters = "#{with_clusters.blank? ? '' : ' OR ' }#{scope.table_name}.cluster_id IS NULL"
           scope_klass = scope_klass.where("#{with_clusters}#{without_clusters}")
         end
-
       end
 
       scope_klass
@@ -40,23 +53,15 @@ module Klastera
     end
 
     ##
+     # Returns a cluster array if organization is using the cluster mode
      #
+     # Use this only to get current_user/organization clusters
+     # understanding this wont be useful out of a cluster mode context.
      #
      ##
     def session_clusters(user,organization)
-      clusters = []
-      if organization.is_in_cluster_mode?
-        unless user.can_admin_clusters?
-          # TODO: 1: return a Cluster::ActiveRecord_Relation and then remove to_a in ::Cluster.of line
-          # TODO: 2: fix call to ::Cluster instead of Klastera::Cluster
-          clusters = ::ClusterUser.of(user,organization).map{|cu|::Cluster.find(cu.cluster_id)}
-          clusters << ::Cluster.new({nid: :without_cluster, name: I18n.t('klastera.without_cluster')}) if organization.optional_mode?
-        else
-          # TODO: remove "to_a" after ClusterUser.of result became a Cluster::ActiveRecord_Relation object
-          clusters = ::Cluster.of(organization).to_a
-        end
-        yield(clusters) if block_given?
-      end
+      clusters = organization.is_in_cluster_mode? ? ::ClusterUser.get_clusters_from(user,organization) : []
+      yield(clusters) if block_given?
       clusters
     end
   end
@@ -69,6 +74,8 @@ module Klastera
       helper_method :cluster_organization
       helper_method :cluster_clusters
       # helper_method :cluster_clusters_ids
+      helper_method :user_has_more_than_one_cluster
+      helper_method :clusters_from
     end
     if respond_to?(:hide_action)
       hide_action :cluster_scope
@@ -83,16 +90,20 @@ module Klastera
       hide_action :cluster_clusters=
       # hide_action :cluster_clusters_ids
       # hide_action :cluster_clusters_ids=
+      hide_action :user_has_more_than_one_cluster
+      hide_action :user_has_more_than_one_cluster=
+      hide_action :clusters_from
+      hide_action :clusters_from=
     end
     before_action :set_the_lonely_cluster, only: %i[ create update ]
   end
 
   def set_the_lonely_cluster
-    form_model = params[:controller].singularize
+    form_model = @form_record ? model_name_from_record_or_class(@form_record).param_key : params[:controller].singularize
     parameters = params.require( form_model ) rescue nil
     lonely_cluster = parameters.blank? ? false : parameters.permit( :lonely_cluster ).present?
     if lonely_cluster
-      params[form_model][:cluster_id] = ::ClusterUser.of(cluster_user,cluster_organization).first.try(:cluster_id)
+      params[form_model][:cluster_id] = cluster_clusters.first.try(:id)
     end
   end
 
@@ -116,6 +127,15 @@ module Klastera
   #   cluster_clusters.map(&:id)
   # end
 
+  def user_has_more_than_one_cluster
+    @cluster_clusters ||= cluster_clusters
+    @cluster_clusters.size > 1
+  end
+
+  def clusters_from(scope,includes=[])
+    Klastera.clusters_from!(cluster_user,cluster_organization,scope,includes)
+  end
+
   def set_cluster_filter
     @filter = ::ClusterFilter.new(cluster_filter_params)
   end

metadata

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