forked from brave/browser-laptop
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request brave#8894 from brave/fix/url-bar-is-bookmarked-cache
Add locationSiteKeyCache and use for siteUtil.isBookmarked
- Loading branch information
Showing
14 changed files
with
524 additions
and
196 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,90 @@ | ||
| /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this file, | ||
| * You can obtain one at http://mozilla.org/MPL/2.0/. */ | ||
|
|
||
| 'use strict' | ||
| const Immutable = require('immutable') | ||
| const siteUtil = require('./siteUtil') | ||
| const UrlUtil = require('../lib/urlutil') | ||
|
|
||
| const createLocationSiteKeysCache = (state) => { | ||
| state = state.set('locationSiteKeysCache', new Immutable.Map()) | ||
| state.get('sites').forEach((site, siteKey) => { | ||
| const location = siteUtil.getLocationFromSiteKey(siteKey) | ||
| if (!location) { | ||
| return | ||
| } | ||
| state = addLocationSiteKey(state, location, siteKey) | ||
| }) | ||
| return state | ||
| } | ||
|
|
||
| module.exports.loadLocationSiteKeysCache = (state) => { | ||
| const cache = state.get('locationSiteKeysCache') | ||
| if (cache) { | ||
| return state | ||
| } | ||
| return createLocationSiteKeysCache(state) | ||
| } | ||
|
|
||
| /** | ||
| * Given a location, get matching appState siteKeys based on cache. | ||
| * Loads cache from appState if it hasn't been loaded yet. | ||
| * @param state Application state | ||
| * @param location {string} | ||
| * @return {Immutable.List<string>|null} siteKeys including this location. | ||
| */ | ||
| module.exports.getLocationSiteKeys = (state, location) => { | ||
| const normalLocation = UrlUtil.getLocationIfPDF(location) | ||
| return state.getIn(['locationSiteKeysCache', normalLocation]) | ||
| } | ||
|
|
||
| /** | ||
| * Given a location, add appState siteKey to cached siteKeys list. | ||
| * Returns new state. | ||
| * @param state Application state | ||
| * @param location {string} | ||
| * @param siteKey {string} | ||
| */ | ||
| const addLocationSiteKey = (state, location, siteKey) => { | ||
| if (!siteKey || !location) { | ||
| return state | ||
| } | ||
| const normalLocation = UrlUtil.getLocationIfPDF(location) | ||
| const cacheKey = ['locationSiteKeysCache', normalLocation] | ||
| const siteKeys = state.getIn(cacheKey) | ||
| if (!siteKeys) { | ||
| return state.setIn(cacheKey, new Immutable.List([siteKey])) | ||
| } else { | ||
| if (siteKeys.includes(siteKey)) { | ||
| return state | ||
| } | ||
| return state.setIn(cacheKey, siteKeys.push(siteKey)) | ||
| } | ||
| } | ||
| module.exports.addLocationSiteKey = addLocationSiteKey | ||
|
|
||
| /** | ||
| * Given a location, remove matching appState siteKeys in cache. | ||
| * Loads cache from appState if it hasn't been loaded yet. | ||
| * @param state Application state | ||
| * @param location {string} | ||
| * @param siteKey {string} | ||
| */ | ||
| const removeLocationSiteKey = (state, location, siteKey) => { | ||
| if (!siteKey || !location) { | ||
| return state | ||
| } | ||
| const normalLocation = UrlUtil.getLocationIfPDF(location) | ||
| const cacheKey = ['locationSiteKeysCache', normalLocation] | ||
| let siteKeys = state.getIn(cacheKey) | ||
| if (!siteKeys) { | ||
| return state | ||
| } | ||
| siteKeys = siteKeys.filter(key => key !== siteKey) | ||
| if (siteKeys.size > 0) { | ||
| return state.setIn(cacheKey, siteKeys) | ||
| } else { | ||
| return state.deleteIn(cacheKey) | ||
| } | ||
| } | ||
| module.exports.removeLocationSiteKey = removeLocationSiteKey |
Oops, something went wrong.