decidim-core 0.5.1 → 0.6.0

data/app/controllers/decidim/scopes_controller.rb

@@ -3,6 +3,8 @@
 module Decidim
   # Exposes the scopes text search so users can choose a scope writing its name.
   class ScopesController < Decidim::ApplicationController
+    skip_before_action :store_current_location
+
     def search
       authorize! :search, Scope
       root = Scope.where(id: params[:root], organization: current_organization).first

data/app/controllers/decidim/widgets_controller.rb

@@ -8,7 +8,7 @@ module Decidim
 
     layout "decidim/widget"
 
-    helper_method :model, :iframe_url, :current_participatory_process
+    helper_method :model, :iframe_url, :current_participatory_space
 
     def show
       respond_to do |format|
@@ -19,8 +19,8 @@ module Decidim
 
     private
 
-    def current_participatory_process
-      @current_participatory_process ||= model.feature.participatory_process
+    def current_participatory_space
+      @current_participatory_space ||= model.feature.participatory_space
     end
 
     def iframe_url

data/app/forms/decidim/follow_form.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Decidim
+  # A form object to be used when users want to follow a followable resource.
+  class FollowForm < Decidim::Form
+    mimic :follow
+
+    attribute :followable_gid, String
+
+    validates :followable_gid, :followable, presence: true
+
+    def followable
+      @followable ||= GlobalID::Locator.locate_signed followable_gid
+    end
+
+    def follow
+      @follow ||= Decidim::Follow.where(user: current_user, followable: followable).first
+    end
+  end
+end

data/app/forms/decidim/invite_user_form.rb

@@ -33,7 +33,7 @@ module Decidim
     def available_roles_for_select
       Decidim::User::ROLES.map do |role|
         [
-          I18n.t(role, scope: "decidim.admin.models.user.fields.roles"),
+          I18n.t("models.user.fields.roles.#{role}", scope: "decidim.admin"),
           role
         ]
       end

data/app/forms/decidim/notifications_settings_form.rb

@@ -6,12 +6,10 @@ module Decidim
   class NotificationsSettingsForm < Form
     mimic :user
 
-    attribute :comments_notifications
-    attribute :replies_notifications
+    attribute :email_on_notification
     attribute :newsletter_notifications
 
-    validates :comments_notifications, presence: true
-    validates :replies_notifications, presence: true
+    validates :email_on_notification, presence: true
     validates :newsletter_notifications, presence: true
   end
 end

data/app/helpers/decidim/action_authorization_helper.rb

@@ -67,11 +67,12 @@ module Decidim
       end
 
       unless current_user_authorized?(action)
-        html_options["onclick"] = "event.preventDefault();"
         html_options["data-toggle"] = current_user ? "#{action.to_s.underscore}AuthorizationModal" : "loginModal"
         url = ""
       end
 
+      html_options["onclick"] = "event.preventDefault();" if url == ""
+
       if block_given?
         button_to(url, html_options, &body)
       else

data/app/helpers/decidim/decidim_form_helper.rb

@@ -13,6 +13,10 @@ module Decidim
     def decidim_form_for(record, options = {}, &block)
       options[:data] ||= {}
       options[:data].update(abide: true, "live-validate" => true, "validate-on-blur" => true)
+
+      options[:html] ||= {}
+      options[:html].update(novalidate: true)
+
       form_for(record, options, &block)
     end
 

data/app/helpers/decidim/feature_path_helper.rb

@@ -9,7 +9,7 @@ module Decidim
     #
     # Returns a url.
     def main_feature_path(feature)
-      feature_root_path_for(feature.manifest.engine, feature)
+      EngineRouter.main_proxy(feature).root_path
     end
 
     # Returns the defined admin root path for a given feature.
@@ -18,18 +18,7 @@ module Decidim
     #
     # Returns a url.
     def manage_feature_path(feature)
