decidim-core 0.10.1 → 0.11.0.pre1

data/app/helpers/decidim/icon_helper.rb

@@ -3,15 +3,15 @@
 module Decidim
   # Helpers related to icons
   module IconHelper
-    # Public: Returns an icon given an instance of a Feature. It defaults to
+    # Public: Returns an icon given an instance of a Component. It defaults to
     # a question mark when no icon is found.
     #
-    # feature - The feature to generate the icon for.
+    # component - The component to generate the icon for.
     # options - a Hash with options
     #
     # Returns an HTML tag with the icon.
-    def feature_icon(feature, options = {})
-      manifest_icon(feature.manifest, options)
+    def component_icon(component, options = {})
+      manifest_icon(component.manifest, options)
     end
 
     # Public: Returns an icon given an instance of a Manifest. It defaults to
@@ -30,7 +30,7 @@ module Decidim
     end
 
     # Public: Finds the correct icon for the given resource. If the resource has a
-    # Feature then it uses it to find the icon, otherwise checks for the resource
+    # Component then it uses it to find the icon, otherwise checks for the resource
     # manifest to find the icon.
     #
     # resource - The resource to generate the icon for.
@@ -38,8 +38,8 @@ module Decidim
     #
     # Returns an HTML tag with the icon.
     def resource_icon(resource, options = {})
-      if resource.respond_to?(:feature)
-        feature_icon(resource.feature, options)
+      if resource.respond_to?(:component)
+        component_icon(resource.component, options)
       elsif resource.respond_to?(:manifest)
         manifest_icon(resource.manifest, options)
       elsif resource.is_a?(Decidim::User)

data/app/helpers/decidim/messaging/conversation_helper.rb

@@ -28,14 +28,15 @@ module Decidim
       # @return [String] The resulting route
       #
       def current_or_new_conversation_path_with(user)
-        return decidim.new_user_session_path unless user_signed_in?
+        decidim_routes = Decidim::Core::Engine.routes.url_helpers
+        return decidim_routes.new_user_session_path unless user_signed_in?
 
         conversation = conversation_between(current_user, user)
 
         if conversation
-          decidim.conversation_path(conversation)
+          decidim_routes.conversation_path(conversation)
         else
-          decidim.new_conversation_path(recipient_id: user.id)
+          decidim_routes.new_conversation_path(recipient_id: user.id)
         end
       end
 

data/app/helpers/decidim/paginate_helper.rb

@@ -13,7 +13,7 @@ module Decidim
       # and unless we remove these params they are added again as query string :(
       default_params = {
         participatory_process_id: nil,
-        feature_id: nil
+        component_id: nil
       }
 
       paginate collection, theme: "decidim", params: paginate_params.merge(default_params)

data/app/helpers/decidim/resource_helper.rb

@@ -27,7 +27,7 @@ module Decidim
       end)
     end
 
-    # Gets the classes linked to the given class for the `current_feature`, and formats
+    # Gets the classes linked to the given class for the `current_component`, and formats
     # them in a nice way so that they can be used in a form. Resulting format looks like
     # this, considering the given class is related to `Decidim::Meetings::Meeting`:
     #
@@ -44,7 +44,7 @@ module Decidim
     def linked_classes_for(klass)
       return [] unless klass.respond_to?(:linked_classes_for)
 
-      klass.linked_classes_for(current_feature).map do |k|
+      klass.linked_classes_for(current_component).map do |k|
         [k.underscore, t(k.demodulize.downcase, scope: "decidim.filters.linked_classes")]
       end
     end

data/app/jobs/decidim/export_job.rb

@@ -4,12 +4,12 @@ module Decidim
   class ExportJob < ApplicationJob
     queue_as :default
 
-    def perform(user, feature, name, format)
-      export_manifest = feature.manifest.export_manifests.find do |manifest|
+    def perform(user, component, name, format)
+      export_manifest = component.manifest.export_manifests.find do |manifest|
         manifest.name == name.to_sym
       end
 
-      collection = export_manifest.collection.call(feature)
+      collection = export_manifest.collection.call(component)
       serializer = export_manifest.serializer
 
       export_data = Decidim::Exporters.find_exporter(format).new(collection, serializer).export

data/app/mailers/decidim/messaging/conversation_mailer.rb

@@ -25,7 +25,6 @@ module Decidim
 
       private
 
-      # rubocop:disable Naming/UncommunicativeMethodParamName
       def notification_mail(from:, to:, conversation:, action:)
         with_user(to) do
           @organization = to.organization
