Skip to content

Commit

Permalink
Merge pull request #1967 from zetkin/issue-1950/remove-event-from-cal…
Browse files Browse the repository at this point in the history
…endar

Remove events from calender on event deletion
  • Loading branch information
richardolsson committed May 17, 2024
2 parents a49dd05 + 2c286e4 commit 9caaff6
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 4 deletions.
2 changes: 1 addition & 1 deletion src/features/events/hooks/useEventsFromDateRange.ts
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ export default function useEventsFromDateRange(
const events = dateRange.flatMap((date) => {
const dateStr = date.slice(0, 10);
return eventsState.eventsByDate[dateStr].items
.filter((item) => !!item.data)
.filter((item) => !!item.data && !item.deleted)
.map((item) => item.data) as ZetkinEvent[];
});

Expand Down
3 changes: 0 additions & 3 deletions src/features/events/store.ts
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,6 @@ const eventsSlice = createSlice({

if (eventListItem) {
eventListItem.deleted = true;
state.eventList.isStale = true;
}

for (const date in state.eventsByDate) {
Expand All @@ -130,7 +129,6 @@ const eventsSlice = createSlice({

if (item) {
item.deleted = true;
state.eventsByDate[date].isStale = true;
}
}

Expand All @@ -141,7 +139,6 @@ const eventsSlice = createSlice({

if (item) {
item.deleted = true;
state.eventsByCampaignId[campaignId].isStale = true;
}
}
},
Expand Down

0 comments on commit 9caaff6

Please sign in to comment.