From 4a7c47fb5c23eeed6092927965b43424ecac3812 Mon Sep 17 00:00:00 2001 From: MathieuG-P <40181755+Zagrios@users.noreply.github.com> Date: Fri, 6 Jan 2023 22:44:41 +0100 Subject: [PATCH] add owned indicator + remove useless props --- .../local-maps-list-panel.component.tsx | 2 +- .../map-item.component.tsx | 20 +++++++++---------- .../download-maps-modal.component.tsx | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/renderer/components/maps-mangement-components/local-maps-list-panel.component.tsx b/src/renderer/components/maps-mangement-components/local-maps-list-panel.component.tsx index 8528e642..599b88e6 100644 --- a/src/renderer/components/maps-mangement-components/local-maps-list-panel.component.tsx +++ b/src/renderer/components/maps-mangement-components/local-maps-list-panel.component.tsx @@ -237,7 +237,7 @@ export const LocalMapsListPanel = forwardRef(({version, className, filter, searc bpm={map.rawInfo._beatsPerMinute} duration={map.bsaverInfo?.metadata?.duration} selected={selectedMaps.some(_map => _map.hash === map.hash)} - diffs={extractMapDiffs(map)} mapId={map.bsaverInfo?.id} qualified={null} ranked={map.bsaverInfo?.ranked} autorId={map.bsaverInfo?.uploader?.id} likes={map.bsaverInfo?.stats?.upvotes} createdAt={map.bsaverInfo?.createdAt} + diffs={extractMapDiffs(map)} mapId={map.bsaverInfo?.id} ranked={map.bsaverInfo?.ranked} autorId={map.bsaverInfo?.uploader?.id} likes={map.bsaverInfo?.stats?.upvotes} createdAt={map.bsaverInfo?.createdAt} onDelete={handleDelete} onSelected={onMapSelected} callBackParam={map} diff --git a/src/renderer/components/maps-mangement-components/map-item.component.tsx b/src/renderer/components/maps-mangement-components/map-item.component.tsx index 23bb0116..6a8d64b0 100644 --- a/src/renderer/components/maps-mangement-components/map-item.component.tsx +++ b/src/renderer/components/maps-mangement-components/map-item.component.tsx @@ -33,7 +33,6 @@ export type MapItemProps = { autorId: number, mapId: string, diffs: Map, - qualified: boolean, ranked: boolean, bpm: number, duration: number, @@ -41,6 +40,7 @@ export type MapItemProps = { createdAt: string, selected?: boolean, downloading?: boolean, + showOwned?: boolean, callBackParam: T onDelete?: (param: T) => void, onDownload?: (param: T) => void, @@ -49,7 +49,7 @@ export type MapItemProps = { onDoubleClick?: (param: T) => void } -export const MapItem = memo(({hash, title, autor, songAutor, coverUrl, songUrl, autorId, mapId, diffs, qualified, ranked, bpm, duration, likes, createdAt, selected, downloading, callBackParam, onDelete, onDownload, onSelected, onCancelDownload, onDoubleClick}: MapItemProps) => { +export const MapItem = memo(({hash, title, autor, songAutor, coverUrl, songUrl, autorId, mapId, diffs, ranked, bpm, duration, likes, createdAt, selected, downloading, showOwned, callBackParam, onDelete, onDownload, onSelected, onCancelDownload, onDoubleClick}: MapItemProps) => { const linkOpener = LinkOpenerService.getInstance(); const audioPlayer = AudioPlayerService.getInstance(); @@ -175,7 +175,7 @@ export const MapItem = memo(({hash, title, autor, songAutor, coverUrl, songUrl, )}
-
+
{e.stopPropagation(); e.preventDefault(); toogleMusic()}}> @@ -186,7 +186,7 @@ export const MapItem = memo(({hash, title, autor, songAutor, coverUrl, songUrl,

{title}

{songAutor && t("maps.map-item.by", {songAutor})}

-

{autor && (<> {t("maps.map-item.mapped-by")} {autor})}

+

{autor && (<> {t("maps.map-item.mapped-by")} {autor})}

{likesText && (
@@ -224,12 +224,12 @@ export const MapItem = memo(({hash, title, autor, songAutor, coverUrl, songUrl,
- {onDelete && !downloading && {e.stopPropagation(); onDelete(callBackParam)}}/>} - {onDownload && !downloading && {e.stopPropagation(); onDownload(callBackParam)}}/>} - {onCancelDownload && !downloading && {e.stopPropagation(); onCancelDownload(callBackParam)}}/>} - {downloading && } - {previewUrl && {e.stopPropagation(); openPreview()}}/>} - {mapId && {e.stopPropagation(); copyBsr()}}/>} + {onDelete && !downloading && {e.stopPropagation(); onDelete(callBackParam)}}/>} + {onDownload && !downloading && {e.stopPropagation(); onDownload(callBackParam)}}/>} + {onCancelDownload && !downloading && {e.stopPropagation(); onCancelDownload(callBackParam)}}/>} + {downloading && } + {previewUrl && {e.stopPropagation(); openPreview()}}/>} + {mapId && {e.stopPropagation(); copyBsr()}}/>}
diff --git a/src/renderer/components/modal/modal-types/download-maps-modal.component.tsx b/src/renderer/components/modal/modal-types/download-maps-modal.component.tsx index 1f40de6e..ad0d6b7d 100644 --- a/src/renderer/components/modal/modal-types/download-maps-modal.component.tsx +++ b/src/renderer/components/modal/modal-types/download-maps-modal.component.tsx @@ -107,7 +107,6 @@ export const DownloadMapsModal: ModalComponent = ({data}) => { likes={map.stats.upvotes} mapId={map.id} ranked={map.ranked} - qualified={map.qualified} title={map.name} songAutor={map.metadata.songAuthorName} diffs={extractMapDiffs(map)} @@ -117,6 +116,7 @@ export const DownloadMapsModal: ModalComponent = ({data}) => { onDoubleClick={(!isMapOwned && !inQueue) && (handleDownloadMap)} onCancelDownload={(inQueue && !isDownloading) && (handleCancelDownload)} downloading={isDownloading} + showOwned={isMapOwned} callBackParam={map} /> )