decidim-blogs 0.27.5 → 0.28.0.rc4

data/config/locales/ru.yml

@@ -26,49 +26,43 @@ ru:
         new: Создать новый пост
         title: Действия
       admin:
-        models:
-          post:
-            name: Пост
         posts:
           create:
-            invalid: При попытке добавить этот пост произошла ошибка
-            success: Пост успешно создан
+            invalid: При попытке добавить этот пост произошла ошибка.
+            success: Пост успешно создан.
           destroy:
-            success: Пост успешно удален
+            success: Пост успешно удален.
           edit:
             save: Обновить
             title: Изменить пост
           index:
+            not_published_yet: Пока не опубликовано.
             title: Посты
           new:
             create: Создать
             title: Создать пост
           update:
             invalid: При попытке сохранить пост произошли ошибки.
-            success: Пост успешно сохранен
+            success: Пост успешно сохранен.
       admin_log:
         post:
           create: "%{user_name} создал пост %{resource_name} в %{space_name}"
           delete: "%{user_name} удалил пост %{resource_name} в %{space_name}"
           update: "%{user_name} обновил пост %{resource_name} в %{space_name}"
+      content_blocks:
+        highlighted_posts:
+          last_published: Последние опубликованные
+          name: Посты
+          see_all: Посмотреть все посты
       last_activity:
-        new_post_at_html: "<span>Новый пост по ссылке %{link}</span>"
+        new_post: 'Новый пост:'
       models:
         post:
           fields:
             author: Автор
             body: Основной текст
-            created_at: 'Создано:'
+            published_at: Время публикации
             title: Название
-      posts:
-        show:
-          back: Назад к списку
-          comments: Комментарии
-          view: Посмотреть
-        sidebar_blog:
-          comments: комментарии
-          most_commented_posts: Наиболее комментируемые посты
-      read_more: Читать подробнее
     components:
       blogs:
         actions:

data/config/locales/sk.yml

@@ -19,15 +19,7 @@ sk:
         new: Nový príspevok
         title: Akcie
       admin:
-        models:
-          post:
-            name: Príspevok
         posts:
-          create:
-            invalid: Vyskytol sa problém s vytváraním príspevku
-            success: Príspevok úspešne vytvorený
-          destroy:
-            success: Príspevok úspešne odstránený
           edit:
             save: Aktualizovať
           index:
@@ -37,24 +29,11 @@ sk:
             title: Vytvort príspevok
           update:
             invalid: Vyskytol sa problém s ukladaním príspevku.
-            success: Príspevok úspešne uložený
-      last_activity:
-        new_post_at_html: "<span>Nový príspevok na %{link}</span>"
       models:
         post:
           fields:
             author: Autor
             body: Telo textu
-            created_at: Vytvorené
-      posts:
-        show:
-          back: Späť na zoznam
-          comments: Komentáre
-          view: Zobraziť
-        sidebar_blog:
-          comments: komentáre
-          most_commented_posts: Najviac komentované príspevky
-      read_more: Čítať ďalej
     components:
       blogs:
         name: Blog

data/config/locales/sr-CS.yml

@@ -1,11 +1,6 @@
 ---
 sr:
   decidim:
-    blogs:
-      posts:
-        show:
-          back: Nazad na listu
-          comments: Komentari
     components:
       blogs:
         settings:

data/config/locales/sv.yml

@@ -23,15 +23,7 @@ sv:
         new: Nytt inlägg
         title: Åtgärder
       admin:
-        models:
-          post:
-            name: Publicera
         posts:
-          create:
-            invalid: Det gick inte att skapa inlägget
-            success: Inlägget har skapats
-          destroy:
-            success: Inlägget har raderats
           edit:
             save: Uppdatera
             title: Redigera inlägg
@@ -42,26 +34,19 @@ sv:
             title: Skapa inlägg
           update:
             invalid: Det gick inte att spara inlägget.
-            success: Inlägget har sparats
+      content_blocks:
+        highlighted_posts:
+          name: Inlägg
+          see_all: Se alla inlägg
       last_activity:
-        new_post_at_html: "<span>Nytt inlägg på %{link}</span>"
+        new_post: 'Nytt inlägg:'
       models:
         post:
           fields:
             author: Författare
             body: Innehåll
-            created_at: Skapad
             official_blog_post: Officiellt inlägg
             title: Titel
-      posts:
-        show:
-          back: Tillbaka till listan
-          comments: Kommentarer
-          view: Visa
-        sidebar_blog:
-          comments: kommentarer
-          most_commented_posts: Mest kommenterade inlägg
-      read_more: Läs mer
     components:
       blogs:
         actions:

