Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
21 changes: 14 additions & 7 deletions app/apps/server/communication/rest.js
Original file line number Diff line number Diff line change
Expand Up @@ -466,20 +466,27 @@ export class AppsRestApi {
return API.v1.failure({ error: 'Failed to get a file to install for the App. ' });
}

const aff = Promise.await(manager.update(buff.toString('base64')));
const aff = Promise.await(manager.update(buff));
const info = aff.getAppInfo();

// Should the updated version have compiler errors, no App will be returned
if (aff.getApp()) {
info.status = aff.getApp().getStatus();
} else {
info.status = 'compiler_error';
if (aff.hasStorageError()) {
return API.v1.failure({ status: 'storage_error', messages: [aff.getStorageError()] });
}

if (aff.hasAppUserError()) {
return API.v1.failure({
status: 'app_user_error',
messages: [aff.getAppUserError().message],
payload: { username: aff.getAppUserError().username },
});
}

info.status = aff.getApp().getStatus();

return API.v1.success({
app: info,
implemented: aff.getImplementedInferfaces(),
compilerErrors: aff.getCompilerErrors(),
licenseValidation: aff.getLicenseValidationResult(),
});
},
delete() {
Expand Down
3 changes: 0 additions & 3 deletions client/admin/apps/helpers.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,6 @@ export function handleInstallError(apiError) {
case 'storage_error':
message = messages.join('');
break;
case 'compiler_error':
message = 'There has been compiler errors. App cannot be installed';
break;
case 'app_user_error':
message = messages.join('');
if (payload && payload.username) {
Expand Down
5 changes: 2 additions & 3 deletions packages/rocketchat-i18n/i18n/af.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,6 @@
"App_Information": "App Inligting",
"App_Installation": "App Installasie",
"App_status_auto_enabled": "enabled",
"App_status_compiler_error_disabled": "Gedeaktiveer: kompilator fout",
"App_status_constructed": "gebou",
"App_status_disabled": "gestremde",
"App_status_error_disabled": "Gestremde: Ongeskikte fout",
Expand Down Expand Up @@ -1902,7 +1901,6 @@
"Office_Hours": "Kantoor ure",
"Office_hours_enabled": "Kantoorure geaktiveer",
"Office_hours_updated": "Kantoorure is opgedateer",
"RetentionPolicy_ExcludePinned": "Sluit uitgespelde boodskappe uit",
"Offline": "op die regte pad",
"Offline_DM_Email": "Direkte boodskap E-pos Vak",
"Offline_Email_Subject_Description": "U mag die volgende plekhouers gebruik:<br/><ul><li>[Site_Name], [Site_URL], [Gebruiker] en [Kamer] vir die Aansoek Naam, URL, Gebruikersnaam en Kamernaam onderskeidelik.<li/></ul>",
Expand Down Expand Up @@ -2141,6 +2139,7 @@
"Retail": "Kleinhandel",
"Retention_setting_changed_successfully": "Behoudingsbeleidinstelling is suksesvol verander",
"RetentionPolicy": "Retensiebeleid",
"RetentionPolicy_ExcludePinned": "Sluit uitgespelde boodskappe uit",
"RetentionPolicy_RoomWarning": "Boodskappe ouer as __time__ word hier outomaties gesnoei",
"RetentionPolicy_RoomWarning_Unpinned": "Ongepakte boodskappe ouer as __time__ word hier outomaties gesnoei",
"RetentionPolicy_RoomWarning_FilesOnly": "Lêers ouer as __time__ word outomaties snoei hier (boodskappe bly ongeskonde)",
Expand Down Expand Up @@ -2841,4 +2840,4 @@
"Your_push_was_sent_to_s_devices": "Jou druk is gestuur na%s toestelle",
"Your_server_link": "Jou bediener skakel",
"Your_workspace_is_ready": "Jou werkruimte is gereed om 🎉 te gebruik"
}
}
5 changes: 2 additions & 3 deletions packages/rocketchat-i18n/i18n/ar.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,6 @@
"App_Information": "معلومات التطبيق",
"App_Installation": "تثبيت التطبيق",
"App_status_auto_enabled": "مُفعّل",
"App_status_compiler_error_disabled": "معطل: خطأ في المترجم",
"App_status_constructed": "إنشاؤه",
"App_status_disabled": "تعطيل",
"App_status_error_disabled": "معطل: خطأ غير مسجل",
Expand Down Expand Up @@ -1900,7 +1899,6 @@
"Office_Hours": "ساعات دوام المكتب",
"Office_hours_enabled": "تم تفعيل ساعات الدوام في المكتب",
"Office_hours_updated": "تم تحديث ساعات الدوام في المكتب",
"RetentionPolicy_ExcludePinned": "استبعاد الرسائل المثبتة",
"Offline": "غير متصل",
"Offline_DM_Email": "لقد تم بعث برسالة مباشرة من قبل __user__",
"Offline_Email_Subject_Description": "يمكنك استخدام العناصر النائبة التالية: <br/><ul><li>[Site_Name] و [Site_URL] و [وسر] و [روم] لاسم التطبيق وعنوان ورل واسم المستخدم و رومنام على التوالي. <li / ></ul>",
Expand Down Expand Up @@ -2139,6 +2137,7 @@
"Retail": "التجزئة",
"Retention_setting_changed_successfully": "تم تغيير إعداد سياسة الاحتفاظ بنجاح",
"RetentionPolicy": "سياسة الإحتفاظ",
"RetentionPolicy_ExcludePinned": "استبعاد الرسائل المثبتة",
"RetentionPolicy_RoomWarning_FilesOnly": "يتم تشذيب الملفات أقدم من %s هنا تلقائيًا (تبقى الرسائل سليمة)",
"RetentionPolicy_Description": "تلقائيا prunes الرسائل القديمة عبر مثيل Rocket.Chat الخاص بك.",
"RetentionPolicy_Enabled": "مُفعّل",
Expand Down Expand Up @@ -2836,4 +2835,4 @@
"Your_push_was_sent_to_s_devices": "وقد أرسلت دفعك إلى أجهزة٪ الصورة",
"Your_server_link": "رابط الخادم الخاص بك",
"Your_workspace_is_ready": "مساحة العمل الخاصة بك جاهزة لاستخدام 🎉"
}
}
5 changes: 2 additions & 3 deletions packages/rocketchat-i18n/i18n/az.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,6 @@
"App_Information": "App Məlumatı",
"App_Installation": "App Quraşdırma",
"App_status_auto_enabled": "Etkin",
"App_status_compiler_error_disabled": "Əlil: Kompilyator səhvi",
"App_status_constructed": "Tikilmiş",
"App_status_disabled": "Əlil",
"App_status_error_disabled": "Əlil: Hərəkətsiz səhv",
Expand Down Expand Up @@ -1902,7 +1901,6 @@
"Office_Hours": "İş saatları",
"Office_hours_enabled": "Ofis saatları aktivləşdi",
"Office_hours_updated": "Ofis saatları yeniləndi",
"RetentionPolicy_ExcludePinned": "Səslənən mesajları həddindən kənarlaşdırın",
"Offline": "Offline",
"Offline_DM_Email": "Direkt Mesaj E-poçt Mövzu",
"Offline_Email_Subject_Description": "Aşağıdakı yer tutuculardan istifadə edə bilərsiniz: <br/><ul><li>[Site_Name], [Site_URL], [İstifadəçi] və [İstifadəçi adı], URL, İstifadəçi adı və Roomname üçün [Room]. <li/></ul>",
Expand Down Expand Up @@ -2141,6 +2139,7 @@
"Retail": "Pərakəndə",
"Retention_setting_changed_successfully": "Saxlama siyasəti parametrləri uğurla dəyişdirildi",
"RetentionPolicy": "Saklama siyasəti",
"RetentionPolicy_ExcludePinned": "Səslənən mesajları həddindən kənarlaşdırın",
"RetentionPolicy_RoomWarning": "__time__-dən çox olan mesajlar avtomatik olaraq burda kəsilir",
"RetentionPolicy_RoomWarning_Unpinned": "__time__-dən daha köhnəlməmiş mesajlar avtomatik olaraq buradan kəsilir",
"RetentionPolicy_RoomWarning_FilesOnly": "__time__-dən çox olan fayllar avtomatik olaraq burulmuşdur (mesajlar dəyişməz qalır)",
Expand Down Expand Up @@ -2841,4 +2840,4 @@
"Your_push_was_sent_to_s_devices": "Sizin itəniz%s cihazlarına göndərildi",
"Your_server_link": "Sizin server bağlantınız",
"Your_workspace_is_ready": "İş yeriniz 🎉 istifadə etməyə hazırdır"
}
}
5 changes: 2 additions & 3 deletions packages/rocketchat-i18n/i18n/be-BY.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,6 @@
"App_Information": "інфармацыя аб дадатку",
"App_Installation": "ўстаноўка App",
"App_status_auto_enabled": "Уключана",
"App_status_compiler_error_disabled": "Адключана: Памылка кампілятара",
"App_status_constructed": "пабудаваны",
"App_status_disabled": "інвалід",
"App_status_error_disabled": "Адключана: Uncaught Памылка",
Expand Down Expand Up @@ -1915,7 +1914,6 @@
"Office_Hours": "прыёмныя гадзіны",
"Office_hours_enabled": "Гадзіны працы офіса Enabled",
"Office_hours_updated": "Гадзіны працы абноўленыя",
"RetentionPolicy_ExcludePinned": "Выключыць ўскладалі паведамлення",
"Offline": "Offline",
"Offline_DM_Email": "Прамое паведамленне E-mail Тэма",
"Offline_Email_Subject_Description": "Вы можаце выкарыстоўваць наступныя запаўняльнікі: <br/><ul><li>[site_name], [site_URL], [User] & [Room] для імя прыкладання, URL, імя карыстальніка і Roomname адпаведна <li/></ul>",
Expand Down Expand Up @@ -2155,6 +2153,7 @@
"Retail": "рознічны",
"Retention_setting_changed_successfully": "Настройка палітыкі ўтрымання паспяхова зменены",
"RetentionPolicy": "палітыка ўтрымання",
"RetentionPolicy_ExcludePinned": "Выключыць ўскладалі паведамлення",
"RetentionPolicy_RoomWarning": "Паведамлення старэй __time__ аўтаматычна абразаюць тут",
"RetentionPolicy_RoomWarning_Unpinned": "Незамацаваныя паведамлення старэй __time__ аўтаматычна абразаюць тут",
"RetentionPolicy_RoomWarning_FilesOnly": "Файлы старэй __time__ аўтаматычна абразаннем тут (паведамленні застаюцца некранутымі)",
Expand Down Expand Up @@ -2856,4 +2855,4 @@
"Your_push_was_sent_to_s_devices": "Ваш штуршок быў адпраўлены ў%s прылад",
"Your_server_link": "Ваша спасылка сервера",
"Your_workspace_is_ready": "Ваша працоўная вобласць гатова да выкарыстання 🎉"
}
}
5 changes: 2 additions & 3 deletions packages/rocketchat-i18n/i18n/bg.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,6 @@
"App_Information": "Информация за приложението",
"App_Installation": "Инсталиране на приложение",
"App_status_auto_enabled": "Enabled",
"App_status_compiler_error_disabled": "Деактивирано: Грешка при компилатора",
"App_status_constructed": "Конструиран",
"App_status_disabled": "хора с увреждания",
"App_status_error_disabled": "Забранено: Безпогрешна грешка",
Expand Down Expand Up @@ -1901,7 +1900,6 @@
"Office_Hours": "Официални часове",
"Office_hours_enabled": "Официалните часове са активирани",
"Office_hours_updated": "Работното време е актуализирано",
"RetentionPolicy_ExcludePinned": "Изключете закачените съобщения",
"Offline": "Извън линия",
"Offline_DM_Email": "Теми за пряко съобщение по имейл",
"Offline_Email_Subject_Description": "Можете да използвате следните заместващи символи:<br/><ul><li>[Site_Name], [Site_URL], [User] и [Room] съответно за името, URL адреса,<li/></ul>",
Expand Down Expand Up @@ -2140,6 +2138,7 @@
"Retail": "На дребно",
"Retention_setting_changed_successfully": "Настройката на правилата за задържане бе променена успешно",
"RetentionPolicy": "Правила за запазване",
"RetentionPolicy_ExcludePinned": "Изключете закачените съобщения",
"RetentionPolicy_RoomWarning": "По-стари от __time__ са автоматично подрязани тук",
"RetentionPolicy_RoomWarning_Unpinned": "Незаключените съобщения, по-стари от __time__, са автоматично подрязани тук",
"RetentionPolicy_RoomWarning_FilesOnly": "Файловете, по-стари от __time__, са автоматично подрязани тук (съобщенията остават непокътнати)",
Expand Down Expand Up @@ -2839,4 +2838,4 @@
"Your_push_was_sent_to_s_devices": "Натискането ви бе изпратено на %s устройства",
"Your_server_link": "Вашата сървърна връзка",
"Your_workspace_is_ready": "Работното ви пространство е готово за използване 🎉"
}
}
5 changes: 2 additions & 3 deletions packages/rocketchat-i18n/i18n/bs.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,6 @@
"App_Information": "Informacije o aplikaciji",
"App_Installation": "Instalacija aplikacije",
"App_status_auto_enabled": "Omogućeno",
"App_status_compiler_error_disabled": "Onemogućeno: pogreška prevoditelja",
"App_status_constructed": "konstruiran",
"App_status_disabled": "onesposobljen",
"App_status_error_disabled": "Onemogućeno: neozlijeđena pogreška",
Expand Down Expand Up @@ -1900,7 +1899,6 @@
"Office_Hours": "Uredovni Sati",
"Office_hours_enabled": "Uredovni Sati omogućeno",
"Office_hours_updated": "Ažurirani sati",
"RetentionPolicy_ExcludePinned": "Izuzmite prikvačene poruke",
"Offline": "Offline",
"Offline_DM_Email": "__user__ vas je izravno kontaktirao",
"Offline_Email_Subject_Description": "Možete upotrijebiti sljedeće oznake mjesta:<br/><ul><li>[Site_Name], [Site_URL], [User] i [Room] za naziv aplikacije, URL, ime i naziv prostorije.<li/></ul>",
Expand Down Expand Up @@ -2139,6 +2137,7 @@
"Retail": "Maloprodaja",
"Retention_setting_changed_successfully": "Postavka pravila zadržavanja uspješno je promijenjena",
"RetentionPolicy": "Pravila zadržavanja",
"RetentionPolicy_ExcludePinned": "Izuzmite prikvačene poruke",
"RetentionPolicy_RoomWarning": "Poruke starije od __time__ ovdje su automatski izrezane",
"RetentionPolicy_RoomWarning_Unpinned": "Ovdje su automatski obrezane poruke nepovezane poruke koje su starije od __time__",
"RetentionPolicy_RoomWarning_FilesOnly": "Datoteke starije od __time__ ovdje su automatski izrezane (poruke ostaju netaknute)",
Expand Down Expand Up @@ -2839,4 +2838,4 @@
"Your_push_was_sent_to_s_devices": "Push obavijest je poslana %s uređaje",
"Your_server_link": "Veza poslužitelja",
"Your_workspace_is_ready": "Radni je prostor spreman za upotrebu 🎉"
}
}
5 changes: 2 additions & 3 deletions packages/rocketchat-i18n/i18n/ca.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,6 @@
"App_Information": "Informació de l'aplicació",
"App_Installation": "Instal·lació de l'aplicació",
"App_status_auto_enabled": "Actiu",
"App_status_compiler_error_disabled": "Desactivat: error del compilador",
"App_status_constructed": "Construït",
"App_status_disabled": "Inactiu",
"App_status_error_disabled": "Desactivat: error no capturat",
Expand Down Expand Up @@ -2073,7 +2072,6 @@
"Office_Hours": "Horari d'obertura",
"Office_hours_enabled": "Horari d'obertura actiu",
"Office_hours_updated": "Horari actualitzat",
"RetentionPolicy_ExcludePinned": "Exclou els missatges fixats",
"Offline": "Fora de línia",
"Offline_DM_Email": "__user__ us ha enviat un missatge directe",
"Offline_Email_Subject_Description": "Podeu utilitzar els marcadors següents:<br/><ul><li>[Site_Name], [Lloc_URL], [User] i [Room] per al nom de l'aplicació, l'URL, el nom d'usuari i el nom de la sala respectivament.<li/></ul>",
Expand Down Expand Up @@ -2312,6 +2310,7 @@
"Retail": "Venda al detall",
"Retention_setting_changed_successfully": "La configuració de la política de retenció s'ha canviat correctament",
"RetentionPolicy": "Política de retenció",
"RetentionPolicy_ExcludePinned": "Exclou els missatges fixats",
"RetentionPolicy_RoomWarning": "Els missatges anteriors a __time__ es poda aquí automàticament",
"RetentionPolicy_RoomWarning_Unpinned": "Els missatges anteriors que anteriors a __time__ es podran anar aquí automàticament",
"RetentionPolicy_RoomWarning_FilesOnly": "Els fitxers anteriors a __time__ es poda automàticament aquí (els missatges romanen intactes)",
Expand Down Expand Up @@ -3012,4 +3011,4 @@
"Your_push_was_sent_to_s_devices": "La notificació push s'ha enviat a %s dispositius",
"Your_server_link": "El vostre enllaç del servidor",
"Your_workspace_is_ready": "El vostre espai de treball està a punt per utilitzar 🎉"
}
}
5 changes: 2 additions & 3 deletions packages/rocketchat-i18n/i18n/cs.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,6 @@
"App_Information": "Informace o aplikaci",
"App_Installation": "Instalace aplikace",
"App_status_auto_enabled": "Povoleno",
"App_status_compiler_error_disabled": "Zakázáno: chyba kompilace",
"App_status_constructed": "Vytvořeno",
"App_status_disabled": "Zakázáno",
"App_status_error_disabled": "Zakázáno: Nezachycená výjimka",
Expand Down Expand Up @@ -2677,7 +2676,6 @@
"Office_Hours": "Otevírací doba",
"Office_hours_enabled": "Otevírací doba povolena",
"Office_hours_updated": "Otevírací doba aktualizována",
"RetentionPolicy_ExcludePinned": "Vyloučit připnuté zprávy",
"Offline": "Offline",
"Offline_DM_Email": "Předmět emailu přímé zprávy",
"Offline_Email_Subject_Description": "Můžete použít následující značky:<br/><ul><li>[Site_Name] pro název aplikace, [Site_URL] pro URL aplikace, [User] pro uživatele a [Room] pro místnost<li/></ul>",
Expand Down Expand Up @@ -3002,6 +3000,7 @@
"RetentionPolicy": "Zásady uchovávání",
"RetentionPolicy_DoNotPruneDiscussion": "Nepročišťovat zprávy v diskuzi",
"RetentionPolicy_DoNotPruneThreads": "Nepročišťovat zprávy ve vláknech",
"RetentionPolicy_ExcludePinned": "Vyloučit připnuté zprávy",
"RetentionPolicy_RoomWarning": "Zprávy starší než __time__ jsou zde automaticky pročištěny",
"RetentionPolicy_RoomWarning_Unpinned": "Nepřipnuté zprávy starší než __time__ jsou zde automaticky pročištěny",
"RetentionPolicy_RoomWarning_FilesOnly": "Soubory starší než __time__ jsou zde automaticky pročištěny (zpráv se netýká)",
Expand Down Expand Up @@ -3989,4 +3988,4 @@
"Your_server_link": "Odkaz na Váš server",
"Your_temporary_password_is_password": "Vaše dočasné heslo je <strong>[password]</strong>.",
"Your_workspace_is_ready": "Váš prostředí je připraveno k použití 🎉"
}
}
5 changes: 2 additions & 3 deletions packages/rocketchat-i18n/i18n/cy.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,6 @@
"App_Information": "Gwybodaeth App",
"App_Installation": "Gosodiad App",
"App_status_auto_enabled": "Wedi'i alluogi",
"App_status_compiler_error_disabled": "Anabl: Gwall Cyflenwr",
"App_status_constructed": "Adeiladwyd",
"App_status_disabled": "Anabl",
"App_status_error_disabled": "Anabl: Gwall heb ei ddysgu",
Expand Down Expand Up @@ -1899,7 +1898,6 @@
"Office_Hours": "Oriau swyddfa",
"Office_hours_enabled": "Oriau Swyddfa Wedi eu Hwyluso",
"Office_hours_updated": "Diweddaru oriau swyddfa",
"RetentionPolicy_ExcludePinned": "Eithrio negeseuon wedi'u pinnio",
"Offline": "Offline",
"Offline_DM_Email": "Pwnc E-bost Neges Uniongyrchol",
"Offline_Email_Subject_Description": "Gallwch ddefnyddio'r canlynol o ddeiliaid lle: <br / ><ul><li>[Site_Name], [Site_URL], [Defnyddiwr] a [Ystafell] ar gyfer yr Enw Cais, URL, Enw Defnyddiwr a Ffenestri yn y drefn honno <li / ></ul>",
Expand Down Expand Up @@ -2138,6 +2136,7 @@
"Retail": "Manwerthu",
"Retention_setting_changed_successfully": "Mae lleoliad polisi cadwraeth wedi newid yn llwyddiannus",
"RetentionPolicy": "Polisi Cadw",
"RetentionPolicy_ExcludePinned": "Eithrio negeseuon wedi'u pinnio",
"RetentionPolicy_RoomWarning": "Mae negeseuon hŷn na __time__ yn cael eu prunedu'n awtomatig yma",
"RetentionPolicy_RoomWarning_Unpinned": "Mae negeseuon heb eu penodi yn hŷn na __time__ yn cael eu prunedu'n awtomatig yma",
"RetentionPolicy_RoomWarning_FilesOnly": "Mae ffeiliau hŷn na __time__ yn cael eu prunedu'n awtomatig yma (mae negeseuon yn aros yn gyfan)",
Expand Down Expand Up @@ -2838,4 +2837,4 @@
"Your_push_was_sent_to_s_devices": "Anfonwyd eich gwthio i ddyfeisiau %s",
"Your_server_link": "Dolen eich gweinydd",
"Your_workspace_is_ready": "Mae'ch gweithle yn barod i ddefnyddio 🎉"
}
}
Loading