feat(#35): add attachments to video form #36
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
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
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,49 @@ | ||||||
| import { Avatar, IconButton, ListItemIcon, Tooltip } from '@mui/material' | ||||||
| import CopyToClipboard from 'react-copy-to-clipboard' | ||||||
| import { useTranslation } from 'react-i18next' | ||||||
|
|
||||||
| import { useInjection } from '@polyflix/di' | ||||||
|
|
||||||
| import { Icon } from '@core/components/Icon/Icon.component' | ||||||
| import { SnackbarService } from '@core/services/snackbar.service' | ||||||
|
|
||||||
| type Props = { | ||||||
| url: string | ||||||
| copyToClipboard?: boolean | ||||||
| } | ||||||
|
|
||||||
| export const AttachmentAvatar = ({ url, copyToClipboard = true }: Props) => { | ||||||
| const { t: tUsers } = useTranslation('users') | ||||||
| const { t: tAttachments } = useTranslation('attachments') | ||||||
| const snackbarService = useInjection<SnackbarService>(SnackbarService) | ||||||
|
|
||||||
| const avatarContent = () => ( | ||||||
| <Avatar src={'' /* TODO : Issue #466 */}> | ||||||
| <Icon name="eva:link-outline" size={30} /> | ||||||
| </Avatar> | ||||||
| ) | ||||||
|
|
||||||
| if (copyToClipboard) { | ||||||
| return ( | ||||||
| <ListItemIcon> | ||||||
| <CopyToClipboard | ||||||
| onCopy={() => { | ||||||
| snackbarService.createSnackbar( | ||||||
| tUsers('profile.tabs.attachments.content.list.clipboard'), | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| { | ||||||
| variant: 'success', | ||||||
| } | ||||||
| ) | ||||||
| }} | ||||||
| text={url} | ||||||
| > | ||||||
| <Tooltip title={tAttachments<string>('actions.copyToClipboard')}> | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| <IconButton>{avatarContent()}</IconButton> | ||||||
| </Tooltip> | ||||||
| </CopyToClipboard> | ||||||
| </ListItemIcon> | ||||||
| ) | ||||||
| } else { | ||||||
| return <ListItemIcon>{avatarContent()}</ListItemIcon> | ||||||
| } | ||||||
| } | ||||||
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,210 @@ | ||||||
| import { | ||||||
| Box, | ||||||
| Button, | ||||||
| Checkbox, | ||||||
| Container, | ||||||
| Fade, | ||||||
| Link, | ||||||
| ListItem, | ||||||
| ListItemButton, | ||||||
| ListItemText, | ||||||
| Modal, | ||||||
| Paper, | ||||||
| Stack, | ||||||
| SxProps, | ||||||
| Theme, | ||||||
| Typography, | ||||||
| } from '@mui/material' | ||||||
| import { useEffect, useState } from 'react' | ||||||
| import { UseFieldArrayReturn } from 'react-hook-form' | ||||||
| import { useTranslation } from 'react-i18next' | ||||||
| import { Redirect } from 'react-router-dom' | ||||||
|
|
||||||
| import { NoData } from '@core/components/NoData/NoData.component' | ||||||
| import { PaginationSynced } from '@core/components/Pagination/PaginationSynced.component' | ||||||
| import { Scrollbar } from '@core/components/Scrollbar/Scrollbar.component' | ||||||
| import { buildSkeletons } from '@core/utils/gui.utils' | ||||||
|
|
||||||
| import { useAuth } from '@auth/hooks/useAuth.hook' | ||||||
|
|
||||||
| import { IVideoForm } from '@videos/types/form.type' | ||||||
|
|
||||||
| import { Attachment } from '@attachments/models/attachment.model' | ||||||
| import { AttachmentParams } from '@attachments/models/attachment.params' | ||||||
| import { useGetUserAttachmentsQuery } from '@attachments/services/attachment.service' | ||||||
|
|
||||||
| import { AttachmentAvatar } from './AttachmentAvatar.component' | ||||||
|
|
||||||
| interface Props { | ||||||
| attachments: UseFieldArrayReturn<IVideoForm, 'attachments'> | ||||||
| videoId?: string | ||||||
| isOpen: boolean | ||||||
| onClose: () => void | ||||||
| sx?: SxProps<Theme> | ||||||
| } | ||||||
| export const AttachmentSelectorModal = ({ | ||||||
| attachments, | ||||||
| videoId, | ||||||
| isOpen, | ||||||
| onClose, | ||||||
| sx: sxProps, | ||||||
| }: Props) => { | ||||||
| const { user } = useAuth() | ||||||
| const { t } = useTranslation('attachments') | ||||||
|
|
||||||
| const [page] = useState(1) | ||||||
|
|
||||||
| const [filters, setFilters] = useState<AttachmentParams>({ | ||||||
| page, | ||||||
| pageSize: 10, | ||||||
| userId: user!.id, | ||||||
| }) | ||||||
|
|
||||||
| const { data, isLoading, refetch } = useGetUserAttachmentsQuery(filters) | ||||||
|
|
||||||
| const { fields, append, remove } = attachments | ||||||
|
|
||||||
| const handleToggle = (attachment: Attachment) => () => { | ||||||
| const currentIndex = fields.findIndex((e) => e.id === attachment.id) | ||||||
| if (currentIndex === -1) { | ||||||
| append(attachment) | ||||||
| } else { | ||||||
| remove(currentIndex) | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
| useEffect(() => { | ||||||
| /* Since the attachments are not invalidated after a video update, we need to refetch them here */ | ||||||
| if (data) refetch() | ||||||
| }, []) | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
|
|
||||||
| useEffect(() => { | ||||||
| /* On update mode, append the previously selected attachments in order to set the checkboxes ticked */ | ||||||
| if (videoId && data) { | ||||||
| for (const f of fields) { | ||||||
| if ( | ||||||
| f.videos.includes(videoId) && | ||||||
| !fields.find(({ id }) => id === f.id) | ||||||
| ) { | ||||||
| append(f) | ||||||
| } | ||||||
| } | ||||||
| } | ||||||
| }, [videoId, data]) | ||||||
|
There was a problem hiding this comment. maybe
Suggested change
|
||||||
|
|
||||||
| const isAttachmentSelected = (attachment: Attachment) => | ||||||
| fields.some((e) => e.id === attachment.id) | ||||||
|
|
||||||
| /* If the user has no attachment, he is redirected to the attachment creation form */ | ||||||
| if (data && data.totalCount === 0) | ||||||
| return <Redirect push to="/users/profile/attachments/create" /> | ||||||
|
|
||||||
| return ( | ||||||
| <Modal | ||||||
| sx={{ | ||||||
| display: 'flex', | ||||||
| alignItems: 'center', | ||||||
| justifyContent: 'center', | ||||||
| padding: 2, | ||||||
| ...sxProps, | ||||||
| }} | ||||||
| open={isOpen} | ||||||
| onClose={() => onClose()} | ||||||
| aria-labelledby="element modal" | ||||||
| closeAfterTransition | ||||||
| BackdropProps={{ | ||||||
| timeout: 500, | ||||||
| }} | ||||||
| > | ||||||
| <Fade in={isOpen}> | ||||||
| <Paper | ||||||
| sx={{ | ||||||
| width: { | ||||||
| lg: '40%', | ||||||
| md: '50%', | ||||||
| sm: '70%', | ||||||
| xs: '90%', | ||||||
| }, | ||||||
| bgcolor: 'background.default', | ||||||
| borderRadius: 2, | ||||||
| p: { | ||||||
| sm: 2, | ||||||
| xs: 1, | ||||||
| }, | ||||||
| }} | ||||||
| variant="outlined" | ||||||
| > | ||||||
| <Typography variant="h4" sx={{ mb: '2%' }}> | ||||||
| {t('forms.selector.title')} | ||||||
| </Typography> | ||||||
| <Scrollbar | ||||||
| sx={{ | ||||||
| maxHeight: (theme) => `calc(100vh - ${theme.spacing(30)})`, | ||||||
| minHeight: '300px', | ||||||
| }} | ||||||
| > | ||||||
| <Box sx={{ mt: 2 }}> | ||||||
| {{ data } | ||||||
| ? data?.items.map((item) => ( | ||||||
| <ListItem | ||||||
| key={item.id} | ||||||
| secondaryAction={ | ||||||
| <Checkbox | ||||||
| edge="end" | ||||||
| onChange={handleToggle(item)} | ||||||
|
There was a problem hiding this comment. I think it is better like that if you use the input of the function handleToggle
Suggested change
|
||||||
| checked={isAttachmentSelected(item)} | ||||||
|
|
||||||
| /> | ||||||
| } | ||||||
| disablePadding | ||||||
| > | ||||||
| <ListItemButton onClick={handleToggle(item)}> | ||||||
|
|
||||||
| <AttachmentAvatar url={item.url} /> | ||||||
| <Link | ||||||
| href={item.url} | ||||||
| target="_blank" | ||||||
| rel="noopener" | ||||||
| color="inherit" | ||||||
| underline="hover" | ||||||
| > | ||||||
| <ListItemText primary={item.title} /> | ||||||
| </Link> | ||||||
| </ListItemButton> | ||||||
| </ListItem> | ||||||
| )) | ||||||
| : buildSkeletons(3)} | ||||||
| </Box> | ||||||
| </Scrollbar> | ||||||
| <Stack spacing={0}> | ||||||
| {!isLoading && | ||||||
| (data && | ||||||
| data.items.length > 0 && | ||||||
| data.items.length < data.totalCount ? ( | ||||||
|
Comment on lines
+178
to
+181
There was a problem hiding this comment. Maybe you can group everything into one function for clarity |
||||||
| <Box display="flex" sx={{ mt: 3 }} justifyContent="center"> | ||||||
| <PaginationSynced | ||||||
| filters={filters} | ||||||
| setFilters={setFilters} | ||||||
| pageCount={Math.ceil(data?.totalCount / filters.pageSize)} | ||||||
| /> | ||||||
| </Box> | ||||||
| ) : ( | ||||||
| !data || | ||||||
|
There was a problem hiding this comment. Maybe you can group everything into one function for clarity |
||||||
| (data.items.length === 0 && ( | ||||||
| <NoData | ||||||
| variant="attachments" | ||||||
| link="/users/profile/attachments/create" | ||||||
| /> | ||||||
| )) | ||||||
| ))} | ||||||
| </Stack> | ||||||
| <Container | ||||||
| sx={{ display: 'flex', justifyContent: 'center', my: '1em' }} | ||||||
| > | ||||||
| <Button onClick={onClose} variant="contained"> | ||||||
| {t('forms.selector.validate')} | ||||||
| </Button> | ||||||
| </Container> | ||||||
| </Paper> | ||||||
| </Fade> | ||||||
| </Modal> | ||||||
| ) | ||||||
| } | ||||||
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
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.
use only one useTranslation('user') or useTranslation('attachements') then if you want to change use namespace
t('profile.tabs.attachments.content.list.clipboard', { ns: 'user' })