Merge pull request #359 from cap-md089/r-a303931/fix-page-state-updates

fix: added page state deletion code
cap-md089 · Jun 22, 2023 · 00596a2 · 00596a2
2 parents 29f504b + 30e4d92
commit 00596a2
Show file tree

Hide file tree

Showing 30 changed files with 82 additions and 196 deletions.
diff --git a/packages/client/src/__tests__/pages/events/AttendanceMultiAdd.test.tsx b/packages/client/src/__tests__/pages/events/AttendanceMultiAdd.test.tsx
@@ -131,6 +131,7 @@ describe('EventViewer', () => {
 						updateApp={() => void 0}
 						updateBreadCrumbs={() => void 0}
 						updateSideNav={() => void 0}
+						deleteReduxState={() => void 0}
 					/>
 				</FetchAPIProvider>
 			</MemoryRouter>,

diff --git a/packages/client/src/__tests__/pages/events/EventViewer.test.tsx b/packages/client/src/__tests__/pages/events/EventViewer.test.tsx
@@ -145,6 +145,7 @@ describe('EventViewer', () => {
 						updateApp={() => void 0}
 						updateBreadCrumbs={() => void 0}
 						updateSideNav={() => void 0}
+						deleteReduxState={() => void 0}
 					/>
 				</FetchAPIProvider>
 			</MemoryRouter>,
@@ -204,6 +205,7 @@ describe('EventViewer', () => {
 						updateBreadCrumbs={() => void 0}
 						updateSideNav={() => void 0}
 						now={always(0)}
+						deleteReduxState={() => void 0}
 					/>
 				</FetchAPIProvider>
 			</MemoryRouter>,

diff --git a/packages/client/src/components/PageRouter.tsx b/packages/client/src/components/PageRouter.tsx
@@ -66,6 +66,9 @@ import { BreadCrumb } from './BreadCrumbs';
 import ErrorHandler from './ErrorHandler';
 import Loader from './Loader';
 import { SideNavigationItem } from './page-elements/SideNavigation';
+import { connect } from 'react-redux';
+import { deletePageState } from '../state/pageState';
+import { AnyAction } from 'redux';
 
 const pages: Array<{
 	url: string;
@@ -284,6 +287,7 @@ const composeElement =
 		fullMemberDetails: SigninReturn;
 		updateApp: () => void;
 		key: string;
+		deleteReduxState: () => void;
 	}) =>
 	(routeProps: RouteComponentProps<any>) =>
 		(
@@ -299,6 +303,7 @@ const composeElement =
 				member={props.member}
 				fullMemberDetails={props.fullMemberDetails}
 				routeProps={routeProps}
+				deleteReduxState={props.deleteReduxState}
 			/>
 		);
 
@@ -313,6 +318,7 @@ interface PageDisplayerProps {
 	fullMemberDetails: SigninReturn;
 	routeProps: RouteComponentProps<any>;
 	updateApp: () => void;
+	deleteReduxState: () => void;
 }
 
 class PageDisplayer extends React.Component<PageDisplayerProps> {
@@ -355,6 +361,7 @@ class PageDisplayer extends React.Component<PageDisplayerProps> {
 					key="mainpage"
 					registry={this.props.registry}
 					prepareURL={this.prepareURL}
+					deleteReduxState={this.props.deleteReduxState}
 				/>
 			</ErrorHandler>
 		);
@@ -374,6 +381,7 @@ interface PageRouterProps extends RouteComponentProps<any> {
 	registry: RegistryValues;
 	fullMemberDetails: SigninReturn;
 	updateApp: () => void;
+	dispatch: (action: AnyAction) => void;
 }
 
 interface PageRouterState {
@@ -469,6 +477,7 @@ class PageRouter extends React.Component<PageRouterProps, PageRouterState> {
 								fullMemberDetails: this.props.fullMemberDetails,
 								updateApp: this.props.updateApp,
 								key: value.url,
+								deleteReduxState: () => this.props.dispatch(deletePageState)
 							})}
 						/>
 					))}
@@ -477,4 +486,4 @@ class PageRouter extends React.Component<PageRouterProps, PageRouterState> {
 		);
 }
 
-export default withRouter(PageRouter);
+export default connect()(withRouter(PageRouter));
diff --git a/packages/client/src/pages/Calendar.tsx b/packages/client/src/pages/Calendar.tsx
@@ -122,6 +122,8 @@ export default class Calendar extends Page<
 			},
 		]);
 
