decidim-blogs 0.30.2 → 0.31.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d43ca2bb8f318fe9c49f534ecd1da0f00d340f2d913b739109b31b9588fce3f7
-  data.tar.gz: 7a7f039689ccbf6a7831bf6c742eb4a8095f258a8797716908e150b3a25239ee
+  metadata.gz: c986e37bda0dace89dd1a56dc426d9149aefe3b19f3c7e767a77e115e5b75185
+  data.tar.gz: 9a78f9ac1c9e85f47df9a2e8ff49c06641d2973dce644c1f19a4e4e4fedf1804
 SHA512:
-  metadata.gz: 6992cd462f97d918b723c2f9f4b5207ed4ff6447ae4b00550f2738f08c48a9d5cce60302c43bdef4652f5e134aafc5be052948951f3b23e67f883ac69f0266a9
-  data.tar.gz: b54970da820f12bbe1b87ebe6c55a54a7affba58bb77894e8a85e5c12ce088b27a89b1d2abb4d197a1545b8417cec496ec995d8c4c6d957542959baed91c1a7f
+  metadata.gz: 32a3b6d0079d7ccf256b782dc3498421afa07f7e81d0721a635ebecce4e3d675fc8d5799936f07b3a1a208b702e68ad7d3569e0bc8a207cf93594d22cb761ba2
+  data.tar.gz: e048d6740c1505e98754ea007a59fa91088a4d6710e8dfdc7a0528707c2c8ebb59986d8c1e551fed877609e84772de9aa642bea7e2ec783650fce40db38acd63

data/app/cells/decidim/blogs/post_metadata_cell.rb

@@ -13,7 +13,7 @@ module Decidim
       private
 
       def post_items
-        [author_item, creation_date, comments_count_item, endorsements_count_item]
+        [author_item, creation_date, comments_count_item, likes_count_item]
       end
 
       def creation_date

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

@@ -6,7 +6,7 @@ module Decidim
       # This command is executed when the user creates a Post from the admin
       # panel.
       class CreatePost < Decidim::Commands::CreateResource
-        fetch_form_attributes :title, :body, :published_at, :author, :component
+        fetch_form_attributes :title, :body, :published_at, :author, :component, :taxonomizations
 
         private
 

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

@@ -6,7 +6,7 @@ module Decidim
       # This command is executed when the user changes a Post from the admin
       # panel.
       class UpdatePost < Decidim::Commands::UpdateResource
-        fetch_form_attributes :title, :body, :author
+        fetch_form_attributes :title, :body, :author, :taxonomizations
 
         private
 

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

@@ -4,16 +4,39 @@ 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
+      include ::Decidim::MultipleAttachmentsMethods
 
-      private
+      fetch_form_attributes :author, :taxonomizations
 
-      def resource_class = Decidim::Blogs::Post
+      def call
+        return broadcast(:invalid) if invalid?
+
+        if process_attachments?
+          build_attachments
+          return broadcast(:invalid) if attachments_invalid?
+        end
+
+        perform!
+        broadcast(:ok, resource)
+      rescue ActiveRecord::RecordInvalid
+        add_file_attribute_errors!
+        broadcast(:invalid)
+      rescue Decidim::Commands::HookError
+        broadcast(:invalid)
+      end
+
+      protected
 
       def run_after_hooks
+        @attached_to = resource
+        create_attachments(first_weight: 1) if process_attachments?
         send_notification
       end
 
+      def resource_class = Decidim::Blogs::Post
+
+      def extra_params = { visibility: "all" }
+
       def attributes
         super.merge(
           title: { I18n.locale => form.title },

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

@@ -4,7 +4,26 @@ 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
+      include ::Decidim::MultipleAttachmentsMethods
+
+      fetch_form_attributes :title, :body, :taxonomizations
+
+      def call
+        return broadcast(:invalid) if invalid?
+
+        if process_attachments?
+          build_attachments
+          return broadcast(:invalid) if attachments_invalid?
+        end
+
+        perform!
+        broadcast(:ok, resource)
+      rescue ActiveRecord::RecordInvalid
+        add_file_attribute_errors!
+        broadcast(:invalid)
+      rescue Decidim::Commands::HookError
+        broadcast(:invalid)
+      end
 
       private
 
@@ -16,6 +35,12 @@ module Decidim
           body: { I18n.locale => form.body }
         )
       end
+
+      def run_after_hooks
+        @attached_to = resource
+        document_cleanup!(include_all_attachments: true)
+        create_attachments(first_weight: 1) if process_attachments?
+      end
     end
   end
 end

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

@@ -7,7 +7,6 @@ module Decidim
       class PostsController < Admin::ApplicationController
         include Decidim::Admin::HasTrashableResources
 
-        helper UserGroupHelper
         helper PostsHelper
 
         def new
@@ -27,7 +26,7 @@ module Decidim
 
             on(:invalid) do
               flash.now[:alert] = I18n.t("posts.create.invalid", scope: "decidim.blogs.admin")
-              render action: "new"
+              render action: "new", status: :unprocessable_entity
             end
           end
         end
@@ -49,7 +48,7 @@ module Decidim
 
             on(:invalid) do
               flash.now[:alert] = I18n.t("posts.update.invalid", scope: "decidim.blogs.admin")
-              render action: "edit"
+              render action: "edit", status: :unprocessable_entity
             end
           end
         end

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

@@ -8,7 +8,6 @@ module Decidim
       include Paginable
       include Decidim::IconHelper
 
-      helper Decidim::UserGroupHelper
       helper Decidim::Blogs::PostsSelectHelper
       include Decidim::FormFactory
 
@@ -37,7 +36,7 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = I18n.t("posts.create.invalid", scope: "decidim.blogs.admin")
-            render action: "new"
+            render action: "new", status: :unprocessable_entity
           end
         end
       end
@@ -59,7 +58,7 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = I18n.t("posts.update.invalid", scope: "decidim.blogs.admin")
-            render action: "edit"
+            render action: "edit", status: :unprocessable_entity
           end
         end
       end

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

@@ -6,6 +6,7 @@ module Decidim
       # This class holds a Form to update pages from Decidim's admin panel.
       class PostForm < Decidim::Form
         include TranslatableAttributes
+        include Decidim::HasTaxonomyFormAttributes
 
         translatable_attribute :title, String
         translatable_attribute :body, Decidim::Attributes::RichText
@@ -17,6 +18,8 @@ module Decidim
         validates :body, translatable_presence: true
         validate :can_set_author
 
+        alias component current_component
+
         def map_model(model)
           self.decidim_author_id = nil if model.author.is_a? Decidim::Organization
         end
@@ -37,7 +40,6 @@ module Decidim
         def can_set_author
           return if author == current_user.organization
           return if author == current_user
-          return if user_groups.include? author
           return if author == post&.author
 
           errors.add(:decidim_author_id, :invalid)
@@ -47,8 +49,8 @@ module Decidim
           @post ||= Post.find_by(id:)
         end
 
-        def user_groups
-          @user_groups ||= Decidim::UserGroups::ManageableUserGroups.for(current_user).verified
+        def participatory_space_manifest
+          @participatory_space_manifest ||= current_component.participatory_space.manifest.name
         end
       end
     end

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

@@ -5,22 +5,30 @@ module Decidim
     # This class holds a Form to update pages from Decidim's admin panel.
     class PostForm < Decidim::Form
       include TranslatableAttributes
+      include Decidim::HasTaxonomyFormAttributes
+      include Decidim::AttachmentAttributes
+      include Decidim::HasUploadValidations
 
       translatable_attribute :title, String
       translatable_attribute :body, Decidim::Attributes::RichText
 
       attribute :decidim_author_id, Integer
 
+      attachments_attribute :documents
+
       validates :body, translatable_presence: true
       validates :title, translatable_presence: true
 
       validate :can_set_author
 
