diff --git a/jam-ui/src/components/jamtracks/JKJamTrackArtists.js b/jam-ui/src/components/jamtracks/JKJamTrackArtists.js index 80f7c3ab7..d9e80a647 100644 --- a/jam-ui/src/components/jamtracks/JKJamTrackArtists.js +++ b/jam-ui/src/components/jamtracks/JKJamTrackArtists.js @@ -21,6 +21,7 @@ const JKJamTrackArtists = ({ artists, showArtists, onSelect }) => { {t('search.search_results.artists')} + show artists: {showArtists.toString()} {artists.length > 0 ? ( diff --git a/jam-ui/src/components/jamtracks/JKJamTrackPreview.js b/jam-ui/src/components/jamtracks/JKJamTrackPreview.js index 5db53eba5..3d225d36b 100644 --- a/jam-ui/src/components/jamtracks/JKJamTrackPreview.js +++ b/jam-ui/src/components/jamtracks/JKJamTrackPreview.js @@ -14,7 +14,7 @@ const JKJamTrackPreview = ({ jamTrack }) => { return ( - {jamTrack.tracks.map((track, index) => ( + {jamTrack.tracks.filter(t => t.track_type !== 'Click').map((track, index) => ( 6 && !expanded ? 'd-none' : null}> diff --git a/jam-ui/src/components/jamtracks/JKJamTrackTrack.js b/jam-ui/src/components/jamtracks/JKJamTrackTrack.js index 4cd51bc74..ca55ffac3 100644 --- a/jam-ui/src/components/jamtracks/JKJamTrackTrack.js +++ b/jam-ui/src/components/jamtracks/JKJamTrackTrack.js @@ -35,7 +35,8 @@ const JKJamTrackTrack = ({ track }) => { if (track.part && track.part !== info['instrumentDescription']) { info['part'] = `(${track.part})`; } - } else { + } else if (track.track_type === 'Master' && track.part) { + info['instrumentDescription'] = track.part; } let no_audio = true; diff --git a/jam-ui/src/components/jamtracks/JKJamTracksAutoComplete.js b/jam-ui/src/components/jamtracks/JKJamTracksAutoComplete.js index 61581198a..e79998002 100644 --- a/jam-ui/src/components/jamtracks/JKJamTracksAutoComplete.js +++ b/jam-ui/src/components/jamtracks/JKJamTracksAutoComplete.js @@ -101,7 +101,7 @@ const JKJamTracksAutoComplete = ({ return ( - +
@@ -158,7 +158,7 @@ const JKJamTracksAutoComplete = ({ alignContent: 'flex-start' }} > -
{track.name}
+
Song: {track.name}
{track.original_artist}
diff --git a/jam-ui/src/components/jamtracks/JKJamTracksFilter.js b/jam-ui/src/components/jamtracks/JKJamTracksFilter.js index 04ac4d636..f929b9f41 100644 --- a/jam-ui/src/components/jamtracks/JKJamTracksFilter.js +++ b/jam-ui/src/components/jamtracks/JKJamTracksFilter.js @@ -14,11 +14,11 @@ import { useResponsive } from '@farfetch/react-context-responsive'; const JKJamTracksFilter = () => { const { t } = useTranslation('jamtracks'); const [jamTracks, setJamTracks] = useState([]); - const [artists, setArtists] = useState([]); + //const [artists, setArtists] = useState([]); const [selected, setSelected] = useState(null); const [searchTerm, setSearchTerm] = useState(''); const [showDropdown, setShowDropdown] = useState(false); - const [showArtists, setShowArtists] = useState(false); + //const [showArtists, setShowArtists] = useState(false); const [nextOffset, setNextOffset] = useState(null); const [autoCompleteInputValue, setAutoCompleteInputValue] = useState(''); const [page, setPage] = useState(1); @@ -58,10 +58,10 @@ const JKJamTracksFilter = () => { const handleOnSelect = async selected => { setPage(1); - setArtists([]); + //setArtists([]); setJamTracks([]); setSearchTerm(''); - setShowArtists(false); + //setShowArtists(false); setSelected(selected); const params = queryOptions(selected); await fetchJamTracks(params); @@ -69,26 +69,27 @@ const JKJamTracksFilter = () => { const handleOnEnter = async queryStr => { setPage(1); - setArtists([]); + //setArtists([]); setJamTracks([]); setSelected(x => null); setSearchTerm(queryStr); - fetchArtists(queryStr); + //setShowArtists(false); + //fetchArtists(queryStr); const params = queryOptions(queryStr); console.log('handleOnEnter _params', params, selected); await fetchJamTracks(params); }; - const handleOnSelectArtist = async artist => { - setPage(1); - const selectedOpt = { - type: 'artist', - original_artist: artist.original_artist - }; - setShowDropdown(false); - setAutoCompleteInputValue(''); - await handleOnSelect(selectedOpt); - }; + // const handleOnSelectArtist = async artist => { + // setPage(1); + // const selectedOpt = { + // type: 'artist', + // original_artist: artist.original_artist + // }; + // setShowDropdown(false); + // setAutoCompleteInputValue(''); + // await handleOnSelect(selectedOpt); + // }; const handleOnNextJamTracksPage = async () => { const currentQuery = selected ? selected : searchTerm; @@ -96,25 +97,8 @@ const JKJamTracksFilter = () => { await fetchJamTracks(params); }; - // const fetchJamTracks = options => { - // getJamTracks(options) - // .then(resp => { - // return resp.json(); - // }) - // .then(data => { - // console.log('jamtracks', data); - // setJamTracks(prev => [...prev, ...data.jamtracks]); - // setNextOffset(data.next); - // setPage(page => page + 1); - // }) - // .catch(error => { - // console.error('error', error); - // }); - // }; - const fetchJamTracks = async options => { try { - console.log('fetchJamTracks', options); const resp = await getJamTracks(options); const data = await resp.json(); console.log('jamtracks', data); @@ -125,25 +109,25 @@ const JKJamTracksFilter = () => { } }; - const fetchArtists = query => { - const options = { - limit: 100 - }; - options.artist_search = query; + // const fetchArtists = query => { + // const options = { + // limit: 100 + // }; + // options.artist_search = query; - getJamTrackArtists(options) - .then(resp => { - return resp.json(); - }) - .then(data => { - console.log('artists', data); - setArtists(data.artists); - setShowArtists(true); - }) - .catch(error => { - console.error('error', error); - }); - }; + // getJamTrackArtists(options) + // .then(resp => { + // return resp.json(); + // }) + // .then(data => { + // console.log('artists', data); + // setArtists(data.artists); + // setShowArtists(true); + // }) + // .catch(error => { + // console.error('error', error); + // }); + // }; return ( @@ -178,14 +162,14 @@ const JKJamTracksFilter = () => { )}
-
+ {/*
-
+
*/} PDF file diff --git a/jam-ui/src/components/jamtracks/JKJamTracksList.js b/jam-ui/src/components/jamtracks/JKJamTracksList.js index a952855d4..c83fce326 100644 --- a/jam-ui/src/components/jamtracks/JKJamTracksList.js +++ b/jam-ui/src/components/jamtracks/JKJamTracksList.js @@ -31,12 +31,12 @@ const JKJamTracksList = ({ selectedType, searchTerm, jamTracks, nextOffset, onNe {jamTracks.length > 0 && ( - +
- + @@ -44,12 +44,13 @@ const JKJamTracksList = ({ selectedType, searchTerm, jamTracks, nextOffset, onNe {jamTracks.map((jamTrack, index) => ( - - diff --git a/jam-ui/src/i18n/locales/en/jamtracks.json b/jam-ui/src/i18n/locales/en/jamtracks.json index 2c7a9b2eb..512dcbba1 100644 --- a/jam-ui/src/i18n/locales/en/jamtracks.json +++ b/jam-ui/src/i18n/locales/en/jamtracks.json @@ -3,7 +3,7 @@ "page_title": "Find JamTracks", "search_input": { "title": "Search", - "placeholder": "Search by artist, song, style, or keyword" + "placeholder": "enter artist or song name" }, "search_results": { "artists": "Search Results: Artists",
{t('search.list.song')} {t('search.list.tracks')}{t('search.list.shop')}{t('search.list.shop')}
- {jamTrack.name} by {jamTrack.original_artist} + {jamTrack.name}
+ by {jamTrack.original_artist}
+ +