-      feature_root_path_for(feature.manifest.admin_engine, feature)
-    end
-
-    private
-
-    def feature_root_path_for(engine, feature)
-      url_params = {
-        feature_id: feature.id,
-        participatory_process_id: feature.participatory_process.id
-      }
-
-      engine.routes.url_helpers.root_path(url_params)
+      EngineRouter.admin_proxy(feature).root_path
     end
   end
 end

data/app/helpers/decidim/icon_helper.rb

@@ -7,23 +7,41 @@ module Decidim
     # a question mark when no icon is found.
     #
     # feature - The feature to generate the icon for.
+    # options - a Hash with options
     #
     # Returns an HTML tag with the icon.
-    def feature_icon(feature)
-      feature_manifest_icon(feature.manifest)
+    def feature_icon(feature, options = {})
+      manifest_icon(feature.manifest, options)
     end
 
-    # Public: Returns an icon given an instance of a Feature Manifest. It defaults to
+    # Public: Returns an icon given an instance of a Manifest. It defaults to
     # a question mark when no icon is found.
     #
-    # feature_manifest - The feature manifest to generate the icon for.
+    # manifest - The manifest to generate the icon for.
+    # options - a Hash with options
     #
     # Returns an HTML tag with the icon.
-    def feature_manifest_icon(feature_manifest)
-      if feature_manifest.icon
-        external_icon feature_manifest.icon
+    def manifest_icon(manifest, options = {})
+      if manifest.icon
+        external_icon manifest.icon, options
       else
-        icon "question-mark"
+        icon "question-mark", options
+      end
+    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
+    # manifest to find the icon.
+    #
+    # resource - The resource to generate the icon for.
+    # options - a Hash with options
+    #
+    # Returns an HTML tag with the icon.
+    def resource_icon(resource, options = {})
+      if resource.respond_to?(:feature)
+        feature_icon(resource.feature, options)
+      else
+        manifest_icon(resource.manifest, options)
       end
     end
   end

data/app/helpers/decidim/paginate_helper.rb

@@ -8,7 +8,7 @@ module Decidim
     #
     # collection - a collection of elements that need to be paginated
     # paginate_params - a Hash with options to delegate to the pagination helper.
