From 70ab2a7b7bc4e671e4eca039aa32ad6e8192f688 Mon Sep 17 00:00:00 2001
From: Aleksander Nicacio da Silva <aleksander.silva@rocket.chat>
Date: Thu, 2 May 2024 11:17:11 -0300
Subject: [PATCH] feat: added cloud workspace id to workspace statistics
 (#32298)

---
 .changeset/wild-teachers-design.md                         | 7 +++++++
 apps/meteor/app/api/server/lib/getServerInfo.ts            | 5 ++++-
 .../admin/workspace/DeploymentCard/DeploymentCard.tsx      | 4 +++-
 packages/core-typings/src/IWorkspaceInfo.ts                | 1 +
 packages/i18n/src/locales/en.i18n.json                     | 1 +
 packages/i18n/src/locales/pt-BR.i18n.json                  | 2 +-
 6 files changed, 17 insertions(+), 3 deletions(-)
 create mode 100644 .changeset/wild-teachers-design.md

diff --git a/.changeset/wild-teachers-design.md b/.changeset/wild-teachers-design.md
new file mode 100644
index 000000000000..f49f4549e762
--- /dev/null
+++ b/.changeset/wild-teachers-design.md
@@ -0,0 +1,7 @@
+---
+"@rocket.chat/meteor": minor
+"@rocket.chat/core-typings": minor
+"@rocket.chat/i18n": minor
+---
+
+Added "Rocket.Chat Cloud Workspace ID" to workspace statistics page
diff --git a/apps/meteor/app/api/server/lib/getServerInfo.ts b/apps/meteor/app/api/server/lib/getServerInfo.ts
index 9a0e7e4e11c9..020988b0aca4 100644
--- a/apps/meteor/app/api/server/lib/getServerInfo.ts
+++ b/apps/meteor/app/api/server/lib/getServerInfo.ts
@@ -5,6 +5,7 @@ import {
 	getCachedSupportedVersionsToken,
 	wrapPromise,
 } from '../../../cloud/server/functions/supportedVersionsToken/supportedVersionsToken';
+import { settings } from '../../../settings/server';
 import { Info, minimumClientVersions } from '../../../utils/rocketchat.info';
 
 const removePatchInfo = (version: string): string => version.replace(/(\d+\.\d+).*/, '$1');
@@ -12,10 +13,10 @@ const removePatchInfo = (version: string): string => version.replace(/(\d+\.\d+)
 export async function getServerInfo(userId?: string): Promise<IWorkspaceInfo> {
 	const hasPermissionToViewStatistics = userId && (await hasPermissionAsync(userId, 'view-statistics'));
 	const supportedVersionsToken = await wrapPromise(getCachedSupportedVersionsToken());
+	const cloudWorkspaceId = settings.get<string | undefined>('Cloud_Workspace_Id');
 
 	return {
 		version: removePatchInfo(Info.version),
-
 		...(hasPermissionToViewStatistics && {
 			info: {
 				...Info,
@@ -28,5 +29,7 @@ export async function getServerInfo(userId?: string): Promise<IWorkspaceInfo> {
 			supportedVersionsToken.result && {
 				supportedVersions: { signed: supportedVersionsToken.result },
 			}),
+
+		cloudWorkspaceId,
 	};
 }
diff --git a/apps/meteor/client/views/admin/workspace/DeploymentCard/DeploymentCard.tsx b/apps/meteor/client/views/admin/workspace/DeploymentCard/DeploymentCard.tsx
index 0b48d0c8cc88..a300a792f45c 100644
--- a/apps/meteor/client/views/admin/workspace/DeploymentCard/DeploymentCard.tsx
+++ b/apps/meteor/client/views/admin/workspace/DeploymentCard/DeploymentCard.tsx
@@ -16,7 +16,7 @@ type DeploymentCardProps = {
 	statistics: IStats;
 };
 
-const DeploymentCard = ({ serverInfo: { info }, statistics, instances }: DeploymentCardProps): ReactElement => {
+const DeploymentCard = ({ serverInfo: { info, cloudWorkspaceId }, statistics, instances }: DeploymentCardProps): ReactElement => {
 	const t = useTranslation();
 	const formatDateAndTime = useFormatDateAndTime();
 	const setModal = useSetModal();
@@ -33,6 +33,8 @@ const DeploymentCard = ({ serverInfo: { info }, statistics, instances }: Deploym
 			<WorkspaceCardSection title={t('Version')} body={statistics.version} />
 			<WorkspaceCardSection title={t('Deployment_ID')} body={statistics.uniqueId} />
 
+			{cloudWorkspaceId && <WorkspaceCardSection title={t('Cloud_Workspace_Id')} body={cloudWorkspaceId} />}
+
 			{appsEngineVersion && <WorkspaceCardSection title={t('Apps_Engine_Version')} body={appsEngineVersion} />}
 			<WorkspaceCardSection title={t('Node_version')} body={statistics.process.nodeVersion} />
 			<WorkspaceCardSection
diff --git a/packages/core-typings/src/IWorkspaceInfo.ts b/packages/core-typings/src/IWorkspaceInfo.ts
index eede7d1011ff..1282c8bb9277 100644
--- a/packages/core-typings/src/IWorkspaceInfo.ts
+++ b/packages/core-typings/src/IWorkspaceInfo.ts
@@ -5,4 +5,5 @@ export type IWorkspaceInfo = {
 	supportedVersions?: { signed: string };
 	minimumClientVersions: { desktop: string; mobile: string };
 	version: string;
+	cloudWorkspaceId?: string;
 };
diff --git a/packages/i18n/src/locales/en.i18n.json b/packages/i18n/src/locales/en.i18n.json
index 5ac14f5a3b6b..c8897b988c82 100644
--- a/packages/i18n/src/locales/en.i18n.json
+++ b/packages/i18n/src/locales/en.i18n.json
@@ -1100,6 +1100,7 @@
   "Cloud_workspace_connected_without_account": "Your workspace is now connected to the Rocket.Chat Cloud. If you would like, you can login to the Rocket.Chat Cloud and associate your workspace with your Cloud account.",
   "Cloud_workspace_disconnect": "If you no longer wish to utilize cloud services you can disconnect your workspace from Rocket.Chat Cloud.",
   "Cloud_workspace_support": "If you have trouble with a cloud service, please try to sync first.  Should the issue persist, please open a support ticket in the Cloud Console.",
+  "Cloud_Workspace_Id": "Cloud Workspace ID",
   "Collaborative": "Collaborative",
   "Collapse": "Collapse",
   "Collapse_Embedded_Media_By_Default": "Collapse Embedded Media by Default",
diff --git a/packages/i18n/src/locales/pt-BR.i18n.json b/packages/i18n/src/locales/pt-BR.i18n.json
index 0cc43f6fb508..cbe9906ed8aa 100644
--- a/packages/i18n/src/locales/pt-BR.i18n.json
+++ b/packages/i18n/src/locales/pt-BR.i18n.json
@@ -5016,4 +5016,4 @@
   "Enterprise": "Enterprise",
   "UpgradeToGetMore_engagement-dashboard_Title": "Analytics",
   "UpgradeToGetMore_auditing_Title": "Auditoria de mensagem"
-}
\ No newline at end of file
+}