Skip to content

Commit

Permalink
feat(gui): aligned notions of "latest device activity" in listing & d…
Browse files Browse the repository at this point in the history
…etails

Ticket: None
Changelog: Title
Signed-off-by: Manuel Zedel <manuel.zedel@northern.tech>
  • Loading branch information
mzedel committed Jan 7, 2025
1 parent b176d13 commit 40ee57d
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 11 deletions.
8 changes: 3 additions & 5 deletions frontend/src/js/components/devices/ExpandedDevice.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import React, { useCallback, useEffect, useRef } from 'react';
import { useDispatch, useSelector } from 'react-redux';
import { useNavigate } from 'react-router-dom';

import { Chip, Divider, Drawer, Tab, Tabs, Tooltip, chipClasses } from '@mui/material';
import { Chip, Divider, Drawer, Tab, Tabs, chipClasses } from '@mui/material';
import { makeStyles } from 'tss-react/mui';

import DeviceIdentityDisplay from '@northern.tech/common-ui/DeviceIdentity';
Expand Down Expand Up @@ -291,10 +291,8 @@ export const ExpandedDevice = ({ actionCallbacks, deviceId, onClose, setDetailsT
<GatewayConnectionNotification gatewayDevices={gatewayIds.map(gatewayId => devicesById[gatewayId])} onClick={scrollToDeviceSystem} />
)}
<div className={`${isOffline ? 'red' : 'muted'} margin-left margin-right flexbox`}>
<Tooltip title="The last time the device communicated with the Mender server" placement="bottom">
<div className="margin-right-small">Last check-in:</div>
</Tooltip>
<RelativeTime updateTime={device.check_in_time_exact ?? device.check_in_time} />
<div className="margin-right-small">Latest activity:</div>
<RelativeTime updateTime={device.check_in_time} />
</div>
</>
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2153,21 +2153,19 @@ label+.emotion-52 {
class="muted margin-left margin-right flexbox"
>
<div
aria-label="The last time the device communicated with the Mender server"
class="margin-right-small"
data-mui-internal-clone-element="true"
>
Last check-in:
Latest activity:
</div>
<span
aria-label="Tue Jan 01 2019 10:25:00 GMT+0000"
aria-label="Tue Jan 01 2019 09:25:00 GMT+0000"
class=""
data-mui-internal-clone-element="true"
>
<time
datetime="2019-01-01T10:25:00+00:00"
datetime="2019-01-01T09:25:00+00:00"
>
2019-01-01 10:25
2019-01-01 09:25
</time>
</span>
</div>
Expand Down

0 comments on commit 40ee57d

Please sign in to comment.