Skip to content

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

UX: Category danger zone + cleanup old category page selectors (#41049)

chapoi14b972f993c3
diff --git a/app/assets/stylesheets/common/base/edit-category.scss b/app/assets/stylesheets/common/base/edit-category.scss
index 61bb3827a64..9a3d4914ca7 100644
--- a/app/assets/stylesheets/common/base/edit-category.scss
+++ b/app/assets/stylesheets/common/base/edit-category.scss
@@ -1,123 +1,28 @@
@use "lib/viewport";
@use "sass:string";
-$category-settings-width: string.unquote("min(600px, 90%)");
-$number-input-width: 75px;
+$number-input-width: var(--form-kit-small-input);
-div.edit-category {
+.edit-category {
display: block;
max-width: 75ch;
width: 100%;
margin: 0 auto;
+ padding-bottom: var(--space-12);
@include viewport.until(sm) {
display: block;
}
- .edit-category-title-bar {
- grid-area: header;
- grid-column: 1 / span 2;
- display: flex;
- gap: 1em;
- justify-content: space-between;
- align-self: start;
- background-color: var(--primary-very-low);
- padding: 20px;
-
- @include viewport.until(sm) {
- justify-content: start;
- align-items: center;
- padding-bottom: 1em;
- }
-
- h2 {
- @include ellipsis;
-
- @include viewport.until(sm) {
- order: 2;
- margin-bottom: 0;
- }
- }
-
- .category-back {
- height: 2em;
- align-self: flex-end;
- flex: 0 0 auto;
- }
- }
-
- .edit-category-title {
- min-width: 0;
- }
-
- .edit-category-nav {
- grid-area: sidebar;
- grid-row: 2 / span 3;
-
- @include viewport.until(sm) {
- width: 100%;
- background-color: var(--secondary);
- position: relative;
- border-top: 1px solid var(--content-border-color);
- border-bottom: 1px solid var(--content-border-color);
- margin: 0.5em 0;
- overflow: hidden;
-
- &::after {
- background: linear-gradient(
- to right,
- rgb(var(--secondary-rgb), 0),
- rgb(var(--secondary-rgb), 1)
- );
- content: "";
- position: absolute;
- right: 0;
- height: 100%;
- width: 30px;
- }
- }
- }
-
- .nav-stacked {
- background-color: var(--secondary);
-
- @include viewport.until(sm) {
- white-space: nowrap;
- flex-wrap: nowrap;
- overflow-x: scroll;
- display: inline-flex;
- width: 100%;
- margin-bottom: 0;
-
- li {
- font-size: var(--font-down-1);
- border-bottom: none;
- }
+ .edit-category-tab {
+ .form-kit__container-content {
+ // catch-all for text that can't use FormKit builtiin helpertext
+ flex-direction: column;
- a.active::after {
- display: none;
+ input[type="number"] {
+ width: $number-input-width;
}
}
- }
-
- .edit-category-content {
- grid-area: content;
-
- @include viewport.until(sm) {
- padding-top: 1em;
- }
-
- .edit-category-tab {
- display: none;
- }
-
- .edit-category-tab.active {
- display: contents;
- }
-
- .form-kit__container-content {
- flex-wrap: wrap;
- }
.category-permission-hint {
font-size: var(--font-down-1);
@@ -125,18 +30,9 @@ div.edit-category {
}
}
- #list-area & h2 {
- margin: 0;
- }
-
- section.field {
- margin-bottom: 1em;
- }
-
- .category-name-fields {
- display: flex;
- flex-wrap: wrap;
- gap: 1em;
+ .form-kit__control-custom,
+ .form-kit__control-custom .select-kit {
+ width: 100%;
}
.warning {
@@ -145,178 +41,6 @@ div.edit-category {
margin-top: 0;
}
- .edit-category-tab-general {
- .category-chooser {
- width: min(340px, 90%);
- }
-
- .select-kit-header {
- padding-right: 0.65em;
-
- &:hover {
- border: 1px solid var(--tertiary);
- }
-
- .angle-icon {
- color: var(--primary-high);
- width: 0.85em;
- }
- }
- }
-
- .edit-category-tab-security {
- --permission-table-max-width: 450px;
-
- .form-kit__container-content {
- flex-direction: column;
- }
-
- .alert {
- display: block;
- max-width: var(--permission-table-max-width);
- }
-
- .permission-selector {
- margin-right: 0.25em;
- }
-
- .pending-permission-change-alert {
- margin-left: auto;
- max-width: 250px;
- background: var(--primary-very-high);
- color: var(--secondary);
- margin-top: 10px;
- padding: 5px 10px;
- position: relative;
-
- .arrow-div {
- border: solid transparent;
- content: " ";
- position: absolute;
- border-bottom-color: var(--primary-very-high);
- border-width: 7px;
- top: -13px;
- left: 200px;
- }
- }
-
- .permission-list {
- list-style: none;
- margin: 0 0 30px;
- padding: 0;
-
- .name {
- margin-right: 20px;
- display: inline-block;
- min-width: 100px;
- }
-
- .permission {
- margin-left: 20px;
- }
-
- .d-icon-circle-xmark {
- margin-left: 5px;
- color: var(--danger);
- }
-
- li {
- margin-bottom: 10px;
- }
- }
- }
-
- .edit-category-tab-settings,
- .edit-category-tab-moderation,
- .edit-category-tab-tags,
- .edit-category-tab-topic-template {
- > section {
- margin-bottom: 1.5em;
- }
-
- input[type="text"],
- .select-kit {
- width: $category-settings-width;
- }
-
- label {
- max-width: $category-settings-width;
- }
-
- input[type="number"] {
- width: $number-input-width;
- }
- }
-
- .edit-category-tab-tags {
- #category-min-tags-from-group {
- width: $number-input-width;
- min-height: 36px;
- }
-
- .select-kit {
- &.tag-chooser {
- width: 250px;
-
- .select-kit-filter,
- .filter-input {
- min-width: 250px;
- }
- }
- }
-
- .manage-tag-groups {
- display: block;
- }
- }
-
- .edit-category-delete-warning {
- grid-area: warning;
- }
-
- .edit-category-footer {
- grid-area: footer;
- display: flex;
- justify-content: space-between;
- align-self: start;
- padding: 0 1.5em 2em 0;
- }
-
- .category-topic-auto-close-hours,
- .category-default-slow-mode-seconds {
- width: 200px;
- }
-
- .required-tag-groups {
- .required-tag-group-row {
- display: flex;
- gap: 0.5em;
- margin-bottom: 1em;
-
- > * {
- margin: 0;
- }
-
- input[type="number"] {
- width: 4em;
- }
- }
- }
-
- .edit-category-tab-topic-template {
- .select-category-template__info {
- margin-block: 0.25rem;
- font-size: var(--font-down-1);
- }
- }
-}
-
-.category-permissions-table {
- --permission-table-max-width: var(--form-kit-max-input);
- width: 100%;
-}
-
-div.edit-category {
.d-page-header__title-row {
line-height: var(--line-height-medium);
gap: var(--space-4);
@@ -371,21 +95,6 @@ div.edit-category {
}
}
- .select-kit.multi-select.group-chooser {
- max-width: var(--form-kit-max-input);
- width: 100%;
- }
-
- .edit-category-tab-settings label,
- .edit-category-tab-tags label,
- .edit-category-tab-settings input[type="text"],
- .edit-category-tab-settings .select-kit,
- .edit-category-tab-tags input[type="text"],
- .edit-category-tab-tags .select-kit {
- width: 100%;
- max-width: var(--form-kit-max-input);
- }
-
.add-required-tag-group {
align-self: start;
}
@@ -397,38 +106,10 @@ div.edit-category {
}
}
- .edit-category-title-bar {
- box-sizing: border-box;
- width: 100%;
- flex-wrap: wrap;
- }
-
- .edit-category-title {
- flex: 1 1 auto;
-
- h2 {
- margin-top: 0;
- }
-
- .btn-back {
- margin-top: -0.5em;
- margin-left: -0.5em;
- margin-bottom: 0.5em;
- }
- }
-
- .edit-category-nav {
- border-bottom: 1px solid var(--content-border-color);
- }
-
.edit-category-page-header {
margin-bottom: 1.5em;
}
- .edit-category-content {
- grid-area: unset;
- }
-
.edit-category-type-schema-fields {
display: contents;
@@ -469,39 +150,66 @@ div.edit-category {
}
}
}
-}
-.edit-category-title-text {
- display: flex;
- flex-direction: column;
- margin: 0;
+ &__footer {
+ grid-area: footer;
- .edit-category-static-title {
- transition: font-size 0.2s ease-in-out;
+ .form-kit__section-header {
+ border-color: var(--danger);
+ }
+
+ .form-kit__section-title {
+ color: var(--danger);
+ }
}
- &:has(.badge-category__wrapper) {
- .edit-category-static-title {
- position: absolute;
- font-size: var(--font-down-3);
+ &__delete {
+ padding: var(--space-4);
+ border: 1px solid var(--danger);
+ border-radius: var(--d-border-radius);
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ gap: var(--space-4);
+
+ @include viewport.until(sm) {
+ flex-direction: column;
+ align-items: start;
+ }
+
+ &.--forbidden {
+ background: var(--highlight-bg);
+ border-color: var(--highlight-high);
}
}
- .badge-category__wrapper {
- font-weight: normal;
- font-size: var(--font-up-2);
- margin-top: var(--space-5);
+ &__delete-title {
+ font-size: var(--font-0);
}
-}
-div.edit-category {
- .form-kit__errors-summary {
- width: 100%;
- max-width: var(--form-kit-max-input);
- margin-top: var(--space-4);
+ &__delete-description {
+ font-size: var(--font-down-1-rem);
+ color: var(--primary-medium);
+ margin-bottom: 0;
+ max-width: 60ch;
+ }
+
+ &__delete-actions {
+ text-align: right;
+
+ @include viewport.until(sm) {
+ align-self: stretch;
- + .form-kit__section.edit-category-content {
- margin-top: 0;
+ .btn {
+ width: 100%;
+ }
+ }
+ }
+
+ .edit-category-tab-topic-template {
+ .select-category-template__info {
+ margin-block: 0.25rem;
+ font-size: var(--font-down-1);
}
}
@@ -512,11 +220,6 @@ div.edit-category {
}
}
- .edit-category-footer {
- padding: 0;
- margin-bottom: var(--space-4);
- }
-
.edit-category-tab-localizations {
.btn-default {
align-self: start;
@@ -545,13 +248,14 @@ div.edit-category {
font-size: var(--font-down-1);
color: var(--primary-high);
- > :first-child {
- margin-top: 0;
- }
+ // field renders as an excerpt, so these hit nothing of importance atm
+ // > :first-child {
+ // margin-top: 0;
+ // }
- > :last-child {
- margin-bottom: 0;
- }
+ // > :last-child {
+ // margin-bottom: 0;
+ // }
}
.description-content {
@@ -574,24 +278,17 @@ div.edit-category {
}
.description-actions {
- width: 100%;
display: flex;
align-items: center;
gap: var(--space-2);
margin-top: var(--space-2);
-
- .toggle-description {
- color: var(--primary-medium);
-
- &:hover {
- color: var(--primary-high);
- }
- }
}
}
.category-permissions-table {
+ --permission-table-max-width: var(--form-kit-max-input);
max-width: var(--permission-table-max-width);
+ width: 100%;
margin-bottom: 0;
.permission-row {
@@ -681,8 +378,6 @@ div.edit-category {
}
.category-type-selector {
- width: var(--form-kit-max-input);
-
.d-multi-select-trigger__selected-item
.d-multi-select-trigger__selection-label {
max-width: unset;
@@ -723,3 +418,16 @@ div.edit-category {
display: flex;
}
}
+
+h3:has(+ #control-doc_index_topic_id) {
+ border-bottom: 1px solid var(--content-border-color);
+ padding-bottom: 0.5em;
+ font-size: var(--font-up-1);
+ margin: 0;
+}
+
+#control-doc_index_topic_id {
+ .form-kit__container-content {
+ width: 100%;
+ }
+}
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 4d6ae9e68c8..a7f9506eaab 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -5116,6 +5116,11 @@ en:
tag_group: "Tag group"
topic_featured_link_allowed: "Allow featured links in this category"
delete: "Delete category"
+ danger_zone:
+ title: "Danger zone"
+ delete_title: "Delete this category"
+ delete_description: "Once deleted, this category and its settings cannot be recovered. Topics in it will need to be reassigned beforehand."
+ delete_title_forbidden: "Can't delete this category"
create: "New category"
create_with_type: "New %{typeName} category"
create_long: "Create a new category"
diff --git a/frontend/discourse/admin/components/upsert-category/appearance.gjs b/frontend/discourse/admin/components/upsert-category/appearance.gjs
index 0e339914037..404ecb9a446 100644
--- a/frontend/discourse/admin/components/upsert-category/appearance.gjs
+++ b/frontend/discourse/admin/components/upsert-category/appearance.gjs
@@ -7,8 +7,6 @@ import UppyImageUploader from "discourse/components/uppy-image-uploader";
import lazyHash from "discourse/helpers/lazy-hash";
import { CATEGORY_TEXT_COLORS } from "discourse/lib/constants";
import { applyMutableValueTransformer } from "discourse/lib/transformer";
-import { eq } from "discourse/truth-helpers";
-import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";
import { i18n } from "discourse-i18n";
export default class UpsertCategoryAppearance extends Component {
@@ -143,78 +141,126 @@ export default class UpsertCategoryAppearance extends Component {
}
<template>
- <@form.Section
- class={{dConcatClass
- "edit-category-tab"
- "edit-category-tab-images"
- "--full"
- (if (eq @selectedTab "images") "active")
- }}
+ <@form.Container
+ @title={{i18n "category.logo"}}
+ @subtitle={{i18n "category.logo_description"}}
+ @format="full"
>
- <@form.Container
- @title={{i18n "category.logo"}}
- @subtitle={{i18n "category.logo_description"}}
+ <UppyImageUploader
+ @imageUrl={{this.logoImageUrl}}
+ @onUploadDone={{fn this.onUploadDone "uploaded_logo"}}
+ @onUploadDeleted={{fn this.onUploadDeleted "uploaded_logo"}}
+ @type="category_logo"
+ @id="category-logo-uploader"
+ class="no-repeat contain-image"
+ />
+ </@form.Container>
+
+ <@form.Container
+ @title={{i18n "category.logo_dark"}}
+ @subtitle={{i18n "category.logo_description"}}
+ @format="full"
+ >
+ <UppyImageUploader
+ @imageUrl={{this.logoDarkImageUrl}}
+ @onUploadDone={{fn this.onUploadDone "uploaded_logo_dark"}}
+ @onUploadDeleted={{fn this.onUploadDeleted "uploaded_logo_dark"}}
+ @type="category_logo_dark"
+ @id="category-dark-logo-uploader"
+ class="no-repeat contain-image"
+ />
+ </@form.Container>
+
+ <@form.Container @title={{i18n "category.background_image"}} @format="full">
+ <UppyImageUploader
+ @imageUrl={{this.backgroundImageUrl}}
+ @onUploadDone={{fn this.onUploadDone "uploaded_background"}}
+ @onUploadDeleted={{fn this.onUploadDeleted "uploaded_background"}}
+ @type="category_background"
+ @id="category-background-uploader"
+ />
+ </@form.Container>
+
+ <@form.Container
+ @title={{i18n "category.background_image_dark"}}
+ @format="full"
+ >
+ <UppyImageUploader
+ @imageUrl={{this.backgroundDarkImageUrl}}
+ @onUploadDone={{fn this.onUploadDone "uploaded_background_dark"}}
+ @onUploadDeleted={{fn this.onUploadDeleted "uploaded_background_dark"}}
+ @type="category_background_dark"
+ @id="category-dark-background-uploader"
+ />
+ </@form.Container>
+
+ <@form.Field
+ @name="text_color"
+ @title={{i18n "category.foreground_color"}}
+ @format="max"
+ @type="color"
+ as |field|
+ >
+ <field.Control @colors={{CATEGORY_TEXT_COLORS}} />
+ </@form.Field>
+
+ <@form.Field
+ @name="default_view"
+ @title={{i18n "category.default_view"}}
+ @format="max"
+ @type="select"
+ as |field|
+ >
+ <field.Control
+ @nonePlaceholder={{i18n "category.sort_options.default"}}
+ as |select|
>
- <UppyImageUploader
- @imageUrl={{this.logoImageUrl}}
- @onUploadDone={{fn this.onUploadDone "uploaded_logo"}}
- @onUploadDeleted={{fn this.onUploadDeleted "uploaded_logo"}}
- @type="category_logo"
- @id="category-logo-uploader"
- class="no-repeat contain-image"
- />
- </@form.Container>
-
- <@form.Container
- @title={{i18n "category.logo_dark"}}
- @subtitle={{i18n "category.logo_description"}}
+ {{#each this.availableViews as |availableView|}}
+ <select.Option
+ @value={{availableView.value}}
+ >{{availableView.name}}</select.Option>
+ {{/each}}
+ </field.Control>
+ </@form.Field>
+
+ <@form.Field
+ @name="default_top_period"
+ @title={{i18n "category.default_top_period"}}
+ @format="max"
+ @type="select"
+ as |field|
+ >
+ <field.Control
+ @nonePlaceholder={{i18n "category.sort_options.default"}}
+ as |select|
>
- <UppyImageUploader
- @imageUrl={{this.logoDarkImageUrl}}
- @onUploadDone={{fn this.onUploadDone "uploaded_logo_dark"}}
- @onUploadDeleted={{fn this.onUploadDeleted "uploaded_logo_dark"}}
- @type="category_logo_dark"
- @id="category-dark-logo-uploader"
- class="no-repeat contain-image"
- />
- </@form.Container>
-
- <@form.Container @title={{i18n "category.background_image"}}>
- <UppyImageUploader
- @imageUrl={{this.backgroundImageUrl}}
- @onUploadDone={{fn this.onUploadDone "uploaded_background"}}
- @onUploadDeleted={{fn this.onUploadDeleted "uploaded_background"}}
- @type="category_background"
- @id="category-background-uploader"
- />
- </@form.Container>
-
- <@form.Container @title={{i18n "category.background_image_dark"}}>
- <UppyImageUploader
- @imageUrl={{this.backgroundDarkImageUrl}}
- @onUploadDone={{fn this.onUploadDone "uploaded_background_dark"}}
- @onUploadDeleted={{fn
- this.onUploadDeleted
- "uploaded_background_dark"
- }}
- @type="category_background_dark"
- @id="category-dark-background-uploader"
- />
- </@form.Container>
-
- <@form.Field
- @name="text_color"
- @title={{i18n "category.foreground_color"}}
- @format="max"
- @type="color"
- as |field|
+ {{#each this.topPeriods as |period|}}
+ <select.Option @value={{period.value}}>{{period.name}}</select.Option>
+ {{/each}}
+ </field.Control>
+ </@form.Field>
+
+ <@form.Field
+ @name="sort_order"
+ @title={{i18n "category.sort_order"}}
+ @format="max"
+ @type="select"
+ as |field|
+ >
+ <field.Control
+ @nonePlaceholder={{i18n "category.sort_options.default"}}
+ as |select|
>
- <field.Control @colors={{CATEGORY_TEXT_COLORS}} />
- </@form.Field>
+ {{#each this.sortOrders as |sort|}}
+ <select.Option @value={{sort.value}}>{{sort.name}}</select.Option>
+ {{/each}}
+ </field.Control>
+ </@form.Field>
+ {{#unless this.isDefaultSortOrder}}
<@form.Field
- @name="default_view"
- @title={{i18n "category.default_view"}}
+ @name="sort_ascending"
+ @title={{i18n "category.sort_direction"}}
@format="max"
@type="select"
as |field|
@@ -223,54 +269,47 @@ export default class UpsertCategoryAppearance extends Component {
@nonePlaceholder={{i18n "category.sort_options.default"}}
as |select|
>
- {{#each this.availableViews as |availableView|}}
+ {{#each this.sortAscendingOptions as |option|}}
<select.Option
- @value={{availableView.value}}
- >{{availableView.name}}</select.Option>
+ @value={{option.value}}
+ >{{option.name}}</select.Option>
{{/each}}
</field.Control>
</@form.Field>
-
- <@form.Field
- @name="default_top_period"
- @title={{i18n "category.default_top_period"}}
- @format="max"
- @type="select"
- as |field|
+ {{/unless}}
+
+ <@form.Field
+ @name="default_list_filter"
+ @title={{i18n "category.default_list_filter"}}
+ @format="max"
+ @type="select"
+ as |field|
+ >
+ <field.Control
+ @nonePlaceholder={{i18n "category.sort_options.default"}}
+ as |select|
>
- <field.Control
- @nonePlaceholder={{i18n "category.sort_options.default"}}
- as |select|
- >
- {{#each this.topPeriods as |period|}}
- <select.Option
- @value={{period.value}}
- >{{period.name}}</select.Option>
- {{/each}}
- </field.Control>
- </@form.Field>
+ {{#each this.listFilters as |filter|}}
+ <select.Option @value={{filter.value}}>{{filter.name}}</select.Option>
+ {{/each}}
+ </field.Control>
+ </@form.Field>
+ {{#if this.isParentCategory}}
<@form.Field
- @name="sort_order"
- @title={{i18n "category.sort_order"}}
+ @name="show_subcategory_list"
+ @title={{i18n "category.show_subcategory_list"}}
@format="max"
- @type="select"
+ @type="checkbox"
as |field|
>
- <field.Control
- @nonePlaceholder={{i18n "category.sort_options.default"}}
- as |select|
- >
- {{#each this.sortOrders as |sort|}}
- <select.Option @value={{sort.value}}>{{sort.name}}</select.Option>
- {{/each}}
- </field.Control>
+ <field.Control />
</@form.Field>
- {{#unless this.isDefaultSortOrder}}
+ {{#if @transientData.show_subcategory_list}}
<@form.Field
- @name="sort_ascending"
- @title={{i18n "category.sort_direction"}}
+ @name="subcategory_list_style"
+ @title={{i18n "category.subcategory_list_style"}}
@format="max"
@type="select"
as |field|
@@ -279,81 +318,29 @@ export default class UpsertCategoryAppearance extends Component {
@nonePlaceholder={{i18n "category.sort_options.default"}}
as |select|
>
- {{#each this.sortAscendingOptions as |option|}}
+ {{#each this.subcategoryListStyles as |style|}}
<select.Option
- @value={{option.value}}
- >{{option.name}}</select.Option>
+ @value={{style.value}}
+ >{{style.name}}</select.Option>
{{/each}}
</field.Control>
</@form.Field>
- {{/unless}}
-
- <@form.Field
- @name="default_list_filter"
- @title={{i18n "category.default_list_filter"}}
- @format="max"
- @type="select"
- as |field|
- >
- <field.Control
- @nonePlaceholder={{i18n "category.sort_options.default"}}
- as |select|
- >
- {{#each this.listFilters as |filter|}}
- <select.Option
- @value={{filter.value}}
- >{{filter.name}}</select.Option>
- {{/each}}
- </field.Control>
- </@form.Field>
-
- {{#if this.isParentCategory}}
- <@form.Field
- @name="show_subcategory_list"
- @title={{i18n "category.show_subcategory_list"}}
- @format="max"
- @type="checkbox"
- as |field|
- >
- <field.Control />
- </@form.Field>
-
- {{#if @transientData.show_subcategory_list}}
- <@form.Field
- @name="subcategory_list_style"
- @title={{i18n "category.subcategory_list_style"}}
- @format="max"
- @type="select"
- as |field|
- >
- <field.Control
- @nonePlaceholder={{i18n "category.sort_options.default"}}
- as |select|
- >
- {{#each this.subcategoryListStyles as |style|}}
- <select.Option
- @value={{style.value}}
- >{{style.name}}</select.Option>
- {{/each}}
- </field.Control>
- </@form.Field>
- {{/if}}
{{/if}}
+ {{/if}}
+
+ <@form.Field
+ @name="read_only_banner"
+ @title={{i18n "category.read_only_banner"}}
+ @format="max"
+ @type="input"
+ as |field|
+ >
+ <field.Control @maxlength="255" />
+ </@form.Field>
- <@form.Field
- @name="read_only_banner"
- @title={{i18n "category.read_only_banner"}}
- @format="max"
- @type="input"
- as |field|
- >
- <field.Control @maxlength="255" />
- </@form.Field>
-
- <PluginOutlet
- @name="category-custom-images"
- @outletArgs={{lazyHash category=@category form=@form}}
- />
- </@form.Section>
+ <PluginOutlet
+ @name="category-custom-images"
+ @outletArgs={{lazyHash category=@category form=@form}}
+ />
</template>
}
diff --git a/frontend/discourse/admin/components/upsert-category/moderation.gjs b/frontend/discourse/admin/components/upsert-category/moderation.gjs
index 12b64841777..394e88c1292 100644
--- a/frontend/discourse/admin/components/upsert-category/moderation.gjs
+++ b/frontend/discourse/admin/components/upsert-category/moderation.gjs
@@ -7,9 +7,7 @@ import withEventValue from "discourse/helpers/with-event-value";
import { POSTING_REVIEW_GROUP_BASED_MODES } from "discourse/lib/constants";
import ComboBox from "discourse/select-kit/components/combo-box";
import GroupChooser from "discourse/select-kit/components/group-chooser";
-import { eq } from "discourse/truth-helpers";
import DRelativeTimePicker from "discourse/ui-kit/d-relative-time-picker";
-import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";
import { i18n } from "discourse-i18n";
export default class UpsertCategoryModeration extends Component {
@@ -149,156 +147,151 @@ export default class UpsertCategoryModeration extends Component {
}
<template>
- <@form.Section
- class={{dConcatClass
- "edit-category-tab"
- "edit-category-tab-moderation"
- "--full"
- (if (eq @selectedTab "moderation") "active")
- }}
- >
- {{#if this.siteSettings.enable_category_group_moderation}}
- <@form.Container @title={{i18n "category.reviewable_by_group"}}>
- <GroupChooser
- @content={{this.site.groups}}
- @value={{this.moderatingGroupIds}}
- @onChange={{this.onCategoryModeratingGroupsChange}}
- />
- </@form.Container>
- {{/if}}
-
- <@form.Container @title={{i18n "category.default_slow_mode"}}>
- <DRelativeTimePicker
- @id="category-default-slow-mode"
- @durationMinutes={{this.defaultSlowModeMinutes}}
- @onChange={{this.onDefaultSlowModeDurationChange}}
- />
- </@form.Container>
-
- <@form.Container @title={{i18n "topic.auto_close.label"}}>
- <DRelativeTimePicker
- @id="topic-auto-close"
- @durationHours={{this.autoCloseHours}}
- @hiddenIntervals={{this.hiddenRelativeIntervals}}
- @onChange={{this.onAutoCloseDurationChange}}
- />
- </@form.Container>
-
- <@form.Field
- @name="auto_close_based_on_last_post"
- @title={{i18n "topic.auto_close.based_on_last_post"}}
- @type="checkbox"
- @format="full"
- as |field|
- >
- <field.Control />
- </@form.Field>
-
- <@form.Container @title={{i18n "category.num_auto_bump_daily"}}>
- <input
- {{on "input" (withEventValue this.onNumAutoBumpDailyChange)}}
- value={{this.numAutoBumpDaily}}
- type="number"
- min="0"
- id="category-number-daily-bump"
+ {{#if this.siteSettings.enable_category_group_moderation}}
+ <@form.Container @title={{i18n "category.reviewable_by_group"}}>
+ <GroupChooser
+ @content={{this.site.groups}}
+ @value={{this.moderatingGroupIds}}
+ @onChange={{this.onCategoryModeratingGroupsChange}}
/>
</@form.Container>
-
- <@form.Container @title={{i18n "category.auto_bump_cooldown_days"}}>
- <input
- {{on "input" (withEventValue this.onAutoBumpCooldownDaysChange)}}
- value={{this.autoBumpCooldownDays}}
- type="number"
- min="0"
- id="category-auto-bump-cooldown-days"
- />
- </@form.Container>
-
- <@form.Section @title={{i18n "category.new_topic_approval"}}>
- <@form.Object @name="category_setting" as |object|>
- <object.Field
- @name="topic_posting_review_mode"
- @title={{i18n "category.require_topic_approval_for"}}
+ {{/if}}
+
+ <@form.Container @title={{i18n "category.default_slow_mode"}}>
+ <DRelativeTimePicker
+ @id="category-default-slow-mode"
+ @durationMinutes={{this.defaultSlowModeMinutes}}
+ @onChange={{this.onDefaultSlowModeDurationChange}}
+ />
+ </@form.Container>
+
+ <@form.Container @title={{i18n "topic.auto_close.label"}}>
+ <DRelativeTimePicker
+ @id="topic-auto-close"
+ @durationHours={{this.autoCloseHours}}
+ @hiddenIntervals={{this.hiddenRelativeIntervals}}
+ @onChange={{this.onAutoCloseDurationChange}}
+ />
+ </@form.Container>
+
+ <@form.Field
+ @name="auto_close_based_on_last_post"
+ @title={{i18n "topic.auto_close.based_on_last_post"}}
+ @type="checkbox"
+ @format="full"
+ as |field|
+ >
+ <field.Control />
+ </@form.Field>
+
+ <@form.Container @title={{i18n "category.num_auto_bump_daily"}}>
+ <input
+ {{on "input" (withEventValue this.onNumAutoBumpDailyChange)}}
+ value={{this.numAutoBumpDaily}}
+ type="number"
+ min="0"
+ id="category-number-daily-bump"
+ />
+ </@form.Container>
+
+ <@form.Container @title={{i18n "category.auto_bump_cooldown_days"}}>
+ <input
+ {{on "input" (withEventValue this.onAutoBumpCooldownDaysChange)}}
+ value={{this.autoBumpCooldownDays}}
+ type="number"
+ min="0"
+ id="category-auto-bump-cooldown-days"
+ />
+ </@form.Container>
+
+ <@form.Section @title={{i18n "category.new_topic_approval"}}>
+ <@form.Object @name="category_setting" as |object|>
+ <object.Field
+ @name="topic_posting_review_mode"
+ @title={{i18n "category.require_topic_approval_for"}}
+ @type="custom"
+ @format="full"
+ as |field|
+ >
+ <field.Control>
+ <ComboBox
+ @valueProperty="value"
+ @content={{this.postingReviewModeOptions}}
+ @value={{field.value}}
+ @onChange={{this.onTopicPostingReviewModeChange}}
+ @options={{hash placementStrategy="absolute"}}
+ />
+ </field.Control>
+ </object.Field>
+
+ {{#if this.topicModeRequiresGroups}}
+ <@form.Field
+ @name="topic_posting_review_group_ids"
+ @title={{this.topicGroupChooserTitle}}
@type="custom"
+ @format="full"
+ @validate={{this.validatePostingReviewGroups}}
as |field|
>
<field.Control>
- <ComboBox
- @valueProperty="value"
- @content={{this.postingReviewModeOptions}}
+ <GroupChooser
+ class="posting-review-group-chooser"
+ @content={{this.site.groups}}
@value={{field.value}}
- @onChange={{this.onTopicPostingReviewModeChange}}
- @options={{hash placementStrategy="absolute"}}
+ @onChange={{field.set}}
+ @options={{hash
+ none="category.posting_review_groups_placeholder"
+ }}
/>
</field.Control>
- </object.Field>
-
- {{#if this.topicModeRequiresGroups}}
- <@form.Field
- @name="topic_posting_review_group_ids"
- @title={{this.topicGroupChooserTitle}}
- @type="custom"
- @validate={{this.validatePostingReviewGroups}}
- as |field|
- >
- <field.Control>
- <GroupChooser
- class="posting-review-group-chooser"
- @content={{this.site.groups}}
- @value={{field.value}}
- @onChange={{field.set}}
- @options={{hash
- none="category.posting_review_groups_placeholder"
- }}
- />
- </field.Control>
- </@form.Field>
- {{/if}}
- </@form.Object>
- </@form.Section>
-
- <@form.Section @title={{i18n "category.new_reply_approval"}}>
- <@form.Object @name="category_setting" as |object|>
- <object.Field
- @name="reply_posting_review_mode"
- @title={{i18n "category.require_reply_approval_for"}}
+ </@form.Field>
+ {{/if}}
+ </@form.Object>
+ </@form.Section>
+
+ <@form.Section @title={{i18n "category.new_reply_approval"}}>
+ <@form.Object @name="category_setting" as |object|>
+ <object.Field
+ @name="reply_posting_review_mode"
+ @title={{i18n "category.require_reply_approval_for"}}
+ @type="custom"
+ @format="full"
+ as |field|
+ >
+ <field.Control>
+ <ComboBox
+ @valueProperty="value"
+ @content={{this.postingReviewModeOptions}}
+ @value={{field.value}}
+ @onChange={{this.onReplyPostingReviewModeChange}}
+ @options={{hash placementStrategy="absolute"}}
+ />
+ </field.Control>
+ </object.Field>
+
+ {{#if this.replyModeRequiresGroups}}
+ <@form.Field
+ @name="reply_posting_review_group_ids"
+ @title={{this.replyGroupChooserTitle}}
@type="custom"
+ @format="full"
+ @validate={{this.validatePostingReviewGroups}}
as |field|
>
<field.Control>
- <ComboBox
- @valueProperty="value"
- @content={{this.postingReviewModeOptions}}
+ <GroupChooser
+ class="posting-review-group-chooser"
+ @content={{this.site.groups}}
@value={{field.value}}
- @onChange={{this.onReplyPostingReviewModeChange}}
- @options={{hash placementStrategy="absolute"}}
+ @onChange={{field.set}}
+ @options={{hash
+ none="category.posting_review_groups_placeholder"
+ }}
/>
</field.Control>
- </object.Field>
-
- {{#if this.replyModeRequiresGroups}}
- <@form.Field
- @name="reply_posting_review_group_ids"
- @title={{this.replyGroupChooserTitle}}
- @type="custom"
- @validate={{this.validatePostingReviewGroups}}
- as |field|
- >
- <field.Control>
- <GroupChooser
- class="posting-review-group-chooser"
- @content={{this.site.groups}}
- @value={{field.value}}
- @onChange={{field.set}}
- @options={{hash
- none="category.posting_review_groups_placeholder"
- }}
- />
- </field.Control>
- </@form.Field>
- {{/if}}
- </@form.Object>
- </@form.Section>
+ </@form.Field>
+ {{/if}}
+ </@form.Object>
</@form.Section>
</template>
}
diff --git a/frontend/discourse/admin/components/upsert-category/security.gjs b/frontend/discourse/admin/components/upsert-category/security.gjs
index ec326b99c69..c7eef5373e4 100644
--- a/frontend/discourse/admin/components/upsert-category/security.gjs
+++ b/frontend/discourse/admin/components/upsert-category/security.gjs
@@ -8,9 +8,8 @@ import lazyHash from "discourse/helpers/lazy-hash";
import { AUTO_GROUPS } from "discourse/lib/constants";
import Category from "discourse/models/category";
import PermissionType from "discourse/models/permission-type";
-import { eq, or } from "discourse/truth-helpers";
+import { or } from "discourse/truth-helpers";
import DButton from "discourse/ui-kit/d-button";
-import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";
import { i18n } from "discourse-i18n";
export default class UpsertCategorySecurity extends Component {
@@ -172,133 +171,122 @@ export default class UpsertCategorySecurity extends Component {
}
<template>
- <@form.Section
- class={{dConcatClass
- "edit-category-tab"
- "edit-category-tab-security"
- (if (eq @selectedTab "security") "active")
- }}
- >
-
- {{#if @category.is_special}}
- {{#if @category.isUncategorizedCategory}}
- <@form.Alert @type="warning">
- {{i18n "category.uncategorized_security_warning"}}
- </@form.Alert>
- {{else}}
- <@form.Alert @type="warning">
- {{i18n "category.special_warning"}}
- </@form.Alert>
- {{/if}}
- {{/if}}
-
- {{#if this.allParentGroupsUsed}}
+ {{#if @category.is_special}}
+ {{#if @category.isUncategorizedCategory}}
<@form.Alert @type="warning">
- {{i18n "category.permissions.all_parent_groups_used"}}
+ {{i18n "category.uncategorized_security_warning"}}
+ </@form.Alert>
+ {{else}}
+ <@form.Alert @type="warning">
+ {{i18n "category.special_warning"}}
</@form.Alert>
{{/if}}
+ {{/if}}
+ {{#if this.allParentGroupsUsed}}
<@form.Alert @type="warning">
- {{#if this.everyonePermission}}
- {{i18n
- this.everyoneAccessMessageKey
- everyone_group=this.everyonePermission.group_name
- }}
- {{else}}
- {{i18n "category.permissions.specific_groups_have_access"}}
- {{/if}}
+ {{i18n "category.permissions.all_parent_groups_used"}}
</@form.Alert>
-
- {{#unless @category.is_special}}
- <@form.Container @format="full">
- <div class="category-permissions-table">
- <div class="permission-row row-header">
- <span class="group-name">{{i18n
- "category.permissions.group"
- }}</span>
- <span class="options">
- <span class="cell">{{i18n "category.permissions.see"}}</span>
- <span class="cell">{{i18n "category.permissions.reply"}}</span>
- <span class="cell">{{i18n "category.permissions.create"}}</span>
- <span class="cell"></span>
- </span>
+ {{/if}}
+
+ <@form.Alert @type="warning">
+ {{#if this.everyonePermission}}
+ {{i18n
+ this.everyoneAccessMessageKey
+ everyone_group=this.everyonePermission.group_name
+ }}
+ {{else}}
+ {{i18n "category.permissions.specific_groups_have_access"}}
+ {{/if}}
+ </@form.Alert>
+
+ {{#unless @category.is_special}}
+ <@form.Container @format="full">
+ <div class="category-permissions-table">
+ <div class="permission-row row-header">
+ <span class="group-name">{{i18n
+ "category.permissions.group"
+ }}</span>
+ <span class="options">
+ <span class="cell">{{i18n "category.permissions.see"}}</span>
+ <span class="cell">{{i18n "category.permissions.reply"}}</span>
+ <span class="cell">{{i18n "category.permissions.create"}}</span>
+ <span class="cell"></span>
+ </span>
+ </div>
+ {{#each this.permissions as |p|}}
+ <UpsertCategoryPermissionRow
+ @groupId={{p.group_id}}
+ @groupName={{p.group_name}}
+ @type={{p.permission_type}}
+ @everyonePermission={{this.everyonePermission}}
+ @onChangeEveryonePermission={{this.onChangeEveryonePermission}}
+ @onRemovePermission={{this.onRemovePermission}}
+ @onUpdatePermission={{this.onUpdatePermission}}
+ />
+ {{/each}}
+
+ {{#unless this.permissions}}
+ <div class="permission-row row-empty">
+ {{i18n "category.permissions.no_groups_selected"}}
</div>
- {{#each this.permissions as |p|}}
- <UpsertCategoryPermissionRow
- @groupId={{p.group_id}}
- @groupName={{p.group_name}}
- @type={{p.permission_type}}
- @everyonePermission={{this.everyonePermission}}
- @onChangeEveryonePermission={{this.onChangeEveryonePermission}}
- @onRemovePermission={{this.onRemovePermission}}
- @onUpdatePermission={{this.onUpdatePermission}}
- />
- {{/each}}
-
- {{#unless this.permissions}}
- <div class="permission-row row-empty">
- {{i18n "category.permissions.no_groups_selected"}}
- </div>
- {{/unless}}
- {{#if (or this.hasAvailableGroups this.canRemoveAllPermissions)}}
- <PluginOutlet
- @name="category-security-permissions-add-group"
- @outletArgs={{lazyHash
- category=@category
- availableGroups=this.availableGroups
- onSelectGroup=this.onSelectGroup
- canRemoveAllPermissions=this.canRemoveAllPermissions
- onRemoveAllPermissions=this.onRemoveAllPermissions
- }}
- @defaultGlimmer={{true}}
- >
- <div class="add-group">
- {{#if this.hasAvailableGroups}}
- <span class="group-name">
- <@form.Field
- @name="security_add_group_id"
- @title={{i18n "category.security_add_group"}}
- @showTitle={{false}}
- @format="max"
- @type="select"
- @onSet={{this.onSecurityAddGroupSet}}
- as |field|
+ {{/unless}}
+ {{#if (or this.hasAvailableGroups this.canRemoveAllPermissions)}}
+ <PluginOutlet
+ @name="category-security-permissions-add-group"
+ @outletArgs={{lazyHash
+ category=@category
+ availableGroups=this.availableGroups
+ onSelectGroup=this.onSelectGroup
+ canRemoveAllPermissions=this.canRemoveAllPermissions
+ onRemoveAllPermissions=this.onRemoveAllPermissions
+ }}
+ @defaultGlimmer={{true}}
+ >
+ <div class="add-group">
+ {{#if this.hasAvailableGroups}}
+ <span class="group-name">
+ <@form.Field
+ @name="security_add_group_id"
+ @title={{i18n "category.security_add_group"}}
+ @showTitle={{false}}
+ @format="max"
+ @type="select"
+ @onSet={{this.onSecurityAddGroupSet}}
+ as |field|
+ >
+ <field.Control
+ class="available-groups"
+ @nonePlaceholder={{i18n "category.security_add_group"}}
+ as |select|
>
- <field.Control
- class="available-groups"
- @nonePlaceholder={{i18n
- "category.security_add_group"
- }}
- as |select|
- >
- {{#each this.availableGroups as |group|}}
- <select.Option
- @value={{group.id}}
- >{{group.name}}</select.Option>
- {{/each}}
- </field.Control>
- </@form.Field>
- </span>
- {{/if}}
- {{#if this.canRemoveAllPermissions}}
- <DButton
- class="btn-default remove-all-permissions"
- @label="category.permissions.remove_all"
- @action={{this.onRemoveAllPermissions}}
- />
- {{/if}}
- </div>
- </PluginOutlet>
- {{/if}}
- </div>
+ {{#each this.availableGroups as |group|}}
+ <select.Option
+ @value={{group.id}}
+ >{{group.name}}</select.Option>
+ {{/each}}
+ </field.Control>
+ </@form.Field>
+ </span>
+ {{/if}}
+ {{#if this.canRemoveAllPermissions}}
+ <DButton
+ class="btn-default remove-all-permissions"
+ @label="category.permissions.remove_all"
+ @action={{this.onRemoveAllPermissions}}
+ />
+ {{/if}}
+ </div>
+ </PluginOutlet>
+ {{/if}}
+ </div>
- </@form.Container>
- {{/unless}}
+ </@form.Container>
+ {{/unless}}
- <PluginOutlet
- @name="category-custom-security"
- @outletArgs={{lazyHash category=@category form=@form}}
- />
- </@form.Section>
+ <PluginOutlet
+ @name="category-custom-security"
+ @outletArgs={{lazyHash category=@category form=@form}}
+ />
</template>
}
diff --git a/frontend/discourse/admin/components/upsert-category/settings.gjs b/frontend/discourse/admin/components/upsert-category/settings.gjs
index 07575e3a03e..2fd7e549fab 100644
--- a/frontend/discourse/admin/components/upsert-category/settings.gjs
+++ b/frontend/discourse/admin/components/upsert-category/settings.gjs
@@ -5,8 +5,6 @@ import PluginOutlet from "discourse/components/plugin-outlet";
import lazyHash from "discourse/helpers/lazy-hash";
import { SEARCH_PRIORITIES } from "discourse/lib/constants";
import getUrl from "discourse/lib/get-url";
-import { eq } from "discourse/truth-helpers";
-import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";
import { i18n } from "discourse-i18n";
export default class UpsertCategorySettings extends Component {
@@ -36,183 +34,174 @@ export default class UpsertCategorySettings extends Component {
}
<template>
- <@form.Section
- class={{dConcatClass
- "edit-category-tab"
- "edit-category-tab-settings"
- (if (eq @selectedTab "settings") "active")
- }}
+ <@form.Field
+ @name="slug"
+ @title={{i18n "category.slug"}}
+ @format="max"
+ @type="input"
+ @validation="required"
+ as |field|
>
+ <field.Control
+ placeholder={{i18n "category.slug_placeholder"}}
+ @maxlength="255"
+ />
+ </@form.Field>
+
+ {{#if this.showPositionInput}}
<@form.Field
- @name="slug"
- @title={{i18n "category.slug"}}
+ @name="position"
+ @title={{i18n "category.position"}}
@format="max"
- @type="input"
- @validation="required"
+ @type="input-number"
as |field|
>
- <field.Control
- placeholder={{i18n "category.slug_placeholder"}}
- @maxlength="255"
- />
+ <field.Control min="0" />
</@form.Field>
-
- {{#if this.showPositionInput}}
- <@form.Field
- @name="position"
- @title={{i18n "category.position"}}
- @format="max"
- @type="input-number"
- as |field|
- >
- <field.Control min="0" />
- </@form.Field>
- {{/if}}
-
+ {{/if}}
+
+ <@form.Field
+ @name="num_featured_topics"
+ @title={{if
+ @category.parent_category_id
+ (i18n "category.subcategory_num_featured_topics")
+ (i18n "category.num_featured_topics")
+ }}
+ @type="input-number"
+ as |field|
+ >
+ <field.Control min="1" />
+ </@form.Field>
+
+ <@form.Field
+ @name="search_priority"
+ @title={{i18n "category.search_priority.label"}}
+ @format="max"
+ @type="select"
+ @validation="required"
+ as |field|
+ >
+ <field.Control @includeNone={{false}} as |select|>
+ {{#each this.searchPrioritiesOptions as |searchPriority|}}
+ <select.Option
+ @value={{searchPriority.value}}
+ >{{searchPriority.name}}</select.Option>
+ {{/each}}
+ </field.Control>
+ </@form.Field>
+
+ {{#if this.siteSettings.enable_badges}}
<@form.Field
- @name="num_featured_topics"
- @title={{if
- @category.parent_category_id
- (i18n "category.subcategory_num_featured_topics")
- (i18n "category.num_featured_topics")
- }}
+ @name="allow_badges"
+ @title={{i18n "category.allow_badges_label"}}
@format="max"
- @type="input-number"
+ @type="checkbox"
as |field|
>
- <field.Control min="1" />
+ <field.Control />
</@form.Field>
+ {{/if}}
+ {{#if this.siteSettings.topic_featured_link_enabled}}
<@form.Field
- @name="search_priority"
- @title={{i18n "category.search_priority.label"}}
+ @name="topic_featured_link_allowed"
+ @title={{i18n "category.topic_featured_link_allowed"}}
@format="max"
- @type="select"
- @validation="required"
+ @type="checkbox"
as |field|
>
- <field.Control @includeNone={{false}} as |select|>
- {{#each this.searchPrioritiesOptions as |searchPriority|}}
- <select.Option
- @value={{searchPriority.value}}
- >{{searchPriority.name}}</select.Option>
- {{/each}}
- </field.Control>
+ <field.Control />
</@form.Field>
+ {{/if}}
+
+ <@form.Field
+ @name="navigate_to_first_post_after_read"
+ @title={{i18n "category.navigate_to_first_post_after_read"}}
+ @format="max"
+ @type="checkbox"
+ as |field|
+ >
+ <field.Control />
+ </@form.Field>
+
+ <@form.Field
+ @name="all_topics_wiki"
+ @title={{i18n "category.all_topics_wiki"}}
+ @format="max"
+ @type="checkbox"
+ as |field|
+ >
+ <field.Control />
+ </@form.Field>
+
+ <@form.Field
+ @name="allow_unlimited_owner_edits_on_first_post"
+ @title={{i18n "category.allow_unlimited_owner_edits_on_first_post"}}
+ @format="max"
+ @type="checkbox"
+ as |field|
+ >
+ <field.Control />
+ </@form.Field>
- {{#if this.siteSettings.enable_badges}}
+ <@form.Section @title={{i18n "category.settings_sections.email"}}>
+ {{#if this.emailInEnabled}}
<@form.Field
- @name="allow_badges"
- @title={{i18n "category.allow_badges_label"}}
+ @name="email_in"
+ @title={{i18n "category.email_in"}}
+ @format="max"
+ @type="input"
+ as |field|
+ >
+ <field.Control @maxlength="255" />
+ </@form.Field>
+
+ <@form.Field
+ @name="email_in_allow_strangers"
+ @title={{i18n "category.email_in_allow_strangers"}}
@format="max"
@type="checkbox"
as |field|
>
<field.Control />
</@form.Field>
- {{/if}}
- {{#if this.siteSettings.topic_featured_link_enabled}}
<@form.Field
- @name="topic_featured_link_allowed"
- @title={{i18n "category.topic_featured_link_allowed"}}
+ @name="mailinglist_mirror"
+ @title={{i18n "category.mailinglist_mirror"}}
@format="max"
@type="checkbox"
as |field|
>
<field.Control />
</@form.Field>
- {{/if}}
-
- <@form.Field
- @name="navigate_to_first_post_after_read"
- @title={{i18n "category.navigate_to_first_post_after_read"}}
- @format="max"
- @type="checkbox"
- as |field|
- >
- <field.Control />
- </@form.Field>
-
- <@form.Field
- @name="all_topics_wiki"
- @title={{i18n "category.all_topics_wiki"}}
- @format="max"
- @type="checkbox"
- as |field|
- >
- <field.Control />
- </@form.Field>
- <@form.Field
- @name="allow_unlimited_owner_edits_on_first_post"
- @title={{i18n "category.allow_unlimited_owner_edits_on_first_post"}}
- @format="max"
- @type="checkbox"
- as |field|
- >
- <field.Control />
- </@form.Field>
-
- <@form.Section @title={{i18n "category.settings_sections.email"}}>
- {{#if this.emailInEnabled}}
- <@form.Field
- @name="email_in"
- @title={{i18n "category.email_in"}}
- @format="max"
- @type="input"
- as |field|
- >
- <field.Control @maxlength="255" />
- </@form.Field>
-
- <@form.Field
- @name="email_in_allow_strangers"
- @title={{i18n "category.email_in_allow_strangers"}}
- @format="max"
- @type="checkbox"
- as |field|
- >
- <field.Control />
- </@form.Field>
-
- <@form.Field
- @name="mailinglist_mirror"
- @title={{i18n "category.mailinglist_mirror"}}
- @format="max"
- @type="checkbox"
- as |field|
- >
- <field.Control />
- </@form.Field>
-
- <PluginOutlet
- @name="category-email-in"
- @connectorTagName="div"
- @outletArgs={{lazyHash category=@category form=@form}}
- />
- {{else}}
- <@form.Alert @type="info">
- {{trustHTML
- (i18n
- "category.email_in_disabled"
- setting_url=(getUrl
- "/admin/site_settings/category/all_results?filter=email_in"
- )
+ <PluginOutlet
+ @name="category-email-in"
+ @connectorTagName="div"
+ @outletArgs={{lazyHash category=@category form=@form}}
+ />
+ {{else}}
+ <@form.Alert @type="info">
+ {{trustHTML
+ (i18n
+ "category.email_in_disabled"
+ setting_url=(getUrl
+ "/admin/site_settings/category/all_results?filter=email_in"
)
- }}
- </@form.Alert>
- {{/if}}
- </@form.Section>
-
- <PluginOutlet
- @name="category-custom-settings"
- @outletArgs={{lazyHash
- category=@category
- form=@form
- transientData=@transientData
- }}
- />
+ )
+ }}
+ </@form.Alert>
+ {{/if}}
</@form.Section>
+
+ <PluginOutlet
+ @name="category-custom-settings"
+ @outletArgs={{lazyHash
+ category=@category
+ form=@form
+ transientData=@transientData
+ }}
+ />
</template>
}
diff --git a/frontend/discourse/admin/components/upsert-category/tags.gjs b/frontend/discourse/admin/components/upsert-category/tags.gjs
index a92fd536484..e03277e8aa2 100644
--- a/frontend/discourse/admin/components/upsert-category/tags.gjs
+++ b/frontend/discourse/admin/components/upsert-category/tags.gjs
@@ -3,8 +3,6 @@ import { array, fn, hash } from "@ember/helper";
import { action } from "@ember/object";
import { LinkTo } from "@ember/routing";
import TagGroupChooser from "discourse/select-kit/components/tag-group-chooser";
-import { eq } from "discourse/truth-helpers";
-import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";
import { i18n } from "discourse-i18n";
export default class UpsertCategoryTags extends Component {
@@ -34,135 +32,126 @@ export default class UpsertCategoryTags extends Component {
}
<template>
- <@form.Section
- class={{dConcatClass
- "edit-category-tab"
- "edit-category-tab-tags"
- (if (eq @selectedTab "tags") "active")
- }}
+ <@form.Field
+ @name="minimum_required_tags"
+ @title={{i18n "category.minimum_required_tags"}}
+ @type="input-number"
+ as |field|
>
- <@form.Field
- @name="minimum_required_tags"
- @title={{i18n "category.minimum_required_tags"}}
- @format="max"
- @type="input-number"
- as |field|
- >
- <field.Control min="0" id="category-minimum-tags" />
- </@form.Field>
+ <field.Control min="0" id="category-minimum-tags" />
+ </@form.Field>
- <@form.Field
- @name="allowed_tags"
- @title={{if
- @category.id
- (i18n "category.tags_allowed_tags" [email protected])
- (i18n "category.tags_allowed_tags_new_category")
- }}
- @format="max"
- @type="tag-chooser"
- as |field|
- >
- <field.Control
- @showAllTags={{true}}
- @excludeSynonyms={{true}}
- @unlimited={{true}}
- @placeholder="category.tags_placeholder"
- />
- </@form.Field>
+ <@form.Field
+ @name="allowed_tags"
+ @title={{if
+ @category.id
+ (i18n "category.tags_allowed_tags" [email protected])
+ (i18n "category.tags_allowed_tags_new_category")
+ }}
+ @format="max"
+ @type="tag-chooser"
+ as |field|
+ >
+ <field.Control
+ @showAllTags={{true}}
+ @excludeSynonyms={{true}}
+ @unlimited={{true}}
+ @placeholder="category.tags_placeholder"
+ />
+ </@form.Field>
- <@form.Container
- @direction="column"
- @optional={{true}}
- @title={{if
- @category.id
- (i18n "category.tags_allowed_tag_groups" [email protected])
- (i18n "category.tags_allowed_tag_groups_new_category")
- }}
- @format="full"
- >
- <TagGroupChooser
- @id="category-allowed-tag-groups"
- @tagGroups={{this.allowedTagGroups}}
- @onChange={{this.onAllowedTagGroupsChange}}
- />
- <LinkTo @route="tagGroups" class="manage-tag-groups">
- {{i18n "category.manage_tag_groups_link"}}
- </LinkTo>
- </@form.Container>
+ <@form.Container
+ @direction="column"
+ @optional={{true}}
+ @title={{if
+ @category.id
+ (i18n "category.tags_allowed_tag_groups" [email protected])
+ (i18n "category.tags_allowed_tag_groups_new_category")
+ }}
+ @format="full"
+ >
+ <TagGroupChooser
+ @id="category-allowed-tag-groups"
+ @tagGroups={{this.allowedTagGroups}}
+ @onChange={{this.onAllowedTagGroupsChange}}
+ />
+ <LinkTo @route="tagGroups" class="manage-tag-groups">
+ {{i18n "category.manage_tag_groups_link"}}
+ </LinkTo>
+ </@form.Container>
- <@form.Field
- @name="allow_global_tags"
- @title={{i18n "category.allow_global_tags_label"}}
- @format="max"
- @disabled={{this.disableAllowGlobalTags}}
- @type="checkbox"
- as |field|
- >
- <field.Control />
- </@form.Field>
+ <@form.Field
+ @name="allow_global_tags"
+ @title={{i18n "category.allow_global_tags_label"}}
+ @format="max"
+ @disabled={{this.disableAllowGlobalTags}}
+ @type="checkbox"
+ as |field|
+ >
+ <field.Control />
+ </@form.Field>
- <@form.Alert @type="info">
- {{i18n "category.tags_tab_description"}}
- </@form.Alert>
+ <@form.Alert @type="info">
+ {{i18n "category.tags_tab_description"}}
+ </@form.Alert>
- <@form.Section @title={{i18n "category.required_tag_group.description"}}>
- <@form.Collection @name="required_tag_groups" as |collection index|>
- <@form.Row as |row|>
- <row.Col @size={{2}}>
- <collection.Field
- @name="min_count"
- @title={{i18n "category.required_tag_group.min_count"}}
- @validation="required"
- @type="input-number"
- as |field|
- >
- <field.Control min="1" />
- </collection.Field>
- </row.Col>
+ <@form.Section @title={{i18n "category.required_tag_group.description"}}>
+ <@form.Collection @name="required_tag_groups" as |collection index|>
+ <@form.Row as |row|>
+ <row.Col @size={{2}}>
+ <collection.Field
+ @name="min_count"
+ @title={{i18n "category.required_tag_group.min_count"}}
+ @validation="required"
+ @type="input-number"
+ as |field|
+ >
+ <field.Control min="1" />
+ </collection.Field>
+ </row.Col>
- <row.Col @size={{9}}>
- <collection.Field
- @name="name"
- @title={{i18n "category.required_tag_group.tag_group"}}
- @validation="required"
- @type="custom"
- as |field|
- >
- <field.Control>
- <TagGroupChooser
- @tagGroups={{if field.value (array field.value) (array)}}
- @onChange={{fn this.onTagGroupFieldChange field}}
- @options={{hash
- maximum=1
- filterPlaceholder="category.required_tag_group.placeholder"
- }}
- />
- </field.Control>
- </collection.Field>
- </row.Col>
+ <row.Col @size={{9}}>
+ <collection.Field
+ @name="name"
+ @title={{i18n "category.required_tag_group.tag_group"}}
+ @validation="required"
+ @type="custom"
+ as |field|
+ >
+ <field.Control>
+ <TagGroupChooser
+ @tagGroups={{if field.value (array field.value) (array)}}
+ @onChange={{fn this.onTagGroupFieldChange field}}
+ @options={{hash
+ maximum=1
+ filterPlaceholder="category.required_tag_group.placeholder"
+ }}
+ />
+ </field.Control>
+ </collection.Field>
+ </row.Col>
- <row.Col @size={{1}}>
- <@form.Button
- class="btn-danger delete-required-tag-group"
- @icon="trash-can"
- @title="category.required_tag_group.delete"
- @action={{fn collection.remove index}}
- />
- </row.Col>
- </@form.Row>
- </@form.Collection>
+ <row.Col @size={{1}}>
+ <@form.Button
+ class="btn-danger delete-required-tag-group"
+ @icon="trash-can"
+ @title="category.required_tag_group.delete"
+ @action={{fn collection.remove index}}
+ />
+ </row.Col>
+ </@form.Row>
+ </@form.Collection>
- <@form.Button
- class="btn-default add-required-tag-group"
- @icon="plus"
- @label="category.required_tag_group.add"
- @action={{fn
- @form.addItemToCollection
- "required_tag_groups"
- (hash min_count=1)
- }}
- />
- </@form.Section>
+ <@form.Button
+ class="btn-default add-required-tag-group"
+ @icon="plus"
+ @label="category.required_tag_group.add"
+ @action={{fn
+ @form.addItemToCollection
+ "required_tag_groups"
+ (hash min_count=1)
+ }}
+ />
</@form.Section>
</template>
}
diff --git a/frontend/discourse/admin/templates/edit-category/tabs.gjs b/frontend/discourse/admin/templates/edit-category/tabs.gjs
index 3ef537f2f36..45fcc1bc09f 100644
--- a/frontend/discourse/admin/templates/edit-category/tabs.gjs
+++ b/frontend/discourse/admin/templates/edit-category/tabs.gjs
@@ -15,7 +15,7 @@ import EditCategoryTypeSchemaFields from "discourse/components/edit-category-typ
import Form from "discourse/components/form";
import { bind } from "discourse/lib/decorators";
import { registeredEditCategoryTabs } from "discourse/lib/edit-category-tabs";
-import { or } from "discourse/truth-helpers";
+import { eq, or } from "discourse/truth-helpers";
import { i18n } from "discourse-i18n";
const TAB_COMPONENTS = {
@@ -79,7 +79,7 @@ export default class Tabs extends Component {
as |form transientData|
>
<form.Section
- class="edit-category-content edit-category-tab-{{@controller.selectedTab}}"
+ class="edit-category-tab edit-category-tab-{{@controller.selectedTab}}"
>
{{#let
(this.componentFor
@@ -104,30 +104,47 @@ export default class Tabs extends Component {
{{/let}}
</form.Section>
- {{#if @controller.showDeleteReason}}
- <form.Alert @type="warning" class="edit-category-delete-warning">
- {{trustHTML @controller.model.cannot_delete_reason}}
- </form.Alert>
- {{/if}}
+ {{#if (eq @controller.selectedTab "settings")}}
+ {{#if (or @controller.model.can_delete @controller.model.id)}}
+ <form.Section
+ @title={{i18n "category.danger_zone.title"}}
+ class="edit-category__footer"
+ >
+ {{#if @controller.model.can_delete}}
+ <div class="edit-category__delete">
+ <div class="edit-category__delete-context">
+ <h3 class="edit-category__delete-title">
+ {{i18n "category.danger_zone.delete_title"}}
+ </h3>
+ <p class="edit-category__delete-description">
+ {{i18n "category.danger_zone.delete_description"}}
+ </p>
+ </div>
+ <div class="edit-category__delete-actions">
+ <form.Button
+ @action={{@controller.deleteCategory}}
+ @icon="trash-can"
+ @label="category.delete"
+ class="btn-danger btn-small"
+ />
+
+ </div>
+ </div>
+ {{else}}
+ <div class="edit-category__delete --forbidden">
+ <div class="edit-category__delete-context">
+ <h3 class="edit-category__delete-title">
+ {{i18n "category.danger_zone.delete_title_forbidden"}}
+ </h3>
+ <p class="edit-category__delete-description">
+ {{trustHTML @controller.model.cannot_delete_reason}}
+ </p>
+ </div>
+ </div>
+ {{/if}}
- {{#if (or @controller.model.can_delete @controller.model.id)}}
- <form.Actions class="edit-category-footer">
- {{#if @controller.model.can_delete}}
- <form.Button
- @action={{@controller.deleteCategory}}
- @icon="trash-can"
- @label="category.delete"
- class="btn-danger btn-small"
- />
- {{else}}
- <form.Button
- @action={{@controller.toggleDeleteTooltip}}
- @icon="circle-question"
- @label="category.delete"
- class="btn-default btn-small"
- />
- {{/if}}
- </form.Actions>
+ </form.Section>
+ {{/if}}
{{/if}}
</Form>
diff --git a/frontend/discourse/app/components/category-name-fields.gjs b/frontend/discourse/app/components/category-name-fields.gjs
deleted file mode 100644
index c4bd5673abd..00000000000
--- a/frontend/discourse/app/components/category-name-fields.gjs
+++ /dev/null
@@ -1,41 +0,0 @@
-/* eslint-disable ember/no-classic-components */
-import Component from "@ember/component";
-import { tagName } from "@ember-decorators/component";
-import PluginOutlet from "discourse/components/plugin-outlet";
-import lazyHash from "discourse/helpers/lazy-hash";
-import DTextField from "discourse/ui-kit/d-text-field";
-import { i18n } from "discourse-i18n";
-
-@tagName("")
-export default class CategoryNameFields extends Component {
- <template>
- <div ...attributes>
- <PluginOutlet
- @name="category-name-fields-details"
- @outletArgs={{lazyHash category=this.category}}
- >
- <section class="field category-name-fields">
- {{#unless this.category.isUncategorizedCategory}}
- <section class="field-item">
- <label>{{i18n "category.name"}}</label>
- <DTextField
- @value={{this.category.name}}
- @placeholderKey="category.name_placeholder"
- @maxlength="50"
- class="category-name"
- />
- </section>
- {{/unless}}
- <section class="field-item">
- <label>{{i18n "category.slug"}}</label>
- <DTextField
- @value={{this.category.slug}}
- @placeholderKey="category.slug_placeholder"
- @maxlength="255"
- />
- </section>
- </section>
- </PluginOutlet>
- </div>
- </template>
-}
diff --git a/spec/system/page_objects/pages/category.rb b/spec/system/page_objects/pages/category.rb
index c5d4108868e..90ebcfbffc1 100644
--- a/spec/system/page_objects/pages/category.rb
+++ b/spec/system/page_objects/pages/category.rb
@@ -151,11 +151,6 @@ module PageObjects
page.find(CATEGORY_NAVIGATION_NEW_NAV_ITEM_SELECTOR).click
end
- def click_setting_tab(name)
- find(".edit-category-nav .edit-category-#{name}").click
- self
- end
-
def click_edit_category
find(".navigation-controls .edit-category").click
self