Regression: App requests notify admin function generating wrong link (#…

…28111)
RocketChat · Feb 24, 2023 · 88c4c9f · 88c4c9f
1 parent f17ded5
commit 88c4c9f
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppStatus/AppStatus.tsx b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppStatus/AppStatus.tsx
@@ -67,6 +67,7 @@ const AppStatus = ({ app, showStatus = true, isAppDetailsPage, installed, ...pro
 		notifyAdmins({
 			appId: app.id,
 			appName: app.name,
+			appVersion: app.marketplaceVersion,
 			message: postMessage.message,
 		});
 	};

diff --git a/apps/meteor/client/views/marketplace/AppMenu.js b/apps/meteor/client/views/marketplace/AppMenu.js
@@ -151,6 +151,7 @@ function AppMenu({ app, isAppDetailsPage, ...props }) {
 			notifyAdmins({
 				appId: app.id,
 				appName: app.name,
+				appVersion: app.marketplaceVersion,
 				message: postMessage.message,
 			});
 		};

diff --git a/apps/meteor/ee/server/apps/communication/rest.js b/apps/meteor/ee/server/apps/communication/rest.js
@@ -805,12 +805,12 @@ export class AppsRestApi {
 			{ authRequired: true },
 			{
 				async post() {
-					const { appId, appName, message } = this.bodyParams;
+					const { appId, appName, appVersion, message } = this.bodyParams;
 					const workspaceUrl = settings.get('Site_Url');
 
 					const regex = new RegExp('\\/$', 'gm');
 					const safeWorkspaceUrl = workspaceUrl.replace(regex, '');
-					const learnMore = `${safeWorkspaceUrl}/marketplace/explore/info/${appId}`;
+					const learnMore = `${safeWorkspaceUrl}/marketplace/explore/info/${appId}/${appVersion}/requests`;
 
 					try {
 						const msgs = ({ adminUser }) => {

diff --git a/packages/rest-typings/src/apps/index.ts b/packages/rest-typings/src/apps/index.ts
@@ -180,7 +180,7 @@ export type AppsEndpoints = {
 	};
 
 	'/apps/notify-admins': {
-		POST: (params: { appId: string; appName: string; message: string }) => void;
+		POST: (params: { appId: string; appName: string; appVersion: string; message: string }) => void;
 	};
 
 	'/apps': {