-    def decidim_paginate(collection, paginate_params)
+    def decidim_paginate(collection, paginate_params = {})
       # Kaminari uses url_for to generate the url, but this doesn't play nice with our engine system
       # and unless we remove these params they are added again as query string :(
       default_params = {

data/app/helpers/decidim/scopes_helper.rb

@@ -9,7 +9,7 @@ module Decidim
     #
     # Returns boolean.
     def has_visible_scopes?(resource)
-      current_participatory_process.scopes_enabled? && !current_participatory_process.scope.present? && resource.scope.present?
+      current_participatory_space.scopes_enabled? && !current_participatory_space.scope.present? && resource.scope.present?
     end
   end
 end

data/app/jobs/decidim/email_notification_generator_job.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Decidim
+  class EmailNotificationGeneratorJob < ApplicationJob
+    queue_as :decidim_events
+
+    def perform(event, event_class_name, resource, recipient_ids, extra)
+      event_class = event_class_name.constantize
+      EmailNotificationGenerator.new(event, event_class, resource, recipient_ids, extra).generate
+    end
+  end
+end

data/app/jobs/decidim/export_job.rb

@@ -12,9 +12,7 @@ module Decidim
       collection = export_manifest.collection.call(feature)
       serializer = export_manifest.serializer
 
-      export_data = Decidim::Exporters.const_get(format.upcase).new(collection, serializer).export
-
-      name = "#{name}-#{I18n.localize(Date.today, format: :default)}-#{Time.now.seconds_since_midnight.to_i}"
+      export_data = Decidim::Exporters.find_exporter(format).new(collection, serializer).export
 
       ExportMailer.export(user, name, export_data).deliver_now
     end

data/app/jobs/decidim/notification_generator_for_recipient_job.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Decidim
+  class NotificationGeneratorForRecipientJob < ApplicationJob
+    queue_as :decidim_events
+
+    def perform(event, event_class_name, resource, recipient_id, extra)
+      event_class = event_class_name.constantize
+      NotificationGeneratorForRecipient
+        .new(event, event_class, resource, recipient_id, extra)
+        .generate
+    end
+  end
+end

data/app/jobs/decidim/notification_generator_job.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Decidim
+  class NotificationGeneratorJob < ApplicationJob
+    queue_as :decidim_events
+
+    def perform(event, event_class_name, resource, recipient_ids, extra)
+      event_class = event_class_name.constantize
+      NotificationGenerator.new(event, event_class, resource, recipient_ids, extra).generate
+    end
+  end
+end

data/app/mailers/decidim/export_mailer.rb

@@ -8,22 +8,21 @@ module Decidim
     # zipped file.
     #
     # user        - The user to be notified.
-    # name        - The name of the export.
+    # export_name - The name of the export.
     # export_data - The data containing the result of the export.
     #
     # Returns nothing.
-    def export(user, name, export_data)
+    def export(user, export_name, export_data)
       @user = user
       @organization = user.organization
 
-      original_file_name = "#{name}.#{export_data.extension}"
+      filename = export_data.filename(export_name)
+      filename_without_extension = export_data.filename(export_name, extension: false)
 
-      attachments["#{name}.zip"] = FileZipper.new(
-        original_file_name, export_data.read
-      ).zip
+      attachments["#{filename_without_extension}.zip"] = FileZipper.new(filename, export_data.read).zip
 
       with_user(user) do
-        mail(to: "#{user.name} <#{user.email}>", subject: I18n.t("decidim.export_mailer.subject", name: original_file_name))
+        mail(to: "#{user.name} <#{user.email}>", subject: I18n.t("decidim.export_mailer.subject", name: filename))
       end
     end
   end

data/app/mailers/decidim/notification_mailer.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Decidim
+  # A custom mailer for sending notifications to users when
+  # a events are received.
+  class NotificationMailer < Decidim::ApplicationMailer
+    helper Decidim::ResourceHelper
+
+    def event_received(event, event_class_name, resource, user, extra)
+      with_user(user) do
+        @organization = resource.organization
+        event_class = event_class_name.constantize
+        @event_instance = event_class.new(resource: resource, event_name: event, user: user, extra: extra)
+        subject = @event_instance.email_subject
+
+        mail(to: user.email, subject: subject)
+      end
+    end
+  end
+end

data/app/mailers/decidim/reported_mailer.rb

@@ -10,7 +10,7 @@ module Decidim
     def report(user, report)
       with_user(user) do
         @report = report
-        @participatory_process = @report.moderation.participatory_process
+        @participatory_space = @report.moderation.participatory_space
         @organization = user.organization
         @user = user
         subject = I18n.t("report.subject", scope: "decidim.reported_mailer")
@@ -21,7 +21,7 @@ module Decidim
     def hide(user, report)
       with_user(user) do
         @report = report
-        @participatory_process = @report.moderation.participatory_process
+        @participatory_space = @report.moderation.participatory_space
         @organization = user.organization
         @user = user
         subject = I18n.t("hide.subject", scope: "decidim.reported_mailer")
@@ -36,7 +36,7 @@ module Decidim
     end
 
     def manage_moderations_url
-      @manage_moderations_url ||= decidim_admin.moderations_url(@participatory_process.id, host: @organization.host)
+      @manage_moderations_url ||= EngineRouter.admin_proxy(@participatory_space).moderations_url(host: @organization.host)
     end
   end
 end

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

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

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

@@ -28,6 +28,14 @@ module Decidim
         can :manage, Authorization do |authorization|
           authorization.user == user
         end
+
+        can :manage, Follow do |follow|
+          follow.user == user
+        end
+
+        can :manage, Notification do |notification|
+          notification.user == user
+        end
       end
     end
   end

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

@@ -8,8 +8,6 @@ module Decidim
       include CanCan::Ability
 
       def initialize(user, _context)
-        can :read, ParticipatoryProcessGroup
-        can :read, ParticipatoryProcess, &:published?
         can :read, :public_pages
         can :manage, :locales
 

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

@@ -20,7 +20,7 @@ module Decidim
         end
 
         can :read, Feature do |feature|
-          can_manage_process?(feature.participatory_process)
+          can_manage_process?(feature.participatory_space)
         end
       end
     end

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

@@ -20,7 +20,7 @@ module Decidim
         end
 
         can :read, Feature do |feature|
-          can_manage_process?(feature.participatory_process)
+          can_manage_process?(feature.participatory_space)
         end
       end
     end

data/app/models/decidim/category.rb

@@ -4,13 +4,13 @@ module Decidim
   # Categories serve as a taxonomy for components to use for while in the
   # context of a participatory process.
   class Category < ApplicationRecord
-    belongs_to :participatory_process, foreign_key: "decidim_participatory_process_id", class_name: "Decidim::ParticipatoryProcess", inverse_of: :categories
+    belongs_to :participatory_space, foreign_key: "decidim_participatory_space_id", foreign_type: "decidim_participatory_space_type", polymorphic: true
     has_many :subcategories, foreign_key: "parent_id", class_name: "Decidim::Category", dependent: :destroy, inverse_of: :parent
     belongs_to :parent, class_name: "Decidim::Category", foreign_key: "parent_id", inverse_of: :subcategories, optional: true
     has_many :categorizations, foreign_key: "decidim_category_id", class_name: "Decidim::Categorization", dependent: :destroy
 
     validate :forbid_deep_nesting
-    before_validation :subcategories_have_same_process
+    before_validation :subcategories_have_same_participatory_space
 
     # Scope to return only the first-class categories, that is, those that are
     # not subcategories.
@@ -33,9 +33,9 @@ module Decidim
       errors.add(:parent_id, :nesting_too_deep)
     end
 
-    def subcategories_have_same_process
+    def subcategories_have_same_participatory_space
       return unless parent
-      self.participatory_process = parent.participatory_process
+      self.participatory_space = parent.participatory_space
     end
   end
 end

data/app/models/decidim/feature.rb

@@ -8,13 +8,13 @@ module Decidim
     include HasSettings
     include Publicable
 
-    belongs_to :participatory_process, foreign_key: "decidim_participatory_process_id"
-    has_one :organization, through: :participatory_process
-    has_many :categories, through: :participatory_process
-    has_many :scopes, through: :organization
+    belongs_to :participatory_space, polymorphic: true
 
     default_scope { order(arel_table[:weight].asc) }
 
+    delegate :organization, :categories, to: :participatory_space
+    delegate :scopes, to: :organization
+
     # Public: Finds the manifest this feature is associated to.
     #
     # Returns a FeatureManifest.
@@ -31,9 +31,34 @@ module Decidim
       self.manifest_name = manifest.name
     end
 
+    # Public: The name of the engine the feature 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.
+    def mounted_admin_engine
+      "decidim_admin_#{participatory_space_name}_#{manifest_name}"
+    end
+
+    # Public: The hash of contextual params when the feature is mounted.
+    def mounted_params
+      {
+        host: organization.host,
+        feature_id: id,
+        participatory_space.foreign_key.to_sym => participatory_space.id
+      }
+    end
+
     # Public: Returns the value of the registered primary stat.
     def primary_stat
       @primary_stat ||= manifest.stats.filter(primary: true).with_context([self]).map { |name, value| [name, value] }.first&.last
     end
+
+    private
+
+    def participatory_space_name
+      participatory_space.underscored_name
+    end
   end
 end