fix: media library on reload (#3174)

packages/netlify-cms-core/src/actions/entries.ts

@@ -313,12 +313,13 @@ export function deleteLocalBackup(collection: Collection, slug: string) {
  */
 
 export function loadEntry(collection: Collection, slug: string) {
-  return (dispatch: ThunkDispatch<State, {}, AnyAction>, getState: () => State) => {
+  return async (dispatch: ThunkDispatch<State, {}, AnyAction>, getState: () => State) => {
     const state = getState();
     const backend = currentBackend(state.config);
+    await waitForMediaLibraryToLoad(dispatch, getState());
     dispatch(entryLoading(collection, slug));
     return backend
-      .getEntry(state, collection, slug)
+      .getEntry(getState(), collection, slug)
       .then((loadedEntry: EntryValue) => {
         return dispatch(entryLoaded(collection, loadedEntry));
       })

packages/netlify-cms-core/src/actions/mediaLibrary.ts

@@ -147,10 +147,8 @@ export function loadMedia(
       }
     }
     dispatch(mediaLoading(page));
-    return new Promise(resolve => {
+
-      setTimeout(
+    const loadFunction = () =>
-        () =>
-          resolve(
       backend
         .getMedia()
         .then(files => dispatch(mediaLoaded(files)))
@@ -162,11 +160,15 @@ export function loadMedia(
           } else {
             dispatch(mediaLoadFailed());
           }
-              }),
-          ),
-        delay,
-      );
         });
+
+    if (delay > 0) {
+      return new Promise(resolve => {
+        setTimeout(() => resolve(loadFunction()), delay);
+      });
+    } else {
+      return loadFunction();
+    }
   };
 }