Add locationSiteKeyCache and use for siteUtil.isBookmarked #8894

ayumi · 2017-05-16T22:18:59Z

Fix #8703

Submitter Checklist:

Submitted a ticket for my issue if one did not already exist.
Used Github auto-closing keywords in the commit message.
Added/updated tests for this change (for new code or code which already has tests).
Ran git rebase -i to squash commits (if needed).

Test Plan:

Make sure tests are passing.

Reviewer Checklist:

Tests

Adequate test coverage exists to prevent regressions
Tests should be independent and work correctly when run individually or as a suite ref
New files have MPL2 license header

bbondy · 2017-05-17T21:01:18Z

js/state/siteUtil.js

+
+/**
+ * Checks if a siteDetail has the specified tag.
+ * O(n) warning; this iterates through sites.


I think this should either be removed or it should just access in O(1) to check via site key.

bbondy · 2017-05-17T21:13:00Z

js/state/siteUtil.js

+    const site = sites.get(key)
+    if (!site) {
+      return false
+    }


some will still iterate over everything, I think it would be best to just make the cache related to bookmarks, and if the key is in there then return in O(1) if it is bookmarked.

This should only iterate over a median of 1 or 2 keys.

We could have a location-to-bookmarked cache if we assume a location can be bookmarked only once.

bbondy · 2017-05-17T21:18:40Z

app/browser/reducers/tabsReducer.js

+        }
+        const bookmarked = isLocationBookmarked(state, url)
+        tabValue = tabValue.set('bookmarked', bookmarked)
+        state = tabState.updateTabValue(state, tabValue)


I think this should all be removed and then just add the bookmarked property in getTabValue and it'll work better.

bookmarking a page doesn't seem to trigger this function. how would that state change get reflected here?

I think I'd handle appConstants.APP_ADD_SITE in the tabsReducer, the only problem is that doesn't tell you which tab to update. You could either find the tabs with that location or pass in the info with ADD_SITE, that might be better if you can fix all the callers.

Then you could just callupdateTab after getting the tab by tabId in tabs.js


        Add locationSiteKeyCache and use for siteUtil.isBookmarked

Fix #8703

bbondy · 2017-05-19T02:37:00Z

js/about/newtab.js

@@ -96,6 +96,7 @@ class NewTabPage extends React.Component {
    }).size > 0
  }
  isBookmarked (siteProps) {
+    // XXX: Fixme, not passing state in!


Could you check how often this is called? If it is often could you put this in a different component passing in only the URL? It would ensure each is only rendered / called once.

i think it's called once per site icon shown on newTab, when you open a new tab.
it seems to be pretty fast.

bbondy · 2017-05-19T02:40:20Z

test/unit/state/siteCacheTest.js

+const assert = require('assert')
+const Immutable = require('immutable')
+// const mockery = require('mockery')
+// const settings = require('../../../js/constants/settings')


nit: these can be removed in a follow up

bbondy · 2017-05-19T02:41:01Z

test/unit/state/siteCacheTest.js

+// const mockery = require('mockery')
+// const settings = require('../../../js/constants/settings')
+
+describe('siteCache', function () {


nice job on these tests 💯

bbondy · 2017-05-19T02:42:11Z

js/state/siteCache.js

+const siteUtil = require('./siteUtil')
+const UrlUtil = require('../lib/urlutil')
+
+const createLocationSiteKeysCache = (state) => {


In a follow up after this is merged, please move this to app/common/state. Basically no files should be in js/* anymore and we're migrating away from that.

bbondy · 2017-05-19T02:42:56Z

test/unit/state/siteCacheTest.js

@@ -0,0 +1,145 @@
+/* global describe, it */


Please also move this test to test/unit/app/common/state/

bbondy · 2017-05-19T03:12:41Z

Some minor follow ups to do in a new commit but merging this.


        Merge pull request #8894 from brave/fix/url-bar-is-bookmarked-cache

Add locationSiteKeyCache and use for siteUtil.isBookmarked


        Address feedback in PR #8894

@bbondy

Auditors: @bbondy Test Plan: Check that automated tests pass.


        Merge pull request #8951 from brave/fix/improve-8894

Address feedback in PR #8894


        Merge pull request #8951 from brave/fix/improve-8894

Address feedback in PR #8894

ayumi added feature/URLbar PR/work-in-progress ⚒ labels May 16, 2017

ayumi force-pushed the fix/url-bar-is-bookmarked-cache branch from 916bb43 to 1584019 May 17, 2017

luixxiul assigned ayumi May 17, 2017

bbondy reviewed May 17, 2017

View changes

ayumi force-pushed the fix/url-bar-is-bookmarked-cache branch 6 times, most recently from fecb5d3 to ffe78cf May 18, 2017

Add locationSiteKeyCache and use for siteUtil.isBookmarked

Verified

This commit was signed with a verified signature.

ayumi ａｙｕｍｉｙｕ

GPG key ID: FFC29CB6ED2EC961 Learn about signing commits

Loading status checks…

980a855

Fix #8703

ayumi force-pushed the fix/url-bar-is-bookmarked-cache branch from ffe78cf to 980a855 May 19, 2017

ayumi mentioned this pull request May 19, 2017

In nav bar bookmarked star, check only the specific siteKey #8771

Closed

1 of 4 tasks complete

bbondy reviewed May 19, 2017

View changes

test/unit/state/siteCacheTest.js

// const mockery = require('mockery')

// const settings = require('../../../js/constants/settings')

describe('siteCache', function () {

This comment has been minimized.

Sign in to view

Copy link

bbondy May 19, 2017
Member

nice job on these tests 💯

bbondy reviewed May 19, 2017

View changes

test/unit/state/siteCacheTest.js

@@ -0,0 +1,145 @@

/* global describe, it */

This comment has been minimized.

Sign in to view

Copy link

bbondy May 19, 2017
Member

Please also move this test to test/unit/app/common/state/

bbondy merged commit 5fc6f05 into master May 19, 2017
0 of 2 checks passed

0 of 2 checks passed

continuous-integration/appveyor/pr AppVeyor build failed
Details

continuous-integration/travis-ci/pr The Travis CI build failed
Details

luixxiul removed the PR/work-in-progress ⚒ label May 19, 2017

luixxiul added this to the 0.15.300 milestone May 19, 2017

ayumi mentioned this pull request May 19, 2017

URL bar, on every keystroke the browser re-checks if the current location is bookmarked #8703

Closed

ayumi mentioned this pull request May 19, 2017

Address feedback in PR #8894 #8951

Merged

0 of 7 tasks complete

bbondy added a commit that referenced this pull request May 19, 2017

Merge pull request #8951 from brave/fix/improve-8894

Loading status checks…

00e2a0c

Address feedback in PR #8894

bsclifton deleted the fix/url-bar-is-bookmarked-cache branch May 22, 2017

brave / browser-laptop Archived

Add locationSiteKeyCache and use for siteUtil.isBookmarked #8894

Add locationSiteKeyCache and use for siteUtil.isBookmarked #8894

ayumi commented May 16, 2017 •

edited

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

bbondy commented May 19, 2017

brave / browser-laptop Archived

Join GitHub today

Add locationSiteKeyCache and use for siteUtil.isBookmarked #8894

Add locationSiteKeyCache and use for siteUtil.isBookmarked #8894

Conversation

ayumi commented May 16, 2017 • edited

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

bbondy May 18, 2017 • edited

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

bbondy May 19, 2017 • edited

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

bbondy commented May 19, 2017

ayumi commented May 16, 2017 •

edited

bbondy May 18, 2017 •

edited

bbondy May 19, 2017 •

edited