added loadingbar and incorporated into the filterabledatatable

remove CBIGR override comments added typescripting trying to pass validation passing checks added progress to proptypes Update jsx/LoadingBar.tsx Co-authored-by: Maxime Mulder <[email protected]> updated to use ProgressBar instead of LoadingBar removed LoadingBar remove accidental space remove swap file
HenriRabalais · Oct 31, 2024 · c0f5c57 · c0f5c57
1 parent 2d91a56
commit c0f5c57
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/jsx/FilterableDataTable.js b/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,