decidim-core 0.14.4 → 0.15.0

data/app/controllers/decidim/last_activities_controller.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module Decidim
+  # The controller to show all the last activities in a Decidim Organization.
+  class LastActivitiesController < Decidim::ApplicationController
+    include FilterResource
+    include Paginable
+
+    helper Decidim::ResourceHelper
+    helper Decidim::FiltersHelper
+
+    helper_method :activities, :resource_types
+
+    private
+
+    def resource_types
+      return @resource_types if defined?(@resource_types)
+
+      @resource_types = search.resource_types.sort_by do |klass|
+        klass.constantize.model_name.human
+      end
+
+      @resource_types = @resource_types.map do |klass|
+        [klass, klass.constantize.model_name.human]
+      end
+
+      @resource_types << ["all", I18n.t("decidim.last_activities.all")]
+    end
+
+    def activities
+      @activities ||= paginate(search.results)
+    end
+
+    def search_klass
+      ActivitySearch
+    end
+
+    def context_params
+      { organization: current_organization }
+    end
+
+    def default_filter_params
+      { resource_type: "all" }
+    end
+  end
+end

data/app/controllers/decidim/pages_controller.rb

@@ -5,11 +5,13 @@ module Decidim
   class PagesController < Decidim::ApplicationController
     layout "layouts/decidim/application"
 
-    helper_method :page, :stats
+    helper_method :page
     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
@@ -29,5 +31,11 @@ module Decidim
     def page
       @page ||= current_organization.static_pages.find_by(slug: params[:id])
     end
+
+    private
+
+    def set_default_request_format
+      request.format = :html
+    end
   end
 end

data/app/controllers/decidim/profiles_controller.rb

@@ -5,11 +5,16 @@ module Decidim
   class ProfilesController < Decidim::ApplicationController
     helper Decidim::Messaging::ConversationHelper
 
-    helper_method :user, :active_content
+    helper_method :profile_holder, :active_content
+
+    before_action :ensure_profile_holder
+    before_action :ensure_profile_holder_is_a_group, only: [:members]
+    before_action :ensure_profile_holder_is_a_user, only: [:groups, :following]
 
     def show
-      return redirect_to notifications_path if current_user == user
-      @content_cell = "decidim/following"
+      return redirect_to notifications_path if current_user == profile_holder
+      return redirect_to profile_members_path if profile_holder.is_a?(Decidim::UserGroup)
+      redirect_to profile_following_path
     end
 
     def following
@@ -27,10 +32,35 @@ module Decidim
       render :show
     end
 
+    def groups
+      @content_cell = "decidim/groups"
+      render :show
+    end
+
+    def members
+      @content_cell = "decidim/members"
+      render :show
+    end
+
     private
 
-    def user
-      @user ||= Decidim::User.find_by!(
+    def ensure_profile_holder_is_a_group
+      raise ActionController::RoutingError, "No user group with the given nickname" unless profile_holder.is_a?(Decidim::UserGroup)
+    end
+
+    def ensure_profile_holder_is_a_user
+      raise ActionController::RoutingError, "No user with the given nickname" unless profile_holder.is_a?(Decidim::User)
+    end
+
+    def ensure_profile_holder
+      raise ActionController::RoutingError, "No user or user group with the given nickname" unless profile_holder
+    end
+
+    def profile_holder
+      @profile_holder ||= Decidim::User.find_by(
+        nickname: params[:nickname],
+        organization: current_organization
+      ) || Decidim::UserGroup.find_by(
         nickname: params[:nickname],
         organization: current_organization
       )

data/app/controllers/decidim/user_group_join_requests_controller.rb

@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+
+module Decidim
+  # The controller to handle user groups join requests.
+  class UserGroupJoinRequestsController < Decidim::ApplicationController
+    include FormFactory
+
+    def create
+      enforce_permission_to :join, :user_group
+
+      JoinUserGroup.call(current_user, user_group) do
+        on(:ok) do
+          flash[:notice] = t("groups.join.success", scope: "decidim")
+
+          redirect_back fallback_location: profile_members_path(user_group.nickname)
+        end
+
+        on(:invalid) do
+          flash[:alert] = t("groups.join.error", scope: "decidim")
+          redirect_back fallback_location: profile_members_path(user_group.nickname)
+        end
+      end
+    end
+
+    def update
+      enforce_permission_to :manage, :user_group, user_group: user_group
+
+      AcceptUserGroupJoinRequest.call(membership) do
+        on(:ok) do
+          flash[:notice] = t("group_members.accept.success", scope: "decidim")
+
+          redirect_back fallback_location: group_manage_users_path(user_group.nickname)
+        end
+
+        on(:invalid) do
+          flash[:alert] = t("group_members.accept.error", scope: "decidim")
+          redirect_back fallback_location: group_manage_users_path(user_group.nickname)
+        end
+      end
+    end
+
+    def destroy
+      enforce_permission_to :manage, :user_group, user_group: user_group
+
+      RejectUserGroupJoinRequest.call(membership) do
+        on(:ok) do
+          flash[:notice] = t("group_members.reject.success", scope: "decidim")
+
+          redirect_back fallback_location: group_manage_users_path(user_group.nickname)
+        end
+
+        on(:invalid) do
+          flash[:alert] = t("group_members.reject.error", scope: "decidim")
+          redirect_back fallback_location: group_manage_users_path(user_group.nickname)
+        end
+      end
+    end
+
+    private
+
+    def user_group
+      @user_group ||= Decidim::UserGroup.where(organization: current_user.organization).find_by(nickname: params[:group_id])
+    end
+
+    def membership
+      @membership ||= Decidim::UserGroupMembership.where(user_group: user_group).find(params[:id])
+    end
+  end
+end

data/app/events/decidim/demoted_membership_event.rb

@@ -0,0 +1,28 @@
+# frozen-string_literal: true
+
+module Decidim
+  class DemotedMembershipEvent < Decidim::Events::SimpleEvent
+    delegate :url_helpers, to: "Decidim::Core::Engine.routes"
+
+    i18n_attributes :user_group_name
+
+    def resource_url
+      url_helpers.group_manage_users_url(
+        user_group_nickname,
+        host: user.organization.host
+      )
+    end
+
+    def resource_path
+      url_helpers.group_manage_users_path(user_group_nickname)
+    end
+
+    def user_group_nickname
+      extra.dig("user_group_nickname")
+    end
+
+    def user_group_name
+      extra.dig("user_group_name")
+    end
+  end
+end

data/app/events/decidim/invited_to_group_event.rb

@@ -0,0 +1,33 @@
+# frozen-string_literal: true
+
+module Decidim
+  class InvitedToGroupEvent < Decidim::Events::SimpleEvent
+    delegate :url_helpers, to: "Decidim::Core::Engine.routes"
+
+    i18n_attributes :user_group_name
+    i18n_attributes :groups_profile_tab_path
+
+    def resource_url
+      url_helpers.profile_url(
+        user_group_nickname,
+        host: user.organization.host
+      )
+    end
+
+    def resource_path
+      url_helpers.profile_path(user_group_nickname)
+    end
+
+    def groups_profile_tab_path
+      url_helpers.profile_groups_path(user.nickname)
+    end
+
+    def user_group_nickname
+      extra.dig("user_group_nickname")
+    end
+
+    def user_group_name
+      extra.dig("user_group_name")
+    end
+  end
+end

data/app/events/decidim/join_request_accepted_event.rb

@@ -0,0 +1,28 @@
+# frozen-string_literal: true
+
+module Decidim
+  class JoinRequestAcceptedEvent < Decidim::Events::SimpleEvent
+    delegate :url_helpers, to: "Decidim::Core::Engine.routes"
+
+    i18n_attributes :user_group_name
+
+    def resource_url
+      url_helpers.profile_url(
+        user_group_nickname,
+        host: user.organization.host
+      )
+    end
+
+    def resource_path
+      url_helpers.profile_path(user_group_nickname)
+    end
+
+    def user_group_nickname
+      extra.dig("user_group_nickname")
+    end
+
+    def user_group_name
+      extra.dig("user_group_name")
+    end
+  end
+end

data/app/events/decidim/join_request_created_event.rb

@@ -0,0 +1,28 @@
+# frozen-string_literal: true
+
+module Decidim
+  class JoinRequestCreatedEvent < Decidim::Events::SimpleEvent
+    delegate :url_helpers, to: "Decidim::Core::Engine.routes"
+
+    i18n_attributes :user_group_name
+
+    def resource_url
+      url_helpers.group_manage_users_url(
+        user_group_nickname,
+        host: user.organization.host
+      )
+    end
+
+    def resource_path
+      url_helpers.group_manage_users_path(user_group_nickname)
+    end
+
+    def user_group_nickname
+      extra.dig("user_group_nickname")
+    end
+
+    def user_group_name
+      extra.dig("user_group_name")
+    end
+  end
+end

data/app/events/decidim/join_request_rejected_event.rb

@@ -0,0 +1,28 @@
+# frozen-string_literal: true
+
+module Decidim
+  class JoinRequestRejectedEvent < Decidim::Events::SimpleEvent
+    delegate :url_helpers, to: "Decidim::Core::Engine.routes"
+
+    i18n_attributes :user_group_name
+
+    def resource_url
+      url_helpers.profile_url(
+        user_group_nickname,
+        host: user.organization.host
+      )
+    end
+
+    def resource_path
+      url_helpers.profile_path(user_group_nickname)
+    end
+
+    def user_group_nickname
+      extra.dig("user_group_nickname")
+    end
+
+    def user_group_name
+      extra.dig("user_group_name")
+    end
+  end
+end

data/app/events/decidim/promoted_to_admin_event.rb

@@ -0,0 +1,28 @@
+# frozen-string_literal: true
+
+module Decidim
+  class PromotedToAdminEvent < Decidim::Events::SimpleEvent
+    delegate :url_helpers, to: "Decidim::Core::Engine.routes"
+
+    i18n_attributes :user_group_name
+
+    def resource_url
+      url_helpers.group_manage_users_url(
+        user_group_nickname,
+        host: user.organization.host
+      )
+    end
+
+    def resource_path
+      url_helpers.group_manage_users_path(user_group_nickname)
+    end
+
+    def user_group_nickname
+      extra.dig("user_group_nickname")
+    end
+
+    def user_group_name
+      extra.dig("user_group_name")
+    end
+  end
+end

data/app/events/decidim/removed_from_group_event.rb

@@ -0,0 +1,28 @@
+# frozen-string_literal: true
+
+module Decidim
+  class RemovedFromGroupEvent < Decidim::Events::SimpleEvent
+    delegate :url_helpers, to: "Decidim::Core::Engine.routes"
+
+    i18n_attributes :user_group_name
+
+    def resource_url
+      url_helpers.group_manage_users_url(
+        user_group_nickname,
+        host: user.organization.host
+      )
+    end
+
+    def resource_path
+      url_helpers.group_manage_users_path(user_group_nickname)
+    end
+
+    def user_group_nickname
+      extra.dig("user_group_nickname")
+    end
+
+    def user_group_name
+      extra.dig("user_group_name")
+    end
+  end
+end

data/app/forms/decidim/account_form.rb

@@ -17,7 +17,7 @@ module Decidim
     attribute :about
 
     validates :name, presence: true
-    validates :email, presence: true
+    validates :email, presence: true, 'valid_email_2/email': { disposable: true }
     validates :nickname, presence: true
 
     validates :nickname, length: { maximum: Decidim::User.nickname_max_length, allow_blank: true }

data/app/forms/decidim/invite_user_to_group_form.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Decidim
+  # The form object that handles the data behind creating a user group.
+  class InviteUserToGroupForm < Form
+    mimic :invite
+
+    attribute :nickname, String
+
+    validates :nickname, presence: true
+    validate :user_exists
+
+    def user
+      @user ||= Decidim::User.find_by(nickname: clean_nickname, organization: current_organization)
+    end
+
+    private
+
+    def clean_nickname
+      nickname.to_s.tr("@", "")
+    end
+
+    def user_exists
+      return true if user.present?
+
+      errors.add :nickname, :invalid
+    end
+  end
+end