Moved hooks and updated hook tests

frontend/pages/_app.tsx

@@ -16,8 +16,8 @@ import createEmotionCache from 'utils/createEmotionCache'
 
 import ThemeModeContext from '../src/contexts/themeModeContext'
 import UnsavedChangesContext from '../src/contexts/unsavedChangesContext'
-import useThemeMode from '../utils/hooks/useThemeMode'
-import useUnsavedChanges from '../utils/hooks/useUnsavedChanges'
+import useThemeMode from '../src/hooks/useThemeMode'
+import useUnsavedChanges from '../src/hooks/useUnsavedChanges'
 
 // Client-side cache, shared for the whole session of the user in the browser.
 const clientSideEmotionCache = createEmotionCache()

frontend/pages/index.tsx

@@ -22,8 +22,8 @@ import React, { ChangeEvent, Fragment, useCallback, useState } from 'react'
 import ChipSelector from 'src/common/ChipSelector'
 import EmptyBlob from 'src/common/EmptyBlob'
 import MultipleErrorWrapper from 'src/errors/MultipleErrorWrapper'
+import useDebounce from 'src/hooks/useDebounce'
 import Wrapper from 'src/Wrapper'
-import useDebounce from 'utils/hooks/useDebounce'
 
 interface KeyAndLabel {
   key: string

frontend/src/MessageAlert.tsx

@@ -6,7 +6,7 @@ import Alert, { AlertProps } from '@mui/material/Alert'
 import Stack from '@mui/material/Stack'
 import Link from 'next/link'
 import { useEffect, useRef, useState } from 'react'
-import useNotification from 'utils/hooks/useNotification'
+import useNotification from 'src/hooks/useNotification'
 
 type PartialMessageAlertProps =
   | {

frontend/src/contexts/themeModeContext.ts

@@ -1,6 +1,6 @@
 import { createContext } from 'react'
 
-import { ThemeModeHook } from '../../utils/hooks/useThemeMode'
+import { ThemeModeHook } from '../hooks/useThemeMode'
 import { lightTheme } from '../theme'
 
 const ThemeModeContext = createContext<ThemeModeHook>({

frontend/src/contexts/unsavedChangesContext.ts

@@ -1,6 +1,6 @@
 import { createContext } from 'react'
 
-import { UnsavedChangesHook } from '../../utils/hooks/useUnsavedChanges'
+import { UnsavedChangesHook } from '../hooks/useUnsavedChanges'
 
 const UnsavedChangesContext = createContext<UnsavedChangesHook>({
   unsavedChanges: false,

frontend/utils/hooks/useThemeMode.ts → frontend/src/hooks/useThemeMode.ts

@@ -1,7 +1,7 @@
 import { Theme } from '@mui/material/styles'
 import { ChangeEvent, useCallback, useState } from 'react'
 
-import { darkTheme, lightTheme } from '../../src/theme'
+import { darkTheme, lightTheme } from '../theme'
 
 export type ThemeModeHook = {
   theme: Theme

frontend/src/model/registry/CodeLine.tsx

@@ -3,7 +3,7 @@ import CodeIcon from '@mui/icons-material/Code'
 import { Box, IconButton, Stack, Tooltip, Typography } from '@mui/material'
 import { useTheme } from '@mui/material/styles'
 import { ReactElement } from 'react'
-import useNotification from 'utils/hooks/useNotification'
+import useNotification from 'src/hooks/useNotification'
 
 interface CodeLineProps {
   line: string

frontend/src/model/settings/AccessRequestSettings.tsx

@@ -5,7 +5,7 @@ import { useState } from 'react'
 
 import { ModelInterface } from '../../../types/v2/types'
 import { getErrorMessage } from '../../../utils/fetcher'
-import useNotification from '../../../utils/hooks/useNotification'
+import useNotification from '../../hooks/useNotification'
 import MessageAlert from '../../MessageAlert'
 
 type ModelAccessProps = {

frontend/src/model/settings/ModelAccess.tsx

@@ -17,7 +17,7 @@ import { patchModel, useGetModel } from '../../../actions/model'
 import { useListUsers } from '../../../actions/user'
 import { CollaboratorEntry, EntityObject, ModelInterface } from '../../../types/v2/types'
 import { getErrorMessage } from '../../../utils/fetcher'
-import useNotification from '../../../utils/hooks/useNotification'
+import useNotification from '../../hooks/useNotification'
 import MessageAlert from '../../MessageAlert'
 import EntityItem from './EntityItem'
 

frontend/src/model/settings/ModelDetails.tsx

@@ -11,7 +11,7 @@ import { TeamInterface } from 'types/interfaces'
 import { patchModel } from '../../../actions/model'
 import { ModelForm, ModelInterface } from '../../../types/v2/types'
 import { getErrorMessage } from '../../../utils/fetcher'
-import useNotification from '../../../utils/hooks/useNotification'
+import useNotification from '../../hooks/useNotification'
 import MessageAlert from '../../MessageAlert'
 
 type ModelAccessProps = {

frontend/src/wrapper/ModelSearchField.tsx

@@ -4,9 +4,9 @@ import { alpha, styled, useTheme } from '@mui/material/styles'
 import { useListModels } from 'actions/model'
 import { ChangeEvent, useMemo, useState } from 'react'
 import Loading from 'src/common/Loading'
+import useDebounce from 'src/hooks/useDebounce'
 import Link from 'src/Link'
 import MessageAlert from 'src/MessageAlert'
-import useDebounce from 'utils/hooks/useDebounce'
 
 const Search = styled('div')(({ theme }) => ({
   borderRadius: theme.shape.borderRadius,

frontend/utils/hooks/useNotification.spec.tsx → frontend/test/hooks/useNotification.spec.tsx

@@ -4,7 +4,7 @@ import { SnackbarProvider } from 'notistack'
 import React from 'react'
 import { describe, expect, it } from 'vitest'
 
-import useNotification from './useNotification'
+import useNotification from '../../src/hooks/useNotification'
 
 describe('Snackbar', () => {
   function TestComponent() {
@@ -16,15 +16,15 @@ describe('Snackbar', () => {
     return <Box>test</Box>
   }
 
-  it('renders a Snackbar component', async () => {
+  it('displays a snackbar when a notification is sent', async () => {
     render(
       <SnackbarProvider>
         <TestComponent />
       </SnackbarProvider>,
     )
 
     await waitFor(async () => {
-      expect(await screen.findByText('Notification message')).not.toBeUndefined()
+      expect(await screen.findByText('Notification message')).toBeDefined()
     })
   })
 })

frontend/test/model/common/ValidationErrorIcon.spec.tsx

@@ -32,7 +32,6 @@ describe('ValidationErrorIcon', () => {
       </ThemeProvider>,
     )
 
-    screen.debug()
     await waitFor(async () => {
       expect(container.childElementCount).toEqual(0)
     })