From 9a19acecbc0cdc27cf08d30120d20f86fe501e81 Mon Sep 17 00:00:00 2001
From: Jeremy Mitchell <mitchell852@gmail.com>
Date: Sun, 28 Aug 2022 19:44:07 -0600
Subject: [PATCH 1/2] offline is anything not online/reported

---
 traffic_ops/traffic_ops_golang/server/put_status.go             | 2 +-
 .../dialog/select/status/DialogSelectStatusController.js        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/traffic_ops/traffic_ops_golang/server/put_status.go b/traffic_ops/traffic_ops_golang/server/put_status.go
index d66060a49f..56c823bda1 100644
--- a/traffic_ops/traffic_ops_golang/server/put_status.go
+++ b/traffic_ops/traffic_ops_golang/server/put_status.go
@@ -121,7 +121,7 @@ func UpdateStatusHandler(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	if *status.Name == tc.CacheStatusAdminDown.String() || *status.Name == tc.CacheStatusOffline.String() {
+	if *status.Name != tc.CacheStatusOnline.String() && *status.Name != tc.CacheStatusReported.String() {
 		if reqObj.OfflineReason == nil {
 			api.HandleErr(w, r, tx, http.StatusBadRequest, errors.New("offlineReason is required for "+tc.CacheStatusAdminDown.String()+" or "+tc.CacheStatusOffline.String()+" status"), nil)
 			return
diff --git a/traffic_portal/app/src/common/modules/dialog/select/status/DialogSelectStatusController.js b/traffic_portal/app/src/common/modules/dialog/select/status/DialogSelectStatusController.js
index 6bdf02e804..73d531a933 100644
--- a/traffic_portal/app/src/common/modules/dialog/select/status/DialogSelectStatusController.js
+++ b/traffic_portal/app/src/common/modules/dialog/select/status/DialogSelectStatusController.js
@@ -48,7 +48,7 @@ var DialogSelectStatusController = function(server, statuses, $scope, $uibModalI
 
 	$scope.offline = function () {
 		var selectedStatus = _.find(statuses, function(status){ return parseInt(status.id) == parseInt($scope.selectedStatusId) });
-		return selectedStatus && (selectedStatus.name == "ADMIN_DOWN" || selectedStatus.name == "OFFLINE");
+		return selectedStatus && (selectedStatus.name != "ONLINE" && selectedStatus.name != "REPORTED");
 	};
 
 };

From 25e55209b72ceaa561b027ad4ee5ac4ffdfe7017 Mon Sep 17 00:00:00 2001
From: Jeremy Mitchell <mitchell852@gmail.com>
Date: Wed, 31 Aug 2022 15:43:53 -0600
Subject: [PATCH 2/2] makes offline reason optional

---
 traffic_ops/traffic_ops_golang/server/put_status.go         | 6 ++----
 .../dialog/select/status/dialog.select.status.tpl.html      | 4 ++--
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/traffic_ops/traffic_ops_golang/server/put_status.go b/traffic_ops/traffic_ops_golang/server/put_status.go
index 56c823bda1..08838db4a4 100644
--- a/traffic_ops/traffic_ops_golang/server/put_status.go
+++ b/traffic_ops/traffic_ops_golang/server/put_status.go
@@ -122,11 +122,9 @@ func UpdateStatusHandler(w http.ResponseWriter, r *http.Request) {
 	}
 
 	if *status.Name != tc.CacheStatusOnline.String() && *status.Name != tc.CacheStatusReported.String() {
-		if reqObj.OfflineReason == nil {
-			api.HandleErr(w, r, tx, http.StatusBadRequest, errors.New("offlineReason is required for "+tc.CacheStatusAdminDown.String()+" or "+tc.CacheStatusOffline.String()+" status"), nil)
-			return
+		if reqObj.OfflineReason != nil {
+			*reqObj.OfflineReason = inf.User.UserName + ": " + *reqObj.OfflineReason
 		}
-		*reqObj.OfflineReason = inf.User.UserName + ": " + *reqObj.OfflineReason
 	} else {
 		reqObj.OfflineReason = nil
 	}
diff --git a/traffic_portal/app/src/common/modules/dialog/select/status/dialog.select.status.tpl.html b/traffic_portal/app/src/common/modules/dialog/select/status/dialog.select.status.tpl.html
index 335a1905bb..e1ff0519d3 100644
--- a/traffic_portal/app/src/common/modules/dialog/select/status/dialog.select.status.tpl.html
+++ b/traffic_portal/app/src/common/modules/dialog/select/status/dialog.select.status.tpl.html
@@ -39,10 +39,10 @@ <h5 ng-if="needsUpdates(server)">Note: Config file updates will be queued on ALL
         <div class="row" ng-show="offline()">
             <div class="col-sm-12 col-md-12">
                 <div class="form-group" ng-class="{'has-error': hasError(statusForm.offlineReason), 'has-feedback': hasError(statusForm.offlineReason)}">
-                    <label class="control-label" for="offlineReason">Offline Reason *
+                    <label class="control-label" for="offlineReason">Offline Reason
                         <small class="input-error" ng-show="hasPropertyError(statusForm.offlineReason, 'maxlength')">Too Long</small>
                     </label>
-                    <input id="offlineReason" name="offlineReason" type="text" class="form-control" ng-model="status.offlineReason" ng-maxlength="256" ng-required="offline()" autofocus>
+                    <input id="offlineReason" name="offlineReason" type="text" class="form-control" ng-model="status.offlineReason" ng-maxlength="256" autofocus>
                     <span ng-show="hasError(statusForm.offlineReason)" class="form-control-feedback"><i class="fa fa-times"></i></span>
                 </div>
             </div>