decidim-assemblies 0.22.0 → 0.23.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1242c1f63ead3579b71e5b61ac1ae5b9244fc49d76b3a8b6ff5089b9911f0906
-  data.tar.gz: cf5a33dbc2767c1b6588400c316d8bcdac283ac0b4cf374d5bfce24735bca348
+  metadata.gz: e3be7e066b067fe37f9b13c4adb94f7efad0072564bec6a415424274df0dc886
+  data.tar.gz: 9732152540a243e1c32975a08134c933684e86e905f2575b491888b00842c807
 SHA512:
-  metadata.gz: df5b655442c857a964563d201b8bed5c6769e0f1345e6eb8874c8dbd6b5bd2407448d90caebbebb232093fe6ac940a4d020d2028c78f7d917ba2ad8c7b4d520d
-  data.tar.gz: ea5c8b9d8547798488e9e07f6c8a3c9641878ceab634e24b94c42203bedc7f9e1800696c3441b6778d8d8e92fb7382db03e0689c4a4ba6dcb02e3289666f8459
+  metadata.gz: 1fd7989f03ec5d13b09fe660736a45753d52b3a590d7592e7aba4228a65b4cd35c57bd7e7bc4b308251518b8dd1a63aa160afaa6d0c89013248c2b90c9cdeb6a
+  data.tar.gz: 1234b0b7107a1c19487400477c269c2f39c3866ef74d4a840ba42e781d7bc15663051ab4bd448ae29a388d9b8902282329520b6d015cafcebe2e26edd26f703e

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

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    module Admin
+      # A command with all the business logic to import a new assembly
+      # in the system.
+      class ImportAssembly < Rectify::Command
+        # Public: Initializes the command.
+        #
+        # form - A form object with the params.
+        # assembly - An assembly we want to duplicate
+        def initialize(form)
+          @form = form
+        end
+
+        # Executes the command. Broadcasts these events:
+        #
+        # - :ok when everything is valid.
+        # - :invalid if the form wasn't valid and we couldn't proceed.
+        #
+        # Returns nothing.
+        def call
+          return broadcast(:invalid) if form.invalid?
+
+          transaction do
+            import_assembly
+            add_admins_as_followers(@imported_assembly)
+          end
+
+          broadcast(:ok, @imported_assembly)
+        end
+
+        private
+
+        attr_reader :form
+
+        def import_assembly
+          importer = Decidim::Assemblies::AssemblyImporter.new(form.current_organization, form.current_user)
+          assemblies.each do |original_assembly|
+            @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?
+          end
+        end
+
+        def assemblies
+          document_parsed(form.document_text)
+        end
+
+        def document_parsed(document_text)
+          JSON.parse(document_text)
+        end
+
+        def add_admins_as_followers(assembly)
+          assembly.organization.admins.each do |admin|
+            form = Decidim::FollowForm
+                   .from_params(followable_gid: assembly.to_signed_global_id.to_s)
+                   .with_context(
+                     current_organization: assembly.organization,
+                     current_user: admin
+                   )
+
+            Decidim::CreateFollow.new(form, admin).call
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -62,10 +62,6 @@ module Decidim
             subtitle: form.subtitle,
             slug: form.slug,
             hashtag: form.hashtag,
-            hero_image: form.hero_image,
-            remove_hero_image: form.remove_hero_image,
-            banner_image: form.banner_image,
-            remove_banner_image: form.remove_banner_image,
             promoted: form.promoted,
             description: form.description,
             short_description: form.short_description,
@@ -99,7 +95,16 @@ module Decidim
             instagram_handler: form.instagram_handler,
             youtube_handler: form.youtube_handler,
             github_handler: form.github_handler
-          }
+          }.merge(uploader_attributes)
+        end
+
+        def uploader_attributes
+          {
+            hero_image: form.hero_image,
+            remove_hero_image: form.remove_hero_image,
+            banner_image: form.banner_image,
+            remove_banner_image: form.remove_banner_image
+          }.delete_if { |_k, val| val.is_a?(Decidim::ApplicationUploader) }
         end
 
         def participatory_processes(assembly)

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

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    module Admin
+      class AssemblyExportsController < Decidim::Admin::ApplicationController
+        include Concerns::AssemblyAdmin
+        include Decidim::Admin::ParticipatorySpaceExport
+
+        def exportable_space
+          current_assembly
+        end
+
+        def manifest_name
+          current_assembly.manifest.name.to_s
+        end
+
+        def after_export_path
+          assembly_path(current_assembly.slug)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    module Admin
+      class AssemblyImportsController < Decidim::Assemblies::Admin::ApplicationController
+        def new
+          enforce_permission_to :import, :assembly
+          @form = form(AssemblyImportForm).instance
+        end
+
+        def create
+          enforce_permission_to :import, :assembly
+          @form = form(AssemblyImportForm).from_params(params)
+
+          ImportAssembly.call(@form) do
+            on(:ok) do
+              flash[:notice] = I18n.t("assembly_imports.create.success", scope: "decidim.admin")
+              redirect_to assemblies_path
+            end
+
+            on(:invalid) do
+              flash.now[:alert] = I18n.t("assembly_imports.create.error", scope: "decidim.admin")
+              render :new
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -25,12 +25,13 @@ module Decidim
           CreateAssemblyAdmin.call(@form, current_user, current_assembly) do
             on(:ok) do
               flash[:notice] = I18n.t("assembly_user_roles.create.success", scope: "decidim.admin")
