From 0b113b9bab2e48510f562969e5864bb7cdd2a4db Mon Sep 17 00:00:00 2001
From: Qstick <qstick@gmail.com>
Date: Wed, 22 Apr 2020 19:12:33 -0400
Subject: [PATCH] Fixed: Queue Items don't show up

---
 frontend/src/Activity/Queue/Queue.js                      | 8 ++++++--
 .../src/Store/Actions/Creators/createHandleActions.js     | 4 ++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/frontend/src/Activity/Queue/Queue.js b/frontend/src/Activity/Queue/Queue.js
index 0d7047ed9..af0b6ca34 100644
--- a/frontend/src/Activity/Queue/Queue.js
+++ b/frontend/src/Activity/Queue/Queue.js
@@ -44,10 +44,14 @@ class Queue extends Component {
 
   componentDidUpdate(prevProps) {
     const {
-      items
+      items,
+      isMoviesFetching
     } = this.props;
 
-    if (hasDifferentItems(prevProps.items, items) && !items.some((e) => e.movieId)) {
+    if (
+      (!isMoviesFetching && prevProps.isMoviesFetching) ||
+      (hasDifferentItems(prevProps.items, items) && !items.some((e) => e.movieId))
+    ) {
       this.setState((state) => {
         return {
           ...removeOldSelectedState(state, getRemovedItems(prevProps.items, items)),
diff --git a/frontend/src/Store/Actions/Creators/createHandleActions.js b/frontend/src/Store/Actions/Creators/createHandleActions.js
index 40f77d700..afa0943ad 100644
--- a/frontend/src/Store/Actions/Creators/createHandleActions.js
+++ b/frontend/src/Store/Actions/Creators/createHandleActions.js
@@ -17,7 +17,7 @@ const blacklistedProperties = [
 ];
 
 function createItemMap(data) {
-  return data.reduce((acc, d, index, array) => {
+  return data.reduce((acc, d, index) => {
     acc[d.id] = index;
     return acc;
   }, {});
@@ -49,7 +49,7 @@ export default function createHandleActions(handlers, defaultState, section) {
 
         if (_.isArray(payload.data)) {
           newState.items = payload.data;
-          newState.itemMap = createItemMap(newState.items);
+          newState.itemMap = createItemMap(payload.data);
         } else {
           newState.item = payload.data;
         }