klastera 1.2.4.2 → 1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8780a6928f5249deb34be42cac1f52a226113865b9f29ddb12e1a36f018141ed
-  data.tar.gz: 1d99b709cea49a08533192ad8a1df621d78ea4d4ee59e1c266f06e952e6d8063
+  metadata.gz: ef7788eb1826bb5f7ee15fe495ee69f181d3c028b4e51250bee6adfe8be4acbc
+  data.tar.gz: d703b16d95ef2704ad7fcc01ed7d578f957744e362c2c968edea434eb97c167e
 SHA512:
-  metadata.gz: 62c72441e00d9edb6c17525453cde71d864389c9342dbe54df3538609814aef0cdcbc3f7c49f49134d526e2da1f99ff1cc258b750cd024a7031afd3a80977d2d
-  data.tar.gz: 806978a3fae34b0a2ddda331ce37b90de2e66f9c77bd707859b721ac7c83980f706b5eb432a00875db8b26b4c8901b11307ef62ab063952d013eef30eca69772
+  metadata.gz: 3927e49fb28dceb261c9400a214f7a84a074e2330425eada935086023e235c25c8c6b530c109a46b6c934a22183200669c2afd7ac481a7090c5249b9580b55d1
+  data.tar.gz: 8d812d8f464d26c10c4b97dfcbbcecf03d0ec62171269da18452e75aa91b88d71224300065b5b8b93a5c0c1af319ba008a9f3e600639bb881df42d4b2cb9c4f5

data/app/assets/stylesheets/klastera/clusters.css.scss

@@ -8,4 +8,39 @@
       background: none;
     }
   }
