effective_organizations 0.0.4 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1680db25ffadd9aedde1cda52429e5b4d42ee4b2c6c2a16a801631099b7e3db6
-  data.tar.gz: b0ba4cfb29be4714b411101f2c2a50e073a433458c69453f0f032d73b0bcbc4d
+  metadata.gz: 71f3a2d048f4c02e6388c77579b8c0ba2f348eb08574fcb9137759dceb0b5caa
+  data.tar.gz: c5fe4918cf3116a728c6d0bb6ae0acd4146f4ebd2148b9012dc905041a70523e
 SHA512:
-  metadata.gz: cbb3f71d72a698486a909e5c7cb418adb1862254d4d1b3868ab4be56ce6a14c4fc18e7e6f3d1c71649700a7186f3ceeb144ef7fe866f5d5a7e71fe7589bbace4
-  data.tar.gz: 4e3bd0d65a5b370d3f8ad1284dc660720af0bc5b39165c82b265ac421d75ddab6dc1246f63aeba5aebed32f6c77298f211073671420dcbbb9abf8dac3709615a
+  metadata.gz: 92bac27ea6827e568a9ec4ca409feb38e8b162e4b213ea63c7451570be3bc51aa03ee6fd89a6c4ef85da4307e74f19b1157ceafbaa87a9ca1bb25d8f94ba1f4c
+  data.tar.gz: 1a1fd5f3e02af92f13f4c303c12e11e08226e7dfb4f4e244d22b6785f8409493254cbe2b7d5c96000d5c9bb1705215e10b9cd1914828ceecf63d5acb2c336d8c

data/app/datatables/effective_representatives_datatable.rb

@@ -11,11 +11,24 @@ class EffectiveRepresentativesDatatable < Effective::Datatable
 
     col :roles, search: roles_collection
 
-    actions_col
+    unless attributes[:actions] == false
+      actions_col
+    end
+
   end
 
   collection do
-    Effective::Representative.deep.all.where(organization: current_user.organizations)
+    scope = Effective::Representative.deep.all.where(organization: current_user.organizations)
+
+    if attributes[:organization_id]
+      scope = scope.where(organization_id: attributes[:organization_id])
+    end
+
+    if attributes[:user_id]
+      scope = scope.where(user_id: attributes[:user_id])
+    end
+
+    scope
   end
 
   def roles_collection

data/app/models/concerns/effective_organizations_organization.rb

@@ -6,11 +6,7 @@ module EffectiveOrganizationsOrganization
   extend ActiveSupport::Concern
 
   module Base
-    def effective_organizations_organization(users_source_type: nil)
-      @effective_organizations_organization_opts = {
-        users_source_type: users_source_type
-      }
-
+    def effective_organizations_organization
       include ::EffectiveOrganizationsOrganization
     end
   end
@@ -32,8 +28,7 @@ module EffectiveOrganizationsOrganization
     has_many :representatives, -> { Effective::Representative.sorted },
       class_name: 'Effective::Representative', inverse_of: :organization, dependent: :delete_all
 
-    has_many :users, through: :representatives,
-      source_type: (@effective_organizations_organization_opts[:users_source_type] || (name.start_with?('Effective') ? '::User' : "#{name.split('::').first}::Organization"))
+    accepts_nested_attributes_for :representatives, allow_destroy: true
 
     effective_resource do
       title                 :string
@@ -54,8 +49,17 @@ module EffectiveOrganizationsOrganization
 
   # Instance Methods
 
-  def to_s
-    title.presence || 'New Organization'
+  def representative(user:)
+    representatives.find { |rep| rep.user_id == user.id }
+  end
+
+  # Find or build
+  def build_representative(user:)
+    representative(user: user) || representatives.build(user: user)
+  end
+
+  def users
+    representatives.reject(&:marked_for_destruction?).map(&:user)
   end
 
 end

data/app/models/concerns/effective_organizations_user.rb

@@ -6,11 +6,7 @@ module EffectiveOrganizationsUser
   extend ActiveSupport::Concern
 
   module Base
-    def effective_organizations_user(organizations_source_type: nil)
-      @effective_organizations_user_opts = {
-        organizations_source_type: organizations_source_type
-      }
-
+    def effective_organizations_user
       include ::EffectiveOrganizationsUser
     end
   end
@@ -20,17 +16,25 @@ module EffectiveOrganizationsUser
   end
 
   included do
-    # My teams
     has_many :representatives, -> { Effective::Representative.sorted },
       class_name: 'Effective::Representative', inverse_of: :user, dependent: :delete_all
 
-    # App scoped
-    has_many :organizations, through: :representatives,
-      source_type: @effective_organizations_user_opts[:organizations_source_type] || "#{name.split('::').first}::Organization"
+    accepts_nested_attributes_for :representatives, allow_destroy: true
   end
 
+  # Instance Methods
+
   def representative(organization:)
     representatives.find { |rep| rep.organization_id == organization.id }
   end
 
+  # Find or build
+  def build_representative(organization:)
+    representative(organization: organization) || representatives.build(organization: organization)
+  end
+
+  def organizations
+    representatives.reject(&:marked_for_destruction?).map(&:organization)
+  end
+
 end

data/app/views/effective/organizations/_dashboard.html.haml

@@ -4,7 +4,7 @@
   %p You belong to #{pluralize(current_user.organizations.length, 'organization')}
 
   - datatable = EffectiveResources.best('EffectiveOrganizationsDatatable').new(self, namespace: :effective)
-  = render_datatable(datatable)
+  = render_datatable(datatable, simple: true)
 
 - else
   %p You do not belong to any organizations.

data/app/views/effective/organizations/_form_organization.html.haml

@@ -7,5 +7,5 @@
 
 - if organization.persisted?
   %h2 Representatives
-  - datatable = EffectiveRepresentativesDatatable.new(organization_id: organization.id)
+  - datatable = EffectiveRepresentativesDatatable.new(organization: organization)
   = render_inline_datatable(datatable)

data/lib/effective_organizations/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrganizations
-  VERSION = '0.0.4'.freeze
+  VERSION = '0.0.8'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_organizations
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.8
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-15 00:00:00.000000000 Z
+date: 2021-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails