klastera 1.3 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 999d5c067d080b90f56c82a36cbeb286e08000bf09af922845bdd67df023d16c
-  data.tar.gz: e4e105b33d55b228cc4d515e0167586b7b962218860d78593a29f6a71b436712
+  metadata.gz: a8ffbcdd772da4880e6fac3a2fa9165754a873673afb5f2108161d099e634622
+  data.tar.gz: 8541bb3c9c26b8e0084e42b91ef9262b443dbaf1250e4bd209a2fde9db6d92a9
 SHA512:
-  metadata.gz: 6902637aaf11219cff0b3ed2f9dcdf1f86c74d2e6c43211d683c559177da39498220d5fca6b987418b936a89c6b08dde5d49a0014d0b86d1fe3c258612912f92
-  data.tar.gz: 1ec8aad0c6793c426c01969bcdb9f04deed692b06499b0726ee047f13932fda3fe5046067432604947cf85e68662269569d61c482971b8855595a92dc87d1d29
+  metadata.gz: e43f85ef19e054e32274ad4c5c99db112333c76fa831383e72f3e0f7d7ad312d5b48519c33794a46ad3148dd4d50cca62117620e756b12933f0889a9891ad631
+  data.tar.gz: dc98ab10fc1588bec841af4b1e3a4caee5b976986e8023b7528c70190ee2b27fb2e230855773aaa1fcf1a28392380b9f63d186b9165e4f5704acf2631cd3d40f

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

@@ -12,6 +12,7 @@ module Klastera::Concerns::Cluster
 
     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)
@@ -42,7 +43,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?
@@ -60,24 +61,5 @@ module Klastera::Concerns::Cluster
   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/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

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/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/_options.html.erb

@@ -19,20 +19,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/lib/klastera.rb

@@ -8,7 +8,7 @@ module Klastera
   UNCLUSTERED_ENTITY = 'without_cluster'
   KLSTR_HELPERS = %i[
     cluster_user cluster_organization user_has_more_than_one_cluster cluster_scope cluster_of_my_own
-    user_clusters_string_list set_collection_before_group_by_entity
+    user_clusters_string_list set_collection_before_group_by_entity __cluster_scope
   ]
 
   class << self
@@ -50,7 +50,7 @@ module Klastera
       if model_relations.include?(entity_params[0])
         entity_params << "#{entity_params[0]}_id".to_sym
         if entity_params[0] == 'cluster'
-          entity_params << :unclustered if organization.is_in_cluster_mode?
+          entity_params << I18n.t("klastera.#{UNCLUSTERED_ENTITY}") if organization.is_in_cluster_mode?
           active_record_collection = Klastera.filter_clusterized!(
             active_record_collection,
             entity_params[2],
@@ -113,6 +113,44 @@ module Klastera
       scope_klass
     end
 
+    # 
+    # Untested version for more optimized queries
+    #
+    def __cluster_scope!(scope,user,organization,cluster_id=nil,same_scope:false)
+      scope_klass = scope_class(scope)
+      if organization.is_in_cluster_mode?
+        scope_klass = scope_klass.includes(:organization)
+
+        if cluster_id.present?
+          cluster_ids = cluster_id.is_a?(Array) ? cluster_id : [cluster_id]
+        else
+          clusters = cluster_of!(user,organization)
+          cluster_ids = clusters.map(&:id).compact
+        end
+
+        scope_klass = scope_klass.select("DISTINCT ON (#{scope.table_name}.id) #{scope.table_name}.id, #{scope.table_name}.*, clusters.*")
+
+        if organization.required_suborganization_mode?
+          scope_klass = scope_klass.includes(cluster_entities: :cluster).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}'
+          ").joins("
+            LEFT OUTER JOIN clusters
+              ON clusters.id = cluster_entities.cluster_id
+          ").where("cluster_entities.id IS NULL#{or_these_cluster_ids}")
+        end
+        # Provisional fix to avoid unresolved SQL clashes with the main application due to DISTINCT ON clause
+        unless same_scope
+          scope_klass = scope_class(scope).eager_load(:cluster_entities).where(id: scope_klass.map(&:id))
+        end
+      end
+      scope_klass.where(organization_id: organization)
+    end
+
     ##
      # TODO:
      # Implement a validation to ensure that
@@ -207,6 +245,10 @@ module Klastera
     Klastera.cluster_scope!(scope, cluster_user, cluster_organization, cluster_id)
   end
 
+  def __cluster_scope(scope,cluster_id=nil,same_scope:false)
+    Klastera.__cluster_scope!(scope, cluster_user, cluster_organization, cluster_id, same_scope: same_scope)
+  end
+
   def cluster_of_my_own
     Klastera.cluster_of!(cluster_user, cluster_organization)
   end

data/lib/klastera/version.rb

@@ -1,3 +1,3 @@
 module Klastera
-  VERSION = "1.3"
-end
+  VERSION = "1.3.1"
+end

metadata

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