A platform for community discussion. Free, open, simple.
FIX: Incorrect "unsaved changes" dialog in table editor (#39581)
Jarek Radoszad87498d017d
diff --git a/frontend/discourse/app/components/modal/spreadsheet-editor.gjs b/frontend/discourse/app/components/modal/spreadsheet-editor.gjsindex 63b8f1e0246..095ed6d669c 100644--- a/frontend/discourse/app/components/modal/spreadsheet-editor.gjs+++ b/frontend/discourse/app/components/modal/spreadsheet-editor.gjs@@ -29,6 +29,7 @@ export default class SpreadsheetEditor extends Component {defaultColWidth = 150;isEditingTable = !!this.args.model.tableTokens;alignments = null;+ initialSnapshot = null;constructor() {super(...arguments);@@ -70,6 +71,8 @@ export default class SpreadsheetEditor extends Component {} else {this.buildNewTable();}++ this.initialSnapshot = this.captureSnapshot();}@action@@ -79,7 +82,7 @@ export default class SpreadsheetEditor extends Component {@actionconfirmClose() {- if (!this._hasChanges()) {+ if (!this.hasChanges) {return true;}@@ -112,25 +115,18 @@ export default class SpreadsheetEditor extends Component {}}- _hasChanges() {- if (this.isEditingTable) {- const originalSpreadsheetData = this.extractTableContent(- tokenRange(this.args.model.tableTokens, "tr_open", "tr_close")- );- const currentHeaders = this.spreadsheet.getHeaders().split(",");- const currentRows = this.spreadsheet.getData();- const currentSpreadsheetData = currentHeaders.concat(currentRows.flat());-- return (- JSON.stringify(currentSpreadsheetData) !==- JSON.stringify(originalSpreadsheetData)- );- } else {- return this.spreadsheet- .getData()- .flat()- .some((element) => element !== "");- }+ captureSnapshot() {+ return JSON.stringify({+ headers: this.spreadsheet.getHeaders(),+ data: this.spreadsheet.getData(),+ });+ }++ get hasChanges() {+ return (+ this.initialSnapshot !== null &&+ this.captureSnapshot() !== this.initialSnapshot+ );}async loadJspreadsheet() {diff --git a/spec/system/table_builder_spec.rb b/spec/system/table_builder_spec.rbindex 086267fcece..9a8bb10774e 100644--- a/spec/system/table_builder_spec.rb+++ b/spec/system/table_builder_spec.rb@@ -155,6 +155,14 @@ describe "Table Builder" doexpect(page).to have_no_css(".insert-table-modal")end+ it "closes the modal if there are no changes in a table with empty headers" do+ topic_page.visit_topic(topic2)+ topic_page.find(".btn-edit-table", visible: :all).click+ insert_table_modal.cancel++ expect(page).to have_no_css(".insert-table-modal")+ end+it "should show a warning popup if there are unsaved changes" dotopic_page.visit_topic(topic)topic_page.find(".btn-edit-table", visible: :all).click