@@ -42,7 +41,6 @@ module Decidim
 
           mail(to: to.email, subject: subject)
         end
-        # rubocop:enable Naming/UncommunicativeMethodParamName
       end
     end
   end

data/app/middleware/decidim/current_organization.rb

@@ -33,12 +33,12 @@ module Decidim
 
     def detect_current_organization(env)
       host = host_for(env)
-      Decidim::Organization.where(host: host).first
+      Decidim::Organization.find_by(host: host)
     end
 
     def find_secondary_host_org(env)
       host = host_for(env)
-      Decidim::Organization.where("? = ANY(secondary_hosts)", host).first
+      Decidim::Organization.find_by("? = ANY(secondary_hosts)", host)
     end
 
     def host_for(env)

data/app/models/decidim/abilities/admin_ability.rb

@@ -17,7 +17,7 @@ module Decidim
 
       def define_abilities
         can :read, :admin_dashboard
-        can :read, Feature
+        can :read, Component
         can :impersonate, :managed_users
       end
 

data/app/models/decidim/abilities/everyone_ability.rb

@@ -11,7 +11,7 @@ module Decidim
         can :read, :public_pages
         can :manage, :locales
 
-        can :read, Feature, &:published?
+        can :read, Component, &:published?
 
         can :search, Scope
         can :pick, Scope

data/app/models/decidim/abilities/participatory_process_admin_ability.rb

@@ -19,8 +19,8 @@ module Decidim
           can_manage_process?(process)
         end
 
-        can :read, Feature do |feature|
-          can_manage_process?(feature.participatory_space)
+        can :read, Component do |component|
+          can_manage_process?(component.participatory_space)
         end
       end
     end

data/app/models/decidim/abilities/participatory_process_collaborator_ability.rb

@@ -19,8 +19,8 @@ module Decidim
           can_manage_process?(process)
         end
 
-        can :read, Feature do |feature|
-          can_manage_process?(feature.participatory_space)
+        can :read, Component do |component|
+          can_manage_process?(component.participatory_space)
         end
       end
     end

data/app/models/decidim/action_log.rb

@@ -13,13 +13,14 @@ module Decidim
                foreign_key: :decidim_user_id,
                class_name: "Decidim::User"
 
-    belongs_to :feature,
-               foreign_key: :decidim_feature_id,
+    belongs_to :component,
+               foreign_key: :decidim_component_id,
                optional: true,
-               class_name: "Decidim::Feature"
+               class_name: "Decidim::Component"
 
     belongs_to :resource,
-               polymorphic: true
+               polymorphic: true,
+               optional: true
 
     belongs_to :participatory_space,
                optional: true,
@@ -29,7 +30,8 @@ module Decidim
                optional: true,
                class_name: "PaperTrail::Version"
 
-    validates :organization, :user, :action, :resource, presence: true
+    validates :organization, :user, :action, presence: true
+    validates :resource, presence: true, if: ->(log) { log.action != "delete" }
 
     # To ensure records can't be deleted
     before_destroy { |_record| raise ActiveRecord::ReadOnlyRecord }

data/app/models/decidim/area.rb

@@ -4,6 +4,9 @@ module Decidim
   # Areas are used in Assemblies to help users know which is
   # the Area of a participatory space.
   class Area < ApplicationRecord
+    include Traceable
+    include Loggable
+
     belongs_to :organization,
                foreign_key: "decidim_organization_id",
                class_name: "Decidim::Organization",
@@ -18,6 +21,10 @@ module Decidim
     validates :name, :organization, presence: true
     validates :name, uniqueness: { scope: :organization }
 
+    def self.log_presenter_class_for(_log)
+      Decidim::AdminLog::AreaPresenter
+    end
+
     def translated_name
       Decidim::AreaPresenter.new(self).translated_name
     end

data/app/models/decidim/authorization.rb

@@ -22,6 +22,20 @@ module Decidim
 
     validate :active_handler?
 
+    def self.create_or_update_from(handler)
+      authorization = find_or_initialize_by(
+        user: handler.user,
+        name: handler.handler_name
+      )
+
+      authorization.attributes = {
+        unique_id: handler.unique_id,
+        metadata: handler.metadata
+      }
+
+      authorization.grant!
+    end
+
     def grant!
       remove_verification_attachment!
 

data/app/models/decidim/{feature.rb → component.rb}

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 module Decidim
-  # A Feature represents a self-contained group of functionalities usually
-  # defined via a FeatureManifest. It's meant to be able to provide a single
-  # feature that spans over several steps.
-  class Feature < ApplicationRecord
+  # A Component represents a self-contained group of functionalities usually
+  # defined via a ComponentManifest. It's meant to be able to provide a single
+  # component that spans over several steps.
+  class Component < ApplicationRecord
     include HasSettings
     include Publicable
     include Traceable
@@ -12,45 +12,45 @@ module Decidim
 
     belongs_to :participatory_space, polymorphic: true
 
-    default_scope { order(arel_table[:weight].asc) }
+    default_scope { order(arel_table[:weight].asc, arel_table[:manifest_name].asc) }
 
     delegate :organization, :categories, to: :participatory_space
 
     def self.log_presenter_class_for(_log)
-      Decidim::AdminLog::FeaturePresenter
+      Decidim::AdminLog::ComponentPresenter
     end
 
-    # Public: Finds the manifest this feature is associated to.
+    # Public: Finds the manifest this component is associated to.
     #
-    # Returns a FeatureManifest.
+    # Returns a ComponentManifest.
     def manifest
-      Decidim.find_feature_manifest(manifest_name)
+      Decidim.find_component_manifest(manifest_name)
     end
 
-    # Public: Assigns a manifest to this feature.
+    # Public: Assigns a manifest to this component.
     #
-    # manifest - The FeatureManifest for this Feature.
+    # manifest - The ComponentManifest for this Component.
     #
     # Returns nothing.
     def manifest=(manifest)
       self.manifest_name = manifest.name
     end
 
-    # Public: The name of the engine the feature is mounted to.
+    # Public: The name of the engine the component is mounted to.
     def mounted_engine
       "decidim_#{participatory_space_name}_#{manifest_name}"
     end
 
-    # Public: The name of the admin engine the feature is mounted to.
+    # Public: The name of the admin engine the component is mounted to.
     def mounted_admin_engine
       "decidim_admin_#{participatory_space_name}_#{manifest_name}"
     end
 
-    # Public: The hash of contextual params when the feature is mounted.
+    # Public: The hash of contextual params when the component is mounted.
     def mounted_params
       {
         host: organization.host,
-        feature_id: id,
+        component_id: id,
         "#{participatory_space.underscored_name}_slug".to_sym => participatory_space.slug
       }
     end

data/app/models/decidim/moderation.rb

@@ -10,7 +10,7 @@ module Decidim
     belongs_to :participatory_space, foreign_key: "decidim_participatory_space_id", foreign_type: "decidim_participatory_space_type", polymorphic: true
     has_many :reports, foreign_key: "decidim_moderation_id", class_name: "Decidim::Report", dependent: :destroy
 
-    delegate :feature, :organization, to: :reportable
+    delegate :component, :organization, to: :reportable
 
     def self.log_presenter_class_for(_log)
       Decidim::AdminLog::ModerationPresenter

data/app/models/decidim/oauth_application.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Decidim
+  class OAuthApplication < ::Doorkeeper::Application
+    include Decidim::Traceable
+    include Decidim::Loggable
+
+    belongs_to :organization, foreign_key: "decidim_organization_id", class_name: "Decidim::Organization", inverse_of: :oauth_applications
+
+    mount_uploader :organization_logo, OAuthApplicationLogoUploader
+
+    def owner
+      organization
+    end
+
+    def type
+      "Decidim::OAuthApplication"
+    end
+
+    def self.log_presenter_class_for(_log)
+      Decidim::AdminLog::OAuthApplicationPresenter
+    end
+  end
+end

data/app/models/decidim/organization.rb

@@ -18,6 +18,7 @@ module Decidim
     has_many :admins, -> { where(admin: true) }, foreign_key: "decidim_organization_id", class_name: "Decidim::User"
     has_many :users_with_any_role, -> { where.not(roles: []) }, foreign_key: "decidim_organization_id", class_name: "Decidim::User"
     has_many :users, foreign_key: "decidim_organization_id", class_name: "Decidim::User", dependent: :destroy
+    has_many :oauth_applications, foreign_key: "decidim_organization_id", class_name: "Decidim::OAuthApplication", inverse_of: :organization, dependent: :destroy
 
     validates :name, :host, uniqueness: true
     validates :reference_prefix, presence: true
@@ -34,6 +35,10 @@ module Decidim
       Decidim::AdminLog::OrganizationPresenter
     end
 
+    def available_authorization_handlers
+      available_authorizations & Decidim.authorization_handlers.map(&:name)
+    end
+
     # Returns top level scopes for this organization.
     #
     # Returns an ActiveRecord::Relation.