-}
+}
+
+#cluster-remote-table {
+  .cluster-id { width: 70px; }
+  .cluster-order { width: 70px; }
+  .cluster-color { width: 70px; }
+  .odd .colorless { color: #F9F9F9 }
+  .even .colorless { color: #FFF }
+  tr:hover .colorless { color: #444; opacity: 0.2;}
+}
+
+#cluster-remote-form {
+  h4.blank-modal-title {
+    margin: 0;
+    line-height: 28px;
+    letter-spacing: 0.05rem;
+    font-size: 21px;
+    font-weight: 400;
+    color: #666;
+  }
+}
+
+
+ul.klastera-option-help {
+  padding-left: 20px;
+  list-style-type: disc;
+}
+
+ul.klastera-option-help li {
+  margin-bottom: 10px;
+  padding-bottom: 5px;
+  border-bottom: 1px solid #DDD;
+}
+
+ul.klastera-option-help li b { color: #8A8A8A; font-weight: 400; }
+ul.klastera-option-help li b:first-child { color: #2E5F9B; font-weight: bold; }

data/app/controllers/klastera/clusters_controller.rb

@@ -33,13 +33,11 @@ module Klastera
 
     def destroy
       new_cluster_id = params.require(:transfer).permit(:new_cluster_id).values.first rescue nil
-      @transfer = Transfer.new(
-        current_cluster: @cluster,
-        new_cluster_id: new_cluster_id
-      )
+      @transfer = Transfer.new( current_cluster: @cluster, new_cluster_id: new_cluster_id )
       if @transfer.valid?
-        @transfer.to!(::Cluster.related_entities.map{|re|re.constantize})
-        @cluster.destroy
+        if @transfer.apply!
+          @cluster.destroy
+        end
         set_clusters
       end
     end

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

@@ -8,9 +8,13 @@ module Klastera::Concerns::Cluster
     
     attr_reader :last_record
 
-    MODES = [ :required_suborganization, :optional_suborganization, :optional_filter ].freeze
+    REQUIRED_MODE = :required_suborganization.freeze
+    OPTIONAL_MODE = :optional_suborganization.freeze
+    MODES = [ REQUIRED_MODE, OPTIONAL_MODE ].freeze
 
     belongs_to :organization, class_name: Klastera.organization_class
+    has_many :cluster_users
+    has_many :cluster_entities, dependent: :destroy
 
     scope :of, -> (organization,except_ids=[]) {
       _scope = where(organization: organization)
@@ -41,7 +45,7 @@ module Klastera::Concerns::Cluster
     end
 
     def has_related_entities_using_it?
-      ::Cluster.total_records_assign_to(self) > 0
+      self.cluster_entities.size > 0
     end
 
     def can_transfer_and_destroy?
@@ -54,29 +58,10 @@ module Klastera::Concerns::Cluster
     end
 
     def display_name_nid
-      "#{name} (#{nid})"
+      "#{name} (#{nid==Klastera::UNCLUSTERED_ENTITY ? I18n.t("klastera.#{ Klastera::UNCLUSTERED_ENTITY}") : nid})"
     end
   end
   
   module ClassMethods
-    def related_entities(attr_needed: :class_name, macro: :has_many)
-      ::Cluster.reflections.map do |association_name, reflection| 
-        reflection.send(attr_needed) if reflection.macro == macro
-      end.compact
-    end
-
-    def total_records_assign_to(cluster_instance)
-      related_entities(attr_needed: :name).inject(0) do |total, association_name|
-        entity = cluster_instance.send(association_name)
-        if entity.respond_to?(:cluster_id)
-          total+=entity.where(cluster_id: cluster_instance.id).count
-        end
-        total
-      end
-    end
-
-    def modes_as_strings
-      ::Cluster::MODES.map{|m|m.to_s}
-    end
   end
 end

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

@@ -4,11 +4,8 @@ module Klastera::Concerns::ClusterFilter
   included do
     include ActiveModel::Model
     include ActiveModel::Validations::Callbacks
-    attr_accessor :cluster_id
 
-    def kcluster_id
-      self.cluster_id == 'without_cluster' ? nil : self.cluster_id
-    end
+    attr_accessor :cluster_id
   end
   
   module ClassMethods

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

@@ -3,55 +3,39 @@ module Klastera::Concerns::ClusterUser
 
   included do
     self.table_name = 'cluster_users'
-
     belongs_to :user
     belongs_to :cluster
-
     validates :cluster_id, presence: true
-
-    scope :of, -> (user,organization) {
-      Rails.logger.warn("DON'T USE THIS SCOPE DIRECTLY: Use ::ClusterUser.clusters_from class method instead!")
-      includes(:cluster).where(user_id: user, "clusters.organization_id": organization)
-    }
   end
   
   module ClassMethods
+    ##
+     # Return a Cluster::ActiveRecord_Relation of organization (and) user
+     #
+    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) )
+    end
 
     ##
-    # Returns a hash with the users with cluster relation
-    #
-    def 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|
-        user_id = cluster_user.user_id || :uncluster
-        users_hash[user_id] ||= []
-        users_hash[user_id] << cluster_user.cluster_id
-      end
-      users_hash
+     # Return a User::ActiveRecord_Relation of organization (and) user
+     #
+    def users_of(organization)
+      ::User.eager_load(:cluster_users).where(users: { organization_id: organization } )
     end
 
     ##
-     # Returns a Cluster::ActiveRecord_Relation
+     # Return a hash of users and its clusters
      #
-     ##
-    def 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)
+    def users_hash_of(organization)
+      users = {}
+      rows = self.users_of(organization).pluck("users.id AS user_id","cluster_users.cluster_id").uniq
+      rows.each do |row|
+        user_id = row.first
+        users[user_id] ||= []
+        users[user_id] << row.last
       end
-      clusters
+      users
     end
   end
 end

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

@@ -1,7 +1,6 @@
 module Klastera::Concerns::Clusterizable
   extend ActiveSupport::Concern
   included do
-    attr_accessor :lonely_cluster
     belongs_to :cluster
 
     has_many :cluster_entities, as: :entity, class_name: Klastera::ClusterEntity
@@ -11,9 +10,7 @@ module Klastera::Concerns::Clusterizable
     validate :at_least_one_cluster_entity, if: proc { self.organization.required_suborganization_mode? }
     validate :uniqueness_of_cluster_entity_record
 
-    scope :related_clusters, ->() {
-      joins(:cluster_entities).where("cluster_entities.entity_id = #{self.table_name}.id")
-    }
+    scope :includes_cluster, -> { includes(cluster_entities: :cluster) }
 
     def at_least_one_cluster_entity
       if cluster_entities.length == 0 || cluster_entities.reject{|cluster_entity| cluster_entity._destroy == true}.empty?
@@ -47,7 +44,7 @@ module Klastera::Concerns::Clusterizable
   
   module ClassMethods
     def cluster_entity_params
-      [ :cluster_id, :lonely_cluster, { cluster_entities_attributes: [:id, :cluster_id, :_destroy] } ]
+      [ :cluster_id, { cluster_entities_attributes: [:id, :cluster_id, :_destroy] } ]
     end
   end
 end

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

@@ -4,7 +4,7 @@ module Klastera::Concerns::Organization
     
     has_many :clusters
     
-    validates :use_cluster_as, inclusion: { in: ::Cluster.modes_as_strings , message: I18n.t('klastera.clusters.wrong_option') }, if: proc{ use_cluster_as.present? }
+    validates :use_cluster_as, inclusion: { in: ::Cluster::MODES.map{|m|m.to_s}, message: I18n.t('klastera.clusters.wrong_option') }, if: proc{ use_cluster_as.present? }
 
     # Return a symbol version of use_cluster_as value
     def cluster_mode
@@ -22,19 +22,11 @@ module Klastera::Concerns::Organization
     end
 
     def required_suborganization_mode?
-      cluster_mode == ::Cluster::MODES.first
+      cluster_mode == ::Cluster::REQUIRED_MODE
     end
 
     def optional_suborganization_mode?
-      cluster_mode == ::Cluster::MODES.second
-    end
-
-    def optional_filter_mode?
-      cluster_mode == ::Cluster::MODES.third
-    end
-
-    def optional_mode?
-      optional_suborganization_mode? || optional_filter_mode?
+      cluster_mode == ::Cluster::OPTIONAL_MODE
     end
   end
   

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

@@ -7,20 +7,14 @@ module Klastera::Concerns::Transfer
     include ActiveModel::Model
     include ActiveModel::Validations::Callbacks
 
-    attr_accessor :current_cluster, :new_cluster_id, :entities_transfered
+    attr_accessor :current_cluster, :new_cluster_id
 
     validates :current_cluster, presence: true
     validates :new_cluster_id, presence: true, if: proc { self.required_transfer? }
 
     validate do
       new_cluster = ::Cluster.find(self.new_cluster_id.to_i) rescue nil
-      #
-      # In my time, to_a? didnt work
-      # current_cluster.class returned:
-      #   Cluster(id: integer, name: string, nid: text, organization_id: integer, created_at: datetime, updated_at: datetime, color: string)
-      #
-      # If you see this, please fixe it. Thanks
-      #
+
       if current_cluster.class.name != 'Cluster' || current_cluster.try(:is_the_last_record_in_required_suborganization_mode?)
         errors.add(:current_cluster, I18n.t('klastera.messages.current_cluster.cant_transfer'))
       elsif self.required_transfer? && new_cluster_id.present? && new_cluster.nil?
@@ -33,22 +27,19 @@ module Klastera::Concerns::Transfer
       end
     end
 
-    ##
-    #
-    #
-    def to!(related_entities)
-      self.entities_transfered = 0
-      related_entities.each do |entity|
-        if entity.is_a?(Class) && entity.respond_to?(:cluster_id)
-          self.entities_transfered += entity.where(
-            cluster_id: self.current_cluster.id
-          ).update_all(cluster_id: self.new_cluster_id)
-        end
-      end
-    end
-
     def required_transfer?
       self.current_cluster.required_transfer? && self.current_cluster.has_related_entities_using_it?
     end
+
+    ##
+    # A returned boolean is expected. It should always be true even nothing is
+    # transfered, and it only will return false if creation fails.
+    #
+    def apply!
+      Klastera::ClusterEntity.create(current_cluster.cluster_entities.map{ |relation|
+        next if self.new_cluster_id.blank?
+        { cluster_id: self.new_cluster_id, entity_id: relation.entity_id, entity_type: relation.entity_type }
+      }.compact)
+    end
   end
 end

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

@@ -21,10 +21,6 @@ module Klastera::Concerns::User
     def is_a_cluster_admin?; self.cluster_role == CLUSTER_ADMIN; end
     def is_a_cluster_user?; self.cluster_role == CLUSTER_USER; end
 
-    def is_not_a_cluster_root?; ! self.is_a_cluster_root?; end
-    def is_not_a_cluster_admin?; ! self.is_a_cluster_admin?; end
-    def is_not_a_cluster_user?; ! self.is_a_cluster_user?; end
-
     def need_cluster_assignation?
       self.try(:organization).try(:required_suborganization_mode?) && self.is_a_cluster_user?
     end
@@ -33,6 +29,13 @@ module Klastera::Concerns::User
       self.organization.is_in_cluster_mode? && ( self.is_a_cluster_admin? || self.is_a_cluster_root? )
     end
 
+    #
+    # It tells if this user should see what they cluster role or organization dictates
+    # Adminers and users from show cluster modes skip cluster clause
+    def cannot_skip_cluster_clause?
+      ! ( self.is_a_cluster_admin? || self.is_a_cluster_root? || ( self.organization.optional_suborganization_mode? && self.cluster_users.blank? ) )
+    end
+
     #
     # We will try to create a cluster_user record whether
     # the organization is using force mode (if cluster_id isn't present, it will raise a validation error) 

data/app/views/klastera/clusters/_form.html.erb

@@ -3,16 +3,16 @@
 
   <div class="<%=classes_for_remote_modal_body()%>">
     <div class="row">
-      <div class="col-xs-12">
+      <div class="col-xs-6">
         <%= f.input :name, as: :string, label: t('klastera.cluster_name') %>
       </div>
-      <div class="col-xs-12">
+      <div class="col-xs-6">
         <%= f.input :nid, as: :string, label: t('klastera.cluster_nid') %>
       </div>
-      <div class="col-xs-12">
+      <div class="col-xs-6">
         <%= f.input :color, as: :string, label: t('klastera.cluster_color'), input_html: { class: 'color-picker'} %>
       </div>
-      <div class="col-xs-12">
+      <div class="col-xs-6">
         <%= f.input :order, as: :string, label: t('klastera.cluster_order') %>
       </div>
     </div>

data/app/views/klastera/clusters/_form_transfer.html.erb

@@ -2,8 +2,8 @@
 <%= simple_form_for( @transfer,  url: cluster_path(@cluster), method: :delete, remote: true, html: { autocomplete: :off, class: 'destroy-form slim-form-field' } ) do |f| %>
   <%=render 'layouts/remote_form/header', o: @cluster, title: title, fa: :qrcode %>
   <div class="<%=classes_for_remote_modal_body()%>">
-    <h4 class="text-center">Esta acción es irreversible.<br/>¿Está seguro?</h4>
-    <% if ::Cluster.total_records_assign_to(@cluster) > 0 %>
+    <h4 class="blank-modal-title text-center">Esta acción es irreversible<br/>¿Está seguro?</h4>
+    <% if @cluster.cluster_entities.size > 0 %>
       <br />
       <div class="row">
         <% if can_transfer_and_destroy %>

data/app/views/klastera/clusters/_table.html.erb

@@ -1,4 +1,4 @@
-<table class="table table-striped table-hover table-condensed table-bordered datatable">
+<table class="table table-striped table-hover table-condensed table-bordered datatable table">
   <thead>
     <tr>
       <th class="text-center cluster-id"><%=t('klastera.cluster_id')%></th>
@@ -6,7 +6,7 @@
       <th class="text-center cluster-color"><%=t('klastera.cluster_color')%></th>
       <th class="text-center cluster-name"><%=t('klastera.cluster_name')%></th>
       <th class="text-center cluster-nid"><%=t('klastera.cluster_nid')%></th>
-      <th class="cogs-actions four-icons"><span class="fa fa-cogs"></span></th>
+      <th class="cogs-actions two-icons"><span class="fa fa-cogs"></span></th>
     </tr>
   </thead>
   <tbody>
@@ -19,7 +19,7 @@
         </td>
         <td class="text-center cluster-name"><%= cluster.name %></td>
         <td class="text-center cluster-nid"><%= cluster.nid %></td>
-        <td class="cogs-actions four-icons">
+        <td class="cogs-actions two-icons">
           <%= link_to edit_cluster_path(cluster), class:'btn btn-primary btn-xs', title: t('shared.actions.edit'), "data-toggle": "modal", "data-target": "#remote-modal-block" do %>
             <span class="fa fa-pencil-square-o"></span>
           <% end %>
@@ -30,12 +30,4 @@
       </tr>
     <% end %>
   </tbody>
-</table>
-<style type="text/css">
-  .cluster-id { width: 70px; }
-  .cluster-order { width: 70px; }
-  .cluster-color { width: 70px; }
-  .odd .colorless { color: #F9F9F9 }
-  .even .colorless { color: #FFF }
-  tr:hover .colorless { color: #F5F5F5 }
-</style>
+</table>

data/app/views/klastera/clusters/index.html.erb

@@ -18,4 +18,4 @@
 
 </div>
 
-<%= render 'layouts/remote_form/modal'%>
+<%= render 'layouts/remote_form/modal', width: 'md' %>

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, @clusters_session.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/_cluster_filter.html.erb

@@ -1,4 +1,4 @@
-<%= simple_form_for(@filter, url: url, remote: true) do |f| %>
+<%= simple_form_for(@cluster_filter, url: url, remote: true) do |f| %>
 
   <div class="inline-buttons-block top">
     <%= button_tag(t('klastera.actions.filter'), class: 'btn btn-primary btn-sm float-right', data: { disable_with: "<i class='fa fa-spinner spin'></i>" }) %>
@@ -7,7 +7,7 @@
   <%=yield(f) if block_given? %>
 
   <% if cluster_organization.is_in_cluster_mode? %>
-    <% cluster_collection = cluster_clusters.map{|c|[c.name,(c.id||c.nid)]} %>
+    <% cluster_collection = cluster_list.map{|c|[c.name,(c.id||c.nid)]} %>
     <% if cluster_collection.size > 1 %>
       <div class="inline-label-control-block">
         <%= f.input :cluster_id, collection: cluster_collection, prompt: t('klastera.clusters.all'), label: false, wrapper: false %>

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

@@ -3,6 +3,18 @@
 <% if @user.try(:organization).try(:is_in_cluster_mode?) || other_visibility_reason %>
   <div class="form-group">
     <%= f.label t('klastera.cluster_role') %>
+    <span
+      class="klastera-user-cluster-rol"
+      data-title="<%= t('klastera.help.popover.title')%>"
+      data-toggle="popover"
+      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}"))
+      )%>"
+    >
+      <%= fa_icon 'info-circle', class: 'btn-link' %>
+    </span>
     <%= f.select :cluster_role, user_cluster_roles.map{|r|[t("klastera.roles.#{r}"),r]}, { include_blank: true }, { class: 'form-control' } %>
   </div>
 
@@ -23,5 +35,7 @@
         });
       }
     });
