Merge pull request #892 from ssciolla/issue-887-keep-recent-in-modal

Keep recently changed issues in `UFixitModal` (#887)
ucfopen · Jul 25, 2024 · e62f3a2 · e62f3a2
2 parents 0839145 + a0a0bc8
commit e62f3a2
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 5 deletions.
diff --git a/assets/js/Components/App.js b/assets/js/Components/App.js
@@ -233,14 +233,20 @@ class App extends React.Component {
   }
 
   handleIssueSave(newIssue, newReport) {
-    let { report } = this.state
-    report = {...report, ...newReport}
+    const oldReport = this.state.report;
+
+    const report = { ...oldReport, ...newReport };
 
     if (report && Array.isArray(report.issues)) {
-      report.issues = report.issues.map(issue => (issue.id == newIssue.id) ? newIssue : issue)
+      // Combine backend issues with frontend issue state
+      report.issues = report.issues.map((issue) => {
+        if (issue.id === newIssue.id) return newIssue;
+        const oldIssue = oldReport.issues.find((oldReportIssue) => oldReportIssue.id === issue.id);
+        return oldIssue !== undefined ? { ...oldIssue, ...issue } : issue;
+      });
     }
 
-    this.setState({ report })
+    this.setState({ report });
   }
 
   handleFileSave(newFile, newReport) {

diff --git a/assets/js/Components/ContentPage.js b/assets/js/Components/ContentPage.js
@@ -91,9 +91,17 @@ class ContentPage extends React.Component {
   }
 
   handleCloseButton = () => {
+    const newReport = { ...this.props.report };
+    newReport.issues = newReport.issues.map((issue) => {
+      issue.recentlyResolved = false;
+      issue.recentlyUpdated = false;
+      return issue;
+    });
+
     this.setState({
+      report: newReport,
       modalOpen: false
-    })
+    });
   }
 
   handleTrayToggle = (e, val) => {