Algorithem adjustments, remove tab index for links

brave · Mar 25, 2017 · 863d582 · 863d582
1 parent a404201
commit 863d582
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 29 deletions.
diff --git a/app/ledger.js b/app/ledger.js
@@ -212,7 +212,7 @@ const doAction = (action) => {
       } else if (action.key === 'ledgerPinPercentage') {
         if (!synopsis.publishers[publisher]) break
         synopsis.publishers[publisher].pinPercentage = action.value
-        updatePublisherInfo()
+        updatePublisherInfo(publisher)
       }
       break
 
@@ -940,7 +940,7 @@ var publisherInfo = {
   }
 }
 
-var updatePublisherInfo = () => {
+var updatePublisherInfo = (changedPublisher) => {
   var data = {}
   var then = underscore.now() - msecs.week
 
@@ -961,7 +961,7 @@ var updatePublisherInfo = () => {
   atomicWriter(pathName(synopsisPath), synopsis, () => {})
   if (!publisherInfo._internal.enabled) return
 
-  publisherInfo.synopsis = synopsisNormalizer()
+  publisherInfo.synopsis = synopsisNormalizer(changedPublisher)
   publisherInfo.synopsisOptions = synopsis.options
 
   if (publisherInfo._internal.debugP) {
@@ -1021,7 +1021,7 @@ var contributeP = (publisher) => {
           (!blockedP(publisher)))
 }
 
-var synopsisNormalizer = () => {
+var synopsisNormalizer = (changedPublisher) => {
   // courtesy of https://stackoverflow.com/questions/13483430/how-to-make-rounded-percentages-add-up-to-100#13485888
   const roundToTarget = (l, target, property) => {
     let off = target - underscore.reduce(l, (acc, x) => { return acc + Math.round(x[property]) }, 0)
@@ -1033,11 +1033,19 @@ var synopsisNormalizer = () => {
       })
   }
 
-  const normalizePinned = (dataPinned, total, target) => dataPinned.map((publisher) => {
-    const floatNumber = (publisher.pinPercentage / total) * target
-    let newPer = Math.floor(floatNumber)
-    if (newPer < 1) {
+  const normalizePinned = (dataPinned, total, target, setOne) => dataPinned.map((publisher) => {
+    let newPer
+    let floatNumber
+
+    if (setOne) {
       newPer = 1
+      floatNumber = 1
+    } else {
+      floatNumber = (publisher.pinPercentage / total) * target
+      newPer = Math.floor(floatNumber)
+      if (newPer < 1) {
+        newPer = 1
+      }
     }
 
     publisher.weight = floatNumber
@@ -1118,14 +1126,28 @@ var synopsisNormalizer = () => {
 
   // round if over 100% of pinned publishers
   if (pinnedTotal > 100) {
-    dataPinned = roundToTarget(normalizePinned(dataPinned, pinnedTotal, 100), 100, 'pinPercentage')
+    const changedObject = dataPinned.filter(publisher => publisher.site === changedPublisher)[0]
+    const setOne = changedObject.pinPercentage > (100 - dataPinned.length - 1)
+
+    if (setOne) {
+      changedObject.pinPercentage = 100 - dataPinned.length + 1
+      changedObject.weight = changedObject.pinPercentage
+    }
+
+    const pinnedRestTotal = pinnedTotal - changedObject.pinPercentage
+    dataPinned = dataPinned.filter(publisher => publisher.site !== changedPublisher)
+    dataPinned = normalizePinned(dataPinned, pinnedRestTotal, (100 - changedObject.pinPercentage), setOne)
+    dataPinned = roundToTarget(dataPinned, (100 - changedObject.pinPercentage), 'pinPercentage')
+
     dataUnPinned = dataUnPinned.map((result) => {
       let publisher = getPublisherData(result)
       publisher.percentage = 0
       publisher.weight = 0
       return publisher
     })
 
+    dataPinned.push(changedObject)
+
     // sync app store
     appActions.changeLedgerPinnedPercentages(dataPinned)
   } else {

diff --git a/app/renderer/components/preferences/payment/ledgerTable.js b/app/renderer/components/preferences/payment/ledgerTable.js
@@ -165,7 +165,7 @@ class LedgerTable extends ImmutableComponent {
       },
       {
         html: <div>
-          <a className={css(styles.siteData)} href={publisherURL} target='_blank'>
+          <a className={css(styles.siteData)} href={publisherURL} target='_blank' tabIndex={-1}>
             {
               faviconURL
                 ? <img className={css(styles.favicon)} src={faviconURL} alt={site} />

diff --git a/app/renderer/components/preferences/payment/pinnedInput.js b/app/renderer/components/preferences/payment/pinnedInput.js
@@ -34,6 +34,7 @@ class PinnedInput extends ImmutableComponent {
     }
 
     aboutActions.changeSiteSetting(hostPattern, 'ledgerPinPercentage', value)
+    this.forceUpdate()
   }
   render () {
     return <input type='text'

diff --git a/js/components/sortableTable.js b/js/components/sortableTable.js
@@ -33,7 +33,7 @@ class SortableTable extends React.Component {
     return this.sortTable
   }
 
-  componentWillUpdate () {
+  componentDidUpdate () {
     this.sortTable.refresh()
   }
   /**

diff --git a/test/about/ledgerTableTest.js b/test/about/ledgerTableTest.js
@@ -215,16 +215,11 @@ describe('Ledger table', function () {
         .click(`${secondTableThirdRow} [data-test-pinned="false"]`)
         .waitForElementCount(`${firstTable} tr`, 3)
         .click(`${firstTableFirstRow} [data-test-id="pinnedInput"]`)
-        .keys([Brave.keys.DELETE, Brave.keys.DELETE, '40'])
-        .waitForInputText(`${firstTableFirstRow} [data-test-id="pinnedInput"]`, '40')
+        .keys([Brave.keys.DELETE, Brave.keys.DELETE, '40', Brave.keys.ENTER])
         .click(`${firstTableSecondRow} [data-test-id="pinnedInput"]`)
-        .pause(100)
-        .keys([Brave.keys.DELETE, Brave.keys.DELETE, '30'])
-        .waitForInputText(`${firstTableSecondRow} [data-test-id="pinnedInput"]`, '30')
+        .keys([Brave.keys.DELETE, Brave.keys.DELETE, '30', Brave.keys.ENTER])
         .click(`${firstTableThirdRow} [data-test-id="pinnedInput"]`)
-        .pause(100)
         .keys([Brave.keys.DELETE, Brave.keys.DELETE, '20', Brave.keys.ENTER])
-        .waitForInputText(`${firstTableThirdRow} [data-test-id="pinnedInput"]`, '20')
         .waitForTextValue(`${secondTableForthRow} [data-test-id="percentageValue"]`, '10')
     })
 
@@ -238,22 +233,16 @@ describe('Ledger table', function () {
         .click(`${secondTableThirdRow} [data-test-pinned="false"]`)
         .waitForElementCount(`${firstTable} tr`, 3)
         .click(`${firstTableFirstRow} [data-test-id="pinnedInput"]`)
-        .keys([Brave.keys.DELETE, Brave.keys.DELETE, '40'])
-        .waitForInputText(`${firstTableFirstRow} [data-test-id="pinnedInput"]`, '40')
+        .keys([Brave.keys.DELETE, Brave.keys.DELETE, '40', Brave.keys.ENTER])
         .click(`${firstTableSecondRow} [data-test-id="pinnedInput"]`)
-        .pause(100)
-        .keys([Brave.keys.DELETE, Brave.keys.DELETE, '30'])
-        .waitForInputText(`${firstTableSecondRow} [data-test-id="pinnedInput"]`, '30')
+        .keys([Brave.keys.DELETE, Brave.keys.DELETE, '30', Brave.keys.ENTER])
         .click(`${firstTableThirdRow} [data-test-id="pinnedInput"]`)
-        .pause(100)
         .keys([Brave.keys.DELETE, Brave.keys.DELETE, '20', Brave.keys.ENTER])
-        .waitForInputText(`${firstTableThirdRow} [data-test-id="pinnedInput"]`, '20')
         .click(`${firstTableThirdRow} [data-test-id="pinnedInput"]`)
-        .pause(100)
         .keys([Brave.keys.DELETE, Brave.keys.DELETE, '150', Brave.keys.ENTER])
-        .waitForInputText(`${firstTableFirstRow} [data-test-id="pinnedInput"]`, '19')
-        .waitForInputText(`${firstTableSecondRow} [data-test-id="pinnedInput"]`, '13')
-        .waitForInputText(`${firstTableThirdRow} [data-test-id="pinnedInput"]`, '68')
+        .waitForInputText(`${firstTableFirstRow} [data-test-id="pinnedInput"]`, '1')
+        .waitForInputText(`${firstTableSecondRow} [data-test-id="pinnedInput"]`, '1')
+        .waitForInputText(`${firstTableThirdRow} [data-test-id="pinnedInput"]`, '98')
         .waitForTextValue(`${secondTableForthRow} [data-test-id="percentageValue"]`, '0')
     })
   })