decidim-admin 0.30.7 → 0.31.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b7f1325b5cc054088768a3a54e3b14a4b832722aee55dc8b9d6036987dac9a0e
-  data.tar.gz: 53bb55998312acb17ec0d99ed14cdd4e3fe266dda40eb6f9f442505b2206dd00
+  metadata.gz: c34cd47009937e22b9702e072abd4ed2b202b23b76d6977a1e82eb777dfa1fde
+  data.tar.gz: 536f248f74f2b6c02c0d486b7d8c0237a9e714816b6a1d6be9fd4efb9e4de5f8
 SHA512:
-  metadata.gz: 3b18f5c01b8c6007027e1529933ba738616011e9b96f64b78dc39055a3c9f16b3f73118e19820f9c84ab5fe26f481200ef759876698474ad13d1786da6e15646
-  data.tar.gz: c9fc4aaec02ddaf68dbabb850f94b761851c66041fe8835d13ae1653b3f4b9b48cc580767306872c3b2e73a6bf6a51d7c1f73978dbb86e7218c1305336ca764d
+  metadata.gz: 840132645dcff9896ac71fd53b2feb8dc4f3026ec9d1b855951b1285d3e914dd100bdb437269ef0e411195a1b8346761e8232f2ddc1833196a1343a49fe51d84
+  data.tar.gz: 91dd77784880249c7909850780737c7dcbc6f0d619f3e553bbc677fcfac177e1504b790df63edf1a87d052d35fdf520c16400c53ac5799b3d43f648bc9e21f26

data/app/cells/decidim/admin/content_block/show.erb

@@ -12,7 +12,7 @@
           <%= icon "delete-bin-line", role: "img", "aria-hidden": true %>
         <% end %>
       <% end %>
-      <%= icon("draggable", class: "dragger hover:cursor-grab") %>
+      <%= icon "menu-line", role: "img", "aria-hidden": true %>
     </div>
   </div>
 </li>

data/app/commands/decidim/admin/content_blocks/update_content_block.rb

@@ -6,7 +6,7 @@ module Decidim
       # This command gets called when a content block is updated from the admin
       # panel.
       class UpdateContentBlock < Decidim::Command
-        attr_reader :form, :content_block, :scope, :attachments_to_purge
+        attr_reader :form, :content_block, :scope
 
         # Public: Initializes the command.
         #
@@ -17,7 +17,6 @@ module Decidim
           @form = form
           @content_block = content_block
           @scope = scope
-          @attachments_to_purge = []
         end
 
         # Public: Updates the content block settings and its attachments.
@@ -56,8 +55,6 @@ module Decidim
 
           return broadcast(:invalid) unless images_valid
 
-          purge_attachment
-
           broadcast(:ok, content_block)
         end
 
@@ -70,20 +67,14 @@ module Decidim
         def update_content_block_images
           content_block.manifest.images.each do |image_config|
             image_name = image_config[:name]
+
             if form.images[image_name]
               content_block.images_container.send("#{image_name}=", form.images[image_name])
-            elsif form.images[:"remove_#{image_name}"]
-              @attachments_to_purge << content_block.images_container.send(image_name.to_s)
+            elsif form.images[:"remove_#{image_name}"] == "1"
               content_block.images_container.send("#{image_name}=", nil)
             end
           end
         end
-
-        def purge_attachment
-          attachments_to_purge.each do |attachment_to_purge|
-            attachment_to_purge.purge if attachment_to_purge.respond_to?(:purge)
-          end
-        end
       end
     end
   end

data/app/commands/decidim/admin/destroy_participatory_space_private_user.rb

@@ -13,16 +13,6 @@ module Decidim
           }
         }
       end
-
-      def run_after_hooks
-        return unless resource.privatable_to.respond_to?(:private_space?)
-        return unless resource.privatable_to.private_space?
-        return if resource.privatable_to.respond_to?(:is_transparent) && resource.privatable_to.is_transparent?
-
-        # When private user is destroyed, a hook to destroy the follows of user on private non-transparent assembly
-        # or private participatory process and the follows of their children
-        DestroyPrivateUsersFollowsJob.perform_later(resource.decidim_user_id, resource.privatable_to)
-      end
     end
   end
 end

data/app/commands/decidim/admin/hide_menu_component.rb

@@ -21,7 +21,7 @@ module Decidim
           :menu_hidden,
           component,
           current_user,
-          visibility: "admin-only"
+          visibility: "all"
         ) do
           component.update!(visible: false)
         end

data/app/commands/decidim/admin/publish_component.rb

@@ -19,7 +19,6 @@ module Decidim
       def call
         publish_component
         publish_event unless component.previously_published?
-        component.manifest.run_hooks(:publish, component)
 
         broadcast(:ok)
       end

data/app/commands/decidim/admin/unpublish_component.rb

@@ -18,7 +18,6 @@ module Decidim
       # Broadcasts :ok if unpublished, :invalid otherwise.
       def call
         unpublish_component
-        component.manifest.run_hooks(:unpublish, component)
 
         broadcast(:ok)
       end

data/app/commands/decidim/admin/unreport_user.rb

@@ -19,7 +19,7 @@ module Decidim
       #
       # Returns nothing.
       def call
-        return broadcast(:invalid) unless @reportable.reported? || @reportable.user_moderation
+        return broadcast(:invalid) unless @reportable.reported?
 
         unreport!
         broadcast(:ok, @reportable)

data/app/commands/decidim/admin/update_organization.rb

@@ -5,10 +5,14 @@ module Decidim
     # A command with all the business logic for updating the current
     # organization.
     class UpdateOrganization < Decidim::Commands::UpdateResource
-      fetch_form_attributes :name, :default_locale, :reference_prefix, :time_zone, :twitter_handler,
+      fetch_file_attributes :logo, :favicon, :official_img_footer
+
+      fetch_form_attributes :name, :description, :default_locale, :reference_prefix, :time_zone, :twitter_handler,
                             :facebook_handler, :instagram_handler, :youtube_handler, :github_handler, :badges_enabled,
-                            :user_groups_enabled, :comments_max_length, :enable_machine_translations,
-                            :admin_terms_of_service_body, :rich_text_editor_in_public_views, :enable_participatory_space_filters
+                            :comments_max_length, :enable_machine_translations, :admin_terms_of_service_body,
+                            :rich_text_editor_in_public_views, :enable_participatory_space_filters, :official_url,
+                            :enable_omnipresent_banner, :omnipresent_banner_url, :omnipresent_banner_title,
+                            :omnipresent_banner_short_description
 
       private
 
@@ -16,6 +20,7 @@ module Decidim
         super
           .merge(welcome_notification_attributes)
           .merge(machine_translation_attributes)
+          .merge(colors_attributes)
       end
 
       def welcome_notification_attributes
@@ -33,6 +38,16 @@ module Decidim
           machine_translation_display_priority: form.machine_translation_display_priority
         }
       end
+
+      def colors_attributes
+        {
+          colors: {
+            primary: form.primary_color,
+            secondary: form.secondary_color,
+            tertiary: form.tertiary_color
+          }.compact_blank
+        }
+      end
     end
   end
 end

data/app/controllers/concerns/decidim/admin/content_blocks/landing_page_content_blocks.rb

@@ -55,7 +55,7 @@ module Decidim
                 redirect_to edit_resource_landing_page_path
               end
               on(:invalid) do
-                render "decidim/admin/shared/landing_page_content_blocks/edit"
+                render "decidim/admin/shared/landing_page_content_blocks/edit", status: :unprocessable_entity
               end
             end
           end

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

@@ -186,7 +186,7 @@ module Decidim
 
         # Plural model name. Used in search_field placeholder.
         def collection_name
-          query.klass.model_name.human(count: 2)
+          query.klass.model_name.human(count: 2).downcase
         end
 
         def taxonomy_order_or_search?

data/app/controllers/decidim/admin/area_types_controller.rb

@@ -34,7 +34,7 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = I18n.t("area_types.create.error", scope: "decidim.admin")
-            render :new
+            render :new, status: :unprocessable_entity
           end
         end
       end
@@ -56,7 +56,7 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = I18n.t("area_types.update.error", scope: "decidim.admin")
-            render :edit
+            render :edit, status: :unprocessable_entity
           end
         end
       end

data/app/controllers/decidim/admin/areas_controller.rb

@@ -35,7 +35,7 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = I18n.t("areas.create.error", scope: "decidim.admin")
-            render :new
+            render :new, status: :unprocessable_entity
           end
         end
       end
@@ -57,7 +57,7 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = I18n.t("areas.update.error", scope: "decidim.admin")
-            render :edit
+            render :edit, status: :unprocessable_entity
           end
         end
       end

data/app/controllers/decidim/admin/block_user_controller.rb

@@ -27,7 +27,7 @@ module Decidim
 
           on(:invalid) do
             flash[:alert] = I18n.t("officializations.block.error", scope: "decidim.admin")
-            render :new
+            render :new, status: :unprocessable_entity
           end
         end
       end
@@ -65,7 +65,7 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = I18n.t("officializations.bulk_action.block.invalid", scope: "decidim.admin")
-            render :bulk_new
+            render :bulk_new, status: :unprocessable_entity
           end
         end
       end

data/app/controllers/decidim/admin/component_permissions_controller.rb

@@ -26,7 +26,7 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = t("component_permissions.update.error", scope: "decidim.admin")
-            render action: :edit
+            render action: :edit, status: :unprocessable_entity
           end
         end
       end

data/app/controllers/decidim/admin/components_controller.rb

@@ -47,7 +47,7 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = I18n.t("components.create.error", scope: "decidim.admin")
-            render action: "new"
+            render action: "new", status: :unprocessable_entity
           end
         end
       end
@@ -74,7 +74,7 @@ module Decidim
 
           on(:invalid) do
             flash[:alert] = I18n.t("components.update.error", scope: "decidim.admin")
-            render action: :edit
+            render action: :edit, status: :unprocessable_entity
           end
         end
       end

data/app/controllers/decidim/admin/concerns/has_attachment_collections.rb

@@ -39,7 +39,7 @@ module Decidim
 
               on(:invalid) do
                 flash.now[:alert] = I18n.t("attachment_collections.create.error", scope: "decidim.admin")
-                render template: "decidim/admin/attachment_collections/new"
+                render template: "decidim/admin/attachment_collections/new", status: :unprocessable_entity
               end
             end
           end
@@ -64,7 +64,7 @@ module Decidim
 
               on(:invalid) do
                 flash.now[:alert] = I18n.t("attachment_collections.update.error", scope: "decidim.admin")
-                render template: "decidim/admin/attachment_collections/edit"
+                render template: "decidim/admin/attachment_collections/edit", status: :unprocessable_entity
               end
             end
           end

data/app/controllers/decidim/admin/concerns/has_attachments.rb

@@ -39,7 +39,7 @@ module Decidim
 
               on(:invalid) do
                 flash.now[:alert] = I18n.t("attachments.create.error", scope: "decidim.admin")
-                render template: "decidim/admin/attachments/new"
+                render template: "decidim/admin/attachments/new", status: :unprocessable_entity
               end
             end
           end
@@ -64,7 +64,7 @@ module Decidim
 
               on(:invalid) do
                 flash.now[:alert] = I18n.t("attachments.update.error", scope: "decidim.admin")
-                render template: "decidim/admin/attachments/edit"
+                render template: "decidim/admin/attachments/edit", status: :unprocessable_entity
               end
             end
           end

data/app/controllers/decidim/admin/concerns/has_private_users.rb

@@ -51,7 +51,7 @@ module Decidim
 
               on(:invalid) do
                 flash.now[:alert] = I18n.t("participatory_space_private_users.update.error", scope: "decidim.admin")
-                render template: "decidim/admin/participatory_space_private_users/edit"
+                render template: "decidim/admin/participatory_space_private_users/edit", status: :unprocessable_entity
               end
             end
           end
@@ -68,7 +68,7 @@ module Decidim
 
               on(:invalid) do
                 flash.now[:alert] = I18n.t("participatory_space_private_users.create.error", scope: "decidim.admin")
-                render template: "decidim/admin/participatory_space_private_users/new"
+                render template: "decidim/admin/participatory_space_private_users/new", status: :unprocessable_entity
               end
             end
           end
@@ -84,7 +84,7 @@ module Decidim
 
               on(:invalid) do
                 flash.now[:alert] = I18n.t("participatory_space_private_users.destroy.error", scope: "decidim.admin")
-                render template: "decidim/admin/participatory_space_private_users/index"
+                render template: "decidim/admin/participatory_space_private_users/index", status: :unprocessable_entity
               end
             end
           end

data/app/controllers/decidim/admin/concerns/has_private_users_csv_import.rb

@@ -34,7 +34,7 @@ module Decidim
 
               on(:invalid) do
                 flash[:alert] = I18n.t("participatory_space_private_users_csv_imports.create.invalid", scope: "decidim.admin")
-                render template: "decidim/admin/participatory_space_private_users_csv_imports/new"
+                render template: "decidim/admin/participatory_space_private_users_csv_imports/new", status: :unprocessable_entity
               end
             end
           end

data/app/controllers/decidim/admin/conflicts_controller.rb

@@ -47,7 +47,7 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = I18n.t("error", scope: "decidim.admin.conflicts.transfer")
-            render action: "edit"
+            render action: "edit", status: :unprocessable_entity
           end
         end
       end

data/app/controllers/decidim/admin/dashboard_controller.rb

@@ -7,7 +7,6 @@ module Decidim
     class DashboardController < Decidim::Admin::ApplicationController
       helper_method :latest_action_logs
       helper_method :users_counter
-      helper_method :metrics_presenter
       helper_method :count_pending_moderations
 
       def show
@@ -29,14 +28,6 @@ module Decidim
                                 .first(5)
       end
 
-      def metrics_presenter
-        @metrics_presenter ||= Decidim::Admin::DashboardMetricChartsPresenter.new(
-          summary: true,
-          organization: current_organization,
-          view_context:
-        )
-      end
-
       def users_counter
         last_day = Time.zone.yesterday
         last_week = Time.zone.today.prev_week

data/app/controllers/decidim/admin/impersonations_controller.rb

@@ -46,7 +46,7 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = I18n.t("impersonations.create.error", scope: "decidim.admin")
-            render :new
+            render :new, status: :unprocessable_entity
           end
         end
       end

data/app/controllers/decidim/admin/imports_controller.rb

@@ -39,7 +39,7 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = t("decidim.admin.imports.error")
-            render :new
+            render :new, status: :unprocessable_entity
           end
         end
       end

data/app/controllers/decidim/admin/managed_users/promotions_controller.rb

@@ -25,7 +25,7 @@ module Decidim
 
             on(:invalid) do
               flash.now[:alert] = I18n.t("managed_users.promotion.error", scope: "decidim.admin")
-              render :new
+              render :new, status: :unprocessable_entity
             end
           end
         end

data/app/controllers/decidim/admin/newsletters_controller.rb

@@ -56,7 +56,7 @@ module Decidim
           on(:invalid) do |newsletter|
             @newsletter = newsletter
             flash.now[:error] = I18n.t("newsletters.create.error", scope: "decidim.admin")
-            render action: :new
+            render action: :new, status: :unprocessable_entity
           end
         end
       end
@@ -80,7 +80,7 @@ module Decidim
           on(:invalid) do |newsletter|
             @newsletter = newsletter
             flash.now[:error] = I18n.t("newsletters.update.error", scope: "decidim.admin")
-            render action: :edit
+            render action: :edit, status: :unprocessable_entity
           end
         end
       end
@@ -128,12 +128,12 @@ module Decidim
 
           on(:invalid) do
             flash.now[:error] = I18n.t("newsletters.deliver.error", scope: "decidim.admin")
-            render action: :select_recipients_to_deliver
+            render action: :select_recipients_to_deliver, status: :unprocessable_entity
           end
 
           on(:no_recipients) do
             flash.now[:error] = I18n.t("newsletters.send.no_recipients", scope: "decidim.admin")
-            render action: :select_recipients_to_deliver
+            render action: :select_recipients_to_deliver, status: :unprocessable_entity
           end
         end
       end

data/app/controllers/decidim/admin/organization_appearance_controller.rb

@@ -8,8 +8,6 @@ module Decidim
 
       add_breadcrumb_item_from_menu :admin_settings_menu
 
-      helper Decidim::Admin::UploaderImageDimensionsHelper
-
       def edit
         enforce_permission_to :update, :organization, organization: current_organization
         @form = form(OrganizationAppearanceForm).from_model(current_organization)
@@ -27,7 +25,7 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = I18n.t("organization.update.error", scope: "decidim.admin")
-            render :edit
+            render :edit, status: :unprocessable_entity
           end
         end
       end

data/app/controllers/decidim/admin/organization_controller.rb

@@ -7,6 +7,8 @@ module Decidim
     class OrganizationController < Decidim::Admin::ApplicationController
       layout "decidim/admin/settings"
 
+      helper Decidim::Admin::UploaderImageDimensionsHelper
+
       add_breadcrumb_item_from_menu :admin_settings_menu
 
       def edit
