Page MenuHomePhorge
Files F32562281

D6462.1767336668.diff
No OneTemporary
Actions

Size
2 KB
Referenced Files
None
Subscribers
None

D6462.1767336668.diff
View Options

diff --git a/web/calendar/filter-panel.react.js b/web/calendar/filter-panel.react.js
--- a/web/calendar/filter-panel.react.js
+++ b/web/calendar/filter-panel.react.js
@@ -36,6 +36,7 @@
useFilterThreadInfos,
useFilterThreadSearchIndex,
} from '../selectors/calendar-selectors';
+import { filteredCommunityThreadIDsSelector } from '../selectors/thread-selectors';
import { MagnifyingGlass } from '../vectors.react';
import css from './filter-panel.css';
@@ -43,6 +44,7 @@
+filterThreadInfos: $ReadOnlyArray<FilterThreadInfo>,
+filterThreadSearchIndex: SearchIndex,
+filteredThreadIDs: ?$ReadOnlySet<string>,
+ +filteredCommunityThreadIDs: ?$ReadOnlySet<string>,
+includeDeleted: boolean,
+dispatch: Dispatch,
+pushModal: PushModal,
@@ -66,10 +68,20 @@
return this.props.filteredThreadIDs.has(threadID);
}
+ inCurrentCommunity(threadID: string): boolean {
+ if (!this.props.filteredCommunityThreadIDs) {
+ return true;
+ }
+ return this.props.filteredCommunityThreadIDs.has(threadID);
+ }
+
render() {
- const filterThreadInfos = this.state.query
+ let filterThreadInfos = this.state.query
? this.state.searchResults
: this.props.filterThreadInfos;
+ filterThreadInfos = filterThreadInfos.filter(item =>
+ this.inCurrentCommunity(item.threadInfo.id),
+ );
let filters = [];
if (!this.state.query || filterThreadInfos.length > 0) {
@@ -362,6 +374,9 @@
const ConnectedFilterPanel: React.ComponentType<{}> = React.memo<{}>(
function ConnectedFilterPanel(): React.Node {
const filteredThreadIDs = useSelector(filteredThreadIDsSelector);
+ const filteredCommunityThreadIDs = useSelector(
+ filteredCommunityThreadIDsSelector,
+ );
const filterThreadInfos = useFilterThreadInfos();
const filterThreadSearchIndex = useFilterThreadSearchIndex();
const includeDeleted = useSelector(includeDeletedSelector);
@@ -371,6 +386,7 @@
return (
<FilterPanel
filteredThreadIDs={filteredThreadIDs}
+ filteredCommunityThreadIDs={filteredCommunityThreadIDs}
filterThreadInfos={filterThreadInfos}
filterThreadSearchIndex={filterThreadSearchIndex}
includeDeleted={includeDeleted}

File Metadata

Mime Type
text/plain
Expires
Fri, Jan 2, 6:51 AM (3 h, 46 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5878569
Default Alt Text
D6462.1767336668.diff (2 KB)

Event Timeline