Remove typescript errors

.github/workflows/run-tests-v1.yml

@@ -39,28 +39,28 @@ jobs:
         run: |
           echo "COGNITO_REGION set"
           tox -e releasetest
-  test-app:
+  test-frontend:
     runs-on: ubuntu-latest
     defaults:
       run:
         shell: bash
-        working-directory: ./app
+        working-directory: ./frontend
     steps:
       - uses: actions/checkout@v4
       - name: Use Node.js 20
         uses: actions/setup-node@v4
         with:
           node-version: 20
           cache: "npm"
-          cache-dependency-path: app/package-lock.json
+          cache-dependency-path: frontend/package-lock.json
       - name: Run npm CI
         run: npm ci
-      - name: Test app
+      - name: Test frontend
         run: npm run test -- --no-color --run
       - name: Run E2E tests
         uses: cypress-io/github-action@v5
         with:
           install: false
           start: npm run dev
-          working-directory: ./app
+          working-directory: ./frontend
           wait-on: "http://[::1]:4040/"

frontend/src/features/authentication/SignInForm.tsx

@@ -16,6 +16,9 @@ import {PasswordField} from './PasswordField';
 interface SignInFormProps {
   isLoading: boolean;
   onSubmit: ({email, password}: SignInRequest) => Promise<void>;
+  // signInIsLoading: boolean;
+  getTokenIsLoading?: boolean;
+  type?: 'coordinator' | 'guest' | 'host';
 }
 
 const validationSchema = object({

frontend/src/features/authentication/SignUpForm.tsx

@@ -21,6 +21,10 @@ export interface SignUpFormProps {
     firstName,
     lastName,
   }: Omit<SignUpRequest, 'role'>) => Promise<void>;
+  getTokenIsLoading?: boolean;
+  signUpHostIsLoading?: boolean;
+  signUpCoordinatorIsLoading?: boolean;
+  type?: string;
 }
 
 export const SignUpForm = ({onSubmit, isLoading}: SignUpFormProps) => {

frontend/src/features/authentication/__tests__/SignInForm.test.tsx

@@ -10,7 +10,7 @@ const prepare = () => {
     <BrowserRouter>
       <SignInForm
         onSubmit={onSubmit}
-        signInIsLoading={false}
+        isLoading={false}
         getTokenIsLoading={false}
       />
     </BrowserRouter>,

frontend/src/features/authentication/__tests__/SignUpForm.test.tsx

@@ -17,7 +17,7 @@
     type: 'coordinator',
     getTokenIsLoading: false,
     signUpCoordinatorIsLoading: false,
-    signUpHostIsLoading: false,
+    isLoading: false,
     ...initialProps,
   };
 
@@ -100,11 +100,11 @@
     const {submitButton} = prepare({getTokenIsLoading: true});
 
     expect(submitButton).toBeDisabled();
     expect(screen.getByRole('progressbar')).toBeInTheDocument();
   });
 
   it('displays loading spinner when signing up as host', () => {
-    const {submitButton} = prepare({signUpHostIsLoading: true});
+    const {submitButton} = prepare({isLoading: true});
 
     expect(submitButton).toBeDisabled();
     expect(screen.getByRole('progressbar')).toBeInTheDocument();
@@ -114,6 +114,6 @@
     const {submitButton} = prepare({signUpCoordinatorIsLoading: true});
 
     expect(submitButton).toBeDisabled();
     expect(screen.getByRole('progressbar')).toBeInTheDocument();
   });
 });

frontend/src/features/intake-profile/IntakeProfileGroups.tsx

@@ -16,7 +16,7 @@ import {
 } from '@mui/material';
 import {useFormikContext} from 'formik';
 import {useOutletContext} from 'react-router-dom';
-import {InitialValues} from 'src/pages/intake-profile';
+import {InitialValues} from 'src/pages/intake-profile/IntakeProfile';
 import {AdditionalGuestsField} from './fields/AdditionaGuestsField';
 import {FieldGroup, Fields, Guest, Pet} from 'src/services/profile';
 import {AdditionalPetsField} from './fields/AdditionalPetsField';
@@ -216,20 +216,21 @@ export const RenderFields = ({groupId, field}: RenderFieldProps) => {
       );
     case 'contact_method':
       // eslint-disable-next-line no-case-declarations
