Skip to content

Commit

Permalink
fix: add more info to creationtime format (#10286) (#10493)
Browse files Browse the repository at this point in the history
* fix: add more info to  creationtime format

Signed-off-by: Ashutosh <mail.ashutosh8@gmail.com>

* lint issue

Signed-off-by: ashutosh16 <mail.ashutosh8@gmail.com>

* fix: add more info to creationtime format

Signed-off-by: ashutosh16 <11219262+ashutosh16@users.noreply.github.com>

Signed-off-by: Ashutosh <mail.ashutosh8@gmail.com>
Signed-off-by: ashutosh16 <mail.ashutosh8@gmail.com>
Signed-off-by: ashutosh16 <11219262+ashutosh16@users.noreply.github.com>
Co-authored-by: Ashutosh <mail.ashutosh8@gmail.com>
  • Loading branch information
ashutosh16 and Ashutosh committed Sep 9, 2022
1 parent ed9cddb commit 9fac0f6
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {YamlEditor} from '../../../shared/components';
import * as models from '../../../shared/models';
import {services} from '../../../shared/services';
import {ApplicationResourcesDiff} from '../application-resources-diff/application-resources-diff';
import {ComparisonStatusIcon, getPodStateReason, HealthStatusIcon} from '../utils';
import {ComparisonStatusIcon, formatCreationTimestamp, getPodStateReason, HealthStatusIcon} from '../utils';

require('./application-node-info.scss');

Expand All @@ -25,10 +25,7 @@ export const ApplicationNodeInfo = (props: {
if (props.node.createdAt) {
attributes.push({
title: 'CREATED_AT',
value: moment
.utc(props.node.createdAt)
.local()
.format('MM/DD/YYYY HH:mm:ss')
value: formatCreationTimestamp(props.node.createdAt)
});
}
if ((props.node.images || []).length) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,9 @@ import {Consumer, ContextApis} from '../../../shared/context';
import * as models from '../../../shared/models';
import {services} from '../../../shared/services';

import * as moment from 'moment';
import {ApplicationSyncOptionsField, REPLACE_WARNING} from '../application-sync-options/application-sync-options';
import {ApplicationSyncOptionsField} from '../application-sync-options/application-sync-options';
import {RevisionFormField} from '../revision-form-field/revision-form-field';
import {ComparisonStatusIcon, HealthStatusIcon, syncStatusMessage, urlPattern} from '../utils';
import {ComparisonStatusIcon, HealthStatusIcon, syncStatusMessage, urlPattern, formatCreationTimestamp} from '../utils';
import {ApplicationRetryOptions} from '../application-retry-options/application-retry-options';
import {ApplicationRetryView} from '../application-retry-view/application-retry-view';
import {Link} from 'react-router-dom';
Expand Down Expand Up @@ -137,10 +136,7 @@ export const ApplicationSummary = (props: {app: models.Application; updateApp: (
},
{
title: 'CREATED_AT',
view: moment
.utc(app.metadata.creationTimestamp)
.local()
.format('MM/DD/YYYY HH:mm:ss')
view: formatCreationTimestamp(app.metadata.creationTimestamp)
},
{
title: 'REPO URL',
Expand Down
17 changes: 17 additions & 0 deletions ui/src/app/applications/components/utils.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -1120,3 +1120,20 @@ export function appQualifiedName(app: appModels.Application): string {
export function appInstanceName(app: appModels.Application): string {
return app.metadata.namespace + '_' + app.metadata.name;
}

export function formatCreationTimestamp(creationTimestamp: string) {
const createdAt = moment
.utc(creationTimestamp)
.local()
.format('MM/DD/YYYY HH:mm:ss');
const fromNow = moment
.utc(creationTimestamp)
.local()
.fromNow();
return (
<span>
{createdAt}
<i style={{padding: '2px'}} /> ({fromNow})
</span>
);
}

0 comments on commit 9fac0f6

Please sign in to comment.