decidim-core 0.15.2 → 0.16.0

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

@@ -10,15 +10,13 @@ module Decidim
   module UserProfile
     extend ActiveSupport::Concern
     include FormFactory
-
-    delegate :user_groups, to: :current_user, prefix: false
+    include UserGroups
 
     included do
       helper Decidim::UserProfileHelper
       layout "layouts/decidim/user_profile"
 
-      helper_method :available_verification_workflows,
-                    :user_groups
+      helper_method :available_verification_workflows
 
       before_action :current_user
       before_action do

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

@@ -22,6 +22,7 @@ module Decidim
       helper Decidim::ActionAuthorizationHelper
       helper Decidim::AttachmentsHelper
       helper Decidim::SanitizeHelper
+      helper Decidim::PadHelper
 
       helper_method :current_component,
                     :current_participatory_space,

data/app/controllers/decidim/devise/confirmations_controller.rb

@@ -6,6 +6,8 @@ module Decidim
     class ConfirmationsController < ::Devise::ConfirmationsController
       include Decidim::DeviseControllers
 
+      helper_method :new_user_group_session_path
+
       # Since we're using a single Devise installation for multiple
       # organizations, and user emails can be repeated across organizations,
       # we need to identify the user by both the email and the organization.
@@ -18,6 +20,13 @@ module Decidim
       def resource_params
         super.merge(decidim_organization_id: current_organization.id)
       end
+
+      # Overwrites the default method to handle user groups confirmations.
+      def after_confirmation_path_for(resource_name, resource)
+        return profile_path(resource.nickname) if resource_name == :user_group
+
+        super
+      end
     end
   end
 end

data/app/controllers/decidim/devise/omniauth_registrations_controller.rb

@@ -85,7 +85,8 @@ module Decidim
           name: oauth_data[:info][:name],
           nickname: oauth_data[:info][:nickname],
           oauth_signature: OmniauthRegistrationForm.create_signature(oauth_data[:provider], oauth_data[:uid]),
-          avatar_url: oauth_data[:info][:image]
+          avatar_url: oauth_data[:info][:image],
+          raw_data: oauth_hash
         }
       end
 

data/app/controllers/decidim/devise/passwords_controller.rb

@@ -6,8 +6,14 @@ module Decidim
     class PasswordsController < ::Devise::PasswordsController
       include Decidim::DeviseControllers
 
+      before_action :check_sign_in_enabled
+
       private
 
+      def check_sign_in_enabled
+        redirect_to new_user_session_path unless current_organization.sign_in_enabled?
+      end
+
       # Since we're using a single Devise installation for multiple
       # organizations, and user emails can be repeated across organizations,
       # we need to identify the user by both the email and the organization.

data/app/controllers/decidim/devise/registrations_controller.rb

@@ -9,6 +9,7 @@ module Decidim
       include Decidim::DeviseControllers
       include NeedsTosAccepted
 
+      before_action :check_sign_up_enabled
       before_action :configure_permitted_parameters
 
       invisible_captcha
@@ -45,6 +46,10 @@ module Decidim
 
       protected
 
+      def check_sign_up_enabled
+        redirect_to new_user_session_path unless current_organization.sign_up_enabled?
+      end
+
       def configure_permitted_parameters
         devise_parameter_sanitizer.permit(:sign_up, keys: [:name, :tos_agreement])
       end

data/app/controllers/decidim/devise/sessions_controller.rb

@@ -6,6 +6,12 @@ module Decidim
     class SessionsController < ::Devise::SessionsController
       include Decidim::DeviseControllers
 
+      before_action :check_sign_in_enabled, only: :create
+
+      def create
+        super
+      end
+
       def after_sign_in_path_for(user)
         if first_login_and_not_authorized?(user) && !user.admin? && !pending_redirect?(user)
           decidim_verifications.first_login_authorizations_path
@@ -29,6 +35,12 @@ module Decidim
       def after_sign_out_path_for(user)
         request.referer || super
       end
+
+      private
+
+      def check_sign_in_enabled
+        redirect_to new_user_session_path unless current_organization.sign_in_enabled?
+      end
     end
   end
 end

data/app/controllers/decidim/group_admins_controller.rb

@@ -4,6 +4,9 @@ module Decidim
   # The controller to manage user groups admins
   class GroupAdminsController < Decidim::ApplicationController
     include FormFactory
