Do not delete site data when no tags (history)

fix brave#7238 Auditors: @bsclfton, @bbondy Test Plan: Covered by automatic test
darkdh · Feb 14, 2017 · f5f069a · f5f069a
1 parent 10239a4
commit f5f069a
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 7 deletions.
diff --git a/js/state/siteUtil.js b/js/state/siteUtil.js
@@ -255,6 +255,9 @@ module.exports.addSite = function (sites, siteDetail, tag, originalSiteDetail) {
  */
 module.exports.removeSite = function (sites, siteDetail, tag, reorder = true) {
   const key = module.exports.getSiteKey(siteDetail)
+  if (!key) {
+    return sites
+  }
 
   const tags = sites.getIn([key, 'tags'])
   if (isBookmarkFolder(tags)) {
@@ -267,12 +270,18 @@ module.exports.removeSite = function (sites, siteDetail, tag, reorder = true) {
       })
     })
   }
-  if (sites.size && reorder) {
-    const order = sites.getIn([key, 'order'])
-    sites = reorderSite(sites, order)
-  }
+  if (isBookmark(tag)) {
+    if (sites.size && reorder) {
+      const order = sites.getIn([key, 'order'])
+      sites = reorderSite(sites, order)
+    }
 
-  return sites.delete(key)
+    return sites.delete(key)
+  } else {
+    let site = sites.get(key)
+    site = site.set('lastAccessedTime', undefined)
+    return sites.set(key, site)
+  }
 }
 
 /**

diff --git a/test/unit/state/siteUtilTest.js b/test/unit/state/siteUtilTest.js
@@ -546,13 +546,21 @@ describe('siteUtil', function () {
       it('deletes a history entry (has no tags)', function () {
         const siteDetail = {
           tags: [],
-          location: testUrl1
+          location: testUrl1,
+          lastAccessedTime: 123
+        }
+        const expectedSites = {
+          'https://brave.com/|0|0': {
+            tags: [],
+            location: testUrl1,
+            lastAccessedTime: undefined
+          }
         }
         const siteKey = siteUtil.getSiteKey(Immutable.fromJS(siteDetail))
         let sites = {}
         sites[siteKey] = siteDetail
         const processedSites = siteUtil.removeSite(Immutable.fromJS(sites), Immutable.fromJS(siteDetail))
-        assert.deepEqual(processedSites, Immutable.fromJS({}))
+        assert.deepEqual(processedSites.toJS(), expectedSites)
       })
     })
   })