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

Device manager - filter out nulled metadatas in device tile properly (PSG-703) #9251

Merged
merged 5 commits into from
Sep 12, 2022
Merged

Device manager - filter out nulled metadatas in device tile properly (PSG-703) #9251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8e6b4ef
filter out nulled metadatas in device tile properly
Sep 6, 2022
0cadf19
remove log
Sep 6, 2022
3e3cc71
Merge branch 'develop' into psg-703/device-man-missing-metadata
Sep 8, 2022
ddeebec
Merge branch 'develop' into psg-703/device-man-missing-metadata
Sep 9, 2022
a724f3d
Merge branch 'develop' into psg-703/device-man-missing-metadata
Sep 12, 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
10 changes: 6 additions & 4 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 @@ -99,10 +99,12 @@ const DeviceTile: React.FC<DeviceTileProps> = ({ device, children, onClick }) =>
<DeviceTileName device={device} />
<div className="mx_DeviceTile_metadata">
{ metadata.map(({ id, value }, index) =>
<Fragment key={id}>
{ !!index && ' · ' }
<DeviceMetadata id={id} value={value} />
</Fragment>,
!!value
? <Fragment key={id}>
{ !!index && ' · ' }
<DeviceMetadata id={id} value={value} />
</Fragment>
: null,
) }
</div>
</div>
Expand Down
6 changes: 0 additions & 6 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,8 +141,6 @@ exports[`<DevicesPanel /> renders device panel with devices 1`] = `
>
Unverified
</span>
·
·
</div>
</div>
<div
Expand Down Expand Up @@ -259,8 +257,6 @@ exports[`<DevicesPanel /> renders device panel with devices 1`] = `
>
Unverified
</span>
·
·
</div>
</div>
<div
Expand Down Expand Up @@ -336,8 +332,6 @@ exports[`<DevicesPanel /> renders device panel with devices 1`] = `
>
Unverified
</span>
·
·
</div>
</div>
<div
Expand Down
4 changes: 0 additions & 4 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 @@ -171,8 +171,6 @@ exports[`<CurrentDeviceSection /> renders device and correct security card when
>
Unverified
</span>
·
·
</div>
</div>
<div
Expand Down Expand Up @@ -283,8 +281,6 @@ exports[`<CurrentDeviceSection /> renders device and correct security card when
>
Unverified
</span>
·
·
</div>
</div>
<div
Expand Down
6 changes: 0 additions & 6 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,8 +36,6 @@ exports[`<DeviceTile /> renders a device with no metadata 1`] = `
>
Unverified
</span>
·
·
</div>
</div>
<div
Expand Down Expand Up @@ -83,8 +81,6 @@ exports[`<DeviceTile /> renders a verified device with no metadata 1`] = `
>
Unverified
</span>
·
·
</div>
</div>
<div
Expand Down Expand Up @@ -134,8 +130,6 @@ exports[`<DeviceTile /> renders display name with a tooltip 1`] = `
>
Unverified
</span>
·
·
</div>
</div>
<div
Expand Down
1 change: 0 additions & 1 deletion 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 @@ -71,7 +71,6 @@ exports[`<SelectableDeviceTile /> renders unselected device tile with checkbox 1
Unverified
</span>
·
·
<span
data-testid="device-metadata-lastSeenIp"
>
Expand Down
6 changes: 0 additions & 6 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 @@ -83,8 +83,6 @@ exports[`<SessionManagerTab /> renders current session section with a verified s
>
Verified
</span>
·
·
</div>
</div>
<div
Expand Down Expand Up @@ -181,8 +179,6 @@ exports[`<SessionManagerTab /> renders current session section with an unverifie
>
Unverified
</span>
·
·
</div>
</div>
<div
Expand Down Expand Up @@ -279,8 +275,6 @@ exports[`<SessionManagerTab /> sets device verification status correctly 1`] = `
>
Verified
</span>
·
·
</div>
</div>
<div
Expand Down