decidim-core 0.21.0 → 0.22.0

data/app/types/decidim/core/user_entity_input_sort.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Core
+    class UserEntityInputSort < BaseInputSort
+      graphql_name "UserEntitySort"
+      description "A type used for sorting any component parent objects"
+
+      argument :id, String, "Sort by ID, valid values are ASC or DESC", required: false
+      argument :type,
+               type: String,
+               description: "Sort by type of user entity (user or group), alphabetically, valid values are ASC or DESC",
+               required: false
+      argument :name,
+               type: String,
+               description: "Sort by name of the user entity (user or group), alphabetically, valid values are ASC or DESC",
+               required: false
+      argument :nickname,
+               type: String,
+               description: "Sort by nickname of the user entity (user or group), alphabetically, valid values are ASC or DESC",
+               required: false
+    end
+  end
+end

data/app/types/decidim/core/user_group_type.rb

@@ -16,23 +16,35 @@ module Decidim
       field :name, !types.String, "The user group's name"
 
       field :nickname, !types.String, "The user group nickname" do
-        resolve ->(obj, _args, _ctx) { UserGroupPresenter.new(obj).nickname }
+        resolve ->(group, _args, _ctx) { group.presenter.nickname }
       end
 
       field :avatarUrl, !types.String, "The user's avatar url" do
-        resolve ->(obj, _args, _ctx) { UserGroupPresenter.new(obj).avatar_url }
+        resolve ->(group, _args, _ctx) { group.presenter.avatar_url }
       end
 
       field :profilePath, !types.String, "The user group's profile url" do
-        resolve ->(obj, _args, _ctx) { UserGroupPresenter.new(obj).profile_path }
+        resolve ->(group, _args, _ctx) { group.presenter.profile_path }
+      end
+
+      field :organizationName, !types.String, "The user group's organization name" do
+        resolve ->(group, _args, _ctx) { group.organization.name }
       end
 
       field :deleted, !types.Boolean, "Whether the user group's has been deleted or not" do
-        resolve ->(obj, _args, _ctx) { UserGroupPresenter.new(obj).deleted? }
+        resolve ->(group, _args, _ctx) { group.presenter.deleted? }
       end
 
       field :badge, !types.String, "A badge for the user group" do
-        resolve ->(obj, _args, _ctx) { UserGroupPresenter.new(obj).badge }
+        resolve ->(group, _args, _ctx) { group.presenter.badge }
+      end
+
+      field :members, !types[UserType], "Members of this group" do
+        resolve ->(group, _args, _ctx) { group.accepted_users }
+      end
+
+      field :membersCount, !types.Int, "Number of members in this group" do
+        resolve ->(group, _args, _ctx) { group.accepted_memberships.count }
       end
     end
   end

data/app/types/decidim/core/user_type.rb

@@ -11,30 +11,41 @@ module Decidim
         -> { Decidim::Core::AuthorInterface }
       ]
 
+      field :id, !types.ID, "The user's id"
+
       field :name, !types.String, "The user's name"
 
       field :nickname, !types.String, "The user's nickname" do
-        resolve ->(obj, _args, _ctx) { UserPresenter.new(obj).nickname }
+        resolve ->(user, _args, _ctx) { user.presenter.nickname }
       end
 
       field :avatarUrl, !types.String, "The user's avatar url" do
-        resolve ->(obj, _args, _ctx) { UserPresenter.new(obj).avatar_url(:thumb) }
+        resolve ->(user, _args, _ctx) { user.presenter.avatar_url(:thumb) }
       end
 
       field :profilePath, !types.String, "The user's profile url" do
-        resolve ->(obj, _args, _ctx) { UserPresenter.new(obj).profile_path }
+        resolve ->(user, _args, _ctx) { user.presenter.profile_path }
+      end
+
+      field :directMessagesEnabled, !types.String, "If the user making the request is logged in,
+       it will return whether this recipient accepts a conversation or not. It will return false for non-logged requests." do
+        resolve ->(user, _args, ctx) { user.presenter.direct_messages_enabled?(ctx.to_h) }
       end
 
       field :organizationName, !types.String, "The user's organization name" do
-        resolve ->(obj, _args, _ctx) { obj.organization.name }
+        resolve ->(user, _args, _ctx) { user.organization.name }
       end
 
       field :deleted, !types.Boolean, "Whether the user's account has been deleted or not" do
