decidim-core 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3c9e52c7bfc50e66ce2edd41f4a7566f2e1f098
-  data.tar.gz: 32dbce6e9ef9691e0da24e4522f982828daf270b
+  metadata.gz: a774be89f3656a65dcf358c853dce78b47bf583c
+  data.tar.gz: 2e9e91cc41497ccdad3c58f4786921d053888a0d
 SHA512:
-  metadata.gz: d9b03de16fa59d421c80c5d6c452ecd009b434017b01304bb4f060e65c2dfca589bc8d4f7f75bd30beaf29b426938aa9b74a95e120051aa985bf1f4b293af787
-  data.tar.gz: a31f6a85ac6b40528969dc49dca39aefa711c486197e1383f32707159e30af241d3d641ff88a8aa4e4b215331ecf821fb79a58ac37032bb3d9f2727a2916c290
+  metadata.gz: 4def8591405abaa854afb048f841c35ced6f6fea5e35e8c77f5c9de0ecae2c1bd4fbc5c599e5cc07f5d0747b8686247955c98b21be47f422239642d0f08ad2f6
+  data.tar.gz: 1ba2f7fef1c8d850f0732765e7199dff180d6ea78bd62c6edb4a392c3f01f5d82ecd9e4633205ec9bee2afd5661e5484b47b43b00e5917f034d1bdd48c704b60

data/app/assets/config/decidim_core_manifest.js

@@ -5,6 +5,7 @@
 //= link decidim/orders
 //= link decidim/map.js
 //= link decidim/map.css
+//= link decidim/notifications.js
 //= link_directory ../../../vendor/assets/javascripts/datepicker-locales
 //= link decidim/widget.js
 //= link decidim/impersonation.js

data/app/assets/javascripts/decidim/notifications.js.es6

@@ -0,0 +1,33 @@
+$(() => {
+  const $wrapper = $('#notifications');
+  const $section = $wrapper.find('section#notifications-list');
+  const $noNotificationsText = $wrapper.find('.empty-notifications');
+  const $pagination = $wrapper.find('ul.pagination');
+  const FADEOUT_TIME = 500;
+
+  const anyNotifications = () => $wrapper.find('.card--list__item').length > 0;
+  const emptyNotifications = () => {
+    if (!anyNotifications()) {
+      $section.remove();
+      $noNotificationsText.removeClass('hide');
+    }
+  };
+
+  $section.on('click', '.mark-as-read-button', (event) => {
+    const $item = $(event.target).parents('.card--list__item');
+    $item.fadeOut(FADEOUT_TIME, () => {
+      $item.remove();
+      emptyNotifications();
+    });
+  });
+
+  $wrapper.on('click', '.mark-all-as-read-button', () => {
+    $section.fadeOut(FADEOUT_TIME, () => {
+      $pagination.remove();
+      $wrapper.find('.card--list__item').remove();
+      emptyNotifications();
+    });
+  });
+
+  emptyNotifications();
+});

data/app/assets/stylesheets/decidim/extras/_meeting-registrations.scss

@@ -0,0 +1,11 @@
+#meeting-registration-confirm {
+  .help-text {
+    border: 1px solid #eee;
+    background: #fff;
+    padding: 0.5em;
+    overflow-y: scroll;
+    margin-bottom: 1em;
+    margin-top: 0.5em;
+    height: 20em;
+  }
+}

data/app/assets/stylesheets/decidim/modules/_extra.scss

@@ -5,6 +5,10 @@
   .button:last-of-type{
     margin-bottom: 0;
   }
+
+  .follow-button {
+    margin-top: 1rem;
+  }
 }
 
 .extra__suport-number{

data/app/assets/stylesheets/decidim/modules/_process-nav.scss

@@ -83,6 +83,16 @@
     width: 25px;
     height: 25px;
     fill: $muted;
+
+    .stroked-shape{
+      fill: none;
+      fill-opacity: 1;
+      stroke-width: 2.01957917;
+      stroke-miterlimit: 4;
+      stroke-dasharray: none;
+      stroke-dashoffset: 0;
+      stroke: $muted;
+    }
   }
 }
 
@@ -92,6 +102,10 @@
     color: $primary;
     svg{
       fill: $primary;
+
+      .stroked-shape{
+        stroke: $primary;
+      }
     }
   }
 }

data/app/commands/decidim/create_follow.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Decidim
+  # A command with all the business logic for when a user starts following a resource.
+  class CreateFollow < Rectify::Command
+    # Public: Initializes the command.
+    #
+    # form         - A form object with the params.
+    # current_user - The current user.
+    def initialize(form, current_user)
+      @form = form
+      @current_user = current_user
+    end
+
+    # Executes the command. Broadcasts these events:
+    #
+    # - :ok when everything is valid, together with the follow.
+    # - :invalid if the form wasn't valid and we couldn't proceed.
+    #
+    # Returns nothing.
+    def call
+      return broadcast(:invalid) if form.invalid?
+
+      create_follow!
+
+      broadcast(:ok, follow)
+    end
+
+    private
+
+    attr_reader :follow, :form, :current_user
+
+    def create_follow!
+      @follow = Follow.create!(
+        followable: form.followable,
+        user: current_user
+      )
+    end
+  end
+end

