Skip to content
This repository was archived by the owner on Nov 24, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
- [#7037](https://github.com/apache/trafficcontrol/pull/7037) *Traffic Router* Uses Traffic Ops API 4.0 by default

### Fixed
- [#7049](https://github.com/apache/trafficcontrol/issues/7049), [#7052](https://github.com/apache/trafficcontrol/issues/7052) *Traffic Portal* Fixed server table's quick search and filter option for multiple profiles.
- [#7080](https://github.com/apache/trafficcontrol/issues/7080), [#6335](https://github.com/apache/trafficcontrol/issues/6335) *Traffic Portal* Fixed redirect links for server capability.
- [#7022](https://github.com/apache/trafficcontrol/pull/7022) *Traffic Stats* Reuse InfluxDB client handle to prevent potential connection leaks.
- [#7021](https://github.com/apache/trafficcontrol/issues/7021) *Cache Config* Fixed cache config for Delivery Services with IP Origins.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,34 @@ let CommonGridController = function ($scope, $document, $state, userModel, dateU
this.columns[i].tooltipValueGetter = dateCellFormatterUTC;
this.columns[i].valueFormatter = dateCellFormatterUTC;
}
} else if (this.columns[i].filter === 'arrayTextColumnFilter') {
this.columns[i].filter = 'agTextColumnFilter'
this.columns[i].filterParams = {
textCustomComparator: (filter, value, filterText) => {
const filterTextLowerCase = filterText.toLowerCase();
const valueLowerCase = value.toString().toLowerCase();
const profileNameValue = valueLowerCase.split(",");
switch (filter) {
case 'contains':
return valueLowerCase.indexOf(filterTextLowerCase) >= 0;
case 'notContains':
return valueLowerCase.indexOf(filterTextLowerCase) === -1;
Comment thread
ocket8888 marked this conversation as resolved.
Outdated
case 'equals':
return profileNameValue.includes(filterTextLowerCase);
case 'notEqual':
return !profileNameValue.includes(filterTextLowerCase);
case 'startsWith':
return valueLowerCase.indexOf(filterTextLowerCase) === 0;
Comment thread
rimashah25 marked this conversation as resolved.
Outdated
case 'endsWith':
let index = valueLowerCase.lastIndexOf(filterTextLowerCase);
return index >= 0 && index === (valueLowerCase.length - filterTextLowerCase.length);
default:
// should never happen
console.warn('invalid filter type ' + filter);
return false;
}
}
}
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,14 @@ var TableAssignDSServersController = function(deliveryService, servers, assigned
field: "cachegroup",
},
{
headerName: "Profile",
field: "profile"
headerName: "Profile(s)",
field: "profile",
valueGetter: function(params) {
return params.data.profileNames;
},
tooltipValueGetter: function(params) {
return params.data.profileNames.join(", ");
}
}
];

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -166,18 +166,16 @@ var TableServersController = function(tableName, servers, filter, $scope, $state
hide: true
},
{
headerName: "Profile",
headerName: "Profile(s)",
field: "profileName",
hide: false,
valueGetter: function(params) {
if (params.data.profileNames.length > 1) {
return params.data.profileName + ' *';
}
return params.data.profileName;
return params.data.profileNames;
},
tooltipValueGetter: function(params) {
return params.data.profileNames.join(", ");
}
},
filter: 'arrayTextColumnFilter'
},
{
headerName: "Rack",
Expand Down