Device manager - other sessions list (PSG-637) (#9155)
* add session manager tab to user settings * fussy import ordering * i18n * basic sorted list outline * rename to filtered device list * exclude current device session from other sessions list * test other sessions section
This commit is contained in:
parent
09aade2907
commit
0be622e7f0
8 changed files with 193 additions and 4 deletions
53
src/components/views/settings/devices/FilteredDeviceList.tsx
Normal file
53
src/components/views/settings/devices/FilteredDeviceList.tsx
Normal file
|
@ -0,0 +1,53 @@
|
|||
/*
|
||||
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 from 'react';
|
||||
|
||||
import DeviceTile from './DeviceTile';
|
||||
import { DevicesDictionary, DeviceWithVerification } from './useOwnDevices';
|
||||
|
||||
interface Props {
|
||||
devices: DevicesDictionary;
|
||||
}
|
||||
|
||||
// devices without timestamp metadata should be sorted last
|
||||
const sortDevicesByLatestActivity = (left: DeviceWithVerification, right: DeviceWithVerification) =>
|
||||
(right.last_seen_ts || 0) - (left.last_seen_ts || 0);
|
||||
|
||||
const getSortedDevices = (devices: DevicesDictionary) =>
|
||||
Object.values(devices).sort(sortDevicesByLatestActivity);
|
||||
|
||||
/**
|
||||
* Filtered list of devices
|
||||
* Sorted by latest activity descending
|
||||
* TODO(kerrya) Filtering to added as part of PSG-648
|
||||
*/
|
||||
const FilteredDeviceList: React.FC<Props> = ({ devices }) => {
|
||||
const sortedDevices = getSortedDevices(devices);
|
||||
|
||||
return <ol className='mx_FilteredDeviceList'>
|
||||
{ sortedDevices.map((device) =>
|
||||
<li key={device.device_id}>
|
||||
<DeviceTile
|
||||
device={device}
|
||||
/>
|
||||
</li>,
|
||||
|
||||
) }
|
||||
</ol>;
|
||||
};
|
||||
|
||||
export default FilteredDeviceList;
|
|
@ -60,8 +60,9 @@ export enum OwnDevicesError {
|
|||
Unsupported = 'Unsupported',
|
||||
Default = 'Default',
|
||||
}
|
||||
export type DevicesDictionary = Record<DeviceWithVerification['device_id'], DeviceWithVerification>;
|
||||
type DevicesState = {
|
||||
devices: Record<DeviceWithVerification['device_id'], DeviceWithVerification>;
|
||||
devices: DevicesDictionary;
|
||||
currentDeviceId: string;
|
||||
isLoading: boolean;
|
||||
error?: OwnDevicesError;
|
||||
|
|
|
@ -22,11 +22,14 @@ import { useOwnDevices } from '../../devices/useOwnDevices';
|
|||
import DeviceTile from '../../devices/DeviceTile';
|
||||
import SettingsSubsection from '../../shared/SettingsSubsection';
|
||||
import SettingsTab from '../SettingsTab';
|
||||
import FilteredDeviceList from '../../devices/FilteredDeviceList';
|
||||
|
||||
const SessionManagerTab: React.FC = () => {
|
||||
const { devices, currentDeviceId, isLoading } = useOwnDevices();
|
||||
|
||||
const currentDevice = devices[currentDeviceId];
|
||||
const { [currentDeviceId]: currentDevice, ...otherDevices } = devices;
|
||||
const shouldShowOtherSessions = Object.keys(otherDevices).length > 0;
|
||||
|
||||
return <SettingsTab heading={_t('Sessions')}>
|
||||
<SettingsSubsection
|
||||
heading={_t('Current session')}
|
||||
|
@ -37,6 +40,19 @@ const SessionManagerTab: React.FC = () => {
|
|||
device={currentDevice}
|
||||
/> }
|
||||
</SettingsSubsection>
|
||||
{
|
||||
shouldShowOtherSessions &&
|
||||
<SettingsSubsection
|
||||
heading={_t('Other sessions')}
|
||||
description={_t(
|
||||
`For best security, verify your sessions and sign out ` +
|
||||
`from any session that you don't recognize or use anymore.`,
|
||||
)}
|
||||
data-testid='other-sessions-section'
|
||||
>
|
||||
<FilteredDeviceList devices={otherDevices} />
|
||||
</SettingsSubsection>
|
||||
}
|
||||
</SettingsTab>;
|
||||
};
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue