Add the option "Hide sites with less than 1% usage"

Auditor: @bsclifton Fixes #4681 Based on https://github.com/luixxiul/browser-laptop/commit/86c875616085f755e5ced0 421e7bdc9b2b9e601b and #6174, but ported to the 0.12-branch
brave · Dec 14, 2016 · 9bfaff5 · 9bfaff5 · bsclifton · Dec 14, 2016
1 parent 4a86554
commit 9bfaff5
Show file tree

Hide file tree

Showing 7 changed files with 70 additions and 16 deletions.
diff --git a/app/extensions/brave/locales/en-US/preferences.properties b/app/extensions/brave/locales/en-US/preferences.properties
@@ -65,7 +65,8 @@ done=Done
 off=off
 on=on
 ok=Ok
-notifications=Show payment notifications
+minimumPercentage=Hide sites with less than 1% usage
+notifications=Show notifications
 moneyAdd=Use your debit/credit card
 moneyAddSubTitle=No Bitcoin needed!
 outsideUSAPayment=Buy Bitcoin at our recommended source

diff --git a/app/ledger.js b/app/ledger.js
@@ -153,6 +153,10 @@ const doAction = (action) => {
           updatePublisherInfo()
           break
 
+        case settings.MINIMUM_PERCENTAGE:
+          updatePublisherInfo()
+          break
+
         default:
           break
       }
@@ -700,7 +704,7 @@ var updatePublisherInfo = () => {
 }
 
 var synopsisNormalizer = () => {
-  var i, duration, n, pct, publisher, results, total
+  var i, duration, minP, n, pct, publisher, results, total
   var data = []
   var scorekeeper = synopsis.options.scorekeeper
 
@@ -767,16 +771,15 @@ var synopsisNormalizer = () => {
                      .value()
   }
 
+  minP = getSetting(settings.MINIMUM_PERCENTAGE)
   pct = foo(pct, 100)
   total = 0
   for (i = 0; i < n; i++) {
-/*
-    if (pct[i] <= 0) {
+    if (pct[i] < 0) pct[i] = 0
+    if ((minP) && (pct[i] < 1)) {
       data = data.slice(0, i)
       break
     }
- */
-    if (pct[i] < 0) pct[i] = 0
 
     data[i].percentage = pct[i]
     total += pct[i]

diff --git a/js/about/preferences.js b/js/about/preferences.js
@@ -1017,11 +1017,18 @@ class PaymentsTab extends ImmutableComponent {
         </div>
         <div className='settingsPanelDivider'>
           {this.enabled
-            ? <SettingCheckbox
-              dataL10nId='notifications'
-              prefKey={settings.PAYMENTS_NOTIFICATIONS}
-              settings={this.props.settings}
-              onChangeSetting={this.props.onChangeSetting} />
+            ? <SettingsList>
+              <SettingCheckbox
+                dataL10nId='minimumPercentage'
+                prefKey={settings.MINIMUM_PERCENTAGE}
+                settings={this.props.settings}
+                onChangeSetting={this.props.onChangeSetting} />
+              <SettingCheckbox
+                dataL10nId='notifications'
+                prefKey={settings.PAYMENTS_NOTIFICATIONS}
+                settings={this.props.settings}
+                onChangeSetting={this.props.onChangeSetting} />
+            </SettingsList>
             : null}
         </div>
       </div>

diff --git a/js/constants/appConfig.js b/js/constants/appConfig.js
@@ -144,6 +144,7 @@ module.exports = {
     'advanced.send-usage-statistics': false,
     'advanced.minimum-visit-time': 8,
     'advanced.minimum-visits': 5,
+    'advanced.minimum-percentage': false,
     'shutdown.clear-history': false,
     'shutdown.clear-downloads': false,
     'shutdown.clear-cache': false,

diff --git a/js/constants/settings.js b/js/constants/settings.js
@@ -60,6 +60,7 @@ const settings = {
   ADBLOCK_CUSTOM_RULES: 'adblock.customRules',
   MINIMUM_VISIT_TIME: 'advanced.minimum-visit-time',
   MINIMUM_VISITS: 'advanced.minimum-visits',
+  MINIMUM_PERCENTAGE: 'advanced.minimum-percentage',
 
   // DEPRECATED settings
   // ########################

diff --git a/less/about/preferences.less b/less/about/preferences.less
@@ -828,12 +828,53 @@ div.nextPaymentSubmission {
     padding: 20px;
 
     &.advancedSettings {
-      padding-left: 50px;
-      padding-right: 50px;
-
-      select {
+      display: flex;
+      flex-wrap: nowrap;
+      .settingsPanelDivider {
         width: 100%;
       }
+
+      .settingsPanelDivider:nth-child(1) {
+        .settingsListContainer:last-child {
+          margin-bottom: 0;
+        }
+      }
+
+      .settingsPanelDivider:nth-child(2) {
+        display: flex;
+        align-items: center;
+        width: auto;
+        margin-left: 1em;
+
+         .settingsListContainer:last-child {
+           margin-bottom: 0;
+
+          .settingsList {
+            display: flex;
+            flex-flow: column nowrap;
+            justify-content: space-between;
+
+            .settingItem {
+              display: flex;
+              margin-bottom: 1em;
+
+              &:last-child {
+                margin-bottom: 0;
+              }
+
+              label {
+                margin-bottom: 0;
+              }
+
+              .switchControl {
+                margin-top: 2px;
+                padding-top: 0;
+                padding-bottom: 0;
+              }
+            }
+          }
+        }
+      }
     }
 
     .settingsPanelDivider {

diff --git a/package.json b/package.json
@@ -92,7 +92,7 @@
     "immutablepatch": "brave/immutable-js-patch",
     "keytar": "^3.0.0",
     "l20n": "^3.5.1",
-    "ledger-balance": "^0.8.62",
+    "ledger-balance": "^0.8.63",
     "ledger-client": "^0.8.94",
     "ledger-geoip": "^0.8.73",
     "ledger-publisher": "^0.8.91",