decidim-assemblies 0.29.3 → 0.30.0.rc1

data/lib/decidim/assemblies/admin_engine.rb

@@ -16,82 +16,105 @@ module Decidim
       paths["lib/tasks"] = nil
 
       routes do
-        resources :assemblies_types
-
-        resources :assemblies, param: :slug, except: [:show, :destroy] do
-          resource :publish, controller: "assembly_publications", only: [:create, :destroy]
-          resources :copies, controller: "assembly_copies", only: [:new, :create]
-          resources :members, controller: "assembly_members"
-
-          resources :user_roles, controller: "assembly_user_roles" do
-            member do
-              post :resend_invitation, to: "assembly_user_roles#resend_invitation"
+        constraints(->(request) { Decidim::Admin::OrganizationDashboardConstraint.new(request).matches? }) do
+          resources :assemblies, param: :slug, except: [:show, :destroy] do
+            resource :publish, controller: "assembly_publications", only: [:create, :destroy]
+            resources :copies, controller: "assembly_copies", only: [:new, :create]
+            resources :user_roles, controller: "assembly_user_roles" do
+              member do
+                post :resend_invitation, to: "assembly_user_roles#resend_invitation"
+              end
             end
-          end
-
-          resources :attachment_collections, controller: "assembly_attachment_collections", except: [:show]
-          resources :attachments, controller: "assembly_attachments", except: [:show]
-
-          resource :export, controller: "assembly_exports", only: :create
-
-          collection do
-            resources :imports, controller: "assembly_imports", only: [:new, :create]
-          end
 
-          resource :landing_page, only: [:edit, :update], controller: "assembly_landing_page" do
-            resources :content_blocks, only: [:edit, :update, :destroy, :create], controller: "assembly_landing_page_content_blocks"
-          end
-        end
+            resources :attachment_collections, controller: "assembly_attachment_collections", except: [:show]
+            resources :attachments, controller: "assembly_attachments", except: [:show]
 
-        scope "/assemblies/:assembly_slug" do
-          resources :categories, except: [:show]
+            resource :export, controller: "assembly_exports", only: :create
 
-          resources :components do
-            resource :permissions, controller: "component_permissions"
             member do
-              put :publish
-              put :unpublish
-              get :share
+              patch :soft_delete
+              patch :restore
             end
-            resources :exports, only: :create
-            resources :imports, only: [:new, :create] do
-              get :example, on: :collection
+
+            collection do
+              get :manage_trash, to: "assemblies#manage_trash"
+              resources :imports, controller: "assembly_imports", only: [:new, :create]
             end
-            resources :reminders, only: [:new, :create]
-          end
 
-          resources :moderations do
-            member do
-              put :unreport
-              put :hide
-              put :unhide
+            resource :landing_page, only: [:edit, :update], controller: "assembly_landing_page" do
+              resources :content_blocks, only: [:edit, :update, :destroy, :create], controller: "assembly_landing_page_content_blocks"
             end
-            resources :reports, controller: "moderations/reports", only: [:index, :show]
           end
 
-          resources :participatory_space_private_users, controller: "participatory_space_private_users" do
-            member do
-              post :resend_invitation, to: "participatory_space_private_users#resend_invitation"
+          scope "/assemblies/:assembly_slug" do
+            resources :components do
+              collection do
+                put :reorder
+              end
+              resource :permissions, controller: "component_permissions"
+              member do
+                put :publish
+                put :unpublish
+                get :share
+                patch :soft_delete
+                patch :restore
+              end
+              collection do
+                get :manage_trash, to: "components#manage_trash"
+                put :hide
+              end
+              resources :component_share_tokens, except: [:show], path: "share_tokens", as: "share_tokens"
+              resources :exports, only: :create
+              resources :imports, only: [:new, :create] do
+                get :example, on: :collection
+              end
+              resources :reminders, only: [:new, :create]
             end
