decidim-assemblies 0.30.7 → 0.31.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a2c5a5468b2300e4a33afe69e509dbe9e59c27f5e41fd6e55159e45f11950d8
-  data.tar.gz: aab89010bddbd48777231134b105acf7a142ab605922167c6b454a5d847a3e43
+  metadata.gz: d018d946999f92c36cb1382901e224dc928869b75f0598598a9009915273b443
+  data.tar.gz: c3f32fc6f46777b1a5c0837bb3d5ca4a8dbaf45d87725e52d9c8369168421121
 SHA512:
-  metadata.gz: f829ad65c0ca0f39fe99a99926fa13b6b2a29a4c7d7cdfda2d4d8b2474b6db8c9bb4ff68c2bbaadb23b52ffad504c3c987399d11b644f54a41ccdcd4b4e0cfcc
-  data.tar.gz: 885f90af61d77ad149fa9fdbeef5520c1b8616470339bc4c197d184061441f840a5d2d161a57c27202673caf184d4cd5af349ed76bf60c1e84d5ff974e1efcda
+  metadata.gz: 61e63411dd6100f1d766d6f6feaf714efd607e0d1d0e76b70613a091afbe9a3ccb34ee3e20f45d478c3a1ea365020a0d524ece702676c4edd9916328d849e1a8
+  data.tar.gz: 64d22117555d2275ee23236c7ba8cc4991ee40f3cdd11540b2bebe76aa315c53210c728051cd760766b003869ad51d97135407fa96763ab3b3ae4cac028cbcf3

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

@@ -1,3 +1,5 @@
 <% form.fields_for :settings, form.object.settings do |settings_fields| %>
-  <%= settings_fields.number_field :max_results, label: %>
+  <div class="row column">
+    <%= settings_fields.number_field :max_results, label: %>
+  </div>
 <% end %>

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

@@ -8,7 +8,7 @@ module Decidim
       class CreateAssembly < Decidim::Commands::CreateResource
         fetch_file_attributes :hero_image, :banner_image
 
-        fetch_form_attributes :title, :subtitle, :weight, :slug, :hashtag, :description, :short_description,
+        fetch_form_attributes :title, :subtitle, :weight, :slug, :description, :short_description,
                               :promoted, :taxonomizations, :parent, :announcement, :organization,
                               :private_space, :developer_group, :local_area, :target, :participatory_scope,
                               :participatory_structure, :meta_scope, :purpose_of_action,

data/app/commands/decidim/assemblies/admin/{copy_assembly.rb → duplicate_assembly.rb}

@@ -3,9 +3,9 @@
 module Decidim
   module Assemblies
     module Admin
-      # A command with all the business logic when copying a new participatory
+      # A command with all the business logic when duplicating a new participatory
       # assembly in the system.
-      class CopyAssembly < Decidim::Command
+      class DuplicateAssembly < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A form object with the params.
@@ -27,27 +27,26 @@ module Decidim
 
           Decidim.traceability.perform_action!("duplicate", @assembly, @user) do
             Assembly.transaction do
-              copy_assembly
-              copy_assembly_attachments
-              copy_assembly_components if @form.copy_components?
-              copy_landing_page_blocks if @form.copy_landing_page_blocks?
+              duplicate_assembly
+              duplicate_assembly_attachments
+              duplicate_assembly_components if @form.duplicate_components?
+              duplicate_landing_page_blocks if @form.duplicate_landing_page_blocks?
             end
           end
 
-          broadcast(:ok, @copied_assembly)
+          broadcast(:ok, @duplicated_assembly)
         end
 
         private
 
         attr_reader :form
 
