Skip to content

[C-4589] Add links from track tile screen to search screen#9071

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
Kyle-Shanks merged 4 commits into from
Jul 9, 2024
Merged

[C-4589] Add links from track tile screen to search screen #9071

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9001c10
Update track metadata to link to the search screen on mobile
Kyle-Shanks Jul 9, 2024
e79a8f0
Add key to switch
Kyle-Shanks Jul 9, 2024
c508d9c
fix lint
Kyle-Shanks Jul 9, 2024
94a45ad
small update
Kyle-Shanks Jul 9, 2024
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
61 changes: 50 additions & 11 deletions packages/mobile/src/components/details-tile/TrackMetadataList.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
import { useCallback } from 'react'

import type { SearchFilters } from '@audius/common/api'
import { TrackMetadataType, useTrackMetadata } from '@audius/common/hooks'
import type { ID } from '@audius/common/models'
import type { Mood } from '@audius/sdk'
import { trpc } from '@audius/web/src/utils/trpcClientWeb'
import { Image } from 'react-native'

import { Flex, Text, TextLink, spacing } from '@audius/harmony-native'
import { useNavigation } from 'app/hooks/useNavigation'
import { moodMap } from 'app/utils/moods'

import { MetadataItem } from './MetadataItem'
Expand All@@ -13,23 +17,49 @@ const messages = {
album: 'Album'
}

