Device manager - New device tile info design (#9122)(PSG-637)
* redesign device tile info * test DeviceTile except for broken date mocking * mock dates the nice way, test lastactivity in device tile * tweak spacing style * update comment style in rethemendex * i18n
This commit is contained in:
parent
7eaed1a3f8
commit
94f3168ab8
8 changed files with 334 additions and 35 deletions
87
src/components/views/settings/devices/DeviceTile.tsx
Normal file
87
src/components/views/settings/devices/DeviceTile.tsx
Normal file
|
@ -0,0 +1,87 @@
|
|||
/*
|
||||
Copyright 2022 The Matrix.org Foundation C.I.C.
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
import React, { Fragment } from "react";
|
||||
import { IMyDevice } from "matrix-js-sdk/src/matrix";
|
||||
|
||||
import { _t } from "../../../../languageHandler";
|
||||
import { formatDate, formatRelativeTime } from "../../../../DateUtils";
|
||||
import TooltipTarget from "../../elements/TooltipTarget";
|
||||
import { Alignment } from "../../elements/Tooltip";
|
||||
import Heading from "../../typography/Heading";
|
||||
|
||||
interface Props {
|
||||
device: IMyDevice;
|
||||
children?: React.ReactNode;
|
||||
}
|
||||
|
||||
const DeviceTileName: React.FC<{ device: IMyDevice }> = ({ device }) => {
|
||||
if (device.display_name) {
|
||||
return <TooltipTarget
|
||||
alignment={Alignment.Left}
|
||||
label={`${device.display_name} (${device.device_id})`}
|
||||
>
|
||||
<Heading size='h4'>
|
||||
{ device.display_name }
|
||||
</Heading>
|
||||
</TooltipTarget>;
|
||||
}
|
||||
return <Heading size='h4'>
|
||||
{ device.device_id }
|
||||
</Heading>;
|
||||
};
|
||||
|
||||
const MS_6_DAYS = 6 * 24 * 60 * 60 * 1000;
|
||||
const formatLastActivity = (timestamp: number, now = new Date().getTime()): string => {
|
||||
// less than a week ago
|
||||
if (timestamp + MS_6_DAYS >= now) {
|
||||
const date = new Date(timestamp);
|
||||
// Tue 20:15
|
||||
return formatDate(date);
|
||||
}
|
||||
return formatRelativeTime(new Date(timestamp));
|
||||
};
|
||||
|
||||
const DeviceMetadata: React.FC<{ value: string, id: string }> = ({ value, id }) => (
|
||||
value ? <span data-testid={`device-metadata-${id}`}>{ value }</span> : null
|
||||
);
|
||||
|
||||
const DeviceTile: React.FC<Props> = ({ device, children }) => {
|
||||
const lastActivity = device.last_seen_ts && `${_t('Last activity')} ${formatLastActivity(device.last_seen_ts)}`;
|
||||
const metadata = [
|
||||
{ id: 'lastActivity', value: lastActivity },
|
||||
{ id: 'lastSeenIp', value: device.last_seen_ip },
|
||||
];
|
||||
|
||||
return <div className="mx_DeviceTile">
|
||||
<div className="mx_DeviceTile_info">
|
||||
<DeviceTileName device={device} />
|
||||
<div className="mx_DeviceTile_metadata">
|
||||
{ metadata.map(({ id, value }, index) =>
|
||||
<Fragment key={id}>
|
||||
{ !!index && ' · ' }
|
||||
<DeviceMetadata id={id} value={value} />
|
||||
</Fragment>,
|
||||
) }
|
||||
</div>
|
||||
</div>
|
||||
<div className="mx_DeviceTile_actions">
|
||||
{ children }
|
||||
</div>
|
||||
</div>;
|
||||
};
|
||||
|
||||
export default DeviceTile;
|
Loading…
Add table
Add a link
Reference in a new issue