From 299d50d56cae93ce9c279e2ad896ad29e1e0ef23 Mon Sep 17 00:00:00 2001
From: Mark McDowall <mark@mcdowall.ca>
Date: Sun, 21 May 2023 17:51:22 -0700
Subject: [PATCH] Cleanup Calendar custom filters

(cherry picked from commit fd789343b587da252461d84bafba2d72651a11df)

Closes #9296
---
 frontend/src/App/State/CalendarAppState.ts    | 11 ++++++-----
 frontend/src/Calendar/CalendarFilterModal.tsx |  6 ++----
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/frontend/src/App/State/CalendarAppState.ts b/frontend/src/App/State/CalendarAppState.ts
index 64cf9d5a8..d13e7af6e 100644
--- a/frontend/src/App/State/CalendarAppState.ts
+++ b/frontend/src/App/State/CalendarAppState.ts
@@ -1,9 +1,10 @@
-import AppSectionState from 'App/State/AppSectionState';
+import AppSectionState, {
+  AppSectionFilterState,
+} from 'App/State/AppSectionState';
 import Movie from 'Movie/Movie';
-import { FilterBuilderProp } from './AppState';
 
-interface CalendarAppState extends AppSectionState<Movie> {
-  filterBuilderProps: FilterBuilderProp<Movie>[];
-}
+interface CalendarAppState
+  extends AppSectionState<Movie>,
+    AppSectionFilterState<Movie> {}
 
 export default CalendarAppState;
diff --git a/frontend/src/Calendar/CalendarFilterModal.tsx b/frontend/src/Calendar/CalendarFilterModal.tsx
index c09f73743..e26b2928b 100644
--- a/frontend/src/Calendar/CalendarFilterModal.tsx
+++ b/frontend/src/Calendar/CalendarFilterModal.tsx
@@ -23,13 +23,11 @@ function createFilterBuilderPropsSelector() {
   );
 }
 
-interface SeriesIndexFilterModalProps {
+interface CalendarFilterModalProps {
   isOpen: boolean;
 }
 
-export default function CalendarFilterModal(
-  props: SeriesIndexFilterModalProps
-) {
+export default function CalendarFilterModal(props: CalendarFilterModalProps) {
   const sectionItems = useSelector(createCalendarSelector());
   const filterBuilderProps = useSelector(createFilterBuilderPropsSelector());
   const customFilterType = 'calendar';