decidim-core 0.28.2 → 0.29.0.rc2

data/app/packs/stylesheets/decidim/vendor/_datepicker_light.scss

@@ -0,0 +1,228 @@
+// Extracted from wc-datepicker
+// https://github.com/Sqrrl/wc-datepicker
+// Copyright @Sqrrl (c) 2022 - MIT License
+
+.sc-wc-datepicker-h,
+.sc-wc-datepicker-h *,
+.sc-wc-datepicker-h *::before,
+.sc-wc-datepicker-h *::after {
+  margin: 0;
+  padding: 0;
+  box-sizing: border-box;
+}
+
+.sc-wc-datepicker-h {
+  display: inline-flex;
+}
+
+.wc-datepicker {
+  display: block;
+  width: min-content;
+  min-width: 17rem;
+  max-width: 24rem;
+  border: 0.0625rem solid #f2f3f5;
+  color: #111;
+  background-color: #fff;
+  font-family: ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont,
+    "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif,
+    "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
+  font-size: 1rem;
+  font-weight: 400;
+  line-height: 1.5;
+}
+
+.wc-datepicker--disabled *:disabled {
+  opacity: 0.5;
+  cursor: default;
+}
+
+.wc-datepicker--disabled .wc-datepicker__weekday {
+  color: #767676;
+}
+
+.wc-datepicker--disabled .wc-datepicker__date:focus > * {
+  outline: none;
+}
+
+.wc-datepicker--disabled .wc-datepicker__date {
+  cursor: default;
+  opacity: 0.5;
+}
+
+.wc-datepicker--disabled .wc-datepicker__date:hover > * {
+  background-color: transparent;
+}
+
+.wc-datepicker--disabled .wc-datepicker__date--in-range:hover > * {
+  background-color: #f2f3f5;
+}
+
+.wc-datepicker--disabled .wc-datepicker__date--selected:hover > * {
+  color: #fff;
+  background-color: #00f;
+}
+
+.wc-datepicker__header {
+  display: flex;
+  padding: 0.75rem;
+  align-items: center;
+  gap: 0.5rem;
+}
+
+.wc-datepicker__current-month {
+  display: flex;
+  flex-grow: 1;
+  gap: 0.5rem;
+}
+
+.wc-datepicker__month-select,
+.wc-datepicker__year-select {
+  display: flex;
+  height: 2rem;
+  padding-right: 0.5rem;
+  padding-left: 0.5rem;
+  align-items: center;
+  border: none;
+  border-radius: 0.25rem;
+  color: #111;
+  background: #f2f3f5;
+  font: inherit;
+  line-height: 1.125;
+}
+
+.wc-datepicker__month-select {
+  flex-grow: 1;
+  cursor: pointer;
+  appearance: none;
+}
+
+.wc-datepicker__year-select {
+  max-width: 5rem;
+}
+
+.wc-datepicker__previous-month-button,
+.wc-datepicker__next-month-button,
+.wc-datepicker__previous-year-button,
+.wc-datepicker__next-year-button {
+  display: inline-flex;
+  width: 2rem;
+  height: 2rem;
+  padding: 0.375rem;
+  flex-shrink: 0;
+  justify-content: center;
+  align-items: center;
+  border: none;
+  border-radius: 0.25rem;
+  color: #111;
+  background-color: transparent;
+  background-color: #f2f3f5;
+  cursor: pointer;
+}
+
+.wc-datepicker__body {
+  padding-right: 0.75rem;
+  padding-bottom: 0.75rem;
+  padding-left: 0.75rem;
+}
+
+.wc-datepicker__calendar {
+  width: 100%;
+  table-layout: fixed;
+  border-collapse: collapse;
+}
+
+.wc-datepicker__weekday > span {
+  display: flex;
+  padding: 0.125rem;
+  justify-content: center;
+  align-items: center;
+  font-weight: 600;
+  aspect-ratio: 1;
+}
+
+.wc-datepicker__date {
+  padding: 0.125rem;
+  text-align: center;
+  cursor: pointer;
+}
+
+.wc-datepicker__date:focus {
+  outline: none;
+}
+
+.wc-datepicker__date:focus > * {
+  outline: 0.125rem solid #00f;
+}
+
+.wc-datepicker__date:hover > * {
+  background-color: #f2f3f5;
+}
+
+.wc-datepicker__date > * {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  border-radius: 0.25rem;
+  aspect-ratio: 1;
+}
+
+.wc-datepicker__date--today > * {
+  font-weight: 700;
+  font-style: normal;
+}
+
+.wc-datepicker__date--in-range > * {
+  background-color: #f2f3f5;
+}
+
+.wc-datepicker__date--selected > *,
+.wc-datepicker__date--selected:hover > * {
+  color: #fff;
+  background-color: #00f;
+  font-weight: 500;
+}
+
+.wc-datepicker__date--disabled {
+  color: #767676;
+  cursor: default;
+}
+
+.wc-datepicker__date--disabled:not(.wc-datepicker__date--selected):not(
+    .wc-datepicker__date--in-range
+  ):hover
+  > * {
+  background-color: transparent;
+}
+
+.wc-datepicker__date--disabled.wc-datepicker__date--in-range:not(
+    .wc-datepicker__date--selected
+  ):not(.wc-datepicker__date--in-range)
+  > * {
+  background-color: transparent;
+}
+
+.wc-datepicker__footer {
+  display: flex;
+  padding-right: 0.75rem;
+  padding-bottom: 0.75rem;
+  padding-left: 0.75rem;
+  align-items: center;
+  gap: 0.5rem;
+}
+
+.wc-datepicker__clear-button,
+.wc-datepicker__today-button {
+  display: inline-flex;
+  height: 2rem;
+  padding-right: 0.5rem;
+  padding-left: 0.5rem;
+  justify-content: center;
+  align-items: center;
+  border: none;
+  border-radius: 0.25rem;
+  color: #111;
+  background-color: #f2f3f5;
+  font: inherit;
+  line-height: 1;
+  cursor: pointer;
+}

data/app/permissions/decidim/default_permissions.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
 module Decidim
-  # Default permissions class for all components and spaces. It disauthorizes all
+  # Default permissions class for all components and spaces. It deauthorizes all
   # actions by any kind of user. Also works as a default implementation so other
-  # components can inherit from it and get some cenvenience methods.
+  # components can inherit from it and get some convenience methods.
   class DefaultPermissions
     def initialize(user, permission_action, context = {})
       @user = user

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

@@ -15,7 +15,7 @@ module Decidim
       private
 
       def diff_fields_mapping
-        return { external_domain_whitelist: :string } if action == "update_external_domain"
+        return { external_domain_allowlist: :string } if action == "update_external_domain"
 
         settings_attributes_mapping
           .merge(omnipresent_banner_attributes_mapping)

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

@@ -24,7 +24,7 @@ module Decidim
 
       # Private: Caches the object that will be responsible of presenting the static page.
       # Overwrites the method so that we can use a custom presenter to show the correct
-      # path for ther page.
+      # path for their page.
       #
       # Returns an object that responds to `present`.
       def resource_presenter

data/app/presenters/decidim/authorization_transfer_presenter.rb

@@ -37,7 +37,7 @@ module Decidim
     # Returns an array of the translated record counts containing only the
     # texts to be displayed for the user.
     #
-    # @return [Array<String>] The translated records names with their coutns.
+    # @return [Array<String>] The translated records names with their counts.
     def translated_record_texts
       translated_record_counts.values
     end

data/app/presenters/decidim/component_attachment_collection_presenter.rb

