diff --git a/app/scripts/filters/resources.js b/app/scripts/filters/resources.js index 980cf0541c..f7c916ea3d 100644 --- a/app/scripts/filters/resources.js +++ b/app/scripts/filters/resources.js @@ -1340,4 +1340,14 @@ angular.module('openshiftConsole') return serviceInstanceMessage; }; + }) + .filter('humanizeReason', function() { + return function(reason) { + var humanizedReason = _.startCase(reason); + // Special case some values like "BackOff" -> "Back-off" + return humanizedReason.replace("Back Off", "Back-off").replace("O Auth", "OAuth"); + }; + }) + .filter('humanizePodStatus', function(humanizeReasonFilter) { + return humanizeReasonFilter; }); diff --git a/app/views/browse/_pod-details.html b/app/views/browse/_pod-details.html index e079fe61e7..dae7e85855 100644 --- a/app/views/browse/_pod-details.html +++ b/app/views/browse/_pod-details.html @@ -12,7 +12,7 @@

Status:
- {{pod | podStatus | sentenceCase}}, ran for {{(pod | podStartTime) | duration : (pod | podCompletionTime)}} + {{pod | podStatus | humanizePodStatus}}, ran for {{(pod | podStartTime) | duration : (pod | podCompletionTime)}} (expires {{pod.metadata.deletionTimestamp | date : 'medium'}})
Message:
diff --git a/app/views/directives/events-sidebar.html b/app/views/directives/events-sidebar.html index 8bf33cc341..1ab1d56854 100644 --- a/app/views/directives/events-sidebar.html +++ b/app/views/directives/events-sidebar.html @@ -35,7 +35,7 @@

- {{event.reason | sentenceCase}} + {{event.reason | humanizeReason}}
{{event.type}} -   +  
-   +  
diff --git a/app/views/directives/pods-table.html b/app/views/directives/pods-table.html index 982fb14869..205aa7c058 100644 --- a/app/views/directives/pods-table.html +++ b/app/views/directives/pods-table.html @@ -32,7 +32,7 @@
- {{pod | podStatus | sentenceCase}} + {{pod | podStatus | humanizePodStatus}}
{{pod | numContainersReady}}/{{pod.spec.containers.length}} diff --git a/app/views/modals/debug-terminal.html b/app/views/modals/debug-terminal.html index 439f212062..aaebd01083 100644 --- a/app/views/modals/debug-terminal.html +++ b/app/views/modals/debug-terminal.html @@ -4,7 +4,7 @@

Debug Container {{container.name}}

{{debugPod.metadata.name}} — - {{debugPod | podStatus | sentenceCase}} + {{debugPod | podStatus | humanizePodStatus}}
- {{pod | podStatus | sentenceCase}} + {{pod | podStatus | humanizeReason}} – {{pod | numContainersReady}}/{{pod.spec.containers.length}} ready diff --git a/dist/scripts/scripts.js b/dist/scripts/scripts.js index d9191b7e79..bd87591b09 100644 --- a/dist/scripts/scripts.js +++ b/dist/scripts/scripts.js @@ -15350,6 +15350,12 @@ r = _.get(t(n, a), "message"); } return r; }; +} ]).filter("humanizeReason", function() { +return function(e) { +return _.startCase(e).replace("Back Off", "Back-off").replace("O Auth", "OAuth"); +}; +}).filter("humanizePodStatus", [ "humanizeReasonFilter", function(e) { +return e; } ]), angular.module("openshiftConsole").filter("canIDoAny", [ "APIService", "canIFilter", function(e, t) { var n = { buildConfigs: [ { diff --git a/dist/scripts/templates.js b/dist/scripts/templates.js index 0557daeee4..82ebcb7bc6 100644 --- a/dist/scripts/templates.js +++ b/dist/scripts/templates.js @@ -1247,7 +1247,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function( "
Status:
\n" + "
\n" + "\n" + - "{{pod | podStatus | sentenceCase}}, ran for {{(pod | podStartTime) | duration : (pod | podCompletionTime)}}\n" + + "{{pod | podStatus | humanizePodStatus}}, ran for {{(pod | podStartTime) | duration : (pod | podCompletionTime)}}\n" + "(expires {{pod.metadata.deletionTimestamp | date : 'medium'}})\n" + "
\n" + "
Message:
\n" + @@ -6881,7 +6881,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function( "