decidim-admin 0.15.2 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 02f2c9301a4069fc6e58f10b08548fe6a663d52c13b333310952a767d62f02f1
-  data.tar.gz: 3694642e00873e4a6fc0dde713bcb5f880806d284852d5753b1734745a58f27e
+  metadata.gz: 319f13954e9485d30b04176489e14580c36df8228c2b5981b3300599379c6a4f
+  data.tar.gz: e0861279a3252585971caae115060e4cab7451912b3a0a93efac8f203672a4cf
 SHA512:
-  metadata.gz: dcdaa7a874e970652da2df05a95e86270d7acca49e20aee68052f0a0e03ab870ac40d8a7911df2bc0994aa8ca1275e99b3a5d21f2d7ac5049116c809d699bd89
-  data.tar.gz: 3bd5f1f9e511f42bce31c68b2abad250df2e492a5c788160b520cdb8d404d03004a21d441acd1869110e37bf4e423ab93fc91cbb299360a2b9f53746cc18632c
+  metadata.gz: ff39ad46211f78e2743d94afca02d1b37bee664aee978c3f510b94e7094a0e10d5d89bf752ffd0087e58df63116b5ccc4fd6fae3601f7498cfcd9424fa80bf5d
+  data.tar.gz: 10035ee1834ec7d5bc8af8540fda203615adce5dd40b6ca30ca4843b798c248692f6861174a89df17b72387ecc37715bea0f2f9391bd6a35e17ab2dee1af3e04

data/app/assets/config/decidim_admin_manifest.js

@@ -1,4 +1,5 @@
 //= link decidim/admin/application.js
 //= link decidim/admin/managed_users.js
 //= link decidim/admin/component_permissions.js
+//= link decidim/admin/welcome_notification.js
 //= link decidim/admin/application.css

data/app/assets/javascripts/decidim/admin/welcome_notification.js.es6

@@ -0,0 +1,32 @@
+(() => {
+  const $scope = $("#welcome-notification-details");
+
+  const $sendNotificationCheckbox = $(
+    "#organization_send_welcome_notification",
+    $scope
+  );
+
+  const $customizeCheckbox = $(
+    "#organization_customize_welcome_notification",
+    $scope
+  );
+
+  const toggleVisibility = () => {
+    if ($sendNotificationCheckbox.is(":checked")) {
+      $(".send-welcome-notification-details", $scope).show();
+    } else {
+      $(".send-welcome-notification-details", $scope).hide();
+    }
+
+    if ($customizeCheckbox.is(":checked")) {
+      $(".customize-welcome-notification-details", $scope).show();
+    } else {
+      $(".customize-welcome-notification-details", $scope).hide();
+    }
+  };
+
+  $($sendNotificationCheckbox).click(() => toggleVisibility());
+  $($customizeCheckbox).click(() => toggleVisibility());
+
+  toggleVisibility();
+})();

data/app/assets/stylesheets/decidim/admin/modules/_forms.scss

@@ -1,4 +1,5 @@
 $input-margin: 1.5rem;
+$checkboxes-minimum-width: 200px;
 
 button,
 input,
@@ -94,3 +95,23 @@ textarea{
 .is-custom-error-visible{
   display: block;
 }
+
+.checkboxes{
+  margin-bottom: 1rem;
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: space-between;
+
+  &::after{ /* Align last row to left */
+    min-width: $checkboxes-minimum-width;
+    content: "";
+  }
+
+  label{
+    min-width: $checkboxes-minimum-width;
+
+    input[type=checkbox]{
+      vertical-align: baseline;
+    }
+  }
+}

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

@@ -57,7 +57,7 @@ module Decidim
           event: "decidim.events.attachments.attachment_created",
           event_class: Decidim::AttachmentCreatedEvent,
           resource: @attachment,
-          recipient_ids: @attachment.attached_to.followers.pluck(:id)
+          followers: @attachment.attached_to.followers
         )
       end
     end

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

@@ -37,6 +37,9 @@ module Decidim
           title: form.title,
           slug: form.slug,
           content: form.content,
+          show_in_footer: form.show_in_footer,
+          weight: form.weight,
+          topic: form.topic,
           organization: form.organization
         )
       end

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

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    # A command with all the business logic when creating a static page topic.
+    class CreateStaticPageTopic < Rectify::Command
+      # Public: Initializes the command.
+      #
+      # form - A form object with the params.
+      def initialize(form)
+        @form = form
+      end
+
+      # Executes the command. Broadcasts these events:
+      #
+      # - :ok when everything is valid.
+      # - :invalid if the form wasn't valid and we couldn't proceed.
+      #
+      # Returns nothing.
+      def call
+        return broadcast(:invalid) if @form.invalid?
+
+        @topic = Decidim.traceability.create!(
+          StaticPageTopic,
+          @form.current_user,
+          title: @form.title,
+          description: @form.description,
+          organization: @form.current_organization,
+          show_in_footer: @form.show_in_footer,
+          weight: @form.weight
+        )
+        broadcast(:ok)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    # This command deals with destroying a StaticPageTopic from the admin panel.
+    class DestroyStaticPageTopic < Rectify::Command
+      # Public: Initializes the command.
+      #
+      # page - The StaticPageTopic to be destroyed.
+      def initialize(_topic, current_user)
+        @topic = page
+        @current_user = current_user
+      end
+
+      # Public: Executes the command.
+      #
+      # Broadcasts :ok if it got destroyed
+      def call
+        destroy_topic
+        broadcast(:ok)
+      end
+
+      private
+
+      attr_reader :page, :current_user
+
+      def destroy_page
+        transaction do
+          Decidim.traceability.perform_action!(
+            "delete",
+            topic,
+            current_user
+          ) do
+            topic.destroy!
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -26,7 +26,7 @@ module Decidim
           event: "decidim.events.users.user_officialized",
           event_class: Decidim::ProfileUpdatedEvent,
           resource: form.user,
-          recipient_ids: form.user.followers.pluck(:id)
+          followers: form.user.followers
         )
 
         broadcast(:ok, form.user)

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

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require "csv"
+
+module Decidim
+  module Admin
+    # A command with all the business logic when processing the CSV to verify
+    # user groups.
+    class ProcessUserGroupVerificationCsv < Rectify::Command
+      # Public: Initializes the command.
+      #
+      # form - the form object containing the uploaded file
+      def initialize(form)
+        @form = form
+      end
+
+      # Executes the command. Broadcasts these events:
+      #
+      # - :ok when everything is valid.
+      # - :invalid if the form wasn't valid and we couldn't proceed.
+      #
+      # Returns nothing.
+      def call
+        return broadcast(:invalid) unless @form.valid?
+        process_csv
+        broadcast(:ok)
+      end
+
+      private
+
+      def process_csv
+        verifier = @form.current_user
+        organization = @form.current_organization
+
+        CSV.foreach(@form.file.path) do |row|
+          email = row[0]
+          VerifyUserGroupFromCsvJob.perform_later(email, verifier, organization) if email.present?
+        end
+      end
+    end
+  end
+end

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

@@ -44,7 +44,7 @@ module Decidim
           event: "decidim.events.components.component_published",
           event_class: Decidim::ComponentPublishedEvent,
           resource: component,
-          recipient_ids: component.participatory_space.followers.pluck(:id)
+          followers: component.participatory_space.followers
         )
       end
     end

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

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    # This command gets called when a content block is updated from the admin
+    # panel.
+    class UpdateHelpSections < Rectify::Command
+      def initialize(form, organization)
+        @form = form
+        @organization = organization
+      end
+
+      def call
+        return broadcast(:invalid) unless @form.valid?
+
+        ActiveRecord::Base.transaction do
+          @form.sections.each do |section|
+            ContextualHelpSection.set_content(@organization, section.id, section.content)
+          end
+        end
+
+        broadcast(:ok)
+      end
+    end
+  end
+end

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

@@ -49,7 +49,16 @@ module Decidim
           instagram_handler: form.instagram_handler,
           youtube_handler: form.youtube_handler,
           github_handler: form.github_handler,
-          badges_enabled: form.badges_enabled
+          badges_enabled: form.badges_enabled,
+          user_groups_enabled: form.user_groups_enabled
+        }.merge(welcome_notification_attributes)
+      end
+
+      def welcome_notification_attributes
+        {
+          send_welcome_notification: form.send_welcome_notification,
+          welcome_notification_subject: form.customize_welcome_notification ? form.welcome_notification_subject : nil,
+          welcome_notification_body: form.customize_welcome_notification ? form.welcome_notification_body : nil
         }
       end
     end

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

@@ -43,6 +43,9 @@ module Decidim
         {
           title: form.title,
           slug: form.slug,
+          show_in_footer: form.show_in_footer,
+          weight: form.weight,
+          topic: form.topic,
           content: form.content
         }
       end

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

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    # A command with all the business logic when updating a static page topic.
+    class UpdateStaticPageTopic < Rectify::Command
+      # Public: Initializes the command.
+      #
+      # page - The StaticPageTopic to update
+      # form - A form object with the params.
+      def initialize(topic, form)
+        @topic = topic
+        @form = form
+      end
+
+      # Executes the command. Broadcasts these events:
+      #
+      # - :ok when everything is valid.
+      # - :invalid if the form wasn't valid and we couldn't proceed.
+      #
+      # Returns nothing.
+      def call
+        return broadcast(:invalid) if form.invalid?
+
+        update_topic
+        broadcast(:ok)
+      end
+
+      private
+
+      attr_reader :form
+
+      def update_topic
+        Decidim.traceability.update!(
+          @topic,
+          form.current_user,
+          attributes
+        )
+      end
+
+      def attributes
+        {
+          title: form.title,
+          description: form.description,
+          show_in_footer: form.show_in_footer,
+          weight: form.weight
+        }
+      end
+    end
+  end
+end

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

@@ -8,9 +8,10 @@ module Decidim
       #
       # user_group - The user_group to verify
       # current_user - the user performing the action
-      def initialize(user_group, current_user)
+      def initialize(user_group, current_user, via_csv = false)
         @user_group = user_group
         @current_user = current_user
+        @via_csv = via_csv
       end
 
       # Executes the command. Broadcasts these events:
@@ -27,8 +28,9 @@ module Decidim
       private
 
       def verify_user_group
+        action = @via_csv ? "verify_via_csv" : "verify"
         Decidim.traceability.perform_action!(
-          "verify",
+          action,
           @user_group,
           @current_user
         ) do

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

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require "active_support/concern"
+
+module Decidim
+  module Admin
+    # The UserGroups concern must be included in all controllers related
+    # to UserGroups feature. It adds a method to enforce that the feature
+    # is enabled.
+    module UserGroups
+      extend ActiveSupport::Concern
+
+      included do
+        delegate :user_groups_enabled?, to: :current_organization
+
+        helper_method :user_groups_enabled?
+      end
+
+      def enforce_user_groups_enabled
+        raise Decidim::ActionForbidden unless current_organization.user_groups_enabled?
+      end
+    end
+  end
+end

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

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    # Controller that allows managing the user organization.
+    #
+    class HelpSectionsController < Decidim::Admin::ApplicationController
+      layout "decidim/admin/settings"
+      include TranslationsHelper
+
+      helper_method :sections
+
+      before_action do
+        enforce_permission_to :update, :help_sections
+      end
+
+      def show
+        @form = form(HelpSectionsForm).from_model(
+          OpenStruct.new(sections: sections)
+        )
+      end
+
+      def update
+        @form = form(HelpSectionsForm).from_params(
+          params[:help_sections]
+        )
+
+        UpdateHelpSections.call(@form, current_organization) do
+          on(:ok) do
+            flash[:notice] = t("help_sections.success", scope: "decidim.admin")
+            redirect_to action: :show
+          end
+
+          on(:invalid) do
+            flash.now[:alert] = t("help_sections.error", scope: "decidim.admin")
+          end
+        end
+      end
+
+      private
+
+      def sections
+        @sections ||= Decidim.participatory_space_manifests.map do |manifest|
+          OpenStruct.new(
+            id: manifest.name.to_s,
+            content: ContextualHelpSection.find_content(current_organization, manifest.name)
+          )
+        end
+      end
+    end
+  end
+end