@@ -0,0 +1,81 @@
+# frozen_string_literal: true
+
+module Decidim
+  #
+  # Decorator attachments of a component acting as an attachment collection
+  #
+  class ComponentAttachmentCollectionPresenter < SimpleDelegator
+    include Decidim::TranslatableAttributes
+
+    def initialize(resource, opts = {})
+      super(resource)
+
+      @include_component_name = opts[:include_component_name]
+    end
+
+    def attachments
+      @attachments ||= if [resource_model_name, resource_table_name].all?(&:present?)
+                         base_query = Decidim::Attachment.joins(resource_join.join_sources)
+                                                         .where(resource_table_name => { decidim_component_id: __getobj__.id })
+                         if resource_model&.include?(Decidim::Publicable)
+                           base_query.where.not(resource_table_name => { published_at: nil })
+                         else
+                           base_query
+                         end
+                       else
+                         Decidim::Attachment.none
+                       end
+    end
+
+    def documents
+      @documents ||= attachments.with_attached_file.order(:weight).select(&:document?)
+    end
+
+    def documents_visible_for(user)
+      return documents unless resource_model.respond_to?(:visible_for)
+
+      attachments.merge(resource_model.visible_for(user)).with_attached_file.order(:weight).select(&:document?)
+    end
+
+    def unused?
+      documents.blank?
+    end
+
+    def id
+      "component-#{__getobj__.id}"
+    end
+
+    def name
+      base_name = I18n.t(manifest_name, scope: "decidim.application.documents.component_documents")
+
+      return base_name unless @include_component_name
+
+      "#{base_name} - #{translated_attribute(__getobj__.name)}"
+    end
+
+    def description; end
+
+    private
+
+    def resource_join
+      resource_table = Arel::Table.new(resource_table_name)
+      attachments_table = Decidim::Attachment.arel_table
+      attachments_table.join(resource_table).on(
+        resource_table[:id].eq(attachments_table[:attached_to_id]),
+        attachments_table[:attached_to_type].eq(resource_model_name)
+      )
+    end
+
+    def resource_model_name
+      @resource_model_name ||= Decidim.resource_registry.find(manifest_name)&.model_class_name
+    end
+
+    def resource_model
+      @resource_model ||= resource_model_name&.safe_constantize
+    end
+
+    def resource_table_name
+      @resource_table_name ||= resource_model&.table_name
+    end
+  end
+end

data/app/presenters/decidim/footer_menu_presenter.rb

@@ -4,7 +4,7 @@ module Decidim
   # A presenter to render footer menu
   class FooterMenuPresenter < MenuPresenter
     def render
-      content_tag(:nav, role: "navigation", "aria-label" => @options[:label]) do
+      content_tag(:nav, :role => "navigation", "aria-label" => @options[:label]) do
         safe_join([content_tag(:h2, @options[:label], class: "h5 mb-4"), render_menu])
       end
     end

data/app/presenters/decidim/home_stats_presenter.rb

@@ -45,7 +45,7 @@ module Decidim
       stats = {}
       Decidim.component_manifests.flat_map do |component|
         component
-          .stats.except([:supports_count])
+          .stats.except([:votes_count])
           .filter(conditions)
           .with_context(published_components)
           .each do |name, data|

data/app/presenters/decidim/organization_presenter.rb

@@ -4,7 +4,7 @@ module Decidim
   # A general presenter to render organization logic to build a manifest
   class OrganizationPresenter < SimpleDelegator
     def html_name
-      name.html_safe
+      translated_attribute(name).html_safe
     end
 
     def translated_description

data/app/queries/decidim/metric_measure.rb

@@ -4,7 +4,7 @@ module Decidim
   # This class executes some measures related to Metrics, and return its results
   #
   #  - day: Date object
-  #  - resource: Object used to make measurements. Object class is dependant within each measure
+  #  - resource: Object used to make measurements. Object class is dependent within each measure
   class MetricMeasure
     def initialize(day, resource)
       @day = day.try(:to_date) || Time.zone.yesterday

data/app/queries/decidim/public_activities.rb

@@ -14,7 +14,7 @@ module Decidim
   #
   # :resource_name - an optional name for a resource for searching only that
   #    type of resources.
-  # :user - an optional `Decidim::User` that performed the activites
+  # :user - an optional `Decidim::User` that performed the activities
   # :current_user - an optional `Decidim::User` for defining whether to show the
   #   private log entries that relate to the current user.
   # :follows - a collection of `Decidim::Follow` resources. It will return any

data/app/queries/decidim/user_groups/admin_memberships.rb