data/config/locales/tr-TR.yml

@@ -23,15 +23,7 @@ tr:
         new: Yeni posta
         title: Eylemler
       admin:
-        models:
-          post:
-            name: posta
         posts:
-          create:
-            invalid: Bu yayını oluştururken bir sorun oluştu
-            success: Yayın başarıyla oluşturuldu
-          destroy:
-            success: Yayın başarıyla silindi
           edit:
             save: Güncelleştirme
             title: Gönderiyi düzenle
@@ -42,24 +34,11 @@ tr:
             title: Gönderi oluştur
           update:
             invalid: Gönderiyi kaydederken bir sorun oluştu.
-            success: Yayın başarıyla kaydedildi
-      last_activity:
-        new_post_at_html: "<span> %{link}</span>yeni gönderi"
       models:
         post:
           fields:
             author: Yazar
             body: Vücut
-            created_at: Adresinde düzenlendi
-      posts:
-        show:
-          back: Listeye geri dön
-          comments: Yorumlar
-          view: Görünüm
-        sidebar_blog:
-          comments: yorumlar
-          most_commented_posts: En çok yorum yapılan yazılar
-      read_more: Daha fazla oku
     components:
       blogs:
         name: Blog

data/config/locales/uk.yml

@@ -19,15 +19,7 @@ uk:
         new: Створити новий допис
         title: Дії
       admin:
-        models:
-          post:
-            name: Допис
         posts:
-          create:
-            invalid: При спробі додати цей допис сталася помилка
-            success: Допис успішно додано
-          destroy:
-            success: Допис успішно видалено
           edit:
             save: Оновити
           index:
@@ -37,20 +29,11 @@ uk:
             title: Створити допис
           update:
             invalid: При спробі збереження цього допису сталися помилки.
-            success: Допис успішно збережено
       models:
         post:
           fields:
             author: Автор
             body: Основний текст
-            created_at: 'Створено:'
-      posts:
-        show:
-          view: Переглянути
-        sidebar_blog:
-          comments: коментарі
-          most_commented_posts: Найбільш коментовані дописи
-      read_more: Читати далі
     components:
       blogs:
         name: Блог

data/config/locales/zh-CN.yml

@@ -16,15 +16,7 @@ zh-CN:
         new: 新建帖子
         title: 行动
       admin:
-        models:
-          post:
-            name: 帖子
         posts:
-          create:
-            invalid: 创建这个帖子时出错
-            success: 帖子创建成功
-          destroy:
-            success: 帖子已成功删除
           edit:
             save: 更新
           index:
@@ -34,24 +26,11 @@ zh-CN:
             title: 创建帖子
           update:
             invalid: 保存帖子时出错。
-            success: 帖子保存成功
-      last_activity:
-        new_post_at_html: "<span>在 %{link}的新帖</span>"
       models:
         post:
           fields:
             author: 作者
             body: 正文内容
-            created_at: 创建于
-      posts:
-        show:
-          back: 返回列表
-          comments: 评论
-          view: 查看
-        sidebar_blog:
-          comments: 评论
-          most_commented_posts: 评论最多的帖子
-      read_more: 阅读更多
     components:
       blogs:
         name: 博客

data/config/locales/zh-TW.yml

@@ -23,9 +23,6 @@ zh-TW:
         new: 新貼文
         title: 操作
       admin:
-        models:
-          post:
-            name: 文章
         posts:
           create:
             invalid: 建立此文章時出現問題
@@ -36,6 +33,7 @@ zh-TW:
             save: 更新
             title: 编辑文章
           index:
+            not_published_yet: 尚未發布
             title: 貼文
           new:
             create: 建立
@@ -49,24 +47,15 @@ zh-TW:
           delete: "%{user_name} 從 %{space_name} 刪除了 %{resource_name} 部落格文章。"
           update: "%{user_name} 在 %{space_name} 更新了 %{resource_name} 部落格文章"
       last_activity:
-        new_post_at_html: "<span>在 %{link} 上有新貼文</span>"
+        new_post: '新貼文:'
       models:
         post:
           fields:
             author: 作者
             body: 正文
-            created_at: 建立於
             official_blog_post: 官方文章
+            published_at: 發布時間
             title: 標題
-      posts:
-        show:
-          back: 返回列表
-          comments: 評論
-          view: 檢視
-        sidebar_blog:
-          comments: 評論
-          most_commented_posts: 最多留言的帖子
-      read_more: 閱讀變多
     components:
       blogs:
         actions:

