decidim-blogs 0.29.2 → 0.30.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f92b42d662b98c3a74dddec15a232ee1ca834c352ac5562c217275e6d3ce947
-  data.tar.gz: 4bab2db6af3072e7c38da4558ef6ad33a0f3f1fa910c876d77141c7ce7c1aa45
+  metadata.gz: a0d2fde69ea47b9f6ff61d3125320b98a4fabde7e13c80a29f93d0e1e5b53bfd
+  data.tar.gz: f6569ec8db96e0e19d3c5006bfee928001b33986534555de4dc4f65c1a1b10f7
 SHA512:
-  metadata.gz: 988f66c56ed71effe10777503a231b46bcb3cec74becb62d08a6cecaaf26f4e810b62a8264d27cd31108ebb07cedbd5e81021415a32b54cebc618a8d9ba94643
-  data.tar.gz: 10efcb379fb47f8e72d282a96e7b4bdbc316d302521c793d417f65733d6ff467939010a22a2da6730dc27f8f17bf8cd1666b3d8468069c69d3a6c2d2b3602d0f
+  metadata.gz: 1c740209b1eb84e8bb7995034eee7abe4fdaad87bd908167fb3a4485fb71f5a75f28d0de4cc23b634c3520687bf70934ca1b1f08b499b1bf3c733994a965be7b
+  data.tar.gz: 070cd05f488c1dedf3c693678167158e97fecf9e5a2e9b25e326d284bb3ca612142cad01a59ea4c58a4dfdf853ddcfcd174e5e0aaaa888a1d02c1ec25608123b

data/app/cells/decidim/blogs/content_blocks/highlighted_posts_cell.rb

@@ -4,9 +4,6 @@ module Decidim
   module Blogs
     module ContentBlocks
       class HighlightedPostsCell < Decidim::ContentBlocks::HighlightedElementsCell
-        include Decidim::ComponentPathHelper
-        include Decidim::CardHelper
-
         def show
           render unless posts_count.zero?
         end

data/app/commands/decidim/blogs/create_post.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Blogs
+    # This command is executed when the user creates a Post from the frontend
+    class CreatePost < Decidim::Commands::CreateResource
+      fetch_form_attributes :author
+
+      private
+
+      def resource_class = Decidim::Blogs::Post
+
+      def run_after_hooks
+        send_notification
+      end
+
+      def attributes
+        super.merge(
+          title: { I18n.locale => form.title },
+          body: { I18n.locale => form.body },
+          component: form.current_component
+        )
+      end
+
+      def send_notification
+        Decidim::EventsManager.publish(
+          event: "decidim.events.blogs.post_created",
+          event_class: Decidim::Blogs::CreatePostEvent,
+          resource:,
+          followers: resource.participatory_space.followers
+        )
+      end
+    end
+  end
+end

data/app/commands/decidim/blogs/update_post.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Blogs
+    # This command is executed when the user updates a Post from the frontend
+    class UpdatePost < Decidim::Commands::UpdateResource
+      fetch_form_attributes :title, :body
+
+      private
+
+      def resource_class = Decidim::Blogs::Post
+
+      def attributes
+        super.merge(
+          title: { I18n.locale => form.title },
+          body: { I18n.locale => form.body }
+        )
+      end
+    end
+  end
+end

data/app/controllers/decidim/blogs/admin/posts_controller.rb

@@ -5,6 +5,8 @@ module Decidim
     module Admin
       # This controller allows the create or update a blog.
       class PostsController < Admin::ApplicationController
+        include Decidim::Admin::HasTrashableResources
+
         helper UserGroupHelper
         helper PostsHelper
 
@@ -52,18 +54,19 @@ module Decidim
           end
         end
 
-        def destroy
-          enforce_permission_to :destroy, :blogpost, blogpost: post
+        private
 
-          Decidim::Commands::DestroyResource.call(post, current_user) do
-            on(:ok) do
-              flash[:notice] = I18n.t("posts.destroy.success", scope: "decidim.blogs.admin")
-              redirect_to posts_path
-            end
-          end
+        def trashable_deleted_resource_type
+          :post
         end
 
