From 97537e3e16ee03f667326362bbec53e785145148 Mon Sep 17 00:00:00 2001
From: Maaz Syed Adeeb <maaz.adeeb@gmail.com>
Date: Sun, 6 Nov 2016 16:04:41 +0530
Subject: [PATCH] [WIP] Making the Clear Browsing Data dialog stateful

---
 js/actions/appActions.js                |  7 ++++
 js/components/clearBrowsingDataPanel.js | 45 +++++++++++++++++++------
 js/components/main.js                   |  3 +-
 js/constants/appConstants.js            |  3 +-
 js/stores/appStore.js                   |  3 ++
 5 files changed, 49 insertions(+), 12 deletions(-)

diff --git a/js/actions/appActions.js b/js/actions/appActions.js
index 0121a2d2826..46ef3d66b89 100644
--- a/js/actions/appActions.js
+++ b/js/actions/appActions.js
@@ -579,6 +579,13 @@ const appActions = {
     AppDispatcher.dispatch({
       actionType: AppConstants.APP_DEFAULT_BROWSER_CHECK_COMPLETE
     })
+  },
+
+  setClearBrowserDataDefaults: function (defaultValues) {
+    AppDispatcher.dispatch({
+      actionType: AppConstants.APP_UPDATE_CLEAR_BROWSER_DATA_DEFAULTS,
+      defaultValues
+    })
   }
 }
 
diff --git a/js/components/clearBrowsingDataPanel.js b/js/components/clearBrowsingDataPanel.js
index 515e29d1544..ef02c3f082f 100644
--- a/js/components/clearBrowsingDataPanel.js
+++ b/js/components/clearBrowsingDataPanel.js
@@ -3,6 +3,7 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 const React = require('react')
+const Immutable = require('immutable')
 const ImmutableComponent = require('./immutableComponent')
 const Dialog = require('./dialog')
 const Button = require('./button')