const renderMood = (mood: string) => {
const renderMood = (mood: string, onPress: () => void) => {
return (
<TextLink variant='visible' onPress={onPress}>
<Flex direction='row' gap='xs' alignItems='center'>
<Text variant='body' size='s' strength='strong'>
{mood}
</Text>
<Image
source={moodMap[mood as Mood]}
style={{ height: spacing.l, width: spacing.l }}
/>
</Flex>
</TextLink>
)
}

const renderFilterLink = (value: string, onPress: () => void) => {
return (
<Flex direction='row' gap='xs' alignItems='center'>
<TextLink onPress={onPress}>
<Text variant='body' size='s' strength='strong'>
{mood}
{value}
</Text>
<Image
source={moodMap[mood as Mood]}
style={{ height: spacing.l, width: spacing.l }}
/>
</Flex>
</TextLink>
)
}
const renderMetadataValue = (id: TrackMetadataType, value: string) => {

const renderMetadataValue = (
id: TrackMetadataType,
value: string,
handleFilterLinkPress: (filters: SearchFilters) => void
) => {
switch (id) {
case TrackMetadataType.MOOD:
return renderMood(value)
return renderMood(value, () => {
handleFilterLinkPress({ mood: value as Mood })
})
// TODO: BPM and Key might need to be transformed to fit the search page's expected format
case TrackMetadataType.GENRE:
case TrackMetadataType.BPM:
case TrackMetadataType.KEY:
return renderFilterLink(value, () => {
handleFilterLinkPress({ [id]: value })
})
default:
return value
}
Expand All@@ -43,6 +73,15 @@ type TrackMetadataListProps = {
* The additional metadata shown at the bottom of the Track Screen and Collection Screen Headers
*/
export const TrackMetadataList = ({ trackId }: TrackMetadataListProps) => {
const navigation = useNavigation()

const handleFilterLinkPress = useCallback(
(filters: SearchFilters) => {
navigation.navigate('Search', { category: 'tracks', filters })
},
[navigation]
)

const { data: albumInfo } = trpc.tracks.getAlbumBacklink.useQuery({
trackId
})
Expand All@@ -55,7 +94,7 @@ export const TrackMetadataList = ({ trackId }: TrackMetadataListProps) => {
<Flex gap='l' w='100%' direction='row' wrap='wrap'>
{metadataItems.map(({ id, label, value }) => (
<MetadataItem key={id} label={label}>
{renderMetadataValue(id, value)}
{renderMetadataValue(id, value, handleFilterLinkPress)}
</MetadataItem>
))}
{albumInfo ? (
Expand Down
7 changes: 5 additions & 2 deletions packages/mobile/src/screens/search-screen-v2/SearchCategoriesAndFilters.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ type SearchCategoryProps = {
const SearchCategory = (props: SearchCategoryProps) => {
const { category } = props
const [currentCategory, setCategory] = useSearchCategory()
const [, setFilters] = useSearchFilters()
const isSelected = currentCategory === category

const labelByCategory = {
Expand All@@ -40,9 +41,11 @@ const SearchCategory = (props: SearchCategoryProps) => {
value={category}
label={labelByCategory[category]}
isSelected={isSelected}
onChange={(value, isSelected) =>
onChange={(value, isSelected) => {
// Clear Filters and change category
setFilters({})
setCategory(isSelected ? (value as SearchCategoryType) : 'all')
}
}}
icon={isSelected ? IconCloseAlt : undefined}
/>
)
Expand Down
8 changes: 7 additions & 1 deletion packages/mobile/src/screens/search-screen-v2/SearchScreenV2.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { useState } from 'react'
import { useEffect, useState } from 'react'

import type {
SearchCategory,
Expand DownExpand Up@@ -68,6 +68,12 @@ export const SearchScreenStack = () => {
params.filters ?? {}
)

useEffect(() => {
setQuery(params.query ?? '')
setCategory(params.category ?? 'all')
setFilters(params.filters ?? {})
}, [params])

const screenOptions = useAppScreenOptions()

return (
Expand Down
6 changes: 5 additions & 1 deletion packages/web/src/pages/search-page-v2/SearchPageV2.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { useCallback, useContext, useEffect } from 'react'

import { SearchCategory } from '@audius/common/src/api/search'
import { Flex } from '@audius/harmony'
import { generatePath, useParams } from 'react-router-dom'
import { useSearchParams } from 'react-router-dom-v5-compat'
Expand DownExpand Up@@ -90,7 +91,10 @@ export const SearchPageV2 = () => {
<PageComponent
title={query ?? 'Search'}
description={`Search results for ${query}`}
canonicalUrl={fullSearchResultsPageV2(category, query ?? '')}
canonicalUrl={fullSearchResultsPageV2(
category as SearchCategory,
query ?? ''
)}
header={header}
>
<Flex direction='column' w='100%'>
Expand Down
11 changes: 9 additions & 2 deletions packages/web/src/utils/route.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import { SearchCategory } from '@audius/common/api'
import type { ID } from '@audius/common/models'
import { Genre, Mood } from '@audius/sdk'
import { push as pushRoute } from 'connected-react-router'
Expand DownExpand Up@@ -471,11 +472,17 @@ export const fullSearchResultsPage = (query: string) => {
return `${BASE_URL}${searchResultsPage(query)}`
}

export const searchResultsPageV2 = (category: string, query: string) => {
export const searchResultsPageV2 = (
category: SearchCategory,
query: string
) => {
return `/search/${category}/?query=${query}`
}

export const fullSearchResultsPageV2 = (category: string, query: string) => {
export const fullSearchResultsPageV2 = (
category: SearchCategory,
query: string
) => {
return `${BASE_URL}${searchResultsPageV2(category, query)}`
}

Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
[C-4589] Add links from track tile screen to search screen by Kyle-Shanks · Pull Request #9071 · AudiusProject/apps · GitHub
Skip to content
[C-4589] Add links from track tile screen to search screen#9071

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

Kyle-Shanks
merged 4 commits into

from

Jul 9, 2024
 Merged


[C-4589] Add links from track tile screen to search screen
#9071
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
9001c10

Update track metadata to link to the search screen on mobile


Kyle-Shanks Jul 9, 2024
e79a8f0

Add key to switch


Kyle-Shanks Jul 9, 2024
c508d9c

fix lint


Kyle-Shanks Jul 9, 2024
94a45ad

small update


Kyle-Shanks Jul 9, 2024

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


61 changes: 50 additions & 11 deletions
packages/mobile/src/components/details-tile/TrackMetadataList.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
import { useCallback } from 'react'

import type { SearchFilters } from '@audius/common/api'
import { TrackMetadataType, useTrackMetadata } from '@audius/common/hooks'
import type { ID } from '@audius/common/models'
import type { Mood } from '@audius/sdk'
import { trpc } from '@audius/web/src/utils/trpcClientWeb'
import { Image } from 'react-native'

import { Flex, Text, TextLink, spacing } from '@audius/harmony-native'
import { useNavigation } from 'app/hooks/useNavigation'
import { moodMap } from 'app/utils/moods'

import { MetadataItem } from './MetadataItem'
Expand All@@ -13,23 +17,49 @@ const messages = {
 album: 'Album'
}

const renderMood = (mood: string) => {
const renderMood = (mood: string, onPress: () => void) => {
 return (
 <TextLink variant='visible' onPress={onPress}>
 <Flex direction='row' gap='xs' alignItems='center'>
 <Text variant='body' size='s' strength='strong'>
 {mood}
 </Text>
 <Image
 source={moodMap[mood as Mood]}
 style={{ height: spacing.l, width: spacing.l }}
 />
 </Flex>
 </TextLink>
 )
}

const renderFilterLink = (value: string, onPress: () => void) => {
 return (
 <Flex direction='row' gap='xs' alignItems='center'>
 <TextLink onPress={onPress}>
 <Text variant='body' size='s' strength='strong'>
 {mood}
 {value}
 </Text>
 <Image
 source={moodMap[mood as Mood]}
 style={{ height: spacing.l, width: spacing.l }}
 />
 </Flex>
 </TextLink>
 )
}
const renderMetadataValue = (id: TrackMetadataType, value: string) => {

const renderMetadataValue = (
 id: TrackMetadataType,
 value: string,
 handleFilterLinkPress: (filters: SearchFilters) => void
) => {
 switch (id) {
 case TrackMetadataType.MOOD:
 return renderMood(value)
 return renderMood(value, () => {
 handleFilterLinkPress({ mood: value as Mood })
 })
 // TODO: BPM and Key might need to be transformed to fit the search page's expected format
 case TrackMetadataType.GENRE:
 case TrackMetadataType.BPM:
 case TrackMetadataType.KEY:
 return renderFilterLink(value, () => {
 handleFilterLinkPress({ [id]: value })
 })
 default:
 return value
 }
Expand All@@ -43,6 +73,15 @@ type TrackMetadataListProps = {
 * The additional metadata shown at the bottom of the Track Screen and Collection Screen Headers
 */
export const TrackMetadataList = ({ trackId }: TrackMetadataListProps) => {
 const navigation = useNavigation()

 const handleFilterLinkPress = useCallback(
 (filters: SearchFilters) => {
 navigation.navigate('Search', { category: 'tracks', filters })
 },
 [navigation]
 )

 const { data: albumInfo } = trpc.tracks.getAlbumBacklink.useQuery({
 trackId
 })
Expand All@@ -55,7 +94,7 @@ export const TrackMetadataList = ({ trackId }: TrackMetadataListProps) => {
 <Flex gap='l' w='100%' direction='row' wrap='wrap'>
 {metadataItems.map(({ id, label, value }) => (
 <MetadataItem key={id} label={label}>
 {renderMetadataValue(id, value)}
 {renderMetadataValue(id, value, handleFilterLinkPress)}
 </MetadataItem>
 ))}
 {albumInfo ? (
Expand Down

7 changes: 5 additions & 2 deletions
packages/mobile/src/screens/search-screen-v2/SearchCategoriesAndFilters.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ type SearchCategoryProps = {
const SearchCategory = (props: SearchCategoryProps) => {
 const { category } = props
 const [currentCategory, setCategory] = useSearchCategory()
 const [, setFilters] = useSearchFilters()
 const isSelected = currentCategory === category

 const labelByCategory = {
Expand All@@ -40,9 +41,11 @@ const SearchCategory = (props: SearchCategoryProps) => {
 value={category}
 label={labelByCategory[category]}
 isSelected={isSelected}
 onChange={(value, isSelected) =>
 onChange={(value, isSelected) => {
 // Clear Filters and change category
 setFilters({})
 setCategory(isSelected ? (value as SearchCategoryType) : 'all')
 }
 }}
 icon={isSelected ? IconCloseAlt : undefined}
 />
 )
Expand Down

8 changes: 7 additions & 1 deletion
packages/mobile/src/screens/search-screen-v2/SearchScreenV2.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { useState } from 'react'
import { useEffect, useState } from 'react'

import type {
 SearchCategory,
Expand DownExpand Up@@ -68,6 +68,12 @@ export const SearchScreenStack = () => {
 params.filters ?? {}
 )

 useEffect(() => {
 setQuery(params.query ?? '')
 setCategory(params.category ?? 'all')
 setFilters(params.filters ?? {})
 }, [params])

 const screenOptions = useAppScreenOptions()

 return (
Expand Down

6 changes: 5 additions & 1 deletion
packages/web/src/pages/search-page-v2/SearchPageV2.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { useCallback, useContext, useEffect } from 'react'

import { SearchCategory } from '@audius/common/src/api/search'
import { Flex } from '@audius/harmony'
import { generatePath, useParams } from 'react-router-dom'
import { useSearchParams } from 'react-router-dom-v5-compat'
Expand DownExpand Up@@ -90,7 +91,10 @@ export const SearchPageV2 = () => {
 <PageComponent
 title={query ?? 'Search'}
 description={`Search results for ${query}`}
 canonicalUrl={fullSearchResultsPageV2(category, query ?? '')}
 canonicalUrl={fullSearchResultsPageV2(
 category as SearchCategory,
 query ?? ''
 )}
 header={header}
 >
 <Flex direction='column' w='100%'>
Expand Down

11 changes: 9 additions & 2 deletions
packages/web/src/utils/route.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import { SearchCategory } from '@audius/common/api'
import type { ID } from '@audius/common/models'
import { Genre, Mood } from '@audius/sdk'
import { push as pushRoute } from 'connected-react-router'
Expand DownExpand Up@@ -471,11 +472,17 @@ export const fullSearchResultsPage = (query: string) => {
 return `${BASE_URL}${searchResultsPage(query)}`
}

export const searchResultsPageV2 = (category: string, query: string) => {
export const searchResultsPageV2 = (
 category: SearchCategory,
 query: string
) => {
 return `/search/${category}/?query=${query}`
}

export const fullSearchResultsPageV2 = (category: string, query: string) => {
export const fullSearchResultsPageV2 = (
 category: SearchCategory,
 query: string
) => {
 return `${BASE_URL}${searchResultsPageV2(category, query)}`
}

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
[C-4589] Add links from track tile screen to search screen by Kyle-Shanks · Pull Request #9071 · AudiusProject/apps · GitHub
Skip to content
[C-4589] Add links from track tile screen to search screen#9071

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

Kyle-Shanks
merged 4 commits into

from

Jul 9, 2024
 Merged


[C-4589] Add links from track tile screen to search screen
#9071
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
9001c10

Update track metadata to link to the search screen on mobile


Kyle-Shanks Jul 9, 2024
e79a8f0

Add key to switch


Kyle-Shanks Jul 9, 2024
c508d9c

fix lint


Kyle-Shanks Jul 9, 2024
94a45ad

small update


Kyle-Shanks Jul 9, 2024

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


61 changes: 50 additions & 11 deletions
packages/mobile/src/components/details-tile/TrackMetadataList.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
import { useCallback } from 'react'

import type { SearchFilters } from '@audius/common/api'
import { TrackMetadataType, useTrackMetadata } from '@audius/common/hooks'
import type { ID } from '@audius/common/models'
import type { Mood } from '@audius/sdk'
import { trpc } from '@audius/web/src/utils/trpcClientWeb'
import { Image } from 'react-native'

import { Flex, Text, TextLink, spacing } from '@audius/harmony-native'
import { useNavigation } from 'app/hooks/useNavigation'
import { moodMap } from 'app/utils/moods'

import { MetadataItem } from './MetadataItem'
Expand All@@ -13,23 +17,49 @@ const messages = {
 album: 'Album'
}

const renderMood = (mood: string) => {
const renderMood = (mood: string, onPress: () => void) => {
 return (
 <TextLink variant='visible' onPress={onPress}>
 <Flex direction='row' gap='xs' alignItems='center'>
 <Text variant='body' size='s' strength='strong'>
 {mood}
 </Text>
 <Image
 source={moodMap[mood as Mood]}
 style={{ height: spacing.l, width: spacing.l }}
 />
 </Flex>
 </TextLink>
 )
}

const renderFilterLink = (value: string, onPress: () => void) => {
 return (
 <Flex direction='row' gap='xs' alignItems='center'>
 <TextLink onPress={onPress}>
 <Text variant='body' size='s' strength='strong'>
 {mood}
 {value}
 </Text>
 <Image
 source={moodMap[mood as Mood]}
 style={{ height: spacing.l, width: spacing.l }}
 />
 </Flex>
 </TextLink>
 )
}
const renderMetadataValue = (id: TrackMetadataType, value: string) => {

const renderMetadataValue = (
 id: TrackMetadataType,
 value: string,
 handleFilterLinkPress: (filters: SearchFilters) => void
) => {
 switch (id) {
 case TrackMetadataType.MOOD:
 return renderMood(value)
 return renderMood(value, () => {
 handleFilterLinkPress({ mood: value as Mood })
 })
 // TODO: BPM and Key might need to be transformed to fit the search page's expected format
 case TrackMetadataType.GENRE:
 case TrackMetadataType.BPM:
 case TrackMetadataType.KEY:
 return renderFilterLink(value, () => {
 handleFilterLinkPress({ [id]: value })
 })
 default:
 return value
 }
Expand All@@ -43,6 +73,15 @@ type TrackMetadataListProps = {
 * The additional metadata shown at the bottom of the Track Screen and Collection Screen Headers
 */
export const TrackMetadataList = ({ trackId }: TrackMetadataListProps) => {
 const navigation = useNavigation()

 const handleFilterLinkPress = useCallback(
 (filters: SearchFilters) => {
 navigation.navigate('Search', { category: 'tracks', filters })
 },
 [navigation]
 )

 const { data: albumInfo } = trpc.tracks.getAlbumBacklink.useQuery({
 trackId
 })
Expand All@@ -55,7 +94,7 @@ export const TrackMetadataList = ({ trackId }: TrackMetadataListProps) => {
 <Flex gap='l' w='100%' direction='row' wrap='wrap'>
 {metadataItems.map(({ id, label, value }) => (
 <MetadataItem key={id} label={label}>
 {renderMetadataValue(id, value)}
 {renderMetadataValue(id, value, handleFilterLinkPress)}
 </MetadataItem>
 ))}
 {albumInfo ? (
Expand Down

7 changes: 5 additions & 2 deletions
packages/mobile/src/screens/search-screen-v2/SearchCategoriesAndFilters.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ type SearchCategoryProps = {
const SearchCategory = (props: SearchCategoryProps) => {
 const { category } = props
 const [currentCategory, setCategory] = useSearchCategory()
 const [, setFilters] = useSearchFilters()
 const isSelected = currentCategory === category

 const labelByCategory = {
Expand All@@ -40,9 +41,11 @@ const SearchCategory = (props: SearchCategoryProps) => {
 value={category}
 label={labelByCategory[category]}
 isSelected={isSelected}
 onChange={(value, isSelected) =>
 onChange={(value, isSelected) => {
 // Clear Filters and change category
 setFilters({})
 setCategory(isSelected ? (value as SearchCategoryType) : 'all')
 }
 }}
 icon={isSelected ? IconCloseAlt : undefined}
 />
 )
Expand Down

8 changes: 7 additions & 1 deletion
packages/mobile/src/screens/search-screen-v2/SearchScreenV2.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { useState } from 'react'
import { useEffect, useState } from 'react'

import type {
 SearchCategory,
Expand DownExpand Up@@ -68,6 +68,12 @@ export const SearchScreenStack = () => {
 params.filters ?? {}
 )

 useEffect(() => {
 setQuery(params.query ?? '')
 setCategory(params.category ?? 'all')
 setFilters(params.filters ?? {})
 }, [params])

 const screenOptions = useAppScreenOptions()

 return (
Expand Down

6 changes: 5 additions & 1 deletion
packages/web/src/pages/search-page-v2/SearchPageV2.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { useCallback, useContext, useEffect } from 'react'

import { SearchCategory } from '@audius/common/src/api/search'
import { Flex } from '@audius/harmony'
import { generatePath, useParams } from 'react-router-dom'
import { useSearchParams } from 'react-router-dom-v5-compat'
Expand DownExpand Up@@ -90,7 +91,10 @@ export const SearchPageV2 = () => {
 <PageComponent
 title={query ?? 'Search'}
 description={`Search results for ${query}`}
 canonicalUrl={fullSearchResultsPageV2(category, query ?? '')}
 canonicalUrl={fullSearchResultsPageV2(
 category as SearchCategory,
 query ?? ''
 )}
 header={header}
 >
 <Flex direction='column' w='100%'>
Expand Down

11 changes: 9 additions & 2 deletions
packages/web/src/utils/route.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import { SearchCategory } from '@audius/common/api'
import type { ID } from '@audius/common/models'
import { Genre, Mood } from '@audius/sdk'
import { push as pushRoute } from 'connected-react-router'
Expand DownExpand Up@@ -471,11 +472,17 @@ export const fullSearchResultsPage = (query: string) => {
 return `${BASE_URL}${searchResultsPage(query)}`
}

export const searchResultsPageV2 = (category: string, query: string) => {
export const searchResultsPageV2 = (
 category: SearchCategory,
 query: string
) => {
 return `/search/${category}/?query=${query}`
}

export const fullSearchResultsPageV2 = (category: string, query: string) => {
export const fullSearchResultsPageV2 = (
 category: SearchCategory,
 query: string
) => {
 return `${BASE_URL}${searchResultsPageV2(category, query)}`
}

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
[C-4589] Add links from track tile screen to search screen by Kyle-Shanks · Pull Request #9071 · AudiusProject/apps · GitHub
Skip to content
[C-4589] Add links from track tile screen to search screen#9071

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

Kyle-Shanks
merged 4 commits into

from

Jul 9, 2024
 Merged


[C-4589] Add links from track tile screen to search screen
#9071
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
9001c10

Update track metadata to link to the search screen on mobile


Kyle-Shanks Jul 9, 2024
e79a8f0

Add key to switch


Kyle-Shanks Jul 9, 2024
c508d9c

fix lint


Kyle-Shanks Jul 9, 2024
94a45ad

small update


Kyle-Shanks Jul 9, 2024

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


61 changes: 50 additions & 11 deletions
packages/mobile/src/components/details-tile/TrackMetadataList.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
import { useCallback } from 'react'

import type { SearchFilters } from '@audius/common/api'
import { TrackMetadataType, useTrackMetadata } from '@audius/common/hooks'
import type { ID } from '@audius/common/models'
import type { Mood } from '@audius/sdk'
import { trpc } from '@audius/web/src/utils/trpcClientWeb'
import { Image } from 'react-native'

import { Flex, Text, TextLink, spacing } from '@audius/harmony-native'
import { useNavigation } from 'app/hooks/useNavigation'
import { moodMap } from 'app/utils/moods'

import { MetadataItem } from './MetadataItem'
Expand All@@ -13,23 +17,49 @@ const messages = {
 album: 'Album'
}

const renderMood = (mood: string) => {
const renderMood = (mood: string, onPress: () => void) => {
 return (
 <TextLink variant='visible' onPress={onPress}>
 <Flex direction='row' gap='xs' alignItems='center'>
 <Text variant='body' size='s' strength='strong'>
 {mood}
 </Text>
 <Image
 source={moodMap[mood as Mood]}
 style={{ height: spacing.l, width: spacing.l }}
 />
 </Flex>
 </TextLink>
 )
}

const renderFilterLink = (value: string, onPress: () => void) => {
 return (
 <Flex direction='row' gap='xs' alignItems='center'>
 <TextLink onPress={onPress}>
 <Text variant='body' size='s' strength='strong'>
 {mood}
 {value}
 </Text>
 <Image
 source={moodMap[mood as Mood]}
 style={{ height: spacing.l, width: spacing.l }}
 />
 </Flex>
 </TextLink>
 )
}
const renderMetadataValue = (id: TrackMetadataType, value: string) => {

const renderMetadataValue = (
 id: TrackMetadataType,
 value: string,
 handleFilterLinkPress: (filters: SearchFilters) => void
) => {
 switch (id) {
 case TrackMetadataType.MOOD:
 return renderMood(value)
 return renderMood(value, () => {
 handleFilterLinkPress({ mood: value as Mood })
 })
 // TODO: BPM and Key might need to be transformed to fit the search page's expected format
 case TrackMetadataType.GENRE:
 case TrackMetadataType.BPM:
 case TrackMetadataType.KEY:
 return renderFilterLink(value, () => {
 handleFilterLinkPress({ [id]: value })
 })
 default:
 return value
 }
Expand All@@ -43,6 +73,15 @@ type TrackMetadataListProps = {
 * The additional metadata shown at the bottom of the Track Screen and Collection Screen Headers
 */
export const TrackMetadataList = ({ trackId }: TrackMetadataListProps) => {
 const navigation = useNavigation()

 const handleFilterLinkPress = useCallback(
 (filters: SearchFilters) => {
 navigation.navigate('Search', { category: 'tracks', filters })
 },
 [navigation]
 )

 const { data: albumInfo } = trpc.tracks.getAlbumBacklink.useQuery({
 trackId
 })
Expand All@@ -55,7 +94,7 @@ export const TrackMetadataList = ({ trackId }: TrackMetadataListProps) => {
 <Flex gap='l' w='100%' direction='row' wrap='wrap'>
 {metadataItems.map(({ id, label, value }) => (
 <MetadataItem key={id} label={label}>
 {renderMetadataValue(id, value)}
 {renderMetadataValue(id, value, handleFilterLinkPress)}
 </MetadataItem>
 ))}
 {albumInfo ? (
Expand Down

7 changes: 5 additions & 2 deletions
packages/mobile/src/screens/search-screen-v2/SearchCategoriesAndFilters.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ type SearchCategoryProps = {
const SearchCategory = (props: SearchCategoryProps) => {
 const { category } = props
 const [currentCategory, setCategory] = useSearchCategory()
 const [, setFilters] = useSearchFilters()
 const isSelected = currentCategory === category

 const labelByCategory = {
Expand All@@ -40,9 +41,11 @@ const SearchCategory = (props: SearchCategoryProps) => {
 value={category}
 label={labelByCategory[category]}
 isSelected={isSelected}
 onChange={(value, isSelected) =>
 onChange={(value, isSelected) => {
 // Clear Filters and change category
 setFilters({})
 setCategory(isSelected ? (value as SearchCategoryType) : 'all')
 }
 }}
 icon={isSelected ? IconCloseAlt : undefined}
 />
 )
Expand Down

8 changes: 7 additions & 1 deletion
packages/mobile/src/screens/search-screen-v2/SearchScreenV2.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { useState } from 'react'
import { useEffect, useState } from 'react'

import type {
 SearchCategory,
Expand DownExpand Up@@ -68,6 +68,12 @@ export const SearchScreenStack = () => {
 params.filters ?? {}
 )

 useEffect(() => {
 setQuery(params.query ?? '')
 setCategory(params.category ?? 'all')
 setFilters(params.filters ?? {})
 }, [params])

 const screenOptions = useAppScreenOptions()

 return (
Expand Down

6 changes: 5 additions & 1 deletion
packages/web/src/pages/search-page-v2/SearchPageV2.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { useCallback, useContext, useEffect } from 'react'

import { SearchCategory } from '@audius/common/src/api/search'
import { Flex } from '@audius/harmony'
import { generatePath, useParams } from 'react-router-dom'
import { useSearchParams } from 'react-router-dom-v5-compat'
Expand DownExpand Up@@ -90,7 +91,10 @@ export const SearchPageV2 = () => {
 <PageComponent
 title={query ?? 'Search'}
 description={`Search results for ${query}`}
 canonicalUrl={fullSearchResultsPageV2(category, query ?? '')}
 canonicalUrl={fullSearchResultsPageV2(
 category as SearchCategory,
 query ?? ''
 )}
 header={header}
 >
 <Flex direction='column' w='100%'>
Expand Down

11 changes: 9 additions & 2 deletions
packages/web/src/utils/route.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import { SearchCategory } from '@audius/common/api'
import type { ID } from '@audius/common/models'
import { Genre, Mood } from '@audius/sdk'
import { push as pushRoute } from 'connected-react-router'
Expand DownExpand Up@@ -471,11 +472,17 @@ export const fullSearchResultsPage = (query: string) => {
 return `${BASE_URL}${searchResultsPage(query)}`
}

export const searchResultsPageV2 = (category: string, query: string) => {
export const searchResultsPageV2 = (
 category: SearchCategory,
 query: string
) => {
 return `/search/${category}/?query=${query}`
}

export const fullSearchResultsPageV2 = (category: string, query: string) => {
export const fullSearchResultsPageV2 = (
 category: SearchCategory,
 query: string
) => {
 return `${BASE_URL}${searchResultsPageV2(category, query)}`
}

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
[C-4589] Add links from track tile screen to search screen by Kyle-Shanks · Pull Request #9071 · AudiusProject/apps · GitHub
Skip to content
[C-4589] Add links from track tile screen to search screen#9071

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

Kyle-Shanks
merged 4 commits into

from

Jul 9, 2024
 Merged


[C-4589] Add links from track tile screen to search screen
#9071
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
9001c10

Update track metadata to link to the search screen on mobile


Kyle-Shanks Jul 9, 2024
e79a8f0

Add key to switch


Kyle-Shanks Jul 9, 2024
c508d9c

fix lint


Kyle-Shanks Jul 9, 2024
94a45ad

small update


Kyle-Shanks Jul 9, 2024

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


61 changes: 50 additions & 11 deletions
packages/mobile/src/components/details-tile/TrackMetadataList.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
import { useCallback } from 'react'

import type { SearchFilters } from '@audius/common/api'
import { TrackMetadataType, useTrackMetadata } from '@audius/common/hooks'
import type { ID } from '@audius/common/models'
import type { Mood } from '@audius/sdk'
import { trpc } from '@audius/web/src/utils/trpcClientWeb'
import { Image } from 'react-native'

import { Flex, Text, TextLink, spacing } from '@audius/harmony-native'
import { useNavigation } from 'app/hooks/useNavigation'
import { moodMap } from 'app/utils/moods'

import { MetadataItem } from './MetadataItem'
Expand All@@ -13,23 +17,49 @@ const messages = {
 album: 'Album'
}

const renderMood = (mood: string) => {
const renderMood = (mood: string, onPress: () => void) => {
 return (
 <TextLink variant='visible' onPress={onPress}>
 <Flex direction='row' gap='xs' alignItems='center'>
 <Text variant='body' size='s' strength='strong'>
 {mood}
 </Text>
 <Image
 source={moodMap[mood as Mood]}
 style={{ height: spacing.l, width: spacing.l }}
 />
 </Flex>
 </TextLink>
 )
}

const renderFilterLink = (value: string, onPress: () => void) => {
 return (
 <Flex direction='row' gap='xs' alignItems='center'>
 <TextLink onPress={onPress}>
 <Text variant='body' size='s' strength='strong'>
 {mood}
 {value}
 </Text>
 <Image
 source={moodMap[mood as Mood]}
 style={{ height: spacing.l, width: spacing.l }}
 />
 </Flex>
 </TextLink>
 )
}
const renderMetadataValue = (id: TrackMetadataType, value: string) => {

const renderMetadataValue = (
 id: TrackMetadataType,
 value: string,
 handleFilterLinkPress: (filters: SearchFilters) => void
) => {
 switch (id) {
 case TrackMetadataType.MOOD:
 return renderMood(value)
 return renderMood(value, () => {
 handleFilterLinkPress({ mood: value as Mood })
 })
 // TODO: BPM and Key might need to be transformed to fit the search page's expected format
 case TrackMetadataType.GENRE:
 case TrackMetadataType.BPM:
 case TrackMetadataType.KEY:
 return renderFilterLink(value, () => {
 handleFilterLinkPress({ [id]: value })
 })
 default:
 return value
 }
Expand All@@ -43,6 +73,15 @@ type TrackMetadataListProps = {
 * The additional metadata shown at the bottom of the Track Screen and Collection Screen Headers
 */
export const TrackMetadataList = ({ trackId }: TrackMetadataListProps) => {
 const navigation = useNavigation()

 const handleFilterLinkPress = useCallback(
 (filters: SearchFilters) => {
 navigation.navigate('Search', { category: 'tracks', filters })
 },
 [navigation]
 )

 const { data: albumInfo } = trpc.tracks.getAlbumBacklink.useQuery({
 trackId
 })
Expand All@@ -55,7 +94,7 @@ export const TrackMetadataList = ({ trackId }: TrackMetadataListProps) => {
 <Flex gap='l' w='100%' direction='row' wrap='wrap'>
 {metadataItems.map(({ id, label, value }) => (
 <MetadataItem key={id} label={label}>
 {renderMetadataValue(id, value)}
 {renderMetadataValue(id, value, handleFilterLinkPress)}
 </MetadataItem>
 ))}
 {albumInfo ? (
Expand Down

7 changes: 5 additions & 2 deletions
packages/mobile/src/screens/search-screen-v2/SearchCategoriesAndFilters.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ type SearchCategoryProps = {
const SearchCategory = (props: SearchCategoryProps) => {
 const { category } = props
 const [currentCategory, setCategory] = useSearchCategory()
 const [, setFilters] = useSearchFilters()
 const isSelected = currentCategory === category

 const labelByCategory = {
Expand All@@ -40,9 +41,11 @@ const SearchCategory = (props: SearchCategoryProps) => {
 value={category}
 label={labelByCategory[category]}
 isSelected={isSelected}
 onChange={(value, isSelected) =>
 onChange={(value, isSelected) => {
 // Clear Filters and change category
 setFilters({})
 setCategory(isSelected ? (value as SearchCategoryType) : 'all')
 }
 }}
 icon={isSelected ? IconCloseAlt : undefined}
 />
 )
Expand Down

8 changes: 7 additions & 1 deletion
packages/mobile/src/screens/search-screen-v2/SearchScreenV2.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { useState } from 'react'
import { useEffect, useState } from 'react'

import type {
 SearchCategory,
Expand DownExpand Up@@ -68,6 +68,12 @@ export const SearchScreenStack = () => {
 params.filters ?? {}
 )

 useEffect(() => {
 setQuery(params.query ?? '')
 setCategory(params.category ?? 'all')
 setFilters(params.filters ?? {})
 }, [params])

 const screenOptions = useAppScreenOptions()

 return (
Expand Down

6 changes: 5 additions & 1 deletion
packages/web/src/pages/search-page-v2/SearchPageV2.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { useCallback, useContext, useEffect } from 'react'

import { SearchCategory } from '@audius/common/src/api/search'
import { Flex } from '@audius/harmony'
import { generatePath, useParams } from 'react-router-dom'
import { useSearchParams } from 'react-router-dom-v5-compat'
Expand DownExpand Up@@ -90,7 +91,10 @@ export const SearchPageV2 = () => {
 <PageComponent
 title={query ?? 'Search'}
 description={`Search results for ${query}`}
 canonicalUrl={fullSearchResultsPageV2(category, query ?? '')}
 canonicalUrl={fullSearchResultsPageV2(
 category as SearchCategory,
 query ?? ''
 )}
 header={header}
 >
 <Flex direction='column' w='100%'>
Expand Down

11 changes: 9 additions & 2 deletions
packages/web/src/utils/route.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import { SearchCategory } from '@audius/common/api'
import type { ID } from '@audius/common/models'
import { Genre, Mood } from '@audius/sdk'
import { push as pushRoute } from 'connected-react-router'
Expand DownExpand Up@@ -471,11 +472,17 @@ export const fullSearchResultsPage = (query: string) => {
 return `${BASE_URL}${searchResultsPage(query)}`
}

export const searchResultsPageV2 = (category: string, query: string) => {
export const searchResultsPageV2 = (
 category: SearchCategory,
 query: string
) => {
 return `/search/${category}/?query=${query}`
}

export const fullSearchResultsPageV2 = (category: string, query: string) => {
export const fullSearchResultsPageV2 = (
 category: SearchCategory,
 query: string
) => {
 return `${BASE_URL}${searchResultsPageV2(category, query)}`
}

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
[C-4589] Add links from track tile screen to search screen by Kyle-Shanks · Pull Request #9071 · AudiusProject/apps · GitHub
Skip to content
[C-4589] Add links from track tile screen to search screen#9071

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

Kyle-Shanks
merged 4 commits into

from

Jul 9, 2024
 Merged


[C-4589] Add links from track tile screen to search screen
#9071
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
9001c10

Update track metadata to link to the search screen on mobile


Kyle-Shanks Jul 9, 2024
e79a8f0

Add key to switch


Kyle-Shanks Jul 9, 2024
c508d9c

fix lint


Kyle-Shanks Jul 9, 2024
94a45ad

small update


Kyle-Shanks Jul 9, 2024

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


61 changes: 50 additions & 11 deletions
packages/mobile/src/components/details-tile/TrackMetadataList.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
import { useCallback } from 'react'

import type { SearchFilters } from '@audius/common/api'
import { TrackMetadataType, useTrackMetadata } from '@audius/common/hooks'
import type { ID } from '@audius/common/models'
import type { Mood } from '@audius/sdk'
import { trpc } from '@audius/web/src/utils/trpcClientWeb'
import { Image } from 'react-native'

import { Flex, Text, TextLink, spacing } from '@audius/harmony-native'
import { useNavigation } from 'app/hooks/useNavigation'
import { moodMap } from 'app/utils/moods'

import { MetadataItem } from './MetadataItem'
Expand All@@ -13,23 +17,49 @@ const messages = {
 album: 'Album'
}

const renderMood = (mood: string) => {
const renderMood = (mood: string, onPress: () => void) => {
 return (
 <TextLink variant='visible' onPress={onPress}>
 <Flex direction='row' gap='xs' alignItems='center'>
 <Text variant='body' size='s' strength='strong'>
 {mood}
 </Text>
 <Image
 source={moodMap[mood as Mood]}
 style={{ height: spacing.l, width: spacing.l }}
 />
 </Flex>
 </TextLink>
 )
}

const renderFilterLink = (value: string, onPress: () => void) => {
 return (
 <Flex direction='row' gap='xs' alignItems='center'>
 <TextLink onPress={onPress}>
 <Text variant='body' size='s' strength='strong'>
 {mood}
 {value}
 </Text>
 <Image
 source={moodMap[mood as Mood]}
 style={{ height: spacing.l, width: spacing.l }}
 />
 </Flex>
 </TextLink>
 )
}
const renderMetadataValue = (id: TrackMetadataType, value: string) => {

const renderMetadataValue = (
 id: TrackMetadataType,
 value: string,
 handleFilterLinkPress: (filters: SearchFilters) => void
) => {
 switch (id) {
 case TrackMetadataType.MOOD:
 return renderMood(value)
 return renderMood(value, () => {
 handleFilterLinkPress({ mood: value as Mood })
 })
 // TODO: BPM and Key might need to be transformed to fit the search page's expected format
 case TrackMetadataType.GENRE:
 case TrackMetadataType.BPM:
 case TrackMetadataType.KEY:
 return renderFilterLink(value, () => {
 handleFilterLinkPress({ [id]: value })
 })
 default:
 return value
 }
Expand All@@ -43,6 +73,15 @@ type TrackMetadataListProps = {
 * The additional metadata shown at the bottom of the Track Screen and Collection Screen Headers
 */
export const TrackMetadataList = ({ trackId }: TrackMetadataListProps) => {
 const navigation = useNavigation()

 const handleFilterLinkPress = useCallback(
 (filters: SearchFilters) => {
 navigation.navigate('Search', { category: 'tracks', filters })
 },
 [navigation]
 )

 const { data: albumInfo } = trpc.tracks.getAlbumBacklink.useQuery({
 trackId
 })
Expand All@@ -55,7 +94,7 @@ export const TrackMetadataList = ({ trackId }: TrackMetadataListProps) => {
 <Flex gap='l' w='100%' direction='row' wrap='wrap'>
 {metadataItems.map(({ id, label, value }) => (
 <MetadataItem key={id} label={label}>
 {renderMetadataValue(id, value)}
 {renderMetadataValue(id, value, handleFilterLinkPress)}
 </MetadataItem>
 ))}
 {albumInfo ? (
Expand Down

7 changes: 5 additions & 2 deletions
packages/mobile/src/screens/search-screen-v2/SearchCategoriesAndFilters.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ type SearchCategoryProps = {
const SearchCategory = (props: SearchCategoryProps) => {
 const { category } = props
 const [currentCategory, setCategory] = useSearchCategory()
 const [, setFilters] = useSearchFilters()
 const isSelected = currentCategory === category

 const labelByCategory = {
Expand All@@ -40,9 +41,11 @@ const SearchCategory = (props: SearchCategoryProps) => {
 value={category}
 label={labelByCategory[category]}
 isSelected={isSelected}
 onChange={(value, isSelected) =>
 onChange={(value, isSelected) => {
 // Clear Filters and change category
 setFilters({})
 setCategory(isSelected ? (value as SearchCategoryType) : 'all')
 }
 }}
 icon={isSelected ? IconCloseAlt : undefined}
 />
 )
Expand Down

8 changes: 7 additions & 1 deletion
packages/mobile/src/screens/search-screen-v2/SearchScreenV2.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { useState } from 'react'
import { useEffect, useState } from 'react'

import type {
 SearchCategory,
Expand DownExpand Up@@ -68,6 +68,12 @@ export const SearchScreenStack = () => {
 params.filters ?? {}
 )

 useEffect(() => {
 setQuery(params.query ?? '')
 setCategory(params.category ?? 'all')
 setFilters(params.filters ?? {})
 }, [params])

 const screenOptions = useAppScreenOptions()

 return (
Expand Down

6 changes: 5 additions & 1 deletion
packages/web/src/pages/search-page-v2/SearchPageV2.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { useCallback, useContext, useEffect } from 'react'

import { SearchCategory } from '@audius/common/src/api/search'
import { Flex } from '@audius/harmony'
import { generatePath, useParams } from 'react-router-dom'
import { useSearchParams } from 'react-router-dom-v5-compat'
Expand DownExpand Up@@ -90,7 +91,10 @@ export const SearchPageV2 = () => {
 <PageComponent
 title={query ?? 'Search'}
 description={`Search results for ${query}`}
 canonicalUrl={fullSearchResultsPageV2(category, query ?? '')}
 canonicalUrl={fullSearchResultsPageV2(
 category as SearchCategory,
 query ?? ''
 )}
 header={header}
 >
 <Flex direction='column' w='100%'>
Expand Down

11 changes: 9 additions & 2 deletions
packages/web/src/utils/route.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import { SearchCategory } from '@audius/common/api'
import type { ID } from '@audius/common/models'
import { Genre, Mood } from '@audius/sdk'
import { push as pushRoute } from 'connected-react-router'
Expand DownExpand Up@@ -471,11 +472,17 @@ export const fullSearchResultsPage = (query: string) => {
 return `${BASE_URL}${searchResultsPage(query)}`
}

export const searchResultsPageV2 = (category: string, query: string) => {
export const searchResultsPageV2 = (
 category: SearchCategory,
 query: string
) => {
 return `/search/${category}/?query=${query}`
}

export const fullSearchResultsPageV2 = (category: string, query: string) => {
export const fullSearchResultsPageV2 = (
 category: SearchCategory,
 query: string
) => {
 return `${BASE_URL}${searchResultsPageV2(category, query)}`
}

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
[C-4589] Add links from track tile screen to search screen by Kyle-Shanks · Pull Request #9071 · AudiusProject/apps · GitHub
Skip to content
[C-4589] Add links from track tile screen to search screen#9071

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

Kyle-Shanks
merged 4 commits into

from

Jul 9, 2024
 Merged


[C-4589] Add links from track tile screen to search screen
#9071
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
9001c10

Update track metadata to link to the search screen on mobile


Kyle-Shanks Jul 9, 2024
e79a8f0

Add key to switch


Kyle-Shanks Jul 9, 2024
c508d9c

fix lint


Kyle-Shanks Jul 9, 2024
94a45ad

small update


Kyle-Shanks Jul 9, 2024

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


61 changes: 50 additions & 11 deletions
packages/mobile/src/components/details-tile/TrackMetadataList.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
import { useCallback } from 'react'

import type { SearchFilters } from '@audius/common/api'
import { TrackMetadataType, useTrackMetadata } from '@audius/common/hooks'
import type { ID } from '@audius/common/models'
import type { Mood } from '@audius/sdk'
import { trpc } from '@audius/web/src/utils/trpcClientWeb'
import { Image } from 'react-native'

import { Flex, Text, TextLink, spacing } from '@audius/harmony-native'
import { useNavigation } from 'app/hooks/useNavigation'
import { moodMap } from 'app/utils/moods'

import { MetadataItem } from './MetadataItem'
Expand All@@ -13,23 +17,49 @@ const messages = {
 album: 'Album'
}

const renderMood = (mood: string) => {
const renderMood = (mood: string, onPress: () => void) => {
 return (
 <TextLink variant='visible' onPress={onPress}>
 <Flex direction='row' gap='xs' alignItems='center'>
 <Text variant='body' size='s' strength='strong'>
 {mood}
 </Text>
 <Image
 source={moodMap[mood as Mood]}
 style={{ height: spacing.l, width: spacing.l }}
 />
 </Flex>
 </TextLink>
 )
}

const renderFilterLink = (value: string, onPress: () => void) => {
 return (
 <Flex direction='row' gap='xs' alignItems='center'>
 <TextLink onPress={onPress}>
 <Text variant='body' size='s' strength='strong'>
 {mood}
 {value}
 </Text>
 <Image
 source={moodMap[mood as Mood]}
 style={{ height: spacing.l, width: spacing.l }}
 />
 </Flex>
 </TextLink>
 )
}
const renderMetadataValue = (id: TrackMetadataType, value: string) => {

const renderMetadataValue = (
 id: TrackMetadataType,
 value: string,
 handleFilterLinkPress: (filters: SearchFilters) => void
) => {
 switch (id) {
 case TrackMetadataType.MOOD:
 return renderMood(value)
 return renderMood(value, () => {
 handleFilterLinkPress({ mood: value as Mood })
 })
 // TODO: BPM and Key might need to be transformed to fit the search page's expected format
 case TrackMetadataType.GENRE:
 case TrackMetadataType.BPM:
 case TrackMetadataType.KEY:
 return renderFilterLink(value, () => {
 handleFilterLinkPress({ [id]: value })
 })
 default:
 return value
 }
Expand All@@ -43,6 +73,15 @@ type TrackMetadataListProps = {
 * The additional metadata shown at the bottom of the Track Screen and Collection Screen Headers
 */
export const TrackMetadataList = ({ trackId }: TrackMetadataListProps) => {
 const navigation = useNavigation()

 const handleFilterLinkPress = useCallback(
 (filters: SearchFilters) => {
 navigation.navigate('Search', { category: 'tracks', filters })
 },
 [navigation]
 )

 const { data: albumInfo } = trpc.tracks.getAlbumBacklink.useQuery({
 trackId
 })
Expand All@@ -55,7 +94,7 @@ export const TrackMetadataList = ({ trackId }: TrackMetadataListProps) => {
 <Flex gap='l' w='100%' direction='row' wrap='wrap'>
 {metadataItems.map(({ id, label, value }) => (
 <MetadataItem key={id} label={label}>
 {renderMetadataValue(id, value)}
 {renderMetadataValue(id, value, handleFilterLinkPress)}
 </MetadataItem>
 ))}
 {albumInfo ? (
Expand Down

7 changes: 5 additions & 2 deletions
packages/mobile/src/screens/search-screen-v2/SearchCategoriesAndFilters.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ type SearchCategoryProps = {
const SearchCategory = (props: SearchCategoryProps) => {
 const { category } = props
 const [currentCategory, setCategory] = useSearchCategory()
 const [, setFilters] = useSearchFilters()
 const isSelected = currentCategory === category

 const labelByCategory = {
Expand All@@ -40,9 +41,11 @@ const SearchCategory = (props: SearchCategoryProps) => {
 value={category}
 label={labelByCategory[category]}
 isSelected={isSelected}
 onChange={(value, isSelected) =>
 onChange={(value, isSelected) => {
 // Clear Filters and change category
 setFilters({})
 setCategory(isSelected ? (value as SearchCategoryType) : 'all')
 }
 }}
 icon={isSelected ? IconCloseAlt : undefined}
 />
 )
Expand Down

8 changes: 7 additions & 1 deletion
packages/mobile/src/screens/search-screen-v2/SearchScreenV2.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { useState } from 'react'
import { useEffect, useState } from 'react'

import type {
 SearchCategory,
Expand DownExpand Up@@ -68,6 +68,12 @@ export const SearchScreenStack = () => {
 params.filters ?? {}
 )

 useEffect(() => {
 setQuery(params.query ?? '')
 setCategory(params.category ?? 'all')
 setFilters(params.filters ?? {})
 }, [params])

 const screenOptions = useAppScreenOptions()

 return (
Expand Down

6 changes: 5 additions & 1 deletion
packages/web/src/pages/search-page-v2/SearchPageV2.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { useCallback, useContext, useEffect } from 'react'

import { SearchCategory } from '@audius/common/src/api/search'
import { Flex } from '@audius/harmony'
import { generatePath, useParams } from 'react-router-dom'
import { useSearchParams } from 'react-router-dom-v5-compat'
Expand DownExpand Up@@ -90,7 +91,10 @@ export const SearchPageV2 = () => {
 <PageComponent
 title={query ?? 'Search'}
 description={`Search results for ${query}`}
 canonicalUrl={fullSearchResultsPageV2(category, query ?? '')}
 canonicalUrl={fullSearchResultsPageV2(
 category as SearchCategory,
 query ?? ''
 )}
 header={header}
 >
 <Flex direction='column' w='100%'>
Expand Down

11 changes: 9 additions & 2 deletions
packages/web/src/utils/route.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import { SearchCategory } from '@audius/common/api'
import type { ID } from '@audius/common/models'
import { Genre, Mood } from '@audius/sdk'
import { push as pushRoute } from 'connected-react-router'
Expand DownExpand Up@@ -471,11 +472,17 @@ export const fullSearchResultsPage = (query: string) => {
 return `${BASE_URL}${searchResultsPage(query)}`
}

export const searchResultsPageV2 = (category: string, query: string) => {
export const searchResultsPageV2 = (
 category: SearchCategory,
 query: string
) => {
 return `/search/${category}/?query=${query}`
}

export const fullSearchResultsPageV2 = (category: string, query: string) => {
export const fullSearchResultsPageV2 = (
 category: SearchCategory,
 query: string
) => {
 return `${BASE_URL}${searchResultsPageV2(category, query)}`
}

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
[C-4589] Add links from track tile screen to search screen by Kyle-Shanks · Pull Request #9071 · AudiusProject/apps · GitHub
Skip to content
[C-4589] Add links from track tile screen to search screen#9071

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

Kyle-Shanks
merged 4 commits into

from

Jul 9, 2024
 Merged


[C-4589] Add links from track tile screen to search screen
#9071
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
9001c10

Update track metadata to link to the search screen on mobile


Kyle-Shanks Jul 9, 2024
e79a8f0

Add key to switch


Kyle-Shanks Jul 9, 2024
c508d9c

fix lint


Kyle-Shanks Jul 9, 2024
94a45ad

small update


Kyle-Shanks Jul 9, 2024

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


61 changes: 50 additions & 11 deletions
packages/mobile/src/components/details-tile/TrackMetadataList.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
import { useCallback } from 'react'

import type { SearchFilters } from '@audius/common/api'
import { TrackMetadataType, useTrackMetadata } from '@audius/common/hooks'
import type { ID } from '@audius/common/models'
import type { Mood } from '@audius/sdk'
import { trpc } from '@audius/web/src/utils/trpcClientWeb'
import { Image } from 'react-native'

import { Flex, Text, TextLink, spacing } from '@audius/harmony-native'
import { useNavigation } from 'app/hooks/useNavigation'
import { moodMap } from 'app/utils/moods'

import { MetadataItem } from './MetadataItem'
Expand All@@ -13,23 +17,49 @@ const messages = {
 album: 'Album'
}

const renderMood = (mood: string) => {
const renderMood = (mood: string, onPress: () => void) => {
 return (
 <TextLink variant='visible' onPress={onPress}>
 <Flex direction='row' gap='xs' alignItems='center'>
 <Text variant='body' size='s' strength='strong'>
 {mood}
 </Text>
 <Image
 source={moodMap[mood as Mood]}
 style={{ height: spacing.l, width: spacing.l }}
 />
 </Flex>
 </TextLink>
 )
}

const renderFilterLink = (value: string, onPress: () => void) => {
 return (
 <Flex direction='row' gap='xs' alignItems='center'>
 <TextLink onPress={onPress}>
 <Text variant='body' size='s' strength='strong'>
 {mood}
 {value}
 </Text>
 <Image
 source={moodMap[mood as Mood]}
 style={{ height: spacing.l, width: spacing.l }}
 />
 </Flex>
 </TextLink>
 )
}
const renderMetadataValue = (id: TrackMetadataType, value: string) => {

const renderMetadataValue = (
 id: TrackMetadataType,
 value: string,
 handleFilterLinkPress: (filters: SearchFilters) => void
) => {
 switch (id) {
 case TrackMetadataType.MOOD:
 return renderMood(value)
 return renderMood(value, () => {
 handleFilterLinkPress({ mood: value as Mood })
 })
 // TODO: BPM and Key might need to be transformed to fit the search page's expected format
 case TrackMetadataType.GENRE:
 case TrackMetadataType.BPM:
 case TrackMetadataType.KEY:
 return renderFilterLink(value, () => {
 handleFilterLinkPress({ [id]: value })
 })
 default:
 return value
 }
Expand All@@ -43,6 +73,15 @@ type TrackMetadataListProps = {
 * The additional metadata shown at the bottom of the Track Screen and Collection Screen Headers
 */
export const TrackMetadataList = ({ trackId }: TrackMetadataListProps) => {
 const navigation = useNavigation()

 const handleFilterLinkPress = useCallback(
 (filters: SearchFilters) => {
 navigation.navigate('Search', { category: 'tracks', filters })
 },
 [navigation]
 )

 const { data: albumInfo } = trpc.tracks.getAlbumBacklink.useQuery({
 trackId
 })
Expand All@@ -55,7 +94,7 @@ export const TrackMetadataList = ({ trackId }: TrackMetadataListProps) => {
 <Flex gap='l' w='100%' direction='row' wrap='wrap'>
 {metadataItems.map(({ id, label, value }) => (
 <MetadataItem key={id} label={label}>
 {renderMetadataValue(id, value)}
 {renderMetadataValue(id, value, handleFilterLinkPress)}
 </MetadataItem>
 ))}
 {albumInfo ? (
Expand Down

7 changes: 5 additions & 2 deletions
packages/mobile/src/screens/search-screen-v2/SearchCategoriesAndFilters.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ type SearchCategoryProps = {
const SearchCategory = (props: SearchCategoryProps) => {
 const { category } = props
 const [currentCategory, setCategory] = useSearchCategory()
 const [, setFilters] = useSearchFilters()
 const isSelected = currentCategory === category

 const labelByCategory = {
Expand All@@ -40,9 +41,11 @@ const SearchCategory = (props: SearchCategoryProps) => {
 value={category}
 label={labelByCategory[category]}
 isSelected={isSelected}
 onChange={(value, isSelected) =>
 onChange={(value, isSelected) => {
 // Clear Filters and change category
 setFilters({})
 setCategory(isSelected ? (value as SearchCategoryType) : 'all')
 }
 }}
 icon={isSelected ? IconCloseAlt : undefined}
 />
 )
Expand Down

8 changes: 7 additions & 1 deletion
packages/mobile/src/screens/search-screen-v2/SearchScreenV2.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { useState } from 'react'
import { useEffect, useState } from 'react'

import type {
 SearchCategory,
Expand DownExpand Up@@ -68,6 +68,12 @@ export const SearchScreenStack = () => {
 params.filters ?? {}
 )

 useEffect(() => {
 setQuery(params.query ?? '')
 setCategory(params.category ?? 'all')
 setFilters(params.filters ?? {})
 }, [params])

 const screenOptions = useAppScreenOptions()

 return (
Expand Down

6 changes: 5 additions & 1 deletion
packages/web/src/pages/search-page-v2/SearchPageV2.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { useCallback, useContext, useEffect } from 'react'

import { SearchCategory } from '@audius/common/src/api/search'
import { Flex } from '@audius/harmony'
import { generatePath, useParams } from 'react-router-dom'
import { useSearchParams } from 'react-router-dom-v5-compat'
Expand DownExpand Up@@ -90,7 +91,10 @@ export const SearchPageV2 = () => {
 <PageComponent
 title={query ?? 'Search'}
 description={`Search results for ${query}`}
 canonicalUrl={fullSearchResultsPageV2(category, query ?? '')}
 canonicalUrl={fullSearchResultsPageV2(
 category as SearchCategory,
 query ?? ''
 )}
 header={header}
 >
 <Flex direction='column' w='100%'>
Expand Down

11 changes: 9 additions & 2 deletions
packages/web/src/utils/route.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import { SearchCategory } from '@audius/common/api'
import type { ID } from '@audius/common/models'
import { Genre, Mood } from '@audius/sdk'
import { push as pushRoute } from 'connected-react-router'
Expand DownExpand Up@@ -471,11 +472,17 @@ export const fullSearchResultsPage = (query: string) => {
 return `${BASE_URL}${searchResultsPage(query)}`
}

export const searchResultsPageV2 = (category: string, query: string) => {
export const searchResultsPageV2 = (
 category: SearchCategory,
 query: string
) => {
 return `/search/${category}/?query=${query}`
}

export const fullSearchResultsPageV2 = (category: string, query: string) => {
export const fullSearchResultsPageV2 = (
 category: SearchCategory,
 query: string
) => {
 return `${BASE_URL}${searchResultsPageV2(category, query)}`
}

Expand Down