+    var popoverTemplate = '<div class="popover" role="tooltip"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>'
+    $('.klastera-user-cluster-rol').popover({ template: popoverTemplate, html: true, trigger: 'click', });
   </script>
 <% end %>

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

@@ -4,26 +4,18 @@
 %>
 <% if cluster_organization.is_in_cluster_mode? || other_visibility_reason %>
   <% 
-    cluster_collection = @cluster_clusters || cluster_clusters
+    cluster_collection = @clusters_session || cluster_list
     label = t('klastera.cluster.title')
   %>
   <% if f.nil? %>
     <%= label_tag(:cluster_id, label, class: 'control-label') %>
     <%= select_tag(:cluster_id, options_from_collection_for_select(cluster_collection, 'id', 'display_name_nid'), class: 'form-control', prompt: 'Seleccione') %>
   <% elsif f.is_a?(SimpleForm::FormBuilder) %>
-    <% if cluster_collection.size == 1 %>
-      <%= f.input :lonely_cluster, as: :hidden, html_input: { value: true } %>
-    <% else %>
-      <%= f.input :cluster_id, collection: cluster_collection.map{|c|[c.name,c.id]}, label: label %>
-    <% end %>
+    <%= f.input :cluster_id, collection: cluster_collection.map{|c|[c.name,c.id]}, label: label %>
   <% else %>
