From 40617cfd2bf6ac15ff965dbc104e07a174e4f541 Mon Sep 17 00:00:00 2001
From: Rima Shah <rima_shah@comcast.com>
Date: Mon, 26 Sep 2022 21:27:45 -0600
Subject: [PATCH 1/2] Removed `clear table filter` option from the More menu
 and placed next to column selector.

---
 CHANGELOG.md                                                    | 1 +
 .../app/src/common/modules/table/agGrid/grid.tpl.html           | 2 +-
 .../table.deliveryServiceRequests.tpl.html                      | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3de13c0f87..f14db0e109 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 
 ## [unreleased]
 ### Added
+- [#7055](https://github.com/apache/trafficcontrol/issues/7055) *Traffic Portal* Made `Clear Table Filters` option visible to the user.
 - [#7024](https://github.com/apache/trafficcontrol/pull/7024) *Traffic Monitor* Added logging for `ipv4Availability` and `ipv6Availability` in TM.
 - [#7063](https://github.com/apache/trafficcontrol/pull/7063) *Traffic Ops* Added API version 5.0 (IN DEVELOPMENT)
 - [#7023](https://github.com/apache/trafficcontrol/pull/7023) *Traffic Ops* Added the `ASN` field in TO Server struct, which provides the ability to query servers by `ASN`.
diff --git a/traffic_portal/app/src/common/modules/table/agGrid/grid.tpl.html b/traffic_portal/app/src/common/modules/table/agGrid/grid.tpl.html
index 68866af084..bee2f1433d 100644
--- a/traffic_portal/app/src/common/modules/table/agGrid/grid.tpl.html
+++ b/traffic_portal/app/src/common/modules/table/agGrid/grid.tpl.html
@@ -61,6 +61,7 @@
 				</menu>
 			</div>
 			<button class="btn btn-default" title="Refresh" ng-if="$ctrl.options.refreshable" ng-click="refresh()"><i class="fa fa-refresh"></i></button>
+			<button class="btn btn-default" title="clearFilters" ng-click="$ctrl.clearTableFilters()">Clear <i class="fa fa-filter"></i></button>
 			<div class="btn-group" role="group" uib-dropdown is-open="more.isopen">
 				<button name="moreBtn" type="button" class="btn btn-default dropdown-toggle" uib-dropdown-toggle aria-haspopup="true" aria-expanded="false">
 					More&nbsp;
@@ -72,7 +73,6 @@
 						<a ng-if="dd.type == 2" href="{{ $ctrl.getHref(dd) }}">{{ dd.text }}</a>
 					</li>
 					<li ng-if="$ctrl.dropDownOptions.length > 0" class="divider"></li>
-					<li role="menuitem"><button class="menu-item-button" type="button" ng-click="$ctrl.clearTableFilters()">Clear Table Filters</button></li>
 					<li role="menuitem"><button class="menu-item-button" type="button" ng-click="$ctrl.exportCSV()">Export CSV</button></li>
 				</ul>
 			</div>
diff --git a/traffic_portal/app/src/common/modules/table/deliveryServiceRequests/table.deliveryServiceRequests.tpl.html b/traffic_portal/app/src/common/modules/table/deliveryServiceRequests/table.deliveryServiceRequests.tpl.html
index 2e98219568..381f5e70d3 100644
--- a/traffic_portal/app/src/common/modules/table/deliveryServiceRequests/table.deliveryServiceRequests.tpl.html
+++ b/traffic_portal/app/src/common/modules/table/deliveryServiceRequests/table.deliveryServiceRequests.tpl.html
@@ -44,13 +44,13 @@
                         </li>
                     </menu>
                 </div>
+                <button class="btn btn-default" title="clearFilters" ng-click="clearTableFilters()">Clear <i class="fa fa-filter"></i></button>
                 <div class="btn-group" role="group" uib-dropdown is-open="more.isopen">
                     <button name="moreBtn" type="button" class="btn btn-default dropdown-toggle" uib-dropdown-toggle aria-haspopup="true" aria-expanded="false">
                         More&nbsp;
                         <span class="caret"></span>
                     </button>
                     <ul class="dropdown-menu-right dropdown-menu" uib-dropdown-menu>
-                        <li role="menuitem"><button class="menu-item-button" type="button" ng-click="clearTableFilters()">Clear Table Filters</button></li>
                         <li role="menuitem"><button class="menu-item-button" type="button" ng-click="exportCSV()">Export CSV</button></li>
                     </ul>
                 </div>

From a03e8343c323fe40c6b9d04584e92cf6d270cb2d Mon Sep 17 00:00:00 2001
From: Rima Shah <rima_shah@comcast.com>
Date: Wed, 28 Sep 2022 09:23:57 -0600
Subject: [PATCH 2/2] Updated title for clear filter button.

---
 .../app/src/common/modules/table/agGrid/grid.tpl.html           | 2 +-
 .../table.deliveryServiceRequests.tpl.html                      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/traffic_portal/app/src/common/modules/table/agGrid/grid.tpl.html b/traffic_portal/app/src/common/modules/table/agGrid/grid.tpl.html
index bee2f1433d..a8b2967391 100644
--- a/traffic_portal/app/src/common/modules/table/agGrid/grid.tpl.html
+++ b/traffic_portal/app/src/common/modules/table/agGrid/grid.tpl.html
@@ -61,7 +61,7 @@
 				</menu>
 			</div>
 			<button class="btn btn-default" title="Refresh" ng-if="$ctrl.options.refreshable" ng-click="refresh()"><i class="fa fa-refresh"></i></button>
-			<button class="btn btn-default" title="clearFilters" ng-click="$ctrl.clearTableFilters()">Clear <i class="fa fa-filter"></i></button>
+			<button class="btn btn-default" title="Clear Table Filters" ng-click="$ctrl.clearTableFilters()">Clear <i class="fa fa-filter"></i></button>
 			<div class="btn-group" role="group" uib-dropdown is-open="more.isopen">
 				<button name="moreBtn" type="button" class="btn btn-default dropdown-toggle" uib-dropdown-toggle aria-haspopup="true" aria-expanded="false">
 					More&nbsp;
diff --git a/traffic_portal/app/src/common/modules/table/deliveryServiceRequests/table.deliveryServiceRequests.tpl.html b/traffic_portal/app/src/common/modules/table/deliveryServiceRequests/table.deliveryServiceRequests.tpl.html
index 381f5e70d3..9534ed96f1 100644
--- a/traffic_portal/app/src/common/modules/table/deliveryServiceRequests/table.deliveryServiceRequests.tpl.html
+++ b/traffic_portal/app/src/common/modules/table/deliveryServiceRequests/table.deliveryServiceRequests.tpl.html
@@ -44,7 +44,7 @@
                         </li>
                     </menu>
                 </div>
-                <button class="btn btn-default" title="clearFilters" ng-click="clearTableFilters()">Clear <i class="fa fa-filter"></i></button>
+                <button class="btn btn-default" title="Clear Table Filters" ng-click="clearTableFilters()">Clear <i class="fa fa-filter"></i></button>
                 <div class="btn-group" role="group" uib-dropdown is-open="more.isopen">
                     <button name="moreBtn" type="button" class="btn btn-default dropdown-toggle" uib-dropdown-toggle aria-haspopup="true" aria-expanded="false">
                         More&nbsp;