decidim-admin 0.23.6 → 0.24.0.rc1

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

@@ -1,5 +1,6 @@
 // = require ./budget_rule_toggler.component
 // = require ./scope_picker_enabler.component
+// = require ./proposal_infinite_edit
 
 ((exports) => {
   const { BudgetRuleTogglerComponent } = exports.DecidimAdmin;

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

@@ -0,0 +1,29 @@
+(() => {
+  const $creatorSelect = $("#import_creator");
+  const $creatorGuidances = $(".creator-guidances").find(".guidance");
+
+  const showGuidance = (text) => {
+    const formatted = text.replace(/\s/g, "").toLocaleLowerCase();
+    $.each($creatorGuidances, (_index, currentValue) => {
+      if (currentValue.className.includes(formatted)) {
+        const elem = $(currentValue)
+        elem.show();
+      }
+    })
+  }
+
+  $creatorSelect.on("change", function() {
+    const text = $("#import_creator option:selected").text()
+    $creatorGuidances.hide();
+    if (text) {
+      showGuidance(text)
+    }
+  })
+
+  if ($creatorSelect.children("option").length < 2) {
+    $("label[for='import_creator']").hide();
+  }
+  $creatorGuidances.hide();
+  $creatorGuidances.first().show();
+})();
+

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

@@ -0,0 +1,24 @@
+((exports) => {
+  const $ = exports.$; // eslint-disable-line
+
+  $(() => {
+    const $moderationDetails = $(".moderation-details");
+    const $toggleContentButton = $moderationDetails.find(".toggle-content");
+    const $reportedContent = $moderationDetails.find(".reported-content");
+    const $currentContent = $reportedContent.find(".current");
+    const $originalContent = $reportedContent.find(".original");
+
+    $originalContent.hide();
+
+    $toggleContentButton.on("click", () => {
+      $currentContent.toggle();
+      $originalContent.toggle();
+
+      if ($currentContent.is(":hidden")) {
+        $toggleContentButton.html($toggleContentButton.data("see-current-button-label"));
+      } else {
+        $toggleContentButton.html($toggleContentButton.data("see-original-button-label"));
+      }
+    })
+  })
+})(window)

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

@@ -0,0 +1,20 @@
+$(() => {
+  const $limitiedTimeLabel = $("label[for='component_settings_proposal_edit_time_limited']")
+  const $limitedTimeRadioButton = $("#component_settings_proposal_edit_time_limited")
+  const $infiniteTimeRadioButton = $("#component_settings_proposal_edit_time_infinite")
+  const $editTimeContainer = $(".proposal_edit_before_minutes_container")
+
+  $editTimeContainer.detach().appendTo($limitiedTimeLabel)
+
+  if ($infiniteTimeRadioButton.is(":checked")) {
+    $editTimeContainer.hide();
+  }
+
+  $limitedTimeRadioButton.on("click", () => {
+    $editTimeContainer.show();
+  })
+
+  $infiniteTimeRadioButton.on("click", () => {
+    $editTimeContainer.hide();
+  })
+})

data/app/assets/javascripts/decidim/admin/user_moderations.js

@@ -0,0 +1,2 @@
+// Place all the behaviors and hooks related to the matching controller here.
+// All this logic will automatically be available in application.js.

data/app/assets/stylesheets/decidim/admin/_variables.scss

@@ -1,3 +1,12 @@
+// Foundation Variables
+$primary-color: null;
+$secondary-color: null;
+$success-color: null;
+$warning-color: null;
+$alert-color: null;
+$-zf-size: null;
+$-zf-bp-value: null;
+
 // Variables
 
 $brand: #9675ce !default;

data/app/assets/stylesheets/decidim/admin/components/_dropdown-menu.scss

@@ -0,0 +1,3 @@
+.dropdown .is-dropdown-submenu a{
+  color: $secondary;
+}

data/app/assets/stylesheets/decidim/admin/extra/_action-icon.scss

@@ -9,6 +9,19 @@
       color: $warning-color;
       vertical-align: bottom;
     }
+
+    &.action-icon--success{
+      color: $success-color;
+      vertical-align: bottom;
+    }
+  }
+
+  .action-space{
+    display: inline-block;
+
+    &:not(:last-child){
+      margin-right: 1rem;
+    }
   }
 }
 

data/app/assets/stylesheets/decidim/admin/extra/_block_user.scss