-    <% if cluster_collection.size == 1 %>
-      <%= f.hidden_field :lonely_cluster, value: true %>
-    <% else %>
-      <div class="form-group">
-        <%= f.label label %>
-        <%= f.select :cluster_id, cluster_collection.map{|c|[c.name,c.id]}, { include_blank: true }, { class: 'form-control' } %>
-      </div>
-    <% end %>
+    <div class="form-group">
+      <%= f.label label %>
+      <%= f.select :cluster_id, cluster_collection.map{|c|[c.name,c.id]}, { include_blank: true }, { class: 'form-control' } %>
+    </div>
   <% end %>
 <% end %>

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

@@ -1,5 +1,5 @@
 <% if cluster_organization.is_in_cluster_mode? %>
-  <% @cluster_clusters = cluster_clusters %>
+  <% @clusters_session = cluster_list(false) %>
   <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)%>">
@@ -27,7 +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)) %>
+                <% next unless @clusters_session.map(&:id).include?(cluster_entity.try(:object).try(:cluster_id)) %>
                 <%= render 'layouts/klastera/cluster_entity_fields', f: cluster_entity %>
               <% end %>
             </body>

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

@@ -5,10 +5,9 @@
     data-title="<%= t('klastera.help.popover.title')%>"
     data-toggle="popover"
     data-content="<%= 
