klastera 1.2.0 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae9963c78d2880fca43b1fd6bef6be6c7ebcdd957289dd1117d81b815fdef707
-  data.tar.gz: 3ae1a3a37239c56675aaa9b9c82cfd65f6262777746bf6e720465c62e66af069
+  metadata.gz: 5cc4bc5d29598040f68599863b41983f415778050bc988fb0c35b67e7d9e264b
+  data.tar.gz: d96dd17be603a6683084bc34c9c040c51e4cb9422af7a2956c97860f812299ae
 SHA512:
-  metadata.gz: ed36fabfe91b44b8d8209a1484081021be21cb0309bfd8731cd1380aa6dcf210464f0e1e6cd5dbba218691cbae023223160ee287d6b698ce99756bc452e4c563
-  data.tar.gz: 62ce187ce73ebf4bf07e045835a1f3c79a0c2a911c0f45c54d980938851afdf38dfe8f632641f0b6da40b5c62e82d03cf7d0286b321fed90c3873c267cce2574
+  metadata.gz: ad8633404c203750947c1566d4c1d883bd7c33c1eae58982bb0489d62e769255caad49d75277244ad4b50f79fd95ef361c37408078d5ff657a7da7324d3bf75a
+  data.tar.gz: a4c6e14fafdd2eaa1c7664901a1590800d89006a257412b04b483c313fcdc61a1797340028ffe0e9c0bd9a15d38c3783d823bba4d665cd194dd8790d2369e971

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

@@ -9,6 +9,7 @@ module Klastera::Concerns::Clusterizable
 
     validates :cluster_id, presence: true, if: proc { self.try(:cluster_id) && self.organization.required_suborganization_mode? }
     validate :at_least_one_cluster_entity, if: proc { self.organization.required_suborganization_mode? }
