Merge branch 'main' into feature/pdct-1722-fix-corpus-import-id-gener…

…ator

package.json

@@ -39,7 +39,7 @@
     "@testing-library/jest-dom": "^6.2.0",
     "@testing-library/react": "^14.1.2",
     "@testing-library/user-event": "^14.5.2",
-    "@types/draft-js": "^0.11.14",
+    "@types/draft-js": "^0.11.18",
     "@types/draftjs-to-html": "^0.8.3",
     "@types/html-to-draftjs": "^1.4.2",
     "@types/jwt-decode": "^3.1.0",
@@ -48,7 +48,7 @@
     "@types/react-dom": "^18.2.6",
     "@types/react-draft-wysiwyg": "^1.13.6",
     "@typescript-eslint/eslint-plugin": "^7.1.1",
-    "@typescript-eslint/parser": "^7.1.1",
+    "@typescript-eslint/parser": "^7.18.0",
     "@vitejs/plugin-react": "^4.3.1",
     "eslint": "^8.44.0",
     "eslint-config-prettier": "^9.1.0",
@@ -57,7 +57,7 @@
     "eslint-plugin-react-hooks": "^4.6.2",
     "eslint-plugin-react-refresh": "^0.4.11",
     "jwt-encode": "^1.0.1",
-    "markdownlint-cli": "^0.41.0",
+    "markdownlint-cli": "^0.43.0",
     "prettier": "^3.4.1",
     "react-icons": "^4.10.1",
     "ts-node": "^10.9.2",

src/components/forms/FamilyForm.tsx

@@ -326,6 +326,8 @@ export const FamilyForm = ({ family: loadedFamily }: TProps) => {
         ...metadataValues, // add the values for any metadata fields for the given family corpora type
       })
 
+      setLoadedAndReset(true)
+    } else {
       setLoadedAndReset(true)
     }
   }, [config, loadedFamily, reset, isMCFCorpus, collections, corpusInfo])
@@ -544,7 +546,7 @@ export const FamilyForm = ({ family: loadedFamily }: TProps) => {
               />
             ) : null}
 
-            {loadedFamily && corpusInfo && loadedAndReset && (
+            {corpusInfo && loadedAndReset && (
               <>
                 <MetadataSection
                   corpusInfo={corpusInfo}

src/components/forms/fields/TextField.tsx

@@ -46,6 +46,7 @@ export const TextField = <T extends FieldValues>({
               bg='white'
               type={type}
               placeholder={placeholder ?? `Enter ${name}`}
+              value={field.value ?? ''} // this prevents the component changing from a controlled to uncontrolled component
             />
             {showHelperText && isDisabled && (
               <FormHelperText>You cannot edit this</FormHelperText>

src/routes/index.tsx

@@ -1,7 +1,5 @@
 import { createBrowserRouter, RouterProvider } from 'react-router-dom'
 
-import { useAuth } from '@/hooks/useAuth'
-
 import { ProtectedRoute } from './ProtectedRoute'
 import Root from '@/Root'
 import Login from '@/views/auth/Login'
@@ -91,10 +89,8 @@ const unauthenticatedRoutes = [
 ]
 
 const Routes = () => {
-  const { token } = useAuth()
-
   const router = createBrowserRouter([
-    ...(!token ? unauthenticatedRoutes : []),
+    ...unauthenticatedRoutes,
     ...authenticatedRoutes,
   ])
 

src/views/auth/Login.tsx

@@ -1,6 +1,8 @@
 import { LoginForm } from '@/components/forms/LoginForm'
 
 export default function Login() {
+  // TODO: redirect user to the index page if they are already authenticated
+  // const { token } = useAuth()
   return (
     <>
       <LoginForm />