decidim-assemblies 0.29.2 → 0.30.0.rc2

data/lib/decidim/assemblies/test/factories.rb

@@ -29,6 +29,7 @@ FactoryBot.define do
     hero_image { Decidim::Dev.test_file("city.jpeg", "image/jpeg") } # Keep after organization
     banner_image { Decidim::Dev.test_file("city2.jpeg", "image/jpeg") } # Keep after organization
     published_at { Time.current }
+    deleted_at { nil }
     meta_scope { generate_localized_word(:assembly_meta_scope, skip_injection:) }
     developer_group { generate_localized_title(:assembly_developer_group, skip_injection:) }
     local_area { generate_localized_title(:assembly_local_area, skip_injection:) }
@@ -56,10 +57,6 @@ FactoryBot.define do
     weight { 1 }
     announcement { generate_localized_title(:assembly_announcement, skip_injection:) }
 
-    trait :with_type do
-      assembly_type { create :assemblies_type, organization:, skip_injection: }
-    end
-
     trait :promoted do
       promoted { true }
     end
@@ -72,8 +69,12 @@ FactoryBot.define do
       published_at { Time.current }
     end
 
+    trait :trashed do
+      deleted_at { Time.current }
+    end
+
     trait :with_parent do
-      parent { create :assembly, organization:, skip_injection: }
+      parent { create(:assembly, organization:, skip_injection:) }
     end
 
     trait :public do
@@ -115,7 +116,7 @@ FactoryBot.define do
       skip_injection { false }
     end
     user
-    assembly { create :assembly, organization: user.organization, skip_injection: }
+    assembly { create(:assembly, organization: user.organization, skip_injection:) }
     role { "admin" }
   end
 
@@ -129,11 +130,11 @@ FactoryBot.define do
     admin_terms_accepted_at { Time.current }
 
     after(:create) do |user, evaluator|
-      create :assembly_user_role,
+      create(:assembly_user_role,
              user:,
              assembly: evaluator.assembly,
              skip_injection: evaluator.skip_injection,
-             role: :admin
+             role: :admin)
     end
   end
 
@@ -147,11 +148,11 @@ FactoryBot.define do
     admin_terms_accepted_at { Time.current }
 
     after(:create) do |user, evaluator|
-      create :assembly_user_role,
+      create(:assembly_user_role,
              user:,
              assembly: evaluator.assembly,
              role: :moderator,
-             skip_injection: evaluator.skip_injection
+             skip_injection: evaluator.skip_injection)
     end
   end
 
@@ -165,11 +166,11 @@ FactoryBot.define do
     admin_terms_accepted_at { Time.current }
 
     after(:create) do |user, evaluator|
-      create :assembly_user_role,
+      create(:assembly_user_role,
              user:,
              assembly: evaluator.assembly,
              role: :collaborator,
-             skip_injection: evaluator.skip_injection
+             skip_injection: evaluator.skip_injection)
     end
   end
 
@@ -183,33 +184,11 @@ FactoryBot.define do
     admin_terms_accepted_at { Time.current }
 
     after(:create) do |user, evaluator|
-      create :assembly_user_role,
+      create(:assembly_user_role,
              user:,
              assembly: evaluator.assembly,
              role: :valuator,
-             skip_injection: evaluator.skip_injection
-    end
-  end
-
-  factory :assembly_member, class: "Decidim::AssemblyMember" do
-    transient do
-      skip_injection { false }
-    end
-    assembly { create(:assembly, skip_injection:) }
-
-    full_name { Faker::Name.name }
-    gender { Faker::Lorem.word }
-    birthday { Faker::Date.birthday(min_age: 18, max_age: 65) }
-    birthplace { Faker::Lorem.word }
-    position { Decidim::AssemblyMember::POSITIONS.first }
-    designation_date { Faker::Date.between(from: 1.year.ago, to: 1.month.ago) }
-
-    trait :ceased do
-      ceased_date { Faker::Date.between(from: 1.day.ago, to: 5.days.ago) }
-    end
-
-    trait :with_user do
-      user { create(:user, organization: assembly.organization, skip_injection:) }
+             skip_injection: evaluator.skip_injection)
     end
   end
 end

data/lib/decidim/assemblies/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-assemblies version.
   module Assemblies
     def self.version
-      "0.29.2"
+      "0.30.0.rc2"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-assemblies
 version: !ruby/object:Gem::Version