-      t('klastera.help.popover.content',
+      t('klastera.help.popover.content.user_as_cluster_as',
         m1:t('klastera.help.required_suborganization', t: t('klastera.required_suborganization'), e: t('klastera.clusters.entities')),
-        m2:t('klastera.help.optional_suborganization', t: t('klastera.optional_suborganization'), e: t('klastera.clusters.entities')),
-        m3:t('klastera.help.optional_filter', t: t('klastera.optional_filter'), e: t('klastera.clusters.entities'))
+        m2:t('klastera.help.optional_suborganization', t: t('klastera.optional_suborganization'), e: t('klastera.clusters.entities'))
       )%>"
   >
     <%= fa_icon 'info-circle', class: 'btn-link' %>
@@ -19,20 +18,4 @@
 <script type="text/javascript">
   var popoverTemplate = '<div class="popover" role="tooltip"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>'
   $('.klastera-cluster-option').popover({ template: popoverTemplate, html: true, trigger: 'click', });
-</script>
-
-<style type="text/css">
-  ul.klastera-option-help {
-    padding-left: 20px;
-    list-style-type: disc;
-  }
-
-  ul.klastera-option-help li {
-    margin-bottom: 10px;
-    padding-bottom: 5px;
-    border-bottom: 1px solid #DDD;
-  }
-
-  ul.klastera-option-help li b { color: #8A8A8A; font-weight: 400; }
-  ul.klastera-option-help li b:first-child { color: #2E5F9B; font-weight: bold; }
-</style>
+</script>

data/config/locales/es.yml

@@ -9,24 +9,23 @@ es:
       you_need_add_at_least_one_cluster: Esta organización usa clusters en modo obligatorio. Asigne un cluster al usuario por favor.
       assign_cluster_role: Asignar role
       cluster_root_asignation: 
-        title: Asignación Routing Super Admin
-        text: Este rol es sólo para usuarios Routing
+        title: Asignación Super Admin
+        text: Este rol es sólo para usuarios super admin
     roles:
-      root: Routing Super Admin
-      admin: Admin Cliente [ Ignora asignación, ve todos los clusters ]
-      user: Usuario normal [ Ve sólo los clusters asignados ]
+      root: Super Admin
+      admin: Admin Cluster
+      user: Usuario Cluster
     using_cluster_as: Usando cluster como
     cluster_order: Orden
     cluster_id: ID
-    cluster_role: Cluster rol
+    cluster_role: Rol de clusters
     cluster_name: Nombre
     cluster_nid: Código
     cluster_color: Color
     organization_name: Organización
-    use_cluster_as: Activar y usar cluster como
-    required_suborganization: Sub-organización Obligatorio
-    optional_suborganization: Sub-organización Opcional
-    optional_filter: Filtro opcional
+    use_cluster_as: Activar y usar cluster en modo
+    required_suborganization: Obligatorio
+    optional_suborganization: Opcional
     clusters:
       all: Todos
       title: Clusters
@@ -71,10 +70,17 @@ es:
     help:
       popover:
         title: Descripción de cada opción
-        content: "<ul class='klastera-option-help'><li>%{m1}</li><li>%{m2}</li><li>%{m3}</li></ul>"
-      required_suborganization: "<b>%{t}</b>: Obliga definir un cluster en las entidades %{e} ."
-      optional_suborganization: "<b>%{t}</b>: Permite definir un cluster en las entidades %{e}."
-      optional_filter: "<b>%{t}</b>: Permite definir un cluster en las entidades %{e} de forma opcional."
+        content:
+          user_as_cluster_as: "<ul class='klastera-option-help'><li>%{m1}</li><li>%{m2}</li></ul>"
+      required_suborganization: "<b>%{t}</b>: Obliga asignar un cluster a las entidades %{e} ."
+      optional_suborganization: "<b>%{t}</b>: Permite asociar un cluster a las entidades %{e}."
+      roles:
+        description: "<b>%{r}</b>: %{d}."
+        root: Ve todos los clusters y no necesita asignación
+        admin: Ve todos los clusters y no necesita asignación
+        user:
+          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:
     attributes:
       'klastera/transfer':

data/lib/klastera.rb

@@ -5,140 +5,11 @@ 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 set_collection_before_group_by_entity
-  ]
+  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
 
   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
-
-    #
-    # In cases you don't have the active_record_collection object to filter, this method helps you
-    # calling cluster_scope! before and pass the collction to filter_clusterized_collection_with!,
-    # but at the end of the day, I just like to wrap methods.
-    #
-    def cluster_scope_filtered!(scope,cluster_id,user,organization)
-      self.filter_clusterized_collection_with!(
-        cluster_id,
-        self.cluster_scope!(scope,user,organization),
-        organization
-      )
-    end
-
-    #
-    # In order to this works, active_record_collection argument
-    # should be passed through cluster_scope! method before.
-    #
-    def filter_clusterized_collection_with!(cluster_id,active_record_collection,cluster_organization)
-      if cluster_organization.is_in_cluster_mode?
-
-        # IMPORTANT
-        # The next block was commented on because cluster_scope! method is not returning
-        # the cluster_entities within the scope anymore and it doesn't make any sense trying
-        # to filter based on force/use/show logic. Nevertheless, someday we will need it again.
-
-        # # If cluster_id is nil we will try to filter including unclustered entities active_record_collection wsas
-        # unless cluster_id.present?
-        #   # Based on force/use/show definition we don't really need this validation. A force cluster organization won't return an entity that 
-        #   # doesn't belong to a cluster. Nevertheless we don't know if active_record_collection argument is fully definition-compliant.
-        #   if cluster_organization.optional_suborganization_mode?
-        #     cluster_array << nil
-        #   end
-        # end
-
-        if cluster_id.present?
-          cluster_array = [cluster_id] unless cluster_id.is_a?(Array)
-          # The ActiveRecordCollection argument should have previously eager-loaded the cluster entities, thus the join statement is unnecessary.
-          active_record_collection = active_record_collection.joins(:cluster_entities).where("cluster_entities.cluster_id": cluster_array)
-        end
-
-        # You should use a block with clusterable data only
-        yield(active_record_collection) if block_given?
-      end
-      active_record_collection
-    end
-
-    ##
-     #
-     #
-     ##
-    def set_collection_before_group_by_entity!(active_record_collection,entity_params,cluster_organization)
-      entity_params_keys = [:entity_name,:entity_attribute,:entity_id,:entity_id_attribute,:unamed]
-      entity_params[:entity_id] ||= nil #Ensures the entity_id attribute presence even if there is no filter
-      entity_params = entity_params.slice(*entity_params_keys).values
-      model_class = active_record_collection.model.base_class
-      model_relations = model_class.reflections.keys
-      if model_relations.include?(entity_params[0])
-        entity_params << "#{entity_params[0]}_id".to_sym
-        if entity_params[0] == 'cluster'
-          entity_params << :unclustered if cluster_organization.is_in_cluster_mode?
-          active_record_collection = Klastera.filter_clusterized_collection_with!(
-            entity_params[2],
-            active_record_collection,
-            cluster_organization
-          )
-        end
-        yield( active_record_collection, entity_params_keys.zip(entity_params).to_h )
-      end
-    end
-
-    ##
-     # Returns a ::Cluster::ActiveRecord_Relation from a given scope
-     #
-    def clusters_from!(scope,user,organization)
-      cluster_scope!(scope,user,organization).related_clusters
-    end
-
-    ##
-     # Returns a scope filtered by clusters or its
-     # organization if the cluster mode is not active.
-     #
-    def cluster_scope!(scope,user,organization)
-      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}.*")
-          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 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).eager_load(:cluster_entities).where(id: scope_klass.map(&:id), organization_id: organization)
-        end
-      end
-      scope_klass
-    end
-
     ##
      # TODO:
      # Implement a validation to ensure that