-            collection do
-              resource :participatory_space_private_users_csv_imports, only: [:new, :create], path: "csv_import" do
-                delete :destroy_all
+
+            resources :moderations do
+              member do
+                put :unreport
+                put :hide
+                put :unhide
+              end
+              patch :bulk_action, on: :collection
+              resources :reports, controller: "moderations/reports", only: [:index, :show]
+            end
+
+            resources :participatory_space_private_users, controller: "participatory_space_private_users" do
+              member do
+                post :resend_invitation, to: "participatory_space_private_users#resend_invitation"
+              end
+              collection do
+                resource :participatory_space_private_users_csv_imports, only: [:new, :create], path: "csv_import" do
+                  delete :destroy_all
+                end
+                post :publish_all
+                post :unpublish_all
               end
             end
+
+            resources :assembly_share_tokens, except: [:show], path: "share_tokens"
           end
-        end
 
-        scope "/assemblies/:assembly_slug/components/:component_id/manage" do
-          Decidim.component_manifests.each do |manifest|
-            next unless manifest.admin_engine
+          scope "/assemblies/:assembly_slug/components/:component_id/manage" do
+            Decidim.component_manifests.each do |manifest|
+              next unless manifest.admin_engine
 
-            constraints CurrentComponent.new(manifest) do
-              mount manifest.admin_engine, at: "/", as: "decidim_admin_assembly_#{manifest.name}"
+              constraints CurrentComponent.new(manifest) do
+                mount manifest.admin_engine, at: "/", as: "decidim_admin_assembly_#{manifest.name}"
+              end
             end
           end
         end
       end
 
+      initializer "decidim_assemblies_admin.mount_routes" do
+        Decidim::Core::Engine.routes do
+          mount Decidim::Assemblies::AdminEngine, at: "/admin", as: "decidim_admin_assemblies"
+        end
+      end
+
       initializer "decidim_assemblies_admin.action_controller" do |app|
         app.config.to_prepare do
           ActiveSupport.on_load :action_controller do

data/lib/decidim/assemblies/api.rb

@@ -3,7 +3,6 @@
 module Decidim
   module Assemblies
     autoload :AssemblyType, "decidim/api/assembly_type"
-    autoload :AssemblyMemberType, "decidim/api/assembly_member_type"
     autoload :AssembliesTypeType, "decidim/api/assemblies_type_type"
   end
 end

data/lib/decidim/assemblies/content_blocks/registry_manager.rb

@@ -111,6 +111,7 @@ module Decidim
             content_block.public_name_key = "decidim.application.photos.related_photos"
           end
 
+          register_highlighted_debates
           register_highlighted_meetings
           register_highlighted_posts
           register_highlighted_proposals
@@ -118,6 +119,16 @@ module Decidim
           register_related_processes
         end
 
+        def self.register_highlighted_debates
+          return unless Decidim.module_installed?(:debates)
+
+          Decidim.content_blocks.register(:assembly_homepage, :highlighted_debates) do |content_block|
+            content_block.cell = "decidim/debates/content_blocks/highlighted_debates"
+            content_block.public_name_key = "decidim.debates.content_blocks.highlighted_debates.name"
+            content_block.component_manifest_name = "debates"
+          end
+        end
+
         def self.register_highlighted_meetings
           return unless Decidim.module_installed?(:meetings)
 

data/lib/decidim/assemblies/engine.rb

@@ -26,7 +26,7 @@ module Decidim
         }, constraints: { assembly_id: /[0-9]+/ }
 
         resources :assemblies, only: [:index, :show], param: :slug, path: "assemblies" do
-          resources :assembly_members, only: :index, path: "members"
+          resources :participatory_space_private_users, only: :index, path: "members"
         end
 
         scope "/assemblies/:assembly_slug/f/:component_id" do
@@ -40,6 +40,12 @@ module Decidim
         end
       end
 
+      initializer "decidim_assemblies.mount_routes" do
+        Decidim::Core::Engine.routes do
+          mount Decidim::Assemblies::Engine, at: "/", as: "decidim_assemblies"
+        end
+      end
+
       initializer "decidim_assemblies.register_icons" do
         Decidim.icons.register(name: "Decidim::Assembly", icon: "government-line", description: "Assembly", category: "activity", engine: :assemblies)
         Decidim.icons.register(name: "assembly_type", icon: "group-2-line", description: "Type", category: "assemblies", engine: :assemblies)
@@ -68,8 +74,8 @@ module Decidim
         Decidim.view_hooks.register(:user_profile_bottom, priority: Decidim::ViewHooks::MEDIUM_PRIORITY) do |view_context|
           assemblies = OrganizationPublishedAssemblies.new(view_context.current_organization, view_context.current_user)
                                                       .query.distinct
-                                                      .joins(:members)
-                                                      .merge(Decidim::AssemblyMember.where(user: view_context.profile_holder))
+                                                      .joins(:participatory_space_private_users)
+                                                      .merge(Decidim::ParticipatorySpacePrivateUser.where(user: view_context.profile_holder))
                                                       .reorder(title: :asc)
 
           next unless assemblies.any?

data/lib/decidim/assemblies/menu.rb

@@ -43,8 +43,7 @@ module Decidim
                         decidim_admin_assemblies.assemblies_path,
                         icon_name: "government-line",
                         position: 2.2,
-                        active: is_active_link?(decidim_admin_assemblies.assemblies_path) ||
-                                is_active_link?(decidim_admin_assemblies.assemblies_types_path),
+                        active: is_active_link?(decidim_admin_assemblies.assemblies_path),
                         if: allowed_to?(:enter, :space_area, space_name: :assemblies)
         end
       end
@@ -78,6 +77,7 @@ module Decidim
                           active: is_active_link?(manage_component_path(component)) ||
                                   is_active_link?(decidim_admin_assemblies.edit_component_path(current_participatory_space, component)) ||
                                   is_active_link?(decidim_admin_assemblies.edit_component_permissions_path(current_participatory_space, component)) ||
+                                  is_active_link?(decidim_admin_assemblies.component_share_tokens_path(current_participatory_space, component)) ||
                                   participatory_space_active_link?(component),
                           if: component.manifest.admin_engine && user_role_config.component_is_accessible?(component.manifest_name)
           end
@@ -107,12 +107,6 @@ module Decidim
                         if: allowed_to?(:read, :component, assembly: current_participatory_space),
                         submenu: { target_menu: :admin_assemblies_components_menu }
 
-          menu.add_item :categories,
-                        I18n.t("categories", scope: "decidim.admin.menu.assemblies_submenu"),
-                        decidim_admin_assemblies.categories_path(current_participatory_space),
-                        icon_name: "price-tag-3-line",
-                        if: allowed_to?(:read, :category, assembly: current_participatory_space)
-
           menu.add_item :attachments,
                         I18n.t("attachments", scope: "decidim.admin.menu.assemblies_submenu"),
                         decidim_admin_assemblies.assembly_attachments_path(current_participatory_space),
@@ -122,12 +116,6 @@ module Decidim
                         if: allowed_to?(:read, :attachment_collection, assembly: current_participatory_space) ||
                             allowed_to?(:read, :attachment, assembly: current_participatory_space)
 
-          menu.add_item :assembly_members,
-                        I18n.t("assembly_members", scope: "decidim.admin.menu.assemblies_submenu"),
-                        decidim_admin_assemblies.assembly_members_path(current_participatory_space),
-                        icon_name: "user-settings-line",
-                        if: allowed_to?(:read, :assembly_member, assembly: current_participatory_space)
-
           menu.add_item :assembly_user_roles,
                         I18n.t("assembly_admins", scope: "decidim.admin.menu.assemblies_submenu"),
                         decidim_admin_assemblies.assembly_user_roles_path(current_participatory_space),
@@ -145,6 +133,13 @@ module Decidim
                         decidim_admin_assemblies.moderations_path(current_participatory_space),
                         icon_name: "flag-line",
                         if: allowed_to?(:read, :moderation, assembly: current_participatory_space)
+
+          menu.add_item :assembly_share_tokens,
+                        I18n.t("menu.share_tokens", scope: "decidim.admin"),
+                        decidim_admin_assemblies.assembly_share_tokens_path(current_participatory_space),
+                        active: is_active_link?(decidim_admin_assemblies.assembly_share_tokens_path(current_participatory_space)),
+                        icon_name: "share-line",
+                        if: allowed_to?(:read, :share_tokens, current_participatory_space:)
         end
       end
 