+              redirect_to assembly_user_roles_path(current_assembly)
             end
 
             on(:invalid) do
               flash[:alert] = I18n.t("assembly_user_roles.create.error", scope: "decidim.admin")
+              render :new
             end
-            redirect_to assembly_user_roles_path(current_assembly)
           end
         end
 

data/app/controllers/decidim/assemblies/{assembly_widgets_controller.rb → widgets_controller.rb}

@@ -2,7 +2,7 @@
 
 module Decidim
   module Assemblies
-    class AssemblyWidgetsController < Decidim::WidgetsController
+    class WidgetsController < Decidim::WidgetsController
       helper Decidim::SanitizeHelper
 
       private
@@ -16,7 +16,7 @@ module Decidim
       end
 
       def iframe_url
-        @iframe_url ||= assembly_assembly_widget_url(model)
+        @iframe_url ||= assembly_widget_url(model)
       end
     end
   end

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

@@ -8,6 +8,7 @@ module Decidim
       #
       class AssemblyForm < Form
         include TranslatableAttributes
+        include Decidim::HasUploadValidations
 
         CREATED_BY = %w(city_council public others).freeze
 
@@ -75,12 +76,10 @@ module Decidim
         validates :created_by_other, translatable_presence: true, if: ->(form) { form.created_by == "others" }
         validates :title, :subtitle, :description, :short_description, translatable_presence: true
 
-        validates :banner_image,
-                  file_size: { less_than_or_equal_to: ->(_record) { Decidim.maximum_attachment_size } },
-                  file_content_type: { allow: ["image/jpeg", "image/png"] }
-        validates :hero_image,
-                  file_size: { less_than_or_equal_to: ->(_record) { Decidim.maximum_attachment_size } },
-                  file_content_type: { allow: ["image/jpeg", "image/png"] }
+        validates :banner_image, passthru: { to: Decidim::Assembly }
+        validates :hero_image, passthru: { to: Decidim::Assembly }
+
+        alias organization current_organization
 
         def ensure_parent_cannot_be_child
           return if id.blank?

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

@@ -0,0 +1,83 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    module Admin
+      # A form object used to import an assembly from the admin
+      # dashboard.
+      #
+      class AssemblyImportForm < Form
+        include TranslatableAttributes
+
+        JSON_MIME_TYPE = "application/json"
+        # Accepted mime types
+        # keys: are used for dynamic help text on admin form.
+        # values: are used to validate the file format of imported document.
+        #
+        # WARNING: consider adding/removing the relative translation key at
+        # decidim.assemblies.admin.new_import.accepted_types when modifying this hash
+        ACCEPTED_TYPES = {
+          json: JSON_MIME_TYPE
+        }.freeze
+
+        translatable_attribute :title, String
+
+        mimic :assembly
+
+        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
+
+        validates :document, presence: true
+
+        validates :slug, presence: true, format: { with: Decidim::Assembly.slug_format }
+        validates :title, translatable_presence: true
+        validate :slug_uniqueness
+
+        validate :document_type_must_be_valid, if: :document
+
+        def document_text
+          @document_text ||= document&.read
+        end
+
+        def document_type_must_be_valid
+          return if valid_mime_types.include?(document_type)
+
+          errors.add(:document, i18n_invalid_document_type_text)
+        end
+
+        # Return ACCEPTED_MIME_TYPES plus `text/plain` for better markdown support
+        def valid_mime_types
+          ACCEPTED_TYPES.values
+        end
+
+        def document_type
+          document.content_type
+        end
+
+        def i18n_invalid_document_type_text
+          I18n.t("invalid_document_type",
+                 scope: "activemodel.errors.models.assembly.attributes.document",
+                 valid_mime_types: i18n_valid_mime_types_text)
+        end
+
+        def i18n_valid_mime_types_text
+          ACCEPTED_TYPES.keys.map do |mime_type|
+            I18n.t(mime_type, scope: "decidim.assemblies.admin.new_import.accepted_types")
+          end.join(", ")
+        end
+
+        private
+
+        def slug_uniqueness
+          return unless OrganizationAssemblies.new(current_organization).query.where(slug: slug).where.not(id: id).any?
+
+          errors.add(:slug, :taken)
+        end
+      end
+    end
+  end
+end

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

