From 32ccde037a6ea2ee6697d90820bbe4fa5d2cf701 Mon Sep 17 00:00:00 2001 From: Jeremy Mitchell Date: Mon, 6 Mar 2023 17:54:36 -0700 Subject: [PATCH 1/2] adds strikethru for expired certs and red for less than 7 days until expiration --- traffic_portal/app/src/common/modules/table/_table.scss | 8 +++++++- .../certExpirations/TableCertExpirationsController.js | 7 ++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/traffic_portal/app/src/common/modules/table/_table.scss b/traffic_portal/app/src/common/modules/table/_table.scss index 4f18c0b3f9..06910ad8a9 100644 --- a/traffic_portal/app/src/common/modules/table/_table.scss +++ b/traffic_portal/app/src/common/modules/table/_table.scss @@ -221,9 +221,15 @@ div.dropdown button.menu-item-button { } } .ag-row.expired-cert { + background-color: #fcfcfc; + .ag-cell { + text-decoration: line-through; + } + } + .ag-row.seven-days-until-expired { background-color: #f8d7da; } - .ag-row.soon-expired-cert { + .ag-row.thirty-days-until-expired { background-color: #fff3cd; } } diff --git a/traffic_portal/app/src/common/modules/table/certExpirations/TableCertExpirationsController.js b/traffic_portal/app/src/common/modules/table/certExpirations/TableCertExpirationsController.js index 5d3e83af1f..91aed22449 100644 --- a/traffic_portal/app/src/common/modules/table/certExpirations/TableCertExpirationsController.js +++ b/traffic_portal/app/src/common/modules/table/certExpirations/TableCertExpirationsController.js @@ -96,7 +96,12 @@ var TableCertExpirationsController = function(certExpirations, $scope, locationU const now = new Date(); return params.data.expiration < now; }, - 'soon-expired-cert': function(params) { + 'seven-days-until-expired': function(params) { + const sevenDays = new Date(); + sevenDays.setDate(sevenDays.getDate()+7); + return params.data.expiration >= new Date() && params.data.expiration <= sevenDays; + }, + 'thirty-days-until-expired': function(params) { const thirtyDays = new Date(); thirtyDays.setDate(thirtyDays.getDate()+30); return params.data.expiration >= new Date() && params.data.expiration <= thirtyDays; From 69df58f952b413f70dbdbdd01e376bcbf68aed4f Mon Sep 17 00:00:00 2001 From: Jeremy Mitchell Date: Mon, 6 Mar 2023 18:03:37 -0700 Subject: [PATCH 2/2] change log entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 503305553c..1552ce989a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -31,6 +31,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/). - [#7332](https://github.com/apache/trafficcontrol/pull/7332) *Traffic Ops* Creates new role needed for TR to watch TO resources. - [#7322](https://github.com/apache/trafficcontrol/issues/7322) *t3c Adds support for anycast on http routed edges. - [#7367](https://github.com/apache/trafficcontrol/pull/7367) *Traffic Ops* Adds ACME:CREATE, ACME:DELETE, ACME:DELETE, and ACME:READ permissions to operations role. +- [#7380](https://github.com/apache/trafficcontrol/pull/7380) *Traffic Portal* Adds strikethrough (expired), red (7 days until expiration) and yellow (30 days until expiration) visuals to delivery service cert expiration grid rows. ### Changed - [#7369](https://github.com/apache/trafficcontrol/pull/7369) *Traffic Portal* Adds better labels to routing methods widget on the TP dashboard.