[MD Bookmarks] Modify search to retain the previously selected folder.

chrome/test/data/webui/md_bookmarks/store_test.js

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 suite('<bookmarks-store>', function() {
   var store;
   var TEST_TREE;
 
   function replaceStore() {
     store = document.createElement('bookmarks-store');
@@ skipping 75 matching lines @@
       '8': 'rootNode.children.#3',
     };
 
     for (var id in store.idToNodeMap_)
       assertEquals(TEST_PATHS[id], store.idToNodeMap_[id].path);
   });
 
   //////////////////////////////////////////////////////////////////////////////
   // editing bookmarks tree tests:
 
-  test('changing selectedId changes the displayedList', function() {
-    store.selectedId = '0';
-    assertEquals(TEST_TREE.children, store.displayedList);
-    store.selectedId = '1';
-    assertEquals(TEST_TREE.children[0].children, store.displayedList);
-    store.selectedId = '3';
-    assertEquals(
-        TEST_TREE.children[0].children[1].children, store.displayedList);
-
-    // Selecting an item selects the default folder.
-    store.selectedId = '5';
-    assertEquals(TEST_TREE.children[0].children, store.displayedList);
-  });
-
   test('store updates on selected event', function() {
     // First child of root is selected by default.
     assertEquals('1', store.selectedId);
     assertTrue(store.idToNodeMap_['1'].isSelectedFolder);
 
     // Selecting a selected folder doesn't deselect it.
-    store.fire('selected-folder-changed', '1');
+    store.fire('selected-folder-changed', {id: '1', clearSearch: true});
     assertEquals('1', store.selectedId);
     assertTrue(store.idToNodeMap_['1'].isSelectedFolder);
 
     // Select a deeply nested descendant.
-    store.fire('selected-folder-changed', '3');
+    store.fire('selected-folder-changed', {id: '3', clearSearch: true});
     assertEquals('3', store.selectedId);
     assertTrue(store.idToNodeMap_['3'].isSelectedFolder);
     assertFalse(store.idToNodeMap_['1'].isSelectedFolder);
 
     // Select a folder in separate subtree.
-    store.fire('selected-folder-changed', '8');
+    store.fire('selected-folder-changed', {id: '8', clearSearch: true});
     assertEquals('8', store.selectedId);
     assertTrue(store.idToNodeMap_['8'].isSelectedFolder);
     assertFalse(store.idToNodeMap_['3'].isSelectedFolder);
   });
 
   test('store updates on open and close', function() {
     // All folders are open by default.
     for (var id in store.idToNodeMap_) {
       if (store.idToNodeMap_[id].url)
         continue;
 
       assertTrue(store.idToNodeMap_[id].isOpen);
     }
 
     // Closing a folder doesn't close any descendants.
     store.fire('folder-open-changed', {id: '1', open: false});
     assertFalse(store.idToNodeMap_['1'].isOpen);
     assertTrue(store.idToNodeMap_['3'].isOpen);
     store.fire('folder-open-changed', {id: '1', open: true});
 
     // Closing an ancestor folder of a selected folder selects the ancestor.
-    store.fire('selected-folder-changed', '3');
+    store.fire('selected-folder-changed', {id: '3'});
     store.fire('folder-open-changed', {id: '1', open: false});
     assertFalse(store.idToNodeMap_['1'].isOpen);
     assertEquals('1', store.selectedId);
     assertTrue(store.idToNodeMap_['1'].isSelectedFolder);
     assertFalse(store.idToNodeMap_['3'].isSelectedFolder);
   });
 
   test('deleting a node updates the tree', function() {
     removeChild(TEST_TREE, 1);
     overrideBookmarksGetSubTree([TEST_TREE]);
@@ skipping 46 matching lines @@
       '5': 'rootNode.children.#0',
       '8': 'rootNode.children.#1'
     };
 
     for (var id in store.idToNodeMap_)
       assertEquals(TEST_PATHS[id], store.idToNodeMap_[id].path);
   });
 
   test('selectedId updates after removing a selected folder', function() {
     // Selected folder gets removed.
-    store.selectedId = '8';
+    store.fire('selected-folder-changed', {id: '8', clearSearch: true});
     removeChild(TEST_TREE, 3);
     overrideBookmarksGetSubTree([TEST_TREE]);
 
     store.onBookmarkRemoved_('8', {parentId:'0', index:'3'});
     assertTrue(store.idToNodeMap_['0'].isSelectedFolder);
     assertEquals('0', store.selectedId);
 
     // A folder with selected folder in it gets removed.
-    store.selectedId = '3';
+    store.selectFolder_('3');
     removeChild(TEST_TREE, 0);
     overrideBookmarksGetSubTree([TEST_TREE]);
 
     store.onBookmarkRemoved_('1', {parentId:'0', index:'0'});
     assertTrue(store.idToNodeMap_['0'].isSelectedFolder);
     assertEquals('0', store.selectedId);
   });
 
   test('bookmark gets updated after editing', function() {
     // Edit title updates idToNodeMap_ properly.
@@ skipping 18 matching lines @@
   //////////////////////////////////////////////////////////////////////////////
   // search tests:
 
   test('displayedList updates after searchTerm changes', function() {
     var SEARCH_RESULTS = [
       createItem('1', {title: 'cat'}),
       createItem('2', {title: 'apple'}),
       createItem('3', {title: 'paris'}),
     ];
     overrideBookmarksSearch(SEARCH_RESULTS);
+    var prevFolder = store.idToNodeMap_[store.selectedId];
 
     // Search for a non-empty string.
     store.searchTerm = 'a';
-    assertFalse(store.rootNode.children[0].isSelectedFolder);
-    assertEquals(null, store.selectedId);
+    assertFalse(prevFolder.isSelectedFolder);
+    assertEquals(prevFolder.id, store.selectedId);
     assertEquals(SEARCH_RESULTS, store.displayedList);
 
-    // Clear the searchTerm.
+    // Clearing search sets the displayed list to the previous folder.
     store.searchTerm = '';
-    var defaultFolder = store.rootNode.children[0];
-    assertTrue(defaultFolder.isSelectedFolder);
-    assertEquals(defaultFolder.id, store.selectedId);
-    assertEquals(defaultFolder.children, store.displayedList);
+    assertTrue(prevFolder.isSelectedFolder);
+    assertEquals(prevFolder.id, store.selectedId);
+    assertEquals(prevFolder.children, store.displayedList);
 
     // Search with no bookmarks returned.
     overrideBookmarksSearch([]);
     store.searchTerm = 'asdf';
     assertEquals(0, store.displayedList.length);
   });
 
   //////////////////////////////////////////////////////////////////////////////
   // router tests:
 
   test('search updates from route', function() {
     overrideBookmarksSearch([]);
+
+    // Route with basic search.
     searchTerm = 'Pond';
     navigateTo('/?q=' + searchTerm);
     assertEquals(searchTerm, store.searchTerm);
+    assertEquals(store.rootNode.children[0].id, store.selectedId);
+
+    // Route with selected folder and search.
+    var selectedId = '3';
+    searchTerm = 'Fish';
+    navigateTo('/?id=' + selectedId + '&q=' + searchTerm);
+    assertEquals(searchTerm, store.searchTerm);
+    assertEquals(selectedId, store.selectedId);
+
+    // Route with invalid selected folder and search.
+    selectedId = 'bar';
+    searchTerm = 'foo';
+    navigateTo('/?q=' + searchTerm + '&id=' + selectedId);
+    assertEquals(searchTerm, store.searchTerm);
+    assertEquals(store.rootNode.children[0].id, store.selectedId);
   });
 
   test('search updates from route on setup', function() {
     overrideBookmarksSearch([]);
     var searchTerm = 'Boat24';
     navigateTo('/?q=' + searchTerm);
     replaceStore();
     assertEquals(searchTerm, store.searchTerm);
   });
 
   test('route updates from search', function() {
     overrideBookmarksSearch([]);
+    var prevFolderId = '3';
+    store.fire('selected-folder-changed', {id: prevFolderId});
+
+    // Searching sets the previous folder and searchTerm as the URL parameters.
     var searchTerm = 'Boat24';
     store.searchTerm = searchTerm;
-    assertEquals('chrome://bookmarks/?q=' + searchTerm, window.location.href);
+    assertEquals(
+        'chrome://bookmarks/?id=' + prevFolderId + '&q=' + searchTerm,
+        window.location.href);
+
+    // Search parameter is removed from the URL when search is cleared.
+    searchTerm = '';
+    store.searchTerm = searchTerm;
+    assertEquals(
+        'chrome://bookmarks/?id=' + prevFolderId, window.location.href);
   });
 
   test('selectedId updates from route', function() {
     // Folder id routes to the corresponding folder.
     var selectedId = '3';
     navigateTo('/?id=' + selectedId);
     assertEquals(selectedId, store.selectedId);
 
     // Bookmark id routes to the default Bookmarks Bar.
     var selectedId = '2';
@@ skipping 33 matching lines @@
     assertEquals(0, store.anchorIndex_);
 
     // Select other item will remove the previous selection.
     store.fire('select-item', {item: store.idToNodeMap_['3']});
     assertDeepEquals(
         [false, true, false, false],
         store.displayedList.map(i => i.isSelectedItem));
     assertEquals(1, store.anchorIndex_);
 
     // Deleting the selected item will unselect everything.
-    store.selectedId = '1';
+    store.selectFolder_('1');
     store.fire('select-item', {item: store.idToNodeMap_['2']});
     removeChild(TEST_TREE.children[0], 0);
     overrideBookmarksGetSubTree([TEST_TREE.children[0]]);
     store.onBookmarkRemoved_('2', {parentId: '1', index: 0});
     assertDeepEquals(
         [false, false, false],
         store.displayedList.map(i => i.isSelectedItem));
     assertEquals(null, store.anchorIndex_);
 
     // Changing the selected folder will remove the select status of the
     // bookmark.
-    store.selectedId = '3';
+    store.selectFolder_('3');
     assertDeepEquals(
         [false, false, false],
         store.idToNodeMap_['1'].children.map(i => i.isSelectedItem));
     assertEquals(null, store.anchorIndex_);
   });
 
   test('shift select selects the correct bookmarks', function() {
     // When nothing has been selected, it selects a single item.
     assertEquals(null, store.anchorIndex_);
     store.fire('select-item', {item: store.idToNodeMap_['6'], range: true});
@@ skipping 48 matching lines @@
   });
 
   test('selection in search mode', function() {
     // Item gets unselected in search.
     overrideBookmarksSearch([
       createItem('4', {url: 'link4'}),
       createItem('2', {url: 'link2'}),
       createItem('5', {url: 'link5'}),
     ]);
 
-    store.selectedId = '1';
+    // store.selectFolder_('1');
+    store.fire('selected-folder-changed', {id: '1'});
     store.fire('select-item', {item: store.idToNodeMap_['3']});
     store.searchTerm = 'a';
     assertFalse(store.idToNodeMap_['3'].isSelectedItem);
     assertEquals(null, store.anchorIndex_);
 
     // anchorIndex_ gets updated properly in single select.
     store.fire('select-item', {item: store.displayedList[1]});
     assertDeepEquals(
         [false, true, false],
         store.displayedList.map(i => i.isSelectedItem));
@@ skipping 34 matching lines @@
     store.fire(
         'select-item', {item: store.displayedList[2], add: true, range: false});
     store.fire(
         'select-item', {item: store.displayedList[4], add: true, range: true});
     assertDeepEquals(
         [true, false, true, true, true],
         store.displayedList.map(i => i.isSelectedItem));
     assertEquals(2, store.anchorIndex_);
   });
 });