fixes double delete

brave · Sep 11, 2017 · 5198210 · 5198210
1 parent b1d4a73
commit 5198210
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 4 deletions.
diff --git a/app/browser/reducers/urlBarSuggestionsReducer.js b/app/browser/reducers/urlBarSuggestionsReducer.js
@@ -12,6 +12,8 @@ const {makeImmutable} = require('../../common/state/immutableUtil')
 const tabState = require('../../common/state/tabState')
 const historyState = require('../../common/state/historyState')
 const bookmarksState = require('../../common/state/bookmarksState')
+const historyUtil = require('../../common/lib/historyUtil')
+const bookmarkLocationCache = require('../../common/cache/bookmarkLocationCache')
 
 const urlBarSuggestionsReducer = (state, action) => {
   switch (action.actionType) {
@@ -37,10 +39,18 @@ const urlBarSuggestionsReducer = (state, action) => {
         if (Array.isArray(bookmarkKey)) {
           data = Immutable.List()
           bookmarkKey.forEach((key) => {
-            data = data.push(bookmarksState.getBookmark(state, key))
+            const bookmark = bookmarksState.getBookmark(state, key)
+            const historyKey = historyUtil.getKey(bookmark)
+            if (!historyState.hasSite(state, historyKey)) {
+              data = data.push(bookmark)
+            }
           })
         } else {
-          data = bookmarksState.getBookmark(state, bookmarkKey)
+          const bookmark = bookmarksState.getBookmark(state, bookmarkKey)
+          const historyKey = historyUtil.getKey(bookmark)
+          if (!historyState.hasSite(state, historyKey)) {
+            data = bookmark
+          }
         }
 
         if (data != null) {
@@ -60,10 +70,18 @@ const urlBarSuggestionsReducer = (state, action) => {
         if (Array.isArray(historyKey)) {
           data = Immutable.List()
           historyKey.map((key) => {
-            data = data.push(historyState.getSite(state, key))
+            const site = historyState.getSite(state, key)
+            const bookmarkKey = bookmarkLocationCache.getCacheKey(state, site.get('location'))
+            if (bookmarkKey.size === 0) {
+              data = data.push(site)
+            }
           })
         } else {
-          data = historyState.getSite(state, historyKey)
+          const site = historyState.getSite(state, historyKey)
+          const bookmarkKey = bookmarkLocationCache.getCacheKey(state, site.get('location'))
+          if (bookmarkKey.size === 0) {
+            data = site
+          }
         }
 
         if (data != null) {

diff --git a/app/common/state/historyState.js b/app/common/state/historyState.js
@@ -27,6 +27,11 @@ const historyState = {
     return state.getIn([STATE_SITES.HISTORY_SITES, key], Immutable.Map())
   },
 
+  hasSite: (state, key) => {
+    state = validateState(state)
+    return state.hasIn([STATE_SITES.HISTORY_SITES, key], Immutable.Map())
+  },
+
   addSite: (state, siteDetail) => {
     let sites = historyState.getSites(state)
     let siteKey = historyUtil.getKey(siteDetail)