Merge remote-tracking branch 'origin/dev' into improve-install-docs

.env.example

@@ -68,6 +68,7 @@ PHPALLY_SUGGESTION_RULES="
     RedirectedLink,
     EmbedTagDetected,
     IframeNotHandled,
+    TableNotEmpty
 "
 # Rules that are easiest to tackle when using UDOIT. Comma-separated list of rule IDs.
 EASY_FIX_RULES="

CHANGELOG.md

@@ -0,0 +1,25 @@
+# Change Log
+
+Please update this file as you open PRs and make changes to the codebase. Thank you!
+## [Unreleased]
+
+## [3.5.0]
+
+### General
+
+- Added TableNotEmpty rule and UFIXIT issue form to track tables with no content (Thank you, [@AlanFCMV](https://github.com/alanfcmv))
+- Increased maximum file upload size allowed, from 1mb to 10mb (Thank you, [@taheralfayad](https://github.com/taheralfayad))
+- Changed the description of 'ParagraphNotUsedAsHeader' rule to be less ambiguous since UDOIT has flagged this issue incorrectly before (Thank you, [@taheralfayad](https://github.com/taheralfayad))
+- Updated outdated dependencies (Thank you, [@dmols](https://github.com/dmols))
+- Previously, the browser console would relay the data captured in the course, on initial scan. The console log has been removed since, to allow for more data security (Thank you, [@dmols](https://github.com/dmols))
+- Allow UDOIT to accept modern file types to be uploaded, such as those with extensions pptx, xlsx, docx (Thank you, [@taheralfayad](https://github.com/taheralfayad))
+- Added a CHANGELOG file to keep better track of the codebase changes (Thank you, [@dmols](https://github.com/dmols))
+
+### Bugfixes
+
+- Fixed issue where more than one resolved issue in the UFIXIT modal can remain. Before, the modal would only show the most recent one resolved. (Thank you, [@ssciolla](https://github.com/ssciolla))
+- Fixed case where navigating through issues on UFIXIT modal would be difficult or impossible when one is marked as fixed, since the modal will jump back to the resolved one. (Thank you, [@ssciolla](https://github.com/ssciolla))
+- Fixed issue where adding a Youtube API key to your .env file would not make UDOIT automatically consider issues revolving youtube captioning. This was resolved by allowing a 'Full Course Rescan' option in the dropdown menu of the UDOIT welcome screen (Thank you, [@taheralfayad](https://github.com/taheralfayad))
+
+## Previous Releases
+For the time being, please refer to [this page](https://github.com/ucfopen/UDOIT/releases) to view the changes made to previous UDOIT releases.

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) {

assets/js/Components/Constants.js

@@ -31,6 +31,7 @@ export const issueRuleIds = [
     "RedirectedLink",
     "TableDataShouldHaveTableHeader",
     "TableHeaderShouldHaveScope",
+    "TableNotEmpty",
     "VideoCaptionsMatchCourseLanguage",
     "VideoEmbedCheck",
     "VideoProvidesCaptions",

assets/js/Components/ContentPage.js

@@ -77,17 +77,6 @@ class ContentPage extends React.Component {
     }
   }
 
-  static getDerivedStateFromProps(props, state) {
-    const stateActiveIssue = state.activeIssue
-    const propsActiveIssue = stateActiveIssue && props.report.issues[stateActiveIssue.id]
-    if(propsActiveIssue && propsActiveIssue.status !== stateActiveIssue.status) {
-      return {
-        activeIssue: propsActiveIssue
-      }
-    }
-    return null
-  }
-
   handleSearchTerm = (e, val) => {
     this.setState({searchTerm: val, filteredIssues: [], tableSettings: Object.assign({}, this.state.tableSettings, {pageNum: 0})});
   }
@@ -102,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) => {

package.json

@@ -75,7 +75,7 @@
         "@instructure/ui-toggle-details": "^7.5.0",
         "@instructure/ui-tray": "^7.5.0",
         "@reactchartjs/react-chart.js": "^1.0.0-rc.3",
-        "axios": "^0.21.2",
+        "axios": "^1.6.0",
         "babel-loader": "^8.2.2",
         "chart.js": "^2.9.4",
         "moment": "^2.29.4",