-  version: 0.29.2
+  version: 0.30.0.rc2
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-12 00:00:00.000000000 Z
+date: 2025-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -18,70 +18,70 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.2
+        version: 0.30.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.2
+        version: 0.30.0.rc2
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.2
+        version: 0.30.0.rc2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.2
+        version: 0.30.0.rc2
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.2
+        version: 0.30.0.rc2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.2
+        version: 0.30.0.rc2
 - !ruby/object:Gem::Dependency
   name: decidim-meetings
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.2
+        version: 0.30.0.rc2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.2
+        version: 0.30.0.rc2
 - !ruby/object:Gem::Dependency
   name: decidim-proposals
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.2
+        version: 0.30.0.rc2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.2
+        version: 0.30.0.rc2
 description: Assemblies component for decidim.
 email:
 - josepjaume@gmail.com
@@ -98,10 +98,6 @@ files:
 - app/cells/decidim/assemblies/assembly_cell.rb
 - app/cells/decidim/assemblies/assembly_dropdown_metadata_cell.rb
 - app/cells/decidim/assemblies/assembly_g_cell.rb
-- app/cells/decidim/assemblies/assembly_member/data.erb
-- app/cells/decidim/assemblies/assembly_member/name_and_position.erb
-- app/cells/decidim/assemblies/assembly_member/show.erb
-- app/cells/decidim/assemblies/assembly_member_cell.rb
 - app/cells/decidim/assemblies/assembly_metadata_g_cell.rb
 - app/cells/decidim/assemblies/assembly_s_cell.rb
 - app/cells/decidim/assemblies/content_block_cell.rb
@@ -120,21 +116,16 @@ files:
 - app/commands/decidim/assemblies/admin/copy_assembly.rb
 - app/commands/decidim/assemblies/admin/create_assemblies_type.rb
 - app/commands/decidim/assemblies/admin/create_assembly.rb
-- app/commands/decidim/assemblies/admin/create_assembly_member.rb
-- app/commands/decidim/assemblies/admin/destroy_assembly_member.rb
 - app/commands/decidim/assemblies/admin/import_assembly.rb
 - app/commands/decidim/assemblies/admin/update_assemblies_type.rb
 - app/commands/decidim/assemblies/admin/update_assembly.rb
-- app/commands/decidim/assemblies/admin/update_assembly_member.rb
 - app/constraints/decidim/assemblies/current_assembly.rb
 - app/constraints/decidim/assemblies/current_component.rb
 - app/controllers/concerns/decidim/assemblies/admin/assembly_context.rb
-- app/controllers/concerns/decidim/assemblies/admin/assembly_members/filterable.rb
 - app/controllers/concerns/decidim/assemblies/admin/filterable.rb
 - app/controllers/concerns/decidim/assemblies/assembly_breadcrumb.rb
 - app/controllers/decidim/assemblies/admin/application_controller.rb
 - app/controllers/decidim/assemblies/admin/assemblies_controller.rb
-- app/controllers/decidim/assemblies/admin/assemblies_types_controller.rb
 - app/controllers/decidim/assemblies/admin/assembly_attachment_collections_controller.rb
 - app/controllers/decidim/assemblies/admin/assembly_attachments_controller.rb
 - app/controllers/decidim/assemblies/admin/assembly_copies_controller.rb
@@ -142,11 +133,11 @@ files:
 - app/controllers/decidim/assemblies/admin/assembly_imports_controller.rb
 - app/controllers/decidim/assemblies/admin/assembly_landing_page_content_blocks_controller.rb
 - app/controllers/decidim/assemblies/admin/assembly_landing_page_controller.rb
-- app/controllers/decidim/assemblies/admin/assembly_members_controller.rb
 - app/controllers/decidim/assemblies/admin/assembly_publications_controller.rb
+- app/controllers/decidim/assemblies/admin/assembly_share_tokens_controller.rb
 - app/controllers/decidim/assemblies/admin/assembly_user_roles_controller.rb
-- app/controllers/decidim/assemblies/admin/categories_controller.rb
 - app/controllers/decidim/assemblies/admin/component_permissions_controller.rb
+- app/controllers/decidim/assemblies/admin/component_share_tokens_controller.rb
 - app/controllers/decidim/assemblies/admin/components_controller.rb
 - app/controllers/decidim/assemblies/admin/concerns/assembly_admin.rb
 - app/controllers/decidim/assemblies/admin/exports_controller.rb
