jan/openreplay
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(ui): fix slack/teams request duplication

Browse source
This commit is contained in:
nick-delirium 2023-10-30 12:11:45 +01:00
parent 40aee26521
commit 35f5bc6954
4 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frontend/app/components/shared/ProjectDropdown/ProjectDropdown.tsx
View file

@ -69,7 +69,7 @@ function ProjectDropdown(props: Props) {
{sites.map((site) => (
<Menu.Item
icon={<Icon name={site.platform === 'web' ? 'browser/browser' : 'mobile'} />}
icon={<Icon name={site.platform === 'web' ? 'browser/browser' : 'mobile'} color={activeSite?.host === site.host ? 'main' : undefined} />}
key={site.id}
onClick={() => handleSiteChange(site.id)}
className={cn('!py-2', activeSite?.host === site.host ? 'bg-active-blue' : '')}

6
frontend/app/components/shared/SharePopup/SharePopup.js
View file

@ -14,7 +14,9 @@ import { fetchList as fetchTeams, sendMsTeamsMsg } from 'Duck/integrations/teams
(state) => ({
sessionId: state.getIn(['sessions', 'current']).sessionId,
channels: state.getIn(['slack', 'list']),
slackLoaded: state.getIn(['slack', 'loaded']),
msTeamsChannels: state.getIn(['teams', 'list']),
msTeamsLoaded: state.getIn(['teams', 'loaded']),
tenantId: state.getIn(['user', 'account', 'tenantId']),
}),
{ fetchSlack, fetchTeams, sendSlackMsg, sendMsTeamsMsg }
@ -31,10 +33,10 @@ export default class SharePopup extends React.PureComponent {
componentDidUpdate() {
if (this.state.isOpen) {
if (this.props.channels.size === 0) {
if (this.props.channels.size === 0 && !this.props.slackLoaded) {
this.props.fetchSlack();
}
if (this.props.msTeamsChannels.size === 0) {
if (this.props.msTeamsChannels.size === 0 && !this.props.msTeamsLoaded) {
this.props.fetchTeams();
}
}

5
frontend/app/duck/integrations/slack.js
View file

@ -15,13 +15,16 @@ const itemInListUpdater = createItemInListUpdater(idKey);
const initialState = Map({
instance: Config(),
loaded: false,
list: List(),
});
const reducer = (state = initialState, action = {}) => {
switch (action.type) {
case FETCH_LIST.REQUEST:
return state.set('loaded', true);
case FETCH_LIST.SUCCESS:
return state.set('list', List(action.data).map(Config));
return state.set('list', List(action.data).map(Config)).set('loaded', true)
case UPDATE.SUCCESS:
case SAVE.SUCCESS:
const config = Config(action.data);

5
frontend/app/duck/integrations/teams.js
View file

@ -17,12 +17,15 @@ const itemInListUpdater = createItemInListUpdater(idKey);
const initialState = Map({
instance: Config(),
list: List(),
loaded: false,
});
const reducer = (state = initialState, action = {}) => {
switch (action.type) {
case FETCH_LIST.REQUEST:
return state.set('loaded', true);
case FETCH_LIST.SUCCESS:
return state.set('list', List(action.data).map(Config));
return state.set('list', List(action.data).map(Config)).set('loaded', true);
case UPDATE.SUCCESS:
case SAVE.SUCCESS:
const config = Config(action.data);