@@ -0,0 +1,5 @@
+.new_user_block{
+  .form-error{
+    margin-top: 0;
+  }
+}

data/app/assets/stylesheets/decidim/admin/extra/_title_bar.scss

@@ -70,6 +70,7 @@
       margin-left: 0;
 
       .dropdown.menu > li.is-dropdown-submenu-parent > a::after{
+        border-color: var(--secondary);
         border-width: 3px;
         right: 10px;
         margin-top: 0;

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

@@ -0,0 +1,39 @@
+.moderation-details{
+  .toggle-content{
+    cursor: pointer;
+    margin-left: .5rem;
+    font-size: .9rem;
+  }
+
+  .reported-content{
+    .original{
+      display: none;
+    }
+  }
+
+  .callout{
+    &-text{
+      margin-left: .5rem;
+
+      .icon{
+        width: .6rem;
+        margin: 0 .2rem;
+      }
+    }
+  }
+
+  dd{
+    padding: $global-padding;
+    background-color: $light-gray;
+    margin-bottom: .5rem;
+  }
+
+  .reportable-authors{
+    list-style: none;
+    margin: 0;
+
+    .icon{
+      margin-left: .5rem;
+    }
+  }
+}

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

@@ -30,6 +30,7 @@
 @import "draggable-list";
 @import "loading-spinner";
 @import "import_result";
+@import "reveal";
 
 // mentions__container
 @import "decidim/modules/tags";
@@ -39,3 +40,4 @@
 
 //Admin dashboard
 @import "users_statistics";
+@import "moderations";

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

@@ -0,0 +1,5 @@
+.reveal__buttons{
+  display: flex;
+  justify-content: space-between;
+  padding: 0 1rem;
+}

data/app/assets/stylesheets/decidim/admin/modules/_secondary-nav.scss

@@ -62,7 +62,8 @@ $process-title-height: 3rem;
 }
 
 .secondary-nav__title,