-        private
+        def trashable_deleted_resource
+          @trashable_deleted_resource ||= Blogs::Post.with_deleted.find_by(component: current_component, id: params[:id])
+        end
+
+        def trashable_deleted_collection
+          @trashable_deleted_collection ||= Post.where(component: current_component).only_deleted.deleted_at_desc.page(params[:page]).per(15)
+        end
 
         def post
           @post ||= Blogs::Post.find_by(component: current_component, id: params[:id])

data/app/controllers/decidim/blogs/posts_controller.rb

@@ -8,6 +8,10 @@ module Decidim
       include Paginable
       include Decidim::IconHelper
 
+      helper Decidim::UserGroupHelper
+      helper Decidim::Blogs::PostsSelectHelper
+      include Decidim::FormFactory
+
       helper_method :posts, :post, :post_presenter, :paginate_posts, :posts_most_commented, :tabs, :panels
 
       def index; end
@@ -16,6 +20,62 @@ module Decidim
         raise ActionController::RoutingError, "Not Found" unless post
       end
 
+      def new
+        enforce_permission_to :create, :blogpost
+        @form = form(Decidim::Blogs::PostForm).instance
+      end
+
+      def create
+        enforce_permission_to :create, :blogpost
+        @form = form(Decidim::Blogs::PostForm).from_params(params, current_component: current_component)
+
+        CreatePost.call(@form) do
+          on(:ok) do |new_post|
+            flash[:notice] = I18n.t("posts.create.success", scope: "decidim.blogs.admin")
+            redirect_to post_path(new_post)
+          end
+
+          on(:invalid) do
+            flash.now[:alert] = I18n.t("posts.create.invalid", scope: "decidim.blogs.admin")
+            render action: "new"
+          end
+        end
+      end
+
+      def edit
+        enforce_permission_to :update, :blogpost, blogpost: post
+        @form = form(PostForm).from_model(post)
+      end
+
+      def update
+        enforce_permission_to :update, :blogpost, blogpost: post
+        @form = form(PostForm).from_params(params, current_component: current_component)
+
+        UpdatePost.call(@form, post) do
+          on(:ok) do |post|
+            flash[:notice] = I18n.t("posts.update.success", scope: "decidim.blogs.admin")
+            redirect_to post_path(post)
+          end
+
+          on(:invalid) do
+            flash.now[:alert] = I18n.t("posts.update.invalid", scope: "decidim.blogs.admin")
+            render action: "edit"
+          end
+        end
+      end
+
+      def destroy
+        enforce_permission_to :destroy, :blogpost, blogpost: post
+
+        Decidim.traceability.perform_action!("delete", post, current_user) do
+          post.destroy!
+        end
+
+        flash[:notice] = I18n.t("posts.destroy.success", scope: "decidim.blogs.admin")
+
+        redirect_to posts_path
+      end
+
       private
 
       def paginate_posts
@@ -27,7 +87,7 @@ module Decidim
       end
 
       def post_presenter
-        @post_presenter ||= Decidim::Blogs::PostPresenter.new(post)
+        @post_presenter ||= PostPresenter.new(post)
       end
 
       def posts

data/app/forms/decidim/blogs/post_form.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Blogs
+    # This class holds a Form to update pages from Decidim's admin panel.
+    class PostForm < Decidim::Form
+      include TranslatableAttributes
+
+      translatable_attribute :title, String
+      translatable_attribute :body, Decidim::Attributes::RichText
+
+      attribute :decidim_author_id, Integer
+
+      validates :body, translatable_presence: true
+      validates :title, translatable_presence: true
+
+      validate :can_set_author
+
+      def map_model(model)
+        presenter = PostPresenter.new(model)
+
+        self.title = presenter.title
+        self.body = presenter.body
+      end
+
+      def author
+        @author ||= Decidim::UserBaseEntity.find_by(
+          organization: current_organization,
+          id: decidim_author_id
+        )
+      end
+
+      private
+
+      def can_set_author
+        return if author == current_user
+        return if user_groups.include? author
+        return if author == post&.author
+
+        errors.add(:decidim_author_id, :invalid)
+      end
+
+      def post
+        @post ||= Post.find_by(id: id)
+      end
+
+      def user_groups
+        @user_groups ||= Decidim::UserGroups::ManageableUserGroups.for(current_user).verified
+      end
+    end
+  end
+end