+    validate :uniqueness_of_cluster_entity_record
 
     scope :related_clusters, ->() {
       includes(:cluster_entities).where("cluster_entities.entity_id = #{self.table_name}.id")
@@ -20,8 +21,15 @@ module Klastera::Concerns::Clusterizable
       end
     end
 
-    def clusters_string_separated_by(separator)
-      self.cluster_entities.map{|ce|ce.cluster.name}.join(separator)
+    ##
+     # This is a legacy method and we don't recommend using it.
+     # Implement directly Klastera.entity_clusters_string_list instead of this method.
+     # TODO: In order to deprecate it, you will need to perform some changes in the main app
+     ##
+    def clusters_string_separated_by(separator,attribute=:name)
+      Klastera.entity_clusters_string_list!(
+        self.cluster_entities, separator, attribute
+      )
     end
 
     def has_one_cluster_entity
@@ -29,6 +37,12 @@ module Klastera::Concerns::Clusterizable
         return errors.add(:cluster_entities, I18n.t('klastera.messages.has_one_cluster_entity'))
       end
     end
+
+    def uniqueness_of_cluster_entity_record
+      if cluster_entities.map(&:cluster_id).uniq.size != cluster_entities.size
+        return errors.add(:cluster_entities, I18n.t('klastera.messages.duplicated_cluster_entity') )
+      end
+    end
   end
   
   module ClassMethods

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

@@ -1,6 +1,6 @@
 <tr class="nested-fields">
   <td class="field">
-    <%= f.select :cluster_id, cluster_clusters.map{|c|[c.name,c.id]}, { include_blank: true }, { class: 'form-control' } %>
+    <%= f.select :cluster_id, @cluster_clusters.map{|c|[c.name,c.id]}, { include_blank: true }, { class: 'form-control' } %>
   </td>
   <td class="action vertical-align-middle text-center" width="44">
     <%= link_to_remove_association f, class: 'btn btn-danger btn-xs text-danger' do %>

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

@@ -1,4 +1,5 @@
 <% if cluster_organization.is_in_cluster_mode? %>
+  <% @cluster_clusters = cluster_clusters %>
   <div class="col-xs-12">
     <% if hide_title||=false %>
       <div class="form-group file required <%=f.object.class.name.parameterize%>_cluster_entity<%=' has-error' if f.object.errors.has_key?(:cluster_entities)%>">
@@ -26,6 +27,7 @@
           <table id="cluster-entities" class="table table-striped">
             <tbody class="cluster-entity-rows">
               <%= f.fields_for :cluster_entities do |cluster_entity|%>
+                <% next unless @cluster_clusters.map(&:id).include?(cluster_entity.try(:object).try(:cluster_id)) %>
                 <%= render 'layouts/klastera/cluster_entity_fields', f: cluster_entity %>
               <% end %>
             </body>

data/config/locales/es.yml

@@ -61,6 +61,7 @@ es:
       at_least_one_cluster_entity: Debe agregar al menos un cluster
       record_action_successfully: Registro %{a} exitosamente
       cant_delete_the_last_record_in_required_suborganization_mode: No se puede eliminar el único cluster de esta organización
+      duplicated_cluster_entity: Hay un cluster duplicado
       new_cluster_id:
         nil: Cluster no existe
         same: Cluster no puede ser el mismo

data/lib/klastera.rb

@@ -5,8 +5,36 @@ module Klastera
 
   extend ActiveSupport::Concern
 
+  KLSTR_HELPERS = %i[
+    cluster_user cluster_organization user_has_more_than_one_cluster
+    cluster_scope cluster_clusters cluster_scope_filtered clusters_from
+    user_clusters_string_list
+  ]
+
   class << self
 
+    def set_cluster_entities_attributes!(entity,array_cluster_ids)
+      cluster_entities_attributes = {}
+      entity_cluster_entities = entity.try(:cluster_entities) || []
+      entity_clusters = entity_cluster_entities.map(&:cluster_id).sort
+      array_cluster_ids = array_cluster_ids.map(&:id).sort
+      if array_cluster_ids != entity_clusters
+        now = DateTime.now
+        entity_cluster_entities.each_with_index do |ec,index|
+          remove_cluster = true
+          if array_cluster_ids.include?(ec.cluster_id)
+            remove_cluster = false
+            array_cluster_ids.delete(ec.cluster_id)
+          end
+          cluster_entities_attributes[index] = { id: ec.id, cluster_id: ec.cluster_id, _destroy: remove_cluster }
+        end
+        array_cluster_ids.each_with_index do |cluster_id,index|
+          cluster_entities_attributes[now.to_i+index] = { cluster_id: cluster_id, _destroy: false }
+        end
+      end
+      cluster_entities_attributes
+    end
+
     #
     # I like to wrap methods
     #
@@ -30,7 +58,7 @@ module Klastera
           # A force cluster organization won't return an entity out of a cluster, but
           # we don't know if the clusterized entities are fully definition-compliant.
           cluster_array << nil if cluster_organization.optional_suborganization_mode?
-          active_record_collection = active_record_collection.where("cluster_entities.cluster_id": cluster_array)
+          active_record_collection = active_record_collection.joins(:cluster_entities).where("cluster_entities.cluster_id": cluster_array)
         end
         # you may use a block only with clusterizable data
         yield(active_record_collection) if block_given?
@@ -75,18 +103,21 @@ module Klastera
       scope_klass = scope_class(scope).where(organization_id: organization)
       session_clusters(user,organization) do |clusters|
         if organization.is_in_cluster_mode?
+          scope_klass = scope_klass.select("DISTINCT ON (#{scope.table_name}.id) #{scope.table_name}.id, #{scope.table_name}.*")
           scope_klass = scope_klass.includes(includes) if includes.present?
           cluster_ids = clusters.map(&:id)
           if organization.required_suborganization_mode?
             scope_klass = scope_klass.joins(:cluster_entities).where( cluster_entities: { cluster_id: cluster_ids } )
           else
+            or_these_cluster_ids = cluster_ids.present? ? " OR cluster_entities.cluster_id IN (#{cluster_ids.join(",")})" : ""
             scope_klass = scope_klass.joins("
               LEFT OUTER JOIN cluster_entities
-                ON cluster_entities.cluster_id IN (#{cluster_ids.join(",")})
-                AND entity_id = #{scope.table_name}.id 
+                ON entity_id = #{scope.table_name}.id
                 AND entity_type = '#{scope}'
-            ")
+            ").where("cluster_entities.id IS NULL#{or_these_cluster_ids}")
           end
+          # Provisional fix to avoid SQL clashes due to DISTINCT ON clause
+          scope_klass = scope_class(scope).where(organization_id: organization).where(id: scope_klass.map(&:id))
         end
       end
       scope_klass
@@ -118,38 +149,42 @@ module Klastera
       end
       clusters
     end
-  end
 
-  included do
-    if respond_to?(:helper_method)
-      helper_method :cluster_scope
-      helper_method :user_cluster
-      helper_method :cluster_user
-      helper_method :cluster_organization
-      helper_method :cluster_clusters
-      helper_method :cluster_scope_filtered
-      helper_method :user_has_more_than_one_cluster
-      helper_method :clusters_from
+    ##
+     # Return a string with cluster attribute separated by separator argument
+     # A array of cluster ids can be passed fo filter the result
+     #
+    def entity_clusters_string_list!(cluster_entities,separator,attribute=:name,allowed_cluster_ids=nil)
+      _cluster_entities = cluster_entities.reject(&:nil?)
+      if allowed_cluster_ids.is_a?(Array)
+        _cluster_entities.select!{|ce| allowed_cluster_ids.include?(ce.cluster_id)}
+      end
+      _cluster_entities.map do |ce|
+        ce.cluster.try(attribute)
+      end.compact.join(separator)
     end
-    if respond_to?(:hide_action)
-      hide_action :cluster_scope
-      hide_action :cluster_scope=
-      hide_action :user_cluster
-      hide_action :user_cluster=
-      hide_action :cluster_user
-      hide_action :cluster_user=
-      hide_action :cluster_organization
-      hide_action :cluster_organization=
-      hide_action :cluster_clusters
-      hide_action :cluster_clusters=
-      hide_action :cluster_scope_filtered
-      hide_action :cluster_scope_filtered=
-      hide_action :user_has_more_than_one_cluster
-      hide_action :user_has_more_than_one_cluster=
-      hide_action :clusters_from
-      hide_action :clusters_from=
+
+    ##
+     # cluster_clusters needs the logged user and its organization
+     # that why, we perfomed this logic here
+     #
+    def user_clusters_string_list!(user,organization,cluster_entities,separator,attribute=:name)
+      @_session_clusters ||= self.session_clusters(user,organization)
+      self.entity_clusters_string_list!(cluster_entities, separator, attribute, @_session_clusters.map(&:id))
     end
-    before_action :set_the_lonely_cluster, only: %i[ create update ]
+  end
+
+  def cluster_user
+    current_user
+  end
+
+  def cluster_organization
+    current_organization
+  end
+
+  def user_has_more_than_one_cluster
+    @cluster_clusters ||= cluster_clusters
+    @cluster_clusters.size > 1
   end
 
   def set_the_lonely_cluster
@@ -161,16 +196,22 @@ module Klastera
     end
   end
 
-  def cluster_scope(scope,includes=[])
-    Klastera.cluster_scope!(cluster_user,cluster_organization,scope,includes)
+  def set_cluster_filter
+    @filter = ::ClusterFilter.new(cluster_filter_params)
   end
 
-  def cluster_user
-    current_user
+  def cluster_filter_params
+    parameters = params.require(:cluster_filter) rescue nil
+    return {} if parameters.blank?
+    parameters.permit(*cluster_filter_permit_params)
   end
 
-  def cluster_organization
-    current_organization
+  def cluster_filter_permit_params
+    [ :cluster_id ].concat( ::ClusterFilter.attributes )
+  end
+
+  def cluster_scope(scope,includes=[])
+    Klastera.cluster_scope!(cluster_user,cluster_organization,scope,includes)
   end
 
   def cluster_clusters
@@ -187,26 +228,30 @@ module Klastera
     )
   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
-
-  def cluster_filter_params
-    parameters = params.require(:cluster_filter) rescue nil
-    return {} if parameters.blank?
-    parameters.permit(*cluster_filter_permit_params)
+  def user_clusters_string_list(object_entity,separator,attribute=:name)
+    Klastera.user_clusters_string_list!(
+      cluster_user,
+      cluster_organization,
+      object_entity.try(:cluster_entities),
+      separator,
+      attribute
+    )
   end
 
-  def cluster_filter_permit_params
-    [ :cluster_id ].concat( ::ClusterFilter.attributes )
+  included do
+    Klastera::KLSTR_HELPERS.each do |action|
+      if respond_to?(:helper_method)
+        helper_method(action)
+      end
+      if respond_to?(:hide_action)
+        hide_action(helper)
+        hide_action("#{helper}=")
+      end
+    end
+    before_action :set_the_lonely_cluster, only: %i[ create update ]
   end
 end

data/lib/klastera/version.rb

@@ -1,3 +1,3 @@
 module Klastera
-  VERSION = "1.2.0"
-end
+  VERSION = "1.2.4"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: klastera
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.4
 platform: ruby
 authors:
 - Gino Barahona
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-30 00:00:00.000000000 Z
+date: 2020-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -54,7 +54,6 @@ files:
 - app/controllers/klastera/application_controller.rb
 - app/controllers/klastera/clusters_controller.rb
 - app/helpers/klastera/application_helper.rb
-- app/helpers/klastera/clusters_helper.rb
 - app/models/klastera/cluster.rb
 - app/models/klastera/cluster_entity.rb
 - app/models/klastera/cluster_filter.rb

data/app/helpers/klastera/clusters_helper.rb

@@ -1,4 +0,0 @@
-module Klastera
-  module ClustersHelper
-  end
-end