Skip to content

Commit

Permalink
Allow click on command previews and add setting to control apps enabl…
Browse files Browse the repository at this point in the history
…ement (#10853)
  • Loading branch information
graywolf336 authored and rodrigok committed May 23, 2018
1 parent 07cb9ab commit 888e2d9
Show file tree
Hide file tree
Showing 11 changed files with 412 additions and 116 deletions.
10 changes: 2 additions & 8 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,7 @@
"sourceMapPathOverrides": {
"meteor://💻app/packages/rocketchat:*": "${workspaceFolder}/packages/rocketchat-*"
},
"protocol": "inspector",
"env": {
"USE_UNRELEASED_ROCKETAPPS_FRAMEWORK": "true"
}
"protocol": "inspector"
},
{
"type": "node",
Expand All @@ -57,10 +54,7 @@
"sourceMapPathOverrides": {
"meteor://💻app/packages/rocketchat:*": "${workspaceFolder}/packages/rocketchat-*"
},
"protocol": "inspector",
"env": {
"USE_UNRELEASED_ROCKETAPPS_FRAMEWORK": "true"
}
"protocol": "inspector"
},
{
"type": "node",
Expand Down
86 changes: 45 additions & 41 deletions packages/rocketchat-apps/client/admin/appManage.html
Original file line number Diff line number Diff line change
Expand Up @@ -54,28 +54,27 @@
{{#each settings}}
<div class="rc-apps-settings__item">
{{#if $eq type 'string'}}

<div class="rc-input">
<label class="rc-input__label">
<div class="rc-input__title">{{_ i18nLabel}}</div>
<div class="rc-input__wrapper">
{{#if multiline}}
<textarea class="rc-input__element" name="{{id}}" rows="4" style="height: auto">{{value}}</textarea>
<textarea class="rc-input__element" name="{{id}}" rows="4" style="height: auto">{{value}}</textarea>
{{else}}
<input class="rc-input__element" type="text" name="{{id}}" value="{{value}}" placeholder="{{_ i18nPlaceholder}}" />
<input class="rc-input__element" type="text" name="{{id}}" value="{{value}}" placeholder="{{_ i18nPlaceholder}}" />
{{/if}}
</div>
</label>
{{# if i18nDescription}}
<div class="rc-input__description">{{{parseDescription i18nDescription}}}</div>
{{#if i18nDescription}}
<div class="rc-input__description">{{{parseDescription i18nDescription}}}</div>
{{/if}}
{{# if i18nAlert}}
<div class="rc-input__error">
<div class="rc-input__error-icon">
{{> icon block="rc-input__error-icon" icon="warning" classes="rc-input__error-icon-svg"}}
{{#if i18nAlert}}
<div class="rc-input__error">
<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>
<div class="rc-input__error-message">{{_ "i18nAlert"}}</div>
</div>
{{/if}}
</div>
{{else if $eq type 'boolean'}}
Expand All @@ -90,6 +89,14 @@
</span>
</label>
<span class="rc-switch__description">{{{parseDescription i18nDescription}}}</span>
{{# if i18nAlert}}
<div class="rc-input__error">
<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>
{{/if}}
</div>
{{else if $eq type 'int'}}
<div class="rc-input">
Expand All @@ -104,15 +111,15 @@
</div>
</label>
{{# if i18nDescription}}
<div class="rc-input__description">{{{parseDescription i18nDescription}}}</div>
<div class="rc-input__description">{{{parseDescription i18nDescription}}}</div>
{{/if}}
{{# if i18nAlert}}
<div class="rc-input__error">
<div class="rc-input__error-icon">
{{> icon block="rc-input__error-icon" icon="warning" classes="rc-input__error-icon-svg"}}
<div class="rc-input__error">
<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>
<div class="rc-input__error-message">{{_ "i18nAlert"}}</div>
</div>
{{/if}}
</div>
{{else if $eq type 'password'}}
Expand All @@ -128,15 +135,15 @@
</div>
</label>
{{# if i18nDescription}}
<div class="rc-input__description">{{{parseDescription i18nDescription}}}</div>
<div class="rc-input__description">{{{parseDescription i18nDescription}}}</div>
{{/if}}
{{# if i18nAlert}}
<div class="rc-input__error">
<div class="rc-input__error-icon">
{{> icon block="rc-input__error-icon" icon="warning" classes="rc-input__error-icon-svg"}}
<div class="rc-input__error">
<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>
<div class="rc-input__error-message">{{_ "i18nAlert"}}</div>
</div>
{{/if}}
</div>
{{else if $eq type 'relativeUrl'}}
Expand All @@ -150,15 +157,15 @@
</div>
</label>
{{# if i18nDescription}}
<div class="rc-input__description">{{{parseDescription i18nDescription}}}</div>
<div class="rc-input__description">{{{parseDescription i18nDescription}}}</div>
{{/if}}
{{# if i18nAlert}}
<div class="rc-input__error">
<div class="rc-input__error-icon">
{{> icon block="rc-input__error-icon" icon="warning" classes="rc-input__error-icon-svg"}}
<div class="rc-input__error">
<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>
<div class="rc-input__error-message">{{_ "i18nAlert"}}</div>
</div>
{{/if}}
</div>
{{else if $eq type 'font'}}
Expand All @@ -174,15 +181,15 @@
</div>
</label>
{{# if i18nDescription}}
<div class="rc-input__description">{{{parseDescription i18nDescription}}}</div>
<div class="rc-input__description">{{{parseDescription i18nDescription}}}</div>
{{/if}}
{{# if i18nAlert}}
<div class="rc-input__error">
<div class="rc-input__error-icon">
{{> icon block="rc-input__error-icon" icon="warning" classes="rc-input__error-icon-svg"}}
<div class="rc-input__error">
<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>
<div class="rc-input__error-message">{{_ "i18nAlert"}}</div>
</div>
{{/if}}
</div>
{{else if $eq type 'code'}}
Expand Down Expand Up @@ -220,8 +227,6 @@
</div>

{{else if $eq type 'select'}}


<div class="rc-input">
<label class="rc-input__label">
<div class="rc-input__title">{{_ i18nLabel}}</div>
Expand All @@ -248,7 +253,6 @@
</div>

{{else if $eq type 'color'}}

<div class="rc-input">
<label class="rc-input__label">
<div class="rc-input__title">{{_ i18nLabel}}</div>
Expand Down Expand Up @@ -381,9 +385,9 @@
</div>
<div class="rc-apps-container">
<div class="rc-button-group">
<button class="rc-button rc-button--secondary js-cancel">{{ _ "Cancel" }}</button>
<button class="rc-button rc-button--primary js-save {{#if saving}} loading{{/if}}" disabled='{{disabled}}'>{{ _ "Save" }}</button>
<button class="rc-button rc-button--cancel js-uninstall">{{ _ "Uninstall" }}</button>
<button class="rc-button rc-button--secondary js-cancel">{{_ "Cancel" }}</button>
<button class="rc-button rc-button--primary js-save {{#if saving}} loading{{/if}}" disabled='{{disabled}}'>{{_ "Save" }}</button>
<button class="rc-button rc-button--cancel js-uninstall">{{_ "Uninstall" }}</button>
<button class="rc-button rc-button--secondary js-update">{{_ "Update" }}</button>
<button class="rc-button rc-button--secondary js-view-logs">{{_ "View_Logs" }}</button>
</div>
Expand Down
26 changes: 26 additions & 0 deletions packages/rocketchat-apps/client/admin/appWhatIsIt.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<template name="appWhatIsIt">
<section class="page-container page-home page-static content-background-color">
{{> header sectionName="Apps_WhatIsIt" hideHelp=true fixedHeight=true}}
<div class="content">
{{#if isLoading}}
{{> loading}}
{{else if hasError}}
<div class="apps-error error-color">
<i class="icon-attention"></i>
<p>Sadly, an error has occured while loading this page.</p>
</div>
{{else}}
<p>{{_ "Apps_WhatIsIt_paragraph1"}}</p>
<p>{{_ "Apps_WhatIsIt_paragraph2"}}</p>
<p>
{{_ "Apps_WhatIsIt_paragraph3"}}
<a href="https://github.com/RocketChat/Rocket.Chat.Apps-dev-environment/blob/master/README.md" target="_blank">https://github.com/RocketChat/Rocket.Chat.Apps-dev-environment/blob/master/README.md</a>
</p>
<p>
{{_ "Apps_WhatIsIt_paragraph4"}}
<button class="rc-button rc-button--primary js-enable">{{_ "Enable" }}</button>
</p>
{{/if}}
</div>
</section>
</template>
39 changes: 39 additions & 0 deletions packages/rocketchat-apps/client/admin/appWhatIsIt.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
Template.appWhatIsIt.onCreated(function() {
this.isLoading = new ReactiveVar(false);
this.hasError = new ReactiveVar(false);
});

Template.appWhatIsIt.helpers({
isLoading() {
if (Template.instance().isLoading) {
return Template.instance().isLoading.get();
}

return false;
},
hasError() {
if (Template.instance().hasError) {
return Template.instance().hasError.get();
}

return false;
}
});

Template.appWhatIsIt.events({
'click .js-enable'(e, t) {
t.isLoading.set(true);

Meteor.call('apps/go-enable', function _appsMightHaveBeenEnabled(error) {
if (error) {
t.hasError.set(true);
t.isLoading.set(false);
return;
}

window.Apps.load(true);

FlowRouter.go('/admin/apps');
});
}
});
12 changes: 6 additions & 6 deletions packages/rocketchat-apps/client/admin/apps.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
{{#if description}}
<span class="rc-directory-channel-description">{{description}}</span>
{{/if}}
</div>
</div>
</div>
</td>
<td class="rc-table-td rc-table-td--users">{{version}}</td>
Expand All @@ -42,11 +42,11 @@
</td>
</tr>
{{else}}
<tr class="rc-table-tr" data-name="{{name}}">
<td class="rc-table-td rc-table-td--name">
{{_ "There_are_no_applications_installed"}}
</td>
</tr>
<tr class="rc-table-tr" data-name="{{name}}">
<td class="rc-table-td rc-table-td--name">
{{_ "There_are_no_applications_installed"}}
</td>
</tr>
{{/each}}
</tbody>
</table>
Expand Down
Loading

0 comments on commit 888e2d9

Please sign in to comment.