secstate/Iris
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Restoring search as added_from in queue, fixing URILink for search links

Browse Source
This commit is contained in:
James Barnsley
2018-08-14 21:25:55 +12:00
parent eeab697faf
commit 54fb8a0266
5 changed files with 23 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/js/components/URILink.js
View File

@ -51,7 +51,8 @@ export default class URILink extends React.Component{
break;
case 'search':
to = global.baseURL+'search/'+uri;
var exploded = uri.split('%3A');
to = global.baseURL+'search/'+exploded[1]+'/'+exploded[2];
break;
default:

2
src/js/index.js
View File

@ -65,7 +65,7 @@ ReactDOM.render(
<Route path="settings(/service/:sub_view)" component={Settings} />
<Route path="settings/share-authorization" component={ShareAuthorization} />
<Route path="search(/:query)" component={Search} />
<Route path="search(/:type/:term)" component={Search} />
<Route path="album/:uri" component={Album} />
<Route path="artist/:uri(/:sub_view)" component={Artist} />
<Route path="playlist/create" component={CreatePlaylist} />

23
src/js/views/Search.js
View File

@ -68,21 +68,14 @@ class Search extends React.Component{
// Digest the URI query property
// Triggered when the URL changes
digestUri(props = this.props){
if (props.params && props.params.query && props.params.query !== ''){
var type = helpers.getFromUri("searchtype", props.params.query);
var term = helpers.getFromUri("searchterm", props.params.query);
if (props.params && props.params.type && props.params.term){
if (type){
this.setState({type: type});
}
this.setState({
type: props.params.type,
term: props.params.term
});
if (term){
this.setState({term: term});
}
if (type && term){
this.search(type, term);
}
this.search(props.params.type, props.params.term);
}
}
@ -242,7 +235,7 @@ class Search extends React.Component{
Tracks
</h4>
<section className="list-wrapper">
<TrackList tracks={tracks} uri={'iris:'+this.props.params.query} show_source_icon />
<TrackList tracks={tracks} uri={'iris:search:'+this.state.type+':'+this.state.term} show_source_icon />
<LazyLoadListener enabled={this.props['tracks_more'] && spotify_search_enabled} loadMore={ () => this.loadMore('tracks') }/>
</section>
</div>
@ -309,7 +302,7 @@ class Search extends React.Component{
if (tracks.length > 0){
var tracks_section = (
<section className="list-wrapper">
<TrackList tracks={tracks} uri={'iris:'+this.props.params.query} show_source_icon />
<TrackList tracks={tracks} uri={'iris:search:'+this.state.type+':'+this.state.term} show_source_icon />
<LazyLoadListener loading={this.props['tracks_more'] && spotify_search_enabled} loadMore={ () => this.loadMore('tracks') }/>
</section>
)