@@ -12,10 +12,11 @@ module Decidim
         attribute :email, String
         attribute :role, String
 
-        validates :email, :role, presence: true
-        validates :name, presence: true
+        validates :name, :email, :role, presence: true
         validates :role, inclusion: { in: Decidim::AssemblyUserRole::ROLES }
 
+        validates :name, format: { with: UserBaseEntity::REGEXP_NAME }
+
         def roles
           Decidim::AssemblyUserRole::ROLES.map do |role|
             [

data/app/models/decidim/assemblies_type.rb

@@ -5,6 +5,9 @@ module Decidim
   class AssembliesType < ApplicationRecord
     include Decidim::Traceable
     include Decidim::Loggable
+    include Decidim::TranslatableResource
+
+    translatable_fields :title
 
     belongs_to :organization,
                foreign_key: "decidim_organization_id",

data/app/models/decidim/assembly.rb

@@ -24,7 +24,7 @@ module Decidim
     include Decidim::HasAttachmentCollections
     include Decidim::Participable
     include Decidim::Publicable
-    include Decidim::Scopable
+    include Decidim::ScopableParticipatorySpace
     include Decidim::Followable
     include Decidim::HasReference
     include Decidim::Traceable
@@ -32,10 +32,16 @@ module Decidim
     include Decidim::ParticipatorySpaceResourceable
     include Decidim::HasPrivateUsers
     include Decidim::Searchable
+    include Decidim::HasUploadValidations
+    include Decidim::TranslatableResource
 
     SOCIAL_HANDLERS = [:twitter, :facebook, :instagram, :youtube, :github].freeze
     CREATED_BY = %w(city_council public others).freeze
 
+    translatable_fields :title, :subtitle, :short_description, :description, :developer_group, :meta_scope, :local_area,
+                        :target, :participatory_scope, :participatory_structure, :purpose_of_action, :composition, :created_by_other,
+                        :closing_date_reason, :internal_organisation, :special_features
+
     belongs_to :organization,
                foreign_key: "decidim_organization_id",
                class_name: "Decidim::Organization"
@@ -63,7 +69,10 @@ module Decidim
     has_many :children, foreign_key: "parent_id", class_name: "Decidim::Assembly", inverse_of: :parent, dependent: :destroy
     belongs_to :parent, foreign_key: "parent_id", class_name: "Decidim::Assembly", inverse_of: :children, optional: true, counter_cache: :children_count
 
+    validates_upload :hero_image
     mount_uploader :hero_image, Decidim::HeroImageUploader
+
+    validates_upload :banner_image
     mount_uploader :banner_image, Decidim::BannerImageUploader
 
     validates :slug, uniqueness: { scope: :organization }
@@ -158,6 +167,10 @@ module Decidim
       roles.where(role: role_name)
     end
 
+    def attachment_context
+      :admin
+    end
+
     private
 
     # When an assembly changes their parent, we need to update the parents_path attribute

data/app/permissions/decidim/assemblies/permissions.rb

@@ -249,7 +249,9 @@ module Decidim
           :assembly,
           :assembly_user_role,
           :assembly_member,
-          :space_private_user
+          :space_private_user,
+          :export_space,
+          :import
         ].include?(permission_action.subject)
         allow! if is_allowed
       end
@@ -268,6 +270,8 @@ module Decidim
           :assembly_user_role,
           :assembly_member,
           :space_private_user,
+          :export_space,
+          :import,
           :assemblies_setting
         ].include?(permission_action.subject)
         allow! if is_allowed

data/app/presenters/decidim/assemblies/admin_log/assemblies_type_presenter.rb

@@ -34,8 +34,8 @@ module Decidim
           end
         end
 
-        def has_diff?
-          action == "delete" || super
+        def diff_actions
+          super + %w(delete)
         end
       end
     end

data/app/presenters/decidim/assemblies/admin_log/assembly_member_presenter.rb

@@ -43,8 +43,8 @@ module Decidim
           end
         end
 
-        def has_diff?
-          action == "delete" || super
+        def diff_actions
+          super + %w(delete)
         end
       end
     end

data/app/presenters/decidim/assemblies/admin_log/assembly_presenter.rb

@@ -70,8 +70,8 @@ module Decidim
           end
         end
 
-        def has_diff?
-          action == "unpublish" || super
+        def diff_actions
+          super + %w(unpublish)
         end
       end
     end