Skip to content
This repository was archived by the owner on Sep 11, 2024. It is now read-only.

Make device ID copyable in device list #9297

Merged
duxovni merged 3 commits into from
Sep 23, 2022
Merged

Make device ID copyable in device list #9297

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
23301d2
Make device ID copyable in device list
duxovni Sep 20, 2022
ecd0972
Merge branch 'develop' into fayed/device_id
duxovni Sep 20, 2022
362d70c
Merge branch 'develop' into fayed/device_id
duxovni Sep 21, 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
15 changes: 2 additions & 13 deletions src/components/views/settings/devices/DeviceTile.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@ import React, { Fragment } from "react";
import { Icon as InactiveIcon } from '../../../../../res/img/element-icons/settings/inactive.svg';
import { _t } from "../../../../languageHandler";
import { formatDate, formatRelativeTime } from "../../../../DateUtils";
import TooltipTarget from "../../elements/TooltipTarget";
import { Alignment } from "../../elements/Tooltip";
import Heading from "../../typography/Heading";
import { INACTIVE_DEVICE_AGE_DAYS, isDeviceInactive } from "./filter";
import { DeviceWithVerification } from "./types";
Expand All @@ -32,18 +30,8 @@ export interface DeviceTileProps {
}

const DeviceTileName: React.FC<{ device: DeviceWithVerification }> = ({ device }) => {
if (device.display_name) {
return <TooltipTarget
alignment={Alignment.Top}
label={`${device.display_name} (${device.device_id})`}
>
<Heading size='h4'>
{ device.display_name }
</Heading>
</TooltipTarget>;
}
return <Heading size='h4'>
{ device.device_id }
{ device.display_name || device.device_id }
</Heading>;
};

Expand Down Expand Up @@ -91,6 +79,7 @@ const DeviceTile: React.FC<DeviceTileProps> = ({ device, children, onClick }) =>
{ id: 'isVerified', value: verificationStatus },
{ id: 'lastActivity', value: lastActivity },
{ id: 'lastSeenIp', value: device.last_seen_ip },
{ id: 'deviceId', value: device.device_id },
];

