🎧 Your Personal Streaming Service
Go airsonicmadsonicmedia-servermusicmusic-servernavidromeopensubsonicraspberry-piself-hostedstreamerstreaming-apistreaming-audiosubsonicsubsonic-server
Refactor dialogs, make it simple to add a new dialog to all views
Deluan17d9573f4def
diff --git a/ui/src/album/AlbumList.js b/ui/src/album/AlbumList.jsindex d1f79df9b..10ba7e100 100644--- a/ui/src/album/AlbumList.js+++ b/ui/src/album/AlbumList.js@@ -24,11 +24,9 @@ import {import AlbumListActions from './AlbumListActions'import AlbumTableView from './AlbumTableView'import AlbumGridView from './AlbumGridView'-import { AddToPlaylistDialog } from '../dialogs'import albumLists, { defaultAlbumList } from './albumLists'import config from '../config'import AlbumInfo from './AlbumInfo'-import DownloadMenuDialog from '../dialogs/DownloadMenuDialog'import ExpandInfoDialog from '../dialogs/ExpandInfoDialog'const AlbumFilter = (props) => {@@ -138,8 +136,6 @@ const AlbumList = (props) => {<AlbumTableView {...props} />)}</List>- <AddToPlaylistDialog />- <DownloadMenuDialog /><ExpandInfoDialog content={<AlbumInfo />} /></>)diff --git a/ui/src/album/AlbumSongs.js b/ui/src/album/AlbumSongs.jsindex bfd075b3f..e09f1e1fd 100644--- a/ui/src/album/AlbumSongs.js+++ b/ui/src/album/AlbumSongs.js@@ -28,9 +28,7 @@ import {DateField,SizeField,} from '../common'-import { AddToPlaylistDialog } from '../dialogs'import config from '../config'-import DownloadMenuDialog from '../dialogs/DownloadMenuDialog'import ExpandInfoDialog from '../dialogs/ExpandInfoDialog'const useStyles = makeStyles(@@ -189,8 +187,6 @@ const AlbumSongs = (props) => {</SongDatagrid></Card></div>- <AddToPlaylistDialog />- <DownloadMenuDialog /><ExpandInfoDialog content={<SongInfo />} /></>)diff --git a/ui/src/artist/ArtistList.js b/ui/src/artist/ArtistList.jsindex c22f61c17..dbc0e0ebd 100644--- a/ui/src/artist/ArtistList.js+++ b/ui/src/artist/ArtistList.js@@ -17,7 +17,6 @@ import FavoriteIcon from '@material-ui/icons/Favorite'import FavoriteBorderIcon from '@material-ui/icons/FavoriteBorder'import { makeStyles } from '@material-ui/core/styles'import { useDrag } from 'react-dnd'-import { AddToPlaylistDialog } from '../dialogs'import {ArtistContextMenu,List,@@ -32,7 +31,6 @@ import {import config from '../config'import ArtistListActions from './ArtistListActions'import { DraggableTypes } from '../consts'-import DownloadMenuDialog from '../dialogs/DownloadMenuDialog'const useStyles = makeStyles({contextHeader: {@@ -178,8 +176,6 @@ const ArtistList = (props) => {><ArtistListView {...props} /></List>- <AddToPlaylistDialog />- <DownloadMenuDialog /></>)}diff --git a/ui/src/artist/DesktopArtistDetails.js b/ui/src/artist/DesktopArtistDetails.jsindex 8b7212ef5..157f822f1 100644--- a/ui/src/artist/DesktopArtistDetails.js+++ b/ui/src/artist/DesktopArtistDetails.js@@ -8,10 +8,8 @@ import ArtistExternalLinks from './ArtistExternalLink'import config from '../config'import { ArtistContextMenu, RatingField } from '../common'import Lightbox from 'react-image-lightbox'-import { AddToPlaylistDialog } from '../dialogs'import ExpandInfoDialog from '../dialogs/ExpandInfoDialog'import AlbumInfo from '../album/AlbumInfo'-import DownloadMenuDialog from '../dialogs/DownloadMenuDialog'import subsonic from '../subsonic'const useStyles = makeStyles(@@ -152,8 +150,6 @@ const DesktopArtistDetails = ({ artistInfo, record, biography }) => {/>)}</Card>- <AddToPlaylistDialog />- <DownloadMenuDialog /><ExpandInfoDialog content={<AlbumInfo />} /></div>)diff --git a/ui/src/dialogs/Dialogs.js b/ui/src/dialogs/Dialogs.jsnew file mode 100644index 000000000..3de28725c--- /dev/null+++ b/ui/src/dialogs/Dialogs.js@@ -0,0 +1,11 @@+import { AddToPlaylistDialog } from './AddToPlaylistDialog'+import DownloadMenuDialog from './DownloadMenuDialog'+import { HelpDialog } from './HelpDialog'++export const Dialogs = (props) => (+ <>+ <AddToPlaylistDialog />+ <DownloadMenuDialog />+ <HelpDialog />+ </>+)diff --git a/ui/src/dialogs/index.js b/ui/src/dialogs/index.jsindex 7eb98c3c2..7f71529f8 100644--- a/ui/src/dialogs/index.js+++ b/ui/src/dialogs/index.js@@ -1,5 +1,4 @@export * from './AboutDialog'-export * from './AddToPlaylistDialog'export * from './SelectPlaylistInput'-export * from './HelpDialog'export * from './ListenBrainzTokenDialog'+export * from './Dialogs'diff --git a/ui/src/layout/AppBar.js b/ui/src/layout/AppBar.jsindex 46fd969b5..c72f36bff 100644--- a/ui/src/layout/AppBar.js+++ b/ui/src/layout/AppBar.js@@ -12,6 +12,7 @@ import ViewListIcon from '@material-ui/icons/ViewList'import InfoIcon from '@material-ui/icons/Info'import PersonIcon from '@material-ui/icons/Person'import SupervisorAccountIcon from '@material-ui/icons/SupervisorAccount'+import { Dialogs } from '../dialogs/Dialogs'import { AboutDialog } from '../dialogs'import PersonalMenu from './PersonalMenu'import ActivityPanel from './ActivityPanel'@@ -127,6 +128,7 @@ const CustomUserMenu = ({ onClick, ...rest }) => {<Divider /><AboutMenuItem /></UserMenu>+ <Dialogs /></>)}diff --git a/ui/src/layout/Menu.js b/ui/src/layout/Menu.jsindex db5b82472..7ed21ae8f 100644--- a/ui/src/layout/Menu.js+++ b/ui/src/layout/Menu.js@@ -9,7 +9,6 @@ import AlbumIcon from '@material-ui/icons/Album'import SubMenu from './SubMenu'import inflection from 'inflection'import albumLists from '../album/albumLists'-import { HelpDialog } from '../dialogs'import PlaylistsSubMenu from './PlaylistsSubMenu'import config from '../config'@@ -139,7 +138,6 @@ const Menu = ({ dense = false }) => {) : (resources.filter(subItems('playlist')).map(renderResourceMenuItemLink))}- <HelpDialog /></div>)}diff --git a/ui/src/playlist/PlaylistSongs.js b/ui/src/playlist/PlaylistSongs.jsindex fffc1fcba..a968eefa6 100644--- a/ui/src/playlist/PlaylistSongs.js+++ b/ui/src/playlist/PlaylistSongs.js@@ -27,11 +27,9 @@ import {DateField,ArtistLinkField,} from '../common'-import { AddToPlaylistDialog } from '../dialogs'import { AlbumLinkField } from '../song/AlbumLinkField'import { playTracks } from '../actions'import PlaylistSongBulkActions from './PlaylistSongBulkActions'-import DownloadMenuDialog from '../dialogs/DownloadMenuDialog'import ExpandInfoDialog from '../dialogs/ExpandInfoDialog'const useStyles = makeStyles(@@ -214,8 +212,6 @@ const PlaylistSongs = ({ playlistId, readOnly, actions, ...props }) => {</ReorderableList></Card></div>- <AddToPlaylistDialog />- <DownloadMenuDialog /><ExpandInfoDialog content={<SongInfo />} />{React.cloneElement(props.pagination, listContext)}</>diff --git a/ui/src/song/SongList.js b/ui/src/song/SongList.jsindex 2275da4dc..602052d6a 100644--- a/ui/src/song/SongList.js+++ b/ui/src/song/SongList.js@@ -31,10 +31,8 @@ import FavoriteBorderIcon from '@material-ui/icons/FavoriteBorder'import { setTrack } from '../actions'import { SongListActions } from './SongListActions'import { AlbumLinkField } from './AlbumLinkField'-import { AddToPlaylistDialog } from '../dialogs'import { SongBulkActions, QualityInfo, useSelectedFields } from '../common'import config from '../config'-import DownloadMenuDialog from '../dialogs/DownloadMenuDialog'import ExpandInfoDialog from '../dialogs/ExpandInfoDialog'const useStyles = makeStyles({@@ -196,8 +194,6 @@ const SongList = (props) => {</SongDatagrid>)}</List>- <AddToPlaylistDialog />- <DownloadMenuDialog /><ExpandInfoDialog content={<SongInfo />} /></>)