Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update redux and redux toolkit #3976

Merged
merged 4 commits into from
Oct 1, 2024
Merged

update redux and redux toolkit #3976

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3ef845e
update redux and redux toolkit
jmetev1 Sep 28, 2024
7223d00
Merge branch 'main' of github.com:bcgov/wps into task/update-redux
jmetev1 Sep 28, 2024
d7b3504
Merge branch 'main' into task/update-redux
conbrad Oct 1, 2024
65d9e3d
Merge branch 'main' into task/update-redux
conbrad Oct 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions web/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"@mui/x-data-grid-pro": "^6.0.0",
"@mui/x-date-pickers": "^7.0.0",
"@psu/cffdrs_ts": "git+https://github.com/cffdrs/cffdrs_ts#b9afdabc89dd4bdf04ccf1e406a4a5d8d552ff51",
"@reduxjs/toolkit": "^1.8.0",
"@reduxjs/toolkit": "^2.2.7",
"@sentry/react": "^8.2.1",
"@sentry/vite-plugin": "^2.22.4",
"@types/esri-leaflet": "^3.0.0",
Expand Down Expand Up @@ -56,7 +56,7 @@
"prettier": "^3.3.3",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-redux": "^8.0.0",
"react-redux": "^9.1.2",
"react-router-dom": "^6.22.3",
"recharts": "^2.1.8",
"typescript": "^5.2.2",
Expand Down
2 changes: 1 addition & 1 deletion web/src/app/store.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { configureStore, AnyAction, ThunkAction } from '@reduxjs/toolkit'
import thunk, { ThunkMiddleware } from 'redux-thunk'
import { thunk, ThunkMiddleware } from 'redux-thunk'
import rootReducer, { RootState } from 'app/rootReducer'