data/db/migrate/20220812122940_add_published_at_to_decidim_blogs_posts.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class AddPublishedAtToDecidimBlogsPosts < ActiveRecord::Migration[6.1]
+  class Post < ApplicationRecord
+    self.table_name = :decidim_blogs_posts
+  end
+
+  def change
+    add_column :decidim_blogs_posts, :published_at, :datetime
+
+    reversible do |direction|
+      direction.up do
+        Post.update_all("published_at = created_at") # rubocop:disable Rails/SkipsModelValidations
+      end
+    end
+  end
+end

data/lib/decidim/api/blogs_type.rb

@@ -18,11 +18,23 @@ module Decidim
       end
 
       def posts(filter: {}, order: {})
-        Decidim::Core::ComponentListBase.new(model_class: Post).call(object, { filter: filter, order: order }, context)
+        base_query = Decidim::Core::ComponentListBase.new(model_class: Post).call(object, { filter:, order: }, context)
+        if context[:current_user]&.admin?
+          base_query
+        else
+          base_query.published
+        end
       end
 
       def post(id:)
-        Decidim::Core::ComponentFinderBase.new(model_class: Post).call(object, { id: id }, context)
+        scope =
+          if context[:current_user]&.admin?
+            Post
+          else
+            Post.published
+          end
+
+        Decidim::Core::ComponentFinderBase.new(model_class: scope).call(object, { id: }, context)
       end
     end
   end

data/lib/decidim/api/post_type.rb

@@ -16,6 +16,7 @@ module Decidim
       field :id, GraphQL::Types::ID, "The internal ID of this post", null: false
       field :title, Decidim::Core::TranslatedFieldType, "The title for this post", null: true
       field :body, Decidim::Core::TranslatedFieldType, "The body of this post", null: true
+      field :published_at, Decidim::Core::DateTimeType, "The time this page was published", null: false
     end
   end
 end

data/lib/decidim/blogs/admin_engine.rb

@@ -12,8 +12,8 @@ module Decidim
 
       routes do
         resources :posts do
-          resources :attachment_collections
-          resources :attachments
+          resources :attachment_collections, except: [:show]
+          resources :attachments, except: [:show]
         end
         root to: "posts#index"
       end

data/lib/decidim/blogs/component.rb

@@ -1,17 +1,16 @@
 # frozen_string_literal: true
 
-require "decidim/components/namer"
-
 Decidim.register_component(:blogs) do |component|
   component.engine = Decidim::Blogs::Engine
   component.admin_engine = Decidim::Blogs::AdminEngine
   component.icon = "media/images/decidim_blogs.svg"
+  component.icon_key = "pen-nib-line"
   component.permissions_class_name = "Decidim::Blog::Permissions"
 
   component.query_type = "Decidim::Blogs::BlogsType"
 
   component.on(:before_destroy) do |instance|
-    raise StandardError, "Can't remove this component" if Decidim::Blogs::Post.where(component: instance).any?
+    raise StandardError, "Cannot remove this component" if Decidim::Blogs::Post.where(component: instance).any?
   end
 
   component.register_stat :posts_count, primary: true, priority: Decidim::StatsRegistry::MEDIUM_PRIORITY do |components, _start_at, _end_at|
@@ -41,63 +40,8 @@ Decidim.register_component(:blogs) do |component|
   end
 
   component.seeds do |participatory_space|
-    admin_user = Decidim::User.find_by(
-      organization: participatory_space.organization,
-      email: "admin@example.org"
-    )
-
-    step_settings = if participatory_space.allows_steps?
-                      { participatory_space.active_step.id => { comments_enabled: true, comments_blocked: false } }
-                    else
-                      {}
-                    end
-
-    params = {
-      name: Decidim::Components::Namer.new(participatory_space.organization.available_locales, :blogs).i18n_name,
-      manifest_name: :blogs,
-      published_at: Time.current,
-      participatory_space: participatory_space,
-      settings: {
-        vote_limit: 0
-      },
-      step_settings: step_settings
-    }
-
-    component = Decidim.traceability.perform_action!(
-      "publish",
-      Decidim::Component,
-      admin_user,
-      visibility: "all"
-    ) do
-      Decidim::Component.create!(params)
-    end
-
-    6.times do |n|
-      author = if n >= 3
-                 Decidim::User.where(organization: component.organization).order(Arel.sql("RANDOM()")).first
-               elsif n <= 1
-                 Decidim::UserGroup.where(organization: component.organization).order(Arel.sql("RANDOM()")).first
-               else
-                 component.organization
-               end
-
-      params = {
-        component: component,
-        title: Decidim::Faker::Localized.sentence(word_count: 5),
-        body: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-          Decidim::Faker::Localized.paragraph(sentence_count: 20)
-        end,
-        author: author
-      }
-
-      post = Decidim.traceability.create!(
-        Decidim::Blogs::Post,
-        author,
-        params,
-        visibility: "all"
-      )
+    require "decidim/blogs/seeds"
 