+		this.props.deleteReduxState();
+
 		this.updateTitle('Calendar');
 
 		this.props.updateSideNav([]);

diff --git a/packages/client/src/pages/Main.tsx b/packages/client/src/pages/Main.tsx
@@ -68,6 +68,8 @@ export default class Main extends Page<PageProps, MainState> {
 	};
 
 	public async componentDidMount(): Promise<void> {
+		this.props.deleteReduxState();
+
 		const links: SideNavigationItem[] = [
 			{
 				target: '/team',

diff --git a/packages/client/src/pages/NotFound.tsx b/packages/client/src/pages/NotFound.tsx
@@ -32,6 +32,9 @@ export default class NotFound extends Page<PageProps> {
 		]);
 		this.props.updateSideNav([]);
 		this.updateTitle('Not found');
+
+		this.props.deleteReduxState();
+
 	}
 
 	public render = (): JSX.Element => (

diff --git a/packages/client/src/pages/Page.tsx b/packages/client/src/pages/Page.tsx
@@ -37,6 +37,7 @@ export interface PageProps<R = {}> {
 	updateSideNav: (links: SideNavigationItem[], force?: boolean) => void;
 	updateBreadCrumbs: (links: BreadCrumb[]) => void;
 	updateApp: () => void;
+	deleteReduxState: () => void;
 
 	/**
 	 * IGNORE, DO NOT USE

diff --git a/packages/client/src/pages/account/FinishPasswordReset.tsx b/packages/client/src/pages/account/FinishPasswordReset.tsx
@@ -55,6 +55,10 @@ export default class FinishPasswordResetForm extends Page<
 		this.submit = this.submit.bind(this);
 	}
 
+	public componentDidMount(): void {
+		this.props.deleteReduxState();
+	}
+
 	public render = (): JSX.Element => (
 		<SimpleForm<FinishPasswordResetFormValues>
 			values={this.state.form}

diff --git a/packages/client/src/pages/account/FinishSignup.tsx b/packages/client/src/pages/account/FinishSignup.tsx
@@ -48,6 +48,10 @@ export default class FinishSignup extends Page<PageProps<{ token: string }>, Fin
 		tryingFinish: false,
 	};
 
+	public componentDidMount(): void {
+		this.props.deleteReduxState();
+	}
+
 	public render = (): JSX.Element => (
 		<SimpleForm<FormValues>
 			disableOnInvalid={true}

diff --git a/packages/client/src/pages/account/RegisterDiscord.tsx b/packages/client/src/pages/account/RegisterDiscord.tsx
@@ -52,6 +52,9 @@ export default class RegisterDiscord extends Page<
 				),
 			),
 		});
+
+		this.props.deleteReduxState();
+
 	}
 
 	public render(): JSX.Element {

diff --git a/packages/client/src/pages/account/RequestPasswordReset.tsx b/packages/client/src/pages/account/RequestPasswordReset.tsx
@@ -53,6 +53,10 @@ export default class RequestPasswordResetForm extends Page<PageProps, RequestPas
 		this.submit = this.submit.bind(this);
 	}
 
+	public componentDidMount(): void {
+		this.props.deleteReduxState();
+	}
+
 	public render = (): JSX.Element => (
 		<SimpleForm<RequestPasswordResetFormValues>
 			values={this.state.form}

diff --git a/packages/client/src/pages/account/RequestUsername.tsx b/packages/client/src/pages/account/RequestUsername.tsx
@@ -53,6 +53,10 @@ export default class RequestUsernameForm extends Page<PageProps, RequestUsername
 		this.submit = this.submit.bind(this);
 	}
 
+	public componentDidMount(): void {
+		this.props.deleteReduxState();
+	}
+
 	public render = (): JSX.Element => (
 		<SimpleForm<RequestUsernameFormValues>
 			values={this.state.form}

diff --git a/packages/client/src/pages/account/Signup.tsx b/packages/client/src/pages/account/Signup.tsx
@@ -55,6 +55,10 @@ export default class Signup extends Page<PageProps, SignupFormState> {
 		success: false,
 	};
 
+	public componentDidMount(): void {
+		this.props.deleteReduxState();
+	}
+
 	public constructor(props: PageProps) {
 		super(props);
 

diff --git a/packages/client/src/pages/admin/Admin.tsx b/packages/client/src/pages/admin/Admin.tsx
@@ -147,6 +147,8 @@ export default class Admin extends Page<PageProps, AdminState> {
 			]);
 			this.updateTitle('Administration');
 		}
+		this.props.deleteReduxState();
+
 	}
 
 	public render(): JSX.Element {

diff --git a/packages/client/src/pages/admin/pages/FlightAssign.tsx b/packages/client/src/pages/admin/pages/FlightAssign.tsx
@@ -102,6 +102,8 @@ export default class FlightAssign extends Page<PageProps, FlightAssignState> {
 			return;
 		}
 
+		this.props.deleteReduxState();
+
 		this.updateTitle('Administration', 'Flight Assignment');
 		this.props.updateSideNav([
 			...this.props.registry.RankAndFile.Flights.map((flight, i) => ({

diff --git a/packages/client/src/pages/admin/pages/RegEdit.tsx b/packages/client/src/pages/admin/pages/RegEdit.tsx
@@ -145,6 +145,8 @@ export default class RegEdit extends Page<PageProps, RegEditState> {
 	};
 
 	public componentDidMount(): void {
+		this.props.deleteReduxState();
+
 		this.props.updateSideNav([
 			{
 				target: 'contact',

diff --git a/packages/client/src/pages/changelog/ChangeLog.tsx b/packages/client/src/pages/changelog/ChangeLog.tsx
@@ -51,6 +51,8 @@ export default class TeamList extends Page<PageProps, ChangeLogState> {
 				text: 'Home',
 			},
 		]);
+		this.props.deleteReduxState();
+
 		this.props.updateSideNav([]);
 		this.updateTitle('Change log');
 

diff --git a/packages/client/src/pages/drive/Drive.tsx b/packages/client/src/pages/drive/Drive.tsx
@@ -139,6 +139,8 @@ export class Drive extends Page<DriveProps, DriveState> {
 			),
 		]);
 
+		this.props.deleteReduxState();
+
 		if (Either.isLeft(resultEither)) {
 			// TODO: Add error
 		} else {

diff --git a/packages/client/src/pages/events/AttendanceMultiAdd.tsx b/packages/client/src/pages/events/AttendanceMultiAdd.tsx
@@ -307,6 +307,8 @@ export class AttendanceMultiAdd extends Page<AttendanceMultiAddProps, MultiAddSt
 			return;
 		}
 
+		this.props.deleteReduxState();
+
 		const eventID = parseInt(this.props.routeProps.match.params.id.split('-')[0], 10);
 
 		// eslint-disable-next-line

diff --git a/packages/client/src/pages/events/AuditViewer.tsx b/packages/client/src/pages/events/AuditViewer.tsx
@@ -87,6 +87,8 @@ export default class AuditViewer extends Page<AuditViewerProps> {
 			),
 		]);
 
+		this.props.deleteReduxState();
+
 		if (Either.isLeft(informationEither)) {
 			this.setState(prev => ({
 				...prev,

diff --git a/packages/client/src/pages/events/EventLinkList.tsx b/packages/client/src/pages/events/EventLinkList.tsx
@@ -171,6 +171,8 @@ export default class EventLinkList extends Page<PageProps, EventLinkListState> {
 			},
 		]);
 
+		this.props.deleteReduxState();
+
 		this.props.updateSideNav([]);
 
 		this.updateTitle('Event list');

diff --git a/packages/client/src/pages/events/EventViewer.tsx b/packages/client/src/pages/events/EventViewer.tsx
@@ -275,6 +275,8 @@ export class EventViewer extends Page<EventViewerProps, EventViewerState> {
 			{},
 		);
 
+		this.props.deleteReduxState();
+
 		if (Either.isLeft(eventInformation)) {
 			this.setState(prev => ({
 				...prev,