diff --git a/web/redux/redux-setup.js b/web/redux/redux-setup.js --- a/web/redux/redux-setup.js +++ b/web/redux/redux-setup.js @@ -65,7 +65,7 @@ updatesCurrentAsOf: number, loadingStatuses: { [key: string]: { [idx: number]: LoadingStatus } }, calendarFilters: $ReadOnlyArray, - communityIDFilter: ?string, + calendarPickedCommunityID: ?string, urlPrefix: string, windowDimensions: WindowDimensions, cookie?: void, @@ -141,14 +141,14 @@ threadIDs, }, ], - communityIDFilter: action.payload, + calendarPickedCommunityID: action.payload, }; } else if (action.type === clearCalendarCommunityFilter) { const nonThreadFilters = nonThreadCalendarFilters(state.calendarFilters); return { ...state, calendarFilters: nonThreadFilters, - communityIDFilter: null, + calendarPickedCommunityID: null, }; } else if (action.type === setNewSessionActionType) { if ( diff --git a/web/selectors/calendar-selectors.js b/web/selectors/calendar-selectors.js --- a/web/selectors/calendar-selectors.js +++ b/web/selectors/calendar-selectors.js @@ -44,19 +44,27 @@ const filterThreadIDsBelongingToCommunitySelector: ( state: AppState, ) => ?$ReadOnlySet = createSelector( - (state: AppState) => state.communityIDFilter, + (state: AppState) => state.calendarPickedCommunityID, threadInfoSelector, - (communityIDFilter: ?string, threadInfos: { +[id: string]: ThreadInfo }) => { - if (!communityIDFilter) { + ( + calendarPickedCommunityID: ?string, + threadInfos: { +[id: string]: ThreadInfo }, + ) => { + if (!calendarPickedCommunityID) { return null; } - return filterThreadIDsBelongingToCommunity(communityIDFilter, threadInfos); + return filterThreadIDsBelongingToCommunity( + calendarPickedCommunityID, + threadInfos, + ); }, ); function useCommunityIsPicked(communityID: string): boolean { - const communityIDFilter = useSelector(state => state.communityIDFilter); - return communityID === communityIDFilter; + const calendarPickedCommunityID = useSelector( + state => state.calendarPickedCommunityID, + ); + return communityID === calendarPickedCommunityID; } export {