@@ -151,19 +22,22 @@ 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.
+     # Returns which clusters a user can see avoiding unnecessary queries if the cluster restraint doesn't apply
      #
-     ##
-    def session_clusters(user,organization)
-      clusters = organization.is_in_cluster_mode? ? ::ClusterUser.clusters_from(user,organization) : []
-      if block_given?
-        clusters = clusters.reject{|c|c.id.blank?}
-        yield(clusters)
+    def cluster_list!(organization,user,include_unclustered=true)
+      # Only the cluster mode on and the mandatory user-cluster relation will use a join clause to get the clusters list
+      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 })
       end
-      clusters
+
+      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}")})
+      end
+      active_record_collection
     end
 
     ##
@@ -181,88 +55,124 @@ module Klastera
     end
 
     ##
-     # cluster_clusters needs the logged user and its organization
-     # that why, we perfomed this logic here
+     # cluster_list! needs a user and a 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))
+      @clusters_session ||= Klastera.cluster_list!(organization,user)
+      self.entity_clusters_string_list!(cluster_entities, separator, attribute, @clusters_session.map(&:id))
     end
-  end
 
-  def cluster_user
-    current_user
-  end
+    #
+    # We will try to avoid cluster clause except when:
+    # 1.- cluster mode is active
+    # AND
+    #   2a.- cluster_filter is present (someone wants to filter by cluster)
+    # OR
+    #   2b.- the current user has some limitations and must checks they cluster relation
+    #         - User is having clusters in optional_suborganization mode
+    #         - User IS NOT having clusters in required_suborganization mode
+    #
+    # For the other hand, with force_cluster_clause we can skip the previous logic if
+    # cluster_filter_id is present when the optional_suborganization mode is on. BUT!
+    # Be aware that if the cluster_filter is not present, the value of force_cluster_clause
+    # will be overridden by the returned value of cannot_skip_cluster_clause? method.
+    #
+    def cluster_scope!(scope_klass, user, organization, cluster_filter=nil, force_cluster_clause=false)
+      scope_klass = scope_class(scope_klass)
+      if organization.is_in_cluster_mode? && ( cluster_filter.present? || force_cluster_clause = user.cannot_skip_cluster_clause? ) # yes, this is an assignation
+        cluster_ids = []
+        # Set another variable as array to get the cluster id(s)
+        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
+        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
+          scope_klass = scope_klass.eager_load(:organization,cluster_entities: :cluster)
+          # We add the unclustered if the value of cluster_filter have the special without_cluster string or as method description says
+          if cluster_ids.delete(UNCLUSTERED_ENTITY) || ( force_cluster_clause && organization.optional_suborganization_mode? )
+            cluster_ids << nil
+          end
+          scope_klass = scope_klass.where( cluster_entities: { cluster_id: cluster_ids } )
+        end
+      end
+      scope_klass.where(organization_id: organization)
+    end
 