const thunkMiddleware: ThunkMiddleware<RootState, AnyAction> = thunk
Expand Down
2 changes: 1 addition & 1 deletion web/src/features/auth/slices/authenticationSlice.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ describe('authenticationSlice', () => {
it('should be initialized with correct state', () => {
expect(
authReducer(undefined, {
type: undefined
type: ''
dgboss marked this conversation as resolved.
Show resolved Hide resolved
})
).toEqual(initialState)
})
Expand Down
2 changes: 1 addition & 1 deletion web/src/features/hfiCalculator/slices/hfiCalculatorSlice.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ describe('hfiCalculatorSlice', () => {
describe('reducer', () => {
const dummyError = 'an error'
it('should be initialized with correct state flags', () => {
expect(hfiCalculatorDailiesReducer(undefined, { type: undefined })).toEqual(initialState)
expect(hfiCalculatorDailiesReducer(undefined, { type: '' })).toEqual(initialState)
})
it('should set fuelTypesLoading = true when fetchFuelTypesStart is called', () => {
expect(hfiCalculatorDailiesReducer(initialState, fetchFuelTypesStart())).toEqual({
Expand Down
2 changes: 1 addition & 1 deletion web/src/features/hfiCalculator/slices/hfiReadySlice.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ describe('hfiReadySlice', () => {
describe('reducer', () => {
const dummyError = 'an error'
it('should be initialized with correct state', () => {
expect(hfiReadyReducer(undefined, { type: undefined })).toEqual(initialState)
expect(hfiReadyReducer(undefined, { type: '' })).toEqual(initialState)
})
it('should set loading = true when fetchFuelTypesStart is called', () => {
expect(hfiReadyReducer(initialState, setHFIReadyStart())).toEqual({
Expand Down
33 changes: 19 additions & 14 deletions web/src/features/moreCast2/components/editInputCell.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { render, fireEvent, within } from '@testing-library/react'
import { render, fireEvent, within, act } from '@testing-library/react'
import { useDispatch } from 'react-redux'
import { GridApiContext, GridCellMode, GridTreeNodeWithRender } from '@mui/x-data-grid-pro'
import { EditInputCell } from '@/features/moreCast2/components/EditInputCell'
Expand Down Expand Up @@ -44,8 +44,8 @@ vi.mock('@/features/moreCast2/slices/validInputSlice', () => ({
const mockDispatch = vi.fn()

beforeEach(() => {
vi.clearAllMocks()
;(useDispatch as jest.Mock).mockReturnValue(mockDispatch)
vi.clearAllMocks();
(useDispatch as unknown as jest.Mock).mockReturnValue(mockDispatch)
dgboss marked this conversation as resolved.
Show resolved Hide resolved
})

describe('EditInputCell', () => {
Expand Down Expand Up @@ -77,45 +77,50 @@ describe('EditInputCell', () => {
expect(mockSetEditCellValue).toHaveBeenCalledWith({ id: 1, field: 'test', value: '20' })
})

test('should call stopCellEditMode on blur', () => {
test('should call stopCellEditMode on blur', async () => {
const { getByTestId } = render(
<GridApiContext.Provider value={apiMock}>
<EditInputCell {...defaultProps} id={1} value="10" field="test" hasFocus={false} error="" />
</GridApiContext.Provider>
)

const input = within(getByTestId('forecast-edit-cell')).getByRole('spinbutton') as HTMLInputElement
input.focus()
fireEvent.blur(input)

await act(async () => {
dgboss marked this conversation as resolved.
Show resolved Hide resolved
input.focus()
fireEvent.blur(input)
})
expect(mockStopCellEditMode).toHaveBeenCalledWith({ id: 1, field: 'test' })
})

test('should handle Escape key press', () => {
test('should handle Escape key press', async () => {
const { getByTestId } = render(
<GridApiContext.Provider value={apiMock}>
<EditInputCell {...defaultProps} id={1} value="10" field="test" hasFocus={false} error="" />
</GridApiContext.Provider>
)

const input = within(getByTestId('forecast-edit-cell')).getByRole('spinbutton') as HTMLInputElement
input.focus()
fireEvent.keyDown(input, { key: 'Escape', code: 'Escape', charCode: 27 })
await act(async () => {
input.focus()
fireEvent.keyDown(input, { key: 'Escape', code: 'Escape', charCode: 27 })
})

expect(mockStopCellEditMode).toHaveBeenCalledWith({ id: 1, field: 'test' })
})

test('should not call stopCellEditMode when Escape key is pressed and there is an error', () => {
test('should not call stopCellEditMode when Escape key is pressed and there is an error', async () => {
const { getByTestId } = render(
<GridApiContext.Provider value={{ current: apiMock }}>
<EditInputCell {...defaultProps} error="Test error" />
</GridApiContext.Provider>
)

const input = within(getByTestId('forecast-edit-cell')).getByRole('spinbutton') as HTMLInputElement
input.focus()
// Simulate Escape key press
fireEvent.keyDown(input, { key: 'Escape', code: 'Escape', charCode: 27 })
await act(async () => {
input.focus()
// Simulate Escape key press
fireEvent.keyDown(input, { key: 'Escape', code: 'Escape', charCode: 27 })
})

// Verify that stopCellEditMode was not called
expect(mockStopCellEditMode).not.toHaveBeenCalled()
Expand Down
2 changes: 1 addition & 1 deletion web/src/features/moreCast2/slices/dataSlice.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ describe('dataSlice', () => {
describe('reducer', () => {
const dummyError = 'an error'
it('should be initialized with correct state flags', () => {
expect(dataSliceReducer(undefined, { type: undefined })).toEqual(initialState)
expect(dataSliceReducer(undefined, { type: '' })).toEqual(initialState)
dgboss marked this conversation as resolved.
Show resolved Hide resolved
})
it('should set loading = true when getWeatherIndeterminatesStart is called', () => {
expect(dataSliceReducer(initialState, getWeatherIndeterminatesStart())).toEqual({
Expand Down
55 changes: 14 additions & 41 deletions web/tsconfig.app.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,13 @@
"jsx": "react-jsx",
/* Linting */
"strict": true,
"types": [
"vite/client",
"node"
],
"types": ["vite/client", "node", "vitest/globals", "@testing-library/jest-dom"],
"noUnusedLocals": false,
// "noUnusedParameters": ,
"noFallthroughCasesInSwitch": true,
//from old
"target": "es2015",
"lib": [
"dom",
"dom.iterable",
"esnext"
],
"lib": ["dom", "dom.iterable", "esnext"],
"allowJs": true,
"skipLibCheck": true,
"esModuleInterop": true,
Expand All @@ -36,36 +29,16 @@
"module": "esnext",
"baseUrl": ".",
"paths": {
"@/*": [
"./src/*"
],
"#root/*": [
"./*"
],
"app/*": [
"./src/app/*"
],
"utils/*": [
"./src/utils/*"
],
"api/*": [
"./src/api/*"
],
"features/*": [
"./src/features/*"
],
"components/*": [
"src/components/*"
],
"components": [
"./src/components/index"
],
"commonSlices/*": [
"./src/commonSlices/*"
],
},
"@/*": ["./src/*"],
"#root/*": ["./*"],
"app/*": ["./src/app/*"],
"utils/*": ["./src/utils/*"],
"api/*": ["./src/api/*"],
"features/*": ["./src/features/*"],
"components/*": ["src/components/*"],
"components": ["./src/components/index"],
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

prettier did this. i could undo it suppose. there's a npm format command but i don't think it's part of ci or anything. is that on purpose?

Copy link
Collaborator

@conbrad conbrad Oct 1, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah we'll have to align that in our lint check perhaps, but we don't want any code changes during CI. We most likely haven't touched this file since prettier has updated so these changes are fine.

"commonSlices/*": ["./src/commonSlices/*"]
}
},
"include": [
"src"
]
}
"include": ["src"]
}
Loading
Loading