+      alias component current_component
+
       def map_model(model)
         presenter = PostPresenter.new(model)
 
         self.title = presenter.title
         self.body = presenter.body
+        self.documents = model.attachments
       end
 
       def author
@@ -34,7 +42,6 @@ module Decidim
 
       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)
@@ -44,8 +51,8 @@ module Decidim
         @post ||= Post.find_by(id: id)
       end
 
-      def user_groups
-        @user_groups ||= Decidim::UserGroups::ManageableUserGroups.for(current_user).verified
+      def participatory_space_manifest
+        @participatory_space_manifest ||= current_component.participatory_space.manifest.name
       end
     end
   end

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

@@ -22,12 +22,10 @@ module Decidim
 
         def post_author_select_field(form, name, _options = {})
           select_options = [
-            [current_organization_name, ""],
-            [current_user.name, current_user.id]
+            [current_organization_name, ""]
           ]
-          current_user_groups = Decidim::UserGroups::ManageableUserGroups.for(current_user).verified
+          select_options << [current_user.name, current_user.id]
 
-          select_options += current_user_groups.map { |g| [g.name, g.id] } if current_organization.user_groups_enabled? && current_user_groups.any?
           unless form.object.author.is_a?(Organization) || select_options.pluck(1).include?(form.object.author.id)
             select_options << [form.object.author.name, form.object.author.id]
           end

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

@@ -8,7 +8,7 @@ module Decidim
       include PaginateHelper
       include SanitizeHelper
       include Decidim::Blogs::PostsHelper
-      include ::Decidim::EndorsableHelper
+      include ::Decidim::LikeableHelper
       include ::Decidim::FollowableHelper
       include Decidim::Comments::CommentsHelper
 

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

@@ -12,21 +12,12 @@ module Decidim
           [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

@@ -9,10 +9,11 @@ module Decidim
       include Decidim::HasAttachments
       include Decidim::HasAttachmentCollections
       include Decidim::HasComponent
+      include Decidim::Taxonomizable
       include Decidim::Authorable
       include Decidim::Comments::CommentableWithComponent
       include Decidim::Searchable
-      include Decidim::Endorsable
+      include Decidim::Likeable
       include Decidim::Followable
       include Decidim::Reportable
       include Decidim::Publicable
@@ -49,6 +50,12 @@ module Decidim
         end
       end
 
+      # Returns the presenter for this BlogPost, to be used in the views.
+      # Required by ResourceRenderer.
+      def presenter
+        Decidim::Blogs::PostPresenter.new(self)
+      end
+
       def visible?
         participatory_space.try(:visible?) && component.try(:published?) && published?
       end
@@ -76,10 +83,6 @@ module Decidim
         author.is_a?(Decidim::Organization)
       end
 
-      def user_group?
-        author.is_a?(Decidim::UserGroup)
-      end
-
       def users_to_notify_on_comment_created
         followers
       end
@@ -95,7 +98,7 @@ module Decidim
 
       # Public: Overrides the `reported_searchable_content_extras` Reportable concern method.
       def reported_searchable_content_extras
-        [normalized_author.name]
+        [author.name]
       end
     end
   end

data/app/packs/stylesheets/blogs.scss

@@ -7,7 +7,7 @@
     }
   }
 