data/app/helpers/decidim/blogs/posts_helper.rb

@@ -18,6 +18,11 @@ module Decidim
         body = translated_attribute(post.body)
         CGI.unescapeHTML html_truncate(body, max_length:)
       end
+
+      def render_schema_org_blog_posting_post(post)
+        exported_post = Decidim::Exporters::JSON.new([post], SchemaOrgBlogPostingPostSerializer).export.read
+        JSON.pretty_generate(JSON.parse(exported_post).first)
+      end
     end
   end
 end

data/app/helpers/decidim/blogs/posts_select_helper.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Blogs
+    # Custom helpers used in posts views
+    module PostsSelectHelper
+      include Decidim::ApplicationHelper
+      include SanitizeHelper
+
+      def fo_post_author_select_field(form, name, _options = {})
+        select_options = [
+          [current_user.name, current_user.id]
+        ]
+
+        select_options += user_groups
+        select_options << [form.object.author.name, form.object.author.id] unless !form.object.author || select_options.pluck(1).include?(form.object.author.id)
+
+        return form.select(name, select_options) if select_options.size > 1
+
+        form.hidden_field(name, value: select_options.first[1])
+      end
+
+      private
+
+      def user_groups
+        return [] unless current_organization.user_groups_enabled?
+
+        Decidim::UserGroups::ManageableUserGroups.for(current_user).verified.map { |user_g| [user_g.name, user_g.id] }
+      end
+    end
+  end
+end

data/app/models/decidim/blogs/post.rb

@@ -18,6 +18,7 @@ module Decidim
       include Decidim::TranslatableResource
       include Traceable
       include Loggable
+      include Decidim::SoftDeletable
 
       component_manifest_name "blogs"
 
@@ -26,7 +27,7 @@ module Decidim
       validates :title, presence: true
 
       scope :created_at_desc, -> { order(arel_table[:created_at].desc) }
-      scope :published, -> { where("published_at <= ?", Time.current) }
+      scope :published, -> { where(published_at: ..Time.current) }
 
       searchable_fields({
                           participatory_space: { component: :participatory_space },

data/app/packs/stylesheets/blogs.scss

@@ -7,26 +7,6 @@
     }
   }
 
