Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
Extraxt Posts feature to spree_posts extension (#13686)
Damian Legawiecce692fa7ad5b
diff --git a/packages/next/.changeset/remove-posts-types.md b/packages/next/.changeset/remove-posts-types.mdnew file mode 100644index 0000000000..956e463505--- /dev/null+++ b/packages/next/.changeset/remove-posts-types.md@@ -0,0 +1,5 @@+---+"@spree/next": patch+---++Removed Posts and PostCategory references. Posts feature has been extracted to the `spree_posts` extension.diff --git a/packages/sdk/.changeset/remove-posts-types.md b/packages/sdk/.changeset/remove-posts-types.mdnew file mode 100644index 0000000000..10c1f68457--- /dev/null+++ b/packages/sdk/.changeset/remove-posts-types.md@@ -0,0 +1,5 @@+---+"@spree/sdk": patch+---++Removed `StorePost` and `StorePostCategory` types and Zod schemas. Posts feature has been extracted to the `spree_posts` extension.diff --git a/packages/sdk/src/types/generated/StorePost.ts b/packages/sdk/src/types/generated/StorePost.tsdeleted file mode 100644index cec50b2682..0000000000--- a/packages/sdk/src/types/generated/StorePost.ts+++ /dev/null@@ -1,18 +0,0 @@-// Typelizer digest 6e2ac0a25224ad90c2139dd0bcd8ce7f-//-// DO NOT MODIFY: This file was automatically generated by Typelizer.--type StorePost = {- id: string;- title: string;- slug: string;- meta_title: string | null;- meta_description: string | null;- published_at: string | null;- created_at: string;- updated_at: string;- author_id: string | null;- post_category_id: string | null;-}--export default StorePost;diff --git a/packages/sdk/src/types/generated/StorePostCategory.ts b/packages/sdk/src/types/generated/StorePostCategory.tsdeleted file mode 100644index 29a7b765b2..0000000000--- a/packages/sdk/src/types/generated/StorePostCategory.ts+++ /dev/null@@ -1,13 +0,0 @@-// Typelizer digest a651d4a565319fe46bdd1a6360437738-//-// DO NOT MODIFY: This file was automatically generated by Typelizer.--type StorePostCategory = {- id: string;- title: string;- slug: string;- created_at: string;- updated_at: string;-}--export default StorePostCategory;diff --git a/packages/sdk/src/types/generated/index.ts b/packages/sdk/src/types/generated/index.tsindex 47701913ba..eab0e8cee1 100644--- a/packages/sdk/src/types/generated/index.ts+++ b/packages/sdk/src/types/generated/index.ts@@ -1,4 +1,4 @@-// Typelizer digest 9bcce2c5fd7dc60cf1f6532ba1cbd10f+// Typelizer digest ba113ecbc539cf6c1d714f86a1aff20a//// DO NOT MODIFY: This file was automatically generated by Typelizer.export type { default as StoreAddress } from './StoreAddress'@@ -40,8 +40,6 @@ export type { default as StorePayment } from './StorePayment'export type { default as StorePaymentSession } from './StorePaymentSession'export type { default as StorePaymentSetupSession } from './StorePaymentSetupSession'export type { default as StorePaymentSource } from './StorePaymentSource'-export type { default as StorePostCategory } from './StorePostCategory'-export type { default as StorePost } from './StorePost'export type { default as StorePrice } from './StorePrice'export type { default as StoreProduct } from './StoreProduct'export type { default as StorePromotion } from './StorePromotion'diff --git a/packages/sdk/src/zod/generated/StorePost.ts b/packages/sdk/src/zod/generated/StorePost.tsdeleted file mode 100644index 9bb63215de..0000000000--- a/packages/sdk/src/zod/generated/StorePost.ts+++ /dev/null@@ -1,17 +0,0 @@-// This file is auto-generated. Do not edit directly.-import { z } from 'zod';--export const StorePostSchema = z.object({- id: z.string(),- title: z.string(),- slug: z.string(),- meta_title: z.string().nullable(),- meta_description: z.string().nullable(),- published_at: z.string().nullable(),- created_at: z.string(),- updated_at: z.string(),- author_id: z.string().nullable(),- post_category_id: z.string().nullable(),-});--export type StorePost = z.infer<typeof StorePostSchema>;diff --git a/packages/sdk/src/zod/generated/StorePostCategory.ts b/packages/sdk/src/zod/generated/StorePostCategory.tsdeleted file mode 100644index c07567e134..0000000000--- a/packages/sdk/src/zod/generated/StorePostCategory.ts+++ /dev/null@@ -1,12 +0,0 @@-// This file is auto-generated. Do not edit directly.-import { z } from 'zod';--export const StorePostCategorySchema = z.object({- id: z.string(),- title: z.string(),- slug: z.string(),- created_at: z.string(),- updated_at: z.string(),-});--export type StorePostCategory = z.infer<typeof StorePostCategorySchema>;diff --git a/packages/sdk/src/zod/generated/index.ts b/packages/sdk/src/zod/generated/index.tsindex abeafafa50..28fb0237dd 100644--- a/packages/sdk/src/zod/generated/index.ts+++ b/packages/sdk/src/zod/generated/index.ts@@ -38,8 +38,6 @@ export { StorePaymentMethodSchema, type StorePaymentMethod } from './StorePaymenexport { StorePaymentSessionSchema, type StorePaymentSession } from './StorePaymentSession';export { StorePaymentSetupSessionSchema, type StorePaymentSetupSession } from './StorePaymentSetupSession';export { StorePaymentSourceSchema, type StorePaymentSource } from './StorePaymentSource';-export { StorePostSchema, type StorePost } from './StorePost';-export { StorePostCategorySchema, type StorePostCategory } from './StorePostCategory';export { StorePriceSchema, type StorePrice } from './StorePrice';export { StoreProductSchema, type StoreProduct } from './StoreProduct';export { StorePromotionSchema, type StorePromotion } from './StorePromotion';diff --git a/spree/admin/app/controllers/spree/admin/post_categories_controller.rb b/spree/admin/app/controllers/spree/admin/post_categories_controller.rbdeleted file mode 100644index 3b98670f4b..0000000000--- a/spree/admin/app/controllers/spree/admin/post_categories_controller.rb+++ /dev/null@@ -1,21 +0,0 @@-module Spree- module Admin- class PostCategoriesController < ResourceController- include Spree::Admin::TableConcern-- add_breadcrumb Spree.t(:posts), :admin_posts_path- add_breadcrumb Spree.t(:categories), :admin_post_categories_path-- def select_options- post_categories = current_store.post_categories.accessible_by(current_ability)- render json: post_categories.pluck(:id, :title).map { |id, title| { id: id, name: title } }- end-- private-- def permitted_resource_params- params.require(:post_category).permit(permitted_post_category_attributes)- end- end- end-enddiff --git a/spree/admin/app/controllers/spree/admin/posts_controller.rb b/spree/admin/app/controllers/spree/admin/posts_controller.rbdeleted file mode 100644index bb46b2ebdb..0000000000--- a/spree/admin/app/controllers/spree/admin/posts_controller.rb+++ /dev/null@@ -1,37 +0,0 @@-module Spree- module Admin- class PostsController < ResourceController- include Spree::Admin::TableConcern-- before_action :load_post_categories-- add_breadcrumb Spree.t(:posts), :admin_posts_path-- before_action :add_breadcrumb_for_post, only: [:edit, :update]-- def select_options- render json: current_store.posts.published.accessible_by(current_ability).to_tom_select_json- end-- private-- def collection_includes- [:author, :post_category, :image_attachment]- end-- def load_post_categories- @post_categories = current_store.post_categories.accessible_by(current_ability).order(:title)- end-- def add_breadcrumb_for_post- return unless @post.present?-- add_breadcrumb @post.title, spree.edit_admin_post_path(@post)- end-- def permitted_resource_params- params.require(:post).permit(permitted_post_attributes)- end- end- end-enddiff --git a/spree/admin/app/helpers/spree/admin/navigation_helper.rb b/spree/admin/app/helpers/spree/admin/navigation_helper.rbindex 633f7212d5..776641f33f 100644--- a/spree/admin/app/helpers/spree/admin/navigation_helper.rb+++ b/spree/admin/app/helpers/spree/admin/navigation_helper.rb@@ -273,13 +273,13 @@ module Spreeend# renders a link to preview a resource on the storefront using the spree_storefront_resource_url helper- # @param resource [Spree::Product, Spree::Post] the resource to preview+ # @param resource [Spree::Product] the resource to preview# @param options [Hash] the options for the link# @return [String] the link to preview the resourcedef external_page_preview_link(resource, options = {})resource_name = options[:name] || resource.class.name.demodulize- url = if [Spree::Product, Spree::Post].include?(resource.class)+ url = if resource.instance_of?(Spree::Product)spree_storefront_resource_url(resource, preview_id: resource.id)elsespree_storefront_resource_url(resource)diff --git a/spree/admin/app/helpers/spree/admin/posts_helper.rb b/spree/admin/app/helpers/spree/admin/posts_helper.rbdeleted file mode 100644index d8e6c2b681..0000000000--- a/spree/admin/app/helpers/spree/admin/posts_helper.rb+++ /dev/null@@ -1,9 +0,0 @@-module Spree- module Admin- module PostsHelper- def post_authors_select_options- current_store.users.map { |user| [user.name, user.id] }- end- end- end-enddiff --git a/spree/admin/app/helpers/spree/admin/tags_helper.rb b/spree/admin/app/helpers/spree/admin/tags_helper.rbindex d82061fedc..11acbf5c83 100644--- a/spree/admin/app/helpers/spree/admin/tags_helper.rb+++ b/spree/admin/app/helpers/spree/admin/tags_helper.rb@@ -9,17 +9,6 @@ module Spree@tags_json_array ||= tags_scope.pluck(:id, :name).map { |id, name| { id: id, name: name } }.as_jsonend- def post_tags_scope- @post_tags_scope ||= ActsAsTaggableOn::Tag.- joins(:taggings).- where(ActsAsTaggableOn.taggings_table => { taggable_type: 'Spree::Post' }).- for_context(:tags).for_tenant(current_store.id)- end-- def post_tags_json_array- @post_tags_json_array ||= post_tags_scope.pluck(:id, :name).map { |id, name| { id: id, name: name } }.as_json- end-def user_tags_scope@user_tags_scope ||= ActsAsTaggableOn::Tag.joins(:taggings).diff --git a/spree/admin/app/views/spree/admin/post_categories/_form.html.erb b/spree/admin/app/views/spree/admin/post_categories/_form.html.erbdeleted file mode 100644index b9a8e7f094..0000000000--- a/spree/admin/app/views/spree/admin/post_categories/_form.html.erb+++ /dev/null@@ -1,6 +0,0 @@-<div class="card mb-6">- <div class="card-body">- <%= f.spree_text_field :title, required: true, autofocus: f.object.new_record? %>- <%= f.spree_rich_text_area :description %>- </div>-</div>\ No newline at end of filediff --git a/spree/admin/app/views/spree/admin/post_categories/_table_header.html.erb b/spree/admin/app/views/spree/admin/post_categories/_table_header.html.erbdeleted file mode 100644index bb4f619fe3..0000000000--- a/spree/admin/app/views/spree/admin/post_categories/_table_header.html.erb+++ /dev/null@@ -1,5 +0,0 @@-<tr>- <th scope="col"><%= Spree.t(:title) %></th>- <th scope="col"><%= Spree.t(:posts) %></th>- <th scope="col"></th>-</tr>\ No newline at end of filediff --git a/spree/admin/app/views/spree/admin/post_categories/_table_row.html.erb b/spree/admin/app/views/spree/admin/post_categories/_table_row.html.erbdeleted file mode 100644index de7d62b191..0000000000--- a/spree/admin/app/views/spree/admin/post_categories/_table_row.html.erb+++ /dev/null@@ -1,9 +0,0 @@-<tr data-controller="row-link" id="<%= dom_id(post_category) %>">- <td class="w-60 p-0">- <%= link_to post_category.title, spree.edit_admin_post_category_path(post_category), class: 'block w-full h-full px-4 py-2', data: { row_link_target: :link, turbo_frame: '_top' } %>- </td>- <td class="w-10 cursor-pointer" data-action="click->row-link#openLink"><%= post_category.posts.count %></td>- <td class="w-10 cursor-pointer text-right" data-action="click->row-link#openLink">- <%= link_to_edit(post_category, class: 'btn btn-light btn-sm', data: { turbo_frame: '_top' }) if can? :edit, post_category %>- </td>-</tr>\ No newline at end of filediff --git a/spree/admin/app/views/spree/admin/post_categories/edit.html.erb b/spree/admin/app/views/spree/admin/post_categories/edit.html.erbdeleted file mode 100644index f5b8f8cb5d..0000000000--- a/spree/admin/app/views/spree/admin/post_categories/edit.html.erb+++ /dev/null@@ -1 +0,0 @@-<%= render 'spree/admin/shared/edit_resource' %>diff --git a/spree/admin/app/views/spree/admin/post_categories/index.html.erb b/spree/admin/app/views/spree/admin/post_categories/index.html.erbdeleted file mode 100644index cee92e8b11..0000000000--- a/spree/admin/app/views/spree/admin/post_categories/index.html.erb+++ /dev/null@@ -1,10 +0,0 @@-<%= render 'spree/admin/shared/posts_tabs' %>--<% content_for :page_actions do %>- <%= render_admin_partials(:post_categories_actions_partials) %>- <%= link_to_with_icon 'plus', Spree.t(:new_post_category), new_object_url, class: 'btn btn-primary' if can?(:create, Spree::PostCategory) %>-<% end %>--<%= render_admin_partials(:post_categories_header_partials) %>--<%= render_table @collection, :post_categories %>diff --git a/spree/admin/app/views/spree/admin/post_categories/new.html.erb b/spree/admin/app/views/spree/admin/post_categories/new.html.erbdeleted file mode 100644index 0fd3668cab..0000000000--- a/spree/admin/app/views/spree/admin/post_categories/new.html.erb+++ /dev/null@@ -1 +0,0 @@-<%= render 'spree/admin/shared/new_resource' %>\ No newline at end of filediff --git a/spree/admin/app/views/spree/admin/posts/_extra_actions.html.erb b/spree/admin/app/views/spree/admin/posts/_extra_actions.html.erbdeleted file mode 100644index e69de29bb2..0000000000diff --git a/spree/admin/app/views/spree/admin/posts/_form.html.erb b/spree/admin/app/views/spree/admin/posts/_form.html.erbdeleted file mode 100644index 54937a8297..0000000000--- a/spree/admin/app/views/spree/admin/posts/_form.html.erb+++ /dev/null@@ -1,54 +0,0 @@-<div class="grid grid-cols-12 gap-6" data-controller="slug-form seo-form">- <div class="col-span-12 lg:col-span-8">- <div class="card mb-6">- <div class="card-body">- <%= f.spree_text_field :title,- required: true,- autofocus: true,- data: {- seo_form_target: 'sourceTitleInput',- slug_form_target: 'name',- action: 'slug-form#updateUrlFromName'- } %>-- <%= f.spree_rich_text_area :content,- help_bubble: 'Add a summary of the post',- data: { seo_form_target: 'sourceDescriptionInput' } %>-- <%= f.spree_rich_text_area :excerpt,- help_bubble: 'Add a summary of the post',- data: { seo_form_target: 'sourceExcerptInput' } %>- </div>- </div>- </div>-- <div class="col-span-12 lg:col-span-4">- <div class="card mb-6">- <div class="card-body">- <%= f.spree_file_field :image, width: 1200, height: 600, crop: true, css: 'flex-col', label: Spree.t(:featured_image) %>- </div>- </div>-- <div class="card mb-6">- <div class="card-body">- <%= f.spree_select :author_id, options_for_select(post_authors_select_options, @post.author_id || try_spree_current_user.id), { label: Spree.t(:author), autocomplete: true } %>- <%= f.spree_select :post_category_id, options_for_select(@post_categories.pluck(:title, :id), @post.post_category_id), { label: Spree.t(:category), include_blank: true, autocomplete: true } %>- <%= f.spree_datetime_field :published_at, help_bubble: 'Marks when the post will be published, leave it blank to hide it' %>-- <div class="form-group mb-0">- <%= f.label :tag_list, Spree.t(:tags) %>- <%= tom_select_tag 'post[tag_list]', multiple: true, class: 'w-full', options: post_tags_json_array, active_option: @post.tag_list, value_field: :name, create: true %>- </div>- </div>- </div>-- <%= render 'spree/admin/shared/seo',- f: f,- title: @post.title,- meta_title: @post.meta_title,- description: @post.content,- slug: @post.slug,- slug_path: 'posts',- placeholder: 'Add a title and content to see how this post might appear in a search engine listing' %>- </div>-</div>\ No newline at end of filediff --git a/spree/admin/app/views/spree/admin/posts/_table_header.html.erb b/spree/admin/app/views/spree/admin/posts/_table_header.html.erbdeleted file mode 100644index 1dae4c8c51..0000000000--- a/spree/admin/app/views/spree/admin/posts/_table_header.html.erb+++ /dev/null@@ -1,7 +0,0 @@-<tr>- <th scope="col"><%= sort_link @search, :title, Spree.t(:title) %></th>- <th scope="col"><%= Spree.t(:category) %></th>- <th scope="col"><%= Spree.t(:author) %></th>- <th scope="col"><%= sort_link @search, :published_at, Spree.t(:published_at) %></th>- <th scope="col"></th>-</tr>\ No newline at end of filediff --git a/spree/admin/app/views/spree/admin/posts/_table_row.html.erb b/spree/admin/app/views/spree/admin/posts/_table_row.html.erbdeleted file mode 100644index 081a6bac21..0000000000--- a/spree/admin/app/views/spree/admin/posts/_table_row.html.erb+++ /dev/null@@ -1,22 +0,0 @@-<tr data-controller="row-link" id="<%= dom_id(post) %>">- <td>- <%= link_to spree.edit_admin_post_path(post), class: 'no-underline flex items-center font-bold text-gray-900 gap-4', data: { row_link_target: :link, 'turbo-frame': '_top' } do %>- <% if post.image.attached? && post.image.variable? %>- <div class="admin-product-image-container">- <%= spree_image_tag(post.image, width: 100, height: 65, class: 'img-fluid', loading: :lazy) %>- </div>- <% else %>- <%= render 'spree/admin/shared/no_image', width: 100, height: 65 %>- <% end %>- <%= post.title %>- <% end %>- </td>-- <td class="cursor-pointer" data-action="click->row-link#openLink"><%= post.post_category_title || '-' %></td>- <td class="cursor-pointer" data-action="click->row-link#openLink"><%= post.author_name %></td>- <td class="cursor-pointer" data-action="click->row-link#openLink"><%= post.published_at.present? ? spree_date(post.published_at) : '-' %></td>-- <td class="actions">- <%= link_to_edit(post, class: 'btn btn-light btn-sm', data: { 'turbo-frame': '_top' }) if can? :edit, post %>- </td>-</tr>\ No newline at end of filediff --git a/spree/admin/app/views/spree/admin/posts/edit.html.erb b/spree/admin/app/views/spree/admin/posts/edit.html.erbdeleted file mode 100644index 6d43ba1463..0000000000--- a/spree/admin/app/views/spree/admin/posts/edit.html.erb+++ /dev/null@@ -1,5 +0,0 @@-<% content_for :page_actions_dropdown do %>- <%= external_page_preview_link(@post) %>-<% end %>--<%= render 'spree/admin/shared/edit_resource', col_class: 'col-span-12' %>diff --git a/spree/admin/app/views/spree/admin/posts/filters.html.erb b/spree/admin/app/views/spree/admin/posts/filters.html.erbdeleted file mode 100644index a5ca5760e9..0000000000--- a/spree/admin/app/views/spree/admin/posts/filters.html.erb+++ /dev/null@@ -1,39 +0,0 @@-<%= search_form_for [:admin, @search], class: "filter-wrap", data: {controller: "filters dialog"} do |f| %>- <div class="flex flex-col lg:flex-row gap-2">- <%= render 'spree/admin/shared/filters_search_bar', param: :search_by_title, label: Spree.t(:title) %>-- <%= button_tag type: 'button', class: 'btn btn-light flex items-center', data: { action: 'dialog#open' } do %>- <%= icon "adjustments", class: "mr-1" %>- <%= Spree.t("admin.filters") %>- <% end %>- </div>-- <%= drawer(id: 'posts-filters-drawer', controller_name: 'dialog') do %>- <%= drawer_header(Spree.t(:filter), 'dialog') %>- <div class="drawer-body">- <div class="form-group">- <%= f.label :author_id_eq, Spree.t(:author) %>- <%= f.select :author_id_eq,- options_for_select(post_authors_select_options, params.dig(:q, :author_id_eq)),- { include_blank: true },- { data: { filters_target: :input, controller: 'autocomplete-select' } } %>- </div>- <div class="form-group">- <%= f.label :post_category_id_eq, Spree.t(:category) %>- <%= f.select :post_category_id_eq,- options_for_select(@post_categories.pluck(:title, :id), params.dig(:q, :post_category_id_eq)),- { include_blank: true },- { data: { filters_target: :input, controller: 'autocomplete-select' } } %>- </div>- <%= render_admin_partials(:posts_filters_partials, f: f) %>- </div>- <div class="drawer-footer">- <%= drawer_discard_button('dialog') %>- <%= render 'spree/admin/shared/filter_submit' %>- </div>- <% end %>-- <%= render "spree/admin/shared/filter_badge_template" %>-- <div data-filters-target="badgesContainer" class="filter-badges-container"></div>-<% end %>diff --git a/spree/admin/app/views/spree/admin/posts/index.html.erb b/spree/admin/app/views/spree/admin/posts/index.html.erbdeleted file mode 100644index 2cf010a138..0000000000--- a/spree/admin/app/views/spree/admin/posts/index.html.erb+++ /dev/null@@ -1,10 +0,0 @@-<%= render 'spree/admin/shared/posts_tabs' %>--<% content_for :page_actions do %>- <%= render_admin_partials(:posts_actions_partials) %>- <%= link_to_with_icon 'plus', Spree.t(:new_post), new_object_url, class: 'btn btn-primary' if can?(:create, Spree::Post) %>-<% end %>--<%= render_admin_partials(:posts_header_partials) %>--<%= render_table @collection, :posts %>diff --git a/spree/admin/app/views/spree/admin/posts/new.html.erb b/spree/admin/app/views/spree/admin/posts/new.html.erbdeleted file mode 100644index 185062e4c7..0000000000--- a/spree/admin/app/views/spree/admin/posts/new.html.erb+++ /dev/null@@ -1 +0,0 @@-<%= render 'spree/admin/shared/new_resource', col_class: 'col-span-12' %>\ No newline at end of filediff --git a/spree/admin/app/views/spree/admin/shared/_posts_tabs.html.erb b/spree/admin/app/views/spree/admin/shared/_posts_tabs.html.erbdeleted file mode 100644index 4d030f8a11..0000000000--- a/spree/admin/app/views/spree/admin/shared/_posts_tabs.html.erb+++ /dev/null@@ -1,8 +0,0 @@-<% content_for :page_title do %>- <%= Spree.t(:posts) %>-<% end %>--<% content_for(:page_tabs) do %>- <%= nav_item(Spree.t(:posts), spree.admin_posts_path) if can?(:manage, Spree::Post) %>- <%= nav_item(Spree.t(:categories), spree.admin_post_categories_path) if can?(:manage, Spree::PostCategory) %>-<% end %>\ No newline at end of filediff --git a/spree/admin/app/views/spree/admin/shared/sidebar/_storefront_nav.html.erb b/spree/admin/app/views/spree/admin/shared/sidebar/_storefront_nav.html.erbindex fea4722c31..7593f78d9e 100644--- a/spree/admin/app/views/spree/admin/shared/sidebar/_storefront_nav.html.erb+++ b/spree/admin/app/views/spree/admin/shared/sidebar/_storefront_nav.html.erb@@ -12,10 +12,6 @@<%= nav_item(Spree.t(:pages), spree.admin_pages_path) %><% end %>- <% if can?(:manage, Spree::Post) %>- <%= nav_item(Spree.t(:posts), spree.admin_posts_path, active: %w[posts post_categories].include?(controller_name)) %>- <% end %>-<% if can?(:manage, current_store) %><%= nav_item(Spree.t(:settings), spree.edit_admin_storefront_path) %><% end %>@@ -33,14 +29,10 @@<%= nav_item(Spree.t(:pages), spree.admin_pages_path) %><% end %>- <% if can?(:manage, Spree::Post) %>- <%= nav_item(Spree.t(:posts), spree.admin_posts_path) %>- <% end %>-<% if can?(:manage, current_store) %><%= nav_item(Spree.t(:settings), spree.edit_admin_storefront_path) %><% end %><%= render_admin_partials(:storefront_nav_partials) %></ul>-<% end %>\ No newline at end of file+<% end %>diff --git a/spree/admin/config/initializers/spree_admin_navigation.rb b/spree/admin/config/initializers/spree_admin_navigation.rbindex cc4700bc06..71bc2c234f 100644--- a/spree/admin/config/initializers/spree_admin_navigation.rb+++ b/spree/admin/config/initializers/spree_admin_navigation.rb@@ -179,15 +179,6 @@ Rails.application.config.after_initialize doposition: 60,if: -> { can?(:manage, Spree::Report) }- # Posts (Blog)- sidebar_nav.add :posts,- label: :posts,- url: :admin_posts_path,- icon: 'article',- position: 70,- active: -> { %w[posts post_categories].include?(controller_name) },- if: -> { can?(:manage, Spree::Post) }-# Integrationssidebar_nav.add :integrations,label: :integrations,diff --git a/spree/admin/config/initializers/spree_admin_tables.rb b/spree/admin/config/initializers/spree_admin_tables.rbindex d42c91eed3..b96858d9db 100644--- a/spree/admin/config/initializers/spree_admin_tables.rb+++ b/spree/admin/config/initializers/spree_admin_tables.rb@@ -1175,105 +1175,6 @@ Rails.application.config.after_initialize dodefault: false,position: 70- # ==========================================- # Posts Table- # ==========================================- Spree.admin.tables.register(:posts, model_class: Spree::Post, search_param: :title_cont)-- Spree.admin.tables.posts.add :title,- label: :title,- type: :link,- sortable: true,- filterable: true,- default: true,- position: 10-- Spree.admin.tables.posts.add :post_category,- label: :category,- type: :string,- filter_type: :autocomplete,- sortable: false,- filterable: true,- default: true,- position: 20,- method: ->(post) { post.post_category_title },- ransack_attribute: 'post_category_id',- search_url: ->(view_context) { view_context.spree.select_options_admin_post_categories_path(format: :json) }-- Spree.admin.tables.posts.add :author,- label: :author,- type: :string,- filter_type: :autocomplete,- sortable: false,- filterable: true,- default: true,- position: 30,- method: ->(post) { post.author_name },- ransack_attribute: 'author_id',- search_url: ->(view_context) { view_context.spree.select_options_admin_admin_users_path(format: :json) }-- Spree.admin.tables.posts.add :published_at,- label: :published_at,- type: :date,- sortable: true,- filterable: true,- default: true,- position: 40-- Spree.admin.tables.posts.add :created_at,- label: :created_at,- type: :datetime,- sortable: true,- filterable: true,- default: false,- position: 50-- Spree.admin.tables.posts.add :updated_at,- label: :updated_at,- type: :datetime,- sortable: true,- filterable: true,- default: false,- position: 60-- # ==========================================- # Post Categories Table- # ==========================================- Spree.admin.tables.register(:post_categories, model_class: Spree::PostCategory, search_param: :title_cont)-- Spree.admin.tables.post_categories.add :title,- label: :title,- type: :link,- sortable: true,- filterable: true,- default: true,- position: 10-- Spree.admin.tables.post_categories.add :posts_count,- label: :posts,- type: :number,- sortable: false,- filterable: false,- default: true,- position: 20,- method: ->(post_category) { post_category.posts.count }-- Spree.admin.tables.post_categories.add :created_at,- label: :created_at,- type: :datetime,- sortable: true,- filterable: true,- default: false,- position: 30-- Spree.admin.tables.post_categories.add :updated_at,- label: :updated_at,- type: :datetime,- sortable: true,- filterable: true,- default: false,- position: 40-# ==========================================# Webhook Endpoints Table# ==========================================diff --git a/spree/admin/config/locales/en.yml b/spree/admin/config/locales/en.ymlindex 3afa205716..45cc9a1b50 100644--- a/spree/admin/config/locales/en.yml+++ b/spree/admin/config/locales/en.yml@@ -219,7 +219,6 @@ en:left_aligned: Left alignedlogo_centered: Logo centeredmax_video_width_on_desktop: Max video width on desktop- maximum_posts_to_show: Maximum posts to showmaximum_products_to_show: Maximum products to shownav_centered: Nav centerednot_set: Not setdiff --git a/spree/admin/config/routes.rb b/spree/admin/config/routes.rbindex 07517683df..088592affd 100644--- a/spree/admin/config/routes.rb+++ b/spree/admin/config/routes.rb@@ -231,17 +231,6 @@ Spree::Core::Engine.add_routes do# integrationsresources :integrations- resources :posts do- collection do- get :select_options, defaults: { format: :json }- end- end- resources :post_categories do- collection do- get :select_options, defaults: { format: :json }- end- end-# account managementresources :roles, except: :showresources :invitations, except: [:edit, :update] dodiff --git a/spree/admin/spec/controllers/spree/admin/post_categories_controller_spec.rb b/spree/admin/spec/controllers/spree/admin/post_categories_controller_spec.rbdeleted file mode 100644index be8c57dbd8..0000000000--- a/spree/admin/spec/controllers/spree/admin/post_categories_controller_spec.rb+++ /dev/null@@ -1,119 +0,0 @@-require 'spec_helper'--RSpec.describe Spree::Admin::PostCategoriesController, type: :controller do- stub_authorization!- render_views-- let(:store) { @default_store }-- describe 'GET #index' do- subject(:index) { get :index }-- it 'renders the list of post categories' do- index-- expect(response).to render_template(:index)- expect(assigns[:collection]).to contain_exactly(*store.post_categories)- end- end-- describe 'GET #select_options' do- subject(:select_options) { get :select_options, format: :json }-- let!(:post_categories) { create_list(:post_category, 3, store: store) }- let!(:other_store_category) { create(:post_category, store: create(:store)) }-- it 'returns post categories for the current store' do- select_options-- json = JSON.parse(response.body)- ids = json.map { |c| c['id'] }- post_categories.each do |category|- expect(ids).to include(category.id)- expect(json).to include({ 'id' => category.id, 'name' => category.title })- end- end-- it 'does not include categories from other stores' do- select_options-- json = JSON.parse(response.body)- expect(json.map { |c| c['id'] }).not_to include(other_store_category.id)- end- end-- describe 'GET #new' do- subject(:new) { get :new }-- it 'renders the new post category page' do- new- expect(response).to render_template(:new)- end- end-- describe 'POST #create' do- subject(:create_category) { post :create, params: { post_category: post_category_params } }-- let(:post_category_params) do- {- title: 'New Category',- description: 'This is a new category',- slug: 'new-category'- }- end-- it 'creates a new post category' do- expect { create_category }.to change(Spree::PostCategory, :count).by(1)-- category = Spree::PostCategory.last- expect(category.title).to eq('New Category')- expect(category.description.to_plain_text).to eq('This is a new category')- expect(category.slug).to eq('new-category')- expect(category.store).to eq(store)- end- end-- describe 'GET #edit' do- subject(:edit) { get :edit, params: { id: post_category.to_param } }-- let(:post_category) { create(:post_category) }-- it 'renders the edit page' do- edit- expect(response).to render_template(:edit)- end- end-- describe 'PUT #update' do- subject(:update_category) { put :update, params: { id: post_category.to_param, post_category: post_category_params } }-- let!(:post_category) { create(:post_category, store: store) }- let(:post_category_params) do- {- title: 'Updated Category',- description: 'This is an updated category',- slug: 'updated-category'- }- end-- it 'updates the post category' do- update_category- post_category.reload-- expect(post_category.title).to eq('Updated Category')- expect(post_category.description.to_plain_text).to eq('This is an updated category')- expect(post_category.slug).to eq('updated-category')- end- end-- describe 'DELETE #destroy' do- subject(:destroy_category) { delete :destroy, params: { id: post_category.to_param } }-- let!(:post_category) { create(:post_category, store: store) }-- it 'destroys the post category' do- expect { destroy_category }.to change(Spree::PostCategory, :count).by(-1)- expect(response).to redirect_to(admin_post_categories_path)- end- end-enddiff --git a/spree/admin/spec/controllers/spree/admin/posts_controller_spec.rb b/spree/admin/spec/controllers/spree/admin/posts_controller_spec.rbdeleted file mode 100644index 61a53bff77..0000000000--- a/spree/admin/spec/controllers/spree/admin/posts_controller_spec.rb+++ /dev/null@@ -1,151 +0,0 @@-require 'spec_helper'--RSpec.describe Spree::Admin::PostsController, type: :controller do- stub_authorization!- render_views-- let(:author_admin_user) { create(:admin_user) }- let(:post_category) { create(:post_category, store: store) }- let(:published_at) { '2025-05-24 00:00:00' }-- let(:store) { @default_store }-- describe 'GET #index' do- subject(:index) { get :index }-- let!(:posts) { create_list(:post, 3) }- let!(:other_posts) { create_list(:post, 2, store: create(:store)) }-- it 'renders the list of posts' do- index-- expect(response).to render_template(:index)- expect(assigns[:collection]).to contain_exactly(*store.posts)- end- end-- describe 'GET #select_options' do- subject(:select_options) { get :select_options }-- let!(:published_posts) { create_list(:post, 2, published_at: 1.day.ago) }- let!(:draft_posts) { create_list(:post, 2, published_at: nil) }-- it 'lists published posts for select options' do- select_options-- expect(JSON.parse(response.body)).to contain_exactly(- { 'id' => published_posts[0].id, 'name' => published_posts[0].title },- { 'id' => published_posts[1].id, 'name' => published_posts[1].title }- )- end- end-- describe 'GET #new' do- subject(:new) { get :new }-- it 'renders the new post page' do- new- expect(response).to render_template(:new)- end- end-- describe 'POST #create' do- subject(:create_post) { post :create, params: { post: post_params } }-- let(:post_params) do- {- title: 'New Post',- content: 'This is a new post',- excerpt: "Excerpt for SEO",- published_at: published_at,- author_id: author_admin_user.id,- image: fixture_file_upload('logo.png', 'image/png'),- meta_title: 'New Post for SEO',- meta_description: 'This is a new post for SEO',- tag_list: ['SEO', 'VIP'],- slug: "my-new-post",- post_category_id: post_category.id- }- end-- it 'creates a new post' do- expect { create_post }.to change(Spree::Post, :count).by(1)-- post = Spree::Post.last- expect(post.title).to eq('New Post')- expect(post.content.to_plain_text).to eq('This is a new post')- expect(post.excerpt.to_plain_text).to eq("Excerpt for SEO")- expect(post.published_at).to eq(published_at)- expect(post.author).to eq(author_admin_user)- expect(post.post_category).to eq(post_category)- expect(post.image).to be_attached- expect(post.meta_title).to eq('New Post for SEO')- expect(post.meta_description).to eq('This is a new post for SEO')- expect(post.tag_list).to match_array(['SEO', 'VIP'])- expect(post.slug).to eq("my-new-post")- expect(post.post_category).to eq(post_category)- end- end-- describe 'GET #edit' do- subject(:edit) { get :edit, params: { id: post.to_param } }-- let(:post) { create(:post) }-- it 'renders the edit page' do- edit- expect(response).to render_template(:edit)- end- end-- describe 'PUT #update' do- subject(:update_post) { put :update, params: { id: post.to_param, post: post_params } }-- let!(:post) { create(:post, store: store) }- let(:post_params) do- {- title: 'Updated Post',- content: 'This is an updated post',- excerpt: "Updated excerpt for SEO",- published_at: published_at,- author_id: author_admin_user.id,- image: fixture_file_upload('logo.png', 'image/png'),- meta_title: 'Updated Post for SEO',- meta_description: 'This is an updated post for SEO',- tag_list: ['Updated', 'VIP'],- post_category_id: post_category.id- }- end-- it 'updates the post' do- update_post- post.reload-- expect(post.title).to eq('Updated Post')- expect(post.content.to_plain_text).to eq('This is an updated post')- expect(post.excerpt.to_plain_text).to eq("Updated excerpt for SEO")- expect(post.published_at).to eq(published_at)- expect(post.author).to eq(author_admin_user)- expect(post.post_category).to eq(post_category)- expect(post.image).to be_attached- expect(post.meta_title).to eq('Updated Post for SEO')- expect(post.meta_description).to eq('This is an updated post for SEO')- expect(post.tag_list).to match_array(['Updated', 'VIP'])- expect(post.post_category).to eq(post_category)- end- end-- describe 'DELETE #destroy' do- subject(:destroy_post) { delete :destroy, params: { id: post.to_param } }-- let!(:post) { create(:post, store: store) }-- it 'destroys the post' do- destroy_post-- expect(post.reload.deleted_at).not_to be_nil-- expect(response).to redirect_to(admin_posts_path)- end- end-enddiff --git a/spree/api/app/serializers/spree/api/v3/post_category_serializer.rb b/spree/api/app/serializers/spree/api/v3/post_category_serializer.rbdeleted file mode 100644index 915378f4e1..0000000000--- a/spree/api/app/serializers/spree/api/v3/post_category_serializer.rb+++ /dev/null@@ -1,13 +0,0 @@-# frozen_string_literal: true--module Spree- module Api- module V3- class PostCategorySerializer < BaseSerializer- typelize title: :string, slug: :string-- attributes :title, :slug, created_at: :iso8601, updated_at: :iso8601- end- end- end-enddiff --git a/spree/api/app/serializers/spree/api/v3/post_serializer.rb b/spree/api/app/serializers/spree/api/v3/post_serializer.rbdeleted file mode 100644index 8212d76091..0000000000--- a/spree/api/app/serializers/spree/api/v3/post_serializer.rb+++ /dev/null@@ -1,25 +0,0 @@-# frozen_string_literal: true--module Spree- module Api- module V3- class PostSerializer < BaseSerializer- typelize title: :string, slug: :string,- meta_title: [:string, nullable: true], meta_description: [:string, nullable: true],- published_at: [:string, nullable: true],- author_id: [:string, nullable: true], post_category_id: [:string, nullable: true]-- attributes :title, :slug, :meta_title, :meta_description,- published_at: :iso8601, created_at: :iso8601, updated_at: :iso8601-- attribute :author_id do |post|- post.author&.prefixed_id- end-- attribute :post_category_id do |post|- post.post_category&.prefixed_id- end- end- end- end-enddiff --git a/spree/api/lib/spree/api/dependencies.rb b/spree/api/lib/spree/api/dependencies.rbindex 514c002f3b..980d26cadd 100644--- a/spree/api/lib/spree/api/dependencies.rb+++ b/spree/api/lib/spree/api/dependencies.rb@@ -72,8 +72,6 @@ module Spreestorefront_line_item_serializer: 'Spree::V2::Storefront::LineItemSerializer',storefront_option_type_serializer: 'Spree::V2::Storefront::OptionTypeSerializer',storefront_option_value_serializer: 'Spree::V2::Storefront::OptionValueSerializer',- storefront_post_category_serializer: 'Spree::V2::Storefront::PostCategorySerializer',- storefront_post_serializer: 'Spree::V2::Storefront::PostSerializer',storefront_product_property_serializer: 'Spree::V2::Storefront::ProductPropertySerializer',storefront_order_promotion_serializer: 'Spree::V2::Storefront::OrderPromotionSerializer',storefront_shipping_method_serializer: 'Spree::V2::Storefront::ShippingMethodSerializer',@@ -136,8 +134,6 @@ module Spreeimport_row_serializer: 'Spree::Api::V3::ImportRowSerializer',invitation_serializer: 'Spree::Api::V3::InvitationSerializer',newsletter_subscriber_serializer: 'Spree::Api::V3::NewsletterSubscriberSerializer',- post_serializer: 'Spree::Api::V3::PostSerializer',- post_category_serializer: 'Spree::Api::V3::PostCategorySerializer',promotion_serializer: 'Spree::Api::V3::PromotionSerializer',refund_serializer: 'Spree::Api::V3::RefundSerializer',reimbursement_serializer: 'Spree::Api::V3::ReimbursementSerializer',@@ -165,10 +161,9 @@ module Spree# sortersstorefront_collection_sorter: -> { Spree::Dependencies.collection_sorter },storefront_order_sorter: -> { Spree::Dependencies.collection_sorter },+ storefront_posts_sorter: nil,storefront_products_sorter: -> { Spree::Dependencies.products_sorter },platform_products_sorter: -> { Spree::Dependencies.products_sorter },- storefront_posts_sorter: -> { Spree::Dependencies.posts_sorter },-# paginatorsstorefront_collection_paginator: 'Spree::Api::Paginate',@@ -181,8 +176,8 @@ module Spreestorefront_completed_order_finder: -> { Spree::Dependencies.completed_order_finder },storefront_credit_card_finder: -> { Spree::Dependencies.credit_card_finder },storefront_find_by_variant_finder: -> { Spree::Dependencies.line_item_by_variant_finder },+ storefront_posts_finder: nil,storefront_products_finder: -> { Spree::Dependencies.products_finder },- storefront_posts_finder: -> { Spree::Dependencies.posts_finder },storefront_taxon_finder: -> { Spree::Dependencies.taxon_finder },storefront_variant_finder: -> { Spree::Dependencies.variant_finder },diff --git a/spree/api/spec/serializers/spree/api/v3/post_category_serializer_spec.rb b/spree/api/spec/serializers/spree/api/v3/post_category_serializer_spec.rbdeleted file mode 100644index b441114dea..0000000000--- a/spree/api/spec/serializers/spree/api/v3/post_category_serializer_spec.rb+++ /dev/null@@ -1,21 +0,0 @@-# frozen_string_literal: true--require 'spec_helper'--RSpec.describe Spree::Api::V3::PostCategorySerializer do- let(:store) { @default_store }- let(:post_category) { create(:post_category, store: store) }- let(:base_params) { { store: store, currency: 'USD' } }-- subject { described_class.new(post_category, params: base_params).to_h }-- it 'includes all expected attributes' do- expect(subject.keys).to match_array(%w[- id title slug created_at updated_at- ])- end-- it 'returns the prefixed id' do- expect(subject['id']).to eq(post_category.prefixed_id)- end-enddiff --git a/spree/api/spec/serializers/spree/api/v3/post_serializer_spec.rb b/spree/api/spec/serializers/spree/api/v3/post_serializer_spec.rbdeleted file mode 100644index c0b6634e6c..0000000000--- a/spree/api/spec/serializers/spree/api/v3/post_serializer_spec.rb+++ /dev/null@@ -1,30 +0,0 @@-# frozen_string_literal: true--require 'spec_helper'--RSpec.describe Spree::Api::V3::PostSerializer do- let(:store) { @default_store }- let(:post) { create(:post, store: store) }- let(:base_params) { { store: store, currency: 'USD' } }-- subject { described_class.new(post, params: base_params).to_h }-- it 'includes all expected attributes' do- expect(subject.keys).to match_array(%w[- id title slug meta_title meta_description published_at- author_id post_category_id created_at updated_at- ])- end-- it 'returns the prefixed id' do- expect(subject['id']).to eq(post.prefixed_id)- end-- it 'returns prefixed author_id' do- expect(subject['author_id']).to eq(post.author.prefixed_id)- end-- it 'returns prefixed post_category_id' do- expect(subject['post_category_id']).to eq(post.post_category.prefixed_id)- end-enddiff --git a/spree/core/app/finders/spree/posts/find.rb b/spree/core/app/finders/spree/posts/find.rbdeleted file mode 100644index daff73aa39..0000000000--- a/spree/core/app/finders/spree/posts/find.rb+++ /dev/null@@ -1,137 +0,0 @@-module Spree- module Posts- class Find < Spree::BaseFinder- def initialize(scope:, params:)- super(scope: scope, params: params)- @scope = scope- @query = params[:q].presence&.strip- @ids = String(params.dig(:filter, :ids)).split(',')- @slugs = String(params.dig(:filter, :slugs)).split(',')- @category_ids = String(params.dig(:filter, :category_ids)).split(',')- @author_ids = String(params.dig(:filter, :author_ids)).split(',')- @tags = params.dig(:filter, :tags).to_s.split(',').compact_blank- @sort_by = params[:sort_by]- @published = params.dig(:filter, :published)- end-- def execute- posts = by_ids(scope)- posts = by_slugs(posts)- posts = by_query(posts)- posts = by_category_ids(posts)- posts = by_author_ids(posts)- posts = by_tags(posts)- posts = by_published(posts)- posts = ordered(posts)-- posts.distinct- end-- private-- attr_reader :scope, :query, :ids, :slugs, :category_ids, :author_ids, :tags, :sort_by, :published-- def query?- query.present?- end-- def ids?- ids.present?- end-- def slugs?- slugs.present?- end-- def category_ids?- category_ids.present?- end-- def author_ids?- author_ids.present?- end-- def tags?- tags.present?- end-- def published?- published.present?- end-- def sort_by?- sort_by.present?- end-- def by_query(posts)- return posts unless query?-- posts.search_by_title(query)- end-- def by_ids(posts)- return posts unless ids?-- posts.where(id: ids)- end-- def by_slugs(posts)- return posts unless slugs?-- posts.where(slug: slugs)- end-- def by_category_ids(posts)- return posts unless category_ids?-- posts.where(post_category_id: category_ids)- end-- def by_author_ids(posts)- return posts unless author_ids?-- posts.where(author_id: author_ids)- end-- def by_tags(posts)- return posts if tags.empty?-- posts.tagged_with(tags, any: true)- end-- def by_published(posts)- return posts unless published?-- case published.to_s- when 'true'- posts.published- when 'false'- posts.where(published_at: nil)- else- posts- end- end-- def ordered(posts)- return posts unless sort_by?-- case sort_by- when 'newest-first'- posts.by_newest- when 'oldest-first'- posts.order(created_at: :asc)- when 'published-newest'- posts.order(published_at: :desc)- when 'published-oldest'- posts.order(published_at: :asc)- when 'title-a-z'- posts.order(title: :asc)- when 'title-z-a'- posts.order(title: :desc)- else- posts- end- end- end- end-end\ No newline at end of filediff --git a/spree/core/app/helpers/spree/base_helper.rb b/spree/core/app/helpers/spree/base_helper.rbindex 8a961cc243..d3f75d0dc2 100644--- a/spree/core/app/helpers/spree/base_helper.rb+++ b/spree/core/app/helpers/spree/base_helper.rb@@ -99,7 +99,7 @@ module Spreeend# returns the URL of an object on the storefront- # @param resource [Spree::Product, Spree::Post, Spree::Taxon, Spree::Page] the resource to get the URL for+ # @param resource [Spree::Product, Spree::Taxon, Spree::Page] the resource to get the URL for# @param options [Hash] the options for the URL# @option options [String] :locale the locale of the resource, defaults to I18n.locale# @option options [String] :store the store of the resource, defaults to current_store@@ -135,9 +135,6 @@ module Spreeparams = "?#{params}" if params.present?"#{base_url + localize}/products/#{resource.slug}#{params}"- elsif defined?(Spree::Post) && resource.is_a?(Spree::Post)- preview_id = options[:preview_id].present? ? "?preview_id=#{options[:preview_id]}" : ''- "#{base_url + localize}/posts/#{resource.slug}#{preview_id}"elsif resource.is_a?(Spree::Taxon)"#{base_url + localize}/t/#{resource.permalink}"elsif defined?(Spree::Page) && (resource.is_a?(Spree::Page) || resource.is_a?(Spree::Policy))diff --git a/spree/core/app/models/concerns/spree/admin_user_methods.rb b/spree/core/app/models/concerns/spree/admin_user_methods.rbindex 6d6c7b0018..6fde5c25fd 100644--- a/spree/core/app/models/concerns/spree/admin_user_methods.rb+++ b/spree/core/app/models/concerns/spree/admin_user_methods.rb@@ -22,7 +22,6 @@ module Spreehas_many :created_gift_card_batches, class_name: 'Spree::GiftCardBatch', foreign_key: :created_by_idhas_many :refunded_refunds, class_name: 'Spree::Refund', foreign_key: :refunder_idhas_many :performed_reimbursements, class_name: 'Spree::Reimbursement', foreign_key: :performed_by_id- has_many :authored_posts, class_name: 'Spree::Post', foreign_key: :author_idhas_many :created_store_credits, class_name: 'Spree::StoreCredit', foreign_key: :created_by_idhas_many :reports, class_name: 'Spree::Report', foreign_key: :user_idhas_many :exports, class_name: 'Spree::Export', foreign_key: :user_id@@ -73,7 +72,6 @@ module Spreecreated_gift_card_batches.update_all(created_by_id: nil, updated_at: Time.current)refunded_refunds.update_all(refunder_id: nil, updated_at: Time.current)performed_reimbursements.update_all(performed_by_id: nil, updated_at: Time.current)- authored_posts.update_all(author_id: nil, updated_at: Time.current)created_store_credits.update_all(created_by_id: nil, updated_at: Time.current)# resources to destroydiff --git a/spree/core/app/models/spree/ability.rb b/spree/core/app/models/spree/ability.rbindex 51235a66d7..0cb683437f 100644--- a/spree/core/app/models/spree/ability.rb+++ b/spree/core/app/models/spree/ability.rb@@ -184,8 +184,6 @@ module Spreedigital_link.token == tokenendcan :read, ::Spree::Policy- can :read, ::Spree::Post- can :read, ::Spree::PostCategoryenddef protect_admin_rolediff --git a/spree/core/app/models/spree/permission_sets/default_customer.rb b/spree/core/app/models/spree/permission_sets/default_customer.rbindex c824c9e27f..a52915e143 100644--- a/spree/core/app/models/spree/permission_sets/default_customer.rb+++ b/spree/core/app/models/spree/permission_sets/default_customer.rb@@ -26,8 +26,6 @@ module Spree# Content pagescan :read, Spree::Policy- can :read, Spree::Post- can :read, Spree::PostCategory# Order management for the user's own orderscan :create, Spree::Orderdiff --git a/spree/core/app/models/spree/post.rb b/spree/core/app/models/spree/post.rbdeleted file mode 100644index b9d38db038..0000000000--- a/spree/core/app/models/spree/post.rb+++ /dev/null@@ -1,108 +0,0 @@-module Spree- class Post < Spree.base_class- has_prefix_id :post-- include Spree::SingleStoreResource- include Spree::Metafields- extend FriendlyId-- publishes_lifecycle_events-- friendly_id :slug_candidates, use: %i[slugged scoped history], scope: %i[store_id deleted?]- acts_as_paranoid- acts_as_taggable_on :tags- acts_as_taggable_tenant :store_id-- if defined?(PgSearch)- include PgSearch::Model- pg_search_scope :search_by_title, against: :title- else- scope :search_by_title, ->(query) { where('title LIKE ?', "%#{query}%") }- end-- #- # Ransack filtering- #- self.whitelisted_ransackable_attributes = %w[author_id post_category_id published_at]- self.whitelisted_ransackable_associations = %w[author post_category]- self.whitelisted_ransackable_scopes = %w[search_by_title]-- #- # Attachments- #- has_one_attached :image, service: Spree.public_storage_service_name-- #- # Rich Text- #- has_rich_text :content- has_rich_text :excerpt-- #- # Associations- #- belongs_to :author, class_name: Spree.admin_user_class.to_s, optional: true- belongs_to :store, class_name: 'Spree::Store', inverse_of: :posts- belongs_to :post_category, class_name: 'Spree::PostCategory', optional: true, touch: true, inverse_of: :posts- alias category post_category-- #- # Validations- #- validates :title, :store, presence: true- validates :slug, presence: true, uniqueness: { scope: :store_id, conditions: -> { where(deleted_at: nil) } }- validates :meta_title, length: { maximum: 160 }, allow_blank: true- validates :meta_description, length: { maximum: 320 }, allow_blank: true- validates :image, content_type: Rails.application.config.active_storage.web_image_content_types-- #- # Scopes- #- scope :published, -> { where(published_at: [..Time.current]) }- scope :by_newest, -> { order(created_at: :desc) }-- delegate :name, to: :author, prefix: true, allow_nil: true- delegate :title, to: :post_category, prefix: true, allow_nil: true-- def should_generate_new_friendly_id?- slug.blank? || (persisted? && title_changed?)- end-- def slug_candidates- [- :title,- [:title, :id]- ]- end-- def published?- published_at.present?- end-- def publish(date = nil)- update(published_at: date || Time.current)- end-- def unpublish- update(published_at: nil)- end-- def description- excerpt.to_plain_text.presence || content.to_plain_text- end-- def shortened_description- desc = excerpt.to_plain_text.presence || content.to_plain_text- desc.length > 320 ? "#{desc[0...320]}..." : desc- end-- def self.to_tom_select_json- pluck(:id, :title).map do |id, title|- {- id: id,- name: title- }- end.as_json- end- end-enddiff --git a/spree/core/app/models/spree/post_category.rb b/spree/core/app/models/spree/post_category.rbdeleted file mode 100644index ae1e4a9133..0000000000--- a/spree/core/app/models/spree/post_category.rb+++ /dev/null@@ -1,46 +0,0 @@-module Spree- class PostCategory < Spree.base_class- has_prefix_id :pcat-- include Spree::SingleStoreResource- include Spree::Metafields- extend FriendlyId-- publishes_lifecycle_events-- friendly_id :slug_candidates, use: %i[slugged scoped history], scope: %i[store_id]-- #- # Associations- #- belongs_to :store, class_name: 'Spree::Store', inverse_of: :post_categories- has_many :posts, class_name: 'Spree::Post', dependent: :nullify, inverse_of: :post_category-- #- # Validations- #- validates :title, :store, presence: true- validates :slug, presence: true, uniqueness: { scope: :store_id }-- #- # ActionText- #- has_rich_text :description-- #- # Ransack- #- self.whitelisted_ransackable_attributes = %w[title slug]-- def should_generate_new_friendly_id?- slug.blank? || title_changed?- end-- def slug_candidates- [- :title,- [:title, :id]- ]- end- end-enddiff --git a/spree/core/app/models/spree/store.rb b/spree/core/app/models/spree/store.rbindex f698fb83c5..94487bff8b 100644--- a/spree/core/app/models/spree/store.rb+++ b/spree/core/app/models/spree/store.rb@@ -101,9 +101,6 @@ module Spreehas_many :reports, class_name: 'Spree::Report'has_many :exports, class_name: 'Spree::Export'- has_many :posts, class_name: 'Spree::Post', dependent: :destroy, inverse_of: :store- has_many :post_categories, class_name: 'Spree::PostCategory', dependent: :destroy, inverse_of: :store-has_many :integrations, class_name: 'Spree::Integration'has_many :gift_cards, class_name: 'Spree::GiftCard', dependent: :destroy@@ -165,7 +162,6 @@ module Spreeafter_create :ensure_default_marketafter_create :ensure_default_taxonomies_are_createdafter_create :ensure_default_automatic_taxons- after_create :ensure_default_post_categories_are_createdafter_create :create_default_policies#@@ -446,21 +442,6 @@ module Spreeendend- def ensure_default_post_categories_are_created- Spree::Events.disable do- [- translate_with_store_locale_fallback('spree.default_post_categories.resources'),- translate_with_store_locale_fallback('spree.default_post_categories.articles'),- translate_with_store_locale_fallback('spree.default_post_categories.news')- ].each do |category_title|- # Use exists?/create pattern for safety- next if post_categories.where(title: category_title).exists?-- post_categories.create(title: category_title)- end- end- end-def create_default_policiesSpree::Events.disable do[diff --git a/spree/core/app/sorters/spree/posts/sort.rb b/spree/core/app/sorters/spree/posts/sort.rbdeleted file mode 100644index 040e2e5164..0000000000--- a/spree/core/app/sorters/spree/posts/sort.rb+++ /dev/null@@ -1,40 +0,0 @@-module Spree- module Posts- class Sort < ::Spree::BaseSorter- def initialize(scope, params = {}, allowed_sort_attributes = [])- super(scope, params, allowed_sort_attributes)- end-- def call- posts = by_param_attributes(scope)- posts = select_translatable_fields(posts) if Spree.use_translations?-- posts.distinct- end-- private-- attr_reader :sort, :scope, :allowed_sort_attributes-- # Add translatable fields to SELECT statement to avoid InvalidColumnReference error (workaround for Mobility issue #596)- def select_translatable_fields(scope)- translatable_fields = translatable_sortable_fields- return scope if translatable_fields.empty?-- scope.i18n.select("#{Post.table_name}.*").select(*translatable_fields)- end-- def translatable_sortable_fields- fields = []- Post.translatable_fields.each do |field|- fields << field if sort_by?(field.to_s)- end- fields- end-- def sort_by?(field)- sort.detect { |s| s[0] == field }- end- end- end-end\ No newline at end of filediff --git a/spree/core/config/locales/en.yml b/spree/core/config/locales/en.ymlindex eed4e3c4a3..d56023446c 100644--- a/spree/core/config/locales/en.yml+++ b/spree/core/config/locales/en.yml@@ -734,8 +734,6 @@ en:all_adjustments_opened: All adjustments successfully opened!all_departments: All departmentsall_items_have_been_returned: All items have been returned- all_posts: All posts- all_posts_with_tag: All posts with tagall_products: All productsall_rights_reserved: All rights reservedall_time: All time@@ -802,8 +800,6 @@ en:bill_address: Bill Addressbilling: Billingbilling_address: Billing Address- blog: Blog- blogs_posts: Blogs postsbody_tag_end: Body tag endbody_tag_start: Body tag startboth: Both@@ -997,10 +993,6 @@ en:default_country_help: Country that will be used for the default shipping and billing addresses on Checkoutdefault_currency: Default currencydefault_locale: Default locale- default_post_categories:- articles: Articles- news: News- resources: Resourcesdefault_refund_amount: Default Refund Amountdefault_shipping_address: Default shipping addressdefault_stock_location_name: Shop location@@ -1437,8 +1429,6 @@ en:new_payment: New Paymentnew_payment_method: New Payment Methodnew_policy: New Policy- new_post: New Post- new_post_category: New Post Categorynew_price_list: New Price Listnew_product: New Productnew_promotion: New Promotion@@ -1741,8 +1731,6 @@ en:please_enter_reasonable_quantity: Please enter a reasonable quantity.policies: Policiespopulate_get_error: Something went wrong. Please try adding the item again.- post_categories: Post categories- posts: Postspowered_by: Powered bypre_tax_amount: Pre-Tax Amountpre_tax_refund_amount: Pre-Tax Refund Amountdiff --git a/spree/core/db/migrate/20250121160028_create_spree_posts_and_spree_post_categories.rb b/spree/core/db/migrate/20250121160028_create_spree_posts_and_spree_post_categories.rbdeleted file mode 100644index a6d7a67c6f..0000000000--- a/spree/core/db/migrate/20250121160028_create_spree_posts_and_spree_post_categories.rb+++ /dev/null@@ -1,33 +0,0 @@-class CreateSpreePostsAndSpreePostCategories < ActiveRecord::Migration[6.1]- def change- if !table_exists?(:spree_post_categories)- create_table :spree_post_categories do |t|- t.references :store, null: false, index: true- t.string :title, null: false- t.string :slug, null: false-- t.timestamps-- t.index ['slug', 'store_id'], name: 'index_spree_post_categories_on_slug_and_store_id', unique: true- end- end-- if !table_exists?(:spree_posts)- create_table :spree_posts do |t|- t.references :author, index: true- t.datetime :published_at- t.string :title, null: false- t.string :slug, null: false- t.references :post_category, index: true- t.references :store, index: true- t.string :meta_title- t.string :meta_description-- t.timestamps- t.datetime :deleted_at-- t.index ['title'], name: 'index_spree_posts_on_title'- end- end- end-enddiff --git a/spree/core/db/migrate/20250305121657_remove_spree_posts_indices.rb b/spree/core/db/migrate/20250305121657_remove_spree_posts_indices.rbdeleted file mode 100644index d40db1c3d6..0000000000--- a/spree/core/db/migrate/20250305121657_remove_spree_posts_indices.rb+++ /dev/null@@ -1,7 +0,0 @@-class RemoveSpreePostsIndices < ActiveRecord::Migration[7.2]- def change- if index_name_exists?(:spree_posts, 'index_spree_posts_on_slug_and_store_id')- remove_index :spree_posts, name: 'index_spree_posts_on_slug_and_store_id'- end- end-enddiff --git a/spree/core/db/sample_data/posts.rb b/spree/core/db/sample_data/posts.rbdeleted file mode 100644index 994b8820f5..0000000000--- a/spree/core/db/sample_data/posts.rb+++ /dev/null@@ -1,7 +0,0 @@-store = Spree::Store.default--store.posts.where(title: 'Hello World').first_or_create!(- content: 'This is a test post',- published_at: Time.current,- author: Spree.admin_user_class.first-)diff --git a/spree/core/lib/spree/core/dependencies.rb b/spree/core/lib/spree/core/dependencies.rbindex b1491a7d76..b8313b7970 100644--- a/spree/core/lib/spree/core/dependencies.rb+++ b/spree/core/lib/spree/core/dependencies.rb@@ -56,9 +56,8 @@ module Spree# sortercollection_sorter: 'Spree::BaseSorter',order_sorter: 'Spree::BaseSorter',+ posts_sorter: nil,products_sorter: 'Spree::Products::Sort',- posts_sorter: 'Spree::Posts::Sort',-# paginatorcollection_paginator: 'Spree::Shared::Paginate',@@ -96,8 +95,8 @@ module Spreecurrent_store_finder: 'Spree::Stores::FindDefault',completed_order_finder: 'Spree::Orders::FindComplete',credit_card_finder: 'Spree::CreditCards::Find',+ posts_finder: nil,products_finder: 'Spree::Products::Find',- posts_finder: 'Spree::Posts::Find',taxon_finder: 'Spree::Taxons::Find',line_item_by_variant_finder: 'Spree::LineItems::FindByVariant',variant_finder: 'Spree::Variants::Find'diff --git a/spree/core/lib/spree/core/engine.rb b/spree/core/lib/spree/core/engine.rbindex ecff865e99..dff1790450 100644--- a/spree/core/lib/spree/core/engine.rb+++ b/spree/core/lib/spree/core/engine.rb@@ -238,8 +238,6 @@ module SpreeSpree::Payment,Spree::PaymentMethod,Spree::PaymentSource,- Spree::Post,- Spree::PostCategory,Spree::Product,Spree::Promotion,Spree::Refund,diff --git a/spree/core/lib/spree/permitted_attributes.rb b/spree/core/lib/spree/permitted_attributes.rbindex fc4e962d03..f49481aedc 100644--- a/spree/core/lib/spree/permitted_attributes.rb+++ b/spree/core/lib/spree/permitted_attributes.rb@@ -39,8 +39,6 @@ module Spree:payment_session_attributes,:payment_setup_session_attributes,:policy_attributes,- :post_attributes,- :post_category_attributes,:price_list_attributes,:product_attributes,:promotion_attributes,@@ -177,10 +175,6 @@ module Spree@@policy_attributes = [:name, :slug, :body]- @@post_attributes = [:title, :meta_title, :meta_description, :slug, :author_id, :post_category_id, :published_at, :content, :excerpt, :image, tag_list: []]-- @@post_category_attributes = [:title, :slug, :description]-@@price_list_attributes = [:name, :description, :match_policy, :starts_at, :ends_at, :status, :position]@@product_properties_attributes = [:property_name, :property_id, :value, :position, :_destroy]diff --git a/spree/core/lib/spree/testing_support/factories/post_category_factory.rb b/spree/core/lib/spree/testing_support/factories/post_category_factory.rbdeleted file mode 100644index fe0cb9a6fa..0000000000--- a/spree/core/lib/spree/testing_support/factories/post_category_factory.rb+++ /dev/null@@ -1,7 +0,0 @@-FactoryBot.define do- factory :post_category, class: Spree::PostCategory do- sequence(:title) { |n| "Category ##{n + 1}" }- description { FFaker::Lorem.sentence }- store { Spree::Store.default || create(:store) }- end-enddiff --git a/spree/core/lib/spree/testing_support/factories/post_factory.rb b/spree/core/lib/spree/testing_support/factories/post_factory.rbdeleted file mode 100644index 5348ba82e5..0000000000--- a/spree/core/lib/spree/testing_support/factories/post_factory.rb+++ /dev/null@@ -1,22 +0,0 @@-FactoryBot.define do- factory :post, class: Spree::Post do- store { Spree::Store.default || create(:store) }- post_category { association(:post_category, store: store) }- title { FFaker::Lorem.sentence }- content { FFaker::Lorem.paragraph }- published_at { Time.current }- association :author, factory: :admin_user-- trait :with_image do- image { Rack::Test::UploadedFile.new(Spree::Core::Engine.root.join('spec/fixtures/thinking-cat.jpg'), 'image/jpeg') }- end-- trait :published do- published_at { Time.current }- end-- trait :unpublished do- published_at { nil }- end- end-enddiff --git a/spree/core/spec/models/spree/admin_user_spec.rb b/spree/core/spec/models/spree/admin_user_spec.rbindex a02661a9aa..727c905105 100644--- a/spree/core/spec/models/spree/admin_user_spec.rb+++ b/spree/core/spec/models/spree/admin_user_spec.rb@@ -28,7 +28,6 @@ describe Spree.admin_user_class, type: :model dolet!(:gift_cards) { create_list(:gift_card, 2, created_by: admin_user) }let!(:refunds) { create_list(:refund, 2, refunder: admin_user, amount: 1) }let!(:reimbursements) { create_list(:reimbursement, 2, performed_by: admin_user) }- let!(:posts) { create_list(:post, 2, author: admin_user) }let!(:reports) { create_list(:report, 2, user: admin_user) }let!(:store_credits) { create_list(:store_credit, 2, created_by: admin_user) }let!(:exports) { create_list(:export, 2, user: admin_user) }@@ -42,7 +41,6 @@ describe Spree.admin_user_class, type: :model doexpect(gift_cards.all? { |gift_card| gift_card.reload.created_by_id.nil? }).to be_truthyexpect(refunds.all? { |refund| refund.reload.refunder_id.nil? }).to be_truthyexpect(reimbursements.all? { |reimbursement| reimbursement.reload.performed_by_id.nil? }).to be_truthy- expect(posts.all? { |post| post.reload.author_id.nil? }).to be_truthyexpect(store_credits.all? { |store_credit| store_credit.reload.created_by_id.nil? }).to be_truthyendenddiff --git a/spree/core/spec/models/spree/concerns/admin_user_methods_spec.rb b/spree/core/spec/models/spree/concerns/admin_user_methods_spec.rbindex dd15b5b487..3f299468f7 100644--- a/spree/core/spec/models/spree/concerns/admin_user_methods_spec.rb+++ b/spree/core/spec/models/spree/concerns/admin_user_methods_spec.rb@@ -13,7 +13,6 @@ describe Spree::AdminUserMethods doit { expect(admin_user).to have_many(:created_gift_card_batches) }it { expect(admin_user).to have_many(:refunded_refunds) }it { expect(admin_user).to have_many(:performed_reimbursements) }- it { expect(admin_user).to have_many(:authored_posts) }it { expect(admin_user).to have_many(:created_store_credits) }it { expect(admin_user).to have_many(:reports) }it { expect(admin_user).to have_many(:exports) }@@ -126,7 +125,6 @@ describe Spree::AdminUserMethods dolet!(:gift_card_batch) { create(:gift_card_batch, created_by: admin_user, amount: 100, prefix: 'TEST') }let!(:refund) { create(:refund, refunder: admin_user, amount: 1) }let!(:reimbursement) { create(:reimbursement, performed_by: admin_user) }- let!(:post) { create(:post, author: admin_user) }let!(:store_credit) { create(:store_credit, created_by: admin_user) }let!(:report) { create(:report, user: admin_user) }let!(:export) { create(:export, user: admin_user) }@@ -161,11 +159,6 @@ describe Spree::AdminUserMethods doexpect(reimbursement.reload.performed_by_id).to be_nilend- it 'nullifies author_id on posts' do- admin_user.destroy- expect(post.reload.author_id).to be_nil- end-it 'nullifies created_by_id on store credits' doadmin_user.destroyexpect(store_credit.reload.created_by_id).to be_nildiff --git a/spree/core/spec/models/spree/post_category_spec.rb b/spree/core/spec/models/spree/post_category_spec.rbdeleted file mode 100644index e800dcbe4f..0000000000--- a/spree/core/spec/models/spree/post_category_spec.rb+++ /dev/null@@ -1,59 +0,0 @@-require 'spec_helper'--RSpec.describe Spree::PostCategory, type: :model do- let(:post_category) { build(:post_category) }-- it_behaves_like 'lifecycle events'-- context 'Associations' do- describe 'posts' do- it 'has many posts' do- post1 = create(:post, post_category: post_category)- post2 = create(:post, post_category: post_category)-- expect(post_category.posts).to include(post1, post2)- end-- it 'nullifies posts when destroyed' do- post = create(:post, post_category: post_category)-- post_category.destroy- post.reload-- expect(post.post_category).to be_nil- end- end- end-- describe 'FriendlyId' do- before do- post_category.save!- end-- describe '#should_generate_new_friendly_id?' do- it 'returns true when slug is blank' do- post_category.slug = nil- expect(post_category.should_generate_new_friendly_id?).to be true- end-- it 'returns true when title has changed' do- post_category.title = 'New Title'- expect(post_category.should_generate_new_friendly_id?).to be true- end-- it 'returns false when slug is present and title unchanged' do- expect(post_category.should_generate_new_friendly_id?).to be false- end- end-- describe '#slug_candidates' do- it 'returns correct slug candidates' do- expected_candidates = [- :title,- [:title, :id]- ]- expect(post_category.slug_candidates).to eq(expected_candidates)- end- end- end-enddiff --git a/spree/core/spec/models/spree/post_spec.rb b/spree/core/spec/models/spree/post_spec.rbdeleted file mode 100644index 43da1b86b5..0000000000--- a/spree/core/spec/models/spree/post_spec.rb+++ /dev/null@@ -1,54 +0,0 @@-require 'spec_helper'--RSpec.describe Spree::Post, type: :model do- let(:post) { create(:post) }-- it_behaves_like 'lifecycle events'-- context 'Validations' do- describe 'image' do- it 'validates content type' do- post.image.attach(- io: File.open(Spree::Core::Engine.root.join('spec/fixtures/files/icon_256x256.png')), filename: 'icon_256x256.png',- content_type: 'image/png'- )- expect(post).to be_valid-- post.image.attach(- io: File.open(Spree::Core::Engine.root.join('spec/fixtures/files/example.json')), filename: 'example.json',- content_type: 'application/json'- )- expect(post).not_to be_valid- end- end-- describe 'slug' do- it 'validates uniqueness' do- other_post = create(:post, slug: 'test-slug')-- post.slug = other_post.slug- expect(post).not_to be_valid- expect(post.errors.full_messages).to include('Slug has already been taken')-- other_post.destroy- expect(post).to be_valid- end- end- end-- describe '#author_name' do- it 'returns the author name' do- expect(post.author_name).to eq(post.author.name)- end-- context 'when author is deleted' do- let!(:other_admin_user) { create(:admin_user) }-- it 'returns the author name' do- post.author.destroy!- post.reload- expect(post.author_name).to be_nil- end- end- end-enddiff --git a/spree/core/spec/models/spree/store_spec.rb b/spree/core/spec/models/spree/store_spec.rbindex 3f6147cdd8..14ffebbfa3 100644--- a/spree/core/spec/models/spree/store_spec.rb+++ b/spree/core/spec/models/spree/store_spec.rb@@ -294,28 +294,6 @@ describe Spree::Store, type: :model, without_global_store: true doendend- describe '#ensure_default_post_categories_are_created' do- let(:store) { build(:store) }-- it 'creates default post categories' do- expect { store.save! }.to change(Spree::PostCategory, :count).by(3)-- expect(store.post_categories.count).to eq(3)- expect(store.post_categories.pluck(:title)).to contain_exactly(- Spree.t('default_post_categories.resources'),- Spree.t('default_post_categories.articles'),- Spree.t('default_post_categories.news')- )- end-- it 'is idempotent - does not create duplicates when called multiple times' do- store.save!-- expect { store.send(:ensure_default_post_categories_are_created) }.not_to change(Spree::PostCategory, :count)- expect(store.post_categories.count).to eq(3)- end- end-endcontext 'Validations' do