@@ -2,7 +2,7 @@
 
 module Decidim
   module UserGroups
-    # Use this class to find the the admins of the given user group with the
+    # Use this class to find the admins of the given user group with the
     # "admin" role. It returns memberships.
     class AdminMemberships < Decidim::Query
       # Syntactic sugar to initialize the class and return the queried objects.

data/app/queries/decidim/user_groups/member_memberships.rb

@@ -2,7 +2,7 @@
 
 module Decidim
   module UserGroups
-    # Use this class to find the the members of the given user group with the
+    # Use this class to find the members of the given user group with the
     # "member" role. It returns memberships.
     class MemberMemberships < Decidim::Query
       # Syntactic sugar to initialize the class and return the queried objects.

data/app/services/decidim/action_logger.rb

@@ -2,7 +2,7 @@
 
 module Decidim
   # Use this class to log actions by any user. You probably should not
-  # use this class dfirectly, but rather use `Decidim.traceability` instead.
+  # use this class directly, but rather use `Decidim.traceability` instead.
   # Check the docs on `Decidim::Traceability` for more info.
   #
   # Usage:
@@ -14,7 +14,7 @@ module Decidim
     #
     # action - a String representing the name of the action
     # user - the Decidim::User that performed the action
-    # resource - the resource onn which the action was performed
+    # resource - the resource on which the action was performed
     # version_id - the ID of the `PaperTrail::Version` that was created on that action
     # resource_extra - a Hash with resource_extra info to be recorded
     #
@@ -27,7 +27,7 @@ module Decidim
     #
     # action - a String representing the name of the action
     # user - the Decidim::User that performed the action
-    # resource - the resource onn which the action was performed
+    # resource - the resource on which the action was performed
     # version_id - the ID of the `PaperTrail::Version` that was created on that action
     # resource_extra - a Hash with resource_extra info to be recorded
     def initialize(action, user, resource, version_id = nil, resource_extra = {})

data/app/services/decidim/log/diff_changeset_calculator.rb

@@ -20,7 +20,7 @@ module Decidim
     class DiffChangesetCalculator
       # original_changeset - a `changeset` from a PaperTrail::Version instance
       # fields_mapping - a Hash mapping attribute names and a type to render them
-      # i18n_labels_scope - a String representing the I18n scope where the attribtue
+      # i18n_labels_scope - a String representing the I18n scope where the attribute
       #   labels can be found
       def initialize(original_changeset, fields_mapping, i18n_labels_scope)
         @original_changeset = original_changeset
@@ -119,7 +119,7 @@ module Decidim
       # Generates the label for the given attribute. If the `locale` is set,
       # it appends the locale at the end: `AttributeName (LocaleName)`.
       #
-      # attribute - A Symbol representing the attribute name. It will retrive
+      # attribute - A Symbol representing the attribute name. It will retrieve
       #   this key from the I18n scope set at `i18n_labels_scope`.
       # locale - a String representing the name of the locale.
       #

data/app/services/decidim/notifications_digest_sending_decider.rb

@@ -3,7 +3,7 @@
 module Decidim
   class NotificationsDigestSendingDecider
     class << self
-      def must_notify?(user, time: Time.now.utc)
+      def must_notify?(user, time = Time.now.utc)
         return true if user.digest_sent_at.blank?
 
         # Note that we are checking whether the notifications were sent at any

data/app/uploaders/decidim/organization_favicon_uploader.rb

@@ -26,7 +26,7 @@ module Decidim
     end
 
     def extension_allowlist
-      %w(png jpg jpeg ico)
+      %w(png jpg jpeg webp ico)
     end
   end
 end

data/app/uploaders/decidim/record_image_uploader.rb

@@ -5,11 +5,11 @@ module Decidim
   # limited content types than the defaults.
   class RecordImageUploader < ImageUploader
     def content_type_allowlist
-      %w(image/jpeg image/png)
+      %w(image/jpeg image/png image/webp)
     end
 
     def extension_allowlist
-      %w(jpeg jpg png)
+      %w(jpeg jpg png webp)
     end
   end
 end