data/app/models/decidim/participatory_space_link.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Decidim
+  class ParticipatorySpaceLink < ApplicationRecord
+    belongs_to :from, polymorphic: true
+    belongs_to :to, polymorphic: true
+
+    validates :name, presence: true, uniqueness: { scope: [:from, :to] }
+    validate :same_organization
+
+    private
+
+    def same_organization
+      return if from.try(:organization) == to.try(:organization)
+
+      errors.add(:from, :invalid)
+      errors.add(:to, :invalid)
+    end
+  end
+end

data/app/models/decidim/participatory_space_private_user.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Decidim
+  # This class gives a given User access to a given private ParticipatorySpacePrivateUser
+  class ParticipatorySpacePrivateUser < ApplicationRecord
+    belongs_to :user, class_name: "Decidim::User", foreign_key: :decidim_user_id
+    belongs_to :privatable_to, polymorphic: true
+
+    validate :user_and_participatory_space_same_organization
+
+    private
+
+    # Private: check if the participatory space and the user have the same organization
+    def user_and_participatory_space_same_organization
+      return if !privatable_to || !user
+      errors.add(:privatable_to, :invalid) unless user.organization == privatable_to.organization
+    end
+  end
+end

data/app/models/decidim/user.rb

@@ -23,6 +23,8 @@ module Decidim
     has_many :memberships, class_name: "Decidim::UserGroupMembership", foreign_key: :decidim_user_id, dependent: :destroy
     has_many :user_groups, through: :memberships, class_name: "Decidim::UserGroup", foreign_key: :decidim_user_group_id
     has_many :notifications, foreign_key: "decidim_user_id", class_name: "Decidim::Notification", dependent: :destroy
+    has_many :access_grants, class_name: "Doorkeeper::AccessGrant", foreign_key: :resource_owner_id, dependent: :destroy
+    has_many :access_tokens, class_name: "Doorkeeper::AccessToken", foreign_key: :resource_owner_id, dependent: :destroy
 
     validates :name, presence: true, unless: -> { deleted? }
     validates :nickname, presence: true, unless: -> { deleted? || managed? }
@@ -36,7 +38,12 @@ module Decidim
     mount_uploader :avatar, Decidim::AvatarUploader
 
     scope :not_deleted, -> { where(deleted_at: nil) }
+
     scope :managed, -> { where(managed: true) }
+    scope :not_managed, -> { where(managed: false) }
+
+    scope :officialized, -> { where.not(officialized_at: nil) }
+    scope :not_officialized, -> { where(officialized_at: nil) }
 
     # Public: Allows customizing the invitation instruction email content when
     # inviting a user.

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

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module Decidim
+  module AdminLog
+    # This class holds the logic to present a `Decidim::Area`
+    # 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
+    #    AreaPresenter.new(action_log, view_helpers).present
+    class AreaPresenter < Decidim::Log::BasePresenter
+      private
+
+      def diff_fields_mapping
+        {
+          name: :i18n,
+          area_type_id: :area_type
+        }
+      end
+
+      def action_string
+        case action
+        when "create", "delete", "update"
+          "decidim.admin_log.area.#{action}"
+        else
+          super
+        end
+      end
+
+      def i18n_labels_scope
+        "activemodel.attributes.area"
+      end
+    end
+  end
+end

data/app/presenters/decidim/admin_log/{feature_presenter.rb → component_presenter.rb}

@@ -2,7 +2,7 @@
 
 module Decidim
   module AdminLog
-    # This class holds the logic to present a `Decidim::Feature`
+    # This class holds the logic to present a `Decidim::Component`
     # for the `AdminLog` log.
     #
     # Usage should be automatic and you shouldn't need to call this class
@@ -10,8 +10,8 @@ module Decidim
     #
     #    action_log = Decidim::ActionLog.last
     #    view_helpers # => this comes from the views
-    #    FeaturePresenter.new(action_log, view_helpers).present
-    class FeaturePresenter < Decidim::Log::BasePresenter
+    #    ComponentPresenter.new(action_log, view_helpers).present
+    class ComponentPresenter < Decidim::Log::BasePresenter
       private
 
       def diff_fields_mapping
@@ -23,13 +23,13 @@ module Decidim
       end
 
       def i18n_labels_scope
-        "activemodel.attributes.feature"
+        "activemodel.attributes.component"
       end
 
       def action_string
         case action
         when "create", "delete", "publish", "unpublish"
