diff --git a/frontend/src/component/application/application-edit-component.js b/frontend/src/component/application/application-edit-component.js index fbd815aa58..b502d72786 100644 --- a/frontend/src/component/application/application-edit-component.js +++ b/frontend/src/component/application/application-edit-component.js @@ -10,6 +10,7 @@ import { Switch, } from 'react-mdl'; import { HeaderTitle, ExternalIconLink, shorten } from '../common'; +import { formatFullDateTime } from '../common/util'; class StatefulTextfield extends Component { constructor (props) { @@ -121,7 +122,7 @@ class ClientApplications extends PureComponent { {clientIp} last seen at {new Date(lastSeen).toLocaleString('nb-NO')} + {clientIp} last seen at {formatFullDateTime(lastSeen)} }> {instanceId} diff --git a/frontend/src/component/common/util.js b/frontend/src/component/common/util.js new file mode 100644 index 0000000000..22e0da0117 --- /dev/null +++ b/frontend/src/component/common/util.js @@ -0,0 +1,3 @@ +const dateTimeOptions = { day: '2-digit', month: '2-digit', year: 'numeric', hour: '2-digit', minute: '2-digit', second: '2-digit' }; + +export const formatFullDateTime = v => new Date(v).toLocaleString('nb-NO', dateTimeOptions); diff --git a/frontend/src/component/feature/view-component.jsx b/frontend/src/component/feature/view-component.jsx index a645941fc1..9133a372d0 100644 --- a/frontend/src/component/feature/view-component.jsx +++ b/frontend/src/component/feature/view-component.jsx @@ -5,6 +5,7 @@ import { hashHistory, Link } from 'react-router'; import HistoryComponent from '../history/history-list-toggle-container'; import MetricComponent from './metric-container'; import EditFeatureToggle from './form-edit-container.jsx'; +import { formatFullDateTime } from '../common/util'; const TABS = { view: 0, @@ -80,7 +81,7 @@ export default class ViewFeatureToggleComponent extends React.Component {

{featureToggle.name} {featureToggle.enabled ? 'is enabled' : 'is disabled'} - Created {(new Date(featureToggle.createdAt)).toLocaleString('nb-NO')} + Created {formatFullDateTime(featureToggle.createdAt)}

{featureToggle.description}
diff --git a/frontend/src/component/history/history-list-component.jsx b/frontend/src/component/history/history-list-component.jsx index d88b2309a3..a39b70b69a 100644 --- a/frontend/src/component/history/history-list-component.jsx +++ b/frontend/src/component/history/history-list-component.jsx @@ -3,13 +3,10 @@ import HistoryItemDiff from './history-item-diff'; import HistoryItemJson from './history-item-json'; import { Table, TableHeader } from 'react-mdl'; import { HeaderTitle, SwitchWithLabel } from '../common'; +import { formatFullDateTime } from '../common/util'; import style from './history.scss'; -const dateOptions = { day: '2-digit', month: '2-digit', year: 'numeric', hour: '2-digit', minute: '2-digit', second: '2-digit' }; - -const formatDate = v => (new Date(v)).toLocaleString('nb-NO', dateOptions); - class HistoryList extends Component { toggleShowDiff () { @@ -40,7 +37,7 @@ class HistoryList extends Component { Type User Diff - Time + Time ); }