effective_organizations 0.0.3 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d1867153f3a3fd958c18fd26c374fba6a439516480ffac3825aabdbc5dadf5f
-  data.tar.gz: 14bf4b503c58169387f886c3781bb2843f51cf90fedd3994eb5333850abc8461
+  metadata.gz: cacbee4a7dd40f4151038a00c39b0e7ef134f0ec739ee29753bc8aa34a73dc8c
+  data.tar.gz: 38e3039961b2ff7ceff0b66090370c9ace3f54ab6f16c666cdc68ca82b699d03
 SHA512:
-  metadata.gz: 7139213c4c010b19cb733d50c1b042fb25f23246c1c1295ca23fe05c1f17e9705f64476b46acbe19833b0b13c7ade72918207b0fceab50fc62586163c332ed92
-  data.tar.gz: ee0dd2280a17fd2ba168a257a875608bf8027b7548db9d3482728f54e4b3898087645d212f860e8307eb0aa8fbfdbe55626327608858ad8aa6911365ad30d280
+  metadata.gz: bd0fd64f099a8a15adb96f3d7d0be5952e4a371f33beddab08427491b818fdcfd12484c376fceb8f0b468ed88423cd47f95c39f8bd9d45e14d2f51c98071b7fa
+  data.tar.gz: 5a69fcb0b32b336e92cfe714c4641e1f38b7a549080e11e20c27031320a9a661d02c06fb7567831f04e105c0f7b9f3c1f4ee003342d67b0a05e4348317feffd9

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/admin/organizations/_form_organization.html.haml

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

data/app/views/admin/representatives/_form.html.haml

@@ -4,12 +4,13 @@
   = f.hidden_field :user_id
   = f.hidden_field :user_type
   = f.hidden_field :organization_id
+  = f.hidden_field :organization_type
 
   - if f.object.new_record?
     - unless inline_datatable? && inline_datatable.attributes[:organization_id].present?
       = f.select :organization, { 'Organizations' => EffectiveOrganizations.Organization.sorted }, polymorphic: true
 
-    = f.checks :roles, EffectiveRoles.roles_collection(f.object)
+    = f.checks :roles, EffectiveRoles.roles_collection(f.object, skip_disabled: true)
 
     - unless inline_datatable? && inline_datatable.attributes[:user_id].present?
       = f.radios :new_representative_user_action, ['Invite new user', 'Add existing user'], inline: true, label: 'Representative'
@@ -28,7 +29,7 @@
     - unless inline_datatable? && inline_datatable.attributes[:user_id].present?
       = f.static_field :user
 
-    = f.checks :roles, EffectiveRoles.roles_collection(f.object)
+    = f.checks :roles, EffectiveRoles.roles_collection(f.object, skip_disabled: true)
 
     - unless inline_datatable? && inline_datatable.attributes[:user_id].present?
       = f.fields_for :user, f.object.user do |fu|

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/app/views/effective/representatives/_form.html.haml

@@ -10,7 +10,7 @@
     - unless inline_datatable? && inline_datatable.attributes[:organization_id].present?
       = f.select :organization, { 'Organizations' => EffectiveOrganizations.Organization.sorted }, polymorphic: true
 
-    = f.checks :roles, EffectiveRoles.roles_collection(f.object)
+    = f.checks :roles, EffectiveRoles.roles_collection(f.object, skip_disabled: true)
 
     - unless inline_datatable? && inline_datatable.attributes[:user_id].present?
       = f.hidden_field :new_representative_user_action, value: 'Invite new user'
@@ -25,7 +25,7 @@
     - unless inline_datatable? && inline_datatable.attributes[:user_id].present?
       = f.static_field :user
 
-    = f.checks :roles, EffectiveRoles.roles_collection(f.object)
+    = f.checks :roles, EffectiveRoles.roles_collection(f.object, skip_disabled: true)
 
     = f.fields_for :user, f.object.user do |fu|
       = render 'effective/representatives/user_fields', f: fu

data/lib/effective_organizations/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrganizations
-  VERSION = '0.0.3'.freeze
+  VERSION = '0.0.7'.freeze
 end

metadata

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