diff --git a/SAS/TMSS/frontend/tmss_webapp/src/components/ViewTable.js b/SAS/TMSS/frontend/tmss_webapp/src/components/ViewTable.js index c31bb08c6f305127c71ea2df2b11c603119e6100..59fa775acfdf492c82d4ba3f9faaf7a28ce23300 100644 --- a/SAS/TMSS/frontend/tmss_webapp/src/components/ViewTable.js +++ b/SAS/TMSS/frontend/tmss_webapp/src/components/ViewTable.js @@ -2595,7 +2595,7 @@ function ViewTable(props) { accessor: header, filter: filtertype, Filter: filterFn, - disableSortBy: doServersideFilter?typeof disableSortBy !== 'undefined' ? disableSortBy : true:false, + disableSortBy: doServersideFilter?(typeof disableSortBy !== 'undefined' ? disableSortBy : true):(disableSortBy || false), disableFilters: doServersideFilter?typeof disableFilter !== 'undefined' ? disableFilter : true:false, //minResizeWidth: 50, //*** TO REMOVE - INCOMING CHANGE */ diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/list.tabs.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/list.tabs.js index 40888287921e2e6cdf942b57448db20450c90457..2d86ba533db68ede29739b91719f2fffbfcf0d2e 100644 --- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/list.tabs.js +++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/list.tabs.js @@ -77,7 +77,7 @@ class TimelineListTabs extends Component { getUnschedulableList () { let unschedulableList = []; for(let unschedulableSU of this.props.unschedulableList ) { - unschedulableSU['summary'] = this.showUnschedulableSummary(unschedulableSU) + unschedulableSU['viewSummaryAction'] = this.showUnschedulableSummary(unschedulableSU) unschedulableList.push(unschedulableSU) } return unschedulableList; diff --git a/SAS/TMSS/frontend/tmss_webapp/src/shared/timeline.constants.js b/SAS/TMSS/frontend/tmss_webapp/src/shared/timeline.constants.js index db8b7557f15dd63524b5312f6ca186f841b11ab1..0c8bd0f2b0d29e6fe2dba8cc9cbcc15cda51406c 100644 --- a/SAS/TMSS/frontend/tmss_webapp/src/shared/timeline.constants.js +++ b/SAS/TMSS/frontend/tmss_webapp/src/shared/timeline.constants.js @@ -42,8 +42,10 @@ const TimelineConstants = { }], UNSCEDULABLE_SU_LIST_DEFAULT_COLUMNS: [{ - summary: { - name: "View Summary" + viewSummaryAction: { + name: "View Summary", + filter: "none", + disableSortBy: true }, status: { name:"Status",