You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@trafficcontrol.apache.org by GitBox <gi...@apache.org> on 2022/09/19 20:13:04 UTC
[GitHub] [trafficcontrol] rimashah25 opened a new pull request, #7074: Fixed server table's quick search and filter for multiple profiles
rimashah25 opened a new pull request, #7074:
URL: https://github.com/apache/trafficcontrol/pull/7074
<!--
Thank you for contributing! Please be sure to read our contribution guidelines: https://github.com/apache/trafficcontrol/blob/master/CONTRIBUTING.md
If this closes or relates to an existing issue, please reference it using one of the following:
Closes: #ISSUE
Related: #ISSUE
If this PR fixes a security vulnerability, DO NOT submit! Instead, contact
the Apache Traffic Control Security Team at security@trafficcontrol.apache.org and follow the
guidelines at https://apache.org/security regarding vulnerability disclosure.
-->
Closes: #7049 and #7052
<!-- **^ Add meaningful description above** --><hr/>
## Which Traffic Control components are affected by this PR?
<!-- Please delete all components from this list that are NOT affected by this PR.
Feel free to add the name of a tool or script that is affected but not on the list.
-->
- Traffic Portal
## What is the best way to verify this PR?
<!-- Please include here ALL the steps necessary to test your PR.
If your PR has tests (and most should), provide the steps needed to run the tests.
If not, please provide step-by-step instructions to test the PR manually and explain why your PR does not need tests. -->
Add servers with multiple profiles and quick search and filter for any profile that is not a primary profile
## If this is a bugfix, which Traffic Control versions contained the bug?
<!-- Delete this section if the PR is not a bugfix, or if the bug is only in the master branch.
Examples:
- 5.1.2
- 5.1.3 (RC1)
-->
7.0.1
## PR submission checklist
- [ ] This PR has no tests as it only changes the display of a table column (UI). <!-- If not, please delete this text and explain why this PR does not need tests. -->
- [ ] This PR has documentation <!-- If not, please delete this text and explain why this PR does not need documentation. -->
- [x] This PR has a CHANGELOG.md entry <!-- A fix for a bug from an ATC release, an improvement, or a new feature should have a changelog entry. -->
- [x] This PR **DOES NOT FIX A SERIOUS SECURITY VULNERABILITY** (see [the Apache Software Foundation's security guidelines](https://apache.org/security) for details)
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
regarding copyright ownership. The ASF licenses this file
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@trafficcontrol.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [trafficcontrol] ocket8888 merged pull request #7074: Fixed server table's quick search and filter for multiple profiles
Posted by GitBox <gi...@apache.org>.
ocket8888 merged PR #7074:
URL: https://github.com/apache/trafficcontrol/pull/7074
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@trafficcontrol.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [trafficcontrol] rimashah25 commented on a diff in pull request #7074: Fixed server table's quick search and filter for multiple profiles
Posted by GitBox <gi...@apache.org>.
rimashah25 commented on code in PR #7074:
URL: https://github.com/apache/trafficcontrol/pull/7074#discussion_r983954758
##########
traffic_portal/app/src/common/modules/table/agGrid/CommonGridController.js:
##########
@@ -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;
+ case 'equals':
+ return profileNameValue.includes(filterTextLowerCase);
+ case 'notEqual':
+ return !profileNameValue.includes(filterTextLowerCase);
+ case 'startsWith':
+ return valueLowerCase.indexOf(filterTextLowerCase) === 0;
+ case 'endsWith':
+ var index = valueLowerCase.lastIndexOf(filterTextLowerCase);
+ return index >= 0 && index === (valueLowerCase.length - filterTextLowerCase.length);
Review Comment:
Also though, please don't use var ==> Resolved.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@trafficcontrol.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [trafficcontrol] rimashah25 commented on pull request #7074: Fixed server table's quick search and filter for multiple profiles
Posted by GitBox <gi...@apache.org>.
rimashah25 commented on PR #7074:
URL: https://github.com/apache/trafficcontrol/pull/7074#issuecomment-1258458449
> This fixes the search and appears to render fine, but some other tables aren't displaying Profiles for servers properly, e.g. the Delivery Service server-assignment table pictured below.
>
> 
>
> Also, #7049 specifically mentions viewing servers filtered by Profile via the "View Servers" menu option on a Profile's page. This PR doesn't fix that.
>
> Also, the table column name is currently still 'Profile', should probably now be 'Profiles' or perhaps 'Profile(s)'. But that's less important.
Resolved #7049 (filtered by Profile using column Filter).
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@trafficcontrol.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [trafficcontrol] ocket8888 commented on a diff in pull request #7074: Fixed server table's quick search and filter for multiple profiles
Posted by GitBox <gi...@apache.org>.
ocket8888 commented on code in PR #7074:
URL: https://github.com/apache/trafficcontrol/pull/7074#discussion_r983945604
##########
traffic_portal/app/src/common/modules/table/agGrid/CommonGridController.js:
##########
@@ -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;
+ case 'equals':
+ return profileNameValue.includes(filterTextLowerCase);
+ case 'notEqual':
+ return !profileNameValue.includes(filterTextLowerCase);
+ case 'startsWith':
+ return valueLowerCase.indexOf(filterTextLowerCase) === 0;
+ case 'endsWith':
+ var index = valueLowerCase.lastIndexOf(filterTextLowerCase);
+ return index >= 0 && index === (valueLowerCase.length - filterTextLowerCase.length);
Review Comment:
Nit but this is built into Javascript as [`String.prototype.endsWith`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/endsWith), so you don't need to mess with numeric indexes and such.
Also though, please don't use `var`
##########
traffic_portal/app/src/common/modules/table/agGrid/CommonGridController.js:
##########
@@ -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;
Review Comment:
FWIW, there's a [`String.prototype.includes`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/includes) just like there is for arrays, so you could do this same way you did 'equals' and 'notEqual'.
##########
traffic_portal/app/src/common/modules/table/agGrid/CommonGridController.js:
##########
@@ -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;
+ case 'equals':
+ return profileNameValue.includes(filterTextLowerCase);
+ case 'notEqual':
+ return !profileNameValue.includes(filterTextLowerCase);
+ case 'startsWith':
+ return valueLowerCase.indexOf(filterTextLowerCase) === 0;
Review Comment:
This is also built into Javascript, as [`String.prototype.startsWith`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/startsWith).
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@trafficcontrol.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [trafficcontrol] rimashah25 commented on a diff in pull request #7074: Fixed server table's quick search and filter for multiple profiles
Posted by GitBox <gi...@apache.org>.
rimashah25 commented on code in PR #7074:
URL: https://github.com/apache/trafficcontrol/pull/7074#discussion_r983954178
##########
traffic_portal/app/src/common/modules/table/agGrid/CommonGridController.js:
##########
@@ -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;
Review Comment:
So, you want me to use `includes` for for `contains`, `notContains`, `startsWith`, `endsWith`?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@trafficcontrol.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [trafficcontrol] rimashah25 commented on a diff in pull request #7074: Fixed server table's quick search and filter for multiple profiles
Posted by GitBox <gi...@apache.org>.
rimashah25 commented on code in PR #7074:
URL: https://github.com/apache/trafficcontrol/pull/7074#discussion_r983989905
##########
traffic_portal/app/src/common/modules/table/agGrid/CommonGridController.js:
##########
@@ -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;
+ case 'equals':
+ return profileNameValue.includes(filterTextLowerCase);
+ case 'notEqual':
+ return !profileNameValue.includes(filterTextLowerCase);
+ case 'startsWith':
+ return valueLowerCase.indexOf(filterTextLowerCase) === 0;
Review Comment:
Spoke to the reviewer and current (and below) comments are more for knowledge purpose and doesn't require any change.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@trafficcontrol.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org