From fa9083ddec212c04adcfc75fd150102904c63e57 Mon Sep 17 00:00:00 2001 From: Deluan Date: Tue, 11 May 2021 18:13:03 -0400 Subject: [PATCH] Upgrade prettier to 2.3.0 Some reformatting was needed... :/ --- ui/package-lock.json | 6 ++--- ui/package.json | 2 +- ui/src/audioplayer/Player.js | 7 +++--- ui/src/dialogs/AddToPlaylistDialog.js | 9 ++------ ui/src/dialogs/AddToPlaylistDialog.test.js | 27 ++++++++++++---------- ui/src/dialogs/SelectPlaylistInput.test.js | 9 ++++---- ui/src/themes/ligera.js | 7 +++--- ui/src/themes/spotify.js | 7 +++--- ui/src/user/DeleteUserButton.js | 21 +++++++---------- 9 files changed, 46 insertions(+), 49 deletions(-) diff --git a/ui/package-lock.json b/ui/package-lock.json index 9f34d014f..4cb4e8236 100644 --- a/ui/package-lock.json +++ b/ui/package-lock.json @@ -13115,9 +13115,9 @@ "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=" }, "prettier": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.2.1.tgz", - "integrity": "sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.3.0.tgz", + "integrity": "sha512-kXtO4s0Lz/DW/IJ9QdWhAf7/NmPWQXkFr/r/WkR3vyI+0v8amTDxiaQSLzs8NBlytfLWX/7uQUMIW677yLKl4w==", "dev": true }, "pretty-bytes": { diff --git a/ui/package.json b/ui/package.json index c9bbaa9b1..1a493e3c0 100644 --- a/ui/package.json +++ b/ui/package.json @@ -34,7 +34,7 @@ "@testing-library/user-event": "^13.1.8", "css-mediaquery": "^0.1.2", "jest-environment-jsdom-sixteen": "^2.0.0", - "prettier": "^2.2.1", + "prettier": "2.3.0", "ra-test": "^3.15.0" }, "scripts": { diff --git a/ui/src/audioplayer/Player.js b/ui/src/audioplayer/Player.js index 5b8ef6453..fdeb9d61a 100644 --- a/ui/src/audioplayer/Player.js +++ b/ui/src/audioplayer/Player.js @@ -295,9 +295,10 @@ const Player = () => { [dispatch, showNotifications] ) - const onAudioPause = useCallback((info) => dispatch(currentPlaying(info)), [ - dispatch, - ]) + const onAudioPause = useCallback( + (info) => dispatch(currentPlaying(info)), + [dispatch] + ) const onAudioEnded = useCallback( (currentPlayId, audioLists, info) => { diff --git a/ui/src/dialogs/AddToPlaylistDialog.js b/ui/src/dialogs/AddToPlaylistDialog.js index 0d4b1aa9f..3d183c6d4 100644 --- a/ui/src/dialogs/AddToPlaylistDialog.js +++ b/ui/src/dialogs/AddToPlaylistDialog.js @@ -17,13 +17,8 @@ import { SelectPlaylistInput } from './SelectPlaylistInput' import DuplicateSongDialog from './DuplicateSongDialog' export const AddToPlaylistDialog = () => { - const { - open, - selectedIds, - onSuccess, - duplicateSong, - duplicateIds, - } = useSelector((state) => state.addToPlaylistDialog) + const { open, selectedIds, onSuccess, duplicateSong, duplicateIds } = + useSelector((state) => state.addToPlaylistDialog) const dispatch = useDispatch() const translate = useTranslate() const notify = useNotify() diff --git a/ui/src/dialogs/AddToPlaylistDialog.test.js b/ui/src/dialogs/AddToPlaylistDialog.test.js index 72d5825aa..f3bffcfd2 100644 --- a/ui/src/dialogs/AddToPlaylistDialog.test.js +++ b/ui/src/dialogs/AddToPlaylistDialog.test.js @@ -53,10 +53,11 @@ describe('AddToPlaylistDialog', () => { data: mockIndexedData, list: { cachedRequests: { - '{"pagination":{"page":1,"perPage":-1},"sort":{"field":"name","order":"ASC"},"filter":{}}': { - ids: ['sample-id1', 'sample-id2'], - total: 2, - }, + '{"pagination":{"page":1,"perPage":-1},"sort":{"field":"name","order":"ASC"},"filter":{}}': + { + ids: ['sample-id1', 'sample-id2'], + total: 2, + }, }, }, }, @@ -129,10 +130,11 @@ describe('AddToPlaylistDialog', () => { data: mockIndexedData, list: { cachedRequests: { - '{"pagination":{"page":1,"perPage":-1},"sort":{"field":"name","order":"ASC"},"filter":{}}': { - ids: ['sample-id1', 'sample-id2'], - total: 2, - }, + '{"pagination":{"page":1,"perPage":-1},"sort":{"field":"name","order":"ASC"},"filter":{}}': + { + ids: ['sample-id1', 'sample-id2'], + total: 2, + }, }, }, }, @@ -186,10 +188,11 @@ describe('AddToPlaylistDialog', () => { data: mockIndexedData, list: { cachedRequests: { - '{"pagination":{"page":1,"perPage":-1},"sort":{"field":"name","order":"ASC"},"filter":{}}': { - ids: ['sample-id1', 'sample-id2'], - total: 2, - }, + '{"pagination":{"page":1,"perPage":-1},"sort":{"field":"name","order":"ASC"},"filter":{}}': + { + ids: ['sample-id1', 'sample-id2'], + total: 2, + }, }, }, }, diff --git a/ui/src/dialogs/SelectPlaylistInput.test.js b/ui/src/dialogs/SelectPlaylistInput.test.js index 751f5d023..be800c7e5 100644 --- a/ui/src/dialogs/SelectPlaylistInput.test.js +++ b/ui/src/dialogs/SelectPlaylistInput.test.js @@ -44,10 +44,11 @@ describe('SelectPlaylistInput', () => { data: mockIndexedData, list: { cachedRequests: { - '{"pagination":{"page":1,"perPage":-1},"sort":{"field":"name","order":"ASC"},"filter":{}}': { - ids: ['sample-id1', 'sample-id2'], - total: 2, - }, + '{"pagination":{"page":1,"perPage":-1},"sort":{"field":"name","order":"ASC"},"filter":{}}': + { + ids: ['sample-id1', 'sample-id2'], + total: 2, + }, }, }, }, diff --git a/ui/src/themes/ligera.js b/ui/src/themes/ligera.js index f57d80bb6..e8f6c3ece 100644 --- a/ui/src/themes/ligera.js +++ b/ui/src/themes/ligera.js @@ -47,9 +47,10 @@ const musicListActions = { 'button:first-child>span:first-child>span': { display: 'none', }, - 'button>span:first-child>span, button:not(:first-child)>span:first-child>svg': { - color: '#656565', - }, + 'button>span:first-child>span, button:not(:first-child)>span:first-child>svg': + { + color: '#656565', + }, }, } diff --git a/ui/src/themes/spotify.js b/ui/src/themes/spotify.js index c42e5384f..8f49f6394 100644 --- a/ui/src/themes/spotify.js +++ b/ui/src/themes/spotify.js @@ -48,9 +48,10 @@ const musicListActions = { 'button:first-child>span:first-child>span': { display: 'none', }, - 'button>span:first-child>span, button:not(:first-child)>span:first-child>svg': { - color: '#b3b3b3', - }, + 'button>span:first-child>span, button:not(:first-child)>span:first-child>svg': + { + color: '#b3b3b3', + }, }, } diff --git a/ui/src/user/DeleteUserButton.js b/ui/src/user/DeleteUserButton.js index 913904a9c..44378569d 100644 --- a/ui/src/user/DeleteUserButton.js +++ b/ui/src/user/DeleteUserButton.js @@ -31,19 +31,14 @@ const DeleteUserButton = (props) => { onClick, ...rest } = props - const { - open, - loading, - handleDialogOpen, - handleDialogClose, - handleDelete, - } = useDeleteWithConfirmController({ - resource, - record, - redirect, - basePath, - onClick, - }) + const { open, loading, handleDialogOpen, handleDialogClose, handleDelete } = + useDeleteWithConfirmController({ + resource, + record, + redirect, + basePath, + onClick, + }) const classes = useStyles(props) return (