From 2ddb6de654a8d8fa7c04da69b70cd45cafb9855f Mon Sep 17 00:00:00 2001
From: Keegan George <kgeorge13@gmail.com>
Date: Mon, 18 Jul 2022 11:03:57 -0700
Subject: [PATCH] FIX: Only update table portion from raw post

---
 .../api-initializers/table-editor.js          |  7 +++++--
 .../components/spreadsheet-editor.js          | 19 ++++++++++++++-----
 javascripts/discourse/lib/utilities.js        |  4 ++++
 .../templates/modal/table-editor-modal.hbs    |  2 +-
 4 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/javascripts/discourse/api-initializers/table-editor.js b/javascripts/discourse/api-initializers/table-editor.js
index 76574e7..7ab220f 100644
--- a/javascripts/discourse/api-initializers/table-editor.js
+++ b/javascripts/discourse/api-initializers/table-editor.js
@@ -31,6 +31,7 @@ export default apiInitializer("0.11.1", (api) => {
   function generateModal(event) {
     const table = event.target.parentNode.lastElementChild;
     const tempTable = table.cloneNode(true);
+    const tableId = event.target.getAttribute("data-table-id");
 
     return ajax(`/posts/${this.id}`, { type: "GET" })
       .then((post) => {
@@ -38,19 +39,20 @@ export default apiInitializer("0.11.1", (api) => {
           model: post,
         }).setProperties({
           tableHtml: tempTable,
-          submitOnEnter: false,
+          tableId,
         });
       })
       .catch(popupAjaxError);
   }
 
   function generatePopups(tables, attrs) {
-    tables.forEach((table) => {
+    tables.forEach((table, index) => {
       if (site.isMobileDevice) {
         return;
       }
 
       const popupBtn = createButton();
+      popupBtn.setAttribute("data-table-id", index);
       table.parentNode.classList.add("fullscreen-table-wrapper");
       const expandBtn = document.querySelector(".open-popup-link");
 
@@ -59,6 +61,7 @@ export default apiInitializer("0.11.1", (api) => {
       } else {
         table.parentNode.insertBefore(popupBtn, table);
       }
+
       popupBtn.addEventListener("click", generateModal.bind(attrs), false);
     });
   }
diff --git a/javascripts/discourse/components/spreadsheet-editor.js b/javascripts/discourse/components/spreadsheet-editor.js
index 407c5f1..e6c2b66 100644
--- a/javascripts/discourse/components/spreadsheet-editor.js
+++ b/javascripts/discourse/components/spreadsheet-editor.js
@@ -5,6 +5,7 @@ import { arrayToTable, tableToObj } from "../lib/utilities";
 import Component from "@ember/component";
 import { ajax } from "discourse/lib/ajax";
 import { popupAjaxError } from "discourse/lib/ajax-error";
+import { findTableRegex } from "../lib/utilities";
 
 export default Component.extend({
   tagName: "",
@@ -53,9 +54,6 @@ export default Component.extend({
       data: tableData,
       columns,
     });
-
-    const originalData = this.spreadsheet.getData();
-    console.log("Original Data:", originalData);
   },
 
   @action
@@ -74,7 +72,6 @@ export default Component.extend({
 
   @action
   editTable() {
-    // TODO: insert table edit submission logic
     const updatedHeaders = this.spreadsheet.getHeaders().split(","); // keys
     const updatedData = this.spreadsheet.getData(); // values
 
@@ -83,8 +80,20 @@ export default Component.extend({
     const newRaw = markdownTable;
     const editReason =
       this.get("editReason") || "Update Table with Table Editor";
+    const tableId = this.get("tableId");
 
-    this.updateTable(postId, newRaw, editReason);
+    const raw = this.model.raw;
+    const tableToEdit = raw.match(findTableRegex());
+
+    let editedTable;
+
+    if (tableToEdit.length > 1) {
+      editedTable = raw.replace(tableToEdit[tableId], newRaw);
+    } else {
+      editedTable = raw.replace(findTableRegex(), newRaw);
+    }
+
+    this.updateTable(postId, editedTable, editReason);
   },
 
   updateTable(postId, raw, edit_reason) {
diff --git a/javascripts/discourse/lib/utilities.js b/javascripts/discourse/lib/utilities.js
index 966148a..54bea0c 100644
--- a/javascripts/discourse/lib/utilities.js
+++ b/javascripts/discourse/lib/utilities.js
@@ -85,3 +85,7 @@ export function arrayToTable(array, columns, alignment = "center") {
   // Return table
   return table;
 }
+
+export function findTableRegex() {
+  return /((\r?){2}|^)([^\r\n]*\|[^\r\n]*(\r?\n)?)+(?=(\r?\n){2}|$)/gm;
+}
diff --git a/javascripts/discourse/templates/modal/table-editor-modal.hbs b/javascripts/discourse/templates/modal/table-editor-modal.hbs
index 489a951..95e3002 100644
--- a/javascripts/discourse/templates/modal/table-editor-modal.hbs
+++ b/javascripts/discourse/templates/modal/table-editor-modal.hbs
@@ -1,6 +1,6 @@
 <SpreadsheetEditor
   @model={{this.model}}
   @tableHtml={{this.tableHtml}}
+  @tableId={{this.tableId}}
   @triggerModalClose={{action "closeEditModal"}}
-  @submitOnClose="false"
 />
\ No newline at end of file