@@ -158,44 +149,36 @@ files:
 - app/controllers/decidim/assemblies/admin/reminders_controller.rb
 - app/controllers/decidim/assemblies/application_controller.rb
 - app/controllers/decidim/assemblies/assemblies_controller.rb
-- app/controllers/decidim/assemblies/assembly_members_controller.rb
-- app/events/decidim/assemblies/create_assembly_member_event.rb
+- app/controllers/decidim/assemblies/participatory_space_private_users_controller.rb
 - app/events/decidim/role_assigned_to_assembly_event.rb
 - app/forms/decidim/assemblies/admin/assemblies_type_form.rb
 - app/forms/decidim/assemblies/admin/assembly_copy_form.rb
 - app/forms/decidim/assemblies/admin/assembly_form.rb
 - app/forms/decidim/assemblies/admin/assembly_import_form.rb
-- app/forms/decidim/assemblies/admin/assembly_member_form.rb
 - app/forms/decidim/assemblies/admin/assembly_user_role_form.rb
 - app/helpers/decidim/assemblies/admin/assemblies_admin_menu_helper.rb
 - app/helpers/decidim/assemblies/admin/assemblies_helper.rb
-- app/helpers/decidim/assemblies/admin/assembly_members_helper.rb
 - app/helpers/decidim/assemblies/application_helper.rb
 - app/helpers/decidim/assemblies/assemblies_helper.rb
 - app/helpers/decidim/assemblies/filter_assemblies_helper.rb
 - app/models/decidim/assemblies_type.rb
 - app/models/decidim/assembly.rb
-- app/models/decidim/assembly_member.rb
 - app/models/decidim/assembly_user_role.rb
 - app/packs/entrypoints/decidim_assemblies.js
 - app/packs/entrypoints/decidim_assemblies_admin.js
+- app/packs/entrypoints/decidim_assemblies_admin_list.js
 - app/packs/images/decidim/assemblies/decidim_assemblies.svg
 - app/packs/src/decidim/assemblies/admin/assemblies.js
-- app/packs/src/decidim/assemblies/admin/assembly_members.js
+- app/packs/src/decidim/assemblies/admin/assemblies_list.js
 - app/packs/src/decidim/assemblies/assemblies.js
-- app/packs/src/decidim/assemblies/orgchart.js
 - app/permissions/decidim/assemblies/permissions.rb
-- app/presenters/decidim/admin/assembly_member_presenter.rb
 - app/presenters/decidim/assemblies/admin_log/assemblies_setting_presenter.rb
 - app/presenters/decidim/assemblies/admin_log/assemblies_type_presenter.rb
-- app/presenters/decidim/assemblies/admin_log/assembly_member_presenter.rb
 - app/presenters/decidim/assemblies/admin_log/assembly_presenter.rb
 - app/presenters/decidim/assemblies/admin_log/assembly_user_role_presenter.rb
-- app/presenters/decidim/assemblies/admin_log/value_types/member_position_presenter.rb
 - app/presenters/decidim/assemblies/admin_log/value_types/role_presenter.rb
 - app/presenters/decidim/assemblies/assembly_presenter.rb
 - app/presenters/decidim/assemblies/assembly_stats_presenter.rb
-- app/presenters/decidim/assembly_member_presenter.rb
 - app/presenters/decidim/assembly_presenter.rb
 - app/presenters/decidim/log/value_types/assembly_presenter.rb
 - app/presenters/decidim/log/value_types/assembly_type_presenter.rb
@@ -214,23 +197,20 @@ files:
 - app/queries/decidim/assemblies/visible_assemblies.rb
 - app/serializers/decidim/assemblies/assembly_importer.rb
 - app/serializers/decidim/assemblies/assembly_serializer.rb
+- app/serializers/decidim/assemblies/open_data_assembly_serializer.rb
 - app/views/decidim/assemblies/_assembly.html.erb
+- app/views/decidim/assemblies/admin/assemblies/_assemblies_thead.html.erb
+- app/views/decidim/assemblies/admin/assemblies/_assembly_row.html.erb
 - app/views/decidim/assemblies/admin/assemblies/_form.html.erb
 - app/views/decidim/assemblies/admin/assemblies/edit.html.erb
 - app/views/decidim/assemblies/admin/assemblies/index.html.erb
+- app/views/decidim/assemblies/admin/assemblies/index.js.erb
+- app/views/decidim/assemblies/admin/assemblies/manage_trash.html.erb
 - app/views/decidim/assemblies/admin/assemblies/new.html.erb
