#2717 removing delete modal show

Northeastern-Electric-Racing · Sep 4, 2024 · 3ca0225 · 3ca0225
1 parent b99426b
commit 3ca0225
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 28 deletions.
diff --git a/src/frontend/src/components/NERDeleteModal.tsx b/src/frontend/src/components/NERDeleteModal.tsx
@@ -6,7 +6,6 @@ import { NERModalProps } from './NERModal';
 
 interface NERDeleteModalProps<T extends FieldValues> extends NERModalProps {
  onFormSubmit: (data: T) => void;
- children?: React.ReactNode;
  title: string;
 }
 

diff --git a/src/frontend/src/hooks/recruitment.hooks.ts b/src/frontend/src/hooks/recruitment.hooks.ts
@@ -46,22 +46,6 @@ export const useDeleteMilestone = () => {
  );
 };
 
-export const useDeleteFAQ = () => {
- const queryClient = useQueryClient();
- return useMutation<{ message: string }, Error, any>(
- ['faqs', 'delete'],
- async (faqId: string) => {
- const { data } = await deleteFaq(faqId);
- return data;
- },
- {
- onSuccess: () => {
- queryClient.invalidateQueries(['faqs']);
- }
- }
- );
-};
-
 export const useCreateMilestone = () => {
  const queryClient = useQueryClient();
  return useMutation<Milestone, Error, MilestonePayload>(
@@ -132,3 +116,19 @@ export const useEditFaq = (id: string) => {
  }
  );
 };
+
+export const useDeleteFAQ = () => {
+ const queryClient = useQueryClient();
+ return useMutation<{ message: string }, Error, any>(
+ ['faqs', 'delete'],
+ async (faqId: string) => {
+ const { data } = await deleteFaq(faqId);
+ return data;
+ },
+ {
+ onSuccess: () => {
+ queryClient.invalidateQueries(['faqs']);
+ }
+ }
+ );
+};
diff --git a/src/frontend/src/pages/AdminToolsPage/RecruitmentConfig/FAQTable.tsx b/src/frontend/src/pages/AdminToolsPage/RecruitmentConfig/FAQTable.tsx
@@ -17,7 +17,6 @@ const FAQsTable = () => {
  const [createModalShow, setCreateModalShow] = useHistoryState<boolean>('', false);
  const [faqEditing, setFaqEditing] = useHistoryState<FrequentlyAskedQuestion | undefined>('', undefined);
  const [faqToDelete, setFaqToDelete] = useState<FrequentlyAskedQuestion | undefined>(undefined);
- const [deleteModalShow, setDeleteModalShow] = useHistoryState<boolean>('', false);
  const { mutateAsync: deleteFaq } = useDeleteFAQ();
  const toast = useToast();
 
@@ -65,7 +64,6 @@ const FAQsTable = () => {
  sx={{ p: 0.5, color: 'white' }}
  onClick={() => {
  setFaqToDelete(faq);
- setDeleteModalShow(true);
  }}
  >
  <DeleteIcon />
@@ -113,22 +111,22 @@ const FAQsTable = () => {
  <NERButton
  variant="contained"
  onClick={() => {
- // setCreateModalShow(true);
+ setCreateModalShow(true);
  }}
  >
  Add FAQ
  </NERButton>
  </Box>
  {faqToDelete && (
  <NERDeleteModal
- open={deleteModalShow}
+ open={faqToDelete !== undefined}
  onHide={() => setFaqToDelete(undefined)}
  formId="delete-item-form"
  title="FAQ"
  onFormSubmit={() => {
  if (faqToDelete) {
  handleDelete(faqToDelete.faqId);
- setDeleteModalShow(false);
+ setFaqToDelete(undefined);
  }
  }}
  />

diff --git a/src/frontend/src/pages/AdminToolsPage/RecruitmentConfig/MilestoneTable.tsx b/src/frontend/src/pages/AdminToolsPage/RecruitmentConfig/MilestoneTable.tsx
@@ -34,7 +34,6 @@ const MilestoneTable = () => {
  };
 
  const [milestoneToDelete, setMilestoneToDelete] = useState<Milestone | undefined>(undefined);
- const [deleteModalShow, setDeleteModalShow] = useHistoryState<boolean>('', false);
  const { mutateAsync: deleteMilestone } = useDeleteMilestone();
  const toast = useToast();
 
@@ -79,7 +78,6 @@ const MilestoneTable = () => {
  sx={{ p: 0.5, color: 'white' }}
  onClick={() => {
  setMilestoneToDelete(milestone);
- setDeleteModalShow(true);
  }}
  >
  <DeleteIcon />
@@ -142,14 +140,14 @@ const MilestoneTable = () => {
  </NERButton>
  </Box>
  <NERDeleteModal
- open={deleteModalShow}
+ open={milestoneToDelete !== undefined}
  onHide={() => setMilestoneToDelete(undefined)}
  formId="delete-item-form"
  title="Milestone"
  onFormSubmit={() => {
  if (milestoneToDelete) {
  handleDelete(milestoneToDelete.milestoneId);
- setDeleteModalShow(false);
+ setMilestoneToDelete(undefined);
  }
  }}
  />

diff --git a/src/frontend/src/utils/urls.ts b/src/frontend/src/utils/urls.ts
@@ -179,12 +179,12 @@ const carsCreate = () => `${cars()}/create`;
 const recruitment = () => `${API_URL}/recruitment`;
 const allMilestones = () => `${recruitment()}/milestones`;
 const milestoneCreate = () => `${recruitment()}/milestone/create`;
-const milestoneDelete = (id: string) => `${recruitment()}/milestone/${id}/delete`;
-const faqDelete = (id: string) => `${recruitment()}/faq/${id}/delete`;
 const milestoneEdit = (id: string) => `${recruitment()}/milestone/${id}/edit`;
+const milestoneDelete = (id: string) => `${recruitment()}/milestone/${id}/delete`;
 const allFaqs = () => `${recruitment()}/faqs`;
 const faqCreate = () => `${recruitment()}/faq/create`;
 const faqEdit = (id: string) => `${recruitment()}/faq/${id}/edit`;
+const faqDelete = (id: string) => `${recruitment()}/faq/${id}/delete`;
 
 /**************** Other Endpoints ****************/
 const version = () => `https://api.github.com/repos/Northeastern-Electric-Racing/FinishLine/releases/latest`;