From db3f5693981c95491d971e2d5da92ab601aec943 Mon Sep 17 00:00:00 2001
From: Krzysztof Kotlarek <kotlarek.krzysztof@gmail.com>
Date: Fri, 20 Jan 2023 13:30:39 +1100
Subject: [PATCH] FIX: move min tag setting to tags section in edit category
 (#19789)

`Minimum number of tags required in a topic` should be in `Tags` panel instead of `Settings`
---
 .../components/edit-category-settings.hbs        | 16 +---------------
 .../templates/components/edit-category-tags.hbs  | 13 ++++++++++++-
 .../tests/acceptance/category-edit-test.js       |  2 ++
 .../stylesheets/common/base/edit-category.scss   |  3 ++-
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/templates/components/edit-category-settings.hbs b/app/assets/javascripts/discourse/app/templates/components/edit-category-settings.hbs
index 2080982b7aa..5d1ab2c2375 100644
--- a/app/assets/javascripts/discourse/app/templates/components/edit-category-settings.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/edit-category-settings.hbs
@@ -181,20 +181,6 @@
     </div>
   </section>
 
-  {{#if this.siteSettings.tagging_enabled}}
-    <section class="field minimum-required-tags">
-      <label for="category-minimum-tags">
-        {{i18n "category.minimum_required_tags"}}
-      </label>
-      <TextField
-        @value={{this.category.minimum_required_tags}}
-        @id="category-minimum-tags"
-        @type="number"
-        @min="0"
-      />
-    </section>
-  {{/if}}
-
   <section class="field num-auto-bump-daily">
     <label for="category-number-daily-bump">
       {{i18n "category.num_auto_bump_daily"}}
@@ -378,4 +364,4 @@
   @name="category-custom-settings"
   @args={{hash category=this.category}}
   @tagName="section"
-/>
\ No newline at end of file
+/>
diff --git a/app/assets/javascripts/discourse/app/templates/components/edit-category-tags.hbs b/app/assets/javascripts/discourse/app/templates/components/edit-category-tags.hbs
index 98f724be1bc..5b39eadf2d2 100644
--- a/app/assets/javascripts/discourse/app/templates/components/edit-category-tags.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/edit-category-tags.hbs
@@ -1,3 +1,14 @@
+<section class="field minimum-required-tags">
+  <label for="category-minimum-tags">
+    {{i18n "category.minimum_required_tags"}}
+  </label>
+  <TextField
+    @value={{this.category.minimum_required_tags}}
+    @id="category-minimum-tags"
+    @type="number"
+    @min="0"
+  />
+</section>
 <section class="field allowed-tags">
   <label>{{i18n "category.tags_allowed_tags"}}</label>
   <TagChooser
@@ -71,4 +82,4 @@
       @class="add-required-tag-group"
     />
   </section>
-</section>
\ No newline at end of file
+</section>
diff --git a/app/assets/javascripts/discourse/tests/acceptance/category-edit-test.js b/app/assets/javascripts/discourse/tests/acceptance/category-edit-test.js
index 9f777d5877b..a315b60e72d 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/category-edit-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/category-edit-test.js
@@ -77,6 +77,8 @@ acceptance("Category Edit", function (needs) {
   test("Editing required tag groups", async function (assert) {
     await visit("/c/bug/edit/tags");
 
+    assert.ok(exists(".minimum-required-tags"));
+
     assert.ok(exists(".required-tag-groups"));
     assert.strictEqual(count(".required-tag-group-row"), 0);
 
diff --git a/app/assets/stylesheets/common/base/edit-category.scss b/app/assets/stylesheets/common/base/edit-category.scss
index f93326e2c95..0365781b45b 100644
--- a/app/assets/stylesheets/common/base/edit-category.scss
+++ b/app/assets/stylesheets/common/base/edit-category.scss
@@ -102,7 +102,8 @@ div.edit-category {
     }
   }
 
-  .edit-category-tab-settings {
+  .edit-category-tab-settings,
+  .edit-category-tab-tags {
     > section {
       margin-bottom: 1.5em;
     }