Regression: REST API calls at Engagement Dashboard (#26235)

RocketChat · Jul 15, 2022 · 3987360 · 3987360
1 parent 55ae5e0
commit 3987360
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 25 deletions.
diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/channels/useChannelsList.ts b/apps/meteor/ee/client/views/admin/engagementDashboard/channels/useChannelsList.ts
@@ -19,8 +19,8 @@ export const useChannelsList = ({ period, offset, count }: UseChannelsListOption
 			const { start, end } = getPeriodRange(period);
 
 			const response = await getChannelsList({
-				start,
-				end,
+				start: start.toISOString(),
+				end: end.toISOString(),
 				offset,
 				count,
 			});

diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/messages/useMessageOrigins.ts b/apps/meteor/ee/client/views/admin/engagementDashboard/messages/useMessageOrigins.ts
@@ -15,8 +15,8 @@ export const useMessageOrigins = ({ period }: UseMessageOriginsOptions) => {
 			const { start, end } = getPeriodRange(period);
 
 			const response = await getMessageOrigins({
-				start,
-				end,
+				start: start.toISOString(),
+				end: end.toISOString(),
 			});
 
 			return response

diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/messages/useMessagesSent.ts b/apps/meteor/ee/client/views/admin/engagementDashboard/messages/useMessagesSent.ts
@@ -15,8 +15,8 @@ export const useMessagesSent = ({ period }: UseMessagesSentOptions) => {
 			const { start, end } = getPeriodRange(period);
 
 			const response = await getMessagesSent({
-				start,
-				end,
+				start: start.toISOString(),
+				end: end.toISOString(),
 			});
 
 			return response

diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/messages/useTopFivePopularChannels.ts b/apps/meteor/ee/client/views/admin/engagementDashboard/messages/useTopFivePopularChannels.ts
@@ -15,8 +15,8 @@ export const useTopFivePopularChannels = ({ period }: UseTopFivePopularChannelsO
 			const { start, end } = getPeriodRange(period);
 
 			const response = await getTopFivePopularChannels({
-				start,
-				end,
+				start: start.toISOString(),
+				end: end.toISOString(),
 			});
 
 			return response

diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/users/useActiveUsers.ts b/apps/meteor/ee/client/views/admin/engagementDashboard/users/useActiveUsers.ts
@@ -16,8 +16,8 @@ export const useActiveUsers = ({ utc }: UseActiveUsersOptions) => {
 			const { start, end } = getPeriodRange('last 30 days', utc);
 
 			const response = await getActiveUsers({
-				start: (utc ? moment.utc(start) : moment(start)).subtract(29, 'days').toDate(),
-				end,
+				start: (utc ? moment.utc(start) : moment(start)).subtract(29, 'days').toISOString(),
+				end: end.toISOString(),
 			});
 
 			return response

diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/users/useHourlyChatActivity.ts b/apps/meteor/ee/client/views/admin/engagementDashboard/users/useHourlyChatActivity.ts
@@ -17,7 +17,7 @@ export const useHourlyChatActivity = ({ displacement, utc }: UseHourlyChatActivi
 			const day = (utc ? moment.utc().endOf('day') : moment().endOf('day')).subtract(displacement, 'days').toDate();
 
 			const response = await getHourlyChatActivity({
-				start: day,
+				start: day.toISOString(),
 			});
 
 			return response

diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/users/useNewUsers.ts b/apps/meteor/ee/client/views/admin/engagementDashboard/users/useNewUsers.ts
@@ -15,8 +15,8 @@ export const useNewUsers = ({ period, utc }: UseNewUsersOptions) => {
 			const { start, end } = getPeriodRange(period, utc);
 
 			const response = await getNewUsers({
-				start,
-				end,
+				start: start.toISOString(),
+				end: end.toISOString(),
 			});
 
 			return response

diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/users/useUsersByTimeOfTheDay.ts b/apps/meteor/ee/client/views/admin/engagementDashboard/users/useUsersByTimeOfTheDay.ts
@@ -15,8 +15,8 @@ export const useUsersByTimeOfTheDay = ({ period, utc }: UseUsersByTimeOfTheDayOp
 			const { start, end } = getPeriodRange(period, utc);
 
 			const response = await getUsersByTimeOfTheDay({
-				start,
-				end,
+				start: start.toISOString(),
+				end: end.toISOString(),
 			});
 
 			return response

diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/users/useWeeklyChatActivity.ts b/apps/meteor/ee/client/views/admin/engagementDashboard/users/useWeeklyChatActivity.ts
@@ -17,7 +17,7 @@ export const useWeeklyChatActivity = ({ displacement, utc }: UseWeeklyChatActivi
 			const day = (utc ? moment.utc().endOf('day') : moment().endOf('day')).subtract(displacement, 'weeks').toDate();
 
 			const response = await getWeeklyChatActivity({
-				start: day,
+				start: day.toISOString(),
 			});
 
 			return response

diff --git a/apps/meteor/ee/definition/rest/v1/engagementDashboard.ts b/apps/meteor/ee/definition/rest/v1/engagementDashboard.ts
@@ -4,7 +4,7 @@ declare module '@rocket.chat/rest-typings' {
 	// eslint-disable-next-line @typescript-eslint/interface-name-prefix
 	interface Endpoints {
 		'/v1/engagement-dashboard/channels/list': {
-			GET: (params: { start: Date; end: Date; offset: number; count: number }) => {
+			GET: (params: { start: string; end: string; offset: number; count: number }) => {
 				channels: {
 					room: {
 						_id: IRoom['_id'];
@@ -24,15 +24,15 @@ declare module '@rocket.chat/rest-typings' {
 			};
 		};
 		'/v1/engagement-dashboard/messages/origin': {
-			GET: (params: { start: Date; end: Date }) => {
+			GET: (params: { start: string; end: string }) => {
 				origins: {
 					t: IRoom['t'];
 					messages: number;
 				}[];
 			};
 		};
 		'/v1/engagement-dashboard/messages/top-five-popular-channels': {
-			GET: (params: { start: Date; end: Date }) => {
+			GET: (params: { start: string; end: string }) => {
 				channels: {
 					t: IRoom['t'];
 					messages: number;
@@ -42,7 +42,7 @@ declare module '@rocket.chat/rest-typings' {
 			};
 		};
 		'/v1/engagement-dashboard/messages/messages-sent': {
-			GET: (params: { start: Date; end: Date }) => {
+			GET: (params: { start: string; end: string }) => {
 				days: { day: Date; messages: number }[];
 				period: {
 					count: number;
@@ -55,7 +55,7 @@ declare module '@rocket.chat/rest-typings' {
 			};
 		};
 		'/v1/engagement-dashboard/users/active-users': {
-			GET: (params: { start: Date; end: Date }) => {
+			GET: (params: { start: string; end: string }) => {
 				month: {
 					day: number;
 					month: number;
@@ -66,7 +66,7 @@ declare module '@rocket.chat/rest-typings' {
 			};
 		};
 		'/v1/engagement-dashboard/users/chat-busier/weekly-data': {
-			GET: (params: { start: Date }) => {
+			GET: (params: { start: string }) => {
 				month: {
 					users: number;
 					day: number;
@@ -76,15 +76,15 @@ declare module '@rocket.chat/rest-typings' {
 			};
 		};
 		'/v1/engagement-dashboard/users/chat-busier/hourly-data': {
-			GET: (params: { start: Date }) => {
+			GET: (params: { start: string }) => {
 				hours: {
 					users: number;
 					hour: number;
 				}[];
 			};
 		};
 		'/v1/engagement-dashboard/users/users-by-time-of-the-day-in-a-week': {
-			GET: (params: { start: Date; end: Date }) => {
+			GET: (params: { start: string; end: string }) => {
 				week: {
 					users: number;
 					hour: number;
@@ -95,7 +95,7 @@ declare module '@rocket.chat/rest-typings' {
 			};
 		};
 		'/v1/engagement-dashboard/users/new-users': {
-			GET: (params: { start: Date; end: Date }) => {
+			GET: (params: { start: string; end: string }) => {
 				days: { day: Date; users: number }[];
 				period: {
 					count: number;