decidim-assemblies 0.29.2 → 0.30.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b74ba273556ca0e94a759cbd5113716342eba68ac7f4ec0b259ae563167b3fb8
-  data.tar.gz: 9e44b00be96f1fe4c7a22558cea599aff5c40a681f1d506fae075cc00ed15fa1
+  metadata.gz: b8631958217576052d6edbd46ca6c6e54656b4c224dbadbe44bd8ec066fff39c
+  data.tar.gz: a6173da764f9c767ac553368ebaf1266966e5750badcc19f0c1a315cf88e769b
 SHA512:
-  metadata.gz: ae74d4d6e9ca6b7e1b50793ad96902846ae0cae14077cfded2e60fe85872c33c132d64c6e4a70d676fe430e3496facfaacfab77dd97fd9474dab5b19829d5ca1
-  data.tar.gz: 0fcb0bf1dcef6daec9b9f7d2c535a4733de1ca7b961ff56ced152cc68313a28e030e63e5331c0a6b51e448b6da2f0e39549308bc8baf894524fa230438038a48
+  metadata.gz: 26f1c400580cf435fce814674909d24164583ad01d5c9755c0c5c41bcaf7a4fe34e813678eb3dea35dc66964d942bb3f280bde9988e6b490cd8c0376694a491d
+  data.tar.gz: 6a3fa33fed1422eb124c1304a9326e6d1fbd22c35f94fdf476a925a91fe86e71dedc136ddb37894a0abbade74eb4a75ffa19fe225a51ddbebcf41013af54082b

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

@@ -9,16 +9,7 @@ module Decidim
       private
 
       def items
-        [children_item, assembly_type].compact
-      end
-
-      def assembly_type
-        return unless has_assembly_type?
-
-        {
-          text: translated_attribute(model.assembly_type.title),
-          icon: "group-2-line"
-        }
+        [children_item].compact
       end
 
       def children_item
@@ -37,10 +28,6 @@ module Decidim
       def published_children_assemblies
         @published_children_assemblies ||= model.children.published
       end
-
-      def has_assembly_type?
-        model.assembly_type.present?
-      end
     end
   end
 end

data/app/cells/decidim/assemblies/content_blocks/extra_data_cell.rb

@@ -4,28 +4,18 @@ module Decidim
   module Assemblies
     module ContentBlocks
       class ExtraDataCell < Decidim::ContentBlocks::ParticipatorySpaceExtraDataCell
-        delegate :assembly_type, :duration, to: :presented_resource
+        delegate :duration, to: :presented_resource
 
         private
 
         def extra_data_items
-          [type_item, duration_item].compact
+          [duration_item].compact
         end
 
         def presented_resource
           Decidim::Assemblies::AssemblyPresenter.new(resource)
         end
 
-        def type_item
-          return if assembly_type.blank?
-
-          {
-            title: t("assembly_type", scope: "decidim.assemblies.show"),
-            icon: "group-2-line",
-            text: decidim_sanitize_translated(assembly_type)
-          }
-        end
-
         def duration_item
           {
             title: t("duration", scope: "decidim.assemblies.show"),

data/app/cells/decidim/assemblies/content_blocks/highlighted_assemblies_settings_form/show.erb

@@ -1,3 +1,3 @@
 <% form.fields_for :settings, form.object.settings do |settings_fields| %>
-  <%= settings_fields.select :max_results, [6, 9, 12], prompt: "", label: %>
+  <%= settings_fields.number_field :max_results, label: %>
 <% end %>

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

@@ -29,7 +29,6 @@ module Decidim
             Assembly.transaction do
               copy_assembly
               copy_assembly_attachments
-              copy_assembly_categories if @form.copy_categories?
               copy_assembly_components if @form.copy_components?
             end
           end
@@ -51,7 +50,6 @@ module Decidim
             description: @assembly.description,
             short_description: @assembly.short_description,
             promoted: @assembly.promoted,
-            scope: @assembly.scope,
             parent: @assembly.parent,
             developer_group: @assembly.developer_group,
             local_area: @assembly.local_area,
@@ -60,7 +58,8 @@ module Decidim
             participatory_scope: @assembly.participatory_scope,
             participatory_structure: @assembly.participatory_structure,
             meta_scope: @assembly.meta_scope,
-            announcement: @assembly.announcement
+            announcement: @assembly.announcement,
+            taxonomies: @assembly.taxonomies
           )
         end
 
@@ -72,17 +71,6 @@ module Decidim
           end
         end
 
-        def copy_assembly_categories
-          @assembly.categories.each do |category|
-            Category.create!(
-              name: category.name,
-              description: category.description,
-              parent_id: category.parent_id,
-              participatory_space: @copied_assembly
-            )
-          end
-        end
-
         def copy_assembly_components
           @assembly.components.each do |component|
             new_component = Component.create!(

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

@@ -9,10 +9,10 @@ module Decidim
         fetch_file_attributes :hero_image, :banner_image
 
         fetch_form_attributes :title, :subtitle, :weight, :slug, :hashtag, :description, :short_description,
-                              :promoted, :scopes_enabled, :scope, :area, :parent, :announcement, :organization,
+                              :promoted, :taxonomizations, :parent, :announcement, :organization,
                               :private_space, :developer_group, :local_area, :target, :participatory_scope,
                               :participatory_structure, :meta_scope, :purpose_of_action,
-                              :composition, :assembly_type, :creation_date, :created_by, :created_by_other,
+                              :composition, :creation_date, :created_by, :created_by_other,
                               :duration, :included_at, :closing_date, :closing_date_reason, :internal_organisation,
                               :is_transparent, :special_features, :twitter_handler, :facebook_handler,
                               :instagram_handler, :youtube_handler, :github_handler

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

@@ -41,8 +41,6 @@ module Decidim
           assemblies.each do |original_assembly|
             Decidim.traceability.perform_action!("import", Assembly, @user) do
               @imported_assembly = importer.import(original_assembly, form.current_user, title: form.title, slug: form.slug)
-              importer.import_assemblies_type(original_assembly["decidim_assemblies_type_id"])
-              importer.import_categories(original_assembly["assembly_categories"]) if form.import_categories?
               importer.import_folders_and_attachments(original_assembly["attachments"]) if form.import_attachments?
               importer.import_components(original_assembly["components"]) if form.import_components?
               @imported_assembly

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

@@ -9,9 +9,9 @@ module Decidim
         fetch_file_attributes :hero_image, :banner_image
 
         fetch_form_attributes :title, :subtitle, :slug, :hashtag, :promoted, :description, :short_description,
-                              :scopes_enabled, :scope, :area, :parent, :private_space, :developer_group, :local_area,
+                              :taxonomizations, :parent, :private_space, :developer_group, :local_area,
                               :target, :participatory_scope, :participatory_structure, :meta_scope,
-                              :purpose_of_action, :composition, :assembly_type, :creation_date, :created_by,
+                              :purpose_of_action, :composition, :creation_date, :created_by,
                               :created_by_other, :duration, :included_at, :closing_date, :closing_date_reason,
                               :internal_organisation, :is_transparent, :special_features, :twitter_handler, :announcement,
                               :facebook_handler, :instagram_handler, :youtube_handler, :github_handler, :weight

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

@@ -25,24 +25,15 @@ module Decidim
           end
 
           def filters
-            [:private_space_eq, :published_at_null, :decidim_assemblies_type_id_eq]
+            [:private_space_eq, :published_at_null]
           end
 
           def filters_with_values
             {
               private_space_eq: [true, false],
-              published_at_null: [true, false],
-              decidim_assemblies_type_id_eq: AssembliesType.where(organization: current_organization).pluck(:id)
+              published_at_null: [true, false]
             }
           end
-
-          def dynamically_translated_filters
-            [:decidim_assemblies_type_id_eq]
-          end
-
-          def translated_decidim_assemblies_type_id_eq(id)
-            translated_attribute(Decidim::AssembliesType.find(id).title)
-          end
         end
       end
     end

data/app/controllers/decidim/assemblies/admin/assemblies_controller.rb

@@ -7,8 +7,11 @@ module Decidim
       #
       class AssembliesController < Decidim::Assemblies::Admin::ApplicationController
         include Decidim::Assemblies::Admin::Filterable
-        include Decidim::Admin::ParticipatorySpaceAdminBreadcrumb
-        helper_method :current_assembly, :parent_assembly, :current_participatory_space
+        include Decidim::Admin::ParticipatorySpaceAdminContext
+        include Decidim::Admin::HasTrashableResources
+
+        helper_method :current_assembly, :parent_assembly, :parent_assembly_id, :current_participatory_space
+
         layout "decidim/admin/assemblies"
 
         def index
@@ -29,7 +32,7 @@ module Decidim
           CreateAssembly.call(@form) do
             on(:ok) do |assembly|
               flash[:notice] = I18n.t("assemblies.create.success", scope: "decidim.admin")
-              redirect_to assemblies_path(q: { parent_id_eq: assembly.parent_id })
+              redirect_to components_path(assembly)
             end
 
             on(:invalid) do
@@ -75,8 +78,20 @@ module Decidim
           @collection ||= OrganizationAssemblies.new(current_user.organization).query
         end
 
+        def trashable_deleted_resource_type
+          :assembly
+        end
+
+        def trashable_deleted_resource
+          @trashable_deleted_resource ||= current_assembly
+        end
+
+        def trashable_deleted_collection
+          @trashable_deleted_collection = filtered_collection.only_deleted.deleted_at_desc
+        end
+
         def current_assembly
-          @current_assembly ||= collection.where(slug: params[:slug]).or(
+          @current_assembly ||= collection.with_deleted.where(slug: params[:slug]).or(
             collection.where(id: params[:slug])
           ).first
         end

data/app/controllers/decidim/assemblies/admin/assembly_copies_controller.rb

@@ -20,7 +20,7 @@ module Decidim
           CopyAssembly.call(@form, current_assembly, current_user) do
             on(:ok) do
               flash[:notice] = I18n.t("assemblies_copies.create.success", scope: "decidim.admin")
-              redirect_to assemblies_path(parent_id: current_assembly.parent_id)
+              redirect_to assemblies_path
             end
 
             on(:invalid) do

data/app/controllers/decidim/assemblies/admin/assembly_share_tokens_controller.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    module Admin
+      # This controller allows sharing unpublished things.
+      # It is targeted for customizations for sharing unpublished things that lives under
+      # an assembly.
+      class AssemblyShareTokensController < Decidim::Admin::ShareTokensController
+        include Concerns::AssemblyAdmin
+
+        def resource
+          current_assembly
+        end
+      end
+    end
+  end
+end

data/app/controllers/decidim/assemblies/admin/component_share_tokens_controller.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    module Admin
+      # This controller allows sharing unpublished things.
+      # It is targeted for customizations for sharing unpublished things that lives under
+      # an assembly.
+      class ComponentShareTokensController < Decidim::Admin::ShareTokensController
+        include Concerns::AssemblyAdmin
+
+        def resource
+          @resource ||= current_participatory_space.components.find(params[:component_id])
+        end
+      end
+    end
+  end
+end

data/app/controllers/decidim/assemblies/assemblies_controller.rb

@@ -56,9 +56,7 @@ module Decidim
 
       def default_filter_params
         {
-          with_any_scope: nil,
-          with_any_area: nil,
-          with_any_type: nil
+          with_any_taxonomies: nil
         }
       end
 

data/app/controllers/decidim/assemblies/{assembly_members_controller.rb → participatory_space_private_users_controller.rb}

@@ -2,27 +2,19 @@
 
 module Decidim
   module Assemblies
-    class AssemblyMembersController < Decidim::Assemblies::ApplicationController
+    class ParticipatorySpacePrivateUsersController < Decidim::Assemblies::ApplicationController
       include ParticipatorySpaceContext
-      include AssemblyBreadcrumb
-
-      helper_method :collection
+      include Decidim::HasMembersPage
 
       def index
         raise ActionController::RoutingError, "No members for this assembly" if members.none?
 
         enforce_permission_to :list, :members
-        redirect_to decidim_assemblies.assembly_path(current_participatory_space) unless current_user_can_visit_space?
+        redirect_to decidim_assemblies.assembly_path(current_participatory_space) unless can_visit_index?
       end
 
       private
 
-      def members
-        @members ||= current_participatory_space.members.not_ceased
-      end
-
-      alias collection members
-
       def current_participatory_space
         return unless params[:assembly_slug]
 

data/app/forms/decidim/assemblies/admin/assembly_copy_form.rb

@@ -14,7 +14,6 @@ module Decidim
         mimic :assembly
 
         attribute :slug, String
-        attribute :copy_categories, Boolean
         attribute :copy_components, Boolean
 
         validates :slug, presence: true, format: { with: Decidim::Assembly.slug_format }

data/app/forms/decidim/assemblies/admin/assembly_form.rb

@@ -9,6 +9,7 @@ module Decidim
       class AssemblyForm < Form
         include TranslatableAttributes
         include Decidim::HasUploadValidations
+        include Decidim::HasTaxonomyFormAttributes
 
         CREATED_BY = %w(city_council public others).freeze
 
@@ -41,17 +42,13 @@ module Decidim
         attribute :twitter_handler, String
         attribute :youtube_handler, String
 
-        attribute :decidim_assemblies_type_id, Integer
-        attribute :area_id, Integer
         attribute :parent_id, Integer
         attribute :participatory_processes_ids, Array[Integer]
-        attribute :scope_id, Integer
         attribute :weight, Integer, default: 0
 
         attribute :is_transparent, Boolean
         attribute :promoted, Boolean
         attribute :private_space, Boolean
-        attribute :scopes_enabled, Boolean
 
         attribute :closing_date, Decidim::Attributes::LocalizedDate
         attribute :creation_date, Decidim::Attributes::LocalizedDate
@@ -63,16 +60,12 @@ module Decidim
         attribute :remove_banner_image, Boolean, default: false
         attribute :remove_hero_image, Boolean, default: false
 
-        validates :area, presence: true, if: proc { |object| object.area_id.present? }
-
         validates :parent, presence: true, if: ->(form) { form.parent.present? }
         validate :ensure_parent_cannot_be_child, if: ->(form) { form.parent.present? }
 
-        validates :scope, presence: true, if: proc { |object| object.scope_id.present? }
         validates :slug, presence: true, format: { with: Decidim::Assembly.slug_format }
 
         validate :slug_uniqueness
-        validate :same_type_organization, if: ->(form) { form.decidim_assemblies_type_id }
 
         validates :created_by_other, translatable_presence: true, if: ->(form) { form.created_by == "others" }
         validates :title, :subtitle, :description, :short_description, translatable_presence: true
@@ -84,6 +77,10 @@ module Decidim
 
         alias organization current_organization
 
+        def participatory_space_manifest
+          :assemblies
+        end
+
         def ensure_parent_cannot_be_child
           return if id.blank?
 
@@ -91,23 +88,6 @@ module Decidim
           errors.add(:parent, :invalid) unless available_assemblies.include? parent
         end
 
-        def map_model(model)
-          self.scope_id = model.decidim_scope_id
-        end
-
-        def scope
-          @scope ||= current_organization.scopes.find_by(id: scope_id)
-        end
-
-        def area
-          @area ||= current_organization.areas.find_by(id: area_id)
-        end
-
-        def assembly_types_for_select
-          @assembly_types_for_select ||= organization_assembly_types
-                                             &.map { |type| [translated_attribute(type.title), type.id] }
-        end
-
         def created_by_for_select
           CREATED_BY.map do |creator|
             [
@@ -127,16 +107,8 @@ module Decidim
                                         &.sort_by { |arr| arr[0] }
         end
 
-        def assembly_type
-          AssembliesType.find_by(id: decidim_assemblies_type_id)
-        end
-
         private
 
-        def organization_assembly_types
-          AssembliesType.where(organization: current_organization)
-        end
-
         def organization_participatory_processes
           Decidim.find_participatory_space_manifest(:participatory_processes)
                  .participatory_spaces.call(current_organization)
@@ -154,13 +126,6 @@ module Decidim
 
           errors.add(:slug, :taken)
         end
-
-        def same_type_organization
-          return unless assembly_type
-          return if assembly_type.organization == current_organization
-
-          errors.add(:assembly_type, :invalid)
-        end
       end
     end
   end

data/app/forms/decidim/assemblies/admin/assembly_import_form.rb

@@ -27,7 +27,6 @@ module Decidim
 
         attribute :slug, String
         attribute :import_steps, Boolean, default: false
-        attribute :import_categories, Boolean, default: true
         attribute :import_attachments, Boolean, default: true
         attribute :import_components, Boolean, default: true
         attribute :document, Decidim::Attributes::Blob

data/app/helpers/decidim/assemblies/admin/assemblies_helper.rb

@@ -15,10 +15,32 @@ module Decidim
           end
         end
 
-        # Public: A collection of Assemblies that can be selected as parent
-        # assemblies for another assembly; to be used in forms.
-        def parent_assemblies_for_select
-          @parent_assemblies_for_select ||= ParentAssembliesForSelect.for(current_organization, current_assembly)
+        # Public: select options representing a collection of Assemblies that
+        # can be selected as parent assemblies for another assembly; to be used in forms.
+        def parent_assemblies_options
+          options = []
+          root_assemblies = ParentAssembliesForSelect.for(current_organization, current_assembly).where(parent_id: nil).sort_by(&:weight)
+
+          root_assemblies.each do |assembly|
+            build_assembly_options(assembly, options)
+          end
+
+          options
+        end
+
+        private
+
+        # Recursively build the options for the assembly tree
+        def build_assembly_options(assembly, options, level = 0)
+          name = sanitize("#{" " * 4 * level} #{assembly.translated_title}")
+          options << [name, assembly.id]
+
+          # Skip the current assembly to avoid selecting a child as parent
+          return if assembly == current_assembly
+
+          assembly.children.each do |child|
+            build_assembly_options(child, options, level + 1)
+          end
         end
       end
     end

data/app/helpers/decidim/assemblies/assemblies_helper.rb

@@ -17,11 +17,11 @@ module Decidim
         components = participatory_space.components.published.or(Decidim::Component.where(id: try(:current_component)))
 
         [
-          *(if participatory_space.members.not_ceased.any?
+          *(if participatory_space.members_public_page?
               [{
                 name: t("assembly_member_menu_item", scope: "layouts.decidim.assembly_navigation"),
-                url: decidim_assemblies.assembly_assembly_members_path(participatory_space),
-                active: is_active_link?(decidim_assemblies.assembly_assembly_members_path(participatory_space), :inclusive)
+                url: decidim_assemblies.assembly_participatory_space_private_users_path(participatory_space),
+                active: is_active_link?(decidim_assemblies.assembly_participatory_space_private_users_path(participatory_space), :inclusive)
               }]
             end
            )
@@ -31,7 +31,7 @@ module Decidim
             url: main_component_path(component),
             active: is_active_link?(main_component_path(component), :inclusive)
           }
-        end
+        end.compact
       end
     end
   end

data/app/helpers/decidim/assemblies/filter_assemblies_helper.rb

@@ -6,25 +6,21 @@ module Decidim
     module FilterAssembliesHelper
       include Decidim::CheckBoxesTreeHelper
 
-      def assembly_types
-        @assembly_types ||= AssembliesType.where(organization: current_organization).joins(:assemblies).distinct
-      end
-
-      def filter_types_values
-        return if assembly_types.blank?
+      def filter_sections
+        items = []
 
-        type_values = assembly_types.map { |type| [type.id.to_s, translated_attribute(type.title)] }
-        type_values.prepend(["", t("decidim.assemblies.assemblies.filters.names.all")])
+        available_taxonomy_filters.find_each do |taxonomy_filter|
+          items.append(method: "with_any_taxonomies[#{taxonomy_filter.root_taxonomy_id}]",
+                       collection: filter_taxonomy_values_for(taxonomy_filter),
+                       label: decidim_sanitize_translated(taxonomy_filter.name),
+                       id: "taxonomy")
+        end
 
-        filter_tree_from_array(type_values)
+        items.reject { |item| item[:collection].blank? }
       end
 
-      def filter_sections
-        [
-          { method: :with_any_scope, collection: filter_global_scopes_values, label_scope: "decidim.shared.participatory_space_filters.filters", id: "scope" },
-          { method: :with_any_area, collection: filter_areas_values, label_scope: "decidim.shared.participatory_space_filters.filters", id: "area" },
-          { method: :with_any_type, collection: filter_types_values, label_scope: "decidim.assemblies.assemblies.filters", id: "type" }
-        ].reject { |item| item[:collection].blank? }
+      def available_taxonomy_filters
+        Decidim::TaxonomyFilter.for(current_organization).for_manifest(:assemblies)
       end
     end
   end

data/app/models/decidim/assembly.rb

@@ -24,6 +24,7 @@ module Decidim
     include Decidim::HasAttachmentCollections
     include Decidim::Participable
     include Decidim::Publicable
+    include Decidim::Taxonomizable
     include Decidim::ScopableParticipatorySpace
     include Decidim::Followable
     include Decidim::HasReference
@@ -36,6 +37,8 @@ module Decidim
     include Decidim::TranslatableResource
     include Decidim::HasArea
     include Decidim::FilterableResource
+    include Decidim::SoftDeletable
+    include Decidim::ShareableWithToken
 
     CREATED_BY = %w(city_council public others).freeze
 
@@ -60,11 +63,6 @@ module Decidim
              dependent: :destroy,
              as: :participatory_space
 
-    has_many :members,
-             foreign_key: "decidim_assembly_id",
-             class_name: "Decidim::AssemblyMember",
-             dependent: :destroy
-
     has_many :components, as: :participatory_space, dependent: :destroy
 
     has_many :children, foreign_key: "parent_id", class_name: "Decidim::Assembly", inverse_of: :parent, dependent: :destroy
@@ -82,8 +80,6 @@ module Decidim
     after_create :set_parents_path
     after_update :set_parents_path, :update_children_paths, if: :saved_change_to_parent_id?
 
-    scope :with_any_type, ->(*type_ids) { where(decidim_assemblies_type_id: type_ids) }
-
     searchable_fields({
                         scope_id: :decidim_scope_id,
                         participatory_space: :itself,
@@ -165,7 +161,23 @@ module Decidim
     end
 
     def self.ransackable_scopes(_auth_object = nil)
-      [:with_any_area, :with_any_scope, :with_any_type]
+      [:with_any_taxonomies]
+    end
+
+    def shareable_url(share_token)
+      EngineRouter.main_proxy(self).assembly_url(self, share_token: share_token.token)
+    end
+
+    def self.ransackable_attributes(auth_object = nil)
+      base = %w(title short_description description id)
+
+      return base unless auth_object&.admin?
+
+      base + %w(published_at private_space parent_id)
+    end
+
+    def self.ransackable_associations(_auth_object = nil)
+      %w(parent children taxonomies)
     end
 
     private
@@ -186,7 +198,7 @@ module Decidim
     #
     # rubocop:disable Rails/SkipsModelValidations
     def set_parents_path
-      update_column(:parents_path, [parent&.parents_path, id].select(&:present?).join("."))
+      update_column(:parents_path, [parent&.parents_path, id].compact_blank.join("."))
     end
     # rubocop:enable Rails/SkipsModelValidations
 
@@ -221,7 +233,5 @@ module Decidim
 
     # Allow ransacker to search for a key in a hstore column (`title`.`en`)
     ransacker_i18n :title
-
-    ransack_alias :type_id, :decidim_assemblies_type_id
   end
 end

data/app/packs/entrypoints/decidim_assemblies_admin.js

@@ -1,3 +1,2 @@
 import "src/decidim/assemblies/admin/assemblies"
-import "src/decidim/assemblies/admin/assembly_members"
 import "src/decidim/slug_form"

data/app/packs/entrypoints/decidim_assemblies_admin_list.js

@@ -0,0 +1 @@
+import "src/decidim/assemblies/admin/assemblies_list"