-- app/views/decidim/assemblies/admin/assemblies_types/_form.html.erb
-- app/views/decidim/assemblies/admin/assemblies_types/edit.html.erb
-- app/views/decidim/assemblies/admin/assemblies_types/index.html.erb
-- app/views/decidim/assemblies/admin/assemblies_types/new.html.erb
 - app/views/decidim/assemblies/admin/assembly_copies/_form.html.erb
 - app/views/decidim/assemblies/admin/assembly_copies/new.html.erb
 - app/views/decidim/assemblies/admin/assembly_imports/_form.html.erb
 - app/views/decidim/assemblies/admin/assembly_imports/new.html.erb
-- app/views/decidim/assemblies/admin/assembly_members/_form.html.erb
-- app/views/decidim/assemblies/admin/assembly_members/edit.html.erb
-- app/views/decidim/assemblies/admin/assembly_members/index.html.erb
-- app/views/decidim/assemblies/admin/assembly_members/new.html.erb
 - app/views/decidim/assemblies/admin/assembly_user_roles/_form.html.erb
 - app/views/decidim/assemblies/admin/assembly_user_roles/edit.html.erb
 - app/views/decidim/assemblies/admin/assembly_user_roles/index.html.erb
@@ -239,13 +219,11 @@ files:
 - app/views/decidim/assemblies/assemblies/index.html.erb
 - app/views/decidim/assemblies/assemblies/index.js.erb
 - app/views/decidim/assemblies/assemblies/show.html.erb
-- app/views/decidim/assemblies/assembly_members/index.html.erb
 - app/views/decidim/assemblies/pages/user_profile/_member_of.html.erb
-- app/views/decidim/assembly_members/_assembly_member.html.erb
+- app/views/decidim/assemblies/participatory_space_private_users/index.html.erb
 - app/views/layouts/decidim/admin/_manage_assemblies.html.erb
 - app/views/layouts/decidim/admin/assemblies.html.erb
 - app/views/layouts/decidim/admin/assemblies_imports.html.erb
-- app/views/layouts/decidim/admin/assemblies_types.html.erb
 - app/views/layouts/decidim/admin/assembly.html.erb
 - config/assets.rb
 - config/locales/am-ET.yml
@@ -353,9 +331,11 @@ files:
 - db/migrate/20210507063604_add_announcement_to_assemblies.rb
 - db/migrate/20210907120249_remove_designation_mode_from_assembly_members.rb
 - db/migrate/20240712061153_change_show_statistics_from_decidim_assemblies.rb
+- db/migrate/20240822161222_add_deleted_at_to_decidim_assemblies.rb
+- db/migrate/20241016101151_migrate_assembly_members_to_private_users.rb
+- db/migrate/20241108141651_remove_column_show_statistics_from_assemblies.rb
 - decidim-assemblies.gemspec
 - lib/decidim/api/assemblies_type_type.rb
-- lib/decidim/api/assembly_member_type.rb
 - lib/decidim/api/assembly_type.rb
 - lib/decidim/assemblies.rb
 - lib/decidim/assemblies/admin.rb
@@ -386,14 +366,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: 3.2.0
+      version: 3.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: Decidim assemblies module

data/app/cells/decidim/assemblies/assembly_member/data.erb

@@ -1,19 +0,0 @@
-<div class="profile__user-avatar-container">
-  <div class="<%= has_profile? ? "profile__user-avatar" : "profile__user-avatar !border-0" %>">
-    <%= image_tag(has_profile? ? model.avatar_url(:big) : model.non_user_avatar_path, alt: "member-avatar") %>
-  </div>
-</div>
-<div>
-  <%= render :name_and_position %>
-  <div class="mt-2">
-    <span class="text-gray-2">
-      <%= t("decidim.assembly_members.assembly_member.designated_on") %>
-    </span>
-    <strong>
-      <%= l designation_date, format: :decidim_short %>
-    </strong>
-  </div>
-  <span class="profile__user-nick">
-    <%= personal_information %>
-  </span>
-</div>

data/app/cells/decidim/assemblies/assembly_member/name_and_position.erb

@@ -1,11 +0,0 @@
-<div class="<%= has_profile? ? "profile__user-name" : "profile__user-name !no-underline" %>">
-  <%= name %>
-  <span class="capitalize label alert">
-    <%= position %>
-  </span>
-</div>
-<% if nickname.present? %>
-  <span class="profile__user-nick block">
-    <%= nickname %>
-  </span>
-<% end %>

data/app/cells/decidim/assemblies/assembly_member/show.erb

@@ -1,9 +0,0 @@
-<% if has_profile? %>
-  <%= link_to profile_url, class: "profile__user" do %>
-    <%= render :data %>
-  <% end %>
-<% else %>
-  <div class="profile__user">
-    <%= render :data %>
-  </div>
-<% end %>

data/app/cells/decidim/assemblies/assembly_member_cell.rb

@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Assemblies
-    # This cell renders the card for an instance of an Assembly member
-    class AssemblyMemberCell < Decidim::ViewModel
-      property :designation_date
-      property :name
-      property :nickname
-      property :personal_information
-      property :position
-      property :profile_url
-
-      private
-
-      def has_profile?
-        model.profile_url.present?
-      end
-    end
-  end
-end

data/app/commands/decidim/assemblies/admin/create_assembly_member.rb

@@ -1,55 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Assemblies
-    module Admin
-      # A command with all the business logic when creating a new assembly
-      # member in the system.
-      class CreateAssemblyMember < Decidim::Commands::CreateResource
-        fetch_file_attributes :non_user_avatar
-
-        fetch_form_attributes :full_name, :gender, :birthday, :birthplace, :ceased_date, :designation_date,
-                              :position, :position_other, :user
-
-        protected
-
-        def run_after_hooks
-          notify_assembly_member_about_new_membership
-        end
-
-        private
-
-        def attributes
-          super.merge(assembly: form.participatory_space)
-        end
-
-        def resource_class = Decidim::AssemblyMember
-
-        def extra_params
-          {
-            resource: {
-              title: form.full_name
-            },
-            participatory_space: {
-              title: form.participatory_space.title
-            }
-          }
-        end
-
-        def followers
-          form.user.is_a?(Decidim::UserGroup) ? form.user.users : [form.user]
-        end
-
-        def notify_assembly_member_about_new_membership
-          data = {
-            event: "decidim.events.assemblies.create_assembly_member",
-            event_class: Decidim::Assemblies::CreateAssemblyMemberEvent,
-            resource: form.participatory_space,
-            followers:
-          }
-          Decidim::EventsManager.publish(**data)
-        end
-      end
-    end
-  end
-end

data/app/commands/decidim/assemblies/admin/destroy_assembly_member.rb

@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Assemblies
-    module Admin
-      # A command with all the business logic when destroying an assembly
-      # member in the system.
-      class DestroyAssemblyMember < Decidim::Commands::DestroyResource
-        private
-
-        def extra_params
-          {
-            resource: {
-              title: resource.full_name
-            },
-            participatory_space: {
-              title: resource.assembly.title
-            }
-          }
-        end
-      end
-    end
-  end
-end

data/app/commands/decidim/assemblies/admin/update_assembly_member.rb

@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Assemblies
-    module Admin
-      # A command with all the business logic when updating an assembly
-      # member in the system.
-      class UpdateAssemblyMember < Decidim::Commands::UpdateResource
-        fetch_file_attributes :non_user_avatar
-
-        fetch_form_attributes :full_name, :gender, :birthday, :birthplace, :ceased_date, :designation_date,
-                              :position, :position_other, :weight, :user
-
-        private
-
-        def extra_params
-          {
-            resource: {
-              title: resource.full_name
-            },
-            participatory_space: {
-              title: resource.assembly.title
-            }
-          }
-        end
-      end
-    end
-  end
-end

data/app/controllers/concerns/decidim/assemblies/admin/assembly_members/filterable.rb

@@ -1,39 +0,0 @@
-# frozen_string_literal: true
-
-require "active_support/concern"
-
-module Decidim
-  module Assemblies
-    module Admin
-      module AssemblyMembers
-        module Filterable
-          extend ActiveSupport::Concern
-
-          included do
-            include Decidim::Admin::Filterable
-
-            private
-
-            def filters
-              [:ceased_date_not_null]
-            end
-
-            def filters_with_values
-              {
-                ceased_date_not_null: %w(true false)
-              }
-            end
-
-            def base_query
-              collection
-            end
-
-            def search_field_predicate
-              :full_name_or_user_name_or_user_nickname_cont
-            end
-          end
-        end
-      end
-    end
-  end
-end