-        resolve ->(obj, _args, _ctx) { UserPresenter.new(obj).deleted? }
+        resolve ->(user, _args, _ctx) { user.presenter.deleted? }
       end
 
       field :badge, !types.String, "A badge for the user group" do
-        resolve ->(obj, _args, _ctx) { UserPresenter.new(obj).badge }
+        resolve ->(user, _args, _ctx) { user.presenter.badge }
+      end
+
+      field :groups, !types[UserGroupType], "Groups where this user belongs" do
+        resolve ->(user, _args, _ctx) { user.accepted_user_groups }
       end
     end
   end

data/app/uploaders/decidim/attachment_uploader.rb

@@ -19,7 +19,7 @@ module Decidim
 
     protected
 
-    def extension_white_list
+    def extension_whitelist
       %w(jpg jpeg gif png bmp pdf doc docx xls xlsx ppt ppx rtf txt odt ott odf otg ods ots)
     end
 

data/app/uploaders/decidim/avatar_uploader.rb

@@ -20,5 +20,9 @@ module Decidim
     def default_url(*)
       ActionController::Base.helpers.asset_path("decidim/default-avatar.svg")
     end
+
+    def default_multiuser_url(*)
+      ActionController::Base.helpers.asset_path("decidim/avatar-multiuser.png")
+    end
   end
 end

data/app/uploaders/decidim/image_uploader.rb

@@ -11,9 +11,7 @@ module Decidim
     # CarrierWave automatically calls this method and validates the content
     # type fo the temp file to match against any of these options.
     def content_type_whitelist
-      [
-        %r{image\/}
-      ]
+      extension_whitelist.map { |ext| "image/#{ext}" }
     end
 
     # Strips out all embedded information from the image
@@ -24,9 +22,28 @@ module Decidim
       end
     end
 
+    # Fetches info about different versions, their processors and dimensions
+    def dimensions_info
+      if versions.any?
+        versions.map do |version, info|
+          [
+            version,
+            {
+              processor: info.processors[0][0],
+              dimensions: info.processors[0][1]
+            }
+          ]
+        end.to_h
+      else
+        processors.map do |info|
+          [:default, { processor: info[0], dimensions: info[1] }]
+        end.to_h
+      end
+    end
+
     # Add a white list of extensions which are allowed to be uploaded.
     # For images you might use something like this:
-    def extension_white_list
+    def extension_whitelist
       %w(jpg jpeg gif png bmp ico)
     end
 
@@ -52,6 +69,13 @@ module Decidim
       3840
     end
 
+    def manipulate!
+      super
+    rescue CarrierWave::ProcessingError => e
+      Rails.logger.error(e)
+      raise CarrierWave::ProcessingError, I18n.t("carrierwave.errors.general")
+    end
+
     private
 
     def validation_error!(text)

data/app/uploaders/decidim/newsletter_template_image_uploader.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Decidim
+  # This class deals with uploading images to newsletters.
+  class NewsletterTemplateImageUploader < ImageUploader
+    process resize_to_fit: [550, 300]
+
+    def max_image_height_or_width
+      8000
+    end
+
+    # Overwrite: If the content block is in preview mode, then we show the
+    # preview image. Otherwise, we use the default behavior.
+    def url(*args)
+      return preview_url if in_preview?
+
+      super
+    end
+
+    def preview_url(*_args)
+      manifest_images = model.content_block.manifest.images
+      image = manifest_images.find { |manifest_image| manifest_image[:name] == mounted_as } || {}
+      preview = image[:preview]
+
+      if preview && preview.respond_to?(:call)
+        preview.call
+      else
+        preview
+      end
+    end
+
+    def in_preview?
+      model.content_block.in_preview
+    end
+  end
+end

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

@@ -1,20 +1,23 @@
+<% add_decidim_page_title(t("delete_my_account", scope: "layouts.decidim.user_profile")) %>
+<% content_for(:subtitle) { t("delete_my_account", scope: "layouts.decidim.user_profile") } %>
+
 <div class="row">
   <div class="columns large-8 end">
     <div class="callout alert">
       <p><%= t(".alert") %></p>
     </div>
     <p><%= t(".explanation") %></p>
