Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Regression: App requests notify admin function generating wrong link #28111

Merged
merged 4 commits into from
Feb 24, 2023
Merged

Regression: App requests notify admin function generating wrong link #28111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5f634d0
fix: :bug: Rocket.cat app request admin notification link
rique223 Feb 21, 2023
01c464d
Merge branch 'develop' into fix/notify-admin-link
rique223 Feb 23, 2023
44b1e7d
Merge branch 'develop' into fix/notify-admin-link
sampaiodiego Feb 23, 2023
2169487
Merge branch 'develop' into fix/notify-admin-link
rique223 Feb 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppStatus/AppStatus.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
});
};
Expand Down
1 change: 1 addition & 0 deletions apps/meteor/client/views/marketplace/AppMenu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,7 @@ function AppMenu({ app, isAppDetailsPage, ...props }) {
notifyAdmins({
appId: app.id,
appName: app.name,
appVersion: app.marketplaceVersion,
message: postMessage.message,
});
};
Expand Down
4 changes: 2 additions & 2 deletions apps/meteor/ee/server/apps/communication/rest.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }) => {
Expand Down
2 changes: 1 addition & 1 deletion packages/rest-typings/src/apps/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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': {
Expand Down