A platform for community discussion. Free, open, simple.
FIX: computes form data on load (#38434)
Joffrey JAFFEUXd1ed87b649be
diff --git a/frontend/discourse/admin/controllers/edit-category/tabs.js b/frontend/discourse/admin/controllers/edit-category/tabs.jsindex ee8d076b73f..1740b13f904 100644--- a/frontend/discourse/admin/controllers/edit-category/tabs.js+++ b/frontend/discourse/admin/controllers/edit-category/tabs.js@@ -14,7 +14,25 @@ import { defaultHomepage } from "discourse/lib/utilities";import Category from "discourse/models/category";import { i18n } from "discourse-i18n";-const FIELD_LIST = [+// Only fields managed through FormKit in the legacy edit-category flow.+// Other legacy tab components (settings, tags, etc.) write directly to the model.+const LEGACY_FORMKIT_FIELDS = [+ "name",+ "slug",+ "parent_category_id",+ "color",+ "text_color",+ "style_type",+ "emoji",+ "icon",+ "localizations",+ "email_in",+ "email_in_allow_strangers",+ "mailinglist_mirror",+];++// All fields managed through FormKit in the simplified creation flow.+const SIMPLIFIED_FIELD_LIST = ["name","slug","parent_category_id",@@ -50,12 +68,6 @@ const FIELD_LIST = ["mailinglist_mirror","allowed_tag_groups","allowed_tags",-];--// Additional fields managed through FormKit in the simplified creation flow.-// The legacy edit-category components manage these directly on the model.-const SIMPLIFIED_FIELD_LIST = [- ...FIELD_LIST,"required_tag_groups","minimum_required_tags","allow_global_tags",@@ -77,6 +89,7 @@ export default class EditCategoryTabsController extends Controller {@trackedshowAdvancedTabs =this.keyValueStore.getItem(SHOW_ADVANCED_TABS_KEY) === "true";+ @tracked formData;@tracked selectedTab = "general";@tracked formApi = null;@autoTrackedArray panels = [];@@ -91,12 +104,15 @@ export default class EditCategoryTabsController extends Controller {@and("showTooltip", "model.cannot_delete_reason") showDeleteReason;- get formData() {+ @action+ initFormData() {const enableSimplifiedCategoryCreation =this.siteSettings.enable_simplified_category_creation;const data = getProperties(this.model,- ...(enableSimplifiedCategoryCreation ? SIMPLIFIED_FIELD_LIST : FIELD_LIST)+ ...(enableSimplifiedCategoryCreation+ ? SIMPLIFIED_FIELD_LIST+ : LEGACY_FORMKIT_FIELDS));if (enableSimplifiedCategoryCreation) {@@ -128,7 +144,7 @@ export default class EditCategoryTabsController extends Controller {});}- return data;+ this.formData = data;}@computed("saving", "deleting")@@ -295,6 +311,7 @@ export default class EditCategoryTabsController extends Controller {}this.set("saving", false);+ this.initFormData();this.toasts.success({duration: "short",diff --git a/frontend/discourse/admin/routes/edit-category/tabs.js b/frontend/discourse/admin/routes/edit-category/tabs.jsindex 808741da6ce..7d55dcce36a 100644--- a/frontend/discourse/admin/routes/edit-category/tabs.js+++ b/frontend/discourse/admin/routes/edit-category/tabs.js@@ -16,6 +16,7 @@ export default class EditCategoryTabs extends DiscourseRoute {showTooltip: false,});+ controller.initFormData();controller.setSelectedTab(selectedTab);}}diff --git a/frontend/discourse/admin/routes/new-category/tabs.js b/frontend/discourse/admin/routes/new-category/tabs.jsindex debff95a4d8..88064823ffa 100644--- a/frontend/discourse/admin/routes/new-category/tabs.js+++ b/frontend/discourse/admin/routes/new-category/tabs.js@@ -50,6 +50,7 @@ export default class NewCategoryTabs extends DiscourseRoute {parentParams: {},showTooltip: false,});+ controller.initFormData();controller.setSelectedTab(selectedTab);}}