-  &__endorsers {
+  &__likes {
     @apply space-y-3;
 
     &-text {

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

@@ -49,7 +49,7 @@ module Decidim
       def can_manage_post
         return false unless post&.author
 
-        can_create_post && post&.author == user
+        can_create_post && admin_can_manage_post
       end
 
       def admin_can_manage_post
@@ -58,8 +58,6 @@ module Decidim
         case post.author
         when Decidim::User
           post.author == user
-        when Decidim::UserGroup
-          post.author.users.include?(user)
         when Decidim::Organization
           space_admin?
         else

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

@@ -13,8 +13,6 @@ module Decidim
       def author
         @author ||= if official?
                       Decidim::Blogs::OfficialAuthorPresenter.new
-                    elsif user_group?
-                      Decidim::UserGroupPresenter.new(super)
                     else
                       Decidim::UserPresenter.new(super)
                     end
@@ -28,16 +26,22 @@ module Decidim
         Decidim::ResourceLocatorPresenter.new(post).path
       end
 
-      def title(links: false, html_escape: false, all_locales: false)
+      def title(html_escape: false, all_locales: false)
         return unless post
 
-        super(post.title, links, html_escape, all_locales)
+        super(post.title, html_escape, all_locales)
       end
 
-      def body(links: false, extras: true, strip_tags: false, all_locales: false)
+      def body(links: false, strip_tags: false, all_locales: false)
         return unless post
 
-        content_handle_locale(post.body, all_locales, extras, links, strip_tags)
+        content_handle_locale(post.body, all_locales, links, strip_tags)
+      end
+
+      def taxonomy_names(html_escape: false, all_locales: false)
+        post.taxonomies.map do |taxonomy|
+          taxonomy.presenter.title(html_escape:, all_locales:)
+        end
       end
     end
   end

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

@@ -1,21 +1,84 @@
-<% 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 %>
+<button type="button" data-controller="dropdown" data-target="actions-post-<%= post.id %>" aria-label="<%= t("decidim.admin.actions.actions_label", resource: post.title) %>">
+  <%= icon "more-fill", class: "text-secondary" %>
+</button>
+
+<div class="inline-block relative">
+  <ul id="actions-post-<%= post.id %>" class="dropdown dropdown__action" aria-hidden="true">
+    <% if view == :deleted %>
+      <% if allowed_to? :restore, :blogpost, trashable_deleted_resource: post %>
+        <li class="dropdown__item">
+          <%= link_to url_for(action: :restore, id: post, controller: "posts"), method: :patch, class: "dropdown__button" do %>
+            <%= icon "refresh-line" %>
+            <%= t("decidim.admin.actions.restore") %>
+          <% end %>
+        </li>
+      <% end %>
+    <% else %>
+      <% if allowed_to? :update, :blogpost, blogpost: post %>
+        <li class="dropdown__item">
+          <%= link_to edit_post_path(post), class: "dropdown__button" do %>
+            <%= icon "pencil-line" %>
+            <%= t("actions.edit", scope: "decidim.blogs") %>
+          <% end %>
+        </li>
+
+        <hr>
+
+        <% if component_settings.attachments_allowed? %>
+          <li class="dropdown__item">
+            <%= link_to post_attachments_path(post), class: "dropdown__button" do %>
+              <%= icon "attachment-line" %>
+              <%= t("actions.attachments", scope: "decidim.admin") %>
+            <% end %>
+          </li>
+
+          <li class="dropdown__item">
+            <%= link_to post_attachment_collections_path(post), class: "dropdown__button" do %>
+              <%= icon "folder-line" %>
+              <%= t("actions.attachment_collections", scope: "decidim.admin") %>
+            <% end %>
+          </li>
+
+          <hr>
+        <% end %>
+      <% end %>
+
+      <li class="dropdown__item">
+        <%= link_to resource_locator(post).path, target: :blank, data: { "external-link": false }, class: "dropdown__button" do %>
+          <%= icon "eye-line" %>
+          <%= t("actions.preview", scope: "decidim.admin") %>
+        <% end %>
+      </li>
+
+      <hr>
+
+      <li class="dropdown__item">
+        <%= dropdown_resource_permissions_link(post) %>
+      </li>
+
+      <% if allowed_to? :soft_delete, :blogpost, trashable_deleted_resource: post %>
+        <hr>
+
+        <li class="dropdown__item">
+          <%= link_to soft_delete_post_path(post), method: :patch, data: { confirm: t("actions.confirm_delete_post", scope: "decidim.blogs") }, class: "dropdown__button" do %>
+            <%= icon "delete-bin-line" %>
+            <%= t("actions.soft_delete", scope: "decidim.admin") %>
+          <% end %>
+        </li>
+      <% else %>
+        <hr>
+
+        <li class="dropdown__item">
+          <div class="dropdown__button-disabled">
+            <%= with_tooltip t("tooltips.deleted_posts_info", scope: "decidim.admin") do %>
+              <%= icon "delete-bin-line", class: "text-gray" %>
+              <span>
+                <%= t("actions.soft_delete", scope: "decidim.admin") %>
+              </span>
+            <% end %>
+          </div>
+        </li>
+      <% end %>
+    <% end %>
+  </ul>
+</div>

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

@@ -16,6 +16,13 @@
           <%= form.datetime_field :published_at %>
         </div>
       </div>
+      <% if @form.taxonomy_filters&.any? %>
+        <% @form.taxonomy_filters.each do |filter| %>
+          <div class="row column">
+            <%= filter_taxonomy_items_select_field form, :taxonomies, filter %>
+          </div>
+        <% end %>
+      <% end %>
     </div>
   </div>
 

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

@@ -1,25 +1,28 @@
 <tr data-id="<%= post.id %>">
-  <td>
+  <td data-label="<%= t("models.post.fields.title", scope: "decidim.blogs") %>">
     <% 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>
+  <td data-label="<%= t("models.post.fields.body", scope: "decidim.blogs") %>">
     <%= decidim_sanitize_editor post_description_admin(post) %>
   </td>
-  <td>
+  <td data-label="<%= t("models.post.fields.author", scope: "decidim.blogs") %>">
     <%= translated_attribute(post.try(:author).try(:name)) %>
   </td>
+  <td data-label="<%= t("models.post.fields.taxonomies", scope: "decidim.blogs") %>">
+    <%= present(post).taxonomy_names.join(", ") %>
+  </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 %>
+  <td data-label="<%= t("models.post.fields.published_at", scope: "decidim.blogs") %>">
+    <% if publish_data[:icon] .present? %>
+      <%= with_tooltip(publish_data[:popup], title: publish_data[:popup], class: "left") { publish_data[:icon] } %>
+    <% end %>
     <%= l post.published_at, format: :decidim_short %>
   </td>
-  <td class="table-list__actions">
+  <td class="table-list__actions" data-label="<%= t("actions.title", scope: "decidim.blogs") %>">
     <%= render partial: "decidim/blogs/admin/posts/actions", locals: { post:, view: } %>
   </td>
 </tr>

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

@@ -3,6 +3,7 @@
   <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.taxonomies", scope: "decidim.blogs") %></th>
   <th><%= t("models.post.fields.published_at", scope: "decidim.blogs") %></th>
   <th><%= t("actions.title", scope: "decidim.blogs") %></th>
 </tr>

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

@@ -7,7 +7,7 @@
       <%= render partial: "decidim/admin/components/resource_action" %>
     </h1>
   </div>
-  <div class="table-scroll">
+  <div class="table-stacked">
     <table class="table-list">
       <%= render partial: "posts-thead" %>
       <tbody>
@@ -20,7 +20,7 @@
   </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 %>
+      <%= link_to manage_trash_posts_path, class: "flex items-center  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">

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

@@ -1,11 +1,12 @@
 <% 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">
+  <div class="table-stacked">
     <table class="table-list">
       <%= render partial: "posts-thead" %>
       <tbody>

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

@@ -1,5 +1,5 @@
 <section class="layout-main__section layout-main__buttons  pt-10" data-buttons>
-    <%= cell("decidim/endorsement_block", post) %>
+    <%= cell("decidim/like_block", post) %>
 
   <%= cell "decidim/comments_button", nil %>
 
@@ -8,4 +8,4 @@
   </div>
 </section>
 
-<%= cell "decidim/endorsers_list", post %>
+<%= cell "decidim/likers_list", post %>