fix: allow switching conference after saving

jeffreymeng · Sep 5, 2020 · 81d5e7d · 81d5e7d
1 parent 62fcab5
commit 81d5e7d
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 2 deletions.
diff --git a/src/components/admin/awards/SaveModal.tsx b/src/components/admin/awards/SaveModal.tsx
@@ -11,9 +11,11 @@ export default function SaveModal({
 	edits,
 	selectedConference,
 	conferenceData,
+	setData,
 }: {
 	show: boolean;
 	setShow: (show: boolean) => void;
+	setData: (data: any[]) => void;
 	edits: string[];
 	selectedConference: string;
 	conferenceData: ConferenceAwardsData | null;
@@ -164,14 +166,16 @@ export default function SaveModal({
 												}
 												setSubmitting(true);
 												let backupData = null;
+												let newConferenceID = "";
 												if (
 													selectedConference ===
 													"(NEW)"
 												) {
-													await firebase
+													const ref = await firebase
 														.firestore()
 														.collection("awards")
 														.add(conferenceData);
+													newConferenceID = ref.id;
 												} else {
 													backupData = (
 														await firebase
@@ -206,14 +210,48 @@ export default function SaveModal({
 																: "update-award",
 														...(selectedConference ===
 														"(NEW)"
-															? {}
+															? {
+																	conferenceId: newConferenceID,
+															  }
 															: {
 																	conferenceId: selectedConference,
 																	previousData: backupData,
 																	modifiedFields: edits,
 															  }),
 														newData: conferenceData,
 													});
+												if (
+													selectedConference ===
+													"(NEW)"
+												) {
+													setData((data) => {
+														const [
+															first,
+															...rest
+														] = data;
+														return [
+															first,
+															{
+																id: newConferenceID,
+																award: conferenceData,
+															},
+															...rest,
+														];
+													});
+												} else {
+													setData((data) =>
+														data.map((c) =>
+															c.id !==
+															selectedConference
+																? c
+																: {
+																		id:
+																			c.id,
+																		award: conferenceData,
+																  }
+														)
+													);
+												}
 												setSubmitting(false);
 												setSuccess(true);
 											}}

diff --git a/src/pages/admin/awards.tsx b/src/pages/admin/awards.tsx
@@ -244,6 +244,7 @@ export default function AboutPage(): React.ReactElement {
 			<SaveModal
 				show={showSaveModal}
 				setShow={setShowSaveModal}
+				setData={setData}
 				conferenceData={conferenceData}
 				edits={edits}
 				selectedConference={selectedConference}