A platform for community discussion. Free, open, simple.
DEV: Remove duplicate work from Boards components (#43732)
Régis Hanol0021b75223dc
diff --git a/plugins/boards/assets/javascripts/discourse/components/boards-card.gjs b/plugins/boards/assets/javascripts/discourse/components/boards-card.gjsindex 28883b2135d..8280dd18bb2 100644--- a/plugins/boards/assets/javascripts/discourse/components/boards-card.gjs+++ b/plugins/boards/assets/javascripts/discourse/components/boards-card.gjs@@ -91,9 +91,10 @@ export default class BoardsCard extends Component {return [];}+ const columnTagNames = this.columnTagNames;return tags.filter((tag) => {const name = typeof tag === "string" ? tag : tag.name;- return !this.columnTagNames.has(name?.toLowerCase());+ return !columnTagNames.has(name?.toLowerCase());});}@@ -103,8 +104,9 @@ export default class BoardsCard extends Component {return null;}+ const columnTagNames = this.columnTagNames;const filtered = this.topic.tags.filter(- (tag) => !this.columnTagNames.has(tag.toLowerCase())+ (tag) => !columnTagNames.has(tag.toLowerCase()));return filtered.length ? renderTags(null, { tags: filtered }) : null;@@ -144,10 +146,6 @@ export default class BoardsCard extends Component {return [];}- get assignedUser() {- return this.allAssignedUsers[0] ?? null;- }-get assignedGroup() {if (!this.siteSettings.assign_enabled) {return null;@@ -243,14 +241,6 @@ export default class BoardsCard extends Component {}));}- get floaterTagsHtml() {- const tags = this.args.card.tags;- if (this.isTopicCard || !tags?.length) {- return null;- }- return renderTags(null, { tags });- }-@actionopenDetailModal() {const board = this.args.board;diff --git a/plugins/boards/assets/javascripts/discourse/components/modal/boards-board-settings.gjs b/plugins/boards/assets/javascripts/discourse/components/modal/boards-board-settings.gjsindex 5c1f3f9eddb..d1d08611027 100644--- a/plugins/boards/assets/javascripts/discourse/components/modal/boards-board-settings.gjs+++ b/plugins/boards/assets/javascripts/discourse/components/modal/boards-board-settings.gjs@@ -71,40 +71,23 @@ export default class BoardsBoardSettings extends Component {@cachedget formData() {- const board = this.args.model.board;-- // Existing board- if (board) {- return {- name: board.name || "",- slug: board.slug || "",- constraint_type: inferConstraintType(- board.category_ids,- board.tag_names- ),- category_ids: board.category_ids || [],- tag_names: board.tag_names || [],- card_style: board.card_style || "detailed",- show_tags: board.show_tags ?? false,- show_topic_thumbnail: board.show_topic_thumbnail ?? false,- require_confirmation: board.require_confirmation ?? false,- acl: board.acl,- };- }-- // New board- return {- name: "",- slug: "",- constraint_type: null,- category_ids: [],- tag_names: [],- card_style: "detailed",+ const board = this.args.model.board || {show_tags: true,- show_topic_thumbnail: false,- require_confirmation: false,acl: buildDefaultBoardAcl(this.site, this.siteSettings),};++ return {+ name: board.name || "",+ slug: board.slug || "",+ constraint_type: inferConstraintType(board.category_ids, board.tag_names),+ category_ids: board.category_ids || [],+ tag_names: board.tag_names || [],+ card_style: board.card_style || "detailed",+ show_tags: board.show_tags ?? false,+ show_topic_thumbnail: board.show_topic_thumbnail ?? false,+ require_confirmation: board.require_confirmation ?? false,+ acl: board.acl,+ };}get isNew() {diff --git a/plugins/boards/assets/javascripts/discourse/components/modal/boards-column-settings.gjs b/plugins/boards/assets/javascripts/discourse/components/modal/boards-column-settings.gjsindex 743d7b808b2..19eccf0b4f7 100644--- a/plugins/boards/assets/javascripts/discourse/components/modal/boards-column-settings.gjs+++ b/plugins/boards/assets/javascripts/discourse/components/modal/boards-column-settings.gjs@@ -27,49 +27,21 @@ import BoardsEditableTitle from "../boards-editable-title";export default class BoardsColumnSettings extends Component {@tracked showAdvanced = false;- get isNew() {- return !this.args.model.column;- }-@cachedget formData() {const column = this.args.model.column;- if (column) {- return {- title: column.title || "",- icon: column.icon || null,- color: column.color || null,- default_sort: column.default_sort || "priority",- tag_name: column.tag_name || "",- move_to_category_id: column.move_to_category_id || null,- move_to_assigned: column.move_to_assigned || "",- move_to_status: column.move_to_status || "",- };- }return {- title: "",- icon: null,- color: null,- default_sort: "priority",- tag_name: "",- move_to_category_id: null,- move_to_assigned: "",- move_to_status: "",+ title: column?.title || "",+ icon: column?.icon || null,+ color: column?.color || null,+ default_sort: column?.default_sort || "priority",+ tag_name: column?.tag_name || "",+ move_to_category_id: column?.move_to_category_id || null,+ move_to_assigned: column?.move_to_assigned || "",+ move_to_status: column?.move_to_status || "",};}- get statusOptions() {- return STATUS_OPTIONS;- }-- get sortOptions() {- return COLUMN_SORT_OPTIONS;- }-- get assignedOptions() {- return ASSIGNED_OPTIONS;- }-// NOTE: We are aware this is not ideal because a board// can have multiple categories, but we only support one// for now because server-side the tag search is limited@@ -201,7 +173,7 @@ export default class BoardsColumnSettings extends Component {><field.Control><ComboBox- @content={{this.sortOptions}}+ @content={{COLUMN_SORT_OPTIONS}}@onChange={{fn this.onDefaultSortChange field}}@value={{data.default_sort}}/>@@ -240,7 +212,7 @@ export default class BoardsColumnSettings extends Component {><field.Control><ComboBox- @content={{this.statusOptions}}+ @content={{STATUS_OPTIONS}}@onChange={{fn this.onStatusChange field}}@options={{hashclearable=true@@ -279,7 +251,7 @@ export default class BoardsColumnSettings extends Component {><field.Control><ComboBox- @content={{this.assignedOptions}}+ @content={{ASSIGNED_OPTIONS}}@onChange={{fn this.onAssignedModeChange field}}@options={{hashclearable=truediff --git a/plugins/boards/assets/javascripts/discourse/components/modal/boards-constraint-fix.gjs b/plugins/boards/assets/javascripts/discourse/components/modal/boards-constraint-fix.gjsindex bdd5bf8d795..8b4bd11afe0 100644--- a/plugins/boards/assets/javascripts/discourse/components/modal/boards-constraint-fix.gjs+++ b/plugins/boards/assets/javascripts/discourse/components/modal/boards-constraint-fix.gjs@@ -30,14 +30,6 @@ export default class BoardsConstraintFix extends Component {}}- get tagOptions() {- const { mismatches } = this.args.model;- if (!mismatches.needsTags) {- return [];- }- return mismatches.boardTagNames;- }-get canSave() {const { mismatches } = this.args.model;if (mismatches.needsCategory && !this.selectedCategoryId) {@@ -129,7 +121,7 @@ export default class BoardsConstraintFix extends Component {<div class="discourse-boards-constraint-fix__field"><label>{{i18n "boards.board.constraint_fix_tags"}}</label><div class="discourse-boards-constraint-fix__options">- {{#each this.tagOptions as |tagName|}}+ {{#each @model.mismatches.boardTagNames as |tagName|}}<DButtonclass={{if(includes this.selectedTagNames tagName)diff --git a/plugins/boards/assets/javascripts/discourse/components/modal/boards-topic-card-detail.gjs b/plugins/boards/assets/javascripts/discourse/components/modal/boards-topic-card-detail.gjsindex eab6aa1786d..831e724be38 100644--- a/plugins/boards/assets/javascripts/discourse/components/modal/boards-topic-card-detail.gjs+++ b/plugins/boards/assets/javascripts/discourse/components/modal/boards-topic-card-detail.gjs@@ -214,7 +214,6 @@ export default class BoardsTopicCardDetail extends Component {<:footer><DButtonclass="btn-primary"- @action={{this.viewTopic}}@href={{this.topicUrl}}@icon="up-right-from-square"@label="boards.board.view_topic"