effective_organizations 0.0.5 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f978ab4fee3200d82c2f9c6858f707d35155c0da70f0f4a611e558597ea17e2
-  data.tar.gz: 67a3e163f691e3baeec1e48ce0687fcb649e491b65e4fb9a01cd03575726b59c
+  metadata.gz: c1251bb3a7cf64ab3a2cc1019031611b6e62bcde3e146026075ca9f3a09a4950
+  data.tar.gz: c240b5ef71a712a338ccf3153a91f06babde47008cb5b30990fc88049406ed6b
 SHA512:
-  metadata.gz: 2f07c62ddd2d61aa1f31c5abba3d5cd56b019b6fc58e474d1b063f3246416d077d357109b7c66fe9f514c1d263e18e23488662c9c2701fe52db5738ddba6ffe1
-  data.tar.gz: ea9ecd0a199c925c5ddd3550a83524d23fab81d48c4e91d620bee64970d7ae95238f561c8184bbeb4c43182db2e7b030e1afa97d663049c2c1b8c24b706f2a16
+  metadata.gz: 444bb29c6c1ec54d698e10f4b0ba16cf418fccfede8aad5ef06fa59adc9ea3253f8f67bc5932e2d312fee608d609dc8bc9ef5ca5f9f832fadea700574bffe2d5
+  data.tar.gz: 2c0807e703a5bd3ff0db559de7d963e2f6ba3f772558543f16118063172cf1d4de3a6baba579adf054689b37e65a5149fa1ecc7a0a9ccfa19e7573edc2908715

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

@@ -1,10 +1,10 @@
 %h2 Organizations
 
 - if current_user.organizations.present?
-  %p You belong to #{pluralize(current_user.organizations.length, 'organization')}
+  %p You are a representative for #{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.
+  %p You are not a representative. When you create an organization, or if someone else adds you to their organization, we'll show them here.

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.5'.freeze
+  VERSION = '0.0.9'.freeze
 end

metadata

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