#2395 renamed files and moved submit and cancel text types

Northeastern-Electric-Racing · May 22, 2024 · a31f091 · a31f091
1 parent 7f36d5b
commit a31f091
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 17 deletions.
diff --git a/src/backend/src/utils/teams.utils.ts b/src/backend/src/utils/teams.utils.ts
@@ -88,7 +88,3 @@ export const removeUsersFromList = (currentUsers: UserWithId[], usersToRemove: U
   const userIdsToRemove = usersToRemove.map((user) => user.userId);
   return currentUsers.filter((user) => !userIdsToRemove.includes(user.userId));
 };
-
-export type submitText = 'Submit' | 'Save' | 'Create' | 'Yes' | 'Delete' | 'Schedule' | 'Send To Advisor' | 'Submit to SABO';
-
-export type cancelText = 'Cancel' | 'Delete' | 'Exit' | 'No';
diff --git a/src/frontend/src/components/NERDraggableForm.tsx b/src/frontend/src/components/NERDraggableForm.tsx
@@ -4,14 +4,14 @@ import NERSuccessButton from './NERSuccessButton';
 import Draggable from 'react-draggable';
 import CloseIcon from '@mui/icons-material/Close';
 import { ReactNode } from 'react';
-import { cancelText, submitText } from '../../../backend/src/utils/teams.utils';
+import { CancelText, SubmitText } from '../utils/teams.utils';
 
 interface NERDraggableFormProps {
   open: boolean;
   title: string;
   children?: ReactNode;
-  cancelText?: cancelText;
-  submitText?: submitText;
+  cancelText?: CancelText;
+  submitText?: SubmitText;
   formId?: string;
   disableSuccessButton?: boolean;
   showCloseButton?: boolean;
@@ -27,9 +27,9 @@ export const NERDraggableForm = ({
   cancelText,
   submitText,
   formId,
-  disableSuccessButton,
-  showCloseButton,
-  hideFormButtons,
+  disableSuccessButton = false,
+  showCloseButton = false,
+  hideFormButtons = false,
   handleSubmit,
   onHide
 }: NERDraggableFormProps) => {

diff --git a/src/frontend/src/components/NERModal.tsx b/src/frontend/src/components/NERModal.tsx
@@ -3,7 +3,7 @@ import NERFailButton from './NERFailButton';
 import NERSuccessButton from './NERSuccessButton';
 import { ReactNode } from 'react';
 import CloseIcon from '@mui/icons-material/Close';
-import { cancelText, submitText } from '../../../backend/src/utils/teams.utils';
+import { CancelText, SubmitText } from '../utils/teams.utils';
 
 const background = '#ef4345';
 
@@ -14,8 +14,8 @@ export interface NERModalProps {
   onSubmit?: () => void;
   onHide: () => void;
   children?: ReactNode;
-  cancelText?: cancelText;
-  submitText?: submitText;
+  cancelText?: CancelText;
+  submitText?: SubmitText;
   disabled?: boolean;
   showCloseButton?: boolean;
   hideFormButtons?: boolean;

diff --git a/...hartComponents/GanttRequestChangeForm.tsx → ...artComponents/GanttRequestChangeModal.tsx b/...hartComponents/GanttRequestChangeForm.tsx → ...artComponents/GanttRequestChangeModal.tsx
@@ -10,13 +10,13 @@ import { useSingleWorkPackage } from '../../../hooks/work-packages.hooks';
 import { useToast } from '../../../hooks/toasts.hooks';
 import { NERDraggableForm } from '../../../components/NERDraggableForm';
 
-interface GanttRequestChangeFormProps {
+interface GanttRequestChangeModalProps {
   change: RequestEventChange;
   handleClose: () => void;
   open: boolean;
 }
 
-export const GanttRequestChangeForm = ({ change, handleClose, open }: GanttRequestChangeFormProps) => {
+export const GanttRequestChangeModal = ({ change, handleClose, open }: GanttRequestChangeModalProps) => {
   const toast = useToast();
   const [reasonForChange, setReasonForChange] = useState<ChangeRequestReason>(ChangeRequestReason.Estimation);
   const [explanationForChange, setExplanationForChange] = useState('');

diff --git a/src/frontend/src/pages/GanttPage/GanttChartPage.tsx b/src/frontend/src/pages/GanttPage/GanttChartPage.tsx
@@ -33,7 +33,7 @@ import GanttChart from './GanttChart';
 import { useAllTeamTypes } from '../../hooks/design-reviews.hooks';
 import { Team, TeamType } from 'shared';
 import { useAllTeams } from '../../hooks/teams.hooks';
-import { GanttRequestChangeForm } from './GanttChartComponents/GanttRequestChangeForm';
+import { GanttRequestChangeModal } from './GanttChartComponents/GanttRequestChangeModal';
 
 const GanttChartPage: FC = () => {
   const query = useQuery();
@@ -277,7 +277,7 @@ const GanttChartPage: FC = () => {
           highlightedChange={ganttTaskChanges[ganttTaskChanges.length - 1]}
         />
         {ganttTaskChanges.map((change) => (
-          <GanttRequestChangeForm change={change} open handleClose={() => removeActiveModal(change.eventId)} />
+          <GanttRequestChangeModal change={change} open handleClose={() => removeActiveModal(change.eventId)} />
         ))}
       </Box>
     </PageLayout>

diff --git a/src/frontend/src/utils/teams.utils.ts b/src/frontend/src/utils/teams.utils.ts
@@ -32,3 +32,7 @@ export const userToAutocompleteOption = (user?: User): { label: string; id: stri
 export const userComparator = (user1: User, user2: User) => {
   return user1.firstName > user2.firstName ? 1 : -1;
 };
+
+export type SubmitText = 'Submit' | 'Save' | 'Create' | 'Yes' | 'Delete' | 'Schedule' | 'Send To Advisor' | 'Submit to SABO';
+
+export type CancelText = 'Cancel' | 'Delete' | 'Exit' | 'No';