Chore: Remove OS version for device management (#27786)

pull/27789/head
Luciano Marcos Pierdona Junior 3 years ago committed by GitHub
parent 3cfa0b985c
commit 80da49d804
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      apps/meteor/ee/client/views/account/deviceManagement/DeviceManagementAccountTable/DeviceManagementAccountRow.tsx
  2. 1
      apps/meteor/ee/client/views/account/deviceManagement/DeviceManagementAccountTable/DeviceManagementAccountTable.tsx
  3. 4
      apps/meteor/ee/client/views/admin/deviceManagement/DeviceManagementAdminTable/DeviceManagementAdminRow.tsx
  4. 1
      apps/meteor/ee/client/views/admin/deviceManagement/DeviceManagementAdminTable/DeviceManagementAdminTable.tsx
  5. 8
      apps/meteor/ee/server/lib/deviceManagement/session.ts

@ -13,7 +13,6 @@ type DevicesRowProps = {
deviceName?: string;
deviceType?: string;
deviceOSName?: string;
deviceOSVersion?: string;
loginAt: string;
onReload: () => void;
};
@ -23,7 +22,6 @@ const DeviceManagementAccountRow = ({
deviceName,
deviceType = 'browser',
deviceOSName,
deviceOSVersion,
loginAt,
onReload,
}: DevicesRowProps): ReactElement => {
@ -41,7 +39,7 @@ const DeviceManagementAccountRow = ({
{deviceName && <Box withTruncatedText>{deviceName}</Box>}
</Box>
</TableCell>
<TableCell>{`${deviceOSName || ''} ${deviceOSVersion || ''}`}</TableCell>
<TableCell>{deviceOSName || ''}</TableCell>
<TableCell>{formatDateAndTime(loginAt)}</TableCell>
{mediaQuery && <TableCell>{_id}</TableCell>}
<TableCell align='end'>

@ -65,7 +65,6 @@ const DeviceManagementAccountTable = (): ReactElement => {
deviceName={session.device?.name}
deviceType={session.device?.type}
deviceOSName={session.device?.os.name}
deviceOSVersion={session.device?.os.version}
loginAt={session.loginAt}
onReload={reload}
/>

@ -15,7 +15,6 @@ type DeviceRowProps = {
deviceName?: string;
deviceType?: string;
deviceOSName?: string;
deviceOSVersion?: string;
loginAt: string;
onReload: () => void;
};
@ -27,7 +26,6 @@ const DeviceManagementAdminRow = ({
deviceName,
deviceType = 'browser',
deviceOSName = '',
deviceOSVersion = '',
loginAt,
onReload,
}: DeviceRowProps): ReactElement => {
@ -70,7 +68,7 @@ const DeviceManagementAdminRow = ({
{deviceName && <Box withTruncatedText>{deviceName}</Box>}
</Box>
</TableCell>
<TableCell>{`${deviceOSName} ${deviceOSVersion}`}</TableCell>
<TableCell>{deviceOSName}</TableCell>
<TableCell withTruncatedText>{username}</TableCell>
{mediaQuery && <TableCell>{formatDateAndTime(loginAt)}</TableCell>}
{mediaQuery && <TableCell withTruncatedText>{_id}</TableCell>}

@ -91,7 +91,6 @@ const DeviceManagementAdminTable = ({ reloadRef }: { reloadRef: MutableRefObject
deviceName={session?.device?.name}
deviceType={session?.device?.type}
deviceOSName={session?.device?.os?.name}
deviceOSVersion={session?.device?.os?.version}
loginAt={session.loginAt}
onReload={reload}
/>

@ -52,7 +52,7 @@ export const listenSessionLogin = async (): Promise<void> => {
name,
username,
browserInfo: `${browser.name} ${browser.version}`,
osInfo: `${os.name} ${os.version || ''}`,
osInfo: `${os.name}`,
deviceInfo: `${device.type || t('Device_Management_Device_Unknown')} ${device.vendor || ''} ${device.model || ''} ${
cpu.architecture || ''
}`,
@ -65,17 +65,17 @@ export const listenSessionLogin = async (): Promise<void> => {
case 'tablet':
case 'smarttv':
mailData.browserInfo = `${browser.name} ${browser.version}`;
mailData.osInfo = `${os.name} ${os.version || ''}`;
mailData.osInfo = `${os.name}`;
mailData.deviceInfo = `${device.type} ${device.vendor || ''} ${device.model || ''} ${cpu.architecture || ''}`;
break;
case 'mobile-app':
mailData.browserInfo = `Rocket.Chat App ${app?.bundle || app?.version}`;
mailData.osInfo = `${os.name} ${os.version || ''}`;
mailData.osInfo = `${os.name}`;
mailData.deviceInfo = 'Mobile App';
break;
case 'desktop-app':
mailData.browserInfo = `Rocket.Chat ${app?.name || browser.name} ${app?.bundle || app?.version || browser.version}`;
mailData.osInfo = `${os.name} ${os.version || ''}`;
mailData.osInfo = `${os.name}`;
mailData.deviceInfo = `Desktop App ${cpu.architecture || ''}`;
break;
default:

Loading…
Cancel
Save