Merge remote-tracking branch 'aces/main' into 2024_11_04_Data_Release…

…_Hide_Delete_Manage_Modify

.eslintrc.json

@@ -111,8 +111,9 @@
           }}
         ],
         "jsdoc/require-param-description": "error",
-        "jsdoc/require-returns": "error",
         "jsdoc/require-returns-description": "error",
+        "jsdoc/require-param-type": "off",
+        "jsdoc/require-returns-type": "off",
         "no-undef": "off",
         "@typescript-eslint/ban-ts-comment": "off",
         "@typescript-eslint/no-explicit-any": "off"

SQL/0000-00-00-schema.sql

@@ -1529,6 +1529,7 @@ CREATE TABLE `issues` (
   `candID` int(6) DEFAULT NULL,
   `category` varchar(255) DEFAULT NULL,
   `description` longtext DEFAULT NULL,
+  `instrument` int(10) unsigned DEFAULT NULL,
   PRIMARY KEY (`issueID`),
   KEY `fk_issues_1` (`reporter`),
   KEY `fk_issues_2` (`assignee`),
@@ -1537,20 +1538,22 @@ CREATE TABLE `issues` (
   KEY `fk_issues_5` (`centerID`),
   KEY `fk_issues_6` (`lastUpdatedBy`),
   KEY `fk_issues_8` (`category`),
+  KEY `fk_issues_instrument` (`instrument`),
   CONSTRAINT `fk_issues_8` FOREIGN KEY (`category`) REFERENCES `issues_categories` (`categoryName`),
   CONSTRAINT `fk_issues_1` FOREIGN KEY (`reporter`) REFERENCES `users` (`UserID`),
   CONSTRAINT `fk_issues_2` FOREIGN KEY (`assignee`) REFERENCES `users` (`UserID`),
   CONSTRAINT `fk_issues_3` FOREIGN KEY (`candID`) REFERENCES `candidate` (`CandID`),
   CONSTRAINT `fk_issues_4` FOREIGN KEY (`sessionID`) REFERENCES `session` (`ID`),
   CONSTRAINT `fk_issues_5` FOREIGN KEY (`centerID`) REFERENCES `psc` (`CenterID`),
-  CONSTRAINT `fk_issues_6` FOREIGN KEY (`lastUpdatedBy`) REFERENCES `users` (`UserID`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8;
+  CONSTRAINT `fk_issues_6` FOREIGN KEY (`lastUpdatedBy`) REFERENCES `users` (`UserID`),
+  CONSTRAINT `fk_issues_instrument` FOREIGN KEY (`instrument`) REFERENCES `test_names` (`ID`) ON DELETE RESTRICT ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 CREATE TABLE `issues_history` (
   `issueHistoryID` int(11) unsigned NOT NULL AUTO_INCREMENT,
   `newValue` longtext NOT NULL,
   `dateAdded` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `fieldChanged` enum('assignee','status','comment','sessionID','centerID','title','category','module','lastUpdatedBy','priority','candID', 'description','watching') NOT NULL DEFAULT 'comment',
+  `fieldChanged` enum('assignee','status','comment','sessionID','centerID','title','category','module','lastUpdatedBy','priority','candID', 'description','watching','instrument') NOT NULL DEFAULT 'comment',
   `issueID` int(11) unsigned NOT NULL,
   `addedBy` varchar(255) NOT NULL DEFAULT '',
   PRIMARY KEY (`issueHistoryID`),

jsx/FilterableDataTable.js

@@ -4,6 +4,7 @@ import PropTypes from 'prop-types';
 import Panel from 'jsx/Panel';
 import DataTable from 'jsx/DataTable';
 import Filter from 'jsx/Filter';
+import ProgressBar from 'jsx/ProgressBar';
 
 /**
  * FilterableDataTable component.
@@ -149,7 +150,10 @@ class FilterableDataTable extends Component {
       />
     );
 
-    const dataTable = (
+    const {progress} = this.props;
+    const dataTable = !isNaN(progress) && progress < 100 ? (
+      <ProgressBar value={progress}/>
+    ) : (
       <DataTable
         data={this.props.data}
         fields={this.props.fields}
@@ -191,6 +195,7 @@ FilterableDataTable.propTypes = {
   updateFilterCallback: PropTypes.func,
   noDynamicTable: PropTypes.bool,
   loading: PropTypes.element,
+  progress: PropTypes.number,
   getMappedCell: PropTypes.func,
   folder: PropTypes.element,
   nullTableShow: PropTypes.element,

jsx/Form.d.ts

@@ -108,8 +108,7 @@ type selectElementProps = {
     required?: boolean
     emptyOption?: boolean
     autoSelect?: boolean
-    hasError?: boolean
-    errorMessage?: boolean
+    errorMessage?: string
     onUserInput: (name: string, value: any) => void
     noMargins?: boolean
     placeholder?: string
@@ -306,7 +305,6 @@ type fileElementProps = {
     disabled?: boolean
     required?: boolean
     allowMultiple?: boolean
-    hasError?: boolean
     errorMessage?: string
     onUserInput: (name: string, value: any) => void
 };
@@ -407,7 +405,6 @@ type dateElementProps = {
     dateFormat?: string
     disabled?: boolean
     required?: boolean
-    hasError?: boolean
     errorMessage?: string
     onUserInput: (name: string, value: any) => void
 };
@@ -595,7 +592,7 @@ type radioElementProps = {
     required?: boolean
     vertical?: boolean
     checked: boolean
-    errorMessage?: boolean
+    errorMessage?: string
     elementClass?: boolean
     onUserInput: (name: string, value: any) => void
 }