@@ -165,14 +160,6 @@ module Decidim
                         active: is_active_link?(decidim_admin_assemblies.new_import_path),
                         icon_name: "price-tag-3-line",
                         if: allowed_to?(:import, :assembly)
-
-          menu.add_item :assemblies_types,
-                        I18n.t("menu.assemblies_types", scope: "decidim.admin"),
-                        decidim_admin_assemblies.assemblies_types_path,
-                        position: 3,
-                        active: is_active_link?(decidim_admin_assemblies.assemblies_types_path),
-                        icon_name: "government-line",
-                        if: allowed_to?(:manage, :assemblies_type)
         end
       end
     end

data/lib/decidim/assemblies/participatory_space.rb

@@ -32,16 +32,20 @@ Decidim.register_participatory_space(:assemblies) do |participatory_space|
   end
 
   participatory_space.exports :assemblies do |export|
-    export.collection do |assembly|
-      Decidim::Assembly.where(id: assembly.id).includes(:area, :scope, :attachment_collections, :categories)
+    export.collection do
+      Decidim::Assembly
+        .public_spaces
+        .includes(:attachment_collections)
     end
 
+    export.include_in_open_data = true
+
     export.serializer Decidim::Assemblies::AssemblySerializer
+    export.open_data_serializer Decidim::Assemblies::OpenDataAssemblySerializer
   end
 
   participatory_space.register_on_destroy_account do |user|
     Decidim::AssemblyUserRole.where(user:).destroy_all
-    Decidim::AssemblyMember.where(user:).destroy_all
   end
 
   participatory_space.seeds do

data/lib/decidim/assemblies/seeds.rb

@@ -8,6 +8,15 @@ module Decidim
       def call
         create_content_block!
 
+        taxonomy = create_taxonomy!(name: "Assembly Types", parent: nil)
+        2.times do
+          create_taxonomy!(name: ::Faker::Lorem.word, parent: taxonomy)
+        end
+        # filters for assemblies only
+        create_taxonomy_filter!(root_taxonomy: taxonomy,
+                                taxonomies: taxonomy.all_children,
+                                participatory_space_manifests: [:assemblies])
+
         2.times do |_n|
           assembly = create_assembly!
 
@@ -20,12 +29,6 @@ module Decidim
 
             create_attachments!(attached_to: current_assembly)
 
-            2.times do
-              create_category!(participatory_space: current_assembly)
-            end
-
-            create_assembly_members!(assembly: current_assembly)
-
             seed_components_manifests!(participatory_space: current_assembly)
 
             Decidim::ContentBlocksCreator.new(current_assembly).create_default!
@@ -74,7 +77,6 @@ module Decidim
           composition: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
             Decidim::Faker::Localized.paragraph(sentence_count: 3)
           end,
-          assembly_type: Decidim::AssembliesType.create!(organization:, title: Decidim::Faker::Localized.word),
           creation_date: 1.day.from_now,
           created_by: "others",
           created_by_other: Decidim::Faker::Localized.word,
@@ -120,32 +122,6 @@ module Decidim
           )
         end
       end
-
-      def create_assembly_members!(assembly:)
-        Decidim::AssemblyMember::POSITIONS.each do |position|
-          Decidim::AssemblyMember.create!(
-            full_name: ::Faker::Name.name,
-            gender: ::Faker::Lorem.word,
-            birthday: ::Faker::Date.birthday(min_age: 18, max_age: 65),
-            birthplace: ::Faker::Demographic.demonym,
-            designation_date: ::Faker::Date.between(from: 1.year.ago, to: 1.month.ago),
-            position:,
-            position_other: position == "other" ? ::Faker::Job.position : nil,
-            assembly:
-          )
-        end
-
-        Decidim::AssemblyMember.create!(
-          user: assembly.organization.users.first,
-          gender: ::Faker::Lorem.word,
-          birthday: ::Faker::Date.birthday(min_age: 18, max_age: 65),
-          birthplace: ::Faker::Demographic.demonym,
-          designation_date: ::Faker::Date.between(from: 1.year.ago, to: 1.month.ago),
-          position: "other",
-          position_other: ::Faker::Job.position,
-          assembly:
-        )
-      end
     end
   end
 end

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.3"
+      "0.30.0.rc1"
     end
   end
 end