-      const {emailFieldId, phoneFieldId} = field.linkedFields;
+      const {emailFieldId, phoneFieldId} = field.linkedFields || {};
       // eslint-disable-next-line no-case-declarations
       let isEmailFilled = false;
       // eslint-disable-next-line no-case-declarations
       let isPhoneFilled = false;
       if (emailFieldId) {
-        // This isn't best practice and can be replaced with validator library to verify email
-        isEmailFilled = Boolean(
-          values[emailFieldId] && /\S+@\S+\.\S+/.test(values[emailFieldId]),
-        );
+        const emailValue = values[emailFieldId];
+        isEmailFilled =
+          typeof emailValue === 'string' && /\S+@\S+\.\S+/.test(emailValue);
       }
       // eslint-disable-next-line no-case-declarations
       if (phoneFieldId) {
-        isPhoneFilled = phoneRegExp.test(values[phoneFieldId]);
+        const phoneValue = values[phoneFieldId];
+        isPhoneFilled =
+          typeof phoneValue === 'string' && phoneRegExp.test(phoneValue);
       }
 
       return (

frontend/src/features/intake-profile/fields/AdditionaGuestsField.tsx

@@ -6,7 +6,7 @@ import {
   FieldArray,
   useFormikContext,
 } from 'formik';
-import {InitialValues} from 'src/pages/intake-profile';
+import {InitialValues} from 'src/pages/intake-profile/IntakeProfile';
 import {Guest} from '../../../services/profile';
 import {DatePickerField} from './DatePickerField';
 

frontend/src/features/intake-profile/fields/AdditionalPetsField.tsx

@@ -2,8 +2,7 @@ import {Stack, Button, TextField, Typography} from '@mui/material';
 import {FormikErrors, FieldArray, useFormikContext} from 'formik';
 import {Pet} from '../../../services/profile';
 import Autocomplete from '@mui/material/Autocomplete';
-import {InitialValues} from 'src/pages/intake-profile';
-
+import {InitialValues} from 'src/pages/intake-profile/IntakeProfile';
 interface Values {
   pets: Pet[];
 }

frontend/src/pages/SystemAdminDashboard.tsx

@@ -34,6 +34,7 @@ import {
   DashboardDataResponse,
   useAdminDeleteUserMutation,
   useGetAllDashboardDataMutation,
+  AdminApiError,
 } from '../services/coordinator';
 import ChangeCircleRoundedIcon from '@mui/icons-material/ChangeCircleRounded';
 

frontend/src/pages/__tests__/ForgotPasswordCode.test.tsx

@@ -9,7 +9,7 @@ import {
   fireEvent,
   userEvent,
 } from '../../utils/testing/test-utils';
-import {ForgotPasswordCode} from '../ForgotPasswordCode';
+import {ForgotPasswordCode} from '../authentication/ForgotPasswordCode';
 import {BrowserRouter} from 'react-router-dom';
 import {Formik} from 'formik';
 import {server} from '../../utils/testing/server';

frontend/src/pages/intake-profile/helpers/buildValidationSchema.ts

@@ -21,6 +21,7 @@ export const typeValidations = {
   email: string().email('Must be a valid email address'),
   yes_no: string(),
   dropdown: string(),
+  // date: date().required('Date is required').typeError('Invalid date'),
   date: date().typeError('DOB is not a valid date'),
   additional_guests: array().of(
     object().shape({
@@ -37,6 +38,8 @@ export const typeValidations = {
       type: string().required('Type of pet is required'),
     }),
   ),
+  contact_method: string(),
+  multiple_choice: array().of(string().required('Choice is required')),
 };
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
@@ -53,7 +56,7 @@ const merge = (...schemas) => {
 };
 
 const createFieldValidationSchema = ({type, validations}: Fields) => {
-  if (!typeValidations[type]) {
+  if (!(type in typeValidations)) {
     console.error(
       `No schema exists in typeValidations hashmap in IntakeProfile/constants/index.ts for type: ${type}`,
     );

frontend/src/pages/intake-profile/helpers/index.ts

@@ -1,5 +1,6 @@
 import {faker} from '@faker-js/faker';
 import {array, object, string} from 'yup';
+
 import {InitialValues} from '../IntakeProfile';
 import {
   FieldGroup,
@@ -114,7 +115,6 @@ export const typeValidations = {
       relationship: string().required('Relationship is required'),
     }),
   ),
-  // array of strings of the type of pets
   pets: array().of(
     object().shape({
       type: string().required('Type of pet is required'),
@@ -125,24 +125,41 @@ export const typeValidations = {
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
+// const merge = (...schemas) => {
+//   const [first, ...rest] = schemas;
+
+//   const merged = rest.reduce(
+//     (mergedSchemas, schema) => mergedSchemas.concat(schema),
+//     first,
+//   );
+
+//   return merged;
+// };
+
 const merge = (...schemas) => {
-  const [first, ...rest] = schemas;
+  const validSchemas = schemas.filter(schema => schema !== undefined);
 
-  const merged = rest.reduce(
-    (mergedSchemas, schema) => mergedSchemas.concat(schema),
-    first,
-  );
+  if (validSchemas.length === 0) {
+    return [];
+  }
+
+  const [first, ...rest] = validSchemas;
+
+  const merged = rest.reduce((mergedSchemas, schema) => {
+    return mergedSchemas.concat(schema);
+  }, first);
 
   return merged;
 };
 
 const createFieldValidationSchema = ({type, validations}: Fields) => {
-  if (!typeValidations[type]) {
+  if (!(type in typeValidations)) {
     console.error(
       `No schema exists in typeValidations hashmap in IntakeProfile/constants/index.ts for type: ${type}`,
     );
   }
-
+  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+  // @ts-ignore
   let schema = typeValidations[type];
 
   if (validations.required) {

frontend/src/services/profile.ts

@@ -11,6 +11,7 @@ export const fieldTypes = [
   'additional_guests',
   'pets',
   'contact_method',
+  'multiple_choice',
 ] as const;
 
 type FieldTypeTuple = typeof fieldTypes;
@@ -45,8 +46,8 @@ export interface Fields {
     required_if?: ReduiredIf;
   };
   linkedFields?: {
-    emailFieldId?: string;
-    phoneFieldId?: string;
+    emailFieldId: string;
+    phoneFieldId: string;
   };
 }
 

frontend/vite.config.ts

@@ -53,7 +53,7 @@ export default defineConfig(({mode}) => {
     test: {
       globals: true,
       environment: 'jsdom',
-      setupFiles: './src/utils/test/setupTests.ts',
+      setupFiles: './src/utils/testing/setupTests.ts',
     },
   };
 });