@@ -24,14 +25,38 @@ class ClearBrowsingDataPanel extends ImmutableComponent {
     this.onToggleAutofillData = this.onToggleSetting.bind(this, 'autofillData')
     this.onToggleSavedSiteSettings = this.onToggleSetting.bind(this, 'savedSiteSettings')
     this.onClear = this.onClear.bind(this)
+    this.getIsChecked = this.getIsChecked.bind(this)
+    this.getNewDefaultValues = this.getNewDefaultValues.bind(this)
+  }
+  getIsChecked (setting) {
+    const currentValue = this.props.clearBrowsingDataDetail.get(setting)
+    if (this.props.defaultValues && currentValue === undefined) {
+      return this.props.defaultValues.get(setting)
+    } else {
+      return currentValue
+    }
+  }
+  getNewDefaultValues () {
+    let newDefaultValues = new Immutable.Map()
+    let settings = ['browserHistory', 'downloadHistory', 'cachedImagesAndFiles', 'savedPasswords', 'allSiteCookies', 'autocompleteData', 'autofillData', 'savedSiteSettings']
+    // TODO: Optimize this to send back only defined settings
+    settings.forEach(function (setting) {
+      const currentValue = this.props.clearBrowsingDataDetail.get(setting)
+      newDefaultValues = newDefaultValues.set(setting, currentValue !== undefined ? currentValue : this.props.defaultValues.get(setting))
+    }.bind(this))
+    return newDefaultValues
   }
   onToggleSetting (setting, e) {
     windowActions.setClearBrowsingDataDetail(this.props.clearBrowsingDataDetail.set(setting, e.target.value))
   }
   onClear () {
-    appActions.clearAppData(this.props.clearBrowsingDataDetail)
-    this.props.onHide()
     let detail = this.props.clearBrowsingDataDetail
+    if (this.props.defaultValues) {
+      detail = this.getNewDefaultValues()
+    }
+    appActions.setClearBrowserDataDefaults(detail)
+    appActions.clearAppData(detail)
+    this.props.onHide()
     if (detail.get('allSiteCookies') && detail.get('browserHistory') &&
         detail.get('cachedImagesAndFiles')) {
       ipc.send(messages.PREFS_RESTART)
@@ -42,14 +67,14 @@ class ClearBrowsingDataPanel extends ImmutableComponent {
       <div className='clearBrowsingData' onClick={(e) => e.stopPropagation()}>
         <div className='formSection clearBrowsingDataTitle' data-l10n-id='clearBrowsingData' />
         <div className='formSection clearBrowsingDataOptions'>
-          <SwitchControl className='browserHistorySwitch' rightl10nId='browserHistory' checkedOn={this.props.clearBrowsingDataDetail.get('browserHistory')} onClick={this.onToggleBrowserHistory} />
-          <SwitchControl rightl10nId='downloadHistory' checkedOn={this.props.clearBrowsingDataDetail.get('downloadHistory')} onClick={this.onToggleDownloadHistory} />
-          <SwitchControl rightl10nId='cachedImagesAndFiles' checkedOn={this.props.clearBrowsingDataDetail.get('cachedImagesAndFiles')} onClick={this.onToggleCachedImagesAndFiles} />
-          <SwitchControl rightl10nId='savedPasswords' checkedOn={this.props.clearBrowsingDataDetail.get('savedPasswords')} onClick={this.onToggleSavedPasswords} />
-          <SwitchControl rightl10nId='allSiteCookies' checkedOn={this.props.clearBrowsingDataDetail.get('allSiteCookies')} onClick={this.onToggleAllSiteCookies} />
-          <SwitchControl className='autocompleteDataSwitch' rightl10nId='autocompleteData' checkedOn={this.props.clearBrowsingDataDetail.get('autocompleteData')} onClick={this.onToggleAutocompleteData} />
-          <SwitchControl className='autofillDataSwitch' rightl10nId='autofillData' checkedOn={this.props.clearBrowsingDataDetail.get('autofillData')} onClick={this.onToggleAutofillData} />
-          <SwitchControl className='siteSettingsSwitch' rightl10nId='savedSiteSettings' checkedOn={this.props.clearBrowsingDataDetail.get('savedSiteSettings')} onClick={this.onToggleSavedSiteSettings} />
+          <SwitchControl className='browserHistorySwitch' rightl10nId='browserHistory' checkedOn={this.getIsChecked('browserHistory')} onClick={this.onToggleBrowserHistory} />
+          <SwitchControl rightl10nId='downloadHistory' checkedOn={this.getIsChecked('downloadHistory')} onClick={this.onToggleDownloadHistory} />
+          <SwitchControl rightl10nId='cachedImagesAndFiles' checkedOn={this.getIsChecked('cachedImagesAndFiles')} onClick={this.onToggleCachedImagesAndFiles} />
+          <SwitchControl rightl10nId='savedPasswords' checkedOn={this.getIsChecked('savedPasswords')} onClick={this.onToggleSavedPasswords} />
+          <SwitchControl rightl10nId='allSiteCookies' checkedOn={this.getIsChecked('allSiteCookies')} onClick={this.onToggleAllSiteCookies} />
+          <SwitchControl className='autocompleteDataSwitch' rightl10nId='autocompleteData' checkedOn={this.getIsChecked('autocompleteData')} onClick={this.onToggleAutocompleteData} />
+          <SwitchControl className='autofillDataSwitch' rightl10nId='autofillData' checkedOn={this.getIsChecked('autofillData')} onClick={this.onToggleAutofillData} />
+          <SwitchControl className='siteSettingsSwitch' rightl10nId='savedSiteSettings' checkedOn={this.getIsChecked('savedSiteSettings')} onClick={this.onToggleSavedSiteSettings} />
         </div>
         <div className='formSection clearBrowsingDataButtons'>
           <Button l10nId='cancel' className='secondaryAltButton' onClick={this.props.onHide} />
diff --git a/js/components/main.js b/js/components/main.js
index 4b152d9d0f7..2f1ec7f5f3e 100644
--- a/js/components/main.js
+++ b/js/components/main.js
@@ -995,7 +995,8 @@ class Main extends ImmutableComponent {
          clearBrowsingDataPanelIsVisible
           ? <ClearBrowsingDataPanel
             clearBrowsingDataDetail={this.props.windowState.get('clearBrowsingDataDetail')}
-            onHide={this.onHideClearBrowsingDataPanel} />
+            onHide={this.onHideClearBrowsingDataPanel}
+            defaultValues={this.props.appState.get('clearBrowsingDataDefaults')} />
           : null
         }
         {
diff --git a/js/constants/appConstants.js b/js/constants/appConstants.js
index 9ee5bc7c697..5b98b051c6a 100644
--- a/js/constants/appConstants.js
+++ b/js/constants/appConstants.js
@@ -63,7 +63,8 @@ const AppConstants = {
   APP_UPDATE_ADBLOCK_CUSTOM_RULES: _,
   APP_SUBMIT_FEEDBACK: _,
   APP_DEFAULT_BROWSER_UPDATED: _,
-  APP_DEFAULT_BROWSER_CHECK_COMPLETE: _
+  APP_DEFAULT_BROWSER_CHECK_COMPLETE: _,
+  APP_UPDATE_CLEAR_BROWSER_DATA_DEFAULTS: _
 }
 
 module.exports = mapValuesByKeys(AppConstants)
diff --git a/js/stores/appStore.js b/js/stores/appStore.js
index 1dff646f1dc..81c87405136 100644
--- a/js/stores/appStore.js
+++ b/js/stores/appStore.js
@@ -773,6 +773,9 @@ const handleAppAction = (action) => {
     case AppConstants.APP_DEFAULT_BROWSER_CHECK_COMPLETE:
       appState = appState.set('defaultBrowserCheckComplete', {})
       break
+    case AppConstants.APP_UPDATE_CLEAR_BROWSER_DATA_DEFAULTS:
+      appState = appState.set('clearBrowsingDataDefaults', action.defaultValues)
+      break
     case WindowConstants.WINDOW_SET_FAVICON:
       appState = appState.set('sites', siteUtil.updateSiteFavicon(appState.get('sites'), action.frameProps.get('location'), action.favicon))
       appState = aboutNewTabState.updateSiteFavicon(appState, action)