Skip to content

Commit a092b69

Browse files
Merge branch 'develop' into bump-node-version
2 parents 7531eaf + beec566 commit a092b69

File tree

4 files changed

+16
-2
lines changed

4 files changed

+16
-2
lines changed

.changeset/brave-ties-shout.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
'@rocket.chat/i18n': patch
3+
'@rocket.chat/meteor': patch
4+
---
5+
6+
fixes toast with empty error messages when a private app installation fails

README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@ Free for 30 days. Afterward, choose between continuing to host on our secure clo
4343

4444
[Start your cloud hosted trial now](https://rocket.chat/trial-saas)
4545

46+
# 📖 Docs for Developers, Admins and Users
47+
Please make sure to visit our [Docs](https://docs.rocket.chat/) and [Developer Docs](https://developer.rocket.chat/docs) before sending questions.
48+
4649
# 🛠️ Local development
4750

4851
## Prerequisites

apps/meteor/ee/server/apps/communication/rest.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@ export class AppsRestApi {
383383
}
384384

385385
if (!buff) {
386-
return API.v1.failure({ error: 'Failed to get a file to install for the App. ' });
386+
return API.v1.failure({ error: 'app_file_error', message: 'Failed to get a file to install for the App. ' });
387387
}
388388

389389
// Used mostly in Cloud hosting for security reasons
@@ -400,11 +400,12 @@ export class AppsRestApi {
400400
const info: IAppInfo & { status?: AppStatus } = aff.getAppInfo();
401401

402402
if (aff.hasStorageError()) {
403-
return API.v1.failure({ status: 'storage_error', messages: [aff.getStorageError()] });
403+
return API.v1.failure({ error: 'app_storage_error', status: 'storage_error', messages: [aff.getStorageError()] });
404404
}
405405

406406
if (aff.hasAppUserError()) {
407407
return API.v1.failure({
408+
error: 'app_user_error',
408409
status: 'app_user_error',
409410
messages: [(aff.getAppUserError() as Record<string, any>).message],
410411
payload: { username: (aff.getAppUserError() as Record<string, any>).username },

packages/i18n/src/locales/en.i18n.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -591,6 +591,10 @@
591591
"Apps_disabled_when_Premium_trial_ended_description_admin": "Community workspaces can enable up to 5 marketplace apps. Private apps can only be enabled in premium plans. Reenable the apps you require.",
592592
"Apps_Engine_Version": "Apps Engine Version",
593593
"Apps_Error_private_app_install_disabled": "Private app installation and updates are disabled in this workspace",
594+
"Apps_Error_": "Unknown app error.",
595+
"Apps_Error_app_file_error": "Failed to get a file to install for the App.",
596+
"Apps_Error_app_storage_error": "Failed to save app file on storage.",
597+
"Apps_Error_app_user_error": "Failed to create app user.",
594598
"Apps_Essential_Alert": "This app is essential for the following events:",
595599
"Apps_Essential_Disclaimer": "Events listed above will be disrupted if this app is disabled. If you want Rocket.Chat to work without this app's functionality, you need to uninstall it",
596600
"Apps_Framework_Source_Package_Storage_Type": "Apps' Source Package Storage type",

0 commit comments

Comments
 (0)