Maintenance/reducer restructure

jest.config.js

@@ -4,6 +4,8 @@ module.exports = {
   watchPathIgnorePatterns: ['<rootDir>/boost-tests-', '<rootDir>/tmp/'],
   moduleNameMapper: {
     '\\.(scss|sass|css)$': 'identity-obj-proxy',
+    '^@/(.*)': ['<rootDir>/src/$1'],
+    '^@openapi': ['<rootDir>/openapi'],
   },
   testEnvironment: 'jsdom',
   transform: {

pages/_app.tsx

@@ -3,8 +3,8 @@ import Head from 'next/head'
 import { AppProps } from 'next/app'
 import CssBaseline from '@mui/material/CssBaseline'
 import { CacheProvider, EmotionCache } from '@emotion/react'
-import createEmotionCache from '../src/createEmotionCache'
-import { GlobalStateProvider } from '../src/context/global-context'
+import createEmotionCache from '@/createEmotionCache'
+import { GlobalStateProvider } from '@/context/global'
 import { useRouter } from 'next/router'
 
 // Client-side cache, shared for the whole session of the user in the browser.

pages/experiment/[experimentid].tsx

@@ -1,11 +1,11 @@
 import { useRouter } from 'next/router'
-import { ExperimentProvider } from '../../src/context/experiment-context'
-import TabbedExperiment from '../../src/components/experiment/tabbed-experiment'
-import Experiment from '../../src/components/experiment/experiment'
-import DebugExperiment from '../../src/components/debug-experiment'
-import { useGlobal } from '../../src/context/global-context'
-import LoadingExperiment from '../../src/components/experiment/loading-experiment'
-import JsonEditor from '../../src/components/json-editor/json-editor'
+import { ExperimentProvider } from '@/context/experiment'
+import TabbedExperiment from '@/components/experiment/tabbed-experiment'
+import Experiment from '@/components/experiment/experiment'
+import DebugExperiment from '@/components/experiment/debug-experiment'
+import { useGlobal } from '@/context/global'
+import LoadingExperiment from '@/components/experiment/loading-experiment'
+import JsonEditor from '@/components/json-editor/json-editor'
 
 export default function ExperimentContainer() {
   const router = useRouter()

pages/index.tsx

@@ -1,5 +1,5 @@
 import type { NextPage } from 'next'
-import Home from '../src/components/home/home'
+import Home from '@/components/home/home'
 
 const Index: NextPage = () => {
   return <Home />

src/reducers/data-points-reducer.test.ts → src/components/data-points/data-points-reducer.test.ts

@@ -1,5 +1,5 @@
 import { dataPointsReducer, DataPointsState } from './data-points-reducer'
-import { TableDataRow } from '../types/common'
+import { TableDataRow } from '@/types/common'
 
 describe('data points reducer', () => {
   const initialState: DataPointsState = {

src/reducers/data-points-reducer.ts → src/components/data-points/data-points-reducer.ts

@@ -1,4 +1,4 @@
-import { TableDataRow } from '../types/common'
+import { TableDataRow } from '@/types/common'
 
 interface EditRow {
   row: TableDataRow

src/components/data-points/data-points.tsx

@@ -1,6 +1,6 @@
 import { CircularProgress, IconButton, Box, Tooltip } from '@mui/material'
 import { useCallback, useEffect, useMemo, useReducer } from 'react'
-import { useGlobal } from '../../context/global-context'
+import { useGlobal } from '@/context/global'
 import {
   DataPointType,
   TableDataPoint,
@@ -10,17 +10,14 @@ import {
   CategoricalVariableType,
   DataPointTypeValue,
   ScoreVariableType,
-} from '../../types/common'
-import { EditableTable } from '../editable-table/editable-table'
+} from '@/types/common'
+import { EditableTable } from '@/components/editable-table/editable-table'
 import SwapVertIcon from '@mui/icons-material/SwapVert'
-import { TitleCard } from '../title-card/title-card'
+import { TitleCard } from '@/components/title-card/title-card'
 import useStyles from './data-points.style'
-import DownloadCSVButton from '../download-csv-button'
-import UploadCSVButton from '../upload-csv-button'
-import {
-  dataPointsReducer,
-  DataPointsState,
-} from '../../reducers/data-points-reducer'
+import DownloadCSVButton from '@/components/download-csv-button'
+import UploadCSVButton from '@/components/upload-csv-button'
+import { dataPointsReducer, DataPointsState } from './data-points-reducer'
 
 type DataPointProps = {
   valueVariables: ValueVariableType[]

src/components/details.tsx

@@ -1,5 +1,5 @@
 import { TextField } from '@mui/material'
-import { Info } from '../types/common'
+import { Info } from '@/types/common'
 import { TitleCard } from './title-card/title-card'
 
 type DetailsProps = {

src/components/download-csv-button.tsx

@@ -1,7 +1,7 @@
 import { IconButton, Tooltip } from '@mui/material'
-import { useExperiment } from '../context/experiment-context'
-import { dataPointsToCSV } from '../utility/converters'
-import { saveCSVToLocalFile } from '../utility/save-to-local-file'
+import { useExperiment } from '@/context/experiment'
+import { dataPointsToCSV } from '@/utility/converters'
+import { saveCSVToLocalFile } from '@/utility/save-to-local-file'
 import GetAppIcon from '@mui/icons-material/GetApp'
 
 interface DownloadCSVButtonProps {

src/components/editable-table/editable-table-cell.style.ts

@@ -1,5 +1,5 @@
 import { makeStyles } from '@mui/styles'
-import { tableBorder } from '../../theme/theme'
+import { tableBorder } from '@/theme/theme'
 
 export const useStyles = makeStyles(() => ({
   editCell: {

src/components/editable-table/editable-table-collapsed-row.style.ts

@@ -1,5 +1,5 @@
 import { makeStyles } from '@mui/styles'
-import { colors, tableBorder } from '../../theme/theme'
+import { colors, tableBorder } from '@/theme/theme'
 
 export const useStyles = makeStyles(() => ({
   buttonContainer: {

src/components/editable-table/editable-table-collapsed-row.tsx

@@ -1,6 +1,6 @@
 import useStyles from './editable-table-collapsed-row.style'
 import { IconButton, TableCell, TableRow, Tooltip } from '@mui/material'
-import { TableDataRow } from '../../types/common'
+import { TableDataRow } from '@/types/common'
 import { EditableTableCell } from './editable-table-cell'
 import AddIcon from '@mui/icons-material/Add'
 import EditIcon from '@mui/icons-material/Edit'

src/components/editable-table/editable-table-expanded-row.style.ts

@@ -1,5 +1,5 @@
 import { makeStyles } from '@mui/styles'
-import { colors } from '../../theme/theme'
+import { colors } from '@/theme/theme'
 
 export const useStyles = makeStyles(() => ({
   row: {

src/components/editable-table/editable-table-expanded-row.tsx

@@ -9,7 +9,7 @@ import {
   TableHead,
   TableRow,
 } from '@mui/material'
-import { TableDataRow } from '../../types/common'
+import { TableDataRow } from '@/types/common'
 import { EditableTableCell } from './editable-table-cell'
 import { useState } from 'react'
 

src/components/editable-table/editable-table-row.tsx

@@ -1,4 +1,4 @@
-import { TableDataRow } from '../../types/common'
+import { TableDataRow } from '@/types/common'
 import { useState } from 'react'
 import { EditableTableExpandedRow } from './editable-table-expanded-row'
 import { EditableTableCollapsedRow } from './editable-table-collapsed-row'

src/components/editable-table/editable-table.style.ts

@@ -1,5 +1,5 @@
 import { makeStyles } from '@mui/styles'
-import { tableBorder } from '../../theme/theme'
+import { tableBorder } from '@/theme/theme'
 
 export const useStyles = makeStyles(() => ({
   emptyCell: {

src/components/editable-table/editable-table.tsx

@@ -6,7 +6,7 @@ import {
   TableHead,
   TableRow,
 } from '@mui/material'
-import { TableDataRow } from '../../types/common'
+import { TableDataRow } from '@/types/common'
 import { EditableTableRow } from './editable-table-row'
 import { getRowIndex, getRowId } from './editable-table-util'
 import useStyles from './editable-table.style'

src/components/experiment/configurationTab.tsx

@@ -1,25 +1,23 @@
 import { Grid } from '@mui/material'
-import { useExperiment } from '../../context/experiment-context'
-import { useGlobal } from '../../context/global-context'
+import { useExperiment } from '@/context/experiment'
+import { useSelector } from '@/context/global'
 import {
   ValueVariableType,
   CategoricalVariableType,
   OptimizerConfig,
-} from '../../types/common'
-import Details from '../details'
-import OptimizerModel from '../input-model/optimizer-model'
-import OptimizerConfigurator from '../optimizer-configurator'
+} from '@/types/common'
+import Details from '@/components/details'
+import OptimizerModel from '@/components/input-model/optimizer-model'
+import OptimizerConfigurator from '@/components/optimizer-configurator'
+import { selectAdvancedConfiguration } from '@/context/global/global-selectors'
 
 export const ConfigurationTab = () => {
   const {
     state: { experiment },
     dispatch,
   } = useExperiment()
-  const {
-    state: {
-      flags: { advancedConfiguration },
-    },
-  } = useGlobal()
+
+  const advancedConfiguration = useSelector(selectAdvancedConfiguration)
 
   const valueVariables = experiment.valueVariables
   const categoricalVariables = experiment.categoricalVariables

src/components/experiment/dataEntryTab.tsx

@@ -1,8 +1,8 @@
 import { Grid } from '@mui/material'
-import { useExperiment } from '../../context/experiment-context'
-import { DataPointType } from '../../types/common'
-import DataPoints from '../data-points/data-points'
-import { ExperimentationGuide } from '../result-data/experimentation-guide'
+import { useExperiment } from '@/context/experiment'
+import { DataPointType } from '@/types/common'
+import DataPoints from '@/components/data-points/data-points'
+import { ExperimentationGuide } from '@/components/result-data/experimentation-guide'
 
 export const DataEntryTab = () => {
   const {

src/components/debug-experiment.tsx → src/components/experiment/debug-experiment.tsx

@@ -1,5 +1,5 @@
 import { Card, CardContent } from '@mui/material'
-import { useExperiment } from '../context/experiment-context'
+import { useExperiment } from '@/context/experiment'
 
 export default function DebugExperiment() {
   const { state } = useExperiment()

src/components/experiment/experiment.tsx

@@ -8,35 +8,31 @@ import {
   Switch,
   Typography,
 } from '@mui/material'
-import Layout from '../layout/layout'
-import OptimizerModel from '../input-model/optimizer-model'
-import OptimizerConfigurator from '../optimizer-configurator'
+import Layout from '@/components/layout/layout'
+import OptimizerModel from '@/components/input-model/optimizer-model'
+import OptimizerConfigurator from '@/components/optimizer-configurator'
 import { Alert } from '@mui/material'
-import Details from '../details'
-import DataPoints from '../data-points/data-points'
+import Details from '@/components/details'
+import DataPoints from '@/components/data-points/data-points'
 import { useStyles } from './experiment.style'
-import {
-  useExperiment,
-  runExperiment,
-  useSelector,
-} from '../../context/experiment-context'
+import { useExperiment, runExperiment, useSelector } from '@/context/experiment'
 import React, { useState } from 'react'
 import {
   ValueVariableType,
   CategoricalVariableType,
   OptimizerConfig,
   DataPointType,
-} from '../../types/common'
+} from '@/types/common'
 import LoadingExperiment from './loading-experiment'
-import { ExperimentationGuide } from '../result-data/experimentation-guide'
-import LoadingButton from '../loading-button/loading-button'
-import { Plots } from '../plots/plots'
-import { saveObjectToLocalFile } from '../../utility/save-to-local-file'
-import { useGlobal } from '../../context/global-context'
-import { UISizeValue } from '../../reducers/global-reducer'
-import { getSize } from '../../utility/ui-util'
+import { ExperimentationGuide } from '@/components/result-data/experimentation-guide'
+import LoadingButton from '@/components/loading-button/loading-button'
+import { Plots } from '@/components/plots/plots'
+import { saveObjectToLocalFile } from '@/utility/save-to-local-file'
+import { useGlobal } from '@/context/global'
+import { UISizeValue } from '@/context/global'
+import { getSize } from '@/utility/ui-util'
 import { AlertColor } from '@mui/material'
-import { selectIsInitializing } from '../../reducers/experiment-selectors'
+import { selectIsInitializing } from '@/context/experiment'
 
 type SnackbarMessage = {
   message: string

src/components/experiment/loading-experiment.tsx

@@ -6,7 +6,7 @@ import {
   Typography,
 } from '@mui/material'
 import useStyles from './loading-experiment.style'
-import Layout from '../layout/layout'
+import Layout from '@/components/layout/layout'
 
 export default function LoadingExperiment() {
   const classes = useStyles()

src/components/experiment/tabbed-experiment.tsx

@@ -8,25 +8,21 @@ import {
   Tab,
   Typography,
 } from '@mui/material'
-import Layout from '../layout/layout'
+import Layout from '@/components/layout/layout'
 import { Alert } from '@mui/material'
 import { TabContext, TabList, TabPanel } from '@mui/lab'
 import { useStyles } from './experiment.style'
-import {
-  useExperiment,
-  runExperiment,
-  useSelector,
-} from '../../context/experiment-context'
+import { useExperiment, runExperiment, useSelector } from '@/context/experiment'
 import React, { useState } from 'react'
 import LoadingExperiment from './loading-experiment'
-import LoadingButton from '../loading-button/loading-button'
-import { Plots } from '../plots/plots'
-import { saveObjectToLocalFile } from '../../utility/save-to-local-file'
-import { useGlobal } from '../../context/global-context'
+import LoadingButton from '@/components/loading-button/loading-button'
+import { Plots } from '@/components/plots/plots'
+import { saveObjectToLocalFile } from '@/utility/save-to-local-file'
+import { useGlobal } from '@/context/global'
 import { ConfigurationTab } from './configurationTab'
 import { DataEntryTab } from './dataEntryTab'
-import { State } from '../../reducers/global-reducer'
-import { selectIsInitializing } from '../../reducers/experiment-selectors'
+import { State } from '@/context/global'
+import { selectIsInitializing } from '@/context/experiment'
 
 type SnackbarMessage = {
   message: string

src/components/home/home.tsx

@@ -13,18 +13,18 @@ import {
 } from '@mui/material'
 import { MouseEvent, useCallback, useReducer, useState } from 'react'
 import { useDropzone } from 'react-dropzone'
-import Layout from '../layout/layout'
+import Layout from '@/components/layout/layout'
 import useStyles from './home.style'
 import { NextRouter, useRouter } from 'next/router'
 import SystemUpdateAltIcon from '@mui/icons-material/SystemUpdateAlt'
 import ChevronRightIcon from '@mui/icons-material/ChevronRight'
 import DeleteIcon from '@mui/icons-material/Delete'
 import { buildPath, paths } from '../../../paths'
-import { ExperimentType } from '../../types/common'
-import { useGlobal } from '../../context/global-context'
+import { ExperimentType } from '@/types/common'
+import { useGlobal } from '@/context/global'
 import { v4 as uuid } from 'uuid'
-import { reducer } from '../../reducers/home-reducer'
-import { CreateOrOverwriteDialog } from '../create-or-overwrite-dialog/create-or-overwrite-dialog'
+import { reducer } from './home-reducer'
+import { CreateOrOverwriteDialog } from '@/components/create-or-overwrite-dialog/create-or-overwrite-dialog'
 
 type UploadMessage = {
   message: string

src/components/input-model/categorical-variable.tsx

@@ -4,8 +4,8 @@ import { useState, useCallback, useEffect } from 'react'
 import { useForm } from 'react-hook-form'
 import CategoricalVariableOptions from './categorical-variable-options'
 import { useStyles } from './categorical-variable.style'
-import { CategoricalVariableType } from '../../types/common'
-import { validation } from '../../utility/forms/validation'
+import { CategoricalVariableType } from '@/types/common'
+import { validation } from '@/utility/forms/validation'
 
 type CategoricalVariableProps = {
   isDisabled: boolean

src/components/input-model/optimizer-model.tsx

@@ -9,11 +9,11 @@ import {
   Typography,
   Tooltip,
 } from '@mui/material'
-import { CategoricalVariableType, ValueVariableType } from '../../types/common'
+import { CategoricalVariableType, ValueVariableType } from '@/types/common'
 import DeleteIcon from '@mui/icons-material/Delete'
 import VariableEditor from './variable-editor'
 import useStyles from './optimizer-model.style'
-import { TitleCard } from '../title-card/title-card'
+import { TitleCard } from '@/components/title-card/title-card'
 import LensIcon from '@mui/icons-material/Lens'
 import PanoramaFishEyeIcon from '@mui/icons-material/PanoramaFishEye'
 

src/components/input-model/value-variable.tsx

@@ -2,10 +2,10 @@ import { Box, Button } from '@mui/material'
 import { useEffect, useMemo } from 'react'
 import { useForm } from 'react-hook-form'
 import useStyles from './value-variable.style'
-import { ValueVariableInputType, ValueVariableType } from '../../types/common'
-import { FormInputText } from '../../utility/forms'
-import { FormRadioGroup } from '../../utility/forms/form-radio-group'
-import { validation } from '../../utility/forms/validation'
+import { ValueVariableInputType, ValueVariableType } from '@/types/common'
+import { FormInputText } from '@/utility/forms'
+import { FormRadioGroup } from '@/utility/forms/form-radio-group'
+import { validation } from '@/utility/forms/validation'
 
 type ValueVariableProps = {
   isDisabled: boolean

src/components/input-model/variable-editor.tsx

@@ -3,7 +3,7 @@ import ValueVariable from './value-variable'
 import { Box, Tab, Tabs } from '@mui/material'
 import { useState, ChangeEvent } from 'react'
 import useStyles from './variable-editor.style'
-import { CategoricalVariableType, ValueVariableType } from '../../types/common'
+import { CategoricalVariableType, ValueVariableType } from '@/types/common'
 
 type VariableEditorProps = {
   isAddVariableDisabled: boolean