-  def cluster_organization
-    current_organization
-  end
+    # 
+    # Filter non-clustered entity through a clusterized one
+    #
+    def cluster_scope_through_of!(relation, cluster_entity_klass, scope_klass, user, organization, cluster_filter=nil, force_cluster_clause=false)
+      unclusterized_scope = scope_class(scope_klass)
 
-  def user_has_more_than_one_cluster
-    @cluster_clusters ||= cluster_clusters
-    @cluster_clusters.size > 1
-  end
+      if organization.is_in_cluster_mode? && ( force_cluster_clause || user.cannot_skip_cluster_clause? )
+        unclusterized_scope = unclusterized_scope.joins(relation => :cluster_entities)
+      end
+
+      if scope_klass.respond_to?(:organization)
+        unclusterized_scope = unclusterized_scope.where(organization_id: organization)
+      end
 
-  def set_the_lonely_cluster
-    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] = cluster_clusters.first.try(:id)
+      unclusterized_scope.where("#{relation}_id" => cluster_scope!(cluster_entity_klass, user, organization, cluster_filter, force_cluster_clause))
     end
-  end
 
-  def set_cluster_filter
-    @filter = ::ClusterFilter.new(cluster_filter_params)
+    # 
+    # 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? )
+      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}")
+        end
+      ]
+    end
   end
 