data/app/validators/organization_present_validator.rb

@@ -8,7 +8,7 @@ class OrganizationPresentValidator < ActiveModel::Validations::FileContentTypeVa
     return if record.is_a?(Decidim::Organization)
     return if record.respond_to?(:organization) && record.organization.is_a?(Decidim::Organization)
 
-    record.errors.add attribute, I18n.t("carrierwave.errors.not_inside_organization")
+    record.errors.add attribute, I18n.t("decidim.errors.files.not_inside_organization")
   end
 
   def check_validity!; end

data/app/validators/passthru_validator.rb

@@ -69,7 +69,7 @@ class PassthruValidator < ActiveModel::EachValidator
   def validation_record_context(dummy, record)
     if dummy.is_a?(Decidim::Form)
       dummy.with_context(
-        current_organization: record.try(:current_organization) || record.try(:ganization),
+        current_organization: record.try(:current_organization) || record.try(:organization),
         current_participatory_space: record.try(:current_participatory_space) || record.try(:participatory_space),
         current_component: record.try(:current_component) || record.try(:component)
       )

data/app/validators/uploader_image_dimensions_validator.rb

@@ -28,7 +28,7 @@ class UploaderImageDimensionsValidator < ActiveModel::Validations::FileContentTy
     return unless uploader.validable_dimensions
     return if (image = extract_image(file)).blank?
 
-    record.errors.add attribute, I18n.t("carrierwave.errors.file_resolution_too_large") if image.dimensions.any? { |dimension| dimension > uploader.max_image_height_or_width }
+    record.errors.add attribute, I18n.t("decidim.errors.files.file_resolution_too_large") if image.dimensions.any? { |dimension| dimension > uploader.max_image_height_or_width }
   rescue MiniMagick::Error
     # The error may happen because of many reasons but most commonly the image
     # exceeds the default maximum dimensions set for ImageMagick when the
@@ -40,7 +40,7 @@ class UploaderImageDimensionsValidator < ActiveModel::Validations::FileContentTy
     # Note that the error can also happen because of other reasons than only
     # the image dimensions being too large. But as we do not really know the
     # reason every time, we default to that error.
-    record.errors.add attribute, I18n.t("carrierwave.errors.file_cannot_be_processed")
+    record.errors.add attribute, I18n.t("decidim.errors.files.file_cannot_be_processed")
   end
 
   def extract_image(file)

data/app/views/decidim/account/show.html.erb

@@ -4,7 +4,7 @@
 <%= render layout: "layouts/decidim/shared/layout_user_profile" do %>
   <% if current_user.unconfirmed_email.present? %>
     <%# NOTE: announcement cell clean_body method will purge the button %>
-    <div id="email-change-pending" class="flash secondary" data-announcement>
+    <div id="email-change-pending" class="flash warning" data-announcement>
       <div class="flash__message flex-none block leading-relaxed">
         <p>
           <strong><%= t("decidim.account.email_change.title") %></strong>

data/app/views/decidim/amendments/_wizard_header.html.erb

@@ -1,14 +1,13 @@
 <div class="flex justify-center">
   <h1 class="title-decorator my-12">
     <%= wizard_header_title %>
-    <%= "(#{similar_resources_count})" if local_assigns[:similar_resources_count] %>
   </h1>
 </div>
 
 <ol id="wizard-steps" class="wizard-steps">
   <% (1..total_steps).each do |wizard_step| %>
     <% attributes = @current_step == wizard_step ? { "aria-current": "step" } : {} %>
-    <%= content_tag :li, t(wizard_step, scope: "decidim.amendments.wizard_step_form.steps"), attributes %>
+    <%= content_tag :li, t(wizard_step, scope: "decidim.amendments.wizard_step_form.steps"), attributes.merge(class: "w-1/2") %>
   <% end %>
 </ol>
 

data/app/views/decidim/application/_collection.html.erb

@@ -12,7 +12,9 @@
 </button>
 
 <div id="dropdown-menu-documents-<%= attachment_collection.id %>" class="documents__collection-content" aria-hidden="true">
