decidim-core 0.26.4 → 0.27.0.rc1

data/app/packs/stylesheets/decidim/modules/_input-multiple-mentions.scss

@@ -1,5 +1,32 @@
 @import "tributejs/tribute";
 
-input.js-multiple-mentions.mentions__container::placeholder{
-  color: $input-multiple-placeholder-color;
+.multiple-mentions{
+  input::placeholder{
+    color: $input-multiple-placeholder-color;
+  }
+}
+
+.multiple-mentions-selected{
+  font-size: 1.3rem;
+  line-height: 1.8;
+  list-style: none;
+  margin: 1rem 0 0;
+
+  button{
+    cursor: pointer;
+  }
+
+  img{
+    &.author__avatar{
+      display: inline-block;
+      padding: 0;
+      border-radius: 50%;
+      width: 35px;
+      height: 35px;
+    }
+  }
+
+  li b{
+    font-size: .875rem;
+  }
 }

data/app/packs/stylesheets/decidim/modules/_modules.scss

@@ -53,6 +53,7 @@
 @import "stylesheets/decidim/modules/sticky";
 @import "stylesheets/decidim/modules/notification";
 @import "stylesheets/decidim/modules/statistics";
+@import "stylesheets/decidim/modules/autocomplete";
 
 //Process elements
 @import "stylesheets/decidim/modules/process-header";
@@ -81,7 +82,7 @@
 //Additional elements
 @import "stylesheets/decidim/modules/share";
 @import "stylesheets/decidim/modules/help";
-@import "stylesheets/decidim/modules/cookie-bar";
+@import "stylesheets/decidim/modules/cookie-consent";
 @import "stylesheets/decidim/modules/map";
 @import "stylesheets/decidim/modules/omnipresent_banner";
 @import "stylesheets/decidim/modules/wizard-steps";
@@ -90,3 +91,4 @@
 @import "stylesheets/decidim/modules/fingerprint";
 @import "stylesheets/decidim/modules/toggle";
 @import "stylesheets/decidim/modules/loading-spinner";
+@import "stylesheets/decidim/modules/upload_modal";

data/app/packs/stylesheets/decidim/modules/_reveal.scss

@@ -19,6 +19,21 @@
   }
 }
 
