diff --git a/src/app/frontend/common/components/resourcedetail/infocard.html b/src/app/frontend/common/components/resourcedetail/infocard.html index 312896e3d2db..2cb74f0f3fa9 100644 --- a/src/app/frontend/common/components/resourcedetail/infocard.html +++ b/src/app/frontend/common/components/resourcedetail/infocard.html @@ -36,5 +36,5 @@ - {{::$ctrl.objectMeta.creationTimestamp | date:'medium':'UTC'}} + {{::$ctrl.objectMeta.creationTimestamp | date:'yyyy-MM-ddTHH:mm':'UTC'}} diff --git a/src/app/frontend/configmaplist/configmapcard_component.js b/src/app/frontend/configmaplist/configmapcard_component.js index f48d740eaeda..1bcf5603f2ae 100644 --- a/src/app/frontend/configmaplist/configmapcard_component.js +++ b/src/app/frontend/configmaplist/configmapcard_component.js @@ -68,7 +68,7 @@ export default class ConfigMapCardController { * @return {string} localized tooltip with the formated creation date */ getCreatedAtTooltip(creationDate) { - let filter = this.interpolate_(`{{date | date:'short'}}`); + let filter = this.interpolate_(`{{date | date:'yyyy-MM-ddTHH:mm':'UTC'}}`); /** @type {string} @desc Tooltip 'Created at [some date]' showing the exact creation time of * config map. */ let MSG_CONFIG_MAP_LIST_CREATED_AT_TOOLTIP = diff --git a/src/app/frontend/daemonsetlist/daemonsetcard_component.js b/src/app/frontend/daemonsetlist/daemonsetcard_component.js index 6127ea1c188c..fb1846395a68 100644 --- a/src/app/frontend/daemonsetlist/daemonsetcard_component.js +++ b/src/app/frontend/daemonsetlist/daemonsetcard_component.js @@ -91,7 +91,7 @@ export class DaemonSetCardController { * @return {string} localized tooltip with the formatted creation date */ getCreatedAtTooltip() { - let filter = this.interpolate_(`{{date | date:'short'}}`); + let filter = this.interpolate_(`{{date | date:'yyyy-MM-ddTHH:mm':'UTC'}}`); /** @type {string} @desc Tooltip 'Created at [some date]' showing the exact creation time of * the daemon set.*/ let MSG_DAEMON_SET_LIST_CREATED_AT_TOOLTIP = goog.getMsg( diff --git a/src/app/frontend/deploymentlist/deploymentcard_component.js b/src/app/frontend/deploymentlist/deploymentcard_component.js index 28b6e450c46e..6a3c10d19148 100644 --- a/src/app/frontend/deploymentlist/deploymentcard_component.js +++ b/src/app/frontend/deploymentlist/deploymentcard_component.js @@ -95,7 +95,7 @@ export default class DeploymentCardController { * @return {string} localized tooltip with the formatted creation date */ getCreatedAtTooltip(creationDate) { - let filter = this.interpolate_(`{{date | date:'short'}}`); + let filter = this.interpolate_(`{{date | date:'yyyy-MM-ddTHH:mm':'UTC'}}`); /** @type {string} @desc Tooltip 'Created at [some date]' showing the exact creation time of * a deployment. */ let MSG_DEPLOYMENT_LIST_CREATED_AT_TOOLTIP = diff --git a/src/app/frontend/events/eventcardlist.html b/src/app/frontend/events/eventcardlist.html index 5899797248ab..84601fba2286 100644 --- a/src/app/frontend/events/eventcardlist.html +++ b/src/app/frontend/events/eventcardlist.html @@ -68,10 +68,10 @@ {{event.count}} - {{event.firstSeen | date:'d/M/yy HH:mm':'UTC'}} UTC + {{event.firstSeen | date:'yyyy-MM-ddTHH:mm':'UTC'}} UTC - {{event.lastSeen | date:'d/M/yy HH:mm':'UTC'}} UTC + {{event.lastSeen | date:'yyyy-MM-ddTHH:mm':'UTC'}} UTC diff --git a/src/app/frontend/horizontalpodautoscalerdetail/horizontalpodautoscalerinfo_component.js b/src/app/frontend/horizontalpodautoscalerdetail/horizontalpodautoscalerinfo_component.js index 837e47b4409f..7b78960aeece 100644 --- a/src/app/frontend/horizontalpodautoscalerdetail/horizontalpodautoscalerinfo_component.js +++ b/src/app/frontend/horizontalpodautoscalerdetail/horizontalpodautoscalerinfo_component.js @@ -64,7 +64,7 @@ export default class HorizontalPodAutoscalerInfoController { * @return {string} localized tooltip with the formatted creation date */ getLatScaledTooltip() { - let filter = this.interpolate_(`{{date | date:'short'}}`); + let filter = this.interpolate_(`{{date | date:'yyyy-MM-ddTHH:mm':'UTC'}}`); /** @type {string} @desc Tooltip 'Last scaled at [some date]' showing the exact time of * the last time the horizontal pod autoscaler was scaled.*/ let MSG_HORIZONTAL_POD_AUTOSCALER_DETAIL_LAST_SCALED_TOOLTIP = goog.getMsg( diff --git a/src/app/frontend/horizontalpodautoscalerlist/horizontalpodautoscalercard_component.js b/src/app/frontend/horizontalpodautoscalerlist/horizontalpodautoscalercard_component.js index 9fc3fb5368ba..b1f787d5b1f8 100644 --- a/src/app/frontend/horizontalpodautoscalerlist/horizontalpodautoscalercard_component.js +++ b/src/app/frontend/horizontalpodautoscalerlist/horizontalpodautoscalercard_component.js @@ -86,7 +86,7 @@ export class HorizontalPodAutoscalerCardController { * @return {string} localized tooltip with the formatted creation date */ getCreatedAtTooltip() { - let filter = this.interpolate_(`{{date | date:'short'}}`); + let filter = this.interpolate_(`{{date | date:'yyyy-MM-ddTHH:mm':'UTC'}}`); /** @type {string} @desc Tooltip 'Created at [some date]' showing the exact creation time of * the horizontal pod autoscaler.*/ let MSG_HORIZONTAL_POD_AUTOSCALER_LIST_CREATED_AT_TOOLTIP = diff --git a/src/app/frontend/ingresslist/card_component.js b/src/app/frontend/ingresslist/card_component.js index d503b9be4876..016471ccf14e 100644 --- a/src/app/frontend/ingresslist/card_component.js +++ b/src/app/frontend/ingresslist/card_component.js @@ -42,7 +42,7 @@ class IngressCardController { * @return {string} localized tooltip with the formated start date */ getStartedAtTooltip(startDate) { - let filter = this.interpolate_(`{{date | date:'d/M/yy HH:mm':'UTC'}}`); + let filter = this.interpolate_(`{{date | date:'yyyy-MM-ddTHH:mm':'UTC'}}`); /** @type {string} @desc Tooltip 'Started at [some date]' showing the exact start time of * the ingress.*/ let MSG_INGRESS_LIST_STARTED_AT_TOOLTIP = diff --git a/src/app/frontend/joblist/jobcard.html b/src/app/frontend/joblist/jobcard.html index 512fa17550f3..4ac3bd357b95 100644 --- a/src/app/frontend/joblist/jobcard.html +++ b/src/app/frontend/joblist/jobcard.html @@ -62,7 +62,7 @@ {{::$ctrl.job.objectMeta.creationTimestamp | relativeTime}} - Created at {{::$ctrl.job.objectMeta.creationTimestamp | date:'short'}} + Created at {{::$ctrl.job.objectMeta.creationTimestamp | date:'yyyy-MM-ddTHH:mm':'UTC'}} diff --git a/src/app/frontend/namespacelist/namespacecard_component.js b/src/app/frontend/namespacelist/namespacecard_component.js index 5941557c9049..8c4ad70acb7f 100644 --- a/src/app/frontend/namespacelist/namespacecard_component.js +++ b/src/app/frontend/namespacelist/namespacecard_component.js @@ -72,7 +72,7 @@ export default class NamespaceCardController { * @return {string} localized tooltip with the formated creation date */ getCreatedAtTooltip(creationDate) { - let filter = this.interpolate_(`{{date | date:'short'}}`); + let filter = this.interpolate_(`{{date | date:'yyyy-MM-ddTHH:mm':'UTC'}}`); /** @type {string} @desc Tooltip 'Created at [some date]' showing the exact creation time of * namespace. */ let MSG_NAMESPACE_LIST_CREATED_AT_TOOLTIP = diff --git a/src/app/frontend/nodelist/nodecard_component.js b/src/app/frontend/nodelist/nodecard_component.js index 746fba90ed77..8422ed249495 100644 --- a/src/app/frontend/nodelist/nodecard_component.js +++ b/src/app/frontend/nodelist/nodecard_component.js @@ -81,7 +81,7 @@ export default class NodeCardController { * @return {string} localized tooltip with the formated creation date */ getCreatedAtTooltip(creationDate) { - let filter = this.interpolate_(`{{date | date:'short'}}`); + let filter = this.interpolate_(`{{date | date:'yyyy-MM-ddTHH:mm':'UTC'}}`); /** @type {string} @desc Tooltip 'Created at [some date]' showing the exact creation time of * node. */ let MSG_NODE_LIST_CREATED_AT_TOOLTIP = diff --git a/src/app/frontend/persistentvolumeclaimlist/persistentvolumeclaimcard_component.js b/src/app/frontend/persistentvolumeclaimlist/persistentvolumeclaimcard_component.js index 5fe2015ba1e7..736d232e94f4 100644 --- a/src/app/frontend/persistentvolumeclaimlist/persistentvolumeclaimcard_component.js +++ b/src/app/frontend/persistentvolumeclaimlist/persistentvolumeclaimcard_component.js @@ -95,7 +95,7 @@ export default class PersistentVolumeClaimCardController { * @return {string} localized tooltip with the formatted creation date */ getCreatedAtTooltip(creationDate) { - let filter = this.interpolate_(`{{date | date:'short'}}`); + let filter = this.interpolate_(`{{date | date:'yyyy-MM-ddTHH:mm':'UTC'}}`); /** @type {string} @desc Tooltip 'Created at [some date]' showing the exact creation time of * persistent volume claim. */ let MSG_PERSISTENT_VOLUME_CLAIM_LIST_CREATED_AT_TOOLTIP = diff --git a/src/app/frontend/persistentvolumelist/persistentvolumecard_component.js b/src/app/frontend/persistentvolumelist/persistentvolumecard_component.js index ef46ca7bd323..eac673cb9e4a 100644 --- a/src/app/frontend/persistentvolumelist/persistentvolumecard_component.js +++ b/src/app/frontend/persistentvolumelist/persistentvolumecard_component.js @@ -54,7 +54,7 @@ export default class PersistentVolumeCardController { * @return {string} localized tooltip with the formated creation date */ getCreatedAtTooltip(creationDate) { - let filter = this.interpolate_(`{{date | date:'short'}}`); + let filter = this.interpolate_(`{{date | date:'yyyy-MM-ddTHH:mm':'UTC'}}`); /** @type {string} @desc Tooltip 'Created at [some date]' showing the exact creation time of * persistent volume. */ let MSG_PERSISTENT_VOLUME_LIST_CREATED_AT_TOOLTIP = diff --git a/src/app/frontend/replicasetlist/replicasetcard_component.js b/src/app/frontend/replicasetlist/replicasetcard_component.js index 36bb2fab74ac..ac415ef99cdb 100644 --- a/src/app/frontend/replicasetlist/replicasetcard_component.js +++ b/src/app/frontend/replicasetlist/replicasetcard_component.js @@ -95,7 +95,7 @@ export default class ReplicaSetCardController { * @return {string} localized tooltip with the formated creation date */ getCreatedAtTooltip(creationDate) { - let filter = this.interpolate_(`{{date | date:'short'}}`); + let filter = this.interpolate_(`{{date | date:'yyyy-MM-ddTHH:mm':'UTC'}}`); /** @type {string} @desc Tooltip 'Created at [some date]' showing the exact creation time of * replica set. */ let MSG_REPLICA_SET_LIST_CREATED_AT_TOOLTIP = diff --git a/src/app/frontend/replicationcontrollerlist/replicationcontrollercard_component.js b/src/app/frontend/replicationcontrollerlist/replicationcontrollercard_component.js index 7d6d954924db..9fd901b2c5df 100644 --- a/src/app/frontend/replicationcontrollerlist/replicationcontrollercard_component.js +++ b/src/app/frontend/replicationcontrollerlist/replicationcontrollercard_component.js @@ -97,7 +97,7 @@ export default class ReplicationControllerCardController { * @return {string} localized tooltip with the formated creation date */ getCreatedAtTooltip(creationDate) { - let filter = this.interpolate_(`{{date | date:'short'}}`); + let filter = this.interpolate_(`{{date | date:'yyyy-MM-ddTHH:mm':'UTC'}}`); /** @type {string} @desc Tooltip 'Created at [some date]' showing the exact creation time of * replication controller. */ let MSG_RC_LIST_CREATED_AT_TOOLTIP = diff --git a/src/app/frontend/secretlist/card_component.js b/src/app/frontend/secretlist/card_component.js index 2d3509cf1d46..49eaee341627 100644 --- a/src/app/frontend/secretlist/card_component.js +++ b/src/app/frontend/secretlist/card_component.js @@ -42,7 +42,7 @@ class SecretCardController { * @return {string} localized tooltip with the formated start date */ getStartedAtTooltip(startDate) { - let filter = this.interpolate_(`{{date | date:'d/M/yy HH:mm':'UTC'}}`); + let filter = this.interpolate_(`{{date | date:'yyyy-MM-ddTHH:mm':'UTC'}}`); /** @type {string} @desc Tooltip 'Started at [some date]' showing the exact start time of * the secret.*/ let MSG_SECRET_LIST_STARTED_AT_TOOLTIP = diff --git a/src/app/frontend/statefulsetlist/statefulsetcard_component.js b/src/app/frontend/statefulsetlist/statefulsetcard_component.js index bc9bdbad138c..8a5a202b6096 100644 --- a/src/app/frontend/statefulsetlist/statefulsetcard_component.js +++ b/src/app/frontend/statefulsetlist/statefulsetcard_component.js @@ -95,7 +95,7 @@ export default class StatefulSetCardController { * @return {string} localized tooltip with the formated creation date */ getCreatedAtTooltip(creationDate) { - let filter = this.interpolate_(`{{date | date:'short'}}`); + let filter = this.interpolate_(`{{date | date:'yyyy-MM-ddTHH:mm':'UTC'}}`); /** @type {string} @desc Tooltip 'Created at [some date]' showing the exact creation time of * stateful set. */ let MSG_STATEFUL_SET_LIST_CREATED_AT_TOOLTIP = diff --git a/src/test/frontend/configmaplist/configmapcard_component_test.js b/src/test/frontend/configmaplist/configmapcard_component_test.js index 2759fa1617ed..1b3854dbea6a 100644 --- a/src/test/frontend/configmaplist/configmapcard_component_test.js +++ b/src/test/frontend/configmaplist/configmapcard_component_test.js @@ -36,6 +36,7 @@ describe('Config Map card', () => { }); it('should format the "created at" tooltip correctly', () => { - expect(ctrl.getCreatedAtTooltip('2016-06-06T09:13:12Z')).toMatch('Created at 6/6/16.*'); + expect(ctrl.getCreatedAtTooltip('2016-06-06T09:13:12Z')) + .toMatch('Created at 2016-06-06T09:13.*'); }); }); diff --git a/src/test/frontend/daemonsetlist/daemonsetcard_component_test.js b/src/test/frontend/daemonsetlist/daemonsetcard_component_test.js index 66d92beb9282..587ac8c3e5e8 100644 --- a/src/test/frontend/daemonsetlist/daemonsetcard_component_test.js +++ b/src/test/frontend/daemonsetlist/daemonsetcard_component_test.js @@ -47,6 +47,6 @@ describe('Daemon Set card', () => { }, }; - expect(ctrl.getCreatedAtTooltip()).toMatch('Created at 6/[56]/16.*'); + expect(ctrl.getCreatedAtTooltip()).toMatch('Created at 2016-06-06T09:13.*'); }); }); diff --git a/src/test/frontend/deploymentlist/deploymentcard_component_test.js b/src/test/frontend/deploymentlist/deploymentcard_component_test.js index 28b7af292098..26792d747a37 100644 --- a/src/test/frontend/deploymentlist/deploymentcard_component_test.js +++ b/src/test/frontend/deploymentlist/deploymentcard_component_test.js @@ -120,6 +120,7 @@ describe('Deployment card', () => { }); it('should format the "created at" tooltip correctly', () => { - expect(ctrl.getCreatedAtTooltip('2016-06-06T09:13:12Z')).toMatch('Created at 6/[56]/16.*'); + expect(ctrl.getCreatedAtTooltip('2016-06-06T09:13:12Z')) + .toMatch('Created at 2016-06-06T09:13.*'); }); }); diff --git a/src/test/frontend/horizontalpodautoscalerlist/horizontalpodautoscalercard_component_test.js b/src/test/frontend/horizontalpodautoscalerlist/horizontalpodautoscalercard_component_test.js index 2d99290d012d..cc345f840244 100644 --- a/src/test/frontend/horizontalpodautoscalerlist/horizontalpodautoscalercard_component_test.js +++ b/src/test/frontend/horizontalpodautoscalerlist/horizontalpodautoscalercard_component_test.js @@ -39,6 +39,6 @@ describe('Horizontal Pod Autoscaler card', () => { }); it('should format the "created at" tooltip correctly', () => { - expect(ctrl.getCreatedAtTooltip()).toMatch('Created at 6/6/16.*'); + expect(ctrl.getCreatedAtTooltip()).toMatch('Created at 2016-06-06T09:13.*'); }); }); diff --git a/src/test/frontend/ingresslist/card_component_test.js b/src/test/frontend/ingresslist/card_component_test.js index f6f4f5881de3..7a9bf2205615 100644 --- a/src/test/frontend/ingresslist/card_component_test.js +++ b/src/test/frontend/ingresslist/card_component_test.js @@ -42,7 +42,8 @@ describe('Ingress card', () => { }); it('should format the "ingress start date" tooltip correctly', () => { - expect(ctrl.getStartedAtTooltip('2016-06-06T09:13:12Z')).toBe('Created at 6/6/16 09:13 UTC'); + expect(ctrl.getStartedAtTooltip('2016-06-06T09:13:12Z')) + .toBe('Created at 2016-06-06T09:13 UTC'); }); it('should return details href', () => { diff --git a/src/test/frontend/namespacelist/namespacecard_component_test.js b/src/test/frontend/namespacelist/namespacecard_component_test.js index 95046be9be58..814af9ed98e0 100644 --- a/src/test/frontend/namespacelist/namespacecard_component_test.js +++ b/src/test/frontend/namespacelist/namespacecard_component_test.js @@ -41,6 +41,7 @@ describe('Namespace card', () => { }); it('should format the "created at" tooltip correctly', () => { - expect(ctrl.getCreatedAtTooltip('2016-06-06T09:13:12Z')).toMatch('Created at 6/[56]/16.*'); + expect(ctrl.getCreatedAtTooltip('2016-06-06T09:13:12Z')) + .toMatch('Created at 2016-06-06T09:13.*'); }); }); diff --git a/src/test/frontend/nodelist/nodecard_component_test.js b/src/test/frontend/nodelist/nodecard_component_test.js index d6fccb9dbf17..867aefa7a5cf 100644 --- a/src/test/frontend/nodelist/nodecard_component_test.js +++ b/src/test/frontend/nodelist/nodecard_component_test.js @@ -86,6 +86,7 @@ describe('Node card', () => { }); it('should format the "created at" tooltip correctly', () => { - expect(ctrl.getCreatedAtTooltip('2016-06-06T09:13:12Z')).toMatch('Created at 6/[56]/16.*'); + expect(ctrl.getCreatedAtTooltip('2016-06-06T09:13:12Z')) + .toMatch('Created at 2016-06-06T09:13.*'); }); }); diff --git a/src/test/frontend/persistentvolumeclaimlist/persistentvolumeclaimcard_component_test.js b/src/test/frontend/persistentvolumeclaimlist/persistentvolumeclaimcard_component_test.js index d63733fe882e..37253e469f98 100644 --- a/src/test/frontend/persistentvolumeclaimlist/persistentvolumeclaimcard_component_test.js +++ b/src/test/frontend/persistentvolumeclaimlist/persistentvolumeclaimcard_component_test.js @@ -81,6 +81,7 @@ describe('Persistent Volume Claim card', () => { }); it('should format the "created at" tooltip correctly', () => { - expect(ctrl.getCreatedAtTooltip('2016-06-06T09:13:12Z')).toMatch('Created at 6/6/16.*'); + expect(ctrl.getCreatedAtTooltip('2016-06-06T09:13:12Z')) + .toMatch('Created at 2016-06-06T09:13.*'); }); }); diff --git a/src/test/frontend/persistentvolumelist/persistentvolumecard_component_test.js b/src/test/frontend/persistentvolumelist/persistentvolumecard_component_test.js index 0d93bea9972c..27ab92d24cd3 100644 --- a/src/test/frontend/persistentvolumelist/persistentvolumecard_component_test.js +++ b/src/test/frontend/persistentvolumelist/persistentvolumecard_component_test.js @@ -36,6 +36,7 @@ describe('Persistent Volume card', () => { }); it('should format the "created at" tooltip correctly', () => { - expect(ctrl.getCreatedAtTooltip('2016-06-06T09:13:12Z')).toMatch('Created at 6/6/16.*'); + expect(ctrl.getCreatedAtTooltip('2016-06-06T09:13:12Z')) + .toMatch('Created at 2016-06-06T09:13.*'); }); }); diff --git a/src/test/frontend/replicasetlist/replicasetcard_component_test.js b/src/test/frontend/replicasetlist/replicasetcard_component_test.js index 034f806f7bc2..820dd1a83258 100644 --- a/src/test/frontend/replicasetlist/replicasetcard_component_test.js +++ b/src/test/frontend/replicasetlist/replicasetcard_component_test.js @@ -120,6 +120,7 @@ describe('Replica Set card', () => { }); it('should format the "created at" tooltip correctly', () => { - expect(ctrl.getCreatedAtTooltip('2016-06-06T09:13:12Z')).toMatch('Created at 6/[56]/16.*'); + expect(ctrl.getCreatedAtTooltip('2016-06-06T09:13:12Z')) + .toMatch('Created at 2016-06-06T09:13.*'); }); }); diff --git a/src/test/frontend/replicationcontrollerlist/replicationcontrollercard_component_test.js b/src/test/frontend/replicationcontrollerlist/replicationcontrollercard_component_test.js index c8da77829551..70551de192b8 100644 --- a/src/test/frontend/replicationcontrollerlist/replicationcontrollercard_component_test.js +++ b/src/test/frontend/replicationcontrollerlist/replicationcontrollercard_component_test.js @@ -122,6 +122,7 @@ describe('Replication controller card', () => { }); it('should format the "created at" tooltip correctly', () => { - expect(ctrl.getCreatedAtTooltip('2016-06-06T09:13:12Z')).toMatch('Created at 6/[56]/16.*'); + expect(ctrl.getCreatedAtTooltip('2016-06-06T09:13:12Z')) + .toMatch('Created at 2016-06-06T09:13.*'); }); }); diff --git a/src/test/frontend/secretlist/card_component_test.js b/src/test/frontend/secretlist/card_component_test.js index 0bac3683bd0e..f33ca5e43ca6 100644 --- a/src/test/frontend/secretlist/card_component_test.js +++ b/src/test/frontend/secretlist/card_component_test.js @@ -35,6 +35,7 @@ describe('Secret card', () => { }); it('should format the "secret start date" tooltip correctly', () => { - expect(ctrl.getStartedAtTooltip('2016-06-06T09:13:12Z')).toBe('Created at 6/6/16 09:13 UTC'); + expect(ctrl.getStartedAtTooltip('2016-06-06T09:13:12Z')) + .toBe('Created at 2016-06-06T09:13 UTC'); }); }); diff --git a/src/test/frontend/statefulsetlist/statefulsetcard_component_test.js b/src/test/frontend/statefulsetlist/statefulsetcard_component_test.js index e89aae48b52a..8334568ed1c3 100644 --- a/src/test/frontend/statefulsetlist/statefulsetcard_component_test.js +++ b/src/test/frontend/statefulsetlist/statefulsetcard_component_test.js @@ -107,6 +107,7 @@ describe('Stateful Set card', () => { }); it('should format the "created at" tooltip correctly', () => { - expect(ctrl.getCreatedAtTooltip('2016-06-06T09:13:12Z')).toMatch('Created at 6/[56]/16.*'); + expect(ctrl.getCreatedAtTooltip('2016-06-06T09:13:12Z')) + .toMatch('Created at 2016-06-06T09:13.*'); }); });