Cleanup Calendar custom filters

(cherry picked from commit fd789343b587da252461d84bafba2d72651a11df)

Closes #9296

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> {
+interface CalendarAppState
-  filterBuilderProps: FilterBuilderProp<Movie>[];
+  extends AppSectionState<Movie>,
-}
+    AppSectionFilterState<Movie> {}
 
 export default CalendarAppState;

frontend/src/Calendar/CalendarFilterModal.tsx

@@ -23,13 +23,11 @@ function createFilterBuilderPropsSelector() {
   );
 }
 
-interface SeriesIndexFilterModalProps {
+interface CalendarFilterModalProps {
   isOpen: boolean;
 }
 
-export default function CalendarFilterModal(
+export default function CalendarFilterModal(props: CalendarFilterModalProps) {
-  props: SeriesIndexFilterModalProps
-) {
   const sectionItems = useSelector(createCalendarSelector());
   const filterBuilderProps = useSelector(createFilterBuilderPropsSelector());
   const customFilterType = 'calendar';