Some Bave Pages suggestion cleanup

Before it was showing about:whatever twice for each item (title and location), also it was showing suggestions for about:newtab, about:blank and about:flash when those aren't useful. Auditors: @aekeus
brave · Jul 10, 2016 · f2a9304 · f2a9304 · aekeus · Jul 11, 2016
1 parent 6bc2793
commit f2a9304
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/js/components/urlBarSuggestions.js b/js/components/urlBarSuggestions.js
@@ -10,7 +10,7 @@ const ImmutableComponent = require('./immutableComponent')
 
 const config = require('../constants/config.js')
 const top500 = require('./../data/top500.js')
-const {aboutUrls, isIntermediateAboutPage, isSourceAboutUrl, isUrl} = require('../lib/appUrlUtil')
+const {aboutUrls, isNavigatableAboutPage, isSourceAboutUrl, isUrl} = require('../lib/appUrlUtil')
 const Immutable = require('immutable')
 const debounce = require('../lib/debounce.js')
 const settings = require('../constants/settings')
@@ -135,7 +135,7 @@ class UrlBarSuggestions extends ImmutableComponent {
             : null
           }
           {
-            suggestion.type !== suggestionTypes.SEARCH
+            suggestion.type !== suggestionTypes.SEARCH && suggestion.type !== suggestionTypes.ABOUT_PAGES
             ? <div className='suggestionLocation'>{suggestion.location}</div>
             : null
           }
@@ -295,7 +295,7 @@ class UrlBarSuggestions extends ImmutableComponent {
 
     // about pages
     suggestions = suggestions.concat(mapListToElements({
-      data: aboutUrls.keySeq().filter((x) => !isIntermediateAboutPage(x)),
+      data: aboutUrls.keySeq().filter((x) => isNavigatableAboutPage(x)),
       maxResults: config.urlBarSuggestions.maxAboutPages,
       type: suggestionTypes.ABOUT_PAGES,
       clickHandler: navigateClickHandler((x) => x)}))

diff --git a/js/lib/appUrlUtil.js b/js/lib/appUrlUtil.js
@@ -74,6 +74,12 @@ module.exports.aboutUrls = new Immutable.Map({
 module.exports.isIntermediateAboutPage = (location) =>
   ['about:safebrowsing', 'about:error', 'about:certerror'].includes(getBaseUrl(location))
 
+module.exports.isNotImplementedAboutPage = (location) =>
+  ['about:config', 'about:history'].includes(getBaseUrl(location))
+
+module.exports.isNavigatableAboutPage = (location) =>
+  !module.exports.isIntermediateAboutPage(location) && !module.exports.isNotImplementedAboutPage(location) && !['about:newtab', 'about:blank', 'about:flash'].includes(getBaseUrl(location))
+
 // Map of target URLs mapped to source about: URLs
 const aboutUrlsReverse = new Immutable.Map(module.exports.aboutUrls.reduce((obj, v, k) => {
   obj[v] = k