From 11155dce2579b113b78951166eec83008ca25ce5 Mon Sep 17 00:00:00 2001
From: Hugo Costa <hugocarreiracosta@gmail.com>
Date: Wed, 21 Jun 2023 13:33:43 -0300
Subject: [PATCH 1/2] chore": adding version info into table and contextual bar

---
 .../DeviceManagementAdminRow.tsx                           | 3 +++
 .../DeviceManagementAdminTable.tsx                         | 2 ++
 .../DeviceManagementInfo/DeviceManagementInfo.tsx          | 7 ++++++-
 3 files changed, 11 insertions(+), 1 deletion(-)

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 d68cf21315a9..27ba7b6dba00 100644
--- a/apps/meteor/ee/client/views/admin/deviceManagement/DeviceManagementAdminTable/DeviceManagementAdminRow.tsx
+++ b/apps/meteor/ee/client/views/admin/deviceManagement/DeviceManagementAdminTable/DeviceManagementAdminRow.tsx
@@ -16,6 +16,7 @@ type DeviceRowProps = {
 	deviceType?: string;
 	deviceOSName?: string;
 	loginAt: string;
+	rcVersion?: string;
 	onReload: () => void;
 };
 
@@ -27,6 +28,7 @@ const DeviceManagementAdminRow = ({
 	deviceType = 'browser',
 	deviceOSName = '',
 	loginAt,
+	rcVersion,
 	onReload,
 }: DeviceRowProps): ReactElement => {
 	const t = useTranslation();
@@ -68,6 +70,7 @@ const DeviceManagementAdminRow = ({
 					{deviceName && <Box withTruncatedText>{deviceName}</Box>}
 				</Box>
 			</TableCell>
+			<TableCell>{rcVersion || '—'}</TableCell>
 			<TableCell>{deviceOSName}</TableCell>
 			<TableCell withTruncatedText>{username}</TableCell>
 			{mediaQuery && <TableCell>{formatDateAndTime(loginAt)}</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 c9e94518cf08..db1c78f53ced 100644
--- a/apps/meteor/ee/client/views/admin/deviceManagement/DeviceManagementAdminTable/DeviceManagementAdminTable.tsx
+++ b/apps/meteor/ee/client/views/admin/deviceManagement/DeviceManagementAdminTable/DeviceManagementAdminTable.tsx
@@ -55,6 +55,7 @@ const DeviceManagementAdminTable = ({ reloadRef }: { reloadRef: MutableRefObject
 			<GenericTableHeaderCell key={'client'} direction={sortDirection} active={sortBy === 'client'} onClick={setSort} sort='client'>
 				{t('Client')}
 			</GenericTableHeaderCell>,
+			<GenericTableHeaderCell key={'rcVersion'}>{t('Version')}</GenericTableHeaderCell>,
 			<GenericTableHeaderCell key={'os'} direction={sortDirection} active={sortBy === 'os'} onClick={setSort} sort='os'>
 				{t('OS')}
 			</GenericTableHeaderCell>,
@@ -91,6 +92,7 @@ const DeviceManagementAdminTable = ({ reloadRef }: { reloadRef: MutableRefObject
 						deviceName={session?.device?.name}
 						deviceType={session?.device?.type}
 						deviceOSName={session?.device?.os?.name}
+						rcVersion={session?.device?.version}
 						loginAt={session.loginAt}
 						onReload={reload}
 					/>
diff --git a/apps/meteor/ee/client/views/admin/deviceManagement/DeviceManagementInfo/DeviceManagementInfo.tsx b/apps/meteor/ee/client/views/admin/deviceManagement/DeviceManagementInfo/DeviceManagementInfo.tsx
index 4065057ecea7..89f1af7132a1 100644
--- a/apps/meteor/ee/client/views/admin/deviceManagement/DeviceManagementInfo/DeviceManagementInfo.tsx
+++ b/apps/meteor/ee/client/views/admin/deviceManagement/DeviceManagementInfo/DeviceManagementInfo.tsx
@@ -29,7 +29,7 @@ const DeviceManagementInfo = ({ device, sessionId, loginAt, ip, userId, _user, o
 
 	const handleDeviceLogout = useDeviceLogout(sessionId, '/v1/sessions/logout');
 
-	const { name: clientName, os } = device || {};
+	const { name: clientName, os, version: rcVersion } = device || {};
 	const { username, name } = _user || {};
 	const userPresence = usePresence(userId);
 
@@ -48,6 +48,11 @@ const DeviceManagementInfo = ({ device, sessionId, loginAt, ip, userId, _user, o
 						<InfoPanel.Text>{clientName}</InfoPanel.Text>
 					</InfoPanel.Field>
 
+					<InfoPanel.Field>
+						<InfoPanel.Label>{t('Version')}</InfoPanel.Label>
+						<InfoPanel.Text>{rcVersion || '—'}</InfoPanel.Text>
+					</InfoPanel.Field>
+
 					<InfoPanel.Field>
 						<InfoPanel.Label>{t('OS')}</InfoPanel.Label>
 						<InfoPanel.Text>{`${os?.name || ''} ${os?.version || ''}`}</InfoPanel.Text>

From 04dd4b45406140687dc3b2875c93f34e1bc36ccf Mon Sep 17 00:00:00 2001
From: Hugo Costa <hugocarreiracosta@gmail.com>
Date: Mon, 26 Jun 2023 14:35:21 -0300
Subject: [PATCH 2/2] remove "-" fallback

---
 .../DeviceManagementAdminTable/DeviceManagementAdminRow.tsx     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 9ecc8f3714c0..200eb40686e4 100644
--- a/apps/meteor/ee/client/views/admin/deviceManagement/DeviceManagementAdminTable/DeviceManagementAdminRow.tsx
+++ b/apps/meteor/ee/client/views/admin/deviceManagement/DeviceManagementAdminTable/DeviceManagementAdminRow.tsx
@@ -71,7 +71,7 @@ const DeviceManagementAdminRow = ({
 					{deviceName && <Box withTruncatedText>{deviceName}</Box>}
 				</Box>
 			</GenericTableCell>
-			<GenericTableCell>{rcVersion || '—'}</GenericTableCell>
+			<GenericTableCell>{rcVersion}</GenericTableCell>
 			<GenericTableCell>{deviceOSName}</GenericTableCell>
 			<GenericTableCell withTruncatedText>{username}</GenericTableCell>
 			{mediaQuery && <GenericTableCell>{formatDateAndTime(loginAt)}</GenericTableCell>}