Skip to content
This repository has been archived by the owner on Feb 22, 2023. It is now read-only.

Refactor media services #867

Merged
merged 12 commits into from
Feb 23, 2022
Merged

Refactor media services #867

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
6d16616
Create a single media-service data fetching object
obulat Feb 14, 2022
223f519
Move slug creation from media service to the api service
obulat Feb 15, 2022
3ba8de8
Use typing data from #868
obulat Feb 15, 2022
e0b4b2f
Format
obulat Feb 15, 2022
61ff595
Update src/constants/media.js
obulat Feb 15, 2022
07bb48d
Apply suggestions from code review
obulat Feb 15, 2022
31e085f
Merge branch 'main' into refactor_media_services
obulat Feb 15, 2022
17283e7
edit api-service styles; format
obulat Feb 15, 2022
604e407
Merge branch 'main' into refactor_media_services
obulat Feb 21, 2022
e1961eb
fix decode-media-data type import
obulat Feb 21, 2022
b956a70
Merge branch 'main' into refactor_media_services
obulat Feb 22, 2022
e22293c
Return decoded data from the media services
obulat Feb 22, 2022
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
25 changes: 14 additions & 11 deletions src/store/types.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,19 @@
*/

type FrontendMediaType = MediaDetail['frontendMediaType']
export interface MediaResult<T extends FrontendMediaType[] | Record<string, FrontendMediaType>> {
export interface MediaResult<
T extends FrontendMediaType[] | Record<string, FrontendMediaType>
obulat marked this conversation as resolved.
Show resolved Hide resolved
> {
result_count: number
page_count: number
page_size: number
results:
T extends FrontendMediaType
? DetailFromMediaType<T>
: T extends Array<infer P>
? DetailFromMediaType<P>[]
: T extends Record<infer K, infer P>
? Record<K, DetailFromMediaType<P>>
: never
results: T extends FrontendMediaType
? DetailFromMediaType<T>
: T extends Array<infer P>
? DetailFromMediaType<P>[]
: T extends Record<infer K, infer P>
? Record<K, DetailFromMediaType<P>>
: never
}

export type Query = {
Expand Down Expand Up @@ -87,7 +88,8 @@ export interface ImageDetail extends BaseMediaDetail<'image'> {

export type MediaDetail = ImageDetail | AudioDetail

export type DetailFromMediaType<T extends MediaDetail['frontendMediaType']> = T extends 'image' ? ImageDetail : T extends 'audio' ? AudioDetail : never
export type DetailFromMediaType<T extends MediaDetail['frontendMediaType']> =
T extends 'image' ? ImageDetail : T extends 'audio' ? AudioDetail : never

export interface FilterItem {
code: string
Expand Down Expand Up @@ -130,7 +132,8 @@ export interface ActiveMediaState {
status: 'ejected' | 'playing' | 'paused' // 'ejected' means player is closed
}

export interface MediaStoreResult<T extends FrontendMediaType> extends MediaResult<Record<MediaDetail['id'], T>> {}
export interface MediaStoreResult<T extends FrontendMediaType>
extends MediaResult<Record<MediaDetail['id'], T>> {}

export interface MediaState {
results: {
Expand Down