-      Decidim::Comments::Seed.comments_for(post)
-    end
+    Decidim::Blogs::Seeds.new(participatory_space:).call
   end
 end

data/lib/decidim/blogs/engine.rb

@@ -15,7 +15,14 @@ module Decidim
 
       routes do
         resources :posts, only: [:index, :show]
-        root to: "posts#index"
+        scope "/posts" do
+          root to: "posts#index"
+        end
+        get "/", to: redirect("posts", status: 301)
+      end
+
+      initializer "decidim_blogs.register_icons" do
+        Decidim.icons.register(name: "Decidim::Blogs::Post", icon: "pen-nib-line", description: "Blogs post", category: "activity", engine: :core)
       end
 
       initializer "decidim_blogs.add_cells_view_paths" do
@@ -26,6 +33,14 @@ module Decidim
       initializer "decidim_blogs.webpacker.assets_path" do
         Decidim.register_assets_path File.expand_path("app/packs", root)
       end
+
+      initializer "decidim_blogs.authorization_transfer" do
+        config.to_prepare do
+          Decidim::AuthorizationTransfer.register(:blogs) do |transfer|
+            transfer.move_records(Decidim::Blogs::Post, :decidim_author_id)
+          end
+        end
+      end
     end
   end
 end

data/lib/decidim/blogs/seeds.rb

@@ -0,0 +1,76 @@
+# frozen_string_literal: true
+
+require "decidim/components/namer"
+
+module Decidim
+  module Blogs
+    class Seeds
+      attr_reader :participatory_space
+
+      def initialize(participatory_space:)
+        @participatory_space = participatory_space
+      end
+
+      def call
+        admin_user = Decidim::User.find_by(
+          organization: participatory_space.organization,
+          email: "admin@example.org"
+        )
+
+        step_settings = if participatory_space.allows_steps?
+                          { participatory_space.active_step.id => { comments_enabled: true, comments_blocked: false } }
+                        else
+                          {}
+                        end
+
+        params = {
+          name: Decidim::Components::Namer.new(participatory_space.organization.available_locales, :blogs).i18n_name,
+          manifest_name: :blogs,
+          published_at: Time.current,
+          participatory_space:,
+          settings: {
+            vote_limit: 0
+          },
+          step_settings:
+        }
+
+        component = Decidim.traceability.perform_action!(
+          "publish",
+          Decidim::Component,
+          admin_user,
+          visibility: "all"
+        ) do
+          Decidim::Component.create!(params)
+        end
+
+        6.times do |n|
+          author = if n >= 3
+                     Decidim::User.where(organization: component.organization).sample
+                   elsif n <= 1
+                     Decidim::UserGroup.where(organization: component.organization).sample
+                   else
+                     component.organization
+                   end
+
+          params = {
+            component:,
+            title: Decidim::Faker::Localized.sentence(word_count: 5),
+            body: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
+              Decidim::Faker::Localized.paragraph(sentence_count: 20)
+            end,
+            author:
+          }
+
+          post = Decidim.traceability.create!(
+            Decidim::Blogs::Post,
+            author,
+            params,
+            visibility: "all"
+          )
+
+          Decidim::Comments::Seed.comments_for(post)
+        end
+      end
+    end
+  end
+end

data/lib/decidim/blogs/test/factories.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "decidim/components/namer"
 require "decidim/faker/localized"
 require "decidim/core/test/factories"
 require "decidim/participatory_processes/test/factories"
@@ -8,7 +9,7 @@ FactoryBot.define do
   factory :post_component, parent: :component do
     name { Decidim::Components::Namer.new(participatory_space.organization.available_locales, :blogs).i18n_name }
     manifest_name { :blogs }
-    participatory_space { create(:participatory_process, :with_steps, organization: organization) }
+    participatory_space { create(:participatory_process, :with_steps, organization:) }
   end
 
   factory :post, class: "Decidim::Blogs::Post" do

data/lib/decidim/blogs/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-pages version.
   module Blogs
     def self.version
-      "0.27.5"
+      "0.28.0.rc4"
     end
   end
 end