-  <p><%= decidim_escape_translated(attachment_collection.description) %></p>
+  <% if (description = attachment_collection.description).present? %>
+    <p><%= decidim_escape_translated(description) %></p>
+  <% end %>
 
   <div class="documents__container">
     <% documents.each do |document| %>

data/app/views/decidim/application/_component_documents.html.erb

@@ -0,0 +1,4 @@
+<% documents = collection.documents_visible_for(current_user) %>
+<% if documents.any? %>
+  <%= render partial: "decidim/application/collection", formats: [:html], locals: { attachment_collection: collection, documents: } %>
+<% end %>

data/app/views/decidim/application/_document.html.erb

@@ -8,16 +8,30 @@
     <% end %>
     <div class="card__list-metadata">
       <div><%= icon "file-text-line" %><%= document.file_type %></div>
-      <div><%= icon "scales-2-line" %><%= number_to_human_size(document.file_size) %></div>
+      <% if document.file? %>
+        <div><%= icon "scales-2-line" %><%= number_to_human_size(document.file_size) %></div>
+      <% end %>
     </div>
   </div>
-  <%= link_to document.url,
-              target: "_blank",
-              rel: "noopener noreferrer",
-              class: "button button__sm button__transparent-secondary flex-none",
-              title: t("decidim.application.document.download"),
-              data: { "external-link": false } do %>
-    <%= t("decidim.application.document.download") %>
-    <%= icon "download-line" %>
+  <% if document.file? %>
+    <%= link_to document.url,
+                target: "_blank",
+                rel: "noopener noreferrer",
+                class: "button button__sm button__transparent-secondary flex-none",
+                title: t("decidim.application.document.download"),
+                data: { "external-link": false } do %>
+      <%= t("decidim.application.document.download") %>
+      <%= icon "download-line" %>
+    <% end %>
+  <% else %>
+    <%= link_to document.url,
+                target: "_blank",
+                rel: "noopener noreferrer",
+                class: "button button__sm button__transparent-secondary flex-none",
+                title: t("decidim.application.document.visit_link"),
+                data: { "external-link": true } do %>
+      <%= t("decidim.application.document.visit_link") %>
+    <% end %>
+
   <% end %>
 </div>

data/app/views/decidim/block_user_mailer/notify.html.erb

@@ -1,7 +1,7 @@
 <p class="email-greeting"><%= t ".hello" %></p>
 
-<p class="email-instructions"><%= t ".body_1", organization_name: h(@organization.name) %></p>
+<p class="email-instructions"><%= t ".body_1", organization_name: organization_name(@organization) %></p>
 
 <p class="email-instructions"><%= t ".body_2", justification: h(@justification) %></p>
 
-<p class="email-closing"><%= t(".greetings", organization_name: h(@organization.name), organization_url: decidim.root_url(host: @organization.host)).html_safe %></p>
+<p class="email-closing"><%= t(".greetings", organization_name: organization_name(@organization), organization_url: decidim.root_url(host: @organization.host)).html_safe %></p>

data/app/views/decidim/devise/invitations/edit.html.erb

@@ -14,7 +14,7 @@
     <div class="form__wrapper">
       <%= f.hidden_field :invitation_token %>
 
-      <%= f.text_field :nickname, help_text: t("devise.invitations.edit.nickname_help", organization: current_organization.name), required: "required", autocomplete: "nickname" %>
+      <%= f.text_field :nickname, help_text: t("devise.invitations.edit.nickname_help", organization: current_organization_name), required: "required", autocomplete: "nickname" %>
 
       <% if f.object.class.require_password_on_accepting %>
         <%= render partial: "decidim/account/password_fields", locals: { form: f, user: :user } %>
@@ -24,7 +24,7 @@
     <div class="form__wrapper-block">
       <h4 class="h4"><%= t("tos_title", scope: "decidim.devise.registrations.new") %></h4>
 
-      <div class="tos-text">
+      <div>
         <% terms_of_service_summary_content_blocks.each do |content_block| %>
           <%= cell content_block.manifest.cell, content_block %>
         <% end %>