decidim-admin 0.31.3 → 0.32.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a496d564db404d845bf0c01d03777a3569c62edc12930b42f126931e83d5eac9
-  data.tar.gz: 4dc385ef84cbef63be1045e4a62120c25b8e71ac8580b54f7ada404bc988e9a8
+  metadata.gz: 9da138630750a0739cd6fd8b161f7093193e6293fa32a00e24355c7c0fca9a0c
+  data.tar.gz: ba05f9d1e15ac506f29ce14428c7952be077fd8f251c886be250267a1b32fbb9
 SHA512:
-  metadata.gz: 905379c99a3043d4a0782682b87e041f93305d0614f4e4ba3727839e3f8e35a05dc3db37b822dd8e8aa3c243e071752f56ae4cbb4f39b9360b126021a66335c4
-  data.tar.gz: 8fb9333dce766f2d4b07fd2ada389841b2a4c0c97d8cf7227d37418598b48bb6e14d0d2fe5cea82638a035ecc64f2cbdc40c8272f4da15afd82963b1f2c94ead
+  metadata.gz: 135c143b735ee0ada94c33046c6f9c5cbf81027b91ee609677a66b3fd04db2051781eab9b465836666acf5b3268ba372ab69ed823509d4cba115f2b600cd1a83
+  data.tar.gz: 501dd3d2f79cc2b1699830d82b7f411ebeb8656aab4ac0de1da085b7ec5a4882053187796221a38687544a5a24446d4df752bdecee3fd445b581c9ef7481b7fe

data/README.md

@@ -1,4 +1,4 @@
-# Decidim::Admin
+# decidim-admin
 
 Adds an administration dashboard so users can manage their
 organization, participatory processes and all other entities.
@@ -10,17 +10,7 @@ It is included by default with Decidim.
 
 ## Installation
 
-Add this line to your application's Gemfile:
-
-```ruby
-gem 'decidim-admin'
-```
-
-And then execute:
-
-```bash
-bundle
-```
+This is on the default Decidim installation so you should not change anything to use this module.
 
 ## Components
 

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

@@ -1,3 +1,3 @@
-<% if private_space? && !(transparent_space?) %>
+<% if restricted_space? %>
   <%= cell("decidim/announcement", t("decidim.admin.attachments_privacy_warning.message"), callout_class: "warning") %>
 <% end %>

data/app/cells/decidim/admin/attachments_privacy_warning_cell.rb

@@ -7,12 +7,8 @@ module Decidim
 
       private
 
-      def private_space?
-        current_participatory_space.private_space if current_participatory_space.respond_to?(:private_space)
-      end
-
-      def transparent_space?
-        current_participatory_space.is_transparent if current_participatory_space.respond_to?(:is_transparent)
+      def restricted_space?
+        current_participatory_space.respond_to?(:restricted?) && current_participatory_space.restricted?
       end
     end
   end

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

@@ -59,7 +59,7 @@ module Decidim
 
           data.each do |id, weight|
             content_block = collection.find_by(id:)
-            content_block.update!(weight:) if content_block.present?
+            (content_block.presence&.update!(weight:))
           end
         end
 

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

@@ -58,6 +58,7 @@ module Decidim
 
       def notify_followers
         return unless @attachment.attached_to.is_a?(Decidim::Followable)
+        return if @attachment.attached_to.respond_to?(:published?) && !@attachment.attached_to.published?
 
         Decidim::EventsManager.publish(
           event: "decidim.events.attachments.attachment_created",

data/app/commands/decidim/admin/participatory_space/create_member.rb

@@ -0,0 +1,99 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    module ParticipatorySpace
+      # A command with all the business logic when creating a new participatory space
+      # member in the system.
+      class CreateMember < Decidim::Command
+        delegate :current_user, to: :form
+        # Public: Initializes the command.
+        #
+        # form - A form object with the params.
+        # member_to - The member_to that will hold the
+        #   user role
+        def initialize(form, member_to, via_csv: false)
+          @form = form
+          @member_to = member_to
+          @via_csv = via_csv
+        end
+
+        # Executes the command. Broadcasts these events:
+        #
+        # - :ok when everything is valid.
+        # - :invalid if the form was not valid and we could not proceed.
+        #
+        # Returns nothing.
+        def call
+          return broadcast(:invalid) if form.invalid?
+
+          ActiveRecord::Base.transaction do
+            @user ||= existing_user || new_user
+            create_member
+          end
+
+          broadcast(:ok)
+        rescue ActiveRecord::RecordInvalid
+          form.errors.add(:email, :taken)
+          broadcast(:invalid)
+        end
+
+        private
+
+        attr_reader :form, :member_to, :user
+
+        def create_member
+          action = @via_csv ? "create_via_csv" : "create"
+          Decidim.traceability.perform_action!(
+            action,
+            Decidim::ParticipatorySpace::Member,
+            current_user,
+            resource: {
+              title: user.name
+            }
+          ) do
+            member = Decidim::ParticipatorySpace::Member.where(user:, participatory_space: @member_to).first_or_initialize
+            member.role = form.role
+            member.published = form.published
+            member.save!
+            member
+          end
+        end
+
+        def existing_user
+          return @existing_user if defined?(@existing_user)
+
+          @existing_user = User.find_by(
+            email: form.email.downcase,
+            organization: member_to.organization
+          )
+
+          InviteUserAgain.call(@existing_user, invitation_instructions) if @existing_user&.invitation_pending?
+
+          @existing_user
+        end
+
+        def new_user
+          @new_user ||= InviteUser.call(user_form) do
+            on(:ok) do |user|
+              return user
+            end
+          end
+        end
+
+        def user_form
+          OpenStruct.new(name: form.name,
+                         email: form.email.downcase,
+                         organization: member_to.organization,
+                         admin: false,
+                         invited_by: current_user,
+                         invitation_instructions:)
+        end
+
+        def invitation_instructions
+          "invite_member"
+        end
+      end
+    end
+  end
+end

data/app/commands/decidim/admin/participatory_space/destroy_member.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    module ParticipatorySpace
+      # A command with all the business logic to destroy a member.
+      class DestroyMember < Decidim::Commands::DestroyResource
+        private
+
+        def extra_params
+          {
+            resource: {
+              title: resource.user.name
+            }
+          }
+        end
+
+        def run_after_hooks
+          return unless resource.participatory_space.respond_to?(:restricted?)
+          return unless resource.participatory_space.restricted?
+          return if resource.participatory_space.respond_to?(:transparent?) && resource.participatory_space.transparent?
+
+          # When member is destroyed, a hook to destroy the follows of user on restricted or transparent spaces
+          # and the follows of their children
+          DestroyMembersFollowsJob.perform_later(resource.decidim_user_id, resource.participatory_space)
+        end
+      end
+    end
+  end
+end

data/app/commands/decidim/admin/participatory_space/import_member_csv.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+require "csv"
+
+module Decidim
+  module Admin
+    module ParticipatorySpace
+      class ImportMemberCsv < Decidim::Command
+        include Decidim::Admin::CustomImport
+
+        delegate :current_user, to: :form
+        # Public: Initializes the command.
+        #
+        # form - the form object containing the uploaded file
+        # members_to - The members_to that will hold the user role
+        def initialize(form, members_to)
+          @form = form
+          @members_to = members_to
+        end
+
+        # Executes the command. Broadcasts these events:
+        #
+        # - :ok when everything is valid.
+        # - :invalid if the form was not valid and we could not proceed.
+        #
+        # Returns nothing.
+        def call
+          return broadcast(:invalid) unless @form.valid?
+
+          process_csv
+          broadcast(:ok)
+        end
+
+        private
+
+        attr_reader :form
+
+        def process_csv
+          process_import_file(@form.file) do |(email, user_name)|
+            ImportMemberCsvJob.perform_later(email, user_name, @members_to, current_user) if email.present? && user_name.present?
+          end
+        end
+      end
+    end
+  end
+end

data/app/commands/decidim/admin/participatory_space/publish_all_members.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    module ParticipatorySpace
+      class PublishAllMembers < Decidim::Command
+        # Public: Initializes the command.
+        #
+        # participatory_space - the participatory space
+        # current_user - the current user
+        def initialize(participatory_space, current_user)
+          @participatory_space = participatory_space
+          @current_user = current_user
+        end
+
+        # Executes the command. Broadcasts these events:
+        #
+        # - :ok when everything is valid.
+        # - :invalid if the form was not valid and we could not proceed.
+        #
+        # Returns nothing.
+        def call
+          publish_all
+          create_action_log
+          broadcast(:ok)
+        rescue ActiveRecord::RecordInvalid
+          broadcast(:invalid)
+        end
+
+        private
+
+        attr_reader :participatory_space, :current_user
+
+        def publish_all
+          # rubocop:disable Rails/SkipsModelValidations
+          # Using update_all for performance reasons
+          participatory_space.members.update_all(published: true)
+          # rubocop:enable Rails/SkipsModelValidations
+        end
+
+        def create_action_log
+          Decidim.traceability.perform_action!(
+            "publish_all_members",
+            participatory_space,
+            current_user,
+            members_ids: participatory_space.members.pluck(:id)
+          )
+        end
+      end
+    end
+  end
+end

data/app/commands/decidim/admin/participatory_space/unpublish_all_members.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    module ParticipatorySpace
+      class UnpublishAllMembers < Decidim::Command
+        # Public: Initializes the command.
+        #
+        # participatory_space - the participatory space
+        # current_user - the current user
+        def initialize(participatory_space, current_user)
+          @participatory_space = participatory_space
+          @current_user = current_user
+        end
+
+        # Executes the command. Broadcasts these events:
+        #
+        # - :ok when everything is valid.
+        # - :invalid if the form was not valid and we could not proceed.
+        #
+        # Returns nothing.
+        def call
+          unpublish_all
+          create_action_log
+          broadcast(:ok)
+        rescue ActiveRecord::RecordInvalid
+          broadcast(:invalid)
+        end
+
+        private
+
+        attr_reader :participatory_space, :current_user
+
+        def unpublish_all
+          # rubocop:disable Rails/SkipsModelValidations
+          # Using update_all for performance reasons
+          participatory_space.members.update_all(published: false)
+          # rubocop:enable Rails/SkipsModelValidations
+        end
+
+        def create_action_log
+          Decidim.traceability.perform_action!(
+            "unpublish_all_members",
+            participatory_space,
+            current_user,
+            members_ids: participatory_space.members.pluck(:id)
+          )
+        end
+      end
+    end
+  end
+end

data/app/commands/decidim/admin/participatory_space/update_member.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    module ParticipatorySpace
+      # A command with all the business logic when updating a participatory space
+      # member.
+      class UpdateMember < Decidim::Commands::UpdateResource
+        fetch_form_attributes :role, :published
+      end
+    end
+  end
+end

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

@@ -38,7 +38,7 @@ module Decidim
         transaction do
           order.each_with_index do |id, index|
             component = components.find_by(id:)
-            component.update!(weight: index + 1) if component.present?
+            (component.presence&.update!(weight: index + 1))
           end
         end
       end

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

@@ -54,7 +54,7 @@ module Decidim
 
         data.each do |id, weight|
           item = collection.find_by(id:)
-          item.update!(weight:) if item.present?
+          (item.presence&.update!(weight:))
         end
       end
 

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

@@ -10,7 +10,7 @@ module Decidim
       fetch_form_attributes :name, :description, :default_locale, :reference_prefix, :time_zone, :twitter_handler,
                             :facebook_handler, :instagram_handler, :youtube_handler, :github_handler, :badges_enabled,
                             :comments_max_length, :enable_machine_translations, :admin_terms_of_service_body,
-                            :rich_text_editor_in_public_views, :enable_participatory_space_filters, :official_url,
+                            :rich_text_editor_in_public_views, :official_url,
                             :enable_omnipresent_banner, :omnipresent_banner_url, :omnipresent_banner_title,
                             :omnipresent_banner_short_description
 

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

@@ -5,6 +5,7 @@ module Decidim
     module ContentBlocks
       module LandingPage
         extend ActiveSupport::Concern
+
         included do
           helper_method :active_blocks, :active_content_blocks_title, :add_content_block_text, :available_manifests,
                         :content_block_destroy_confirmation_text, :content_blocks_title, :inactive_blocks,

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

@@ -5,6 +5,7 @@ module Decidim
     module ContentBlocks
       module LandingPageContentBlocks
         extend ActiveSupport::Concern
+
         included do
           helper_method :content_block, :resource_landing_page_content_block_path, :scoped_resource, :submit_button_text
 
@@ -48,14 +49,14 @@ module Decidim
           def update
             enforce_permission_to_update_resource
 
-            @form = form(ContentBlockForm).from_params(params)
+            @form = form(ContentBlockForm).from_params(params, content_block:)
 
             UpdateContentBlock.call(@form, content_block, content_block_scope) do
               on(:ok) do
                 redirect_to edit_resource_landing_page_path
               end
               on(:invalid) do
-                render "decidim/admin/shared/landing_page_content_blocks/edit", status: :unprocessable_entity
+                render "decidim/admin/shared/landing_page_content_blocks/edit", status: :unprocessable_content
               end
             end
           end

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

@@ -77,7 +77,7 @@ module Decidim
         # the query
         def adjacent_items(item)
           query =
-            <<-SQL.squish
+            <<~SQL.squish
               WITH
                 collection AS (#{session_filtered_collection.select(:id).to_sql}),
                 successors AS (
@@ -162,7 +162,7 @@ module Decidim
         # - FilterableHelper#applied_filters_hidden_field_tags
         # To ensure that filters are kept in the search_form_for.
         def filters
-          [:private_space_eq, :published_at_null]
+          [:published_at_null]
         end
 
         # Informs which filters are being used OUTSIDE the dropdown.
@@ -198,8 +198,8 @@ module Decidim
           filtered_taxonomies = taxonomies.roots.or(taxonomies.where(id: available_taxonomy_ids))
           return nil if filtered_taxonomies.blank?
 
-          filtered_taxonomies.each_with_object({}) do |taxonomy, hash|
-            hash[taxonomy.id] = taxonomy_ids_hash(taxonomy.children)
+          filtered_taxonomies.to_h do |taxonomy|
+            [taxonomy.id, taxonomy_ids_hash(taxonomy.children)]
           end
         end
 

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

@@ -25,6 +25,7 @@ module Decidim
       included do
         include Decidim::NeedsOrganization
         include Decidim::Admin::ParticipatorySpaceAdminBreadcrumb
+
         helper ParticipatorySpaceHelpers
 
         helper_method :current_participatory_space

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

@@ -17,7 +17,7 @@ module Decidim
 
           flash[:notice] = t("decidim.admin.exports.notice")
 
-          redirect_back(fallback_location: after_export_path)
+          redirect_back_or_to(after_export_path)
         end
 
         # Public: To be implemented at the controller. You need to

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, status: :unprocessable_entity
+            render :new, status: :unprocessable_content
           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, status: :unprocessable_entity
+            render :edit, status: :unprocessable_content
           end
         end
       end

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

@@ -6,6 +6,7 @@ module Decidim
     #
     class AreasController < Decidim::Admin::ApplicationController
       include Decidim::Admin::Concerns::HasTabbedMenu
+
       helper Decidim::Admin::AreasHelper
 
       layout "decidim/admin/settings"
@@ -35,7 +36,7 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = I18n.t("areas.create.error", scope: "decidim.admin")
-            render :new, status: :unprocessable_entity
+            render :new, status: :unprocessable_content
           end
         end
       end
@@ -57,7 +58,7 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = I18n.t("areas.update.error", scope: "decidim.admin")
-            render :edit, status: :unprocessable_entity
+            render :edit, status: :unprocessable_content
           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, status: :unprocessable_entity
+            render :new, status: :unprocessable_content
           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, status: :unprocessable_entity
+            render :bulk_new, status: :unprocessable_content
           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, status: :unprocessable_entity
+            render action: :edit, status: :unprocessable_content
           end
         end
       end

data/app/controllers/decidim/admin/components/base_controller.rb

@@ -10,6 +10,7 @@ module Decidim
 
         include Decidim::Admin::ParticipatorySpaceAdminContext
         include Decidim::NeedsPermission
+
         participatory_space_admin_layout
 
         helper Decidim::ResourceHelper
@@ -23,15 +24,9 @@ module Decidim
                       :current_participatory_space,
                       :parent_path
 
-        before_action except: [:index, :show] do
-          enforce_permission_to :manage, :component, component: current_component unless skip_manage_component_permission
-        end
-
-        before_action on: [:index, :show] do
-          enforce_permission_to :read, :component, component: current_component
-        end
+        before_action :enforce_component_permissions
 
-        before_action :set_component_breadcrumb_item
+        before_action :set_breadcrumb_items
 
         def permissions_context
           super.merge(
@@ -68,7 +63,16 @@ module Decidim
           false
         end
 
-        def set_component_breadcrumb_item
+        def enforce_component_permissions
+          case action_name.to_sym
+          when :index, :show
+            enforce_permission_to :read, :component, component: current_component
+          else
+            enforce_permission_to :manage, :component, component: current_component unless skip_manage_component_permission
+          end
+        end
+
+        def set_breadcrumb_items
           context_breadcrumb_items << {
             label: t("components", scope: "decidim.admin.menu"),
             url: parent_path,

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

@@ -7,6 +7,7 @@ module Decidim
     #
     class ComponentsController < Decidim::Admin::ApplicationController
       include Decidim::Admin::HasTrashableResources
+
       helper_method :manifest
 
       def index
@@ -47,7 +48,7 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = I18n.t("components.create.error", scope: "decidim.admin")
-            render action: "new", status: :unprocessable_entity
+            render action: "new", status: :unprocessable_content
           end
         end
       end
@@ -74,7 +75,7 @@ module Decidim
 
           on(:invalid) do
             flash[:alert] = I18n.t("components.update.error", scope: "decidim.admin")
-            render action: :edit, status: :unprocessable_entity
+            render action: :edit, status: :unprocessable_content
           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", status: :unprocessable_entity
+                render template: "decidim/admin/attachment_collections/new", status: :unprocessable_content
               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", status: :unprocessable_entity
+                render template: "decidim/admin/attachment_collections/edit", status: :unprocessable_content
               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", status: :unprocessable_entity
+                render template: "decidim/admin/attachments/new", status: :unprocessable_content
               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", status: :unprocessable_entity
+                render template: "decidim/admin/attachments/edit", status: :unprocessable_content
               end
             end
           end