Skip to content

Commit

Permalink
[FIX] App's i18nAlert is only being displayed as "i18nAlert" (#11802)
Browse files Browse the repository at this point in the history
* Fix the i18nAlert not being displayed from Apps

* Fix the apps http being invalid when being used as promises
  • Loading branch information
graywolf336 authored and rodrigok committed Aug 17, 2018
1 parent 22974cf commit 350738b
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 15 deletions.
22 changes: 11 additions & 11 deletions packages/rocketchat-apps/client/admin/appManage.html
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
<div class="rc-input__error-icon">
{{> icon block="rc-input__error-icon" icon="warning" classes="rc-input__error-icon-svg"}}
</div>
<div class="rc-input__error-message">{{_ "i18nAlert"}}</div>
<div class="rc-input__error-message">{{{parseDescription i18nAlert}}}</div>
</div>
{{/if}}
</div>
Expand All @@ -97,7 +97,7 @@
<div class="rc-input__error-icon">
{{> icon block="rc-input__error-icon" icon="warning" classes="rc-input__error-icon-svg"}}
</div>
<div class="rc-input__error-message">{{_ "i18nAlert"}}</div>
<div class="rc-input__error-message">{{{parseDescription i18nAlert}}}</div>
</div>
{{/if}}
</div>
Expand All @@ -121,7 +121,7 @@
<div class="rc-input__error-icon">
{{> icon block="rc-input__error-icon" icon="warning" classes="rc-input__error-icon-svg"}}
</div>
<div class="rc-input__error-message">{{_ "i18nAlert"}}</div>
<div class="rc-input__error-message">{{{parseDescription i18nAlert}}}</div>
</div>
{{/if}}
</div>
Expand All @@ -145,7 +145,7 @@
<div class="rc-input__error-icon">
{{> icon block="rc-input__error-icon" icon="warning" classes="rc-input__error-icon-svg"}}
</div>
<div class="rc-input__error-message">{{_ "i18nAlert"}}</div>
<div class="rc-input__error-message">{{{parseDescription i18nAlert}}}</div>
</div>
{{/if}}
</div>
Expand All @@ -167,7 +167,7 @@
<div class="rc-input__error-icon">
{{> icon block="rc-input__error-icon" icon="warning" classes="rc-input__error-icon-svg"}}
</div>
<div class="rc-input__error-message">{{_ "i18nAlert"}}</div>
<div class="rc-input__error-message">{{{parseDescription i18nAlert}}}</div>
</div>
{{/if}}
</div>
Expand All @@ -191,7 +191,7 @@
<div class="rc-input__error-icon">
{{> icon block="rc-input__error-icon" icon="warning" classes="rc-input__error-icon-svg"}}
</div>
<div class="rc-input__error-message">{{_ "i18nAlert"}}</div>
<div class="rc-input__error-message">{{{parseDescription i18nAlert}}}</div>
</div>
{{/if}}
</div>
Expand Down Expand Up @@ -224,7 +224,7 @@
<div class="rc-input__error-icon">
{{> icon block="rc-input__error-icon" icon="warning" classes="rc-input__error-icon-svg"}}
</div>
<div class="rc-input__error-message">{{_ "i18nAlert"}}</div>
<div class="rc-input__error-message">{{{parseDescription i18nAlert}}}</div>
</div>
{{/if}}
</div>
Expand All @@ -250,7 +250,7 @@
<div class="rc-input__error-icon">
{{> icon block="rc-input__error-icon" icon="warning" classes="rc-input__error-icon-svg"}}
</div>
<div class="rc-input__error-message">{{_ "i18nAlert"}}</div>
<div class="rc-input__error-message">{{{parseDescription i18nAlert}}}</div>
</div>
{{/if}}
</div>
Expand All @@ -275,7 +275,7 @@
<div class="rc-input__error-icon">
{{> icon block="rc-input__error-icon" icon="warning" classes="rc-input__error-icon-svg"}}
</div>
<div class="rc-input__error-message">{{_ "i18nAlert"}}</div>
<div class="rc-input__error-message">{{{parseDescription i18nAlert}}}</div>
</div>
{{/if}}
</div>
Expand Down Expand Up @@ -325,7 +325,7 @@
<div class="rc-input__error-icon">
{{> icon block="rc-input__error-icon" icon="warning" classes="rc-input__error-icon-svg"}}
</div>
<div class="rc-input__error-message">{{_ "i18nAlert"}}</div>
<div class="rc-input__error-message">{{{parseDescription i18nAlert}}}</div>
</div>
{{/if}}
</div>
Expand Down Expand Up @@ -376,7 +376,7 @@
<div class="settings-description">{{{parseDescription i18nDescription}}}</div>
{{/if}}
{{#if i18nAlert}}
<div class="settings-alert pending-color pending-background pending-border"><i class="icon-attention secondary-font-color"></i>{{{_ i18nAlert}}}</div>
<div class="settings-alert pending-color pending-background pending-border"><i class="icon-attention secondary-font-color"></i>{{{parseDescription i18nAlert}}}</div>
{{/if}}
</div>
</div>
Expand Down
10 changes: 6 additions & 4 deletions packages/rocketchat-apps/server/bridges/http.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
export class AppHttpBridge {
call(info) {
async call(info) {
if (!info.request.content && typeof info.request.data === 'object') {
info.request.content = JSON.stringify(info.request.data);
}

console.log(`The App ${ info.appId } is requesting from the outter webs:`, info);

return new Promise((resolve, reject) => {
HTTP.call(info.method, info.url, info.request, (e, result) => (e ? reject(e.response) : resolve(result)));
});
try {
return HTTP.call(info.method, info.url, info.request);
} catch (e) {
return e.response;
}
}
}

0 comments on commit 350738b

Please sign in to comment.