data/app/commands/decidim/create_omniauth_registration.rb

@@ -53,8 +53,6 @@ module Decidim
         @user.password = generated_password
         @user.password_confirmation = generated_password
         @user.skip_confirmation! if verified_email
-        @user.comments_notifications = true
-        @user.replies_notifications = true
       end
 
       @user.tos_agreement = "1"

data/app/commands/decidim/create_registration.rb

@@ -39,9 +39,7 @@ module Decidim
                            password_confirmation: form.password_confirmation,
                            organization: form.current_organization,
                            tos_agreement: form.tos_agreement,
-                           newsletter_notifications: form.newsletter_notifications,
-                           comments_notifications: true,
-                           replies_notifications: true)
+                           newsletter_notifications: form.newsletter_notifications)
     end
 
     def create_user_group

data/app/commands/decidim/create_report.rb

@@ -44,7 +44,7 @@ module Decidim
     attr_reader :form, :report
 
     def find_or_create_moderation!
-      @moderation = Moderation.find_or_create_by!(reportable: @reportable, participatory_process: participatory_process)
+      @moderation = Moderation.find_or_create_by!(reportable: @reportable, participatory_space: participatory_space)
     end
 
     def create_report!
@@ -60,12 +60,12 @@ module Decidim
       @moderation.update_attributes!(report_count: @moderation.report_count + 1)
     end
 
-    def participatory_process_admins
-      @participatory_process_admins ||= Decidim::Admin::ProcessAdmins.for(participatory_process)
+    def participatory_space_admins
+      @participatory_space_admins ||= participatory_space.admins
     end
 
     def send_report_notification_to_admins
-      participatory_process_admins.each do |admin|
+      participatory_space_admins.each do |admin|
         ReportedMailer.report(admin, @report).deliver_later
       end
     end
@@ -79,13 +79,13 @@ module Decidim
     end
 
     def send_hide_notification_to_admins
-      participatory_process_admins.each do |admin|
+      participatory_space_admins.each do |admin|
         ReportedMailer.hide(admin, @report).deliver_later
       end
     end
 
-    def participatory_process
-      @participatory_process ||= @reportable.feature.participatory_process
+    def participatory_space
+      @participatory_space ||= @reportable.feature.participatory_space
     end
   end
 end

data/app/commands/decidim/delete_follow.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module Decidim
+  # A command with all the business logic for when a user stops following a resource.
+  class DeleteFollow < Rectify::Command
+    # Public: Initializes the command.
+    #
+    # form         - A form object with the params.
+    # current_user - The current user.
+    def initialize(form, current_user)
+      @form = form
+      @current_user = current_user
+    end
+
+    # Executes the command. Broadcasts these events:
+    #
+    # - :ok when everything is valid, together with the follow.
+    # - :invalid if the form wasn't valid and we couldn't proceed.
+    #
+    # Returns nothing.
+    def call
+      return broadcast(:invalid) if form.invalid?
+
+      delete_follow!
+
+      broadcast(:ok)
+    end
+
+    private
+
+    attr_reader :form, :current_user
+
+    def delete_follow!
+      form.follow.destroy!
+    end
+  end
+end

data/app/commands/decidim/invite_user.rb

@@ -43,9 +43,7 @@ module Decidim
         email: form.email.downcase,
         organization: form.organization,
         admin: form.role == "admin",