-    <%= decidim_form_for(@form, url: account_path, method: :delete, html: { class: "user-form delete-account" }) do |f| %>
+    <%= decidim_form_for(@form, url: account_path, method: :delete, namespace: "delete_user", html: { class: "user-form delete-account" }) do |f| %>
       <div>
         <label>
           <span class="user-form__label"><%= t("activemodel.attributes.account.delete_reason") %></span>
           <%= f.text_area :delete_reason, rows: 2, label: false %>
         </label>
       </div>
-      <input type="submit" class="button open-modal-button" value="<%= t(".confirm.title") %>">
+      <button class="button open-modal-button"><%= t(".confirm.title") %></button>
     <% end %>
     <div class="tiny reveal" id="deleteConfirm" data-reveal>
-      <%= decidim_form_for(@form, url: account_path, method: :delete, html: { class: "user-form delete-account-modal" }) do |f| %>
+      <%= decidim_form_for(@form, url: account_path, method: :delete, namespace: "delete_user_confirm", html: { class: "user-form delete-account-modal" }) do |f| %>
         <%= f.hidden_field :delete_reason %>
 
         <p><%= t(".confirm.question") %></p>

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

@@ -1,11 +1,16 @@
+<% add_decidim_page_title(t("profile", scope: "layouts.decidim.user_menu")) %>
+<% content_for(:subtitle) { t("profile", scope: "layouts.decidim.user_menu") } %>
+
 <div class="row">
-  <%= decidim_form_for(@account, url: account_path, method: :put, html: { autocomplete: "nope" }) do |f| %>
+  <%= decidim_form_for(@account, url: account_path, method: :put, html: { autocomplete: "off" }) do |f| %>
     <input autocomplete="off" name="hidden" type="password" style="display:none;">
     <div class="columns large-4">
       <%= f.upload :avatar %>
     </div>
 
     <div class="columns large-8 end">
+      <%= form_required_explanation %>
+
       <%= f.text_field :name %>
       <%= f.text_field :nickname %>
       <%= f.email_field :email %>
@@ -15,15 +20,17 @@
       <% if @account.errors[:password].any? || @account.errors[:password_confirmation].any? %>
         <%= render partial: "password_fields", locals: { form: f } %>
       <% else %>
-        <p>
-          <a data-toggle="passwordChange" class="change-password"><%= t ".change_password" %></a>
-        </p>
-        <div id="passwordChange" class="toggle-show" data-toggler=".is-expanded">
-          <%= render partial: "password_fields", locals: { form: f } %>
-        </div>
+        <% if current_organization.sign_in_enabled? %>
+          <p>
+            <a data-toggle="passwordChange" class="change-password"><%= t ".change_password" %></a>
+          </p>
+          <div id="passwordChange" class="toggle-show" data-toggler=".is-expanded">
+            <%= render partial: "password_fields", locals: { form: f } %>
+          </div>
+        <% end %>
       <% end %>
 
-      <%= f.submit t(".update_account"), disable_with: true %>
-    <% end %>
-  </div>
+      <%= f.submit t(".update_account") %>
+    </div>
+  <% end %>
 </div>

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

@@ -1,4 +1,6 @@
 <%= form.fields_for :emendation_params, form.object.emendation_params do |emendation_form| %>
+  <%= form_required_explanation %>
+
   <% amendable.attributes.each do |key, value| %>
     <% key = key.to_sym %>
     <% if amendable.amendable_fields.include?(key) %>

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

@@ -1,5 +1,5 @@
-<main class="column">
-  <article class="card card--proposal">
+<div class="column">
+  <div class="card card--proposal">
     <div class="card__content">
       <div class="card__header">
         <%= link_to Decidim::ResourceLocatorPresenter.new(emendation).path, target: "_blank" do %>
@@ -20,5 +20,5 @@
 
       <%= cell "decidim/tags", emendation, context: { extra_classes: ["tags--proposal"] } %>
     </div>
-  </article>
-</main>
+  </div>
+</div>

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

@@ -1,4 +1,4 @@
-<main class="wrapper">
+<div class="wrapper">
   <div class="row">
     <%= cell("decidim/amendable/wizard_step_form", amendable, view: :wizard_aside ) %>
 
@@ -18,4 +18,4 @@
 
     <div class="columns large-3"></div>
   </div>
-</main>
+</div>

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

@@ -1,4 +1,4 @@
-<main class="wrapper">
+<div class="wrapper">
   <div class="row">
     <%= cell("decidim/amendable/wizard_step_form", amendable, view: :wizard_aside ) %>
 