-        def copy_assembly
-          @copied_assembly = Assembly.create!(
+        def duplicate_assembly
+          @duplicated_assembly = Assembly.create!(
             organization: @assembly.organization,
             title: form.title,
             subtitle: @assembly.subtitle,
             slug: form.slug,
-            hashtag: @assembly.hashtag,
             description: @assembly.description,
             short_description: @assembly.short_description,
             promoted: @assembly.promoted,
@@ -64,47 +63,47 @@ module Decidim
           )
         end
 
-        def copy_assembly_attachments
+        def duplicate_assembly_attachments
           [:hero_image, :banner_image].each do |attribute|
             next unless @assembly.attached_uploader(attribute).attached?
 
-            @copied_assembly.send(attribute).attach(@assembly.send(attribute).blob)
+            @duplicated_assembly.send(attribute).attach(@assembly.send(attribute).blob)
           end
         end
 
-        def copy_assembly_components
+        def duplicate_assembly_components
           @assembly.components.each do |component|
             new_component = Component.create!(
               manifest_name: component.manifest_name,
               name: component.name,
-              participatory_space: @copied_assembly,
+              participatory_space: @duplicated_assembly,
               settings: component.settings,
               step_settings: component.step_settings,
               weight: component.weight
             )
-            component.manifest.run_hooks(:copy, new_component:, old_component: component)
+            component.manifest.run_hooks(:duplicate, new_component:, old_component: component)
           end
         end
 
-        def copy_landing_page_blocks
+        def duplicate_landing_page_blocks
           blocks = Decidim::ContentBlock.where(scoped_resource_id: @assembly.id, scope_name: "assembly_homepage", organization: @assembly.organization)
           return if blocks.blank?
 
           blocks.each do |block|
             new_block = Decidim::ContentBlock.create!(
-              organization: @copied_assembly.organization,
+              organization: @duplicated_assembly.organization,
               scope_name: "assembly_homepage",
-              scoped_resource_id: @copied_assembly.id,
+              scoped_resource_id: @duplicated_assembly.id,
               manifest_name: block.manifest_name,
               settings: block.settings,
               weight: block.weight,
-              published_at: block.published_at.present? ? @copied_assembly.created_at : nil # determine if block is active/inactive
+              published_at: block.published_at.present? ? @duplicated_assembly.created_at : nil # determine if block is active/inactive
             )
-            copy_block_attachments(block, new_block) if block.attachments.present?
+            duplicate_block_attachments(block, new_block) if block.attachments.present?
           end
         end
 
-        def copy_block_attachments(block, new_block)
+        def duplicate_block_attachments(block, new_block)
           block.attachments.map(&:name).each do |name|
             original_image = block.images_container.send(name).blob
             next if original_image.blank?

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

@@ -29,7 +29,7 @@ module Decidim
             add_admins_as_followers(@imported_assembly)
           end
 
-          broadcast(:ok, @imported_assembly, @warnings)
+          broadcast(:ok, @imported_assembly)
         end
 
         private
@@ -37,14 +37,12 @@ module Decidim
         attr_reader :form
 
         def import_assembly
-          @warnings = []
+          importer = Decidim::Assemblies::AssemblyImporter.new(form.current_organization, form.current_user)
           assemblies.each do |original_assembly|
-            importer = Decidim::Assemblies::AssemblyImporter.new(form.current_organization, form.current_user)
             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_folders_and_attachments(original_assembly["attachments"]) if form.import_attachments?
               importer.import_components(original_assembly["components"]) if form.import_components?
-              @warnings.concat(importer.warnings)
               @imported_assembly
             end
           end

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

@@ -8,7 +8,7 @@ module Decidim
       class UpdateAssembly < Decidim::Commands::UpdateResource
         fetch_file_attributes :hero_image, :banner_image
 
-        fetch_form_attributes :title, :subtitle, :slug, :hashtag, :promoted, :description, :short_description,
+        fetch_form_attributes :title, :subtitle, :slug, :promoted, :description, :short_description,
                               :taxonomizations, :parent, :private_space, :developer_group, :local_area,
                               :target, :participatory_scope, :participatory_structure, :meta_scope,
                               :purpose_of_action, :composition, :creation_date, :created_by,

data/app/controllers/concerns/decidim/assemblies/assembly_breadcrumb.rb

@@ -10,7 +10,6 @@ module Decidim
 
       def current_participatory_space_breadcrumb_item
         return {} if current_participatory_space.blank?
-        return super unless current_participatory_space.is_a?(Decidim::Assembly)
 
         dropdown_cell = current_participatory_space_manifest.breadcrumb_cell
 
@@ -24,7 +23,13 @@ module Decidim
           }
         end
 
-        items << super
+        items << {
+          label: current_participatory_space.title,
+          url: Decidim::ResourceLocatorPresenter.new(current_participatory_space).path,
+          active: true,
+          dropdown_cell:,
+          resource: current_participatory_space
+        }
       end
     end
   end

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

