Skip to content

[PAY-3279] Fix misc web album UI issues #9362

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.

Sign up for GitHub

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

Merged
raymondjacobson merged 1 commit into from
Aug 2, 2024
Merged

[PAY-3279] Fix misc web album UI issues #9362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions packages/common/src/hooks/useCollectionMetadata.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@ export const useCollectionMetadata = ({
const {
is_private: isPrivate,
updated_at: updatedAt,
release_date: releaseDate
release_date: releaseDate,
created_at: createdAt
} = collection
const numTracks = collection.playlist_contents?.track_ids?.length ?? 0

Expand All @@ -60,13 +61,13 @@ export const useCollectionMetadata = ({
},
{
id: CollectionMetadataType.RELEASE_DATE,
value: formatDate(releaseDate ?? ''),
value: formatDate(releaseDate ?? createdAt),
label: 'Released',
isHidden: isPrivate
},
{
id: CollectionMetadataType.UPDATED_AT,
value: formatDate(updatedAt ?? ''),
value: formatDate(updatedAt ?? createdAt),
label: 'Updated',
isHidden: isPrivate
}
Expand Down
4 changes: 2 additions & 2 deletions packages/web/src/common/store/pages/collection/lineups/sagas.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ function* getCollectionTracks() {

const trackIds = tracks.map((t) => t.track)
// TODO: Conform all timestamps to be of the same format so we don't have to do any special work here.
const now = Math.floor(Date.now() / 1000)
const times = tracks.map((t) => t.metadata_time || now)
// Some playlists & albums may not have a metadata time, so use the time if not.
const times = tracks.map((t) => t.metadata_time || t.time)

// Reconcile fetching this playlist with the queue.
// Search the queue for its currently playing uids. If any are sourced
Expand Down
1 change: 1 addition & 0 deletions packages/web/src/components/collection/desktop/CollectionHeader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,7 @@ export const CollectionHeader = (props: CollectionHeaderProps) => {
/>
<Flex
direction='column'
gap='xl'
justifyContent='space-between'
css={{ minWidth: 400 }}
>
Expand Down