-.process-title-content{
+.process-title-content,
+.voting-title-content{
   margin-bottom: 1.5rem;
   font-size: .8rem;
   letter-spacing: .1em;
@@ -90,13 +91,15 @@ $process-title-height: 3rem;
   color: $body-font-color;
 }
 
-.process-title{
+.process-title,
+.voting-title{
   @include breakpoint(large){
     margin-bottom: $process-title-height;
   }
 }
 
-.process-title-content{
+.process-title-content,
+.voting-title-content{
   @include breakpoint(large){
     position: absolute;
     left: 120px;

data/app/assets/stylesheets/decidim/admin/modules/_user-login.scss

@@ -18,8 +18,8 @@
 
   .dropdown.menu > li.is-dropdown-submenu-parent > a::after{
     border-top-color: $white;
-    border-width: 4px;
+    border-width: 6px;
     right: 0;
-    margin-top: -1px;
+    margin-top: -3px;
   }
 }

data/app/assets/stylesheets/decidim/admin/user_moderations.scss

@@ -0,0 +1,3 @@
+// Place all the styles related to the UserModerations controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: https://sass-lang.com/

data/app/assets/stylesheets/decidim/admin/utils/_settings.scss

@@ -75,6 +75,7 @@ $foundation-palette: (
   warning: #ffb300,
   alert: #e66a5d,
 );
+
 $lighter-gray: #f6f6f6;
 $light-gray: #eee;
 $medium-gray: #adadad;

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

@@ -3,7 +3,7 @@
     <%= t(public_name_key) %>
     <div>
       <% if has_settings? %>
-        <%= link_to decidim_admin.edit_organization_homepage_content_block_path(manifest_name), class: "mr-s text-muted" do %>
+        <%= link_to edit_content_block_path, class: "mr-s text-muted" do %>
           <%= icon "pencil", role: "img" %>
         <% end %>
       <% end %>

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

@@ -11,6 +11,10 @@ module Decidim
         model.try(:manifest_name) || model.name
       end
 
+      def edit_content_block_path
+        decidim_admin.edit_organization_homepage_content_block_path(manifest_name)
+      end
+
       def decidim_admin
         Decidim::Admin::Engine.routes.url_helpers
       end

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

@@ -0,0 +1,70 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    class BlockUser < Rectify::Command
+      # Public: Initializes the command.
+      #
+      # form - BlockUserForm
+      def initialize(form)
+        @form = form
+      end
+
+      # Executes the command. Broadcasts these events:
+      #
+      # - :ok when everything is valid, together with the resource.
+      # - :invalid if the resource is not reported
+      #
+      # Returns nothing.
+      def call
+        return broadcast(:invalid) unless form.valid?
+
+        transaction do
+          block!
+          register_justification!
+          notify_user!
+        end
+
+        broadcast(:ok, form.user)
+      end
+
+      private
+
+      attr_reader :form
+
+      def register_justification!
+        @current_blocking = UserBlock.create!(
+          justification: form.justification,
+          user: form.user,
+          blocking_user: form.current_user
+        )
+      end
+
+      def notify_user!
+        Decidim::BlockUserJob.perform_later(
+          @current_blocking.user,
+          @current_blocking.justification
+        )
+      end
+
+      def block!
+        Decidim.traceability.perform_action!(
+          "block",
+          form.user,
+          form.current_user,
+          extra: {
+            reportable_type: form.user.class.name,
+            current_justification: form.justification
+          }
+        ) do
+          form.user.blocked = true
+          form.user.blocked_at = Time.current
+          form.user.blocking = @current_blocking
+          form.user.extended_data["user_name"] = form.user.name
+          form.user.name = "Blocked user"
+          form.user.save!
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    class CreateImport < Rectify::Command
+      def initialize(form)
+        @form = form
+      end
+
+      def call
+        return broadcast(:invalid) if form.invalid?
+
+        imported_data = form.importer.prepare
+        transaction do
+          form.importer.import!
+
+          return broadcast(:ok, imported_data)
+        rescue StandardError
+          raise ActiveRecord::Rollback
+        end
+
+        # Something went wrong with import/finish
+        broadcast(:invalid)
+      end
+
+      attr_reader :form
+    end
+  end
+end

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

@@ -10,7 +10,7 @@ module Decidim
       # form - A form object with the params.
       # private_user_to - The private_user_to that will hold the
       #   user role
-      def initialize(form, current_user, private_user_to, via_csv = false)
+      def initialize(form, current_user, private_user_to, via_csv: false)
         @form = form
         @current_user = current_user
         @private_user_to = private_user_to

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

@@ -40,7 +40,8 @@ module Decidim
           show_in_footer: form.show_in_footer,
           weight: form.weight,
           topic: form.topic,
-          organization: form.organization
+          organization: form.organization,
+          allow_public_access: form.allow_public_access
         )
       end
 

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

@@ -23,6 +23,9 @@ module Decidim
         return broadcast(:invalid) unless hideable?
 
         hide!
+
+        send_hide_notification_to_author
+
         broadcast(:ok, @reportable)
       end
 
@@ -44,6 +47,24 @@ module Decidim
           @reportable.moderation.update!(hidden_at: Time.current)
         end
       end
+
+      def send_hide_notification_to_author
+        data = {
+          event: "decidim.events.reports.resource_hidden",
+          event_class: Decidim::ResourceHiddenEvent,
+          resource: @reportable,
+          extra: {
+            report_reasons: report_reasons
+          },
+          affected_users: @reportable.try(:authors) || [@reportable.try(:normalized_author)]
+        }
+
+        Decidim::EventsManager.publish(data)
+      end
+
+      def report_reasons
+        @reportable.moderation.reports.pluck(:reason).uniq
+      end
     end
   end
 end

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

@@ -26,7 +26,8 @@ module Decidim
 
           create_authorization
 
-          create_impersonation_log
+          impersonation_log = create_impersonation_log
+          create_action_log(impersonation_log)
         end
 
         enqueue_expire_job
@@ -60,6 +61,21 @@ module Decidim
           .set(wait: Decidim::ImpersonationLog::SESSION_TIME_IN_MINUTES.minutes)
           .perform_later(user, form.current_user)
       end
+
+      def create_action_log(impersonation_log)
+        Decidim.traceability.perform_action!(
+          "manage",
+          impersonation_log,
+          form.current_user,
+          resource: {
+            name: user.name,
+            id: user.id,
+            nickname: user.nickname
+          },
+          visibility: "admin-only",
+          reason: form.reason
+        )
+      end
     end
   end
 end

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

@@ -30,6 +30,7 @@ module Decidim
 
         promote_user
         invite_user
+        create_action_log
 
         broadcast(:ok)
       end
@@ -51,6 +52,15 @@ module Decidim
       def email_already_exists?
         Decidim::User.where(email: form.email.downcase).any?
       end
+
+      def create_action_log
+        Decidim.traceability.perform_action!(
+          "promote",
+          user,
+          form.current_user,
+          visibility: "admin-only"
+        )
+      end
     end
   end
 end

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

@@ -10,10 +10,12 @@ module Decidim
       # organization - the Organization where the content blocks reside
       # scope - the scope applied to the content blocks
       # order - an Array holding the order of IDs of published content blocks.
-      def initialize(organization, scope, order)
+      # scoped_resource_id - (optional) The id of the resource the content blocks belongs to.
+      def initialize(organization, scope, order, scoped_resource_id = nil)
         @organization = organization
         @scope = scope
         @order = order
+        @scoped_resource_id = scoped_resource_id
       end
 
       # Executes the command. Broadcasts these events:
@@ -31,7 +33,7 @@ module Decidim
 
       private
 
-      attr_reader :organization, :scope
+      attr_reader :organization, :scope, :scoped_resource_id
 
       def reorder_steps
         transaction do
@@ -78,6 +80,7 @@ module Decidim
         Decidim::ContentBlock.create!(
           organization: organization,
           scope_name: scope,
+          scoped_resource_id: scoped_resource_id.presence,
           weight: weight,
           manifest_name: manifest_name
         )
@@ -90,7 +93,7 @@ module Decidim
       end
 
       def collection
-        @collection ||= Decidim::ContentBlock.for_scope(scope, organization: organization)
+        @collection ||= Decidim::ContentBlock.for_scope(scope, organization: organization).where(scoped_resource_id: scoped_resource_id)
       end
     end
   end

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

@@ -0,0 +1,78 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    # A command with all the business logic to transfer a managed user.
+    class TransferUser < Rectify::Command
+      # Public: Initializes the command.
+      #
+      # form
+      # user         - The current user
+      # managed_user - The managed User
+      def initialize(form)
+        @form = form
+      end
+
+      # Executes the command. Broadcasts these events:
+      #
+      # - :ok when everything is valid.
+      # - :invalid if the impersonation is not valid.
+      #
+      # Returns nothing.
+      def call
+        return broadcast(:invalid) unless form.valid?
+
+        transaction do
+          update_managed_user
+          mark_conflict_as_solved
+          create_action_log
+        end
+
+        broadcast(:ok)
+      end
+
+      private
+
+      attr_reader :form
+
+      def new_user
+        form.conflict.current_user
+      end
+
+      def managed_user
+        form.conflict.managed_user
+      end
+
+      def current_user
+        form.current_user
+      end
+
+      def update_managed_user
+        clean_email_and_delete_new_user if form.email == new_user.email
+        managed_user.email = form.email
+        managed_user.encrypted_password = new_user.encrypted_password
+        managed_user.confirmed_at = new_user.confirmed_at
+        managed_user.managed = false
+        managed_user.skip_reconfirmation!
+        managed_user.save!
+      end
+
+      def clean_email_and_delete_new_user
+        new_user.update(deleted_at: Time.now.utc, email: "")
+      end
+
+      def mark_conflict_as_solved
+        form.conflict.update(solved: true)
+      end
+
+      def create_action_log
+        Decidim.traceability.perform_action!(
+          "transfer",
+          form.conflict.managed_user,
+          current_user,
+          visibility: "admin-only"
+        )
+      end
+    end
+  end
+end

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

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    class UnblockUser < Rectify::Command
+      # Public: Initializes the command.
+      #
+      # blocked_user - the user that is unblocked
+      # current_user - the user performing the action
+      def initialize(blocked_user, current_user)
+        @blocked_user = blocked_user
+        @current_user = current_user
+      end
+
+      # Executes the command. Broadcasts these events:
+      #
+      # - :ok when everything is valid, together with the resource.
+      # - :invalid if the resource is not reported
+      #
+      # Returns nothing.
+      def call
+        return broadcast(:invalid) unless @blocked_user.blocked?
+
+        unblock!
+        broadcast(:ok, @blocked_user)
+      end
+
+      private
+
+      def unblock!
+        Decidim.traceability.perform_action!(
+          "unblock",
+          @blocked_user,
+          @current_user,
+          extra: {
+            reportable_type: @blocked_user.class.name
+          }
+        ) do
+          @blocked_user.blocked = false
+          @blocked_user.blocked_at = nil
+          @blocked_user.block_id = nil
+          @blocked_user.name = @blocked_user.user_name
+          @blocked_user.save!
+        end
+      end
+    end
+  end
+end