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

Retaining search results by using URL params and keep results query

Browse Source
This commit is contained in:
James Barnsley
2019-06-10 13:49:57 +12:00
parent 4a303917ef
commit bd811ff007
11 changed files with 124 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/js/services/mopidy/middleware.js
View File

@ -1020,7 +1020,7 @@ const MopidyMiddleware = (function(){
{
remaining: action.data.uri_schemes.length
}
))
));
switch (action.data.context){
@ -1080,6 +1080,7 @@ const MopidyMiddleware = (function(){
// and plug in their URIs
store.dispatch({
type: 'MOPIDY_SEARCH_RESULTS_LOADED',
query: action.data.query,
context: action.data.context,
results: albums_uris
})
@ -1162,6 +1163,7 @@ const MopidyMiddleware = (function(){
// and plug in their URIs
store.dispatch({
type: 'MOPIDY_SEARCH_RESULTS_LOADED',
query: action.data.query,
context: action.data.context,
results: artists_uris
})
@ -1219,6 +1221,7 @@ const MopidyMiddleware = (function(){
// and plug in their URIs
store.dispatch({
type: 'MOPIDY_SEARCH_RESULTS_LOADED',
query: action.data.query,
context: action.data.context,
results: playlists_uris
})
@ -1271,6 +1274,7 @@ const MopidyMiddleware = (function(){
store.dispatch({
type: 'MOPIDY_SEARCH_RESULTS_LOADED',
query: action.data.query,
context: action.data.context,
results: helpers.formatTracks(tracks)
});
@ -1316,6 +1320,7 @@ const MopidyMiddleware = (function(){
store.dispatch({
type: 'MOPIDY_SEARCH_RESULTS_LOADED',
query: action.data.query,
context: 'tracks',
results: helpers.formatTracks(tracks)
});
@ -1377,6 +1382,7 @@ const MopidyMiddleware = (function(){
// and plug in their URIs
store.dispatch({
type: 'MOPIDY_SEARCH_RESULTS_LOADED',
query: action.data.query,
context: 'albums',
results: albums_uris
})
@ -1447,6 +1453,7 @@ const MopidyMiddleware = (function(){
// and plug in their URIs
store.dispatch({
type: 'MOPIDY_SEARCH_RESULTS_LOADED',
query: action.data.query,
context: 'artists',
results: artists_uris
})
@ -1503,6 +1510,7 @@ const MopidyMiddleware = (function(){
// and plug in their URIs
store.dispatch({
type: 'MOPIDY_SEARCH_RESULTS_LOADED',
query: action.data.query,
context: 'playlists',
results: playlists_uris
})

10
src/js/services/mopidy/reducer.js
View File

@ -193,15 +193,17 @@ export default function reducer(mopidy = {}, action){
// Fetch or create our container
if (mopidy.search_results){
var search_results = Object.assign({}, mopidy.search_results)
var search_results = Object.assign({}, mopidy.search_results);
} else {
var search_results = {}
var search_results = {};
}
search_results.query = action.query;
if (search_results[action.context]){
search_results[action.context] = [...search_results[action.context], ...action.results]
search_results[action.context] = [...search_results[action.context], ...action.results];
} else {
search_results[action.context] = action.results
search_results[action.context] = action.results;
}
return Object.assign({}, mopidy, { search_results: search_results });

4
src/js/services/spotify/actions.js
View File

@ -581,6 +581,7 @@ export function getSearchResults(type, query, limit = 50, offset = 0){
dispatch({
type: 'SPOTIFY_SEARCH_RESULTS_LOADED',
context: 'tracks',
query: query,
results: helpers.formatTracks(response.tracks.items),
more: response.tracks.next,
});
@ -594,6 +595,7 @@ export function getSearchResults(type, query, limit = 50, offset = 0){
dispatch({
type: 'SPOTIFY_SEARCH_RESULTS_LOADED',
context: 'artists',
query: query,
results: helpers.arrayOf('uri',response.artists.items),
more: response.artists.next,
});
@ -607,6 +609,7 @@ export function getSearchResults(type, query, limit = 50, offset = 0){
dispatch({
type: 'SPOTIFY_SEARCH_RESULTS_LOADED',
context: 'albums',
query: query,
results: helpers.arrayOf('uri',response.albums.items),
more: response.albums.next,
});
@ -632,6 +635,7 @@ export function getSearchResults(type, query, limit = 50, offset = 0){
dispatch({
type: 'SPOTIFY_SEARCH_RESULTS_LOADED',
context: 'playlists',
query: query,
results: helpers.arrayOf('uri',playlists),
more: response.playlists.next
});

2
src/js/services/spotify/reducer.js
View File

@ -334,6 +334,8 @@ export default function reducer(spotify = {}, action){
var search_results = {}
}
search_results.query = action.query;
if (search_results.results){
search_results[action.context] = [...search_results[action.context], ...action.results]
} else {