summaryrefslogtreecommitdiffstats
path: root/webapp/components/backstage/installed_incoming_webhooks.jsx
diff options
context:
space:
mode:
authorHarrison Healey <harrisonmhealey@gmail.com>2016-05-05 09:32:12 -0400
committerChristopher Speller <crspeller@gmail.com>2016-05-05 09:32:12 -0400
commit2c92540471004c79e317e8a0daf3e612560beda7 (patch)
tree2abed81a2b4340cfaeaed47e70a6b14d0129bc47 /webapp/components/backstage/installed_incoming_webhooks.jsx
parentfcb5b70eb348368421464553066ef9c715c66ff0 (diff)
downloadchat-2c92540471004c79e317e8a0daf3e612560beda7.tar.gz
chat-2c92540471004c79e317e8a0daf3e612560beda7.tar.bz2
chat-2c92540471004c79e317e8a0daf3e612560beda7.zip
PLT-2698 Integrations improvements (#2883)
* Fixed Integrations link to show up for non-admins (when enabled) and when only slash commands are enabled * Updated BackstageSidebar to only show enabled integrations * Added placeholder to integrations list when none exist * Added loading spinner to integrations pages when they're loading
Diffstat (limited to 'webapp/components/backstage/installed_incoming_webhooks.jsx')
-rw-r--r--webapp/components/backstage/installed_incoming_webhooks.jsx25
1 files changed, 14 insertions, 11 deletions
diff --git a/webapp/components/backstage/installed_incoming_webhooks.jsx b/webapp/components/backstage/installed_incoming_webhooks.jsx
index 0d6f900d1..389f65919 100644
--- a/webapp/components/backstage/installed_incoming_webhooks.jsx
+++ b/webapp/components/backstage/installed_incoming_webhooks.jsx
@@ -20,21 +20,16 @@ export default class InstalledIncomingWebhooks extends React.Component {
this.deleteIncomingWebhook = this.deleteIncomingWebhook.bind(this);
this.state = {
- incomingWebhooks: []
+ incomingWebhooks: IntegrationStore.getIncomingWebhooks(),
+ loading: !IntegrationStore.hasReceivedIncomingWebhooks()
};
}
- componentWillMount() {
+ componentDidMount() {
IntegrationStore.addChangeListener(this.handleIntegrationChange);
- if (window.mm_config.EnableIncomingWebhooks === 'true') {
- if (IntegrationStore.hasReceivedIncomingWebhooks()) {
- this.setState({
- incomingWebhooks: IntegrationStore.getIncomingWebhooks()
- });
- } else {
- AsyncClient.listIncomingHooks();
- }
+ if (window.mm_config.EnableIncomingWebhooks === 'true' && this.state.loading) {
+ AsyncClient.listIncomingHooks();
}
}
@@ -44,7 +39,8 @@ export default class InstalledIncomingWebhooks extends React.Component {
handleIntegrationChange() {
this.setState({
- incomingWebhooks: IntegrationStore.getIncomingWebhooks()
+ incomingWebhooks: IntegrationStore.getIncomingWebhooks(),
+ loading: !IntegrationStore.hasReceivedIncomingWebhooks()
});
}
@@ -78,6 +74,13 @@ export default class InstalledIncomingWebhooks extends React.Component {
/>
}
addLink={'/' + Utils.getTeamNameFromUrl() + '/settings/integrations/incoming_webhooks/add'}
+ emptyText={
+ <FormattedMessage
+ id='installed_incoming_webhooks.empty'
+ defaultMessage='No incoming webhooks found'
+ />
+ }
+ loading={this.state.loading}
>
{incomingWebhooks}
</InstalledIntegrations>