+    include UserGroups
+
+    before_action :enforce_user_groups_enabled
 
     helper_method :user_group
 

data/app/controllers/decidim/group_email_confirmations_controller.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Decidim
+  # The controller to manage email confirmations for user groups.
+  class GroupEmailConfirmationsController < Decidim::ApplicationController
+    include FormFactory
+    include UserGroups
+
+    before_action :enforce_user_groups_enabled
+
+    helper_method :user_group
+
+    def create
+      enforce_permission_to :manage, :user_group, user_group: user_group
+      if user_group.email.blank?
+        flash.keep[:alert] = t("decidim.profiles.user.fill_in_email_to_confirm_it")
+        redirect_to(edit_group_path(user_group.nickname)) && return
+      end
+
+      user_group.send_confirmation_instructions
+
+      flash.keep[:notice] = t("decidim.profiles.user.confirmation_instructions_sent")
+      redirect_back(fallback_location: decidim.profile_path(user_group.nickname))
+    end
+
+    private
+
+    def user_group
+      @user_group ||= Decidim::UserGroups::ManageableUserGroups.for(current_user).find_by(nickname: params[:group_id])
+    end
+  end
+end

data/app/controllers/decidim/group_invites_controller.rb

@@ -4,6 +4,9 @@ module Decidim
   # The controller to manage user groups invitations
   class GroupInvitesController < Decidim::ApplicationController
     include FormFactory
+    include UserGroups
+
+    before_action :enforce_user_groups_enabled
 
     helper_method :user_group
 

data/app/controllers/decidim/group_members_controller.rb

@@ -4,6 +4,9 @@ module Decidim
   # The controller to manage user groups members
   class GroupMembersController < Decidim::ApplicationController
     include FormFactory
+    include UserGroups
+
+    before_action :enforce_user_groups_enabled
 
     helper_method :user_group
 

data/app/controllers/decidim/groups_controller.rb

@@ -4,6 +4,9 @@ module Decidim
   # The controller to handle user groups creation
   class GroupsController < Decidim::ApplicationController
     include FormFactory
+    include UserGroups
+
+    before_action :enforce_user_groups_enabled
 
     def new
       enforce_permission_to :create, :user_group, current_user: current_user

data/app/controllers/decidim/homepage_controller.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Decidim
+  class HomepageController < Decidim::ApplicationController
+    layout "layouts/decidim/application"
+    skip_before_action :store_current_location
+
+    def show; end
+  end
+end

data/app/controllers/decidim/last_activities_controller.rb

@@ -32,7 +32,7 @@ module Decidim
     end
 
     def search_klass
-      ActivitySearch
+      HomeActivitySearch
     end
 
     def context_params

data/app/controllers/decidim/messaging/conversations_controller.rb

@@ -11,7 +11,7 @@ module Decidim
 
       before_action :authenticate_user!
 
-      helper_method :conversation
+      helper_method :username_list, :conversation
 
       def new
         enforce_permission_to :create, :conversation
@@ -30,7 +30,10 @@ module Decidim
 
         StartConversation.call(@form) do
           on(:ok) do |conversation|
-            redirect_to conversation_path(conversation)
+            render action: :create, locals: {
+              conversation: conversation,
+              form: MessageForm.new
+            }
           end
 
           on(:invalid) do
@@ -49,6 +52,8 @@ module Decidim
         enforce_permission_to :read, :conversation, conversation: conversation
 
         @conversation.mark_as_read(current_user)
+
+        @form = MessageForm.new
       end
 
       def update
@@ -72,6 +77,10 @@ module Decidim
       def conversation
         @conversation ||= Conversation.find(params[:id])
       end
+
+      def username_list(users)
+        users.pluck(:name).join(", ")
+      end
     end
   end
 end

data/app/controllers/decidim/open_data_controller.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module Decidim
+  class OpenDataController < Decidim::ApplicationController
+    def download
+      if open_data_file_exists?
+        redirect_to uploader.url
+      else
+        schedule_open_data_generation
+        flash[:alert] = t("decidim.open_data.not_available_yet")
+        redirect_back fallback_location: root_path
+      end
+    end
+
+    private
+
+    def open_data_file_exists?
+      uploader.file.exists?
+    rescue StandardError
+      false
+    end
+
+    def uploader
+      current_organization.open_data_file
+    end
+
+    def schedule_open_data_generation
+      OpenDataJob.perform_later(current_organization)
+    end
+  end
+end

