Skip to content

fix(speakers): Avoid refetching activities count unnecessarily #993

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mulldug wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(speakers): Avoid refetching activities count unnecessarily #993

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions src/actions/speaker-actions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -887,14 +887,19 @@ const parseFilters = (filters) => {
return filter;
};

const getSpeakersActivitiesCount =
(summitId, filter, accessToken) => (dispatch) => {
export const getSpeakersActivitiesCount =
(filters = {}) =>
async (dispatch, getState) => {
const { currentSummitState } = getState();
const accessToken = await getAccessTokenSafely();
const { currentSummit } = currentSummitState;
const filter = parseFilters(filters);
const params = { access_token: accessToken };
if (filter.length > 0) params["filter[]"] = filter;
return getRequest(
createAction(REQUEST_SPEAKERS_ACTIVITIES_COUNT),
createAction(RECEIVE_SPEAKERS_ACTIVITIES_COUNT),
`${window.API_BASE_URL}/api/v1/summits/${summitId}/speakers/all/events/count`,
`${window.API_BASE_URL}/api/v1/summits/${currentSummit.id}/speakers/all/events/count`,
authErrorHandler
)(params)(dispatch);
};
Expand Down Expand Up @@ -945,8 +950,6 @@ export const getSpeakersBySummit =
params.order = `${orderDirSign}${order}`;
}

dispatch(getSpeakersActivitiesCount(currentSummit.id, filter, accessToken));

return getRequest(
createAction(REQUEST_SPEAKERS_BY_SUMMIT),
createAction(RECEIVE_SPEAKERS_BY_SUMMIT),
Expand Down
15 changes: 8 additions & 7 deletions src/actions/submitter-actions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,19 @@ export const initSubmittersList = () => async (dispatch) => {
dispatch(createAction(INIT_SUBMITTERS_LIST_PARAMS)());
};

const getSubmittersActivitiesCount =
(summitId, filter, accessToken) => (dispatch) => {
export const getSubmittersActivitiesCount =
(filters = {}) =>
async (dispatch, getState) => {
const { currentSummitState } = getState();
const accessToken = await getAccessTokenSafely();
const { currentSummit } = currentSummitState;
const filter = parseFilters(filters);
const params = { access_token: accessToken };
if (filter.length > 0) params["filter[]"] = filter;
return getRequest(
createAction(REQUEST_SUBMITTERS_ACTIVITIES_COUNT),
createAction(RECEIVE_SUBMITTERS_ACTIVITIES_COUNT),
`${window.API_BASE_URL}/api/v1/summits/${summitId}/submitters/all/events/count`,
`${window.API_BASE_URL}/api/v1/summits/${currentSummit.id}/submitters/all/events/count`,
authErrorHandler
)(params)(dispatch);
};
Expand Down Expand Up @@ -113,10 +118,6 @@ export const getSubmittersBySummit =
params.order = `${orderDirSign}${order}`;
}

dispatch(
getSubmittersActivitiesCount(currentSummit.id, filter, accessToken)
);

return getRequest(
createAction(REQUEST_SUBMITTERS_BY_SUMMIT),
createAction(RECEIVE_SUBMITTERS_BY_SUMMIT),
Expand Down
99 changes: 71 additions & 28 deletions src/pages/summit_speakers/summit-speakers-list-page.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import SpeakerPromoCodeSpecForm from "../../components/forms/speakers-promo-code
import {
initSpeakersList,
getSpeakersBySummit,
getSpeakersActivitiesCount,
exportSummitSpeakers,
selectSummitSpeaker,
unselectSummitSpeaker,
Expand All @@ -35,6 +36,7 @@ import {
import {
initSubmittersList,
getSubmittersBySummit,
getSubmittersActivitiesCount,
exportSummitSubmitters,
selectSummitSubmitter,
unselectSummitSubmitter,
Expand Down Expand Up @@ -146,13 +148,28 @@ class SummitSpeakersListPage extends React.Component {
: this.props.submittersProps;
}

getBySummit(term, page, perPage, order, orderDir, filters) {
getBySummit(
term,
page,
perPage,
order,
orderDir,
filters,
refreshCount = true
) {
const { source } = this.state;
const callable =
source === sources.speakers
? this.props.getSpeakersBySummit
: this.props.getSubmittersBySummit;
callable(term, page, perPage, order, orderDir, filters, source);
if (refreshCount) {
const countCallable =
source === sources.speakers
? this.props.getSpeakersActivitiesCount
: this.props.getSubmittersActivitiesCount;
countCallable(filters);
}
}

export(term, order, orderDir, filters) {
Expand Down Expand Up @@ -220,15 +237,23 @@ class SummitSpeakersListPage extends React.Component {
const {
speakerFilters: { orAndFilter }
} = this.state;
this.getBySummit(term, page, perPage, order, orderDir, {
selectionPlanFilter,
trackFilter,
trackGroupFilter,
activityTypeFilter,
selectionStatusFilter,
orAndFilter,
mediaUploadTypeFilter
});
this.getBySummit(
term,
page,
perPage,
order,
orderDir,
{
selectionPlanFilter,
trackFilter,
trackGroupFilter,
activityTypeFilter,
selectionStatusFilter,
orAndFilter,
mediaUploadTypeFilter
},
false
);
}

handleSort(index, key, dir) {
Expand All @@ -246,15 +271,23 @@ class SummitSpeakersListPage extends React.Component {
const {
speakerFilters: { orAndFilter }
} = this.state;
this.getBySummit(term, page, perPage, key, dir, {
selectionPlanFilter,
trackFilter,
trackGroupFilter,
activityTypeFilter,
selectionStatusFilter,
orAndFilter,
mediaUploadTypeFilter
});
this.getBySummit(
term,
page,
perPage,
key,
dir,
{
selectionPlanFilter,
trackFilter,
trackGroupFilter,
activityTypeFilter,
selectionStatusFilter,
orAndFilter,
mediaUploadTypeFilter
},
false
);
}

handleSearch(term) {
Expand All @@ -273,15 +306,23 @@ class SummitSpeakersListPage extends React.Component {
const {
speakerFilters: { orAndFilter }
} = this.state;
this.getBySummit(term, page, perPage, order, orderDir, {
selectionPlanFilter,
trackFilter,
trackGroupFilter,
activityTypeFilter,
selectionStatusFilter,
orAndFilter,
mediaUploadTypeFilter
});
this.getBySummit(
term,
page,
perPage,
order,
orderDir,
{
selectionPlanFilter,
trackFilter,
trackGroupFilter,
activityTypeFilter,
selectionStatusFilter,
orAndFilter,
mediaUploadTypeFilter
},
false
);
}

handleChangeSelectionPlanFilter(ev) {
Expand Down Expand Up @@ -1222,6 +1263,7 @@ const mapStateToProps = ({
export default connect(mapStateToProps, {
initSpeakersList,
getSpeakersBySummit,
getSpeakersActivitiesCount,
exportSummitSpeakers,
selectSummitSpeaker,
unselectSummitSpeaker,
Expand All @@ -1231,6 +1273,7 @@ export default connect(mapStateToProps, {
sendSpeakerEmails,
initSubmittersList,
getSubmittersBySummit,
getSubmittersActivitiesCount,
exportSummitSubmitters,
selectSummitSubmitter,
unselectSummitSubmitter,
Expand Down
Loading