decidim-admin 0.31.5 → 0.32.0.rc2

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

@@ -9,7 +9,7 @@ module Decidim
       before_action do
         if taxonomy_item && taxonomy_item.parent_ids.exclude?(taxonomy.id)
           flash[:alert] = I18n.t("update.invalid", scope: "decidim.admin.taxonomies")
-          render plain: I18n.t("update.invalid", scope: "decidim.admin.taxonomies"), status: :unprocessable_entity
+          render plain: I18n.t("update.invalid", scope: "decidim.admin.taxonomies"), status: :unprocessable_content
         end
       end
 
@@ -29,7 +29,7 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = I18n.t("create.invalid", scope: "decidim.admin.taxonomies")
-            render action: "new", status: :unprocessable_entity
+            render action: "new", status: :unprocessable_content
           end
         end
       end
@@ -50,7 +50,7 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = I18n.t("update.invalid", scope: "decidim.admin.taxonomies")
-            render action: "edit", status: :unprocessable_entity
+            render action: "edit", status: :unprocessable_content
           end
         end
       end

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

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

data/app/forms/decidim/admin/content_block_form.rb

@@ -12,12 +12,39 @@ module Decidim
       attribute :settings, Object
       attribute :images, Hash
 
+      validate :validate_settings
+
       def map_model(model)
         self.images = model.images_container
       end
 
       def settings?
-        settings.manifest.settings.any?
+        return false unless settings.respond_to?(:manifest)
+
+        settings.manifest.attributes.any?
+      end
+
+      private
+
+      def validate_settings
+        coerce_settings if settings.respond_to?(:to_h) && !settings.respond_to?(:valid?)
+
+        return unless settings.respond_to?(:valid?)
+        return if settings.valid?
+
+        settings.errors.each do |error|
+          errors.add(:settings, error.message)
+        end
+      end
+
+      def coerce_settings
+        content_block = context[:content_block]
+        return unless content_block
+
+        self.settings = content_block.manifest.settings.schema.new(
+          settings.to_h,
+          content_block.organization.default_locale
+        )
       end
     end
   end

data/app/forms/decidim/admin/organization_form.rb

@@ -20,7 +20,6 @@ module Decidim
       attribute :rich_text_editor_in_public_views, Boolean
       attribute :enable_machine_translations, Boolean
       attribute :machine_translation_display_priority, String
-      attribute :enable_participatory_space_filters, Boolean
 
       attribute :twitter_handler, String
       attribute :facebook_handler, String

data/app/forms/decidim/admin/participatory_space/member_csv_import_form.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require "csv"
+
+module Decidim
+  module Admin
+    module ParticipatorySpace
+      # A form object used to upload CSV to batch members.
+      #
+      class MemberCsvImportForm < Form
+        include Decidim::HasUploadValidations
+        include Decidim::Admin::CustomImport
+
+        attribute :file, Decidim::Attributes::Blob
+        attribute :user_name, String
+        attribute :email, String
+
+        validates :file, presence: true, file_content_type: { allow: ["text/csv"] }
+        validate :validate_csv
+
+        def validate_csv
+          return if file.blank?
+
+          process_import_file(file) do |(_email, user_name)|
+            errors.add(:user_name, :invalid) if user_name.blank? || !user_name.match?(UserBaseEntity::REGEXP_NAME)
+          end
+        rescue CSV::MalformedCSVError
+          errors.add(:file, :malformed)
+        end
+      end
+    end
+  end
+end

data/app/forms/decidim/admin/participatory_space/member_form.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    module ParticipatorySpace
+      # A form object used to create members from the
+      # admin dashboard.
+      #
+      class MemberForm < Form
+        include TranslatableAttributes
+
+        mimic :member
+
+        attribute :name, String
+        attribute :email, String
+        attribute :published, Boolean
+
+        translatable_attribute :role, String
+
+        validates :name, :email, presence: true
+
+        validates :name, format: { with: UserBaseEntity::REGEXP_NAME }
+      end
+    end
+  end
+end

data/app/forms/decidim/admin/participatory_space_admin_user_form.rb

@@ -2,7 +2,7 @@
 
 module Decidim
   module Admin
-    class ParticipatorySpaceAdminUserForm < ParticipatorySpacePrivateUserForm
+    class ParticipatorySpaceAdminUserForm < Decidim::Admin::ParticipatorySpace::MemberForm
       attribute :role, String
 
       validates :role, presence: true

data/app/forms/decidim/admin/selective_newsletter_form.rb

@@ -12,13 +12,13 @@ module Decidim
       attribute :send_to_verified_users, Boolean
       attribute :send_to_participants, Boolean
       attribute :send_to_followers, Boolean
-      attribute :send_to_private_members, Boolean
+      attribute :send_to_members, Boolean
 
       validates :send_to_all_users, presence: true, unless: :other_groups_selected_for_all_users?
       validates :send_to_verified_users, presence: true, unless: :other_groups_selected_for_verified_users?
       validates :send_to_followers, presence: true, if: :only_followers_selected?
       validates :send_to_participants, presence: true, if: :only_participants_selected?
-      validates :send_to_private_members, presence: true, if: :only_private_members_selected?
+      validates :send_to_members, presence: true, if: :only_members_selected?
 
       validate :at_least_one_participatory_space_selected
 
@@ -49,31 +49,31 @@ module Decidim
         send_to_verified_users.present? ||
           send_to_participants.present? ||
           send_to_followers.present? ||
-          send_to_private_members.present?
+          send_to_members.present?
       end
 
       def other_groups_selected_for_verified_users?
         send_to_all_users.present? ||
           send_to_participants.present? ||
           send_to_followers.present? ||
-          send_to_private_members.present?
+          send_to_members.present?
       end
 
       def only_followers_selected?
         send_to_all_users.blank? &&
           send_to_participants.blank? &&
-          send_to_private_members.blank? &&
+          send_to_members.blank? &&
           send_to_verified_users.blank?
       end
 
       def only_participants_selected?
         send_to_all_users.blank? &&
           send_to_followers.blank? &&
-          send_to_private_members.blank? &&
+          send_to_members.blank? &&
           send_to_verified_users.blank?
       end
 
-      def only_private_members_selected?
+      def only_members_selected?
         send_to_all_users.blank? &&
           send_to_followers.blank? &&
           send_to_participants.blank? &&

data/app/forms/decidim/admin/taxonomy_filter_form.rb

@@ -5,6 +5,7 @@ module Decidim
     # A form object to create or update areas.
     class TaxonomyFilterForm < Form
       include TranslatableAttributes
+
       Item = Struct.new(:name, :value, :children)
       Manifest = Struct.new(:id, :name)
 

data/app/helpers/decidim/admin/newsletters_helper.rb

@@ -23,10 +23,13 @@ module Decidim
         return if spaces_user_can_admin[space_type.manifest_name.to_sym].blank?
 
         html = ""
-        form_object.fields_for "participatory_space_types[#{space_type.manifest_name}]", space_type do |ff|
-          html += participatory_space_title(space_type)
-          html += ff.hidden_field :manifest_name, value: space_type.manifest_name
-          html += select_tag_participatory_spaces(space_type.manifest_name, spaces_for_select(space_type.manifest_name.to_sym), ff)
+
+        form_object.fields_for :participatory_space_types do |f|
+          f.fields_for space_type.manifest_name, space_type do |ff|
+            html += participatory_space_title(space_type)
+            html += ff.hidden_field :manifest_name, value: space_type.manifest_name
+            html += select_tag_participatory_spaces(space_type.manifest_name, spaces_for_select(space_type.manifest_name.to_sym), ff)
+          end
         end
         html.html_safe
       end
@@ -80,7 +83,7 @@ module Decidim
           recipients << content_tag(:strong, t("index.verified_users", scope: "decidim.admin.newsletters")) if newsletter.sent_to_verified_users?
           recipients << content_tag(:strong, t("index.followers", scope: "decidim.admin.newsletters")) if newsletter.sent_to_followers?
           recipients << content_tag(:strong, t("index.participants", scope: "decidim.admin.newsletters")) if newsletter.sent_to_participants?
-          recipients << content_tag(:strong, t("index.private_members", scope: "decidim.admin.newsletters")) if newsletter.sent_to_private_members?
+          recipients << content_tag(:strong, t("index.members", scope: "decidim.admin.newsletters")) if newsletter.sent_to_members?
 
           concat recipients.join(t("index.and", scope: "decidim.admin.newsletters")).html_safe
         end

data/app/helpers/decidim/admin/search_form_helper.rb

@@ -11,9 +11,26 @@ module Decidim
       # as datetime pickers.
       def search_form_for(record, options = {}, &)
         options[:builder] ||= SearchFormBuilder
+        options[:url] = url_for(params.to_unsafe_h.except("locale", :locale).merge(locale: nil)) if options[:url].blank?
 
         super
       end
+
+      def sort_link(search_object, attribute, *args, &)
+        options = args.extract_options!
+        options = options.merge(params: sort_link_params)
+        args << options
+
+        super
+      end
+
+      private
+
+      def sort_link_params
+        request_params = params.to_unsafe_h.except("locale", :locale).merge(locale: nil)
+        request_params["q"] = request_params["q"].except("s", :s) if request_params["q"].is_a?(Hash)
+        request_params
+      end
     end
   end
 end

data/app/helpers/decidim/admin/settings_helper.rb

@@ -161,6 +161,7 @@ module Decidim
       #
       # @param attribute [Decidim::SettingsManifest::Attribute]
       # @return [Symbol] The FormBuilder's method used to render
+      # @param [Object] options
       def form_method_for_attribute(attribute, options)
         return :editor if attribute.type.to_sym == :text && options[:editor]
 
@@ -225,6 +226,7 @@ module Decidim
       #
       # @param name (see #settings_attribute_input)
       # @param i18n_scope (see #settings_attribute_input)
+      # @param [Object] form
       def taxonomy_filters(form, name, i18n_scope)
         return disabled_taxonomy_filters(name, i18n_scope) if @component&.new_record?
 

data/app/jobs/decidim/admin/newsletter_job.rb

@@ -6,7 +6,7 @@ module Decidim
     #
     class NewsletterJob < ApplicationJob
       queue_as :newsletter
-      self.enqueue_after_transaction_commit = :never
+      self.enqueue_after_transaction_commit = false
 
       def perform(newsletter, form, recipients_ids)
         @newsletter = newsletter
@@ -37,7 +37,7 @@ module Decidim
           send_to_verified_users: @form["send_to_verified_users"],
           send_to_followers: @form["send_to_followers"],
           send_to_participants: @form["send_to_participants"],
-          send_to_private_members: @form["send_to_private_members"],
+          send_to_members: @form["send_to_members"],
           participatory_space_types: @form["participatory_space_types"],
           verification_types: @form["verification_types"]
         }

data/app/jobs/decidim/admin/participatory_space/destroy_members_follows_job.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    module ParticipatorySpace
+      class DestroyMembersFollowsJob < ApplicationJob
+        queue_as :default
+
+        def perform(decidim_user_id, space)
+          return unless space.respond_to?(:restricted?) && space.restricted?
+          return if space.respond_to?(:transparent?) && space.transparent?
+
+          user = Decidim::User.find_by(id: decidim_user_id)
+
+          return if user.blank?
+
+          return if space.respond_to?(:can_participate?) && space.can_participate?(user)
+
+          follows = Decidim::Follow.where(user:)
+          follows.where(followable: space).destroy_all
+
+          destroy_children_follows(follows, space)
+        end
+
+        def destroy_children_follows(follows, space)
+          follows.map do |follow|
+            object = follow.followable.presence
+            next unless object.respond_to?(:decidim_component_id)
+
+            follow.destroy if space.component_ids.include?(object.decidim_component_id)
+          end
+        end
+      end
+    end
+  end
+end

data/app/jobs/decidim/admin/participatory_space/import_member_csv_job.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    module ParticipatorySpace
+      # Custom ApplicationJob scoped to the admin panel.
+      #
+      class ImportMemberCsvJob < ApplicationJob
+        queue_as :exports
+
+        def perform(email, user_name, participatory_space, current_user)
+          return if email.blank? || user_name.blank?
+
+          params = {
+            name: user_name,
+            email: email.downcase.strip
+          }
+          member_form = MemberForm.from_params(params, participatory_space:)
+                                  .with_context(
+                                    current_user:,
+                                    current_participatory_space: participatory_space
+                                  )
+
+          CreateMember.call(member_form, participatory_space, via_csv: true)
+        end
+      end
+    end
+  end
+end

data/app/packs/src/decidim/admin/controllers/access_mode/access_mode.test.js

@@ -0,0 +1,68 @@
+/* global jest */
+
+import { Application } from "@hotwired/stimulus"
+import AccessModeController from "src/decidim/admin/controllers/access_mode/controller"
+
+describe("AccessModeController", () => {
+  let application = null
+  let controller = null
+  let element = null
+  let checkbox = null
+  let accessModeFieldset = null
+
+  beforeEach(async () => {
+    document.body.innerHTML = `
+      <div data-controller="access-mode">
+        <div id="has_members">
+          <input type="hidden" name="has_members" value="0">
+          <input type="checkbox" id="has_members_checkbox" name="has_members" value="1">
+        </div>
+        <fieldset id="access_mode">
+          <legend>Access mode</legend>
+          <label>Open<input type="radio" name="access_mode" value="open"></label>
+        </fieldset>
+      </div>
+    `
+
+    application = Application.start()
+    application.register("access-mode", AccessModeController)
+
+    element = document.querySelector("[data-controller='access-mode']")
+    checkbox = element.querySelector("#has_members input[type='checkbox']")
+    accessModeFieldset = element.querySelector("#access_mode")
+
+    await new Promise((resolve) => {
+      setTimeout(() => {
+        controller = application.getControllerForElementAndIdentifier(element, "access-mode")
+        resolve()
+      }, 0)
+    })
+  })
+
+  afterEach(() => {
+    controller.disconnect()
+    application.stop()
+    document.body.innerHTML = ""
+  })
+
+  it("hides the access_mode fieldset when members checkbox is unchecked", () => {
+    expect(accessModeFieldset.hidden).toBe(true)
+    expect(accessModeFieldset.style.display).toBe("none")
+  })
+
+  it("shows the fieldset when the members checkbox becomes checked", () => {
+    checkbox.checked = true
+    checkbox.dispatchEvent(new Event("change"))
+
+    expect(accessModeFieldset.hidden).toBe(false)
+    expect(accessModeFieldset.style.display).toBe("")
+  })
+
+  it("removes the event listener on disconnect", () => {
+    const removeSpy = jest.spyOn(checkbox, "removeEventListener")
+
+    controller.disconnect()
+
+    expect(removeSpy).toHaveBeenCalledWith("change", controller.toggleAccessMode)
+  })
+})

data/app/packs/src/decidim/admin/controllers/access_mode/controller.js

@@ -0,0 +1,52 @@
+import { Controller } from "@hotwired/stimulus"
+
+/**
+ * Toggles the visibility of the access mode options according to the
+ * "This space has members" checkbox.
+ *
+ * The controller expects to sit on the access accordion so it can
+ * query the checkbox and the `#access_mode` fieldset that lives inside.
+ */
+export default class extends Controller {
+
+  /**
+   * Find the relevant inputs and attach the change listener.
+   * @returns {void}
+   */
+  connect() {
+    this.hasMembersCheckbox = this.element.querySelector("#has_members input[type='checkbox']")
+    this.accessModeFieldset = this.element.querySelector("#access_mode")
+
+    if (!this.hasMembersCheckbox || !this.accessModeFieldset) {
+      return
+    }
+
+    this.toggleAccessMode = this.toggleAccessMode.bind(this)
+    this.hasMembersCheckbox.addEventListener("change", this.toggleAccessMode)
+    this.toggleAccessMode()
+  }
+
+  /**
+   * Remove the listener bound during `connect`.
+   * @returns {void}
+   */
+  disconnect() {
+    if (this.hasMembersCheckbox && this.toggleAccessMode) {
+      this.hasMembersCheckbox.removeEventListener("change", this.toggleAccessMode)
+    }
+  }
+
+  /**
+   * Show or hide the access mode fieldset depending on the checkbox state.
+   * @returns {void}
+   */
+  toggleAccessMode() {
+    const showAccessMode = this.hasMembersCheckbox.checked
+
+    this.accessModeFieldset.disabled = !showAccessMode
+    this.accessModeFieldset.hidden = !showAccessMode
+    this.accessModeFieldset.style.display = showAccessMode
+      ? ""
+      : "none"
+  }
+}

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

@@ -9,7 +9,7 @@ document.addEventListener("turbo:load", () => {
     sendToVerifiedUsers: document.querySelector("#newsletter_send_to_verified_users"),
     sendToParticipants: document.querySelector("#newsletter_send_to_participants"),
     sendToFollowers: document.querySelector("#newsletter_send_to_followers"),
-    sendToPrivateMembers: document.querySelector("#newsletter_send_to_private_members"),
+    sendToMembers: document.querySelector("#newsletter_send_to_members"),
     verificationTypesSelect: document.querySelector("#verification_types_for_select"),
     participatorySpacesForSelect: document.querySelector("#participatory_spaces_for_select"),
     deliverButton: document.querySelector("#deliver-button"),
@@ -24,7 +24,7 @@ document.addEventListener("turbo:load", () => {
     checkboxes: [
       selectors.sendToParticipants,
       selectors.sendToFollowers,
-      selectors.sendToPrivateMembers
+      selectors.sendToMembers
     ].filter(Boolean)
   };
 

data/app/packs/stylesheets/decidim/admin/_datepicker.scss

@@ -22,10 +22,6 @@
     @apply top-2;
   }
 
-  &__pick-calendar {
-    @apply z-[3];
-  }
-
   &__close-calendar {
     @apply z-[3];
   }

data/app/queries/decidim/admin/newsletter_recipients.rb

@@ -46,14 +46,14 @@ module Decidim
       end
 
       def filters_present?
-        @form.send_to_followers || @form.send_to_participants || @form.send_to_private_members
+        @form.send_to_followers || @form.send_to_participants || @form.send_to_members
       end
 
       def apply_filters(recipients)
         filters = [
           user_id_of_followers,
           participant_ids,
-          private_member_ids
+          member_ids
         ].compact.flatten.uniq
 
         filters.empty? ? recipients.none : recipients.where(id: filters)
@@ -119,17 +119,17 @@ module Decidim
         participant_ids.flatten.compact.uniq
       end
 
-      def private_spaces
+      def spaces_with_members
         return [] if spaces.blank?
 
-        spaces.select { |space| space.try(:private_space?) }
+        spaces.select { |space| space.respond_to?(:members) && space.members.exists? }
       end
 
-      def private_member_ids
-        return unless @form.send_to_private_members
-        return [] if private_spaces.blank?
+      def member_ids
+        return unless @form.send_to_members
+        return [] if spaces_with_members.blank?
 
-        Decidim::ParticipatorySpacePrivateUser.private_user_ids_for_participatory_spaces(private_spaces)
+        Decidim::ParticipatorySpace::Member.member_ids_for_participatory_spaces(spaces_with_members)
       end
     end
   end

data/app/views/decidim/admin/admin_terms/show.html.erb

@@ -1,8 +1,10 @@
+<% add_decidim_page_title(t(".title")) %>
+
 <%= cell("decidim/announcement", announcement_body, callout_class: current_user.admin_terms_accepted? ? "success" : "warning" ) %>
 
 <div class="item_show__header">
   <h1 class="item_show__header-title">
-    <%= t("title", scope: "decidim.admin.admin_terms_of_service") %>
+    <%= t(".title") %>
   </h1>
 </div>
 

data/app/views/decidim/admin/area_types/index.html.erb

@@ -1,8 +1,9 @@
-<% add_decidim_page_title(t("decidim.admin.titles.area_types")) %>
+<% add_decidim_page_title(t(".title")) %>
+
 <div class="card" id="area-types">
   <div class="item_show__header">
     <h1 class="item_show__header-title">
-      <%= t "decidim.admin.titles.area_types" %>
+      <%= t(".title") %>
       <% if allowed_to? :create, :area_type %>
         <%= link_to t("actions.add", scope: "decidim.admin"), [:new, :area_type], class: "button button__sm button__secondary new" %>
       <% end %>

data/app/views/decidim/admin/areas/index.html.erb

@@ -1,8 +1,9 @@
-<% add_decidim_page_title(t("areas", scope: "decidim.admin.titles")) %>
+<% add_decidim_page_title(t(".title")) %>
+
 <div class="card" id="areas">
   <div class="item_show__header">
     <h1 class="item_show__header-title">
-      <%= t "decidim.admin.titles.areas" %>
+      <%= t ".title" %>
       <% if allowed_to? :create, :area %>
         <%= link_to t("actions.add", scope: "decidim.admin"), new_area_path, class: "button button__sm button__secondary new" %>
       <% end %>

data/app/views/decidim/admin/attachment_collections/edit.html.erb

@@ -1,8 +1,8 @@
-<% add_decidim_page_title(t("attachment_collections.edit.title", scope: "decidim.admin")) %>
+<% add_decidim_page_title(t(".title")) %>
 
 <div class="item_show__header">
   <h1 class="item_show__header-title">
-    <%= t("attachment_collections.edit.title", scope: "decidim.admin") %>
+    <%= t(".title") %>
   </h1>
 </div>
 

data/app/views/decidim/admin/attachment_collections/index.html.erb

@@ -1,9 +1,9 @@
-<% add_decidim_page_title(t("attachment_collections.index.attachment_collections_title", scope: "decidim.admin")) %>
+<% add_decidim_page_title(t(".title")) %>
 
 <div class="card" id="attachment_collections">
   <div class="item_show__header">
     <h1 class="item_show__header-title">
-      <%= t("attachment_collections.index.attachment_collections_title", scope: "decidim.admin") %>
+      <%= t(".title") %>
       <% if allowed_to? :create, :attachment_collection %>
         <%= link_to t("actions.attachment_collection.new", scope: "decidim.admin"), url_for(action: :new), class: "button button__sm button__secondary new" %>
       <% end %>

data/app/views/decidim/admin/attachment_collections/new.html.erb

@@ -1,7 +1,7 @@
-<% add_decidim_page_title(t("attachment_collections.new.title", scope: "decidim.admin")) %>
+<% add_decidim_page_title(t(".title")) %>
 <div class="item_show__header">
   <h1 class="item_show__header-title">
-    <%= t("attachment_collections.new.title", scope: "decidim.admin") %>
+    <%= t(".title") %>
   </h1>
 </div>
 

data/app/views/decidim/admin/attachments/index.html.erb

@@ -1,8 +1,9 @@
-<% add_decidim_page_title(t(".attachments_title")) %>
+<% add_decidim_page_title(t(".title")) %>
+
 <div class="card" id="attachments">
   <div class="item_show__header">
     <h1 class="item_show__header-title">
-      <%= t(".attachments_title") %>
+      <%= t(".title") %>
       <% if allowed_to? :create, :attachment %>
         <%= link_to t("actions.attachment.new", scope: "decidim.admin"), url_for(action: :new), class: "button button__sm button__secondary new" %>
       <% end %>