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

Better UX on dropdown field; Adding search added_from in queue

Browse Source
This commit is contained in:
James Barnsley
2019-10-13 09:29:41 +13:00
parent 9b2216ca62
commit 68de0feed6
21 changed files with 667 additions and 493 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/js/services/core/reducer.js
View File

@ -2,7 +2,7 @@
import * as helpers from '../../helpers';
export default function reducer(core = {}, action) {
switch (action.type) {
switch (action.type) {
case 'CORE_SET':
return { ...core, ...action.data };
@ -14,17 +14,17 @@ export default function reducer(core = {}, action) {
* */
case 'CURRENT_TRACK_LOADED':
return {
...core,
return {
...core,
current_track: action.track,
current_track_uri: action.uri,
current_track_uri: action.uri,
};
case 'CLEAR_CURRENT_TRACK':
return {
...core,
return {
...core,
current_track: null,
current_track_uri: null,
current_track_uri: null,
};
case 'NEXT_TRACK_LOADED':
@ -36,7 +36,7 @@ export default function reducer(core = {}, action) {
case 'PUSHER_QUEUE_METADATA':
case 'PUSHER_QUEUE_METADATA_CHANGED':
var tracklist = Object.assign([], core.current_tracklist);
for (let i = 0; i < tracklist.length; i++) {
for (let i = 0; i < tracklist.length; i++) {
// load our metadata (if we have any for that tlid)
if (action.queue_metadata[`tlid_${tracklist[i].tlid}`] !== undefined) {
tracklist[i] = {
@ -183,10 +183,10 @@ export default function reducer(core = {}, action) {
library_playlists = helpers.removeDuplicates(library_playlists);
return {
...core,
return {
...core,
library_playlists,
library_playlists_started: true,
library_playlists_started: true,
};
@ -203,14 +203,14 @@ export default function reducer(core = {}, action) {
* */
case 'SEARCH_STARTED':
return {
...core,
return {
...core,
search_results: {
artists_uris: [],
albums_uris: [],
playlists_uris: [],
tracks: [],
},
},
};
case 'SEARCH_RESULTS_LOADED':
@ -270,8 +270,8 @@ export default function reducer(core = {}, action) {
else if (core.search_results && core.search_results.tracks_more) var { tracks_more } = core.search_results;
else var tracks_more = null;
return {
...core,
return {
...core,
search_results: {
artists_more,
artists_uris: helpers.removeDuplicates(artists_uris),
@ -281,7 +281,7 @@ export default function reducer(core = {}, action) {
playlists_uris: helpers.removeDuplicates(playlists_uris),
tracks,
tracks_more,
},
},
};