@@ -28,4 +28,4 @@
 
     <div class="columns large-3"></div>
   </div>
-</main>
+</div>

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

@@ -1,4 +1,4 @@
-<main class="wrapper">
+<div class="wrapper">
   <div class="row">
     <%= cell("decidim/amendable/wizard_step_form", amendable, view: :wizard_aside ) %>
 
@@ -28,4 +28,4 @@
 
     <div class="columns large-3"></div>
   </div>
-</main>
+</div>

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

@@ -1,4 +1,4 @@
-<main class="wrapper">
+<div class="wrapper">
   <div class="row">
     <%= cell("decidim/amendable/wizard_step_form", amendable, view: :wizard_aside) %>
 
@@ -29,4 +29,4 @@
 
     <div class="columns large-3"></div>
   </div>
-</main>
+</div>

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

@@ -1,9 +1,9 @@
-<main class="wrapper">
+<div class="wrapper">
   <div class="row">
     <div class="columns">
       <div class="m-bottom">
         <%= link_to :back do %>
-          <%= icon "chevron-left", class: "icon--small" %>
+          <%= icon "chevron-left", class: "icon--small", role: "img", "aria-hidden": true %>
           <%= t(".back") %>
         <% end %>
       </div>
@@ -38,4 +38,4 @@
       </div>
     </div>
   </div>
-</main>
+</div>

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

@@ -1,9 +1,9 @@
 <% unless attachment_collection.unused? %>
   <div class="docs__container">
-    <h6 data-toggle="docs-collection-<%= attachment_collection.id %>"><%= icon "caret-right", class: "icon--small" %>&nbsp
+    <span data-toggle="docs-collection-<%= attachment_collection.id %>"><%= icon "caret-right", class: "icon--small", role: "img", "aria-hidden": true %>&nbsp;
       <strong><%= translated_attribute(attachment_collection.name) %></strong>
       <small>(<%= attachment_collection.attachments.count %> <%= t(".documents", count: attachment_collection.attachments.count) %>)</small>
-    </h6>
+    </span>
     <div id="docs-collection-<%= attachment_collection.id %>" class="docs__content hide" data-toggler=".hide">
       <p><%= translated_attribute(attachment_collection.description) %></p>
       <div class="card card--list">

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

@@ -2,9 +2,9 @@
   <div class="card--list__text">
     <div>
       <a href="<%= document.url %>" class="card__link">
-        <h6 class="card--list__heading heading6">
+        <h4 class="card--list__heading heading6">
           <%= attachment_title(document) %> <small><%= document.file_type %> <%= number_to_human_size(document.file_size) %></small>
-        </h6>
+        </h4>
         <% if document.description.present? %>
             <span class="text-small"><%= translated_attribute(document.description) %></span>
         <% end %>
@@ -12,8 +12,8 @@
     </div>
   </div>
   <div class="card--list__data">
-    <%= link_to document.url, target: "_blank", rel: "noopener", class: "card--list__data__icon" do %>
-        <%= icon "cloud-download" %>
+    <%= link_to document.url, target: "_blank", rel: "noopener", class: "card--list__data__icon", title: t(".download") do %>
+        <%= icon "cloud-download", role: "img", aria_label: t(".download") %>
     <% end %>
   </div>
 </div>

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

@@ -1,6 +1,6 @@
 <% if documents.any? %>
   <div class="section documents">
-    <h4 class="section-heading"><%= t(".related_documents") %></h4>
+    <h3 class="section-heading"><%= t(".related_documents") %></h3>
     <% if (documents_without_collection = documents.reject(&:attachment_collection_id?)).any? %>
       <div class="card card--list">
         <%= render partial: "document", collection: documents_without_collection %>

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

@@ -1,6 +1,6 @@
 <% if photos.any? %>
   <div class="section images">
-    <h4 class="section-heading"><%= t(".related_photos") %></h4>
+    <h3 class="section-heading"><%= t(".related_photos") %></h3>
     <div class="gallery row">
       <% photos.in_groups_of(3, false).each do |group| %>
         <% group.each_with_index do |photo, index| %>

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

@@ -1,4 +1,4 @@
-<button class="close-button" data-close aria-label="Close modal" type="button">
+<button class="close-button" data-close aria-label="<%= t ".close_modal" %>" type="button">
   <span aria-hidden="true">&times;</span>
 </button>