### Version 0.6.0

#### Features
- Add new entry rows after DBL dot Local discovers and downloads their metadata

#### Fixes
- Improved Search input performance
- Improved scroll bar performance when loading new entries
- Improved entry row selection (toggling tray menu)
- Filter out rows that are missing name (possibly loading_metadata)

(Merge branch 'refs/heads/v0.6.0')

CHANGELOG.md

@@ -1,3 +1,14 @@
+### Version 0.6.0
+
+#### Features
+- Add new entry rows after DBL dot Local discovers and downloads their metadata
+
+#### Fixes
+- Improved Search input performance
+- Improved scroll bar performance when loading new entries
+- Improved entry row selection (toggling tray menu)
+- Filter out rows that are missing name (possibly loading_metadata)
+
 ### Version 0.5.0
 
 #### Features

app/actions/bundle.actions.js

@@ -78,11 +78,11 @@ export function setupBundlesEventSource(authentication) {
     };
     const listeners = {
       'storer/execute_task': listenStorerExecuteTaskDownloadResources,
-      'storer/change_mode': (e) => listenStorerChangeMode(e, dispatch),
+      'storer/change_mode': listenStorerChangeMode,
       'downloader/receiver': listenDownloaderReceiver,
       'downloader/status': (e) => listenDownloaderStatus(e, dispatch),
       'storer/delete_resource': (e) => listenStorerDeleteResource(e, dispatch),
-      'storer/update_from_download': listenStorerUpdateFromDownload,
+      'storer/update_from_download': (e) => listenStorerUpdateFromDownload(e, dispatch),
     };
     Object.keys(listeners).forEach((evType) => {
       const handler = listeners[evType];
@@ -99,30 +99,22 @@ export function setupBundlesEventSource(authentication) {
     }
   };
 
-  function listenStorerExecuteTaskDownloadResources(e) {
-    console.log(e);
+  function listenStorerExecuteTaskDownloadResources() {
+    // console.log(e);
   }
 
-  function listenStorerChangeMode(e, dispatch) {
-    console.log(e);
-    const data = JSON.parse(e.data);
-    const bundleId = data.args[0];
-    const mode = data.args[1];
-    if (mode === 'store') {
-      dispatch(updateStatus(bundleId, 'COMPLETED'));
-    }
-  }
-
-  function updateStatus(_id, status) {
-    return {
-      type: bundleConstants.UPDATE_STATUS,
-      id: _id,
-      status,
-    };
+  function listenStorerChangeMode() {
+    // console.log(e);
+    // const data = JSON.parse(e.data);
+    // const bundleId = data.args[0];
+    // const mode = data.args[1];
+    // if (mode === 'store') {
+    //   dispatch(updateStatus(bundleId, 'COMPLETED'));
+    // }
   }
 
-  function listenDownloaderReceiver(e) {
-    console.log(e);
+  function listenDownloaderReceiver() {
+    // console.log(e);
   }
 
   /* downloader/status
@@ -131,7 +123,7 @@ export function setupBundlesEventSource(authentication) {
    *          'component': 'downloader', 'type': 'status'}}
    */
   function listenDownloaderStatus(e, dispatch) {
-    console.log(e);
+    // console.log(e);
     const data = JSON.parse(e.data);
     const bundleId = data.args[0];
     const resourcesDownloaded = data.args[1];
@@ -149,7 +141,7 @@ export function setupBundlesEventSource(authentication) {
   }
 
   function listenStorerDeleteResource(e, dispatch) {
-    console.log(e);
+    // console.log(e);
     const data = JSON.parse(e.data);
     const bundleId = data.args[0];
     const resourceToRemove = data.args[1];
@@ -164,8 +156,23 @@ export function setupBundlesEventSource(authentication) {
     };
   }
 
-  function listenStorerUpdateFromDownload(e) {
-    console.log(e);
+  async function listenStorerUpdateFromDownload(e, dispatch) {
+    const data = JSON.parse(e.data);
+    const bundleId = data.args[0];
+    const apiBundle = await bundleService.fetchById(bundleId);
+    const fileInfoKeys = Object.keys(apiBundle.store.file_info);
+    if (fileInfoKeys.length === 1 && fileInfoKeys[0] === 'metadata.xml') {
+      // we just downloaded metadata.xml
+      const bundle = bundleService.convertApiBundleToNathanaelBundle(apiBundle);
+      dispatch(addBundle(bundle));
+    }
+  }
+
+  function addBundle(bundle) {
+    return {
+      type: bundleConstants.ADD_BUNDLE,
+      bundle
+    };
   }
 }
 
@@ -318,8 +325,8 @@ export function toggleModePauseResume(id) {
   return { type: bundleConstants.TOGGLE_MODE_PAUSE_RESUME, id };
 }
 
-export function toggleSelectBundle(id) {
-  return { type: bundleConstants.TOGGLE_SELECT, id };
+export function toggleSelectBundle(selectedBundle) {
+  return { type: bundleConstants.TOGGLE_SELECT, selectedBundle };
 }
 
 function getMockBundles() {

app/actions/bundleFilter.actions.js

@@ -4,7 +4,7 @@ import { bundleFilterConstants } from '../constants/bundleFilter.constants';
 
 export const bundleFilterActions = {
   updateSearchInput,
-  addSearchMatch,
+  addSearchResults,
   clearSearch
 };
 
@@ -36,6 +36,11 @@ export function updateSearchInput(searchInput, bundles) {
     textToHighlight})
   */
   function updateAllSearchMatches(dispatch, searchableBundles, searchKeywords) {
+    let searchResults = {
+      chunks: {},
+      foundChunks: {},
+      bundlesMatching: {},
+    };
     const chunksAcrossBundles = {};
     searchableBundles.forEach((searchableBundle) => {
       const chunksInBundle = {};
@@ -55,15 +60,32 @@ export function updateSearchInput(searchInput, bundles) {
         }
       });
       if (Object.keys(matchesInBundle).length > 0) {
-        dispatch(addSearchMatch(searchableBundle, chunksInBundle, matchesInBundle));
+        searchResults = addSearchResults(searchResults, searchableBundle, chunksInBundle, matchesInBundle);
       }
     });
+    dispatch(updateSearchResults(searchResults));
   }
 }
 
-export function addSearchMatch(bundle, chunks, matches) {
+function addSearchResults(searchResults, bundle, chunks, matches) {
+  const oldBundlesMatching = searchResults.bundlesMatching;
+  const oldChunks = searchResults.chunks;
+  const oldMatches = searchResults.matches;
+  const key = bundle.id;
+  const newMatchingBundle = { [key]: bundle };
+  const newChunks = chunks;
+  const newMatches = matches;
   return {
-    type: bundleFilterConstants.ADD_SEARCH_MATCH, bundle, chunks, matches
+    bundlesMatching: { ...oldBundlesMatching, ...newMatchingBundle },
+    chunks: { ...oldChunks, ...newChunks },
+    matches: { ...oldMatches, ...newMatches }
+  };
+}
+
+
+export function updateSearchResults(searchResults) {
+  return {
+    type: bundleFilterConstants.UPDATE_SEARCH_RESULTS, searchResults
   };
 }