+.reveal{
+  .calendar-url-description{
+    margin-bottom: .5rem;
+  }
+
+  .calendar_url_input{
+    margin-top: 1rem;
+  }
+
+  #urlCalendarUrl{
+    // Prevent the "not-allowed" cursor in the share input.
+    cursor: auto;
+  }
+}
+
 .reveal__footer{
   border-top: $border;
 

data/app/packs/stylesheets/decidim/modules/_upload_modal.scss

@@ -0,0 +1,143 @@
+@import "stylesheets/decidim/variables";
+
+.upload-modal{
+  .button{
+    margin: 0;
+  }
+
+  .dropzone-container{
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    margin-bottom: 1rem;
+
+    input[type="file"]{
+      display: none;
+    }
+
+    label{
+      background-color: $white;
+      margin: 1rem 0;
+      cursor: pointer;
+
+      &.is-dragover{
+        background-color: lighten($secondary, 50);
+      }
+
+      &.dropzone{
+        padding: 1rem;
+        text-align: center;
+        border-style: dashed;
+        border-color: $secondary;
+        border-width: 2px;
+        border-radius: 4px;
+
+        * >{
+          display: none;
+        }
+
+        .form-error{
+          margin: 0;
+        }
+      }
+
+      &.disabled{
+        background-color: $light-gray;
+        cursor: not-allowed;
+        border-color: lighten($secondary, 50);
+
+        span{
+          color: #ccc;
+        }
+      }
+    }
+  }
+
+  .upload-items{
+    .upload-item{
+      input[type="text"]{
+        margin: 0;
+      }
+
+      .file-name-span{
+        overflow: hidden;
+      }
+
+      .progress-bar-wrapper{
+        .progress-bar-border{
+          height: 2rem;
+          border: 1px solid $primary;
+          box-sizing: border-box;
+          padding: 0;
+
+          .progress-bar{
+            display: flex;
+            justify-content: flex-start;
+            align-items: center;
+            color: white;
+            background-color: $primary;
+            padding: 0 .5rem;
+            height: 2rem;
+
+            &.filled{
+              justify-content: center;
+              width: 100% !important;
+            }
+          }
+        }
+      }
+    }
+
+    .remove-upload-item{
+      cursor: pointer;
+    }
+
+    .upload-errors{
+      .form-error{
+        margin: 0;
+      }
+    }
+  }
+}
+
+.dynamic-uploads{
+  display: flex;
+  flex-direction: column;
+
+  @include breakpoint(large down){
+    margin-bottom: .5rem;
+  }
+
+  .actions-wrapper{
+    display: flex;
+    justify-content: flex-start;
+    align-items: baseline;
+
+    button.primary{
+      margin-right: .5rem;
+    }
+
+    button.remove-upload{
+      cursor: pointer;
+    }
+
+    &.titled{
+      flex-direction: column-reverse;
+    }
+
+    .active-uploads{
+      span.filename{
+        margin-right: .5rem;
+      }
+
+      span:last-child{
+        margin-right: .5rem;
+      }
+    }
+  }
+
+  &.with-title{
+    display: block;
+    margin: 0;
+  }
+}

data/app/packs/stylesheets/decidim/utils/_fontface.scss

@@ -2,6 +2,7 @@
   font-family: 'Source Sans Pro';
   font-style: normal;
   font-weight: 400;
+  font-display: swap;
   src:
     url('fonts/decidim/Source_Sans_Pro_400.woff2') format('woff2'),
     url('fonts/decidim/Source_Sans_Pro_400.woff') format('woff'),
@@ -12,6 +13,7 @@
   font-family: 'Source Sans Pro';
   font-style: normal;
   font-weight: 600;
+  font-display: swap;
   src:
     url('fonts/decidim/Source_Sans_Pro_600.woff2') format('woff2'),
     url('fonts/decidim/Source_Sans_Pro_600.woff') format('woff'),
@@ -22,6 +24,7 @@
   font-family: 'Source Sans Pro';
   font-style: normal;
   font-weight: 900;
+  font-display: swap;
   src:
     url('fonts/decidim/Source_Sans_Pro_900.woff2') format('woff2'),
     url('fonts/decidim/Source_Sans_Pro_900.woff') format('woff'),

data/app/permissions/decidim/permissions.rb

@@ -116,11 +116,9 @@ module Decidim
     end
 
     def apply_endorsement_permissions
-      is_allowed = current_settings.endorsements_enabled &&
-                   !current_settings.endorsements_blocked &&
-                   authorized?(:endorse, resource: context.fetch(:resource, nil))
+      return disallow! if !current_settings.endorsements_enabled || current_settings.endorsements_blocked
 
-      toggle_allow(is_allowed)
+      allow!
     end
 
     def notification_action?
@@ -150,7 +148,7 @@ module Decidim
       user_group = context.fetch(:user_group)
 
       if permission_action.action == :leave
-        user_can_leave_group = Decidim::UserGroupMembership.where(user: user, user_group: user_group).where.not(role: :creator).any?
+        user_can_leave_group = Decidim::UserGroupMembership.where(user: user, user_group: user_group).any?
         return toggle_allow(user_can_leave_group)
       end
 
@@ -164,9 +162,7 @@ module Decidim
 
     def user_can_preview_component?
       return allow! if context[:share_token].present? && Decidim::ShareToken.use!(token_for: component, token: context[:share_token])
-    rescue ActiveRecord::RecordNotFound
-      nil
-    rescue StandardError
+    rescue ActiveRecord::RecordNotFound, StandardError
       nil
     end
 

data/app/presenters/decidim/admin_log/area_type_presenter.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module Decidim
+  module AdminLog
+    # This class holds the logic to present a `Decidim::AreaType`
+    # for the `AdminLog` log.
+    #
+    # Usage should be automatic and you shouldn't need to call this class
+    # directly, but here's an example:
+    #
+    #    action_log = Decidim::ActionLog.last
+    #    view_helpers # => this comes from the views
+    #    AreaTypePresenter.new(action_log, view_helpers).present
+    class AreaTypePresenter < Decidim::Log::BasePresenter
+      private
+
+      def diff_fields_mapping
+        {
+          name: :i18n,
+          plural: :i18n
+        }
+      end
+
+      def action_string
+        case action
+        when "create", "delete", "update"
+          "decidim.admin_log.area_type.#{action}"
+        else
+          super
+        end
+      end
+    end
+  end
+end

data/app/presenters/decidim/admin_log/attachment_collection_presenter.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Decidim
+  module AdminLog
+    # This class holds the logic to present a `Decidim::AttachmentCollection`
+    # for the `AdminLog` log.
+    #
+    # Usage should be automatic and you shouldn't need to call this class
+    # directly, but here's an example:
+    #
+    #    action_log = Decidim::ActionLog.last
+    #    view_helpers # => this comes from the views
+    #    AttachmentCollectionPresenter.new(action_log, view_helpers).present
+    class AttachmentCollectionPresenter < Decidim::Log::BasePresenter
+      private
+
+      def diff_fields_mapping
+        {
+          name: :i18n,
+          description: :i18n,
+          weight: :integer
+        }
+      end
+
+      def action_string
+        case action
+        when "create", "delete", "update"
+          "decidim.admin_log.attachment_collection.#{action}"
+        else
+          super
+        end
+      end
+    end
+  end
+end

data/app/presenters/decidim/admin_log/attachment_presenter.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Decidim
+  module AdminLog
+    # This class holds the logic to present a `Decidim::Attachment`
+    # for the `AdminLog` log.
+    #
+    # Usage should be automatic and you shouldn't need to call this class
+    # directly, but here's an example:
+    #
+    #    action_log = Decidim::ActionLog.last
+    #    view_helpers # => this comes from the views
+    #    AttachmentPresenter.new(action_log, view_helpers).present
+    class AttachmentPresenter < Decidim::Log::BasePresenter
+      private
+
+      def action_string
+        case action
+        when "create", "delete", "update"
+          "decidim.admin_log.attachment.#{action}"
+        else
+          super
+        end
+      end
+    end
+  end
+end

data/app/presenters/decidim/admin_log/category_presenter.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Decidim
+  module AdminLog
+    # This class holds the logic to present a `Decidim::Category`
+    # for the `AdminLog` log.
+    #
+    # Usage should be automatic and you shouldn't need to call this class
+    # directly, but here's an example:
+    #
+    #    action_log = Decidim::ActionLog.last
+    #    view_helpers # => this comes from the views
+    #    CategoryPresenter.new(action_log, view_helpers).present
+    class CategoryPresenter < Decidim::Log::BasePresenter
+      private
+
+      def diff_fields_mapping
+        {
+          name: :i18n,
+          description: :i18n,
+          weight: :integer,
+          parent_id: :integer
+        }
+      end
+
+      def action_string
+        case action
+        when "create", "delete", "update"
+          "decidim.admin_log.category.#{action}"
+        else
+          super
+        end
+      end
+    end
+  end
+end

data/app/presenters/decidim/admin_log/component_presenter.rb

@@ -18,7 +18,8 @@ module Decidim
         {
           name: :i18n,
           published_at: :date,
-          weight: :integer
+          weight: :integer,
+          permissions: :jsonb
         }
       end
 
@@ -28,15 +29,46 @@ module Decidim
 
       def action_string
         case action
-        when "create", "delete", "publish", "unpublish"
+        when "export_component"
           "decidim.admin_log.component.#{action}"
+        when "create", "delete", "publish", "unpublish", "update_permissions"
+          generate_action_string(action)
         else
           super
         end
       end
 
+      def generate_action_string(action)
+        string = if action_log.participatory_space.present?
+                   "#{action}_with_space"
+                 else
+                   action
+                 end
+        "decidim.log.base_presenter.#{string}"
+      end
+
       def diff_actions
-        super + %w(unpublish)
+        super + %w(unpublish update_permissions)
+      end
+
+      def i18n_params
+        case action_log.extra["name"]
+        when "proposal_comments", "result_comments", "comments", "meeting_comments"
+          super.merge({
+                        component_name: I18n.t("decidim.admin_log.helpers.comments"),
+                        format_name: action_log.extra["format"]
+                      })
+        when "projects", "results", "answers"
+          super.merge({
+                        component_name: I18n.t("decidim.admin_log.helpers.#{action_log.extra["name"]}"),
+                        format_name: action_log.extra["format"]
+                      })
+        else
+          super.merge({
+                        component_name: "",
+                        format_name: action_log.extra["format"]
+                      })
+        end
       end
     end
   end

data/app/presenters/decidim/admin_log/contextual_help_section_presenter.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module Decidim
+  module AdminLog
+    # This class holds the logic to present a `Decidim::ContextualHelpSection`
+    # for the `AdminLog` log.
+    #
+    # Usage should be automatic and you shouldn't need to call this class
+    # directly, but here's an example:
+    #
+    #    action_log = Decidim::ActionLog.last
+    #    view_helpers # => this comes from the views
+    #    ContextualHelpSectionPresenter.new(action_log, view_helpers).present
+    class ContextualHelpSectionPresenter < Decidim::Log::BasePresenter
+      private
+
+      def diff_fields_mapping
+        {
+          content: :i18n
+        }
+      end
+
+      def action_string
+        case action
+        when "update"
+          "decidim.admin_log.contextual_help_section.#{action}"
+        else
+          super
+        end
+      end
+    end
+  end
+end

data/app/presenters/decidim/admin_log/organization_presenter.rb

@@ -15,6 +15,8 @@ module Decidim
       private
 
       def diff_fields_mapping
+        return { external_domain_whitelist: :string } if action == "update_external_domain"
+
         settings_attributes_mapping
           .merge(omnipresent_banner_attributes_mapping)
           .merge(highlighted_content_banner_attributes_mapping)
@@ -79,9 +81,12 @@ module Decidim
       end
 
       def action_string
-        return "decidim.admin_log.organization.update_id_documents_config" if action == "update_id_documents_config"
-
-        "decidim.admin_log.organization.update"
+        case action
+        when "update_id_documents_config", "update_external_domain"
+          "decidim.admin_log.organization.#{action}"
+        else
+          "decidim.admin_log.organization.update"
+        end
       end
 
       def i18n_labels_scope
@@ -89,7 +94,7 @@ module Decidim
       end
 
       def diff_actions
-        super + %w(update_id_documents_config)
+        super + %w(update_id_documents_config update_external_domain)
       end
     end
   end

data/app/presenters/decidim/admin_log/scope_type_presenter.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module Decidim
+  module AdminLog
+    # This class holds the logic to present a `Decidim::ScopeType`
+    # for the `AdminLog` log.
+    #
+    # Usage should be automatic and you shouldn't need to call this class
+    # directly, but here's an example:
+    #
+    #    action_log = Decidim::ActionLog.last
+    #    view_helpers # => this comes from the views
+    #    ScopeTypePresenter.new(action_log, view_helpers).present
+    class ScopeTypePresenter < Decidim::Log::BasePresenter
+      private
+
+      def diff_fields_mapping
+        {
+          name: :i18n,
+          plural: :i18n
+        }
+      end
+
+      def action_string
+        case action
+        when "create", "delete", "update"
+          "decidim.admin_log.scope_type.#{action}"
+        else
+          super
+        end
+      end
+    end
+  end
+end

data/app/presenters/decidim/home_stats_presenter.rb

@@ -2,8 +2,10 @@
 
 module Decidim
   # A presenter to render statistics in the homepage.
-  class HomeStatsPresenter < Rectify::Presenter
-    attribute :organization, Decidim::Organization
+  class HomeStatsPresenter < SimpleDelegator
+    def organization
+      __getobj__.fetch(:organization)
+    end
 
     # Public: Render a collection of primary stats.
     def highlighted
@@ -40,19 +42,12 @@ module Decidim
     end
 
     def component_stats(conditions)
-      stats = {}
       Decidim.component_manifests.flat_map do |component|
-        component
-          .stats.except([:supports_count])
-          .filter(conditions)
-          .with_context(published_components)
-          .each do |name, data|
-            stats[name] ||= 0
-            stats[name] += data
-          end
+        component.stats.except([:supports_count])
+                 .filter(conditions)
+                 .with_context(published_components)
+                 .map { |name, data| [name, data] }
       end
-
-      stats.to_a
     end
 
     def published_components

data/app/presenters/decidim/log/base_presenter.rb

@@ -107,7 +107,7 @@ module Decidim
         h.content_tag(:div, class: "logs__log__explanation") do
           I18n.t(
             action_string,
-            i18n_params
+            **i18n_params
           ).html_safe
         end
       end

data/app/presenters/decidim/menu_item_presenter.rb

@@ -28,7 +28,7 @@ module Decidim
     def render
       content_tag :li, class: link_wrapper_classes do
         output = [link_to(composed_label, url, link_options)]
-        output.push(@view.send(:simple_menu, @menu_item.submenu).render) if @menu_item.submenu
+        output.push(@view.send(:simple_menu, **@menu_item.submenu).render) if @menu_item.submenu
 
         safe_join(output)
       end

data/app/presenters/decidim/metric_charts_presenter.rb

@@ -2,7 +2,13 @@
 
 module Decidim
   # A presenter to render metrics in pages
-  class MetricChartsPresenter < Rectify::Presenter
+  class MetricChartsPresenter < SimpleDelegator
+    delegate :content_tag, :concat, :safe_join, to: :view_context
+
+    def view_context
+      @view_context ||= __getobj__.fetch(:view_context, ActionController::Base.new.view_context)
+    end
+
     # Public: Render a collection of primary metrics.
     def highlighted
       render_highlighted(highlighted_metrics)

data/app/presenters/decidim/nil_presenter.rb

@@ -7,7 +7,9 @@ module Decidim
   #
   # It behaves as a presenter for deleted resources.
   # Returns an empty string for most of the method calls.
-  class NilPresenter < Rectify::Presenter
+  class NilPresenter
+    def initialize(*); end
+
     def deleted?
       true
     end