@@ -37,7 +37,7 @@ module Decidim
 
             on(:invalid) do
               flash.now[:alert] = I18n.t("assemblies.create.error", scope: "decidim.admin")
-              render :new
+              render :new, status: :unprocessable_entity
             end
           end
         end
@@ -63,12 +63,12 @@ module Decidim
 
             on(:invalid) do
               flash.now[:alert] = I18n.t("assemblies.update.error", scope: "decidim.admin")
-              render :edit, layout: "decidim/admin/assembly"
+              render :edit, layout: "decidim/admin/assembly", status: :unprocessable_entity
             end
           end
         end
 
-        def copy
+        def duplicate
           enforce_permission_to :create, :assembly, assembly: collection.find_by(id: params[:parent_id])
         end
 

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

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    module Admin
+      # Controller that allows managing assemblies.
+      #
+      class AssemblyDuplicatesController < Decidim::Assemblies::Admin::ApplicationController
+        include Concerns::AssemblyAdmin
+
+        def new
+          enforce_permission_to :create, :assembly
+          @form = form(AssemblyDuplicateForm).from_model(current_assembly)
+        end
+
+        def create
+          enforce_permission_to :create, :assembly
+          @form = form(AssemblyDuplicateForm).from_params(params)
+
+          DuplicateAssembly.call(@form, current_assembly, current_user) do
+            on(:ok) do
+              flash[:notice] = I18n.t("assemblies_duplicates.create.success", scope: "decidim.admin")
+              redirect_to assemblies_path
+            end
+
+            on(:invalid) do
+              flash.now[:alert] = I18n.t("assemblies_duplicates.create.error", scope: "decidim.admin")
+              render :new, status: :unprocessable_entity
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -16,15 +16,14 @@ module Decidim
           @form = form(AssemblyImportForm).from_params(params)
 
           ImportAssembly.call(@form, current_user) do
-            on(:ok) do |_assembly, warnings|
+            on(:ok) do
               flash[:notice] = I18n.t("assembly_imports.create.success", scope: "decidim.admin")
-              flash[:warning] = warnings.join("<br>") if warnings.any?
               redirect_to assemblies_path
             end
 
             on(:invalid) do
               flash.now[:alert] = I18n.t("assembly_imports.create.error", scope: "decidim.admin")
-              render :new
+              render :new, status: :unprocessable_entity
             end
           end
         end

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

@@ -31,6 +31,10 @@ module Decidim
         def resource_content_block_cell
           "decidim/assemblies/content_block"
         end
+
+        def content_blocks_title
+          t("decidim.admin.menu.assemblies_submenu.landing_page")
+        end
       end
     end
   end

data/app/forms/decidim/assemblies/admin/{assembly_copy_form.rb → assembly_duplicate_form.rb}

@@ -3,10 +3,10 @@
 module Decidim
   module Assemblies
     module Admin
-      # A form object used to copy a assemblies from the admin
+      # A form object used to duplicate a assemblies from the admin
       # dashboard.
       #
-      class AssemblyCopyForm < Form
+      class AssemblyDuplicateForm < Form
         include TranslatableAttributes
 
         translatable_attribute :title, String
@@ -14,8 +14,8 @@ module Decidim
         mimic :assembly
 
         attribute :slug, String
-        attribute :copy_components, Boolean
-        attribute :copy_landing_page_blocks, Boolean
+        attribute :duplicate_components, Boolean
+        attribute :duplicate_landing_page_blocks, Boolean
 
         validates :slug, presence: true, format: { with: Decidim::Assembly.slug_format }
         validates :title, translatable_presence: true

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

@@ -36,7 +36,6 @@ module Decidim
         attribute :created_by, String
         attribute :facebook_handler, String
         attribute :github_handler, String
-        attribute :hashtag, String
         attribute :instagram_handler, String
         attribute :slug, String
         attribute :twitter_handler, String

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

@@ -31,14 +31,12 @@ module Decidim
         attribute :import_components, Boolean, default: true
         attribute :document, Decidim::Attributes::Blob
 
-        validates :document, presence: true
         validates :document, file_content_type: { allow: ACCEPTED_TYPES.values }
         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
-        validate :document_must_have_content, if: -> { document.present? && errors[:document].none? }
 
         def document_text
           @document_text ||= document&.download
