diff --git a/SAS/TMSS/frontend/tmss_webapp/src/components/ViewTable.js b/SAS/TMSS/frontend/tmss_webapp/src/components/ViewTable.js index 211e39b479cb3a1881e2e546aacd79fd8567fda6..28b838da8068fb4c45e50b4b98a1ae5e7ec9633a 100644 --- a/SAS/TMSS/frontend/tmss_webapp/src/components/ViewTable.js +++ b/SAS/TMSS/frontend/tmss_webapp/src/components/ViewTable.js @@ -812,9 +812,9 @@ function FlatpickrRangeColumnFilter({ TableUtil.saveFilter(currentTableName, Header, [] ); setFilter(undefined); } - if (filterValue[1] && !value ){ - setValue(filterValue); - setFilter(filterValue); + if (filterValue && !value ){ + setValue(filterValue); + setFilter(filterValue); } } }, [filterValue, value]); @@ -851,7 +851,6 @@ function FlatpickrRangeColumnFilter({ "allowInput": true, "mode": "range", "defaultHour": 0, - 'ignoredFocusElements': [window.document.body], "plugins": [new confirmDatePlugin()] }} title={(tableToolTipsState[Header])?tableToolTipsState[Header]:"Enter the date & time range to search and press ‘Ok’ button"} @@ -859,17 +858,15 @@ function FlatpickrRangeColumnFilter({ onClose={value => { if(value) { setValue(value); - setFilter(value); - if(storeFilter) { - TableUtil.saveFilter(currentTableName, Header, value); - } - if ((value !== '' && value !== 'Invalid date' ) && doServersideFilter) { - setFiltered(true); - callServerFilter(value); - } - + setFilter(value); + if(storeFilter) { + TableUtil.saveFilter(currentTableName, Header, value); + } + if ((value !== '' && value !== 'Invalid date' ) && doServersideFilter) { + setFiltered(true); + callServerFilter(value); + } } - }} > <input type="text" data-input className={`p-inputtext p-component calendar-input`} /> @@ -1520,6 +1517,9 @@ function DurationRangeFilter({ setValue(filterValue); setFilter(filterValue); } + if(!filterValue && value.length>0){ + setValue([]); + } } }, [filterValue, value]); @@ -1565,6 +1565,9 @@ function DurationRangeFilter({ } let max = rangeValue[1]; setValue([val,max]); + if(doServersideFilter) { + setFilter([val,max] || undefined); + } setRangeValue([val,max]); filterValue[0] = val; if(storeFilter) { @@ -1588,6 +1591,9 @@ function DurationRangeFilter({ } let min = rangeValue[0]; setValue([min,val]); + if(doServersideFilter) { + setFilter([min,val] || undefined); + } setRangeValue([min,val]); filterValue[1] = val; if(storeFilter) { @@ -1724,10 +1730,6 @@ const filterTypes = { fn: DateTimeColumnFilter, type: toDatetimeFilterFn }, - 'durationMinMax': { - fn: DurationRangeFilter, - type: durationTimeFilterFn - }, 'range': { fn: RangeColumnFilter, type: 'between' @@ -1744,6 +1746,10 @@ const filterTypes = { fn: RankRangeFilter, type: 'between' }, + 'durationMinMax': { + fn: DurationRangeFilter, + type: durationTimeFilterFn + } }; // Let the table remove the filter if the string is empty fuzzyTextFilterFn.autoRemove = val => !val @@ -2221,7 +2227,7 @@ function Table(props) { {row.cells.map(cell => { if (cell.column.id !== 'actionpath') { return <td {...cell.getCellProps()}> - {(cell.row.original.links || []).includes(cell.column.id) ? <a href={`${cell.row.original.linksURL[cell.column.id]}`}>{cell.render('Cell')}</a> : cell.render('Cell')} + {(cell.row.original.links || []).includes(cell.column.id) ? <a href={cell.row.original.linksURL[cell.column.id]}>{cell.render('Cell')}</a> : cell.render('Cell')} </td> } else { diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Task/view.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Task/view.js index 86dad8ea7b2733dae87b078e8980b9527fb9ca0a..e689be99d62792f8d048b054d23b7f99276bdd1c 100644 --- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Task/view.js +++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Task/view.js @@ -78,7 +78,8 @@ export class TaskView extends Component { "Duration (Days HH:mm:ss)":"filter-input-75", "Subtask Type":"filter-input-125", "Subtask ID":"filter-input-100", - "Link to Parset":"filter-input-150" + "Link to Parset":"filter-input-150", + "Subtask Status":"filter-input-125" }], defaultSortColumn: [{id: "Start Time", desc: false}], };