-        roles: form.role == "admin" ? [] : [form.role],
-        comments_notifications: true,
-        replies_notifications: true
+        roles: form.role == "admin" ? [] : [form.role]
       )
       @user.invite!(
         form.invited_by,

data/app/commands/decidim/update_notifications_settings.rb

@@ -24,8 +24,7 @@ module Decidim
     private
 
     def update_notifications_settings
-      @user.comments_notifications = @form.comments_notifications
-      @user.replies_notifications = @form.replies_notifications
+      @user.email_on_notification = @form.email_on_notification
       @user.newsletter_notifications = @form.newsletter_notifications
     end
   end

data/app/constraints/decidim/current_feature.rb

@@ -20,9 +20,8 @@ module Decidim
     def matches?(request)
       env = request.env
 
-      return false unless CurrentParticipatoryProcess.new.matches?(request)
-
-      @participatory_process = env["decidim.current_participatory_process"]
+      @participatory_space = env["decidim.current_participatory_space"]
+      return false unless @participatory_space
 
       current_feature(env, request.params) ? true : false
     end
@@ -34,7 +33,7 @@ module Decidim
     end
 
     def detect_current_feature(params)
-      @participatory_process.features.find do |feature|
+      @participatory_space.features.find do |feature|
         params["feature_id"] == feature.id.to_s && feature.manifest_name == @manifest.name.to_s
       end
     end

data/app/controllers/concerns/decidim/settings.rb

@@ -16,7 +16,7 @@ module Decidim
       end
 
       def current_settings
-        @current_settings ||= current_feature.active_step_settings
+        @current_settings ||= current_feature.current_settings
       end
     end
   end

data/app/controllers/decidim/features/base_controller.rb

@@ -6,8 +6,6 @@ module Decidim
     # setting the appropiate layout, including necessary helpers, and overall
     # fooling the engine into thinking it's isolated.
     class BaseController < Decidim::ApplicationController
-      layout "layouts/decidim/participatory_process"
-      include NeedsParticipatoryProcess
       include Settings
       include ActionAuthorization
 
@@ -15,7 +13,6 @@ module Decidim
       helper Decidim::OrdersHelper
       helper Decidim::FeatureReferenceHelper
       helper Decidim::TranslationsHelper
-      helper Decidim::ParticipatoryProcessHelper
       helper Decidim::IconHelper
       helper Decidim::ResourceHelper
       helper Decidim::ScopesHelper
@@ -23,12 +20,14 @@ module Decidim
       helper Decidim::AttachmentsHelper
 
       helper_method :current_feature,
+                    :current_participatory_space,
                     :current_manifest
 
       skip_authorize_resource
 
       before_action do
-        authorize! :read, current_participatory_process
+        extend current_participatory_space.extension_module
+
         authorize! :read, current_feature
       end
 
@@ -40,8 +39,8 @@ module Decidim
         @current_manifest ||= current_feature.manifest
       end
 
-      def current_participatory_process
-        request.env["decidim.current_participatory_process"]
+      def current_participatory_space
+        current_feature.participatory_space
       end
 
       def ability_context

data/app/controllers/decidim/follows_controller.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module Decidim
+  class FollowsController < Decidim::ApplicationController
+    include FormFactory
+    before_action :authenticate_user!
+    helper_method :resource
+
+    def destroy
+      @form = form(Decidim::FollowForm).from_params(params)
+      authorize! :delete, @form.follow
+
+      DeleteFollow.call(@form, current_user) do
+        on(:ok) do
+          render :update_button
+        end
+
+        on(:invalid) do
+          render json: { error: I18n.t("follows.destroy.error", scope: "decidim") }, status: 422
+        end
+      end
+    end
+
+    def create
+      @form = form(Decidim::FollowForm).from_params(params)
+      authorize! :create, Follow
+
+      CreateFollow.call(@form, current_user) do
+        on(:ok) do
+          render :update_button
+        end
+
+        on(:invalid) do
+          render json: { error: I18n.t("follows.create.error", scope: "decidim") }, status: 422
+        end
+      end
+    end
+
+    def resource
+      @resource ||= GlobalID::Locator.locate_signed(
+        params[:follow][:followable_gid]
+      )
+    end
+  end
+end

data/app/controllers/decidim/notifications_controller.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module Decidim
+  # The controller to handle the user's notifications dashboard.
+  class NotificationsController < Decidim::ApplicationController
+    helper Decidim::IconHelper
+    helper Decidim::PaginateHelper
+    include Paginable
+
+    helper_method :notifications
+
+    def index
+      authorize! :read, Notification
+      @notifications = paginate(notifications)
+    end
+
+    def destroy
+      notification = notifications.find(params[:id])
+      authorize! :destroy, notification
+      notification.destroy
+    end
+
+    def read_all
+      authorize! :destroy, notifications.first
+      notifications.destroy_all
+    end
+
+    private
+
+    def notifications
+      @notifications ||= current_user.notifications.order(created_at: :desc)
+    end
+
+    # Private: overwrites the amount of elements per page.
+    def per_page
+      50
+    end
+  end
+end

data/app/controllers/decidim/pages_controller.rb

@@ -25,12 +25,12 @@ module Decidim
 
     def promoted_participatory_processes
       @promoted_participatory_processes ||=
-        OrganizationPrioritizedParticipatoryProcesses.new(current_organization) | PromotedParticipatoryProcesses.new
+        ParticipatoryProcesses::OrganizationPrioritizedParticipatoryProcesses.new(current_organization) | ParticipatoryProcesses::PromotedParticipatoryProcesses.new
     end
 
     def highlighted_participatory_processes
       @highlighted_participatory_processes ||=
-        OrganizationPublishedParticipatoryProcesses.new(current_organization) | HighlightedParticipatoryProcesses.new
+        ParticipatoryProcesses::OrganizationPublishedParticipatoryProcesses.new(current_organization) | ParticipatoryProcesses::HighlightedParticipatoryProcesses.new
     end
 
     private