@@ -27,7 +29,7 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = I18n.t("organization.update.error", scope: "decidim.admin")
-            render :edit
+            render :edit, status: :unprocessable_entity
           end
         end
       end
@@ -36,10 +38,6 @@ module Decidim
         search(current_organization.users.available)
       end
 
-      def user_entities
-        search(current_organization.user_entities.available)
-      end
-
       private
 
       def search(relation)

data/app/controllers/decidim/admin/organization_external_domain_allowlist_controller.rb

@@ -25,7 +25,7 @@ module Decidim
           end
           on(:invalid) do
             flash[:notice] = t("domain_allowlist.update.error", scope: "decidim.admin")
-            render action: "edit"
+            render action: "edit", status: :unprocessable_entity
           end
         end
       end

data/app/controllers/decidim/admin/organization_homepage_controller.rb

@@ -33,6 +33,10 @@ module Decidim
       def resource_content_block_cell
         "decidim/admin/homepage_content_block"
       end
+
+      def content_blocks_title
+        t("decidim.admin.menu.homepage")
+      end
     end
   end
 end

data/app/controllers/decidim/admin/participatory_space/user_role_controller.rb

@@ -38,7 +38,7 @@ module Decidim
 
             on(:invalid) do
               flash[:alert] = I18n.t("create.error", scope: i18n_scope)
-              render :new
+              render :new, status: :unprocessable_entity
             end
           end
         end
@@ -56,7 +56,7 @@ module Decidim
 
             on(:invalid) do
               flash.now[:alert] = I18n.t("update.error", scope: i18n_scope)
-              render :edit
+              render :edit, status: :unprocessable_entity
             end
           end
         end

data/app/controllers/decidim/admin/reminders_controller.rb

@@ -27,7 +27,7 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = t("decidim.admin.reminders.create.error")
-            render :new
+            render :new, status: :unprocessable_entity
           end
         end
       end

data/app/controllers/decidim/admin/resource_permissions_controller.rb

@@ -25,7 +25,7 @@ module Decidim
           end
 
           on(:invalid) do
-            render action: :edit
+            render action: :edit, status: :unprocessable_entity
           end
         end
       end

data/app/controllers/decidim/admin/scope_types_controller.rb

@@ -34,7 +34,7 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = I18n.t("scope_types.create.error", scope: "decidim.admin")
-            render :new
+            render :new, status: :unprocessable_entity
           end
         end
       end
@@ -56,7 +56,7 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = I18n.t("scope_types.update.error", scope: "decidim.admin")
-            render :edit
+            render :edit, status: :unprocessable_entity
           end
         end
       end

data/app/controllers/decidim/admin/scopes_controller.rb

@@ -36,7 +36,7 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = I18n.t("scopes.create.error", scope: "decidim.admin")
-            render :new
+            render :new, status: :unprocessable_entity
           end
         end
       end
@@ -58,7 +58,7 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = I18n.t("scopes.update.error", scope: "decidim.admin")
-            render :edit
+            render :edit, status: :unprocessable_entity
           end
         end
       end

data/app/controllers/decidim/admin/share_tokens_controller.rb

@@ -31,7 +31,7 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = I18n.t("share_tokens.create.invalid", scope: "decidim.admin")
-            render action: "new"
+            render action: "new", status: :unprocessable_entity
           end
         end
       end
@@ -53,7 +53,7 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = I18n.t("share_tokens.update.error", scope: "decidim.admin")
-            render :edit
+            render :edit, status: :unprocessable_entity
           end
         end
       end

data/app/controllers/decidim/admin/static_page_topics_controller.rb

@@ -30,7 +30,7 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = I18n.t("static_page_topics.create.error", scope: "decidim.admin")
-            render :new
+            render :new, status: :unprocessable_entity
           end
         end
       end
@@ -52,7 +52,7 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = I18n.t("static_page_topics.update.error", scope: "decidim.admin")
-            render :edit
+            render :edit, status: :unprocessable_entity
           end
         end
       end

data/app/controllers/decidim/admin/static_pages_controller.rb

@@ -62,7 +62,7 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = I18n.t("static_pages.create.error", scope: "decidim.admin")
-            render :new
+            render :new, status: :unprocessable_entity
           end
         end
       end
@@ -85,7 +85,7 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = I18n.t("static_pages.update.error", scope: "decidim.admin")
-            render :edit
+            render :edit, status: :unprocessable_entity
           end
         end
       end