Skip to content

fix: add more info to creationtime format #10493

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
crenshaw-dev merged 3 commits into from
Sep 9, 2022
Merged

fix: add more info to creationtime format #10493

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e80913a
fix: add more info to creationtime format
ashutosh16 Aug 22, 2022
6b4c2d3
lint issue
ashutosh16 Sep 2, 2022
dc7059a
fix: add more info to creationtime format
ashutosh16 Sep 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions ui/src/app/applications/components/application-node-info/application-node-info.tsx
View file
Open in desktop
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
10 changes: 3 additions & 7 deletions ui/src/app/applications/components/application-summary/application-summary.tsx
View file
Open in desktop
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
View file
Open in desktop
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>
);
}