From 80da49d804ced0fad8a4ab112f8dc69762b28bd4 Mon Sep 17 00:00:00 2001
From: Luciano Marcos Pierdona Junior
 <64279791+LucianoPierdona@users.noreply.github.com>
Date: Thu, 26 Jan 2023 14:53:19 -0300
Subject: [PATCH] Chore: Remove OS version for device management (#27786)

---
 .../DeviceManagementAccountRow.tsx                        | 4 +---
 .../DeviceManagementAccountTable.tsx                      | 1 -
 .../DeviceManagementAdminRow.tsx                          | 4 +---
 .../DeviceManagementAdminTable.tsx                        | 1 -
 apps/meteor/ee/server/lib/deviceManagement/session.ts     | 8 ++++----
 5 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/apps/meteor/ee/client/views/account/deviceManagement/DeviceManagementAccountTable/DeviceManagementAccountRow.tsx b/apps/meteor/ee/client/views/account/deviceManagement/DeviceManagementAccountTable/DeviceManagementAccountRow.tsx
index f0246e7bd98..a581658f68c 100644
--- a/apps/meteor/ee/client/views/account/deviceManagement/DeviceManagementAccountTable/DeviceManagementAccountRow.tsx
+++ b/apps/meteor/ee/client/views/account/deviceManagement/DeviceManagementAccountTable/DeviceManagementAccountRow.tsx
@@ -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'>
diff --git a/apps/meteor/ee/client/views/account/deviceManagement/DeviceManagementAccountTable/DeviceManagementAccountTable.tsx b/apps/meteor/ee/client/views/account/deviceManagement/DeviceManagementAccountTable/DeviceManagementAccountTable.tsx
index aaa2c04fc2f..b3f5fde3091 100644
--- a/apps/meteor/ee/client/views/account/deviceManagement/DeviceManagementAccountTable/DeviceManagementAccountTable.tsx
+++ b/apps/meteor/ee/client/views/account/deviceManagement/DeviceManagementAccountTable/DeviceManagementAccountTable.tsx
@@ -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}
 				/>
diff --git a/apps/meteor/ee/client/views/admin/deviceManagement/DeviceManagementAdminTable/DeviceManagementAdminRow.tsx b/apps/meteor/ee/client/views/admin/deviceManagement/DeviceManagementAdminTable/DeviceManagementAdminRow.tsx
index 4a600283f1b..d68cf21315a 100644
--- a/apps/meteor/ee/client/views/admin/deviceManagement/DeviceManagementAdminTable/DeviceManagementAdminRow.tsx
+++ b/apps/meteor/ee/client/views/admin/deviceManagement/DeviceManagementAdminTable/DeviceManagementAdminRow.tsx
@@ -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>}
diff --git a/apps/meteor/ee/client/views/admin/deviceManagement/DeviceManagementAdminTable/DeviceManagementAdminTable.tsx b/apps/meteor/ee/client/views/admin/deviceManagement/DeviceManagementAdminTable/DeviceManagementAdminTable.tsx
index 0218b41f7a6..c9e94518cf0 100644
--- a/apps/meteor/ee/client/views/admin/deviceManagement/DeviceManagementAdminTable/DeviceManagementAdminTable.tsx
+++ b/apps/meteor/ee/client/views/admin/deviceManagement/DeviceManagementAdminTable/DeviceManagementAdminTable.tsx
@@ -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}
 					/>
diff --git a/apps/meteor/ee/server/lib/deviceManagement/session.ts b/apps/meteor/ee/server/lib/deviceManagement/session.ts
index cfd3488bce1..363f099c976 100644
--- a/apps/meteor/ee/server/lib/deviceManagement/session.ts
+++ b/apps/meteor/ee/server/lib/deviceManagement/session.ts
@@ -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: