effective_organizations 0.0.6 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2ee1cb9ffc7df883ea343966168245ab3d77ba59ef9753a20d825702ba46aaa
-  data.tar.gz: fcd8f65d9dbc66c5073077e6bd7fe9f48774c4444d965c7c4ce95d09c3d97935
+  metadata.gz: 0ed8ea76f6be605f32e951431171d7be4d5c9885adf3adaa51ebd223ad2faa95
+  data.tar.gz: '08a0fa735dc997d95203d90abd6c5657855b6e957b00802800222cf8cfe00d5c'
 SHA512:
-  metadata.gz: a34485e30e3d66f85cb4dff1ed2ccd6656134ac5171c2ceae64e8fc30336144c1ac6c9889dab98b018dbdad0c2b3bda96e583f70583a9907f09eaf1ed4ebe1a0
-  data.tar.gz: fb7e677000619da597b0b43f5ae827211d2d55fca0d51326559b27bb7fc7fbd7b3155260afa37f7768360a0f695d2d80667dabc680414f2479582c645c438dac
+  metadata.gz: 31c96c8af942654f9d314326363228f2cead96f47cd0f7e32f256d7a2362e7e5601bdeb35be78c5bf102c8bfa21d6adfe61664cb991e1d10effe2de937aeef36
+  data.tar.gz: 62ebff63f53a735bb6d185648611d40f717dd469ea03f7f5cb62be5c6027d0248f10f77a38fc8ae2f8bea82d3c2eac9887ead68d847c8fffecaf71032d83d399

data/app/controllers/admin/organizations_controller.rb

@@ -6,7 +6,7 @@ module Admin
     include Effective::CrudController
 
     resource_scope -> { EffectiveOrganizations.Organization.deep.all }
-    datatable -> { Admin::EffectiveOrganizationsDatatable.new }
+    datatable -> { EffectiveResources.best('Admin::EffectiveOrganizationsDatatable').new }
 
     private
 

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
@@ -34,9 +30,6 @@ module EffectiveOrganizationsOrganization
 
     accepts_nested_attributes_for :representatives, allow_destroy: true
 
-    has_many :users, through: :representatives,
-      source_type: (@effective_organizations_organization_opts[:users_source_type] || (name.start_with?('Effective') ? '::User' : "#{name.split('::').first}::Organization"))
-
     effective_resource do
       title                 :string
       category              :string
@@ -56,10 +49,6 @@ module EffectiveOrganizationsOrganization
 
   # Instance Methods
 
-  def to_s
-    title.presence || 'New Organization'
-  end
-
   def representative(user:)
     representatives.find { |rep| rep.user_id == user.id }
   end
@@ -69,4 +58,8 @@ module EffectiveOrganizationsOrganization
     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,19 +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
 
     accepts_nested_attributes_for :representatives, allow_destroy: true
-
-    # App scoped
-    has_many :organizations, through: :representatives,
-      source_type: @effective_organizations_user_opts[:organizations_source_type] || "#{name.split('::').first}::Organization"
   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/lib/effective_organizations/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrganizations
-  VERSION = '0.0.6'.freeze
+  VERSION = '0.1.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_organizations
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.1.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-20 00:00:00.000000000 Z
+date: 2022-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails