decidim-admin 0.8.4 → 0.9.0

data/app/assets/stylesheets/decidim/admin/utils/_toggle-expand.scss

@@ -2,6 +2,7 @@
 
 .toggle-show{
   display: none;
+
   &.is-expanded{
     display: block;
   }

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

@@ -27,11 +27,10 @@ module Decidim
 
         if @attachment.valid?
           @attachment.save!
+          notify_followers
           broadcast(:ok)
         else
-          if @attachment.errors.has_key? :file
-            @form.errors.add :file, @attachment.errors[:file]
-          end
+          @form.errors.add :file, @attachment.errors[:file] if @attachment.errors.has_key? :file
           broadcast(:invalid)
         end
       end
@@ -48,6 +47,17 @@ module Decidim
           attached_to: @attached_to
         )
       end
+
+      def notify_followers
+        return unless @attachment.attached_to.is_a?(Decidim::Followable)
+
+        Decidim::EventsManager.publish(
+          event: "decidim.events.attachments.attachment_created",
+          event_class: Decidim::AttachmentCreatedEvent,
+          resource: @attachment,
+          recipient_ids: @attachment.attached_to.followers.pluck(:id)
+        )
+      end
     end
   end
 end

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

@@ -38,6 +38,7 @@ module Decidim
           manifest_name: manifest.name,
           name: form.name,
           participatory_space: participatory_space,
+          weight: form.weight,
           settings: form.settings,
           default_step_settings: form.default_step_settings,
           step_settings: form.step_settings

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

@@ -22,29 +22,39 @@ module Decidim
         return broadcast(:invalid) if form.invalid?
 
         transaction do
-          create_managed_user
-          raise ActiveRecord::Rollback unless authorized_user?
-        end
+          managed_user.update!(admin: false, tos_agreement: true) unless managed_user.persisted?
+
+          raise ActiveRecord::Rollback unless authorized_user? && impersonation_ok?
 
-        broadcast(:ok)
+          broadcast(:ok)
+        end
       end
 
       private
 
       attr_reader :form, :user
 
-      def create_managed_user
-        @user = Decidim::User.create!(
-          name: form.name,
+      def managed_user
+        @managed_user ||= Decidim::User.find_or_initialize_by(
           organization: form.current_organization,
-          admin: false,
           managed: true,
-          tos_agreement: true
+          name: form.name
         )
       end
 
+      def impersonation_ok?
+        ImpersonateManagedUser.call(form, managed_user) do
+          on(:ok) do
+            return true
+          end
+          on(:invalid) do
+            return false
+          end
+        end
+      end
+
       def authorized_user?
-        form.authorization.user = @user
+        form.authorization.user = managed_user
         Verifications::AuthorizeUser.call(form.authorization) do
           on(:ok) do
             return true

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

@@ -8,11 +8,9 @@ module Decidim
       #
       # form         - The form with the authorization info
       # user         - The user to impersonate
-      # current_user - The current user doing the impersonation.
-      def initialize(form, user, current_user)
+      def initialize(form, user)
         @form = form
         @user = user
-        @current_user = current_user
       end
 
       # Executes the command. Broadcasts these events:
@@ -22,17 +20,17 @@ module Decidim
       #
       # Returns nothing.
       def call
-        return broadcast(:invalid) if !user.managed? || !authorization_valid?
+        return broadcast(:invalid) unless user.managed? && authorization_valid?
 
         create_impersonation_log
-        enque_expire_job
+        enqueue_expire_job
 
         broadcast(:ok)
       end
 
       private
 
-      attr_reader :current_user, :user, :form
+      attr_reader :user, :form
 
       def authorization_valid?
         return false unless form.valid?
@@ -45,16 +43,16 @@ module Decidim
 
       def create_impersonation_log
         Decidim::ImpersonationLog.create!(
-          admin: current_user,
+          admin: form.current_user,
           user: user,
           started_at: Time.current
         )
       end
 
-      def enque_expire_job
+      def enqueue_expire_job
         Decidim::Admin::ExpireImpersonationJob
           .set(wait: Decidim::ImpersonationLog::SESSION_TIME_IN_MINUTES.minutes)
-          .perform_later(user, current_user)
+          .perform_later(user, form.current_user)
       end
     end
   end

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

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    # A command with all the business logic when officializing a user.
+    class OfficializeUser < Rectify::Command
+      # Public: Initializes the command.
+      #
+      # form - The officialization form.
+      def initialize(form)
+        @form = form
+      end
+
+      # Executes the command. Broadcasts these events:
+      #
+      # - :ok when the officialization suceeds.
+      # - :invalid when the form is invalid.
+      #
+      # Returns nothing.
+      def call
+        return broadcast(:invalid) unless form.valid?
+
+        officialize_user
+
+        Decidim::EventsManager.publish(
+          event: "decidim.events.users.user_officialized",
+          event_class: Decidim::ProfileUpdatedEvent,
+          resource: form.user,
+          recipient_ids: form.user.followers.pluck(:id)
+        )
+
+        broadcast(:ok, form.user)
+      end
+
+      private
+
+      attr_reader :form
+
+      def officialize_user
+        form.user.update!(
+          officialized_at: Time.current,
+          officialized_as: form.officialized_as
+        )
+      end
+    end
+  end
+end

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

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    # A command with all the business logic when unofficializing a user.
+    class UnofficializeUser < Rectify::Command
+      # Public: Initializes the command.
+      #
+      # user - The user to be unofficialized.
+      def initialize(user)
+        @user = user
+      end
+
+      # Executes the command. Broadcasts these events:
+      #
+      # - :ok when the unofficialization suceeds.
+      # - :invalid when the form is invalid.
+      #
+      # Returns nothing.
+      def call
+        unofficialize_user
+
+        broadcast(:ok)
+      end
+
+      private
+
+      attr_reader :user
+
+      def unofficialize_user
+        user.update!(officialized_at: nil, officialized_as: nil)
+      end
+    end
+  end
+end

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

@@ -44,6 +44,15 @@ module Decidim
       end
 
       def attributes
+        appearance_attributes
+          .merge(highlighted_content_banner_attributes)
+          .merge(omnipresent_banner_attributes)
+          .tap do |attributes|
+            attributes[:header_snippets] = form.header_snippets if Decidim.enable_html_header_snippets
+          end
+      end
+
+      def appearance_attributes
         {
           cta_button_path: form.cta_button_path,
           cta_button_text: form.cta_button_text,
@@ -61,11 +70,29 @@ module Decidim
           remove_official_img_footer: form.remove_official_img_footer,
           official_url: form.official_url,
           show_statistics: form.show_statistics
-        }.tap do |attributes|
-          if Decidim.enable_html_header_snippets
-            attributes[:header_snippets] = form.header_snippets
-          end
-        end
+        }
+      end
+
+      def highlighted_content_banner_attributes
+        {
+          highlighted_content_banner_enabled: form.highlighted_content_banner_enabled,
+          highlighted_content_banner_action_url: form.highlighted_content_banner_action_url,
+          highlighted_content_banner_image: form.highlighted_content_banner_image,
+          remove_highlighted_content_banner_image: form.remove_highlighted_content_banner_image,
+          highlighted_content_banner_title: form.highlighted_content_banner_title,
+          highlighted_content_banner_short_description: form.highlighted_content_banner_short_description,
+          highlighted_content_banner_action_title: form.highlighted_content_banner_action_title,
+          highlighted_content_banner_action_subtitle: form.highlighted_content_banner_action_subtitle
+        }
+      end
+
+      def omnipresent_banner_attributes
+        {
+          enable_omnipresent_banner: form.enable_omnipresent_banner,
+          omnipresent_banner_url: form.omnipresent_banner_url,
+          omnipresent_banner_short_description: form.omnipresent_banner_short_description,
+          omnipresent_banner_title: form.omnipresent_banner_title
+        }
       end
     end
   end

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

@@ -7,7 +7,7 @@ module Decidim
     class CategoriesController < Decidim::Admin::ApplicationController
       include ParticipatorySpaceAdminContext
       participatory_space_admin_layout
-      
+
       def index
         authorize! :read, Decidim::Category
       end

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

@@ -8,7 +8,7 @@ module Decidim
       class BaseController < Admin::ApplicationController
         skip_authorize_resource
         include Settings
-        
+
         include Decidim::Admin::ParticipatorySpaceAdminContext
         participatory_space_admin_layout
 

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

@@ -91,6 +91,13 @@ module Decidim
 
         @feature.publish!
 
+        Decidim::EventsManager.publish(
+          event: "decidim.events.features.feature_published",
+          event_class: Decidim::FeaturePublishedEvent,
+          resource: @feature,
+          recipient_ids: current_participatory_space.followers.pluck(:id)
+        )
+
         flash[:notice] = I18n.t("features.publish.success", scope: "decidim.admin")
         redirect_to action: :index
       end

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

@@ -33,7 +33,7 @@ module Decidim
 
           @form = form(ImpersonateManagedUserForm).from_params(params)
 
-          ImpersonateManagedUser.call(@form, user, current_user) do
+          ImpersonateManagedUser.call(@form, user) do
             on(:ok) do
               redirect_to decidim.root_path
             end

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

@@ -9,7 +9,9 @@ module Decidim
     class ManagedUsersController < Admin::ApplicationController
       layout "decidim/admin/users"
 
-      helper_method :available_authorizations, :more_than_one_authorization?
+      helper_method :available_authorization_handlers,
+                    :more_than_one_authorization_handler?,
+                    :select_authorization_handler_step?
 
       def index
         authorize! :index, :managed_users
@@ -19,7 +21,12 @@ module Decidim
       def new
         authorize! :new, :managed_users
 
-        if handler_name.present?
+        if available_authorization_handlers.blank?
+          flash[:alert] = I18n.t("managed_users.new.no_authorization_handlers", scope: "decidim.admin")
+          redirect_to action: :index
+        end
+
+        unless select_authorization_handler_step?
           @form = form(ManagedUserForm).from_params(
             authorization: {
               handler_name: handler_name
@@ -36,7 +43,7 @@ module Decidim
         CreateManagedUser.call(@form) do
           on(:ok) do
             flash[:notice] = I18n.t("managed_users.create.success", scope: "decidim.admin")
-            redirect_to managed_users_path
+            redirect_to decidim.root_path
           end
 
           on(:invalid) do
@@ -48,21 +55,28 @@ module Decidim
 
       private
 
+      def select_authorization_handler_step?
+        handler_name.blank? && params[:managed_user].blank?
+      end
+
       def collection
         @collection ||= current_organization.users.managed
       end
 
       def handler_name
-        return params[:handler_name] if more_than_one_authorization?
-        available_authorizations.first
+        return if available_authorization_handlers.blank?
+        return params[:handler_name] if more_than_one_authorization_handler?
+        available_authorization_handlers.first.name
       end
 
-      def available_authorizations
-        current_organization.available_authorizations.map(&:underscore)
+      def available_authorization_handlers
+        Decidim::Verifications::Adapter.from_collection(
+          current_organization.available_authorizations & Decidim.authorization_handlers.map(&:name)
+        )
       end
 
-      def more_than_one_authorization?
-        available_authorizations.length > 1
+      def more_than_one_authorization_handler?
+        available_authorization_handlers.length > 1
       end
     end
   end

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

@@ -3,8 +3,9 @@
 module Decidim
   module Admin
     # Controller that allows managing newsletters.
-    #
     class NewslettersController < Decidim::Admin::ApplicationController
+      include Decidim::NewslettersHelper
+
       def index
         authorize! :index, Newsletter
         @newsletters = collection.order(Newsletter.arel_table[:created_at].desc)
@@ -27,7 +28,6 @@ module Decidim
 
         email = NewsletterMailer.newsletter(current_user, @newsletter)
         Premailer::Rails::Hook.perform(email)
-
         render html: email.html_part.body.decoded.html_safe
       end
 

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

@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    # Controller that allows managing user groups at the admin panel.
+    #
+    class OfficializationsController < Decidim::Admin::ApplicationController
+      layout "decidim/admin/users"
+
+      helper_method :user
+
+      def index
+        authorize! :index, :officializations
+        @query = params[:q]
+        @state = params[:state]
+
+        @users = Decidim::Admin::UsersOfficialization.for(@query, @state)
+                                                     .page(params[:page])
+                                                     .per(15)
+      end
+
+      def new
+        authorize! :new, :officializations
+
+        @form = form(OfficializationForm).from_model(user)
+      end
+
+      def create
+        authorize! :create, :officializations
+
+        @form = form(OfficializationForm).from_params(params)
+
+        OfficializeUser.call(@form) do
+          on(:ok) do |user|
+            notice = I18n.t("officializations.create.success", scope: "decidim.admin")
+
+            redirect_to officializations_path(q: user.name), notice: notice
+          end
+        end
+      end
+
+      def destroy
+        authorize! :destroy, :officializations
+
+        UnofficializeUser.call(user) do
+          on(:ok) do
+            notice = I18n.t("officializations.destroy.success", scope: "decidim.admin")
+
+            redirect_to officializations_path(q: user.name), notice: notice
+          end
+        end
+      end
+
+      private
+
+      def user
+        @user ||= Decidim::User.find_by(
+          id: params[:user_id],
+          organization: current_organization
+        )
+      end
+    end
+  end
+end