data/app/controllers/decidim/own_user_groups_controller.rb

@@ -4,7 +4,9 @@ module Decidim
   # The controller to handle managing the current user's
   # UserGroups.
   class OwnUserGroupsController < Decidim::ApplicationController
-    include Decidim::UserProfile
+    include UserProfile
+
+    before_action :enforce_user_groups_enabled
 
     def index
       @user_groups = current_user.user_groups

data/app/controllers/decidim/pages_controller.rb

@@ -5,31 +5,23 @@ module Decidim
   class PagesController < Decidim::ApplicationController
     layout "layouts/decidim/application"
 
-    helper_method :page
+    helper_method :page, :pages
     helper CtaButtonHelper
     helper Decidim::SanitizeHelper
-    skip_before_action :store_current_location
 
     before_action :set_default_request_format
 
     def index
       enforce_permission_to :read, :public_page
-      @pages = current_organization.static_pages.sorted_by_i18n_title
+      @topics = StaticPageTopic.where(organization: current_organization)
+      @orphan_pages = StaticPage.where(topic: nil, organization: current_organization)
     end
 
     def show
-      enforce_permission_to :read, :public_page, page: page
-      if params[:id] == "home"
-        render :home
-      elsif page
-        render :decidim_page
-      else
-        raise ActionController::RoutingError, "Not Found"
-      end
-    end
-
-    def page
-      @page ||= current_organization.static_pages.find_by(slug: params[:id])
+      @page = current_organization.static_pages.find_by!(slug: params[:id])
+      enforce_permission_to :read, :public_page, page: @page
+      @topic = @page.topic
+      @pages = @topic&.pages
     end
 
     private

data/app/controllers/decidim/profiles_controller.rb

@@ -3,6 +3,8 @@
 module Decidim
   # The controller to handle the user's public profile page.
   class ProfilesController < Decidim::ApplicationController
+    include UserGroups
+
     helper Decidim::Messaging::ConversationHelper
 
     helper_method :profile_holder, :active_content
@@ -12,9 +14,9 @@ module Decidim
     before_action :ensure_profile_holder_is_a_user, only: [:groups, :following]
 
     def show
-      return redirect_to notifications_path if current_user == profile_holder
+      return redirect_to profile_timeline_path(nickname: params[:nickname]) if profile_holder == current_user
       return redirect_to profile_members_path if profile_holder.is_a?(Decidim::UserGroup)
-      redirect_to profile_following_path
+      redirect_to profile_activity_path(nickname: params[:nickname])
     end
 
     def following
@@ -33,15 +35,24 @@ module Decidim
     end
 
     def groups
+      enforce_user_groups_enabled
+
       @content_cell = "decidim/groups"
       render :show
     end
 
     def members
+      enforce_user_groups_enabled
+
       @content_cell = "decidim/members"
       render :show
     end
 
+    def activity
+      @content_cell = "decidim/user_activity"
+      render :show
+    end
+
     private
 
     def ensure_profile_holder_is_a_group

data/app/controllers/decidim/searches_controller.rb

@@ -11,9 +11,11 @@ module Decidim
     helper_method :term
 
     def index
-      Search.call(term, current_organization, filters) do
+      Search.call(term, current_organization, filters, page_params) do
         on(:ok) do |results|
-          expose(results: results.page(params[:page]).per(params[:per_page]))
+          # results.page(params[:page]).per(params[:per_page])
+          results_count = results.sum { |results_by_type| results_by_type.last[:count] }
+          expose(sections: results, results_count: results_count)
         end
       end
     end
@@ -35,5 +37,12 @@ module Decidim
     def filters
       filter_params
     end
+
+    def page_params
+      {
+        per_page: per_page,
+        page: params[:page]
+      }
+    end
   end
 end

data/app/controllers/decidim/user_activities_controller.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Decidim
+  # The controller to show all the last activities in a Decidim Organization.
+  class UserActivitiesController < Decidim::ApplicationController
+    include Paginable
+    include UserGroups
+
+    helper Decidim::ResourceHelper
+    helper_method :activities, :user
+
+    private
+
+    def user
+      @user ||= Decidim::User.find_by(nickname: params[:nickname])
+    end
+
+    def activities
+      @activities ||= paginate(
+        ActivitySearch.new(
+          organization: current_organization,
+          user: user,
+          resource_type: "all"
+        ).run
+      )
+    end
+  end
+end