Merge pull request #12754 from AlexRobinson-/arobinson/forget-this-do…

…main

Add "forget this domain" feature

app/browser/reducers/historyReducer.js

@@ -19,6 +19,7 @@ const messages = require('../../../js/constants/messages')
 const settings = require('../../../js/constants/settings')
 
 // Utils
+const urlParse = require('../../common/urlParse')
 const {makeImmutable} = require('../../common/state/immutableUtil')
 const {remove} = require('../../common/lib/siteSuggestions')
 const syncUtil = require('../../../js/state/syncUtil')
@@ -126,6 +127,24 @@ const historyReducer = (state, action, immutableAction) => {
  break
  }
 
+ case appConstants.APP_REMOVE_HISTORY_DOMAIN: {
+ const domain = action.get('domain')
+
+ if (!domain) {
+ break
+ }
+
+ historyState.getSites(state).forEach(historySite => {
+ if (urlParse(historySite.get('location')).hostname === domain) {
+ state = historyState.removeSite(state, historySite.get('key'))
+ }
+ })
+
+ state = aboutHistoryState.setHistory(state, historyState.getSites(state))
+
+ break
+ }
+
  case appConstants.APP_POPULATE_HISTORY:
  {
  state = aboutHistoryState.setHistory(state, historyState.getSites(state))

app/extensions/brave/locales/en-US/menu.properties

@@ -45,6 +45,7 @@ cut=Cut
 delete=Delete
 deleteBookmark=Delete Bookmark
 deleteBookmarks=Delete Selected Bookmarks
+deleteDomainFromHistory=Delete Domain from History
 deleteFolder=Delete Folder
 deleteHistoryEntries=Delete Selected History Entries
 deleteHistoryEntry=Delete History Entry

app/locale.js

@@ -60,6 +60,7 @@ var rendererIdentifiers = function () {
  'deleteBookmarks',
  'deleteHistoryEntry',
  'deleteHistoryEntries',
+ 'deleteDomainFromHistory',
  'deleteLedgerEntry',
  'ledgerBackupText1',
  'ledgerBackupText2',

js/actions/appActions.js

@@ -384,7 +384,7 @@ const appActions = {
 
  /**
  * Removes a site from the site list
- * @param {string|Immutable.List} historyKey - Hisotry item key that we want to remove, can be list of keys as well
+ * @param {string|Immutable.List} historyKey - History item key that we want to remove, can be list of keys as well
  */
  removeHistorySite: function (historyKey) {
  dispatch({
@@ -393,6 +393,17 @@ const appActions = {
  })
  },
 
+ /**
+ * Removes all sites for the given domain from the site list
+ * @param {string} domain - Domain of the sites we want to remove
+ */
+ removeHistoryDomain: function (domain) {
+ dispatch({
+ actionType: appConstants.APP_REMOVE_HISTORY_DOMAIN,
+ domain
+ })
+ },
+
  /**
  * Dispatches a message to add/edit download details
  * If set, also indicates that add/edit is shown

js/constants/appConstants.js

@@ -19,6 +19,7 @@ const appConstants = {
  APP_ADD_HISTORY_SITE: _,
  APP_SET_STATE: _,
  APP_REMOVE_HISTORY_SITE: _,
+ APP_REMOVE_HISTORY_DOMAIN: _,
  APP_MERGE_DOWNLOAD_DETAIL: _, // Sets an individual download detail
  APP_CLEAR_COMPLETED_DOWNLOADS: _, // Removes all completed downloads
  APP_SET_DATA_FILE_ETAG: _,

js/contextMenus.js

@@ -355,6 +355,14 @@ const siteSingleDetailTemplate = (siteKey, type, activeFrame) => {
  }
  }
  })
+
+ template.push({
+ label: locale.translation('deleteDomainFromHistory'),
+ click: () => {
+ const domain = urlParse(siteDetail.get('location')).hostname
+ appActions.removeHistoryDomain(domain)
+ }
+ })
  }
 
  if (type !== siteTags.HISTORY) {

test/unit/app/browser/reducers/historyReducerTest.js

@@ -86,6 +86,17 @@ describe('historyReducer unit test', function () {
  partitionNumber: 0,
  themeColor: undefined,
  title: 'Brave'
+ },
+ {
+ count: 2,
+ favicon: undefined,
+ key: 'https://brave.com/|1',
+ lastAccessedTime: 0,
+ location: 'https://brave.com/',
+ objectId: null,
+ partitionNumber: 0,
+ themeColor: undefined,
+ title: 'Brave | Another Page'
  }
  ]
  }
@@ -350,6 +361,83 @@ describe('historyReducer unit test', function () {
  })
  })
 
+ describe('APP_REMOVE_HISTORY_DOMAIN', function () {
+ let spy, spyAbout
+
+ before(function () {
+ spy = sinon.spy(historyState, 'removeSite')
+ spyAbout = sinon.spy(aboutHistoryState, 'setHistory')
+ })
+
+ afterEach(function () {
+ spy.reset()
+ spyAbout.reset()
+ })
+
+ after(function () {
+ spy.restore()
+ spyAbout.restore()
+ })
+
+ it('null case', function () {
+ const newState = historyReducer(state, {
+ actionType: appConstants.APP_REMOVE_HISTORY_DOMAIN
+ })
+ assert.equal(spy.notCalled, true)
+ assert.equal(spyAbout.notCalled, true)
+ assert.deepEqual(newState.toJS(), state.toJS())
+ })
+
+ it('domain is a string', function () {
+ const newState = historyReducer(stateWithData, {
+ actionType: appConstants.APP_REMOVE_HISTORY_DOMAIN,
+ domain: 'https://brave.com'
+ })
+ const expectedState = state
+ .set('historySites', Immutable.fromJS({
+ 'https://clifton.io/|0': {
+ count: 1,
+ favicon: undefined,
+ key: 'https://clifton.io/|0',
+ lastAccessedTime: 0,
+ location: 'https://clifton.io/',
+ objectId: null,
+ partitionNumber: 0,
+ themeColor: undefined,
+ title: 'Clifton'
+ }
+ }))
+ .setIn(['about', 'history'], Immutable.fromJS({
+ entries: [
+ {
+ count: 1,
+ favicon: undefined,
+ key: 'https://clifton.io/|0',
+ lastAccessedTime: 0,
+ location: 'https://clifton.io/',
+ objectId: null,
+ partitionNumber: 0,
+ themeColor: undefined,
+ title: 'Clifton'
+ }
+ ],
+ updatedStamp: 0
+ }))
+
+ it('calls remove for each matching domain', () => {
+ assert.equal(spy.calledTwice, true)
+ })
+
+ it('sets the history with the update site list', () => {
+ assert.equal(spyAbout.calledOnce, true)
+ })
+
+ it('returns the updated state', () => {
+ assert.deepEqual(newState.toJS(), expectedState.toJS())
+ })
+ })
+ })
+
  describe('APP_REMOVE_HISTORY_SITE', function () {
  let spy, spyAbout