decidim-core 0.10.1 → 0.11.0.pre1

data/app/presenters/decidim/log/value_types/area_type_presenter.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Log
+    module ValueTypes
+      # This class presents the given value as a Decidim::AreaType. Check
+      # the `DefaultPresenter` for more info on how value
+      # presenters work.
+      class AreaTypePresenter < DefaultPresenter
+        # Public: Presents the value as an AreaType. If the area type can
+        # be found, it shows its title. Otherwise it shows its ID.
+        #
+        # Returns an HTML-safe String.
+        def present
+          return unless value
+          return h.translated_attribute(area_type.name) if area_type
+          I18n.t("not_found", id: value, scope: "decidim.log.value_types.area_type_presenter")
+        end
+
+        private
+
+        def area_type
+          @area_type ||= Decidim::AreaType.find_by(id: value)
+        end
+      end
+    end
+  end
+end

data/app/presenters/decidim/log/value_types/currency_presenter.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Log
+    module ValueTypes
+      # This class presents the given value as a currency. Check
+      # the `DefaultPresenter` for more info on how value
+      # presenters work.
+      class CurrencyPresenter < DefaultPresenter
+        # Public: Presents the value as a currency.
+        #
+        # Returns an HTML-safe String.
+        def present
+          return unless value
+          h.number_to_currency(value, unit: Decidim.currency_unit)
+        end
+      end
+    end
+  end
+end

data/app/presenters/decidim/log/value_types/scope_presenter.rb

@@ -20,7 +20,7 @@ module Decidim
         private
 
         def scope
-          @scope ||= Decidim::Scope.where(id: value).first
+          @scope ||= Decidim::Scope.find_by(id: value)
         end
       end
     end

data/app/presenters/decidim/log/value_types/scope_type_presenter.rb

@@ -20,7 +20,7 @@ module Decidim
         private
 
         def scope_type
-          @scope_type ||= Decidim::ScopeType.where(id: value).first
+          @scope_type ||= Decidim::ScopeType.find_by(id: value)
         end
       end
     end

data/app/presenters/decidim/resource_locator_presenter.rb

@@ -59,8 +59,8 @@ module Decidim
         resource.class.try(:participatory_space_manifest)
     end
 
-    def feature
-      resource.feature if resource.respond_to?(:feature)
+    def component
+      resource.component if resource.respond_to?(:component)
     end
 
     def member_route_name
@@ -72,7 +72,7 @@ module Decidim
     end
 
     def route_proxy
-      @route_proxy ||= EngineRouter.main_proxy(feature || resource)
+      @route_proxy ||= EngineRouter.main_proxy(component || resource)
     end
   end
 end

data/app/services/decidim/action_authorizer.rb

@@ -2,30 +2,30 @@
 
 module Decidim
   # This class is used to authorize a user against an action in the context of a
-  # feature.
+  # component.
   class ActionAuthorizer
     #
     # Initializes the ActionAuthorizer.
     #
     # user    - The user to authorize against.
-    # feature - The feature to authenticate against.
+    # component - The component to authenticate against.
     # action  - The action to authenticate.
     #
-    def initialize(user, feature, action)
+    def initialize(user, component, action)
       @user = user
-      @feature = feature
+      @component = component
       @action = action.to_s if action
     end
 
     #
-    # Authorize user to perform an action in the context of a feature.
+    # Authorize user to perform an action in the context of a component.
     #
     # Returns:
     #   :ok an empty hash                      - When there is no authorization handler related to the action.
     #   result of authorization handler check  - When there is an authorization handler related to the action. Check Decidim::Verifications::DefaultActionAuthorizer class docs.
     #
     def authorize
-      raise AuthorizationError, "Missing data" unless feature && action
+      raise AuthorizationError, "Missing data" unless component && action
 
       status_code, data = if authorization_handler_name
                             authorization_handler.authorize(authorization, permission_options)
@@ -38,7 +38,7 @@ module Decidim
 
     private
 
-    attr_reader :user, :feature, :action
+    attr_reader :user, :component, :action
 
     def authorization
       return nil unless user && authorization_handler_name
@@ -61,9 +61,9 @@ module Decidim
     end
 
     def permission
-      return nil unless feature && action
+      return nil unless component && action
 
-      @permission ||= feature.permissions&.fetch(action, nil)
+      @permission ||= component.permissions&.fetch(action, nil)
     end
 
     class AuthorizationStatus

data/app/services/decidim/action_logger.rb

@@ -48,8 +48,10 @@ module Decidim
         organization: organization,
         action: action,
         resource: resource,
+        resource_id: resource.id,
+        resource_type: resource.class.name,
         participatory_space: participatory_space,
-        feature: feature,
+        component: component,
         version_id: version_id,
         extra: extra_data
       )
@@ -63,12 +65,12 @@ module Decidim
       user.organization
     end
 
-    def feature
-      resource.feature if resource.respond_to?(:feature)
+    def component
+      resource.component if resource.respond_to?(:component)
     end
 
     def participatory_space
-      return feature.participatory_space if feature.respond_to?(:participatory_space)
+      return component.participatory_space if component.respond_to?(:participatory_space)
       resource.participatory_space if resource.respond_to?(:participatory_space)
     end
 
@@ -86,9 +88,9 @@ module Decidim
     # Returns a Hash.
     def extra_data
       {
-        feature: {
-          manifest_name: feature.try(:manifest_name),
-          title: title_for(feature)
+        component: {
+          manifest_name: component.try(:manifest_name),
+          title: title_for(component)
         }.compact,
         participatory_space: {
           manifest_name: participatory_space_manifest_name,

data/app/services/decidim/email_notification_generator.rb

@@ -45,7 +45,7 @@ module Decidim
     #
     # Returns nothing.
     def send_email_to(recipient_id)
-      recipient = Decidim::User.where(id: recipient_id).first
+      recipient = Decidim::User.find_by(id: recipient_id)
       return unless recipient
       return unless recipient.email_on_notification?
 

data/app/services/decidim/notification_generator_for_recipient.rb

@@ -49,7 +49,7 @@ module Decidim
     attr_reader :event, :event_class, :resource, :recipient_id, :extra
 
     def recipient
-      @recipient ||= User.where(id: recipient_id).first
+      @recipient ||= User.find_by(id: recipient_id)
     end
   end
 end

data/app/services/decidim/resource_search.rb

@@ -16,12 +16,12 @@ module Decidim
     end
 
     # Creates the SearchLight base query.
-    # Check if the option feature was provided.
+    # Check if the option component was provided.
     def base_query
       # raise order_start_time.inspect
-      raise "Missing feature" unless feature
+      raise "Missing component" unless component
 
-      @scope.where(feature: feature)
+      @scope.where(component: component)
     end
 
     # Handle the category_id filter
@@ -57,17 +57,17 @@ module Decidim
     # Private: Creates an array of category ids.
     # It contains categories' subcategories ids as well.
     def category_ids
-      feature
+      component
         .categories
         .where(id: category_id)
-        .or(feature.categories.where(parent_id: category_id))
+        .or(component.categories.where(parent_id: category_id))
         .pluck(:id)
     end
 
-    # Private: Since feature is not used by a search method we need
+    # Private: Since component is not used by a search method we need
     # to define the method manually.
-    def feature
-      options[:feature]
+    def component
+      options[:component]
     end
   end
 end

data/app/services/decidim/settings_change.rb

@@ -1,18 +1,18 @@
 # frozen_string_literal: true
 
 module Decidim
-  # This is a helper class in order to publish feature and settings changes
+  # This is a helper class in order to publish component and settings changes
   # so that components can react to these changes and send notifications to users.
   class SettingsChange
     # Publishes a change to ActiveSupport::Notifications.
     #
-    # feature - The Decidim::Feature where the changes have been applied.
+    # component - The Decidim::Component where the changes have been applied.
     # previous_settings - A Hash or a Decidim::SettingsManifest schema with the settings before changing them.
     # current_settings - A Hash or a Decidim::SettingsManifest schema with the current settings.
-    def self.publish(feature, previous_settings, current_settings)
+    def self.publish(component, previous_settings, current_settings)
       ActiveSupport::Notifications.publish(
-        "decidim.settings_change.#{feature.manifest_name}",
-        feature_id: feature.id,
+        "decidim.settings_change.#{component.manifest_name}",
+        component_id: component.id,
         previous_settings: previous_settings.to_h.deep_symbolize_keys,
         current_settings: current_settings.to_h.deep_symbolize_keys
       )

data/app/services/decidim/static_map_generator.rb

@@ -42,7 +42,7 @@ module Decidim
     end
 
     def organization
-      @organization ||= @resource.feature.organization
+      @organization ||= @resource.component.organization
     end
   end
 end

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

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Core
+    AttachmentType = GraphQL::ObjectType.define do
+      name "Attachment"
+      description "A file attachment"
+
+      field :url, !types.String, "The url of this attachment"
+      field :type, !types.String, "The type of this attachment", property: :file_type
+      field :thumbnail, types.String, "A thumbnail of this attachment, if it's an image.", property: :thumbnail_url
+    end
+  end
+end

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

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Core
+    CategoryType = GraphQL::ObjectType.define do
+      name "Category"
+      description "A category that can be applied to other resources."
+
+      field :id, !types.ID
+      field :name, !TranslatedFieldType, "The name of this category."
+
+      field :subcategories, !types[Decidim::Core::CategoryType], "Subcategories of this category."
+      field :parent, Decidim::Core::CategoryType, "This category's parent category."
+    end
+  end
+end

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

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Core
+    # This type represents a Decidim's global property.
+    CoordinatesType = GraphQL::ObjectType.define do
+      name "Coordinates"
+      description "Physical coordinates for a location"
+
+      field :latitude, !types.Float, "Latitude of this coordinate" do
+        resolve ->(coordinates, _args, _ctx) { coordinates[0] }
+      end
+
+      field :longitude, !types.Float, "Longitude of this coordinate" do
+        resolve ->(coordinates, _args, _ctx) { coordinates[1] }
+      end
+    end
+  end
+end

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

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Core
+    ScopeApiType = GraphQL::ObjectType.define do
+      name "Scope"
+      description "A scope"
+
+      field :id, !types.ID
+      field :name, !TranslatedFieldType, "The name of this scope."
+
+      field :children, !types[Decidim::Core::ScopeApiType], "Descendants of this scope"
+      field :parent, Decidim::Core::ScopeApiType, "This scope's parent scope."
+    end
+  end
+end

data/app/uploaders/decidim/oauth_application_logo_uploader.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Decidim
+  # This class deals with uploading hero images to ParticipatoryProcesses.
+  class OAuthApplicationLogoUploader < ImageUploader
+    include CarrierWave::MiniMagick
+    process resize_to_fit: [75, 75]
+  end
+end

data/app/validators/geocoding_validator.rb

@@ -4,8 +4,8 @@
 # an existing address and computes its coordinates.
 class GeocodingValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
-    if Decidim.geocoder.present? && record.feature.present?
-      organization = record.feature.organization
+    if Decidim.geocoder.present? && record.component.present?
+      organization = record.component.organization
       Geocoder.configure(Geocoder.config.merge(http_headers: { "Referer" => organization.host }))
       coordinates = Geocoder.coordinates(value)
 

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

@@ -1,27 +1,27 @@
 <div class="row">
   <div class="columns large-8 end">
     <div class="callout alert">
-      <p><%= t('.alert') %></p>
+      <p><%= t(".alert") %></p>
     </div>
-    <p><%= t('.explanation') %></p>
+    <p><%= t(".explanation") %></p>
     <%= decidim_form_for(@form, url: account_path, method: :delete, html: { class: "user-form delete-account" }) do |f| %>
       <div>
         <label>
-          <span class="user-form__label"><%= t('activemodel.attributes.account.delete_reason') %></span>
+          <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') %>" />
+      <input type="submit" class="button open-modal-button" value="<%= t(".confirm.title") %>" />
     <% 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| %>
         <%= f.hidden_field :delete_reason %>
 
-        <p><%= t('.confirm.question') %></p>
+        <p><%= t(".confirm.question") %></p>
 
-        <input type="submit" class="button expanded" value="<%= t('.confirm.ok') %>" />
+        <input type="submit" class="button expanded" value="<%= t(".confirm.ok") %>" />
 
-        <button class="close-button" data-close aria-label="<%= t('.confirm.close') %>" type="button">
+        <button class="close-button" data-close aria-label="<%= t(".confirm.close") %>" type="button">
           <span aria-hidden="true">&times;</span>
         </button>
       <% end %>

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

@@ -5,7 +5,7 @@
       <small>(<%= attachment_collection.attachments.count %> <%= t(".documents", count: attachment_collection.attachments.count) %>)</small>
     </h6>
     <div id="docs-collection-<%= attachment_collection.id %>" class="docs__content hide" data-toggler=".hide">
-      <p><%= translated_attribute(attachment_collection.description)  %></p>
+      <p><%= translated_attribute(attachment_collection.description) %></p>
       <div class="card card--list">
         <%= render partial: "document", collection: documents %>
       </div>

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

@@ -12,7 +12,7 @@
     </div>
   </div>
   <div class="card--list__data">
-    <%= link_to document.url, class: "card--list__data__icon" do %>
+    <%= link_to document.url, target: "_blank", class: "card--list__data__icon" do %>
         <%= icon "cloud-download" %>
     <% end %>
   </div>

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

@@ -5,7 +5,7 @@
       <% photos.in_groups_of(3, false).each do |group| %>
         <% group.each_with_index do |photo, index| %>
           <div class="columns small-6 medium-4 <%= (index == 2 || photo == group.last ? "end" : "") %>">
-            <%= link_to photo.big_url do %>
+            <%= link_to photo.big_url, target: "_blank" do %>
               <%= image_tag photo.thumbnail_url, class:"thumbnail", alt: strip_tags(translated_attribute(photo.description)) %>
             <% end %>
           </div>

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

@@ -13,7 +13,7 @@
           <%= decidim_form_for resource, as: resource_name, url: invitation_path(resource_name, invite_redirect: params[:invite_redirect]), html: { method: :put, class: "register-form new_user" } do |f| %>
             <%= f.hidden_field :invitation_token %>
 
-            <%= f.text_field :nickname, help_text: t("devise.invitations.edit.nickname_help") %>
+            <%= f.text_field :nickname, help_text: t("devise.invitations.edit.nickname_help", organization: current_organization.name) %>
 
             <% if f.object.class.require_password_on_accepting %>
               <%= f.password_field :password %></p>

data/app/views/decidim/devise/omniauth_registrations/new.html.erb

@@ -22,7 +22,7 @@
 
             <div class="user-person">
               <div class="field">
-                <%= f.text_field :nickname, help_text: t(".nickname_help") %>
+                <%= f.text_field :nickname, help_text: t(".nickname_help", organization: current_organization.name) %>
               </div>
             </div>
 

data/app/views/decidim/devise/registrations/new.html.erb

@@ -35,7 +35,7 @@
 
             <div class="user-person">
               <div class="field">
-                <%= f.text_field :nickname, help_text: t(".nickname_help") %>
+                <%= f.text_field :nickname, help_text: t(".nickname_help", organization: current_organization.name) %>
               </div>
             </div>
 

data/app/views/decidim/devise/sessions/new.html.erb

@@ -6,7 +6,7 @@
       <div class="columns large-8 large-centered text-center page-title">
         <h1 class="heading1"><%= t("devise.sessions.new.sign_in") %></h1>
         <p>
-          <%= t('.are_you_new?') %>
+          <%= t(".are_you_new?") %>
           <%= link_to t(".register"), new_user_registration_path %>
         </p>
       </div>
@@ -18,7 +18,7 @@
             <%= decidim_form_for(resource, as: resource_name, url: session_path(resource_name), html: { class: "register-form new_user" }) do |f| %>
               <div>
                 <div class="field">
-                  <%= f.email_field :email, autofocus: true  %>
+                  <%= f.email_field :email, autofocus: true %>
                 </div>
                 <div class="field">
                   <%= f.password_field :password, autocomplete: "off" %>

data/app/views/decidim/devise/shared/_omniauth_buttons.html.erb

@@ -2,7 +2,7 @@
   <div class="row">
     <div class="columns large-4 mediumlarge-6 medium-8 medium-centered">
       <span class="register__separator">
-        <span class="register__separator__text"><%= t('.or') %></span>
+        <span class="register__separator__text"><%= t(".or") %></span>
       </span>
       <%- resource_class.omniauth_providers.each do |provider| %>
         <% if social_provider_enabled? provider %>

data/app/views/decidim/devise/shared/_omniauth_buttons_mini.html.erb

@@ -2,7 +2,7 @@
   <div class="row">
     <div class="columns medium-8 medium-centered">
       <span class="register__separator">
-        <span class="register__separator__text"><%= t('or', scope: "decidim.devise.shared.omniauth_buttons") %></span>
+        <span class="register__separator__text"><%= t("or", scope: "decidim.devise.shared.omniauth_buttons") %></span>
       </span>
       <div class="text-center">
         <%- Decidim::User.omniauth_providers.each do |provider| %>

data/app/views/decidim/doorkeeper/authorizations/new.html.erb

@@ -0,0 +1,58 @@
+<main class="wrapper">
+  <div class="row collapse">
+    <div class="row">
+      <div class="columns large-8 medium-centered">
+        <div class="card">
+          <div class="card__content">
+            <div class="row">
+              <div class="columns medium-2 text-center">
+                <img src="<%= oauth_application.organization_logo.url %>" alt="<%= oauth_application.organization_name %>" width="75" height="75" />
+              </div>
+              <div class="columns medium-10">
+                <h3 class="heading3"><%= t(".wants_to_use_your_account_html", application_name: oauth_application.name) %>
+                  <br />
+                  <%= t(".by_organization_link_html", link: link_to(oauth_application.organization_name, oauth_application.organization_url)) %>
+                </h3>
+                <br />
+                <p class="lead"><%= t(".connect_your_account_html", organization: current_organization.name) %></p>
+                <div>
+                  <p><strong><%= t(".this_application_will_be_able_to") %></strong></p>
+                  <ul>
+                    <li><%= t(".see_name") %></li>
+                    <li><%= t(".see_username") %></li>
+                    <li><%= t(".see_email") %></li>
+                  </ul>
+                </div>
+                <div>
+                  <p><strong class="primary"><%= t(".this_application_will_not_be_able_to") %></strong></p>
+                  <ul>
+                    <li><%= t(".update_profile") %></li>
+                    <li><%= t(".publish_content") %></li>
+                  </ul>
+                </div>
+                <div class="row">
+                  <%= form_tag oauth_authorization_path, method: :post, class: "column medium-5 small-7 medium-5" do %>
+                    <%= hidden_field_tag :client_id, @pre_auth.client.uid %>
+                    <%= hidden_field_tag :redirect_uri, @pre_auth.redirect_uri %>
+                    <%= hidden_field_tag :state, @pre_auth.state %>
+                    <%= hidden_field_tag :response_type, @pre_auth.response_type %>
+                    <%= hidden_field_tag :scope, @pre_auth.scope %>
+                    <button class="column button button--nomargin secondary light" type="submit" name="authorize"><%= t(".authorize") %></button>
+                  <% end %>
+                  <%= form_tag oauth_authorization_path, method: :delete, class: "column small-4 medium-3 small-push-1 end" do %>
+                    <%= hidden_field_tag :client_id, @pre_auth.client.uid %>
+                    <%= hidden_field_tag :redirect_uri, @pre_auth.redirect_uri %>
+                    <%= hidden_field_tag :state, @pre_auth.state %>
+                    <%= hidden_field_tag :response_type, @pre_auth.response_type %>
+                    <%= hidden_field_tag :scope, @pre_auth.scope %>
+                    <button class="column button button--nomargin" type="submit" name="cancel"><%= t(".cancel") %></button>
+                  <% end %>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</main>

data/app/views/decidim/messaging/conversations/_show.html.erb

@@ -1,7 +1,7 @@
 <main class="wrapper">
   <div class="row">
     <div class="columns">
-      <div class="title-action" >
+      <div class="title-action">
         <h1 class="heading1 title-action__title">
           <%= link_to decidim.conversations_path, class: "card--list__data__icon card--list__data__icon--back" do %>
             <%= icon "chevron-left" %>

data/app/views/decidim/messaging/conversations/index.html.erb

@@ -1,7 +1,7 @@
 <main class="wrapper">
   <div class="row">
     <div class="columns">
-      <div class="title-action" >
+      <div class="title-action">
         <h1 class="heading1 title-action__title">
           <%= t(".title") %>
         </h1>

data/app/views/decidim/notifications/index.html.erb

@@ -1,7 +1,7 @@
 <main class="wrapper" id="notifications">
   <div class="row">
     <div class="columns">
-      <div class="title-action" >
+      <div class="title-action">
         <h1 class="heading1 title-action__title"><%= t("title", scope: "layouts.decidim.notifications_dashboard") %></h1>
         <% if notifications.any? %>
           <%= link_to(

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

@@ -4,14 +4,14 @@
       <label>
         <%= f.check_box :email_on_notification, label: false, class: "switch-input" %>
         <span class="switch-paddle"></span>
-        <span class="switch-label"><%= t('.email_on_notification') %></span>
+        <span class="switch-label"><%= t(".email_on_notification") %></span>
       </label>
     </div>
     <div class="switch tiny switch-with-label newsletter_notifications">
       <label>
         <%= f.check_box :newsletter_notifications, label: false, class: "switch-input" %>
         <span class="switch-paddle"></span>
-        <span class="switch-label"><%= t('.newsletter_notifications') %></span>
+        <span class="switch-label"><%= t(".newsletter_notifications") %></span>
       </label>
     </div>
     <%= f.submit t(".update_notifications_settings"), disable_with: true %>

data/app/views/decidim/own_user_groups/index.html.erb

@@ -10,13 +10,13 @@
               </h5>
               <span class="text-small"><%= l(user_group.created_at, format: :long) %></span>
               <% if user_group.verified? %>
-                <span class="success label"><%= t('.verified') %></span>
+                <span class="success label"><%= t(".verified") %></span>
               <% end %>
               <% if user_group.rejected? %>
-                <span class="alert label"><%= t('.rejected') %></span>
+                <span class="alert label"><%= t(".rejected") %></span>
               <% end %>
               <% if user_group.pending? %>
-                <span class="warning label"><%= t('.pending') %></span>
+                <span class="warning label"><%= t(".pending") %></span>
               <% end %>
             </div>
           </div>