PLT-7309: Fix webook management when permitted for non-admins. (#7132)

Этот коммит содержится в:
George Goldberg
2017-08-08 13:45:17 +01:00
коммит произвёл Joram Wilander
родитель 82407bd44a
Коммит 5132c62d15
3 изменённых файлов: 32 добавлений и 4 удалений

Просмотреть файл

@@ -33,6 +33,20 @@ export function loadIncomingHooks(complete) {
);
}
export function loadIncomingHooksForTeam(teamId, complete) {
IntegrationActions.getIncomingHooks(teamId, 0, 10000)(dispatch, getState).then(
(data) => {
if (data) {
loadProfilesForIncomingHooks(data);
}
if (complete) {
complete(data);
}
}
);
}
function loadProfilesForIncomingHooks(hooks) {
const profilesToLoad = {};
for (let i = 0; i < hooks.length; i++) {
@@ -64,6 +78,20 @@ export function loadOutgoingHooks(complete) {
);
}
export function loadOutgoingHooksForTeam(teamId, complete) {
IntegrationActions.getOutgoingHooks('', teamId, 0, 10000)(dispatch, getState).then(
(data) => {
if (data) {
loadProfilesForOutgoingHooks(data);
}
if (complete) {
complete(data);
}
}
);
}
function loadProfilesForOutgoingHooks(hooks) {
const profilesToLoad = {};
for (let i = 0; i < hooks.length; i++) {

Просмотреть файл

@@ -9,7 +9,7 @@ import IntegrationStore from 'stores/integration_store.jsx';
import TeamStore from 'stores/team_store.jsx';
import UserStore from 'stores/user_store.jsx';
import {loadIncomingHooks, deleteIncomingHook} from 'actions/integration_actions.jsx';
import {loadIncomingHooksForTeam, deleteIncomingHook} from 'actions/integration_actions.jsx';
import * as Utils from 'utils/utils.jsx';
@@ -48,7 +48,7 @@ export default class InstalledIncomingWebhooks extends React.Component {
UserStore.addChangeListener(this.handleUserChange);
if (window.mm_config.EnableIncomingWebhooks === 'true') {
loadIncomingHooks(() => this.setState({loading: false}));
loadIncomingHooksForTeam(TeamStore.getCurrentId(), () => this.setState({loading: false}));
}
}

Просмотреть файл

@@ -9,7 +9,7 @@ import IntegrationStore from 'stores/integration_store.jsx';
import TeamStore from 'stores/team_store.jsx';
import UserStore from 'stores/user_store.jsx';
import {loadOutgoingHooks, regenOutgoingHookToken, deleteOutgoingHook} from 'actions/integration_actions.jsx';
import {loadOutgoingHooksForTeam, regenOutgoingHookToken, deleteOutgoingHook} from 'actions/integration_actions.jsx';
import * as Utils from 'utils/utils.jsx';
@@ -49,7 +49,7 @@ export default class InstalledOutgoingWebhooks extends React.Component {
UserStore.addChangeListener(this.handleUserChange);
if (window.mm_config.EnableOutgoingWebhooks === 'true') {
loadOutgoingHooks(() => this.setState({loading: false}));
loadOutgoingHooksForTeam(TeamStore.getCurrentId(), () => this.setState({loading: false}));
}
}