-
Notifications
You must be signed in to change notification settings - Fork 1
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.
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
Fix(web-react): FileUploaderInput className #DS-1508 #1719
Open
curdaj
wants to merge
8
commits into
main
Choose a base branch
from
fix/ds-1508-className-fileUploaderInput
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+178
−10
Open
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
b743379
Fix(web-react): FileUploaderInput className #DS-1508
curdaj aaeb783
fixup! Fix(web-react): FileUploaderInput className #DS-1508
curdaj 2b7b57a
Feat(jest-config): Mock TextEncoder and TextDecoder in DOM
literat 40a6ee2
fixup! Fix(web-react): FileUploaderInput className #DS-1508
literat 12c2bf8
fixup! Fix(web-react): FileUploaderInput className #DS-1508
literat 3450c1e
fixup! Fix(web-react): FileUploaderInput className #DS-1508
curdaj f6fe608
fixup! Fix(web-react): FileUploaderInput className #DS-1508
curdaj 7eea633
fixup! Fix(web-react): FileUploaderInput className #DS-1508
curdaj File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,69 @@ | ||
'use client'; | ||
|
||
import { | ||
FileUploader, | ||
FileUploaderAttachment, | ||
FileUploaderInput, | ||
FileUploaderList, | ||
SpiritFileUploaderAttachmentProps, | ||
useFileQueue, | ||
} from '@lmc-eu/spirit-web-react'; | ||
import React, { useState } from 'react'; | ||
|
||
const FileuploaderTest = () => { | ||
const [errorMessage, setErrorMessage] = useState<(string | Error)[]>([]); | ||
|
||
const { | ||
fileQueue: fileQueueWarning, | ||
addToQueue: addToQueueWarning, | ||
clearQueue: clearQueueWarning, | ||
onDismiss: onDismissWarning, | ||
findInQueue: findInQueueWarning, | ||
updateQueue: updateQueueWarning, | ||
} = useFileQueue(); | ||
|
||
const attachmentComponent = ({ id, ...props }: SpiritFileUploaderAttachmentProps) => ( | ||
<FileUploaderAttachment key={id} id={id} {...props} /> | ||
); | ||
|
||
return ( | ||
<FileUploader | ||
addToQueue={(key, file) => { | ||
return addToQueueWarning(key, file); | ||
}} | ||
clearQueue={clearQueueWarning} | ||
fileQueue={fileQueueWarning} | ||
findInQueue={findInQueueWarning} | ||
id="file-uploader-validation-states-warning" | ||
onDismiss={onDismissWarning} | ||
updateQueue={updateQueueWarning} | ||
> | ||
<FileUploaderInput | ||
helperText="Max file size is 50 kb" | ||
id="file-uploader-validation-states-warning-input" | ||
label="Label" | ||
labelText="or drag and drop here" | ||
linkText="Upload your file" | ||
name="attachmentsWarning" | ||
onError={(error) => { | ||
setErrorMessage((prevErrors) => [...prevErrors, error]); | ||
}} | ||
validationText={`${errorMessage.join(', ')}`} | ||
validationState="warning" | ||
isRequired | ||
isMultiple | ||
maxFileSize={51200} // 50 kb | ||
// add onInput callback should solve issue if upload files by select them (not for drag and drop) | ||
// onInput={() => setErrorMessage([])} | ||
/> | ||
<FileUploaderList | ||
attachmentComponent={attachmentComponent} | ||
id="file-uploader-validation-states-warning-attachment" | ||
inputName="attachmentsWarning" | ||
label="Attachments" | ||
/> | ||
</FileUploader> | ||
); | ||
}; | ||
|
||
export default FileuploaderTest; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
import { Heading } from '@lmc-eu/spirit-web-react'; | ||
import FileuploaderTest from '@/app/fileuploader'; | ||
import { NextPage } from 'next'; | ||
|
||
const Home: NextPage = () => <Heading size="large">Spirit App Router</Heading>; | ||
const Home: NextPage = () => <FileuploaderTest />; | ||
|
||
export default Home; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
95 changes: 95 additions & 0 deletions
95
packages/web-react/src/components/FileUploader/__tests__/FileUploaderInput.test.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,12 +1,107 @@ | ||
import { render, screen, act, fireEvent, waitFor } from '@testing-library/react'; | ||
import React from 'react'; | ||
import ReactDOMServer from 'react-dom/server'; | ||
import { classNamePrefixProviderTest } from '../../../../tests/providerTests/classNamePrefixProviderTest'; | ||
import { restPropsTest } from '../../../../tests/providerTests/restPropsTest'; | ||
import { validationTextPropsTest } from '../../../../tests/providerTests/validationTextPropsTest'; | ||
import FileUploaderInput from '../FileUploaderInput'; | ||
import '@testing-library/jest-dom'; | ||
|
||
describe('FileUploaderInput', () => { | ||
classNamePrefixProviderTest(FileUploaderInput, 'FileUploaderInput'); | ||
|
||
restPropsTest(FileUploaderInput, 'div'); | ||
|
||
validationTextPropsTest(FileUploaderInput, '.FileUploaderInput__validationText'); | ||
|
||
it('should have drag-and-drop listeners in CSR when draggable is supported', () => { | ||
render(<FileUploaderInput id="test-uploader" name="test-uploader" label="upload" data-testid="test" />); | ||
|
||
const dropZone = screen.getAllByTestId('test')[0]; | ||
|
||
expect(dropZone).toHaveClass('has-drag-and-drop'); | ||
}); | ||
|
||
it('should not have drag-and-drop listeners in SSR', () => { | ||
const ui = <FileUploaderInput id="test-uploader" name="test-uploader" label="upload" data-testid="test" />; | ||
const container = document.createElement('div'); | ||
document.body.appendChild(container); | ||
container.innerHTML = ReactDOMServer.renderToString(ui); | ||
|
||
act(() => { | ||
render(ui, { hydrate: true, container }); | ||
}); | ||
|
||
const dropZone = screen.getAllByTestId('test')[0]; | ||
|
||
expect(dropZone).not.toHaveClass('has-drag-and-drop'); | ||
}); | ||
}); | ||
|
||
describe('Listener approach', () => { | ||
it('should not register onDragOver event listener during SSR', () => { | ||
// Simulace addEventListener pomocí jest.spyOn | ||
const addEventListenerSpy = jest.spyOn(document, 'addEventListener'); | ||
|
||
// Simulujeme SSR renderováním pouze komponenty bez vykonání useEffect | ||
// Abychom simulovali SSR, renderování komponenty nebude obsahovat "hydration" logiku. | ||
render(<FileUploaderInput name="bagr" id="pokus" data-testid="test" />, { hydrate: false }); | ||
|
||
// Ověřujeme, že event listener nebyl zaregistrován | ||
expect(addEventListenerSpy).not.toHaveBeenCalledWith('dragover', expect.any(Function)); | ||
|
||
// Vyčistíme spy | ||
addEventListenerSpy.mockRestore(); | ||
}); | ||
|
||
it('should register onDragOver event listener during CSR', () => { | ||
const addEventListenerSpy = jest.spyOn(document, 'addEventListener'); | ||
|
||
// Simulujeme CSR renderováním komponenty s vykonáním useEffect | ||
render(<FileUploaderInput name="bagr" id="pokus" data-testid="test" />, { hydrate: true }); | ||
|
||
expect(addEventListenerSpy).toHaveBeenCalledWith('dragover', expect.any(Function)); | ||
|
||
addEventListenerSpy.mockRestore(); | ||
}); | ||
}); | ||
|
||
describe('mock useEffect approach', () => { | ||
it('should not register onDragOver event listener during SSR', () => { | ||
jest.spyOn(React, 'useEffect').mockImplementation(() => {}); | ||
const addEventListenerSpy = jest.spyOn(window, 'addEventListener'); | ||
|
||
// Simulujeme SSR renderování komponenty | ||
render(<FileUploaderInput name="bagr" id="pokus" data-testid="test" />); | ||
|
||
// Kontrolujeme, že během SSR nebyl zaregistrován žádný onDragOver listener | ||
expect(addEventListenerSpy).not.toHaveBeenCalledWith('dragover', expect.any(Function)); | ||
|
||
addEventListenerSpy.mockRestore(); | ||
}); | ||
|
||
it('should register onDragOver event listener during CSR', () => { | ||
const addEventListenerSpy = jest.spyOn(window, 'addEventListener'); | ||
|
||
// Simulujeme CSR renderování komponenty | ||
render(<FileUploaderInput name="bagr" id="pokus" data-testid="test" />); | ||
|
||
// Kontrolujeme, že během CSR byl zaregistrován onDragOver listener | ||
expect(addEventListenerSpy).toHaveBeenCalledWith('dragover', expect.any(Function)); | ||
|
||
addEventListenerSpy.mockRestore(); | ||
}); | ||
}); | ||
|
||
describe('is-dragging class onDragOver event', () => { | ||
it('should have is-dragging class on dragOver', () => { | ||
render(<FileUploaderInput name="bagr" id="pokus" data-testid="test" />); | ||
const dropZone = screen.getAllByTestId('test')[0]; | ||
|
||
fireEvent.dragOver(dropZone); | ||
|
||
waitFor(() => { | ||
expect(dropZone).toHaveClass('is-dragging'); | ||
}); | ||
}); | ||
}); |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Are we able to test this?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
https://stackoverflow.com/questions/75376392/how-to-test-server-side-render-with-testing-library-react
It would be nice to have 2 tests. One for CSR where event listeners like
onDragOver
, etc. are set, and one for SSR where there are undefined. :-)There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm sorry, but I still can't figure out how to test it :(