-  &__actions {
-    @apply flex flex-col md:flex-row justify-between items-center gap-10 pt-10;
-
-    &-left {
-      @apply flex items-center gap-2;
-    }
-
-    &-right {
-      @apply flex items-center gap-4;
-
-      button {
-        @apply flex items-center gap-1;
-      }
-    }
-
-    .is-active span:last-child {
-      @apply text-white bg-secondary border-secondary;
-    }
-  }
-
   &__endorsers {
     @apply space-y-3;
 

data/app/permissions/decidim/blog/permissions.rb

@@ -4,18 +4,101 @@ module Decidim
   module Blog
     class Permissions < Decidim::DefaultPermissions
       def permissions
-        return permission_action unless permission_action.subject == :blogpost
+        return permission_action unless permission_action.subject == :blogpost || permission_action.subject == :post
 
         if permission_action.scope == :public
+          if permission_action.action.in?([:update, :destroy])
+            toggle_allow(can_manage_post)
+            return permission_action
+          end
+
+          if permission_action.action == :create
+            toggle_allow(can_create_post)
+            return permission_action
+          end
+
           allow!
           return permission_action
         end
 
-        return permission_action if permission_action.scope != :admin
+        return permission_action unless permission_action.scope == :admin
+
+        if permission_action.action.in?([:update, :destroy])
+          toggle_allow(admin_can_manage_post)
+          return permission_action
+        end
 
         allow!
         permission_action
       end
+
+      def post
+        @post ||= context.fetch(:blogpost, nil)
+      end
+
+      def current_component
+        @current_component ||= context.fetch(:current_component, nil)
+      end
+
+      def can_create_post
+        current_component&.participatory_space&.published? &&
+          current_component&.published? &&
+          (creation_enabled_for_participants? || initiative_authorship?)
+      end
+
+      def can_manage_post
+        return false unless post&.author
+
+        can_create_post && post&.author == user
+      end
+
+      def admin_can_manage_post
+        return false unless post&.author
+
+        case post.author
+        when Decidim::User
+          post.author == user
+        when Decidim::UserGroup
+          post.author.users.include?(user)
+        when Decidim::Organization
+          space_admin?
+        else
+          false
+        end
+      end
+
+      def space_admin?
+        space_admins.include?(user)
+      end
+
+      def creation_enabled_for_participants?
+        component_settings&.creation_enabled_for_participants? &&
+          current_component&.participatory_space&.can_participate?(user)
+      end
+
+      def space_admins
+        participatory_space = current_component&.participatory_space
+
+        return [] unless participatory_space
+
+        @space_admins ||= begin
+          space_admins = if participatory_space.respond_to?(:user_roles)
+                           participatory_space.user_roles(:admin)&.collect(&:user)
+                         else
+                           []
+                         end
+          global_admins = current_component.organization.admins
+          (global_admins + space_admins).uniq
+        end
+      end
+
+      def initiative_authorship?
+        return false unless user
+
+        Decidim.module_installed?("initiatives") &&
+          current_component&.participatory_space.is_a?(Decidim::Initiative) &&
+          current_component&.participatory_space&.has_authorship?(user)
+      end
     end
   end
 end

data/app/presenters/decidim/blogs/admin_log/post_presenter.rb

@@ -17,7 +17,7 @@ module Decidim
 
         def action_string
           case action
-          when "create", "delete", "update"
+          when "create", "delete", "update", "soft_delete", "restore"
             "decidim.blogs.admin_log.post.#{action}"
           else
             super

data/app/presenters/decidim/blogs/post_presenter.rb

@@ -5,7 +5,11 @@ module Decidim
     #
     # Decorator for posts
     #
-    class PostPresenter < SimpleDelegator
+    class PostPresenter < Decidim::ResourcePresenter
+      include Decidim::ResourceHelper
+      include ActionView::Helpers::UrlHelper
+      include Decidim::SanitizeHelper
+
       def author
         @author ||= if official?
                       Decidim::Blogs::OfficialAuthorPresenter.new
@@ -15,6 +19,26 @@ module Decidim
                       Decidim::UserPresenter.new(super)
                     end
       end
+
+      def post
+        __getobj__
+      end
+
+      def post_path
+        Decidim::ResourceLocatorPresenter.new(post).path
+      end
+
+      def title(links: false, html_escape: false, all_locales: false)
+        return unless post
+
+        super(post.title, links, html_escape, all_locales)
+      end
+
+      def body(links: false, extras: true, strip_tags: false, all_locales: false)
+        return unless post
+
+        content_handle_locale(post.body, all_locales, extras, links, strip_tags)
+      end
     end
   end
 end

data/app/views/decidim/blogs/admin/posts/_actions.html.erb

@@ -0,0 +1,21 @@
+<% if view == :deleted %>
+  <% if allowed_to? :restore, :blogpost, trashable_deleted_resource: post %>
+    <%= icon_link_to "refresh-line", url_for(action: :restore, id: post, controller: "posts"), t("decidim.admin.actions.restore"), method: :patch, class: "action-icon--restore" %>
+  <% end %>
+<% else %>
+  <% if allowed_to? :update, :blogpost, blogpost: post %>
+    <%= icon_link_to "pencil-line", edit_post_path(post), t("actions.edit", scope: "decidim.blogs"), class: "action-icon--edit" %>
+    <%= icon_link_to "folder-line", post_attachment_collections_path(post), t("actions.attachment_collections", scope: "decidim.meetings"), class: "action-icon--attachment_collections" %>
+    <%= icon_link_to "attachment-line", post_attachments_path(post), t("actions.attachments", scope: "decidim.meetings"), class: "action-icon--attachments" %>
+  <% end %>
+
+  <%= icon_link_to "eye-line", resource_locator(post).path, t("actions.preview", scope: "decidim.admin"), class: "action-icon--preview", target: :blank, data: { "external-link": false } %>
+
+  <%= resource_permissions_link(post) %>
+
+  <% if allowed_to? :soft_delete, :blogpost, trashable_deleted_resource: post %>
+    <%= icon_link_to "delete-bin-line", soft_delete_post_path(post), t("actions.soft_delete", scope: "decidim.admin"), method: :patch, class: "action-icon--delete", data: { confirm: t("actions.confirm_delete_post", scope: "decidim.blogs") } %>
+  <% else %>
+    <%= icon "delete-bin-line", class: "action-icon action-icon--disabled", role: "img", aria_label: t("actions.soft_delete", scope: "decidim.admin") %>
+  <% end %>
+<% end %>

data/app/views/decidim/blogs/admin/posts/_post-tr.html.erb

@@ -0,0 +1,25 @@
+<tr data-id="<%= post.id %>">
+  <td>
+    <% if allowed_to? :update, :blogpost, blogpost: post %>
+      <%= link_to translated_attribute(post.title), edit_post_path(post) %><br>
+    <% else %>
+      <%= translated_attribute(post.title) %><br>
+    <% end %>
+  </td>
+  <td>
+    <%= decidim_sanitize_editor post_description_admin(post) %>
+  </td>
+  <td>
+    <%= translated_attribute(post.try(:author).try(:name)) %>
+  </td>
+  <% publish_data = publish_data(post.published_at) %>
+  <td>
+    <%= content_tag :span, class: "padding-3", data: { tooltip: true, disable_hover: false, click_open: false }, title: publish_data[:popup] do
+      publish_data[:icon]
+    end %>
+    <%= l post.published_at, format: :decidim_short %>
+  </td>
+  <td class="table-list__actions">
+    <%= render partial: "decidim/blogs/admin/posts/actions", locals: { post:, view: } %>
+  </td>
+</tr>

data/app/views/decidim/blogs/admin/posts/_posts-thead.html.erb

@@ -0,0 +1,9 @@
+<thead>
+<tr>
+  <th><%= t("models.post.fields.title", scope: "decidim.blogs") %></th>
+  <th><%= t("models.post.fields.body", scope: "decidim.blogs") %></th>
+  <th><%= t("models.post.fields.author", scope: "decidim.blogs") %></th>
+  <th><%= t("models.post.fields.published_at", scope: "decidim.blogs") %></th>
+  <th><%= t("actions.title", scope: "decidim.blogs") %></th>
+</tr>
+</thead>

data/app/views/decidim/blogs/admin/posts/index.html.erb

@@ -9,64 +9,25 @@
   </div>
   <div class="table-scroll">
     <table class="table-list">
-      <thead>
-        <tr>
-          <th><%= t("models.post.fields.title", scope: "decidim.blogs") %></th>
-          <th><%= t("models.post.fields.body", scope: "decidim.blogs") %></th>
-          <th><%= t("models.post.fields.author", scope: "decidim.blogs") %></th>
-          <th><%= t("models.post.fields.published_at", scope: "decidim.blogs") %></th>
-          <th><%= t("actions.title", scope: "decidim.blogs") %></th>
-        </tr>
-      </thead>
+      <%= render partial: "posts-thead" %>
       <tbody>
-        <% posts.created_at_desc.each do |post| %>
-
-          <tr data-id="<%= post.id %>">
-            <td>
-              <% if allowed_to? :update, :blogpost, blog_post: post %>
-                <%= link_to translated_attribute(post.title), edit_post_path(post) %><br>
-              <% else %>
-                <%= translated_attribute(post.title) %><br>
-              <% end %>
-            </td>
-            <td>
-              <%= decidim_sanitize_editor post_description_admin(post) %>
-            </td>
-            <td>
-              <%= translated_attribute(post.try(:author).try(:name)) %>
-            </td>
-            <% publish_data = publish_data(post.published_at) %>
-            <td>
-              <%= content_tag :span, class: "padding-3", data: { tooltip: true, disable_hover: false, click_open: false }, title: publish_data[:popup] do
-                publish_data[:icon]
-              end %>
-              <%= l post.published_at, format: :decidim_short %>
-            </td>
-            <td class="table-list__actions">
-              <% if allowed_to? :update, :blogpost, blog_post: post %>
-                <%= icon_link_to "pencil-line", edit_post_path(post), t("actions.edit", scope: "decidim.blogs"), class: "action-icon--edit" %>
-              <% end %>
-
-              <% if allowed_to? :update, :blogpost, blog_post: post %>
-                <%= icon_link_to "folder-line", post_attachment_collections_path(post), t("actions.attachment_collections", scope: "decidim.meetings"), class: "action-icon--attachment_collections" %>
-              <% end %>
-
-              <% if allowed_to? :update, :blogpost, blog_post: post %>
-                <%= icon_link_to "attachment-line", post_attachments_path(post), t("actions.attachments", scope: "decidim.meetings"), class: "action-icon--attachments" %>
-              <% end %>
-
-              <%= icon_link_to "eye-line", resource_locator(post).path, t("actions.preview", scope: "decidim.admin"), class: "action-icon--preview", target: :blank, data: { "external-link": false } %>
-
-              <%= resource_permissions_link(post) %>
-
-              <% if allowed_to? :destroy, :blogpost, blog_post: post %>
-                <%= icon_link_to "delete-bin-line", post_path(post), t("actions.destroy", scope: "decidim.blogs"), method: :delete, class: "action-icon--remove", data: { confirm: t("actions.confirm_destroy", scope: "decidim.blogs") } %>
-              <% end %>
-            </td>
-          </tr>
-        <% end %>
+        <%= render partial: "decidim/blogs/admin/posts/post-tr",
+                   collection: posts,
+                   as: :post,
+                   locals: { view: :index } %>
       </tbody>
     </table>
   </div>
+  <% if allowed_to? :manage_trash, :post, participatory_space: current_participatory_space %>
+    <div class="card mt-4">
+      <%= link_to manage_trash_posts_path, class: "flex items-center underline text-secondary" do %>
+        <%= icon "delete-bin-2-line", class: "mr-2 fill-current text-secondary", role: "img" %>
+        <%= t("actions.view_deleted_posts", scope: "decidim.blogs") %>
+        <span class="ml-2">
+          <%= icon_with_tooltip("information-line", t("actions.deleted_posts_info", scope: "decidim.blogs")) %>
+        </span>
+      <% end %>
+    </div>
+  <% end %>
 </div>
 <%= decidim_paginate posts %>

data/app/views/decidim/blogs/admin/posts/manage_trash.html.erb

@@ -0,0 +1,20 @@
+<% add_decidim_page_title(t(".title")) %>
+<div class="card">
+  <div class="item_show__header">
+    <h1 class="item_show__header-title">
+      <%= t(".title") %>
+    </h1>
+  </div>
+  <div class="table-scroll">
+    <table class="table-list">
+      <%= render partial: "posts-thead" %>
+      <tbody>
+        <%= render partial: "decidim/blogs/admin/posts/post-tr",
+                   collection: trashable_deleted_collection,
+                   as: :post,
+                   locals: { view: :deleted } %>
+      </tbody>
+    </table>
+  </div>
+</div>
+<%= decidim_paginate trashable_deleted_collection %>