feat: workspace info admin page

.changeset/workspace-status-admin-page.md

@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": minor
+---
+
+Added a new Admin page called `Workspace info` in place of Information page, to make it easier to check the license 

apps/meteor/app/api/server/lib/getServerInfo.ts

@@ -1,20 +1,15 @@
+import type { IWorkspaceInfo } from '@rocket.chat/core-typings';
+
 import { hasPermissionAsync } from '../../../authorization/server/functions/hasPermission';
 import {
 	getCachedSupportedVersionsToken,
 	wrapPromise,
 } from '../../../cloud/server/functions/supportedVersionsToken/supportedVersionsToken';
 import { Info, minimumClientVersions } from '../../../utils/rocketchat.info';
 
-type ServerInfo = {
-	info?: typeof Info;
-	supportedVersions?: { signed: string };
-	minimumClientVersions: typeof minimumClientVersions;
-	version: string;
-};
-
 const removePatchInfo = (version: string): string => version.replace(/(\d+\.\d+).*/, '$1');
 
-export async function getServerInfo(userId?: string): Promise<ServerInfo> {
+export async function getServerInfo(userId?: string): Promise<IWorkspaceInfo> {
 	const hasPermissionToViewStatistics = userId && (await hasPermissionAsync(userId, 'view-statistics'));
 	const supportedVersionsToken = await wrapPromise(getCachedSupportedVersionsToken());
 

apps/meteor/app/statistics/server/lib/statistics.ts

@@ -305,18 +305,30 @@ export const statistics = {
 		);
 
 		// Message statistics
-		statistics.totalChannelMessages = (await Rooms.findByType('c', { projection: { msgs: 1 } }).toArray()).reduce(
-			function _countChannelMessages(num: number, room: IRoom) {
+		const channels = await Rooms.findByType('c', { projection: { msgs: 1, prid: 1 } }).toArray();
+		const totalChannelDiscussionsMessages = await channels.reduce(function _countChannelDiscussionsMessages(num: number, room: IRoom) {
+			return num + (room.prid ? room.msgs : 0);
+		}, 0);
+		statistics.totalChannelMessages =
+			(await channels.reduce(function _countChannelMessages(num: number, room: IRoom) {
 				return num + room.msgs;
-			},
-			0,
-		);
-		statistics.totalPrivateGroupMessages = (await Rooms.findByType('p', { projection: { msgs: 1 } }).toArray()).reduce(
-			function _countPrivateGroupMessages(num: number, room: IRoom) {
+			}, 0)) - totalChannelDiscussionsMessages;
+
+		const privateGroups = await Rooms.findByType('p', { projection: { msgs: 1, prid: 1 } }).toArray();
+		const totalPrivateGroupsDiscussionsMessages = await privateGroups.reduce(function _countPrivateGroupsDiscussionsMessages(
+			num: number,
+			room: IRoom,
+		) {
+			return num + (room.prid ? room.msgs : 0);
+		},
+		0);
+		statistics.totalPrivateGroupMessages =
+			(await privateGroups.reduce(function _countPrivateGroupMessages(num: number, room: IRoom) {
 				return num + room.msgs;
-			},
-			0,
-		);
+			}, 0)) - totalPrivateGroupsDiscussionsMessages;
+
+		statistics.totalDiscussionsMessages = totalPrivateGroupsDiscussionsMessages + totalChannelDiscussionsMessages;
+
 		statistics.totalDirectMessages = (await Rooms.findByType('d', { projection: { msgs: 1 } }).toArray()).reduce(
 			function _countDirectMessages(num: number, room: IRoom) {
 				return num + room.msgs;
@@ -332,6 +344,7 @@ export const statistics = {
 		statistics.totalMessages =
 			statistics.totalChannelMessages +
 			statistics.totalPrivateGroupMessages +
+			statistics.totalDiscussionsMessages +
 			statistics.totalDirectMessages +
 			statistics.totalLivechatMessages;
 

apps/meteor/client/hooks/useWorkspaceInfo.ts

@@ -0,0 +1,29 @@
+import type { IWorkspaceInfo, IStats } from '@rocket.chat/core-typings';
+import type { IInstance } from '@rocket.chat/rest-typings';
+import { useEndpoint } from '@rocket.chat/ui-contexts';
+import { useQueries } from '@tanstack/react-query';
+
+export const useWorkspaceInfo = () => {
+	const getStatistics = useEndpoint('GET', '/v1/statistics');
+	const getInstances = useEndpoint('GET', '/v1/instances.get');
+	const getServerInfo = useEndpoint('GET', '/info');
+
+	const results = useQueries({
+		queries: [
+			{ queryKey: ['info', 'serverInfo'], queryFn: () => getServerInfo(), staleTime: Infinity, keepPreviousData: true },
+			{ queryKey: ['info', 'instances'], queryFn: () => getInstances(), staleTime: Infinity, keepPreviousData: true },
+			{ queryKey: ['info', 'statistics'], queryFn: () => getStatistics({ refresh: 'true' }), staleTime: Infinity, keepPreviousData: true },
+		],
+	});
+
+	const [serverInfoQuery, instancesQuery, statisticsQuery] = results;
+
+	const instances: IInstance[] | undefined = instancesQuery?.data?.instances as IInstance[];
+	const statistics: IStats | undefined = statisticsQuery?.data as IStats;
+	const serverInfo: IWorkspaceInfo | undefined = serverInfoQuery?.data as IWorkspaceInfo;
+
+	const isLoading = results.some((query) => query.isLoading);
+	const isError = results.some((query) => query.isError);
+
+	return { instances, statistics, serverInfo, isLoading, isError, refetchStatistics: statisticsQuery.refetch };
+};

apps/meteor/client/lib/utils/isOverLicenseLimits.ts

@@ -0,0 +1,22 @@
+import type { LicenseLimitKind } from '@rocket.chat/license';
+
+type Limits = Record<
+	LicenseLimitKind,
+	{
+		max: number;
+		value?: number;
+	}
+>;
+
+export const isOverLicenseLimits = (limits: Limits): boolean => {
+	for (const key in limits) {
+		if (Object.hasOwn(limits, key)) {
+			const limit = limits[key as keyof Limits];
+			if (limit.value !== undefined && limit.value > limit.max) {
+				return true;
+			}
+		}
+	}
+
+	return false;
+};