-          "decidim.admin_log.feature.#{action}"
+          "decidim.admin_log.component.#{action}"
         else
           super
         end

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

@@ -7,7 +7,7 @@ module Decidim
     class NewsletterResourcePresenter < Decidim::Log::ResourcePresenter
       private
 
-      # Private: Finds the public link for the given static page..
+      # Private: Finds the admin link for the newsletter.
       #
       # Returns an HTML-safe String.
       def resource_path

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

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+module Decidim
+  module AdminLog
+    # This class holds the logic to present a `Decidim::OAuthApplication`
+    # 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
+    #    OAuthApplicationPresenter.new(action_log, view_helpers).present
+    class OAuthApplicationPresenter < Decidim::Log::BasePresenter
+      private
+
+      def diff_fields_mapping
+        {
+          name: :string,
+          organization_name: :string,
+          organization_url: :string,
+          organization_logo: :string,
+          redirect_uri: :string
+        }
+      end
+
+      def action_string
+        case action
+        when "create", "delete", "update"
+          "decidim.admin_log.oauth_application.#{action}"
+        else
+          super
+        end
+      end
+
+      def i18n_labels_scope
+        "activemodel.attributes.oauth_application"
+      end
+
+      # Private: Caches the object that will be responsible of presenting the OAuthApplication.
+      # Overwrites the method so that we can use a custom presenter to show the correct
+      # path for the OAuthApplication.
+      #
+      # Returns an object that responds to `present`.
+      def resource_presenter
+        @resource_presenter ||= Decidim::AdminLog::OAuthApplicationResourcePresenter.new(action_log.resource, h, action_log.extra["resource"])
+      end
+    end
+  end
+end

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

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Decidim
+  module AdminLog
+    # This class extends the default resource presenter for logs, so that
+    # it can properly link to the OAuthApplication.
+    class OAuthApplicationResourcePresenter < Decidim::Log::ResourcePresenter
+      private
+
+      # Private: Finds the admin link for the OAuthApplication.
+      #
+      # Returns an HTML-safe String.
+      def resource_path
+        @resource_path ||= h.decidim_admin.oauth_application_path(resource)
+      end
+    end
+  end
+end

data/app/presenters/decidim/home_stats_presenter.rb

@@ -9,7 +9,7 @@ module Decidim
     def highlighted
       highlighted_stats = Decidim.stats.only([:users_count, :processes_count]).with_context(organization).map { |name, data| [name, data] }
       highlighted_stats = highlighted_stats.concat(global_stats(priority: StatsRegistry::HIGH_PRIORITY))
-      highlighted_stats = highlighted_stats.concat(feature_stats(priority: StatsRegistry::HIGH_PRIORITY))
+      highlighted_stats = highlighted_stats.concat(component_stats(priority: StatsRegistry::HIGH_PRIORITY))
       highlighted_stats = highlighted_stats.reject(&:empty?)
       highlighted_stats = highlighted_stats.reject { |_name, data| data.zero? }
 
@@ -29,7 +29,7 @@ module Decidim
     # Public: Render a collection of stats that are not primary.
     def not_highlighted
       not_highlighted_stats = global_stats(priority: StatsRegistry::MEDIUM_PRIORITY)
-      not_highlighted_stats = not_highlighted_stats.concat(feature_stats(priority: StatsRegistry::MEDIUM_PRIORITY))
+      not_highlighted_stats = not_highlighted_stats.concat(component_stats(priority: StatsRegistry::MEDIUM_PRIORITY))
       not_highlighted_stats = not_highlighted_stats.reject(&:empty?)
       not_highlighted_stats = not_highlighted_stats.reject { |_name, data| data.zero? }
 
@@ -55,9 +55,9 @@ module Decidim
              .map { |name, data| [name, data] }
     end
 
-    def feature_stats(conditions)
-      Decidim.feature_manifests.flat_map do |feature|
-        feature.stats.filter(conditions).with_context(published_features).map { |name, data| [name, data] }
+    def component_stats(conditions)
+      Decidim.component_manifests.flat_map do |component|
+        component.stats.filter(conditions).with_context(published_components).map { |name, data| [name, data] }
       end
     end
 
@@ -80,8 +80,8 @@ module Decidim
       end
     end
 
-    def published_features
-      @published_features ||= Feature.where(participatory_space: public_participatory_spaces).published
+    def published_components
+      @published_components ||= Component.where(participatory_space: public_participatory_spaces).published
     end
   end
 end

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

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