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

Async support (webpack); Selector for SearchResults

Browse Source
This commit is contained in:
James Barnsley
2020-09-19 22:30:41 +12:00
parent 5e019200fd
commit 59d73d409d
18 changed files with 10490 additions and 321 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -467,8 +467,12 @@ const CoreMiddleware = (function () {
if (artist.albums_uris) {
const promises = artist.albums_uris.map((albumUri) => localForage.getItem(albumUri));
console.time('restoring')
Promise.all(promises).then(
(albums) => store.dispatch(coreActions.restoreItemsFromColdStore(compact(albums))),
(albums) => {
store.dispatch(coreActions.restoreItemsFromColdStore(compact(albums)));
console.timeEnd('restoring')
},
);
}
@ -742,18 +746,14 @@ const CoreMiddleware = (function () {
case 'ITEMS_LOADED':
const mergedItems = [];
console.time('TIMER')
// THE FOLLOWING LINES ARE THE CULPRIT
action.items.forEach((item) => {
mergedItems.push({
...core.items[item.uri] || {},
...item,
});
store.dispatch(uiActions.stopLoading(item.uri));
});
// ABOVE
store.dispatch(uiActions.stopLoading(arrayOf('uri', action.items)));
store.dispatch(coreActions.updateColdStore(mergedItems));
next({
...action,
@ -767,16 +767,6 @@ const CoreMiddleware = (function () {
next(action);
break;
case 'RESTORE_ITEMS_FROM_COLD_STORE':
action.items.forEach((item) => store.dispatch(uiActions.stopLoading(item.uri)));
next(action);
break;
case 'RESTORE_LIBRARY_FROM_COLD_STORE':
store.dispatch(uiActions.stopLoading(action.library.uri));
next(action);
break;
case 'ARTISTS_LOADED':
var artists_index = { ...core.artists };
var artists_loaded = [];
@ -984,6 +974,16 @@ const CoreMiddleware = (function () {
next(action);
break;
case 'RESTORE_ITEMS_FROM_COLD_STORE':
store.dispatch(uiActions.stopLoading(action.items));
next(action);
break;
case 'RESTORE_LIBRARY_FROM_COLD_STORE':
store.dispatch(uiActions.stopLoading(action.library.uri));
next(action);
break;
// TODO: Relocate this
case 'UPDATE_COLD_STORE':
if (action.items) {