From 31d659b7d4ae71e6b90bd99ede45301fc832b73e Mon Sep 17 00:00:00 2001
From: Muthukrishnanmatriot
<76949556+muthukrishnanmatriot@users.noreply.github.com>
Date: Wed, 26 May 2021 10:42:57 +0530
Subject: [PATCH] Code update for review comment
---
.../tmss_webapp/src/components/ViewTable.js | 2 +-
.../routes/Scheduling/SchedulingUnitList.js | 29 ++++++++-----------
2 files changed, 13 insertions(+), 18 deletions(-)
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/components/ViewTable.js b/SAS/TMSS/frontend/tmss_webapp/src/components/ViewTable.js
index deb1d3d7c68..ce033e61470 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/components/ViewTable.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/components/ViewTable.js
@@ -200,9 +200,9 @@ function SelectColumnFilter({
return (
<div onClick={e => { e.stopPropagation() }}>
<select
+ className= {columnclassname[0][Header]}
style={{
height: '24.2014px',
- width: '60px',
border: '1px solid lightgrey',
}}
value={value}
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/SchedulingUnitList.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/SchedulingUnitList.js
index 35b2e1b9021..bde5bec242b 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/SchedulingUnitList.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/SchedulingUnitList.js
@@ -269,39 +269,34 @@ class SchedulingUnitList extends Component{
}
getAPIFilter(suFilters, columnDef) {
- let defaultColumsProps = columnDef;
const defaultColKeys = Object.keys(columnDef);
defaultColKeys.forEach(key => {
let tmpColMap = {};
let tempKey = key;
tmpColMap['orgField'] = tempKey;
tmpColMap['tmpField'] = tempKey;
-
if(key === 'suid') {
tempKey = 'id';
tmpColMap['orgField'] = tempKey;
tmpColMap['tmpField'] = 'suid';
}
- let defaulColumn = defaultColumsProps[key];
- if(defaulColumn) {
- tmpColMap['displayName'] = defaulColumn['name'];
+ if(columnDef[key]) {
+ tmpColMap['displayName'] = columnDef[key]['name'];
}
this.columnMap.push(tmpColMap);
- let filter = suFilters.data.filters[tempKey];
- if(filter) {
- defaultColumsProps[key]['disableSortBy'] = !_.includes(suFilters.data.ordering, tempKey);
- defaultColumsProps[key]['disableFilters'] = false;
- if(UIConstants.FILTER_MAP[filter.type]) {
- defaultColumsProps[key]['filter'] = UIConstants.FILTER_MAP[filter.type];
+ //Set Enable/Disable the Filter & SortBy in each column
+ if(suFilters.data.filters[tempKey]) {
+ columnDef[key]['disableSortBy'] = !_.includes(suFilters.data.ordering, tempKey);
+ columnDef[key]['disableFilters'] = false;
+ if(UIConstants.FILTER_MAP[suFilters.data.filters[tempKey].type]) {
+ columnDef[key]['filter'] = UIConstants.FILTER_MAP[suFilters.data.filters[tempKey].type];
}
- } else {
- if (defaultColumsProps[key]['name']) {
- defaultColumsProps[key]['disableSortBy'] = true;
- defaultColumsProps[key]['disableFilters'] = true;
- }
+ } else if (columnDef[key]['name']) {
+ columnDef[key]['disableSortBy'] = true;
+ columnDef[key]['disableFilters'] = true;
}
});
- return defaultColumsProps;
+ return columnDef;
}
/**
--
GitLab