Splits sites object in the app state

Resovles brave#9978 Resolves brave#6108 Resovles brave#6585 Resolves brave#6104 Resolves brave#3694 Auditors: @bbondy @ayumi @diracdeltas @bsclifton @darkdh Test Plan:
NejcZdovc · Jul 18, 2017 · 9c4feec · 9c4feec
1 parent ff263c0
commit 9c4feec
Show file tree

Hide file tree

Showing 62 changed files with 2,026 additions and 1,131 deletions.
diff --git a/app/browser/bookmarksExporter.js b/app/browser/bookmarksExporter.js
@@ -11,20 +11,31 @@ const electron = require('electron')
 const dialog = electron.dialog
 const app = electron.app
 const BrowserWindow = electron.BrowserWindow
-const getSetting = require('../../js/settings').getSetting
+
+// State
+const bookmarkFoldersState = require('../common/state/bookmarkFoldersState')
+const bookmarsState = require('../common/state/bookmarksState')
+
+// Constants
 const settings = require('../../js/constants/settings')
 const siteTags = require('../../js/constants/siteTags')
+
+// Utils
+const {getSetting} = require('../../js/settings')
 const siteUtil = require('../../js/state/siteUtil')
-const isWindows = process.platform === 'win32'
+const platformUtil = require('../common/lib/platformUtil')
+
 const indentLength = 2
 const indentType = ' '
 
-function showDialog (sites) {
+function showDialog (state) {
   const focusedWindow = BrowserWindow.getFocusedWindow()
   const fileName = moment().format('DD_MM_YYYY') + '.html'
   const defaultPath = path.join(getSetting(settings.DEFAULT_DOWNLOAD_SAVE_PATH) || app.getPath('downloads'), fileName)
   let personal = []
   let other = []
+  const bookmarks = bookmarsState.getBookmarks(state)
+  const bookmarkFolders = bookmarkFoldersState.getFolders(state)
 
   dialog.showSaveDialog(focusedWindow, {
     defaultPath: defaultPath,
@@ -34,13 +45,14 @@ function showDialog (sites) {
     }]
   }, (fileName) => {
     if (fileName) {
-      personal = createBookmarkArray(sites)
-      other = createBookmarkArray(sites, -1, false)
+      personal = createBookmarkArray(bookmarks, bookmarkFolders)
+      other = createBookmarkArray(bookmarks, bookmarkFolders, -1, false)
       fs.writeFileSync(fileName, createBookmarkHTML(personal, other))
     }
   })
 }
 
+// TODO refactor this based on the structure (now we send in bookmarks and folders)
 function createBookmarkArray (sites, parentFolderId, first = true, depth = 1) {
   const filteredBookmarks = parentFolderId
     ? sites.filter((site) => site.get('parentFolderId') === parentFolderId)
@@ -54,13 +66,12 @@ function createBookmarkArray (sites, parentFolderId, first = true, depth = 1) {
 
   filteredBookmarks.forEach((site) => {
     if (site.get('tags').includes(siteTags.BOOKMARK) && site.get('location')) {
-      title = site.get('customTitle') || site.get('title') || site.get('location')
+      title = site.get('title') || site.get('location')
       payload.push(`${indentNext}<DT><A HREF="${site.get('location')}">${title}</A>`)
     } else if (siteUtil.isFolder(site)) {
       const folderId = site.get('folderId')
 
-      title = site.get('customTitle') || site.get('title')
-      payload.push(`${indentNext}<DT><H3>${title}</H3>`)
+      payload.push(`${indentNext}<DT><H3>${site.get('title')}</H3>`)
       payload = payload.concat(createBookmarkArray(sites, folderId, true, (depth + 1)))
     }
   })
@@ -71,7 +82,7 @@ function createBookmarkArray (sites, parentFolderId, first = true, depth = 1) {
 }
 
 function createBookmarkHTML (personal, other) {
-  const breakTag = (isWindows) ? '\r\n' : '\n'
+  const breakTag = (platformUtil.isWindows()) ? '\r\n' : '\n'
   const title = 'Bookmarks'
 
   return `<!DOCTYPE NETSCAPE-Bookmark-file-1>

diff --git a/app/browser/menu.js b/app/browser/menu.js
@@ -17,7 +17,6 @@ const appConstants = require('../../js/constants/appConstants')
 const windowConstants = require('../../js/constants/windowConstants')
 const messages = require('../../js/constants/messages')
 const settings = require('../../js/constants/settings')
-const siteTags = require('../../js/constants/siteTags')
 
 // State
 const {getByTabId} = require('../common/state/tabState')
@@ -35,8 +34,8 @@ const frameStateUtil = require('../../js/state/frameStateUtil')
 const menuUtil = require('../common/lib/menuUtil')
 const {getSetting} = require('../../js/settings')
 const locale = require('../locale')
-const {isLocationBookmarked} = require('../../js/state/siteUtil')
 const platformUtil = require('../common/lib/platformUtil')
+const bookmarkUtil = require('../common/lib/bookmarkUtil')
 const isDarwin = platformUtil.isDarwin()
 const isLinux = platformUtil.isLinux()
 
@@ -372,7 +371,7 @@ const updateRecentlyClosedMenuItems = (state) => {
 }
 
 const isCurrentLocationBookmarked = (state) => {
-  return isLocationBookmarked(state, currentLocation)
+  return bookmarkUtil.isLocationBookmarked(state, currentLocation)
 }
 
 const createBookmarksSubmenu = (state) => {
@@ -402,6 +401,7 @@ const createBookmarksSubmenu = (state) => {
     CommonMenu.exportBookmarksMenuItem()
   ]
 
+  // TODO we should send sites in, but first level bookmarks and folders
   const bookmarks = menuUtil.createBookmarkTemplateItems(state.get('sites'))
   if (bookmarks.length > 0) {
     submenu.push(CommonMenu.separatorMenuItem)
@@ -689,33 +689,15 @@ const doAction = (state, action) => {
         createMenu(state)
       }
       break
-    case appConstants.APP_ADD_SITE:
+
     case appConstants.APP_ADD_BOOKMARK:
     case appConstants.APP_EDIT_BOOKMARK:
-      {
-        if (action.tag === siteTags.BOOKMARK || action.tag === siteTags.BOOKMARK_FOLDER) {
-          createMenu(state)
-        } else if (action.siteDetail && action.siteDetail.constructor === Immutable.List && action.tag === undefined) {
-          let shouldRebuild = false
-          action.siteDetail.forEach((site) => {
-            const tag = site.getIn(['tags', 0])
-            if (tag === siteTags.BOOKMARK || tag === siteTags.BOOKMARK_FOLDER) {
-              shouldRebuild = true
-            }
-          })
-          if (shouldRebuild) {
-            createMenu(state)
-          }
-        }
-        break
-      }
-    case appConstants.APP_REMOVE_SITE:
-      {
-        if (action.tag === siteTags.BOOKMARK || action.tag === siteTags.BOOKMARK_FOLDER) {
-          createMenu(state)
-        }
-        break
-      }
+    case appConstants.APP_REMOVE_BOOKMARK:
+    case appConstants.APP_ADD_BOOKMARK_FOLDER:
+    case appConstants.APP_EDIT_BOOKMARK_FOLDER:
+    case appConstants.APP_REMOVE_BOOKMARK_FOLDER:
+      createMenu(state)
+      break
     case appConstants.APP_ON_CLEAR_BROWSING_DATA:
       {
         const defaults = state.get('clearBrowsingDataDefaults')