@@ -78,15 +76,6 @@ module Decidim
 
           errors.add(:slug, :taken)
         end
-
-        def document_must_have_content
-          return if document_text.blank?
-
-          parsed = JSON.parse(document_text)
-          errors.add(:document, :empty) if parsed.is_a?(Array) && parsed.empty?
-        rescue JSON::ParserError
-          errors.add(:document, :invalid_json)
-        end
       end
     end
   end

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

@@ -14,10 +14,7 @@ module Decidim
 
       # Items to display in the navigation of an assembly
       def assembly_nav_items(participatory_space)
-        components = participatory_space
-                     .components
-                     .published.or(Decidim::Component.where(id: try(:current_component)))
-                     .where(visible: true)
+        components = participatory_space.components.published.or(Decidim::Component.where(id: try(:current_component)))
 
         [
           *(if participatory_space.members_public_page?

data/app/models/decidim/assembly.rb

@@ -123,10 +123,6 @@ module Decidim
       published? && (!private_space? || (private_space? && is_transparent?))
     end
 
-    def hashtag
-      attributes["hashtag"].to_s.delete("#")
-    end
-
     def to_param
       slug
     end
@@ -173,7 +169,7 @@ module Decidim
 
       return base unless auth_object&.admin?
 
-      base + %w(published_at created_at private_space parent_id)
+      base + %w(published_at private_space parent_id)
     end
 
     def self.ransackable_associations(_auth_object = nil)

data/app/packs/entrypoints/decidim_assemblies_admin.js

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

data/app/packs/src/decidim/assemblies/admin/assemblies.js

@@ -1,63 +1,4 @@
-$(() => {
-  const $assemblyScopeEnabled = $("#assembly_scopes_enabled");
-  const $assemblyScopeId = $("#assembly_scope_id");
+import { definitionsFromContext } from "src/decidim/refactor/support/stimulus"
 
-  if ($(".edit_assembly, .new_assembly").length > 0) {
-    $assemblyScopeEnabled.on("change", (event) => {
-      const checked = event.target.checked;
-      $assemblyScopeId.attr("disabled", !checked);
-    })
-    $assemblyScopeId.attr("disabled", !$assemblyScopeEnabled.prop("checked"));
-  }
-
-  const $form = $(".assembly_form_admin");
-
-  if ($form.length > 0) {
-
-    const $privateSpace = $form.find("#private_space");
-    const $isTransparent = $form.find("#is_transparent");
-    const $specialFeatures = $form.find("#special_features");
-
-
-    const toggleDisabledHiddenFields = () => {
-      const enabledPrivateSpace = $privateSpace.find("input[type='checkbox']").prop("checked");
-      $isTransparent.find("input[type='checkbox']").attr("disabled", "disabled");
-      $specialFeatures.hide();
-
-      if (enabledPrivateSpace) {
-        $isTransparent.find("input[type='checkbox']").attr("disabled", !enabledPrivateSpace);
-        $specialFeatures.show();
-      }
-    };
-
-    $privateSpace.on("change", toggleDisabledHiddenFields);
-    toggleDisabledHiddenFields();
-
-    const $assemblyType = $form.find("#assembly_assembly_type");
-    const $assemblyTypeOther = $form.find("#assembly_type_other");
-
-    const $assemblyCreatedBy = $form.find("#assembly_created_by");
-    const $assemblyCreatedByOther = $form.find("#created_by_other");
-
-    const toggleDependsOnSelect = ($target, $showDiv) => {
-      const value = $target.val();
-      $showDiv.hide();
-      if (value === "others") {
-        $showDiv.show();
-      }
-    };
-
-    $assemblyType.on("change", (ev) => {
-      const $target = $(ev.target);
-      toggleDependsOnSelect($target, $assemblyTypeOther);
-    });
-
-    $assemblyCreatedBy.on("change", (ev) => {
-      const $target = $(ev.target);
-      toggleDependsOnSelect($target, $assemblyCreatedByOther);
-    });
-
-    toggleDependsOnSelect($assemblyType, $assemblyTypeOther);
-    toggleDependsOnSelect($assemblyCreatedBy, $assemblyCreatedByOther);
-  }
-});
+const context = require.context("../controllers", true, /controller\.js$/)
+window.Stimulus.load(definitionsFromContext(context))