-  def cluster_filter_params
-    parameters = params.require(:cluster_filter) rescue nil
-    return {} if parameters.blank?
-    parameters.permit(*cluster_filter_permit_params)
-  end
+  ##################################################################################################################################################
 
-  def cluster_filter_permit_params
-    [ :cluster_id ].concat( ::ClusterFilter.attributes )
+  def cluster_user
+    current_user
   end
 
-  def filter_clusterized_collection_with(cluster_id,active_record_collection)
-    Klastera.filter_clusterized_collection_with!(cluster_id,active_record_collection,cluster_organization)
+  def cluster_organization
+    current_organization
   end
 
-  def cluster_scope(scope)
-    Klastera.cluster_scope!(scope,cluster_user,cluster_organization)
+  def set_cluster_filter
+    cluster_filter_params = params.require(:cluster_filter) rescue {}
+    @cluster_filter = ::ClusterFilter.new(
+      cluster_filter_params.present? ? cluster_filter_params.permit(
+        [ :cluster_id ].concat( ::ClusterFilter.attributes )
+      ) : {}
+    )
   end
 
-  def cluster_clusters
-    Klastera.session_clusters(cluster_user,cluster_organization)
+  def cluster_list(include_unclustered=true)
+    Klastera.cluster_list!(cluster_organization, cluster_user, include_unclustered)
   end
 
-  def cluster_scope_filtered(scope,cluster_id)
-    Klastera.cluster_scope_filtered!(
-      scope,
-      cluster_id,
-      cluster_user,
-      cluster_organization
-    )
+  def cluster_scope(scope_klass, cluster_filter=nil, force_cluster_clause=false)
+    Klastera.cluster_scope!(scope_klass, cluster_user, cluster_organization, cluster_filter, force_cluster_clause)
   end
 
-  def clusters_from(scope)
-    Klastera.clusters_from!(scope,cluster_user,cluster_organization)
+  def cluster_scope_through_of(relation, cluster_entity_klass, scope_klass, cluster_filter=nil, force_cluster_clause=false)
+    Klastera.cluster_scope_through_of!(relation, cluster_entity_klass, scope_klass, cluster_user, cluster_organization, cluster_filter, force_cluster_clause)
   end
 
-  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
-    )
+  def group_by_cluster_scope(scope_klass, cluster_filter=[], scope_scopes=[])
+    Klastera.group_by_cluster_scope!(scope_klass, cluster_user, cluster_organization, cluster_filter, scope_scopes)
   end
 
-  def set_collection_before_group_by_entity(active_record_collection,entity_params,&block)
-    Klastera.set_collection_before_group_by_entity!(active_record_collection,params,cluster_organization,&block)
+  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
 
   included do
@@ -275,6 +185,5 @@ module Klastera
         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.4.2"
+  VERSION = "1.4"
 end

data/lib/tasks/klastera_tasks.rake

@@ -13,6 +13,11 @@ namespace :klastera do
         klass = args.entity.constantize
         ActiveRecord::Base.transaction do
           klass.where.not(cluster_id: nil).each do |entity|
+            if entity.cluster.blank?
+              puts "Cluster ID #{entity.cluster_id} was not found!"
+              puts "skip..."
+              next
+            end
             Klastera::ClusterEntity.create(entity: entity, cluster: entity.cluster)
           end
         end

metadata

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