Skip to content

A platform for community discussion. Free, open, simple.

Revert "FEAT: category-specific topic title placeholder" (#38588)

Bannon Tanner09c0baacbd5f
diff --git a/app/assets/stylesheets/common/base/edit-category.scss b/app/assets/stylesheets/common/base/edit-category.scss
index e12768063cd..98f095497e6 100644
--- a/app/assets/stylesheets/common/base/edit-category.scss
+++ b/app/assets/stylesheets/common/base/edit-category.scss
@@ -230,8 +230,7 @@ div.edit-category {
}
.edit-category-tab-settings,
- .edit-category-tab-tags,
- .edit-category-tab-topic-template {
+ .edit-category-tab-tags {
> section {
margin-bottom: 1.5em;
}
diff --git a/app/controllers/categories_controller.rb b/app/controllers/categories_controller.rb
index e73bcbc7d6a..fae8db12f5e 100644
--- a/app/controllers/categories_controller.rb
+++ b/app/controllers/categories_controller.rb
@@ -622,7 +622,6 @@ class CategoriesController < ApplicationController
:slug,
:allow_badges,
:topic_template,
- :topic_title_placeholder,
:description,
:sort_order,
:sort_ascending,
diff --git a/app/models/category.rb b/app/models/category.rb
index eb8fbda3c2c..73191d0d81d 100644
--- a/app/models/category.rb
+++ b/app/models/category.rb
@@ -1271,65 +1271,64 @@ end
# Table name: categories
#
# id :integer not null, primary key
-# all_topics_wiki :boolean default(FALSE), not null
-# allow_badges :boolean default(TRUE), not null
-# allow_global_tags :boolean default(FALSE), not null
-# allow_unlimited_owner_edits_on_first_post :boolean default(FALSE), not null
-# auto_close_based_on_last_post :boolean default(FALSE)
-# auto_close_hours :float
-# color :string(6) default("0088CC"), not null
-# contains_messages :boolean
-# default_list_filter :string(20) default("all")
-# default_slow_mode_seconds :integer
-# default_top_period :string(20) default("all")
-# default_view :string(50)
-# description :text
-# email_in :string
-# email_in_allow_strangers :boolean default(FALSE)
-# emoji :string
-# icon :string
-# locale :string(20)
-# mailinglist_mirror :boolean default(FALSE), not null
-# minimum_required_tags :integer default(0), not null
# name :string(50) not null
-# name_lower :string(50) not null
-# navigate_to_first_post_after_read :boolean default(FALSE), not null
-# num_featured_topics :integer default(3)
-# position :integer
-# post_count :integer default(0), not null
-# posts_day :integer default(0)
-# posts_month :integer default(0)
-# posts_week :integer default(0)
-# posts_year :integer default(0)
-# read_only_banner :string
-# read_restricted :boolean default(FALSE), not null
-# search_priority :integer default(0)
-# show_subcategory_list :boolean default(FALSE)
-# slug :string not null
-# sort_ascending :boolean
-# sort_order :string
-# style_type :integer default("square"), not null
-# subcategory_list_style :string(50) default("rows_with_featured_topics")
-# text_color :string(6) default("FFFFFF"), not null
+# color :string(6) default("0088CC"), not null
+# topic_id :integer
# topic_count :integer default(0), not null
-# topic_featured_link_allowed :boolean default(TRUE)
-# topic_template :text
-# topic_title_placeholder :string
-# topics_day :integer default(0)
-# topics_month :integer default(0)
-# topics_week :integer default(0)
-# topics_year :integer default(0)
# created_at :datetime not null
# updated_at :datetime not null
+# user_id :integer not null
+# topics_year :integer default(0)
+# topics_month :integer default(0)
+# topics_week :integer default(0)
+# slug :string not null
+# description :text
+# text_color :string(6) default("FFFFFF"), not null
+# read_restricted :boolean default(FALSE), not null
+# auto_close_hours :float
+# post_count :integer default(0), not null
# latest_post_id :integer
# latest_topic_id :integer
+# position :integer
# parent_category_id :integer
-# topic_id :integer
-# uploaded_background_dark_id :integer
+# posts_year :integer default(0)
+# posts_month :integer default(0)
+# posts_week :integer default(0)
+# email_in :string
+# email_in_allow_strangers :boolean default(FALSE)
+# topics_day :integer default(0)
+# posts_day :integer default(0)
+# allow_badges :boolean default(TRUE), not null
+# name_lower :string(50) not null
+# auto_close_based_on_last_post :boolean default(FALSE)
+# topic_template :text
+# contains_messages :boolean
+# sort_order :string
+# sort_ascending :boolean
+# uploaded_logo_id :integer
# uploaded_background_id :integer
+# topic_featured_link_allowed :boolean default(TRUE)
+# all_topics_wiki :boolean default(FALSE), not null
+# show_subcategory_list :boolean default(FALSE)
+# num_featured_topics :integer default(3)
+# default_view :string(50)
+# subcategory_list_style :string(50) default("rows_with_featured_topics")
+# default_top_period :string(20) default("all")
+# mailinglist_mirror :boolean default(FALSE), not null
+# minimum_required_tags :integer default(0), not null
+# navigate_to_first_post_after_read :boolean default(FALSE), not null
+# search_priority :integer default(0)
+# allow_global_tags :boolean default(FALSE), not null
+# read_only_banner :string
+# default_list_filter :string(20) default("all")
+# allow_unlimited_owner_edits_on_first_post :boolean default(FALSE), not null
+# default_slow_mode_seconds :integer
# uploaded_logo_dark_id :integer
-# uploaded_logo_id :integer
-# user_id :integer not null
+# uploaded_background_dark_id :integer
+# style_type :integer default("square"), not null
+# emoji :string
+# icon :string
+# locale :string(20)
#
# Indexes
#
diff --git a/app/serializers/basic_category_serializer.rb b/app/serializers/basic_category_serializer.rb
index 592953f3119..646f36a39bf 100644
--- a/app/serializers/basic_category_serializer.rb
+++ b/app/serializers/basic_category_serializer.rb
@@ -23,7 +23,6 @@ class BasicCategorySerializer < ApplicationSerializer
:notification_level,
:can_edit,
:topic_template,
- :topic_title_placeholder,
:has_children,
:subcategory_count,
:sort_order,
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index c34c30dec7a..1bc2476b22e 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -4650,8 +4650,6 @@ en:
advanced: "Advanced"
show_advanced: "Advanced settings"
topic_template: "Template"
- topic_title_placeholder: "Category topic title placeholder"
- topic_title_placeholder_placeholder: "[optional] custom topic title placeholder for this category"
tags: "Tags"
localizations: "Localizations"
localization:
diff --git a/db/migrate/20260306183220_add_topic_title_placeholder_to_categories.rb b/db/migrate/20260306183220_add_topic_title_placeholder_to_categories.rb
deleted file mode 100644
index d45d2835f69..00000000000
--- a/db/migrate/20260306183220_add_topic_title_placeholder_to_categories.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-class AddTopicTitlePlaceholderToCategories < ActiveRecord::Migration[8.0]
- def change
- add_column :categories, :topic_title_placeholder, :string, null: true
- end
-end
diff --git a/frontend/discourse/app/components/category-topic-template-editor.gjs b/frontend/discourse/app/components/category-topic-template-editor.gjs
index 5d7ee61e86a..0cb76d523b7 100644
--- a/frontend/discourse/app/components/category-topic-template-editor.gjs
+++ b/frontend/discourse/app/components/category-topic-template-editor.gjs
@@ -6,7 +6,6 @@ import { LinkTo } from "@ember/routing";
import { service } from "@ember/service";
import DEditor from "discourse/components/d-editor";
import DToggleSwitch from "discourse/components/d-toggle-switch";
-import TextField from "discourse/components/text-field";
import FormTemplateChooser from "discourse/select-kit/components/form-template-chooser";
import { i18n } from "discourse-i18n";
@@ -88,16 +87,6 @@ export default class CategoryTopicTemplateEditor extends Component {
}
<template>
- <div class="control-group">
- <label for="category-topic-title-placeholder">
- {{i18n "category.topic_title_placeholder"}}
- </label>
- <TextField
- @value={{@category.topic_title_placeholder}}
- @id="category-topic-title-placeholder"
- @placeholderKey="category.topic_title_placeholder_placeholder"
- />
- </div>
{{#if this.siteSettings.enable_form_templates}}
<div class="control-group">
<DToggleSwitch
diff --git a/frontend/discourse/app/components/composer-title.gjs b/frontend/discourse/app/components/composer-title.gjs
index 79c7da17873..8402dfded65 100644
--- a/frontend/discourse/app/components/composer-title.gjs
+++ b/frontend/discourse/app/components/composer-title.gjs
@@ -227,14 +227,6 @@ export default class ComposerTitle extends Component {
);
}
- @computed("composer.categoryTitlePlaceholder", "composer.titlePlaceholder")
- get titleAriaLabel() {
- return (
- this.composer.categoryTitlePlaceholder ||
- i18n(this.composer.titlePlaceholder)
- );
- }
-
bodyIsDefault() {
const reply = this.get("composer.reply") || "";
return (
@@ -249,8 +241,7 @@ export default class ComposerTitle extends Component {
@id="reply-title"
@maxLength={{this.titleMaxLength}}
@placeholderKey={{this.composer.titlePlaceholder}}
- @placeholder={{this.composer.categoryTitlePlaceholder}}
- @aria-label={{this.titleAriaLabel}}
+ @aria-label={{i18n this.composer.titlePlaceholder}}
@disabled={{this.disabled}}
@autocomplete="off"
/>
diff --git a/frontend/discourse/app/models/category.js b/frontend/discourse/app/models/category.js
index 0f83610530b..790f8709c3f 100644
--- a/frontend/discourse/app/models/category.js
+++ b/frontend/discourse/app/models/category.js
@@ -804,7 +804,6 @@ export default class Category extends RestModel {
category_setting_attributes: this.category_setting,
custom_fields: this.custom_fields,
topic_template: this.topic_template,
- topic_title_placeholder: this.topic_title_placeholder,
form_template_ids: this.form_template_ids,
all_topics_wiki: this.all_topics_wiki,
allow_unlimited_owner_edits_on_first_post:
diff --git a/frontend/discourse/app/models/composer.js b/frontend/discourse/app/models/composer.js
index 965f33cc384..ab47de357db 100644
--- a/frontend/discourse/app/models/composer.js
+++ b/frontend/discourse/app/models/composer.js
@@ -450,11 +450,6 @@ export default class Composer extends RestModel {
: "composer.title_placeholder";
}
- @computed("category.topic_title_placeholder")
- get categoryTitlePlaceholder() {
- return this.category?.topic_title_placeholder || null;
- }
-
@computed("action", "post", "topic", "topic.title")
get replyOptions() {
const options = {
diff --git a/spec/requests/api/schemas/json/category_create_response.json b/spec/requests/api/schemas/json/category_create_response.json
index ae840596e2a..e8b48972ace 100644
--- a/spec/requests/api/schemas/json/category_create_response.json
+++ b/spec/requests/api/schemas/json/category_create_response.json
@@ -89,12 +89,6 @@
"null"
]
},
- "topic_title_placeholder": {
- "type": [
- "string",
- "null"
- ]
- },
"form_template_ids": {
"type": "array",
"items": {}
@@ -348,7 +342,6 @@
"notification_level",
"can_edit",
"topic_template",
- "topic_title_placeholder",
"has_children",
"subcategory_count",
"sort_order",
diff --git a/spec/requests/api/schemas/json/category_list_response.json b/spec/requests/api/schemas/json/category_list_response.json
index cd811fbcdc9..08495969ec8 100644
--- a/spec/requests/api/schemas/json/category_list_response.json
+++ b/spec/requests/api/schemas/json/category_list_response.json
@@ -84,12 +84,6 @@
"null"
]
},
- "topic_title_placeholder": {
- "type": [
- "string",
- "null"
- ]
- },
"has_children": {
"type": "boolean"
},
@@ -217,7 +211,6 @@
"notification_level",
"can_edit",
"topic_template",
- "topic_title_placeholder",
"has_children",
"subcategory_count",
"sort_order",
diff --git a/spec/requests/api/schemas/json/category_update_response.json b/spec/requests/api/schemas/json/category_update_response.json
index 610f67225cb..069885b00a5 100644
--- a/spec/requests/api/schemas/json/category_update_response.json
+++ b/spec/requests/api/schemas/json/category_update_response.json
@@ -92,12 +92,6 @@
"null"
]
},
- "topic_title_placeholder": {
- "type": [
- "string",
- "null"
- ]
- },
"form_template_ids": {
"type": "array",
"items": {}
@@ -348,7 +342,6 @@
"notification_level",
"can_edit",
"topic_template",
- "topic_title_placeholder",
"form_template_ids",
"has_children",
"subcategory_count",
diff --git a/spec/requests/api/schemas/json/site_response.json b/spec/requests/api/schemas/json/site_response.json
index a168b498fc7..863ecf6a9a9 100644
--- a/spec/requests/api/schemas/json/site_response.json
+++ b/spec/requests/api/schemas/json/site_response.json
@@ -708,12 +708,6 @@
"null"
]
},
- "topic_title_placeholder": {
- "type": [
- "string",
- "null"
- ]
- },
"has_children": {
"type": "boolean"
},
@@ -859,7 +853,6 @@
"permission",
"notification_level",
"topic_template",
- "topic_title_placeholder",
"has_children",
"subcategory_count",
"sort_order",
diff --git a/spec/requests/categories_controller_spec.rb b/spec/requests/categories_controller_spec.rb
index 6c4efe4b80e..273f7dcaf7b 100644
--- a/spec/requests/categories_controller_spec.rb
+++ b/spec/requests/categories_controller_spec.rb
@@ -934,7 +934,6 @@ RSpec.describe CategoriesController do
allow_global_tags: "true",
required_tag_groups: [{ name: tag_group.name, min_count: 2 }],
form_template_ids: [form_template_1.id, form_template_2.id],
- topic_title_placeholder: "test topic title placeholder",
}
expect(response.status).to eq(200)
@@ -957,7 +956,6 @@ RSpec.describe CategoriesController do
expect(category.category_required_tag_groups.first.tag_group.id).to eq(tag_group.id)
expect(category.category_required_tag_groups.first.min_count).to eq(2)
expect(category.form_template_ids).to eq([form_template_1.id, form_template_2.id])
- expect(category.topic_title_placeholder).to eq("test topic title placeholder")
end
it "logs the changes correctly" do
diff --git a/spec/system/composer/category_templates_spec.rb b/spec/system/composer/category_templates_spec.rb
index e4768b09992..81ceceb1179 100644
--- a/spec/system/composer/category_templates_spec.rb
+++ b/spec/system/composer/category_templates_spec.rb
@@ -633,26 +633,4 @@ describe "Composer Form Templates", type: :system do
expect(mini_tag_chooser).to have_no_selection
end
end
-
- context "when a category has a topic title placeholder" do
- fab!(:category_with_title_placeholder) do
- Fabricate(:category, topic_title_placeholder: "Describe your issue briefly")
- end
-
- it "shows custom topic title placeholder in the composer" do
- category_page.visit(category_with_title_placeholder)
- category_page.new_topic_button.click
-
- expect(page).to have_field("reply-title", placeholder: "Describe your issue briefly")
- end
-
- it "falls back to default placeholder if category topic title placeholder is nil" do
- SiteSetting.topic_featured_link_enabled = false
- category_with_title_placeholder.update!(topic_title_placeholder: nil)
- category_page.visit(category_with_title_placeholder)
- category_page.new_topic_button.click
-
- expect(find("#reply-title")[:placeholder]).to eq(I18n.t("js.composer.title_placeholder"))
- end
- end
end
diff --git a/spec/system/edit_category_topic_template_spec.rb b/spec/system/edit_category_topic_template_spec.rb
deleted file mode 100644
index 0213afc82ce..00000000000
--- a/spec/system/edit_category_topic_template_spec.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-describe "Edit category topic template", type: :system do
- fab!(:admin)
- fab!(:category)
-
- before { sign_in admin }
-
- it "saves and displays a custom topic title placeholder" do
- visit "/c/#{category.slug}/edit/topic-template"
- find("#category-topic-title-placeholder").fill_in(with: "Describe your issue briefly")
- find("#save-category").click
-
- expect(category.reload.topic_title_placeholder).to eq("Describe your issue briefly")
- end
-end