decidim-admin 0.31.8 → 0.32.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b09d289923eeba25084f2ef02203d589e66d9f9112ab0c07663f5cabcc27fa6
-  data.tar.gz: ac243685d31770727448e905d9cd8d92afc6681c2418f26c92336075d9c91df2
+  metadata.gz: 9da138630750a0739cd6fd8b161f7093193e6293fa32a00e24355c7c0fca9a0c
+  data.tar.gz: ba05f9d1e15ac506f29ce14428c7952be077fd8f251c886be250267a1b32fbb9
 SHA512:
-  metadata.gz: 988427f2e29e0dc9d8ea2284421e014a690f65b90f0374a4c6acafaf5cbf0a566ea09c3678d420b0d24f6f2ac475f145f7a28dd84011bcf649f158c1527beec1
-  data.tar.gz: ca646ce7ca7f693b7c37f164504c2c076cfcf1cf231ec8450c675b82b94c058a856cd76659c020cf74ebf10ffecde940448111c138fe5d2974663eb696114079
+  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_newsletter.rb

@@ -31,7 +31,7 @@ module Decidim
             @content_block = content_block
           end
           on(:invalid) do
-            raise Decidim::Commands::HookError, "There was a problem persisting the changes to the content block"
+            raise "There was a problem persisting the changes to the content block"
           end
         end
       end

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

@@ -5,34 +5,20 @@ module Decidim
     # A command with all the business logic to create a new taxonomy filter in the
     # system.
     class CreateTaxonomyFilter < Decidim::Commands::CreateResource
-      fetch_form_attributes :root_taxonomy_id, :internal_name, :name, :participatory_space_manifests
+      fetch_form_attributes :root_taxonomy_id, :filter_items, :internal_name, :name, :participatory_space_manifests
 
       protected
 
       def resource_class = Decidim::TaxonomyFilter
 
-      def run_after_hooks
-        create_filter_items!
-      end
-
       def extra_params
         {
           extra: {
             taxonomy_name: form.root_taxonomy.name,
-            filter_items_count: selected_taxonomy_item_ids.size
+            filter_items_count: form.filter_items.count
           }
         }
       end
-
-      private
-
-      def create_filter_items!
-        selected_taxonomy_item_ids.each { |taxonomy_item_id| resource.filter_items.create!(taxonomy_item_id:) }
-      end
-
-      def selected_taxonomy_item_ids
-        form.taxonomy_items.map(&:to_i).uniq
-      end
     end
   end
 end

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/commands/decidim/admin/update_taxonomy_filter.rb

@@ -2,45 +2,27 @@
 
 module Decidim
   module Admin
-    # A command with all the business logic to update an existing taxonomy filter
-    # in the system.
+    # A command with all the business logic to create a new taxonomy filter in the
+    # system.
     class UpdateTaxonomyFilter < Decidim::Commands::UpdateResource
-      fetch_form_attributes :internal_name, :name, :participatory_space_manifests
+      fetch_form_attributes :filter_items, :internal_name, :name, :participatory_space_manifests
 
       protected
 
       def resource_class = Decidim::TaxonomyFilter
 
-      def run_after_hooks
-        sync_filter_items!
+      def run_before_hooks
+        resource.filter_items.destroy_all
       end
 
       def extra_params
         {
           extra: {
             taxonomy_name: resource.root_taxonomy.name,
-            filter_items_count: selected_taxonomy_item_ids.size
+            filter_items_count: form.filter_items.count
           }
         }
       end
-
-      private
-
-      def sync_filter_items!
-        removed_ids = current_taxonomy_item_ids - selected_taxonomy_item_ids
-        added_ids = selected_taxonomy_item_ids - current_taxonomy_item_ids
-
-        resource.filter_items.where(taxonomy_item_id: removed_ids).destroy_all if removed_ids.any?
-        added_ids.each { |taxonomy_item_id| resource.filter_items.create!(taxonomy_item_id:) }
-      end
-
-      def current_taxonomy_item_ids
-        resource.filter_items.pluck(:taxonomy_item_id)
-      end
-
-      def selected_taxonomy_item_ids
-        form.taxonomy_items.map(&:to_i).uniq
-      end
     end
   end
 end

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

@@ -10,7 +10,7 @@ module Decidim
       end
 
       def current_component_taxonomy_filters
-        @current_component_taxonomy_filters ||= TaxonomyFilter.for(current_organization) # rubocop:disable Decidim/OrganizationScopedFinder -- .for scopes by decidim_organization_id internally
+        @current_component_taxonomy_filters ||= TaxonomyFilter.for(current_organization)
                                                               .for_manifest(current_participatory_space.manifest.name)
                                                               .where(id: current_component.settings.taxonomy_filters)
       end

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

@@ -5,11 +5,12 @@ 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,
                         :inactive_content_blocks_title, :resource_content_block_cell, :resource_create_url,
-                        :resource_sort_url, :scoped_resource
+                        :resource_sort_url
           def edit
             enforce_permission_to_update_resource
 
@@ -29,6 +30,10 @@ module Decidim
             end
           end
 
+          # Method that specifies the i18n scope for this controller. This can be overwritten in your controller.
+          # so that you can pass a different scope to the i18n methods.
+          def i18n_scope = "decidim.admin.content_blocks"
+
           # Method to be implemented at the controller. Returns a string
           # with the text for the title of content blocks
           #
@@ -66,10 +71,6 @@ module Decidim
 
           private
 
-          # Method that specifies the i18n scope for this controller. This can be overwritten in your controller.
-          # so that you can pass a different scope to the i18n methods.
-          def i18n_scope = "decidim.admin.content_blocks"
-
           # Method to be implemented at the controller. You need to
           # return a symbol that defines the content block scope.
           # Examples of scopes could be `:homepage` or `:landing_page`.

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/global_moderation_context.rb

@@ -8,8 +8,6 @@ module Decidim
       extend ActiveSupport::Concern
 
       included do
-        protected
-
         # Private: Overwrites the method from the parent controller so that the
         # permission system does not overwrite permissions.
         def authorization_scope

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

@@ -8,8 +8,6 @@ module Decidim
       extend ActiveSupport::Concern
 
       class_methods do
-        protected
-
         # Public: Called on a controller, it sets up all the surrounding methods to render a
         # participatory space's admin template. It expects the method `current_participatory_space`
         # to be defined, from which it will extract the participatory manifest.
@@ -27,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,13 +17,11 @@ 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
         # return the space that will be exported.
-        protected
-
         def exportable_space
           raise NotImplementedError
         end

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

@@ -6,7 +6,6 @@ module Decidim
     # Terms of service agreement.
     class AdminTermsController < Decidim::Admin::ApplicationController
       def accept
-        enforce_permission_to :accept, :admin_terms
         current_user.admin_terms_accepted_at = Time.current
         if current_user.save!
           flash[:notice] = t("accept.success", scope: "decidim.admin.admin_terms_of_service")

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

@@ -44,8 +44,6 @@ module Decidim
       register_permissions(::Decidim::Admin::ApplicationController,
                            ::Decidim::Admin::Permissions)
 
-      protected
-
       def user_has_no_permission_path
         decidim_admin.root_path
       end