return <div className="mx_DeviceTile" data-testid={`device-tile-${device.device_id}`}>
Expand Down
18 changes: 18 additions & 0 deletions test/components/views/settings/__snapshots__/DevicesPanel-test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,12 @@ exports[`<DevicesPanel /> renders device panel with devices 1`] = `
>
Unverified
</span>
·
<span
data-testid="device-metadata-deviceId"
>
device_1
</span>
</div>
</div>
<div
Expand Down Expand Up @@ -257,6 +263,12 @@ exports[`<DevicesPanel /> renders device panel with devices 1`] = `
>
Unverified
</span>
·
<span
data-testid="device-metadata-deviceId"
>
device_2
</span>
</div>
</div>
<div
Expand Down Expand Up @@ -332,6 +344,12 @@ exports[`<DevicesPanel /> renders device panel with devices 1`] = `
>
Unverified
</span>
·
<span
data-testid="device-metadata-deviceId"
>
device_3
</span>
</div>
</div>
<div
Expand Down
12 changes: 12 additions & 0 deletions test/components/views/settings/devices/__snapshots__/CurrentDeviceSection-test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,12 @@ exports[`<CurrentDeviceSection /> renders device and correct security card when
>
Unverified
</span>
·
<span
data-testid="device-metadata-deviceId"
>
alices_device
</span>
</div>
</div>
<div
Expand Down Expand Up @@ -322,6 +328,12 @@ exports[`<CurrentDeviceSection /> renders device and correct security card when
>
Unverified
</span>
·
<span
data-testid="device-metadata-deviceId"
>
alices_device
</span>
</div>
</div>
<div
Expand Down
36 changes: 28 additions & 8 deletions test/components/views/settings/devices/__snapshots__/DeviceTile-test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,12 @@ exports[`<DeviceTile /> renders a device with no metadata 1`] = `
>
Unverified
</span>
·
<span
data-testid="device-metadata-deviceId"
>
123
</span>
</div>
</div>
<div
Expand Down Expand Up @@ -81,6 +87,12 @@ exports[`<DeviceTile /> renders a verified device with no metadata 1`] = `
>
Unverified
</span>
·
<span
data-testid="device-metadata-deviceId"
>
123
</span>
</div>
</div>
<div
Expand Down Expand Up @@ -113,15 +125,11 @@ exports[`<DeviceTile /> renders display name with a tooltip 1`] = `
<div
class="mx_DeviceTile_info"
>
<div
tabindex="0"
<h4
class="mx_Heading_h4"
>
<h4
class="mx_Heading_h4"
>
My device
</h4>
</div>
My device
</h4>
<div
class="mx_DeviceTile_metadata"
>
Expand All @@ -130,6 +138,12 @@ exports[`<DeviceTile /> renders display name with a tooltip 1`] = `
>
Unverified
</span>
·
<span
data-testid="device-metadata-deviceId"
>
123
</span>
</div>
</div>
<div
Expand Down Expand Up @@ -187,6 +201,12 @@ exports[`<DeviceTile /> separates metadata with a dot 1`] = `
>
1.2.3.4
</span>
·
<span
data-testid="device-metadata-deviceId"
>
123
</span>
</div>
</div>
<div
Expand Down
18 changes: 10 additions & 8 deletions test/components/views/settings/devices/__snapshots__/SelectableDeviceTile-test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,15 +53,11 @@ exports[`<SelectableDeviceTile /> renders unselected device tile with checkbox 1
<div
class="mx_DeviceTile_info"
>
<div
tabindex="0"
<h4
class="mx_Heading_h4"
>
<h4
class="mx_Heading_h4"
>
My Device
</h4>
</div>
My Device
</h4>
<div
class="mx_DeviceTile_metadata"
>
Expand All @@ -76,6 +72,12 @@ exports[`<SelectableDeviceTile /> renders unselected device tile with checkbox 1
>
123.456.789
</span>
·
<span
data-testid="device-metadata-deviceId"
>
my-device
</span>
</div>
</div>
<div
Expand Down
54 changes: 30 additions & 24 deletions test/components/views/settings/tabs/user/__snapshots__/SessionManagerTab-test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,15 +85,11 @@ exports[`<SessionManagerTab /> renders current session section with a verified s
<div
class="mx_DeviceTile_info"
>
<div
tabindex="0"
<h4
class="mx_Heading_h4"
>
<h4
class="mx_Heading_h4"
>
Alices device
</h4>
</div>
Alices device
</h4>
<div
class="mx_DeviceTile_metadata"
>
Expand All @@ -102,6 +98,12 @@ exports[`<SessionManagerTab /> renders current session section with a verified s
>
Verified
</span>
·
<span
data-testid="device-metadata-deviceId"
>
alices_device
</span>
</div>
</div>
<div
Expand Down Expand Up @@ -185,15 +187,11 @@ exports[`<SessionManagerTab /> renders current session section with an unverifie
<div
class="mx_DeviceTile_info"
>
<div
tabindex="0"
<h4
class="mx_Heading_h4"
>
<h4
class="mx_Heading_h4"
>
Alices device
</h4>
</div>
Alices device
</h4>
<div
class="mx_DeviceTile_metadata"
>
Expand All @@ -202,6 +200,12 @@ exports[`<SessionManagerTab /> renders current session section with an unverifie
>
Unverified
</span>
·
<span
data-testid="device-metadata-deviceId"
>
alices_device
</span>
</div>
</div>
<div
Expand Down Expand Up @@ -285,15 +289,11 @@ exports[`<SessionManagerTab /> sets device verification status correctly 1`] = `
<div
class="mx_DeviceTile_info"
>
<div
tabindex="0"
<h4
class="mx_Heading_h4"
>
<h4
class="mx_Heading_h4"
>
Alices device
</h4>
</div>
Alices device
</h4>
<div
class="mx_DeviceTile_metadata"
>
Expand All @@ -302,6 +302,12 @@ exports[`<SessionManagerTab /> sets device verification status correctly 1`] = `
>
Verified
</span>
·
<span
data-testid="device-metadata-deviceId"
>
alices_device
</span>
</div>
</div>
<div
Expand Down