Skip to content

fix: invalid link/message in banner for invalid apps #35132

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

Merged
kodiakhq merged 4 commits into from
Feb 14, 2025
Merged

fix: invalid link/message in banner for invalid apps #35132

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
ad282a4
fix: invalid link/message in banner for invalid apps
abhinavkrin Feb 5, 2025
2b17839
added changeset
abhinavkrin Feb 5, 2025
1524abc
added translations
abhinavkrin Feb 13, 2025
2db74b4
Merge branch 'develop' into fix/invalid-link-and-message-for-invalid-…
kodiakhq[bot] Feb 14, 2025
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
5 changes: 5 additions & 0 deletions .changeset/fast-starfishes-perform.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': patch
---

Fixes broken link and improves messaging for invalid apps banner.
20 changes: 12 additions & 8 deletions apps/meteor/ee/server/apps/cron.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ const notifyAdminsAboutInvalidApps = async function _notifyAdminsAboutInvalidApp

const id = 'someAppInInvalidState';
const title = 'Warning';
const text = 'There is one or more apps in an invalid state. Click here to review.';
const rocketCatMessage = 'There is one or more apps in an invalid state. Go to Administration > Apps to review.';
const link = '/admin/apps';
const link = '/marketplace/installed';

await sendMessagesToAdmins({
msgs: async ({ adminUser }) => ({
msg: `*${i18n.t(title, { lng: adminUser.language || 'en' })}*\n${i18n.t(rocketCatMessage, {
msg: `*${i18n.t(title, { lng: adminUser.language || 'en' })}*\n${i18n.t('Invalid_apps_admin_message', {
lng: adminUser.language || 'en',
marketplace: i18n.t('Marketplace', { lng: adminUser.language || 'en' }),
installed: i18n.t('Installed', { lng: adminUser.language || 'en' }),
})}`,
}),
banners: async ({ adminUser }) => {
Expand All @@ -40,7 +40,7 @@ const notifyAdminsAboutInvalidApps = async function _notifyAdminsAboutInvalidApp
id,
priority: 10,
title,
text,
text: i18n.t('Invalid_apps_banner_text', { lng: adminUser.language || 'en' }),
modifiers: ['danger'],
link,
},
Expand All @@ -64,10 +64,14 @@ const notifyAdminsAboutRenewedApps = async function _notifyAdminsAboutRenewedApp
return;
}

const rocketCatMessage = 'There is one or more disabled apps with valid licenses. Go to Administration > Apps to review.';

await sendMessagesToAdmins({
msgs: async ({ adminUser }) => ({ msg: `${i18n.t(rocketCatMessage, { lng: adminUser.language || 'en' })}` }),
msgs: async ({ adminUser }) => ({
msg: i18n.t('Disabled_apps_admin_message', {
lng: adminUser.language || 'en',
marketplace: i18n.t('Marketplace', { lng: adminUser.language || 'en' }),
installed: i18n.t('Installed', { lng: adminUser.language || 'en' }),
}),
}),
});
};

Expand Down
3 changes: 3 additions & 0 deletions packages/i18n/src/locales/en.i18n.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1768,6 +1768,7 @@
"Disable_two-factor_authentication": "Disable two-factor authentication via TOTP",
"Disable_two-factor_authentication_email": "Disable two-factor authentication via Email",
"Disabled": "Disabled",
"Disabled_apps_admin_message": "There are one or more disabled apps with valid licenses. Go to {{marketplace}} > {{installed}} to review.",
"Disable_voice_calling": "Disable voice calling",
"Disallow_reacting": "Disallow Reacting",
"Disallow_reacting_Description": "Disallows reacting",
Expand Down Expand Up @@ -2923,6 +2924,8 @@
"Invalid_setting_s": "Invalid setting: %s",
"Invalid_two_factor_code": "Invalid two factor code",
"Invalid_username": "The username entered is invalid",
"Invalid_apps_banner_text": "There are one or more apps in an invalid state. Click here to review.",
"Invalid_apps_admin_message": "There are one or more apps in an invalid state. Go to {{marketplace}} > {{installed}} to review.",
"invisible": "invisible",
"Invisible": "Invisible",
"Invitation": "Invitation",
Expand Down
Loading