From 214d4e8e423bc968781efbcee55d15e5bed45998 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Mon, 3 Feb 2020 10:57:53 +0100
Subject: [PATCH 01/25] Remove deprecated option in settings

---
 www/settings/inner.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/www/settings/inner.js b/www/settings/inner.js
index 3279bd89b..385c35cb4 100644
--- a/www/settings/inner.js
+++ b/www/settings/inner.js
@@ -73,7 +73,7 @@ define([
             'cp-settings-thumbnails',
             'cp-settings-drive-backup',
             'cp-settings-drive-import-local',
-            'cp-settings-drive-reset'
+            //'cp-settings-drive-reset'
         ],
         'cursor': [
             'cp-settings-cursor-color',
@@ -1197,6 +1197,7 @@ define([
         return $div;
     };
 
+    /*
     create['drive-reset'] = function () {
         var $div = $('<div>', {'class': 'cp-settings-drive-reset cp-sidebarlayout-element'});
         $('<label>').text(Messages.settings_resetNewTitle).appendTo($div);
@@ -1220,6 +1221,7 @@ define([
 
         return $div;
     };
+    */
 
     // Cursor settings
 

From 19c329f6e71cc939f26b3c026a51e9cd45d1b67f Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Mon, 3 Feb 2020 10:58:38 +0100
Subject: [PATCH 02/25] Trim history option in settings (UI only)

---
 customize.dist/src/less2/include/buttons.less |  9 +++++
 www/common/common-ui-elements.js              |  7 ++++
 www/common/common-util.js                     |  1 +
 www/common/sframe-common-file.js              |  9 +----
 www/settings/inner.js                         | 35 +++++++++++++++++++
 5 files changed, 53 insertions(+), 8 deletions(-)

diff --git a/customize.dist/src/less2/include/buttons.less b/customize.dist/src/less2/include/buttons.less
index ad6aaf9cc..a907d2a0b 100644
--- a/customize.dist/src/less2/include/buttons.less
+++ b/customize.dist/src/less2/include/buttons.less
@@ -85,6 +85,7 @@
             white-space: normal;
             font-weight: bold;
         }
+
         &.danger, &.btn-danger {
             background-color: @colortheme_alertify-red;
             border-color: @colortheme_alertify-red-border;
@@ -94,6 +95,14 @@
             }
         }
 
+        &.danger-alt, &.btn-danger-alt {
+            border-color: @colortheme_alertify-red;
+            color: @colortheme_alertify-red;
+            &:hover, &:active {
+                background-color: lighten(@colortheme_alertify-red, 35%);
+            }
+        }
+
         &.safe, &.btn-safe {
             background-color: @colortheme_alertify-green;
             border-color: @colortheme_alertify-green-border;
diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index b5e5aa90a..af1b4f679 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -30,6 +30,13 @@ define([
         });
     }
 
+    UIElements.prettySize = function (bytes) {
+        var kB = Util.bytesToKilobytes(bytes);
+        if (kB < 1024) { return kB + Messages.KB; }
+        var mB = Util.bytesToMegabytes(bytes);
+        return mB + Messages.MB;
+    };
+
     UIElements.updateTags = function (common, href) {
         var existing, tags;
         NThen(function(waitFor) {
diff --git a/www/common/common-util.js b/www/common/common-util.js
index da83b5960..e3ca9d007 100644
--- a/www/common/common-util.js
+++ b/www/common/common-util.js
@@ -224,6 +224,7 @@
         else if (bytes >= oneMegabyte) { return 'MB'; }
     };
 
+
     // given a path, asynchronously return an arraybuffer
     Util.fetch = function (src, cb, progress) {
         var CB = Util.once(cb);
diff --git a/www/common/sframe-common-file.js b/www/common/sframe-common-file.js
index c7ca340a6..c1d0b74c0 100644
--- a/www/common/sframe-common-file.js
+++ b/www/common/sframe-common-file.js
@@ -182,13 +182,6 @@ define([
             }
         };
 
-        var prettySize = function (bytes) {
-            var kB = Util.bytesToKilobytes(bytes);
-            if (kB < 1024) { return kB + Messages.KB; }
-            var mB = Util.bytesToMegabytes(bytes);
-            return mB + Messages.MB;
-        };
-
         queue.next = function () {
             if (queue.queue.length === 0) {
                 clearTimeout(queue.to);
@@ -251,7 +244,7 @@ define([
             // name
             $('<td>').append($link).appendTo($tr);
             // size
-            $('<td>').text(prettySize(estimate)).appendTo($tr);
+            $('<td>').text(UIElements.prettySize(estimate)).appendTo($tr);
             // progress
             $('<td>', {'class': 'cp-fileupload-table-progress'}).append($progressContainer).appendTo($tr);
             // cancel
diff --git a/www/settings/inner.js b/www/settings/inner.js
index 385c35cb4..31b62220c 100644
--- a/www/settings/inner.js
+++ b/www/settings/inner.js
@@ -73,6 +73,7 @@ define([
             'cp-settings-thumbnails',
             'cp-settings-drive-backup',
             'cp-settings-drive-import-local',
+            'cp-settings-trim-history'
             //'cp-settings-drive-reset'
         ],
         'cursor': [
@@ -1197,6 +1198,40 @@ define([
         return $div;
     };
 
+    makeBlock('trim-history', function (cb) {
+        // XXX settings_trimHistoryTitle, settings_trimHistoryHint, settings_trimHistoryButton
+        // XXX trimHistory_confirm
+
+        var spinner = UI.makeSpinner();
+        var button = h('button.btn.btn-danger-alt', {
+            disabled: 'disabled'
+        }, Messages.trimHistoryButton || 'test'); // XXX
+        var currentSize = h('p', $(spinner.spinner).clone()[0]);
+        var content = h('div', [
+            currentSize,
+            button,
+            spinner.ok,
+            spinner.spinner
+        ]);
+
+        Messages.trimHistory_currentSize = 'Abcd: <b>{0}</b>'; // XXX
+
+        var size;
+        nThen(function (waitFor) {
+            size = UIElements.prettySize(1024*12); // XXX get size
+        }).nThen(function () {
+            $(currentSize).html(Messages._getKey('trimHistory_currentSize', [size]));
+            $(button).click(function () {
+                UI.confirm(Messages.trimHistory_confirm, function (yes) {
+                    if (!yes) { return; }
+                    spinner.spin();
+                });
+            }).prop('disabled', '');
+        });
+
+        cb(content);
+    }, true);
+
     /*
     create['drive-reset'] = function () {
         var $div = $('<div>', {'class': 'cp-settings-drive-reset cp-sidebarlayout-element'});

From b28f262c86877c42fe774ca75e9437cadc0333fc Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Mon, 3 Feb 2020 12:04:01 +0100
Subject: [PATCH 03/25] History trimming placeholder

---
 www/common/outer/async-store.js |  28 +++---
 www/common/outer/history.js     | 155 ++++++++++++++++++++++++++++++++
 2 files changed, 165 insertions(+), 18 deletions(-)
 create mode 100644 www/common/outer/history.js

diff --git a/www/common/outer/async-store.js b/www/common/outer/async-store.js
index 51c04066f..580cae7e9 100644
--- a/www/common/outer/async-store.js
+++ b/www/common/outer/async-store.js
@@ -17,6 +17,7 @@ define([
     '/common/outer/profile.js',
     '/common/outer/team.js',
     '/common/outer/messenger.js',
+    '/common/outer/history.js',
     '/common/outer/network-config.js',
     '/customize/application_config.js',
 
@@ -28,7 +29,7 @@ define([
     '/bower_components/saferphore/index.js',
 ], function (Sortify, UserObject, ProxyManager, Migrate, Hash, Util, Constants, Feedback,
              Realtime, Messaging, Pinpad,
-             SF, Cursor, OnlyOffice, Mailbox, Profile, Team, Messenger,
+             SF, Cursor, OnlyOffice, Mailbox, Profile, Team, Messenger, History,
              NetConfig, AppConfig,
              Crypto, ChainPad, CpNetflux, Listmap, nThen, Saferphore) {
 
@@ -39,8 +40,6 @@ define([
         var sendDriveEvent = function () {};
         var registerProxyEvents = function () {};
 
-        var storeHash, storeChannel;
-
         var store = window.CryptPad_AsyncStore = {
             modules: {}
         };
@@ -149,13 +148,7 @@ define([
         };
 
         var getUserChannelList = function () {
-            // start with your userHash...
-            var userHash = storeHash;
-            if (!userHash) { return null; }
-
-            // No password for drive
-            var secret = Hash.getSecrets('drive', userHash);
-            var userChannel = secret.channel;
+            var userChannel = store.driveChannel;
             if (!userChannel) { return null; }
 
             // Get the list of pads' channel ID in your drive
@@ -304,7 +297,7 @@ define([
                 teamId = data.teamId;
             }
 
-            if (channel === storeChannel && !force) {
+            if (channel === store.driveChannel && !force) {
                 return void cb({error: 'User drive removal blocked!'});
             }
 
@@ -703,11 +696,9 @@ define([
 
         Store.deleteAccount = function (clientId, data, cb) {
             var edPublic = store.proxy.edPublic;
-            // No password for drive
-            var secret = Hash.getSecrets('drive', storeHash);
             Store.anonRpcMsg(clientId, {
                 msg: 'GET_METADATA',
-                data: secret.channel
+                data: store.driveChannel
             }, function (data) {
                 var metadata = data[0];
                 // Owned drive
@@ -727,7 +718,7 @@ define([
                     }).nThen(function (waitFor) {
                         // Delete Drive
                         Store.removeOwnedChannel(clientId, {
-                            channel: secret.channel,
+                            channel: store.driveChannel,
                             force: true
                         }, waitFor());
                     }).nThen(function () {
@@ -743,7 +734,7 @@ define([
                 var toSign = {
                     intent: 'Please delete my account.'
                 };
-                toSign.drive = secret.channel;
+                toSign.drive = store.driveChannel;
                 toSign.edPublic = edPublic;
                 var signKey = Crypto.Nacl.util.decodeBase64(store.proxy.edPrivate);
                 var proof = Crypto.Nacl.sign.detached(Crypto.Nacl.util.decodeUTF8(Sortify(toSign)), signKey);
@@ -2073,6 +2064,7 @@ define([
                 store.mailbox.removeClient(clientId);
             } catch (e) { console.error(e); }
             Object.keys(store.modules).forEach(function (key) {
+                if (!store.modules[key].removeClient) { return; }
                 try {
                     store.modules[key].removeClient(clientId);
                 } catch (e) { console.error(e); }
@@ -2334,6 +2326,7 @@ define([
                 store.messenger = store.modules['messenger'];
                 loadUniversal(Profile, 'profile', waitFor);
                 loadUniversal(Team, 'team', waitFor);
+                loadUniversal(History, 'history', waitFor);
                 cleanFriendRequests();
             }).nThen(function () {
                 var requestLogin = function () {
@@ -2435,13 +2428,12 @@ define([
 
         var connect = function (clientId, data, cb) {
             var hash = data.userHash || data.anonHash || Hash.createRandomHash('drive');
-            storeHash = hash;
             if (!hash) {
                 return void cb({error: '[Store.init] Unable to find or create a drive hash. Aborting...'});
             }
             // No password for drive
             var secret = Hash.getSecrets('drive', hash);
-            storeChannel = secret.channel;
+            store.driveChannel = secret.channel;
             var listmapConfig = {
                 data: {},
                 websocketURL: NetConfig.getWebsocketURL(),
diff --git a/www/common/outer/history.js b/www/common/outer/history.js
new file mode 100644
index 000000000..59b3d1021
--- /dev/null
+++ b/www/common/outer/history.js
@@ -0,0 +1,155 @@
+define([
+    '/common/common-util.js',
+    '/common/common-hash.js',
+    '/common/userObject.js',
+    '/bower_components/nthen/index.js',
+], function (Util, Hash, UserObject, nThen) {
+    var History = {};
+    var commands = {};
+
+    var getAccountChannels = function (ctx) {
+        var channels = [];
+        var edPublic = Util.find(ctx.store, ['proxy', 'edPublic']);
+
+        // Drive
+        channels.push(ctx.store.driveChannel);
+
+        // Profile
+        var profile = ctx.store.proxy.profile;
+        if (profile) {
+            var profileChan = profile.edit ? Hash.hrefToHexChannelId('/profile/#' + profile.edit, null) : null;
+            if (profileChan) { channels.push(profileChan); }
+        }
+
+        // Mailboxes
+        var mailboxes = ctx.store.proxy.mailboxes;
+        if (mailboxes) {
+            var mList = Object.keys(mailboxes).map(function (m) {
+                return {
+                    lastKnownHash: mailboxes[m].lastKnownHash,
+                    channel: mailboxes[m].channel
+                };
+            });
+            Array.prototype.push.apply(channels, mList);
+        }
+
+        // Shared folders owned by me
+        var sf = ctx.store.proxy[UserObject.SHARED_FOLDERS];
+        if (sf) {
+            console.log(sf);
+            var sfChannels = Object.keys(sf).map(function (fId) {
+                var data = sf[fId];
+                if (!data || !data.owners) { return; }
+                var isOwner = Array.isArray(data.owners) && data.owners.indexOf(edPublic) !== -1;
+                if (!isOwner) { return; }
+                return data.channel;
+            }).filter(Boolean);
+            console.log(sfChannels);
+            Array.prototype.push.apply(channels, sfChannels);
+        }
+
+        return channels;
+    };
+
+    commands.GET_HISTORY_SIZE = function (ctx, data, cId, cb) {
+        if (!ctx.store.loggedIn || !ctx.store.rpc) { return void cb({ error: 'INSUFFICIENT_PERMISSIONS' }); }
+        var channels = data.channels;
+        if (!Array.isArray(channels)) { return void cb({ error: 'EINVAL' }); }
+
+        // If account trim history, get the correct channels here
+        if (data.account) {
+            channels = getAccountChannels(ctx);
+        }
+
+        var size = 0;
+        var warning = false;
+        nThen(function (waitFor) {
+            // TODO: check if owner first?
+            channels.forEach(function (chan) {
+                size += Math.floor(Math.random()*1000) * 1024; // XXX
+                /*
+                var channel = chan;
+                var lastKnownHash;
+                if (typeof (chan) === "object" && chan.channel) {
+                    channel = chan.channel;
+                    lastKnownHash = chan.lastKnownHash;
+                }
+                ctx.store.rpc.getHistorySize({
+                    channel: channel,
+                    lastKnownHash: lastKnownHash
+                }, waitFor(function (err, value) {
+                    if (err) {
+                        warning = true;
+                        return;
+                    }
+                    size += value;
+                }));
+                */ // XXX TODO
+            });
+        }).nThen(function () {
+            cb({
+                warning: warning,
+                size: size
+            });
+        });
+    };
+
+    commands.TRIM_HISTORY = function (ctx, data, cId, cb) {
+        if (!ctx.store.loggedIn || !ctx.store.rpc) { return void cb({ error: 'INSUFFICIENT_PERMISSIONS' }); }
+        var channels = data.channels;
+        if (!Array.isArray(channels)) { return void cb({ error: 'EINVAL' }); }
+
+        // If account trim history, get the correct channels here
+        if (data.account) {
+            channels = getAccountChannels(ctx);
+        }
+
+        var warning = false;
+        nThen(function (waitFor) {
+            channels.forEach(function (chan) {
+                /*
+                ctx.store.rpc.trimHistory(chan, waitFor(function (err) {
+                    if (err) {
+                        warning = err;
+                        return;
+                    }
+                }));
+                */ // XXX TODO
+            });
+        }).nThen(function () {
+            if (channels.length === 1 && warning) {
+                return void cb({error: err});
+            }
+            cb({ warning: warning });
+        });
+    };
+
+    History.init = function (cfg, waitFor, emit) {
+        var history = {};
+        if (!cfg.store) { return; }
+        var ctx = {
+            store: cfg.store,
+            Store: cfg.Store,
+            pinPads: cfg.pinPads,
+            updateMetadata: cfg.updateMetadata,
+            emit: emit,
+        };
+
+        history.execCommand = function (clientId, obj, cb) {
+            var cmd = obj.cmd;
+            var data = obj.data;
+            try {
+                commands[cmd](ctx, data, clientId, cb);
+            } catch (e) {
+                console.error(e);
+            }
+        };
+
+        return history;
+    };
+
+    return History;
+});
+
+
+

From 53f19920f0c247626e6da2d6d3d9ea6e5b472ffb Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Mon, 3 Feb 2020 12:04:33 +0100
Subject: [PATCH 04/25] History trimming in settings

---
 www/settings/inner.js | 36 ++++++++++++++++++++++++++++++++----
 1 file changed, 32 insertions(+), 4 deletions(-)

diff --git a/www/settings/inner.js b/www/settings/inner.js
index 31b62220c..49fba02d9 100644
--- a/www/settings/inner.js
+++ b/www/settings/inner.js
@@ -1199,7 +1199,8 @@ define([
     };
 
     makeBlock('trim-history', function (cb) {
-        // XXX settings_trimHistoryTitle, settings_trimHistoryHint, settings_trimHistoryButton
+        if (!common.isLoggedIn()) { return; }
+        // XXX settings_trimHistoryTitle, settings_trimHistoryHint, settings_trimHistoryButton, settings_trimHistoryError
         // XXX trimHistory_confirm
 
         var spinner = UI.makeSpinner();
@@ -1214,17 +1215,42 @@ define([
             spinner.spinner
         ]);
 
-        Messages.trimHistory_currentSize = 'Abcd: <b>{0}</b>'; // XXX
+        Messages.trimHistory_currentSize = 'Size XXX: <b>{0}</b>'; // XXX
 
+        var $button = $(button);
         var size;
         nThen(function (waitFor) {
-            size = UIElements.prettySize(1024*12); // XXX get size
+            APP.history.execCommand('GET_HISTORY_SIZE', {
+                account: true,
+                channels: []
+            }, waitFor(function (obj) {
+                if (obj && obj.error) {
+                    waitFor.abort();
+                    var error = h('div.alert.alert-danger', Messages.settings_trimHistoryError || 'error'); // XXX
+                    $(content).empty().append(error);
+                    return;
+                }
+                size = UIElements.prettySize(Number(obj.size));
+            }));
         }).nThen(function () {
             $(currentSize).html(Messages._getKey('trimHistory_currentSize', [size]));
-            $(button).click(function () {
+            $button.click(function () {
                 UI.confirm(Messages.trimHistory_confirm, function (yes) {
                     if (!yes) { return; }
+
+                    $button.remove();
                     spinner.spin();
+                    APP.history.execCommand('TRIM_HISTORY', {
+                        account: true,
+                        channels: []
+                    }, function (obj) {
+                        if (obj && obj.error) {
+                            // XXX what are the possible errors?
+                            return;
+                        }
+                        spinner.hide();
+                        $(content).append(h('div.alert.alert-success', Messages.settings_trimHistorySuccess || 'ok')); // XXX
+                    });
                 });
             }).prop('disabled', '');
         });
@@ -1716,6 +1742,7 @@ define([
         };
         APP.toolbar = Toolbar.create(configTb);
         APP.toolbar.$rightside.hide();
+        APP.history = common.makeUniversal('history');
 
         // Content
         var $rightside = APP.$rightside;
@@ -1734,6 +1761,7 @@ define([
             categories[cat].forEach(addItem);
         }
 
+
         // TODO RPC
         //obj.proxy.on('change', [], refresh);
         //obj.proxy.on('remove', [], refresh);

From 5ead391706db3843b2c9a8d61fca217ce6e0ab90 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Mon, 3 Feb 2020 12:21:12 +0100
Subject: [PATCH 05/25] Add comments and improve trim history warnings

---
 www/common/outer/history.js | 25 +++++++++++++++++--------
 www/settings/inner.js       | 12 ++++++++----
 2 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/www/common/outer/history.js b/www/common/outer/history.js
index 59b3d1021..5294fa170 100644
--- a/www/common/outer/history.js
+++ b/www/common/outer/history.js
@@ -12,7 +12,10 @@ define([
         var edPublic = Util.find(ctx.store, ['proxy', 'edPublic']);
 
         // Drive
-        channels.push(ctx.store.driveChannel);
+        var driveOwned = (Util.find(ctx.store, ['driveMetadata', 'owners']) || []).indexOf(edpublic) !== -1;
+        if (driveOwned) {
+            channels.push(ctx.store.driveChannel);
+        }
 
         // Profile
         var profile = ctx.store.proxy.profile;
@@ -56,13 +59,14 @@ define([
         var channels = data.channels;
         if (!Array.isArray(channels)) { return void cb({ error: 'EINVAL' }); }
 
+        var warning = [];
+
         // If account trim history, get the correct channels here
         if (data.account) {
             channels = getAccountChannels(ctx);
         }
 
         var size = 0;
-        var warning = false;
         nThen(function (waitFor) {
             // TODO: check if owner first?
             channels.forEach(function (chan) {
@@ -79,7 +83,7 @@ define([
                     lastKnownHash: lastKnownHash
                 }, waitFor(function (err, value) {
                     if (err) {
-                        warning = true;
+                        warning.push(err);
                         return;
                     }
                     size += value;
@@ -88,7 +92,7 @@ define([
             });
         }).nThen(function () {
             cb({
-                warning: warning,
+                warning: warning.length ? warning : undefined,
                 size: size
             });
         });
@@ -99,28 +103,33 @@ define([
         var channels = data.channels;
         if (!Array.isArray(channels)) { return void cb({ error: 'EINVAL' }); }
 
+        var warning = [];
+
         // If account trim history, get the correct channels here
         if (data.account) {
             channels = getAccountChannels(ctx);
         }
 
-        var warning = false;
         nThen(function (waitFor) {
             channels.forEach(function (chan) {
                 /*
                 ctx.store.rpc.trimHistory(chan, waitFor(function (err) {
                     if (err) {
-                        warning = err;
+                        chanWarning = true;
+                        warning.push(err);
                         return;
                     }
                 }));
                 */ // XXX TODO
             });
         }).nThen(function () {
-            if (channels.length === 1 && warning) {
+            // Only one channel and warning: error
+            if (channels.length === 1 && warning.length) {
                 return void cb({error: err});
             }
-            cb({ warning: warning });
+            cb({
+                warning: warning.length ? warning : undefined
+            });
         });
     };
 
diff --git a/www/settings/inner.js b/www/settings/inner.js
index 49fba02d9..9c6ccd36f 100644
--- a/www/settings/inner.js
+++ b/www/settings/inner.js
@@ -1200,8 +1200,10 @@ define([
 
     makeBlock('trim-history', function (cb) {
         if (!common.isLoggedIn()) { return; }
-        // XXX settings_trimHistoryTitle, settings_trimHistoryHint, settings_trimHistoryButton, settings_trimHistoryError
-        // XXX trimHistory_confirm
+        // XXX settings_trimHistoryTitle, settings_trimHistoryHint, settings_trimHistoryButton, trimHistoryError
+        // XXX trimHistorySuccess, trimHistory_confirm
+
+        if (!privateData.isDriveOwned) { return; } // XXX
 
         var spinner = UI.makeSpinner();
         var button = h('button.btn.btn-danger-alt', {
@@ -1226,8 +1228,9 @@ define([
             }, waitFor(function (obj) {
                 if (obj && obj.error) {
                     waitFor.abort();
-                    var error = h('div.alert.alert-danger', Messages.settings_trimHistoryError || 'error'); // XXX
+                    var error = h('div.alert.alert-danger', Messages.trimHistoryError || 'error'); // XXX
                     $(content).empty().append(error);
+                    // TODO: obj.warning?
                     return;
                 }
                 size = UIElements.prettySize(Number(obj.size));
@@ -1248,8 +1251,9 @@ define([
                             // XXX what are the possible errors?
                             return;
                         }
+                        // TODO: obj.warning?
                         spinner.hide();
-                        $(content).append(h('div.alert.alert-success', Messages.settings_trimHistorySuccess || 'ok')); // XXX
+                        $(content).append(h('div.alert.alert-success', Messages.trimHistorySuccess || 'ok')); // XXX
                     });
                 });
             }).prop('disabled', '');

From 4ac2f64726df9de91ab060b8ab1e55e465b427e9 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Mon, 3 Feb 2020 17:38:15 +0100
Subject: [PATCH 06/25] Add history trim in the properties modal

---
 .../src/less2/include/modals-ui-elements.less |  36 ++++++
 www/common/common-ui-elements.js              | 104 +++++++++++++++---
 www/common/outer/history.js                   |  21 +++-
 www/settings/inner.js                         |  10 +-
 4 files changed, 149 insertions(+), 22 deletions(-)

diff --git a/customize.dist/src/less2/include/modals-ui-elements.less b/customize.dist/src/less2/include/modals-ui-elements.less
index 3e6855fbe..e13263d36 100644
--- a/customize.dist/src/less2/include/modals-ui-elements.less
+++ b/customize.dist/src/less2/include/modals-ui-elements.less
@@ -26,6 +26,42 @@
     // Properties modal
     .cp-app-prop {
         margin-bottom: 10px;
+        .cp-app-prop-size-container {
+            height: 20px;
+            background-color: @colortheme_logo-2;
+            margin: 10px 0;
+            padding: 0;
+            div {
+                height: 20px;
+                margin: 0;
+                padding: 0;
+                background-color: #CCCCCC;
+            }
+        }
+        .cp-app-prop-size-legend {
+            color: @colortheme_modal-fg;
+            display: flex;
+            margin: 10px 0;
+            & > div {
+                display: flex;
+                align-items: center;
+                flex-basis: 50%;
+                margin: 0;
+                padding: 0;
+            }
+            .cp-app-prop-history-size-color, .cp-app-prop-contents-size-color {
+                display: inline-block;
+                height: 20px;
+                width: 20px;
+                margin-right: 10px;
+            }
+            .cp-app-prop-history-size-color {
+                background-color: #CCCCCC;
+            }
+            .cp-app-prop-contents-size-color {
+                background-color: @colortheme_logo-2;
+            }
+        }
     }
 
     .cp-app-prop-content {
diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index af1b4f679..393a82c11 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -689,6 +689,9 @@ define([
         var $d = $('<div>');
         if (!data) { return void cb(void 0, $d); }
 
+        var priv = common.getMetadataMgr().getPrivateData();
+        var edPublic = priv.edPublic;
+
         if (data.href) {
             $('<label>', {'for': 'cp-app-prop-link'}).text(Messages.editShare).appendTo($d);
             $d.append(UI.dialog.selectable(data.href, {
@@ -715,13 +718,29 @@ define([
             $d.append(h('div.cp-app-prop', [Messages.fm_lastAccess,  h('br'), h('span.cp-app-prop-content', new Date(data.atime).toLocaleString())]));
         }
 
+        var owned = false;
         if (common.isLoggedIn()) {
+            if (Array.isArray(data.owners)) {
+                if (data.owners.indexOf(edPublic) !== -1) {
+                    owned = true;
+                } else {
+                    Object.keys(priv.teams || {}).some(function (id) {
+                        var team = priv.teams[id] || {};
+                        if (team.viewer) { return; }
+                        if (data.owners.indexOf(team.edPublic) === -1) { return; }
+                        owned = id;
+                        return true;
+                    });
+                }
+            }
             // check the size of this file...
             var bytes = 0;
+            var historyBytes;
+            var chan = [data.channel];
+            if (data.rtChannel) { chan.push(data.rtChannel); }
+            if (data.lastVersion) { chan.push(Hash.hrefToHexChannelId(data.lastVersion)); }
+            var history = common.makeUniversal('history');
             NThen(function (waitFor) {
-                var chan = [data.channel];
-                if (data.rtChannel) { chan.push(data.rtChannel); }
-                if (data.lastVersion) { chan.push(Hash.hrefToHexChannelId(data.lastVersion)); }
                 chan.forEach(function (c) {
                     common.getFileSize(c, waitFor(function (e, _bytes) {
                         if (e) {
@@ -731,20 +750,79 @@ define([
                         bytes += _bytes;
                     }));
                 });
+
+                if (!owned) { return; }
+                history.execCommand('GET_HISTORY_SIZE', {
+                    pad: true,
+                    channels: chan.filter(function (c) { return c.length === 32; }),
+                    teamId: typeof(owned) === "number" && owned
+                }, waitFor(function (obj) {
+                    if (obj && obj.error) { return; }
+                    historyBytes = obj.size;
+                }));
             }).nThen(function () {
                 if (bytes === 0) { return void cb(void 0, $d); }
-                var KB = Util.bytesToKilobytes(bytes);
+                var formatted = UIElements.prettySize(bytes);
 
-                var formatted = Messages._getKey('formattedKB', [KB]);
-                $d.append(h('div.cp-app-prop', [Messages.upload_size, h('br'), h('span.cp-app-prop-content', formatted)]));
+                historyBytes = Math.floor(0.2*bytes); // XXX test data
 
-        if (data.sharedFolder && false) {
-            $('<label>', {'for': 'cp-app-prop-channel'}).text('Channel ID').appendTo($d);
-            if (AppConfig.pinBugRecovery) { $d.append(h('p', AppConfig.pinBugRecovery)); }
-            $d.append(UI.dialog.selectable(data.channel, {
-                id: 'cp-app-prop-link',
-            }));
-        }
+                if (!owned || !historyBytes || historyBytes > bytes) {
+                    $d.append(h('div.cp-app-prop', [Messages.upload_size, h('br'), h('span.cp-app-prop-content', formatted)]));
+                    return void cb(void 0, $d);
+                }
+
+                Messages.historyTrim_historySize = 'History: {0}'; // XXX
+                Messages.historyTrim_contentsSize = 'Contents: {0}'; // XXX
+
+                var p = Math.round((historyBytes / bytes) * 100);
+                var historyPrettySize = UIElements.prettySize(historyBytes);
+                var contentsPrettySize = UIElements.prettySize(bytes - historyBytes);
+                var button;
+                var spinner = UI.makeSpinner();
+                var size = h('div.cp-app-prop', [
+                    Messages.upload_size,
+                    h('br'),
+                    h('div.cp-app-prop-size-container', [
+                        h('div.cp-app-prop-size-history', { style: 'width:'+p+'%;' })
+                    ]),
+                    h('div.cp-app-prop-size-legend', [
+                        h('div.cp-app-prop-history-size', [
+                            h('span.cp-app-prop-history-size-color'),
+                            h('span.cp-app-prop-content', Messages._getKey('historyTrim_historySize', [historyPrettySize]))
+                        ]),
+                        h('div.cp-app-prop-contents-size', [
+                            h('span.cp-app-prop-contents-size-color'),
+                            h('span.cp-app-prop-content', Messages._getKey('historyTrim_contentsSize', [contentsPrettySize]))
+                        ]),
+                    ]),
+                    button = h('button.btn.btn-danger-alt.no-margin', Messages.trimHistory_button || 'test'), // XXX
+                    spinner.spinner
+                ]);
+                $d.append(size);
+
+                var $button = $(button);
+                $button.click(function () {
+                    UI.confirm(Messages.trimHistory_confirm, function (yes) {
+                        if (!yes) { return; }
+
+                        $button.remove();
+                        spinner.spin();
+                        history.execCommand('TRIM_HISTORY', {
+                            pad: true,
+                            channels: chan.filter(function (c) { return c.length === 32; }),
+                            teamId: typeof(owned) === "number" && owned
+                        }, function (obj) {
+                            if (obj && obj.error) {
+                                console.error(obj.error);
+                                // XXX what are the possible errors?
+                                return;
+                            }
+                            // TODO: obj.warning?
+                            spinner.hide();
+                            $(size).append(h('div.alert.alert-success', Messages.trimHistory_success || 'ok')); // XXX
+                        });
+                    });
+                });
 
                 cb(void 0, $d);
             });
diff --git a/www/common/outer/history.js b/www/common/outer/history.js
index 5294fa170..09e023251 100644
--- a/www/common/outer/history.js
+++ b/www/common/outer/history.js
@@ -39,7 +39,6 @@ define([
         // Shared folders owned by me
         var sf = ctx.store.proxy[UserObject.SHARED_FOLDERS];
         if (sf) {
-            console.log(sf);
             var sfChannels = Object.keys(sf).map(function (fId) {
                 var data = sf[fId];
                 if (!data || !data.owners) { return; }
@@ -47,18 +46,29 @@ define([
                 if (!isOwner) { return; }
                 return data.channel;
             }).filter(Boolean);
-            console.log(sfChannels);
             Array.prototype.push.apply(channels, sfChannels);
         }
 
         return channels;
     };
 
+    var getRpc = function (ctx, teamId) {
+        if (!teamId) { return ctx.store.rpc; }
+        var teams = ctx.store.modules['team'];
+        if (!teams) { return; }
+        var team = teams.getTeam(teamId);
+        if (!team) { return; }
+        return team.rpc;
+    };
+
     commands.GET_HISTORY_SIZE = function (ctx, data, cId, cb) {
         if (!ctx.store.loggedIn || !ctx.store.rpc) { return void cb({ error: 'INSUFFICIENT_PERMISSIONS' }); }
         var channels = data.channels;
         if (!Array.isArray(channels)) { return void cb({ error: 'EINVAL' }); }
 
+        var rpc = getRpc(ctx, data.teamid);
+        if (!rpc) { return void cb({ error: 'ENORPC'}); }
+
         var warning = [];
 
         // If account trim history, get the correct channels here
@@ -78,7 +88,7 @@ define([
                     channel = chan.channel;
                     lastKnownHash = chan.lastKnownHash;
                 }
-                ctx.store.rpc.getHistorySize({
+                rpc.getHistorySize({
                     channel: channel,
                     lastKnownHash: lastKnownHash
                 }, waitFor(function (err, value) {
@@ -103,6 +113,9 @@ define([
         var channels = data.channels;
         if (!Array.isArray(channels)) { return void cb({ error: 'EINVAL' }); }
 
+        var rpc = getRpc(ctx, data.teamid);
+        if (!rpc) { return void cb({ error: 'ENORPC'}); }
+
         var warning = [];
 
         // If account trim history, get the correct channels here
@@ -113,7 +126,7 @@ define([
         nThen(function (waitFor) {
             channels.forEach(function (chan) {
                 /*
-                ctx.store.rpc.trimHistory(chan, waitFor(function (err) {
+                rpc.trimHistory(chan, waitFor(function (err) {
                     if (err) {
                         chanWarning = true;
                         warning.push(err);
diff --git a/www/settings/inner.js b/www/settings/inner.js
index 9c6ccd36f..9c352390f 100644
--- a/www/settings/inner.js
+++ b/www/settings/inner.js
@@ -1200,15 +1200,15 @@ define([
 
     makeBlock('trim-history', function (cb) {
         if (!common.isLoggedIn()) { return; }
-        // XXX settings_trimHistoryTitle, settings_trimHistoryHint, settings_trimHistoryButton, trimHistoryError
-        // XXX trimHistorySuccess, trimHistory_confirm
+        // XXX settings_trimHistoryTitle, settings_trimHistoryHint, trimHistory_button, trimHistory_error
+        // XXX trimHistory_success, trimHistory_confirm
 
         if (!privateData.isDriveOwned) { return; } // XXX
 
         var spinner = UI.makeSpinner();
         var button = h('button.btn.btn-danger-alt', {
             disabled: 'disabled'
-        }, Messages.trimHistoryButton || 'test'); // XXX
+        }, Messages.trimHistory_button || 'test'); // XXX
         var currentSize = h('p', $(spinner.spinner).clone()[0]);
         var content = h('div', [
             currentSize,
@@ -1228,7 +1228,7 @@ define([
             }, waitFor(function (obj) {
                 if (obj && obj.error) {
                     waitFor.abort();
-                    var error = h('div.alert.alert-danger', Messages.trimHistoryError || 'error'); // XXX
+                    var error = h('div.alert.alert-danger', Messages.trimHistory_error || 'error'); // XXX
                     $(content).empty().append(error);
                     // TODO: obj.warning?
                     return;
@@ -1253,7 +1253,7 @@ define([
                         }
                         // TODO: obj.warning?
                         spinner.hide();
-                        $(content).append(h('div.alert.alert-success', Messages.trimHistorySuccess || 'ok')); // XXX
+                        $(content).append(h('div.alert.alert-success', Messages.trimHistory_success || 'ok')); // XXX
                     });
                 });
             }).prop('disabled', '');

From c58a50081bfee6c4667265447fe1cf3c1330096a Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Mon, 3 Feb 2020 17:40:26 +0100
Subject: [PATCH 07/25] lint compliance

---
 www/common/outer/history.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/www/common/outer/history.js b/www/common/outer/history.js
index 09e023251..5bc77cd35 100644
--- a/www/common/outer/history.js
+++ b/www/common/outer/history.js
@@ -12,7 +12,7 @@ define([
         var edPublic = Util.find(ctx.store, ['proxy', 'edPublic']);
 
         // Drive
-        var driveOwned = (Util.find(ctx.store, ['driveMetadata', 'owners']) || []).indexOf(edpublic) !== -1;
+        var driveOwned = (Util.find(ctx.store, ['driveMetadata', 'owners']) || []).indexOf(edPublic) !== -1;
         if (driveOwned) {
             channels.push(ctx.store.driveChannel);
         }
@@ -81,6 +81,8 @@ define([
             // TODO: check if owner first?
             channels.forEach(function (chan) {
                 size += Math.floor(Math.random()*1000) * 1024; // XXX
+                chan = chan; // XXX
+                waitFor = waitFor; // XXX
                 /*
                 var channel = chan;
                 var lastKnownHash;
@@ -125,6 +127,8 @@ define([
 
         nThen(function (waitFor) {
             channels.forEach(function (chan) {
+                chan = chan; // XXX
+                waitFor = waitFor; // XXX
                 /*
                 rpc.trimHistory(chan, waitFor(function (err) {
                     if (err) {
@@ -138,7 +142,7 @@ define([
         }).nThen(function () {
             // Only one channel and warning: error
             if (channels.length === 1 && warning.length) {
-                return void cb({error: err});
+                return void cb({error: warning[0]});
             }
             cb({
                 warning: warning.length ? warning : undefined

From d736f783e79a71b2351967e41430bba9043b51a6 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Tue, 4 Feb 2020 13:52:11 +0100
Subject: [PATCH 08/25] Add txid in GET_HISTORY

---
 historyKeeper.js                |  7 +++++--
 www/common/outer/async-store.js | 18 +++++++++++++++++-
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/historyKeeper.js b/historyKeeper.js
index fe16a204c..c636a090c 100644
--- a/historyKeeper.js
+++ b/historyKeeper.js
@@ -739,6 +739,7 @@ module.exports.create = function (cfg) {
         var config = parsed[2];
         var metadata = {};
         var lastKnownHash;
+        var txid;
 
         // clients can optionally pass a map of attributes
         // if the channel already exists this map will be ignored
@@ -746,6 +747,7 @@ module.exports.create = function (cfg) {
         if (config && typeof config === "object" && !Array.isArray(parsed[2])) {
             lastKnownHash = config.lastKnownHash;
             metadata = config.metadata || {};
+            txid = config.txid;
             if (metadata.expire) {
                 metadata.expire = +metadata.expire * 1000 + (+new Date());
             }
@@ -796,11 +798,12 @@ module.exports.create = function (cfg) {
                 msgCount++;
                 // avoid sending the metadata message a second time
                 if (isMetadataMessage(msg) && metadata_cache[channelName]) { return readMore(); }
+                if (txid) { msg[0] = txid; }
                 sendMsg(ctx, user, [0, HISTORY_KEEPER_ID, 'MSG', user.id, JSON.stringify(msg)], readMore);
             }, (err) => {
                 if (err && err.code !== 'ENOENT') {
                     if (err.message !== 'EINVAL') { Log.error("HK_GET_HISTORY", err); }
-                    const parsedMsg = {error:err.message, channel: channelName};
+                    const parsedMsg = {error:err.message, channel: channelName, txid: txid};
                     sendMsg(ctx, user, [0, HISTORY_KEEPER_ID, 'MSG', user.id, JSON.stringify(parsedMsg)]);
                     return;
                 }
@@ -848,7 +851,7 @@ module.exports.create = function (cfg) {
                 }
 
                 // End of history message:
-                let parsedMsg = {state: 1, channel: channelName};
+                let parsedMsg = {state: 1, channel: channelName, txid: txid};
                 sendMsg(ctx, user, [0, HISTORY_KEEPER_ID, 'MSG', user.id, JSON.stringify(parsedMsg)]);
             });
         });
diff --git a/www/common/outer/async-store.js b/www/common/outer/async-store.js
index 580cae7e9..152b9c9f9 100644
--- a/www/common/outer/async-store.js
+++ b/www/common/outer/async-store.js
@@ -1855,6 +1855,8 @@ define([
                 }
             };
 
+            var txid = Math.floor(Math.random() * 1000000);
+
             var msgs = [];
             var completed = false;
             var onMsg = function (msg, sender) {
@@ -1863,6 +1865,8 @@ define([
                 var parsed = parse(msg);
                 if (!parsed) { return; }
 
+                if (parsed.txid && parsed.txid !== txid) { return; }
+
                 // Ignore the metadata message
                 if (parsed.validateKey && parsed.channel) { return; }
                 if (parsed.error && parsed.channel) {
@@ -1883,9 +1887,20 @@ define([
                     return;
                 }
 
-                msg = parsed[4];
+                if (Array.isArray(parsed) && parsed[0] && parsed[0] !== txid) { return; }
+
                 // Keep only the history for our channel
                 if (parsed[3] !== data.channel) { return; }
+                // If we want the full messages, push the parsed data
+                if (parsed[4] && full) {
+                    msgs.push({
+                        msg: msg,
+                        hash: parsed[4].slice(0,64)
+                    });
+                    return;
+                }
+                // Otherwise, push the messages
+                msg = parsed[4];
                 if (msg) {
                     msg = msg.replace(/cp\|(([A-Za-z0-9+\/=]+)\|)?/, '');
                     msgs.push(msg);
@@ -1894,6 +1909,7 @@ define([
             network.on('message', onMsg);
 
             var cfg = {
+                txid: txid,
                 lastKnownHash: data.lastKnownHash
             };
             var msg = ['GET_HISTORY', data.channel, cfg];

From 689ea40a92de5b8e8b36d6b75f2e2c2e018422dd Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Tue, 4 Feb 2020 13:52:32 +0100
Subject: [PATCH 09/25] Compute history size in the worker

---
 www/common/common-ui-elements.js |  2 -
 www/common/outer/async-store.js  | 14 +++--
 www/common/outer/history.js      | 99 ++++++++++++++++++++++++++------
 www/settings/inner.js            |  2 +-
 4 files changed, 93 insertions(+), 24 deletions(-)

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 393a82c11..9f67f0dd9 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -764,8 +764,6 @@ define([
                 if (bytes === 0) { return void cb(void 0, $d); }
                 var formatted = UIElements.prettySize(bytes);
 
-                historyBytes = Math.floor(0.2*bytes); // XXX test data
-
                 if (!owned || !historyBytes || historyBytes > bytes) {
                     $d.append(h('div.cp-app-prop', [Messages.upload_size, h('br'), h('span.cp-app-prop-content', formatted)]));
                     return void cb(void 0, $d);
diff --git a/www/common/outer/async-store.js b/www/common/outer/async-store.js
index 152b9c9f9..7f54ef6c6 100644
--- a/www/common/outer/async-store.js
+++ b/www/common/outer/async-store.js
@@ -429,10 +429,12 @@ define([
             });
         };
 
-        Store.getFileSize = function (clientId, data, cb) {
+        Store.getFileSize = function (clientId, data, _cb) {
+            var cb = Util.once(Util.mkAsync(_cb));
+
             if (!store.anon_rpc) { return void cb({error: 'ANON_RPC_NOT_READY'}); }
 
-            var channelId = Hash.hrefToHexChannelId(data.href, data.password);
+            var channelId = data.channel || Hash.hrefToHexChannelId(data.href, data.password);
             store.anon_rpc.send("GET_FILE_SIZE", channelId, function (e, response) {
                 if (e) { return void cb({error: e}); }
                 if (response && response.length && typeof(response[0]) === 'number') {
@@ -1761,7 +1763,9 @@ define([
 
         // Fetch the latest version of the metadata on the server and return it.
         // If the pad is stored in our drive, update the local values of "owners" and "expire"
-        Store.getPadMetadata = function (clientId, data, cb) {
+        Store.getPadMetadata = function (clientId, data, _cb) {
+            var cb = Util.once(Util.mkAsync(_cb));
+
             if (!data.channel) { return void cb({ error: 'ENOTFOUND'}); }
             store.anon_rpc.send('GET_METADATA', data.channel, function (err, obj) {
                 if (err) { return void cb({error: err}); }
@@ -1843,7 +1847,9 @@ define([
             network.sendto(hk, JSON.stringify(['GET_FULL_HISTORY', data.channel, data.validateKey]));
         };
 
-        Store.getHistory = function (clientId, data, cb) {
+        Store.getHistory = function (clientId, data, _cb, full) {
+            var cb = Util.once(Util.mkAsync(_cb));
+
             var network = store.network;
             var hk = network.historyKeeper;
 
diff --git a/www/common/outer/history.js b/www/common/outer/history.js
index 5bc77cd35..43860decb 100644
--- a/www/common/outer/history.js
+++ b/www/common/outer/history.js
@@ -52,6 +52,12 @@ define([
         return channels;
     };
 
+    var getEdPublic = function (ctx, teamId) {
+        if (!teamId) { return Util.find(ctx.store, ['proxy', 'edPublic']); }
+
+        var teamData = Util.find(ctx, ['store', 'proxy', 'teams', teamId]);
+        return Util.find(teamData, ['keys', 'drive', 'edPublic']);
+    };
     var getRpc = function (ctx, teamId) {
         if (!teamId) { return ctx.store.rpc; }
         var teams = ctx.store.modules['team'];
@@ -61,14 +67,77 @@ define([
         return team.rpc;
     };
 
+    var getHistoryData = function (ctx, channel, lastKnownHash, teamId, _cb) {
+        var cb = Util.once(Util.mkAsync(_cb));
+        var edPublic = getEdPublic(ctx, teamId);
+        var Store = ctx.Store;
+
+        var total = 0;
+        var history = 0;
+        var metadata = 0;
+        var hash;
+        nThen(function (waitFor) {
+            // Total size
+            Store.getFileSize(null, {
+                channel: channel
+            }, waitFor(function (obj) {
+                if (obj && obj.error) {
+                    waitFor.abort();
+                    return void cb(obj);
+                }
+                if (typeof(obj.size) === "undefined") {
+                    waitFor.abort();
+                    return void cb({error: 'ENOENT'});
+                }
+                total = obj.size;
+            }));
+            // Pad
+            Store.getHistory(null, {
+                channel: channel,
+                lastKnownHash: lastKnownHash
+            }, waitFor(function (obj) {
+                if (obj && obj.error) {
+                    waitFor.abort();
+                    return void cb(obj);
+                }
+                if (!Array.isArray(obj)) {
+                    waitFor.abort();
+                    return void cb({error: 'EINVAL'});
+                }
+
+                hash = obj[0].hash;
+                var messages = obj.map(function(data) {
+                    return data.msg;
+                });
+                history = messages.join('\n').length;
+            }), true);
+            // Metadata
+            Store.getPadMetadata(null, {
+                channel: channel
+            }, waitFor(function (obj) {
+                if (obj && obj.error) { return; }
+                if (!obj || typeof(obj) !== "object") { return; }
+                metadata = JSON.stringify(obj).length;
+                if (!obj || !Array.isArray(obj.owners) ||
+                    obj.owners.indexOf(edPublic) === -1) {
+                    waitFor.abort();
+                    return void cb({error: 'INSUFFICIENT_PERMISSIONS'});
+                }
+            }));
+        }).nThen(function () {
+            cb({
+                size: (total - metadata - history),
+                hash: hash
+            });
+        });
+
+    };
+
     commands.GET_HISTORY_SIZE = function (ctx, data, cId, cb) {
         if (!ctx.store.loggedIn || !ctx.store.rpc) { return void cb({ error: 'INSUFFICIENT_PERMISSIONS' }); }
         var channels = data.channels;
         if (!Array.isArray(channels)) { return void cb({ error: 'EINVAL' }); }
 
-        var rpc = getRpc(ctx, data.teamid);
-        if (!rpc) { return void cb({ error: 'ENORPC'}); }
-
         var warning = [];
 
         // If account trim history, get the correct channels here
@@ -77,30 +146,26 @@ define([
         }
 
         var size = 0;
+        var res = [];
         nThen(function (waitFor) {
-            // TODO: check if owner first?
             channels.forEach(function (chan) {
-                size += Math.floor(Math.random()*1000) * 1024; // XXX
-                chan = chan; // XXX
-                waitFor = waitFor; // XXX
-                /*
                 var channel = chan;
                 var lastKnownHash;
                 if (typeof (chan) === "object" && chan.channel) {
                     channel = chan.channel;
                     lastKnownHash = chan.lastKnownHash;
                 }
-                rpc.getHistorySize({
-                    channel: channel,
-                    lastKnownHash: lastKnownHash
-                }, waitFor(function (err, value) {
-                    if (err) {
-                        warning.push(err);
+                getHistoryData(ctx, channel, lastKnownHash, data.teamId, waitFor(function (obj) {
+                    if (obj && obj.error) {
+                        warning.push(obj.error);
                         return;
                     }
-                    size += value;
+                    size += obj.size;
+                    res.push({
+                        channel: channel,
+                        lastKnownHash: obj.hash
+                    });
                 }));
-                */ // XXX TODO
             });
         }).nThen(function () {
             cb({
@@ -115,7 +180,7 @@ define([
         var channels = data.channels;
         if (!Array.isArray(channels)) { return void cb({ error: 'EINVAL' }); }
 
-        var rpc = getRpc(ctx, data.teamid);
+        var rpc = getRpc(ctx, data.teamId);
         if (!rpc) { return void cb({ error: 'ENORPC'}); }
 
         var warning = [];
diff --git a/www/settings/inner.js b/www/settings/inner.js
index 9c352390f..8270c7c2d 100644
--- a/www/settings/inner.js
+++ b/www/settings/inner.js
@@ -1203,7 +1203,7 @@ define([
         // XXX settings_trimHistoryTitle, settings_trimHistoryHint, trimHistory_button, trimHistory_error
         // XXX trimHistory_success, trimHistory_confirm
 
-        if (!privateData.isDriveOwned) { return; } // XXX
+        //if (!privateData.isDriveOwned) { return; } // XXX
 
         var spinner = UI.makeSpinner();
         var button = h('button.btn.btn-danger-alt', {

From 2e631a8b5f6682ba11933dfff47aa867e1cca096 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Tue, 4 Feb 2020 14:49:31 +0100
Subject: [PATCH 10/25] New UI tool: confirm button

---
 customize.dist/src/less2/include/buttons.less | 16 ++++++
 www/common/common-interface.js                | 53 +++++++++++++++++++
 www/settings/inner.js                         |  7 ++-
 3 files changed, 74 insertions(+), 2 deletions(-)

diff --git a/customize.dist/src/less2/include/buttons.less b/customize.dist/src/less2/include/buttons.less
index a907d2a0b..4bcb61e44 100644
--- a/customize.dist/src/less2/include/buttons.less
+++ b/customize.dist/src/less2/include/buttons.less
@@ -48,6 +48,22 @@
         }
     }
 
+    div.cp-button-confirm {
+        display: inline-block;
+        button {
+            margin: 0;
+        }
+        .cp-button-timer {
+            height: 3px;
+            & > div {
+                height: 100%;
+                background-color: @colortheme_alertify-primary;
+                &.danger, &.btn-danger, &.danger-alt, &.btn-danger-alt {
+                    background-color: @colortheme_alertify-red;
+                }
+            }
+        }
+    }
 
     button:not(.pure-button):not(.md-button):not(.mdl-button) {
 
diff --git a/www/common/common-interface.js b/www/common/common-interface.js
index 1d681d6e9..9ca5dbac8 100644
--- a/www/common/common-interface.js
+++ b/www/common/common-interface.js
@@ -593,6 +593,59 @@ define([
             }
         });
     };
+    UI.confirmButton = function (originalBtn, config, _cb) {
+        config = config || {};
+        cb = Util.once(Util.mkAsync(_cb));
+
+        var classes = 'btn ' + (config.classes || 'btn-primary');
+
+        var button = h('button', {
+            "class": classes,
+            title: config.title || ''
+        }, Messages.areYouSure || "Are you sure?"); // XXX
+        var $button = $(button);
+
+        var div = h('div', {
+            "class": config.classes || ''
+        });
+        var timer = h('div.cp-button-timer', div);
+
+        var content = h('div.cp-button-confirm', [
+            button,
+            timer
+        ]);
+
+        var to;
+
+        var done = function (res) {
+            cb(res);
+            clearTimeout(to);
+            $(content).remove();
+            $(originalBtn).show();
+        };
+
+        $button.click(function () {
+            done(true);
+        });
+
+        var TIMEOUT = 3000;
+        var INTERVAL = 10;
+        var i = 1;
+
+        var todo = function () {
+            var p = 100 * ((TIMEOUT - (i * INTERVAL)) / TIMEOUT);
+            if (i++ * INTERVAL >= TIMEOUT) {
+                done(false);
+                return;
+            }
+            $(div).css('width', p+'%');
+            to = setTimeout(todo, INTERVAL);
+        };
+        to = setTimeout(todo, INTERVAL);
+
+        $(originalBtn).hide().after(content);
+    };
+
 
     UI.proposal = function (content, cb) {
         var buttons = [{
diff --git a/www/settings/inner.js b/www/settings/inner.js
index 8270c7c2d..b19716fde 100644
--- a/www/settings/inner.js
+++ b/www/settings/inner.js
@@ -1208,7 +1208,7 @@ define([
         var spinner = UI.makeSpinner();
         var button = h('button.btn.btn-danger-alt', {
             disabled: 'disabled'
-        }, Messages.trimHistory_button || 'test'); // XXX
+        }, Messages.trimHistory_button || 'delete history... xxx'); // XXX
         var currentSize = h('p', $(spinner.spinner).clone()[0]);
         var content = h('div', [
             currentSize,
@@ -1238,7 +1238,10 @@ define([
         }).nThen(function () {
             $(currentSize).html(Messages._getKey('trimHistory_currentSize', [size]));
             $button.click(function () {
-                UI.confirm(Messages.trimHistory_confirm, function (yes) {
+                //UI.confirm(Messages.trimHistory_confirm, function (yes) {
+                UI.confirmButton(button, {
+                    classes: 'btn-danger'
+                }, function (yes) {
                     if (!yes) { return; }
 
                     $button.remove();

From 5c9b387b6b57c584a65ddedd2841f74d4c9d7d05 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Tue, 4 Feb 2020 15:13:42 +0100
Subject: [PATCH 11/25] Update secondary danger button colors

---
 customize.dist/src/less2/include/buttons.less | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/customize.dist/src/less2/include/buttons.less b/customize.dist/src/less2/include/buttons.less
index 4bcb61e44..7c3bf01db 100644
--- a/customize.dist/src/less2/include/buttons.less
+++ b/customize.dist/src/less2/include/buttons.less
@@ -115,7 +115,8 @@
             border-color: @colortheme_alertify-red;
             color: @colortheme_alertify-red;
             &:hover, &:active {
-                background-color: lighten(@colortheme_alertify-red, 35%);
+                color: @colortheme_alertify-red-color;
+                background-color: contrast(@colortheme_modal-bg, darken(@colortheme_alertify-red, 10%), lighten(@colortheme_alertify-red, 10%));
             }
         }
 

From 6db7fbac0f56cc5df5a37a1e793c13fc640a96c7 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 5 Feb 2020 17:55:04 +0100
Subject: [PATCH 12/25] lint

---
 www/common/common-interface.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/common/common-interface.js b/www/common/common-interface.js
index 7cb257b87..2dd2a9e85 100644
--- a/www/common/common-interface.js
+++ b/www/common/common-interface.js
@@ -600,7 +600,7 @@ define([
     };
     UI.confirmButton = function (originalBtn, config, _cb) {
         config = config || {};
-        cb = Util.once(Util.mkAsync(_cb));
+        var cb = Util.once(Util.mkAsync(_cb));
 
         var classes = 'btn ' + (config.classes || 'btn-primary');
 

From e6709f03aae54538384c6f054a86db6c091a7317 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 5 Feb 2020 17:55:25 +0100
Subject: [PATCH 13/25] Add trim history RPC command

---
 www/common/common-ui-elements.js |  5 +++--
 www/common/outer/history.js      | 17 ++++-------------
 www/common/pinpad.js             | 11 +++++++++++
 www/settings/inner.js            |  7 +++----
 4 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 68c33cdd0..4520e68fe 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -739,6 +739,7 @@ define([
             if (data.rtChannel) { chan.push(data.rtChannel); }
             if (data.lastVersion) { chan.push(Hash.hrefToHexChannelId(data.lastVersion)); }
             var history = common.makeUniversal('history');
+            var trimChannels = [];
             NThen(function (waitFor) {
                 chan.forEach(function (c) {
                     common.getFileSize(c, waitFor(function (e, _bytes) {
@@ -758,6 +759,7 @@ define([
                 }, waitFor(function (obj) {
                     if (obj && obj.error) { return; }
                     historyBytes = obj.size;
+                    trimChannels = obj.channels;
                 }));
             }).nThen(function () {
                 if (bytes === 0) { return void cb(void 0, $d); }
@@ -806,7 +808,7 @@ define([
                         spinner.spin();
                         history.execCommand('TRIM_HISTORY', {
                             pad: true,
-                            channels: chan.filter(function (c) { return c.length === 32; }),
+                            channels: trimChannels,
                             teamId: typeof(owned) === "number" && owned
                         }, function (obj) {
                             if (obj && obj.error) {
@@ -814,7 +816,6 @@ define([
                                 // XXX what are the possible errors?
                                 return;
                             }
-                            // TODO: obj.warning?
                             spinner.hide();
                             $(size).append(h('div.alert.alert-success', Messages.trimHistory_success || 'ok')); // XXX
                         });
diff --git a/www/common/outer/history.js b/www/common/outer/history.js
index 43860decb..1860e38c8 100644
--- a/www/common/outer/history.js
+++ b/www/common/outer/history.js
@@ -163,13 +163,14 @@ define([
                     size += obj.size;
                     res.push({
                         channel: channel,
-                        lastKnownHash: obj.hash
+                        hash: obj.hash
                     });
                 }));
             });
         }).nThen(function () {
             cb({
                 warning: warning.length ? warning : undefined,
+                channels: res,
                 size: size
             });
         });
@@ -185,24 +186,14 @@ define([
 
         var warning = [];
 
-        // If account trim history, get the correct channels here
-        if (data.account) {
-            channels = getAccountChannels(ctx);
-        }
-
         nThen(function (waitFor) {
-            channels.forEach(function (chan) {
-                chan = chan; // XXX
-                waitFor = waitFor; // XXX
-                /*
-                rpc.trimHistory(chan, waitFor(function (err) {
+            channels.forEach(function (obj) {
+                rpc.trimHistory(obj, waitFor(function (err) {
                     if (err) {
-                        chanWarning = true;
                         warning.push(err);
                         return;
                     }
                 }));
-                */ // XXX TODO
             });
         }).nThen(function () {
             // Only one channel and warning: error
diff --git a/www/common/pinpad.js b/www/common/pinpad.js
index e9ecbb7f3..2841656bc 100644
--- a/www/common/pinpad.js
+++ b/www/common/pinpad.js
@@ -125,6 +125,17 @@ var factory = function (Util, Rpc) {
                 });
             };
 
+            exp.trimHistory = function (data, _cb) {
+                var cb = Util.once(Util.mkAsync(_cb));
+                if (typeof(data) !== 'object' || !data.channel || !data.hash) {
+                    return void cb('INVALID_ARGUMENTS');
+                }
+                rpc.send('TRIM_HISTORY', data, function (e) {
+                    if (e) { return cb(e); }
+                    cb();
+                });
+            };
+
             exp.clearOwnedChannel = function (channel, cb) {
                 if (typeof(channel) !== 'string' || channel.length !== 32) {
                     return void cb('INVALID_ARGUMENTS');
diff --git a/www/settings/inner.js b/www/settings/inner.js
index b19716fde..50a4c0205 100644
--- a/www/settings/inner.js
+++ b/www/settings/inner.js
@@ -1221,6 +1221,7 @@ define([
 
         var $button = $(button);
         var size;
+        var channels = [];
         nThen(function (waitFor) {
             APP.history.execCommand('GET_HISTORY_SIZE', {
                 account: true,
@@ -1230,9 +1231,9 @@ define([
                     waitFor.abort();
                     var error = h('div.alert.alert-danger', Messages.trimHistory_error || 'error'); // XXX
                     $(content).empty().append(error);
-                    // TODO: obj.warning?
                     return;
                 }
+                channels = obj.channels;
                 size = UIElements.prettySize(Number(obj.size));
             }));
         }).nThen(function () {
@@ -1247,14 +1248,12 @@ define([
                     $button.remove();
                     spinner.spin();
                     APP.history.execCommand('TRIM_HISTORY', {
-                        account: true,
-                        channels: []
+                        channels: channels
                     }, function (obj) {
                         if (obj && obj.error) {
                             // XXX what are the possible errors?
                             return;
                         }
-                        // TODO: obj.warning?
                         spinner.hide();
                         $(content).append(h('div.alert.alert-success', Messages.trimHistory_success || 'ok')); // XXX
                     });

From 4079f1bfdb5dc87a7527211381c4fc115dc5d8da Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 5 Feb 2020 18:12:10 +0100
Subject: [PATCH 14/25] Fix RPC command

---
 lib/rpc.js                  | 2 +-
 www/common/outer/history.js | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/rpc.js b/lib/rpc.js
index 11a9bb06f..f4d57b800 100644
--- a/lib/rpc.js
+++ b/lib/rpc.js
@@ -46,7 +46,7 @@ const AUTHENTICATED_CALLS = [
     'OWNED_UPLOAD_COMPLETE',
     'UPLOAD_CANCEL',
     'EXPIRE_SESSION',
-    'TRIM_OWNED_CHANNEL_HISTORY',
+    'TRIM_HISTORY',
     'CLEAR_OWNED_CHANNEL',
     'REMOVE_OWNED_CHANNEL',
     'REMOVE_PINS',
diff --git a/www/common/outer/history.js b/www/common/outer/history.js
index 1860e38c8..bae186174 100644
--- a/www/common/outer/history.js
+++ b/www/common/outer/history.js
@@ -105,6 +105,8 @@ define([
                     return void cb({error: 'EINVAL'});
                 }
 
+                if (!obj.length) { return; }
+
                 hash = obj[0].hash;
                 var messages = obj.map(function(data) {
                     return data.msg;
@@ -161,6 +163,7 @@ define([
                         return;
                     }
                     size += obj.size;
+                    if (!obj.hash) { return; }
                     res.push({
                         channel: channel,
                         hash: obj.hash
@@ -188,7 +191,9 @@ define([
 
         nThen(function (waitFor) {
             channels.forEach(function (obj) {
+                console.warn(obj); // XXX
                 rpc.trimHistory(obj, waitFor(function (err) {
+                    console.error(obj.channel, arguments); // XXX
                     if (err) {
                         warning.push(err);
                         return;

From 9395a1ef1a99b7b446c2ec88783ee21f48e13c6b Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Wed, 5 Feb 2020 12:43:39 -0500
Subject: [PATCH 15/25] always write lines with a newline

---
 storage/file.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/storage/file.js b/storage/file.js
index 92e8cceee..b55ba3051 100644
--- a/storage/file.js
+++ b/storage/file.js
@@ -975,10 +975,11 @@ var trimChannel = function (env, channelName, hash, _cb) {
             if (msgHash === hash) {
                 // everything from this point on should be retained
                 retain = true;
-                return void tempStream.write(msgObj.buff, function () {
+                return void tempStream.write(s_msg + '\n', function () {
                     readMore();
                 });
             }
+            readMore();
         };
 
         readMessagesBin(env, channelName, 0, handler, w(function (err) {

From b7ca39715d173c50da51b8c710bc2b2a0591194e Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Wed, 5 Feb 2020 13:03:11 -0500
Subject: [PATCH 16/25] don't hang when reading unparseable lines from history

---
 lib/historyKeeper.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/historyKeeper.js b/lib/historyKeeper.js
index 9609e7b51..ddcb8764f 100644
--- a/lib/historyKeeper.js
+++ b/lib/historyKeeper.js
@@ -595,7 +595,9 @@ module.exports.create = function (cfg, cb) {
             const start = (beforeHash) ? 0 : offset;
             store.readMessagesBin(channelName, start, (msgObj, readMore, abort) => {
                 if (beforeHash && msgObj.offset >= offset) { return void abort(); }
-                handler(tryParse(msgObj.buff.toString('utf8')), readMore);
+                var parsed = tryParse(msgObj.buff.toString('utf8'));
+                if (!parsed) { return void readMore(); }
+                handler(parsed, readMore);
             }, waitFor(function (err) {
                 return void cb(err);
             }));
@@ -749,7 +751,6 @@ module.exports.create = function (cfg, cb) {
 
             // TODO compute lastKnownHash in a manner such that it will always skip past the metadata line?
             getHistoryAsync(channelName, lastKnownHash, false, (msg, readMore) => {
-                if (!msg) { return; } // XXX
                 msgCount++;
                 // avoid sending the metadata message a second time
                 if (isMetadataMessage(msg) && metadata_cache[channelName]) { return readMore(); }
@@ -869,7 +870,6 @@ module.exports.create = function (cfg, cb) {
         // FIXME should we send metadata here too?
         // none of the clientside code which uses this API needs metadata, but it won't hurt to send it (2019-08-22)
         return void getHistoryAsync(parsed[1], -1, false, (msg, readMore) => {
-            if (!msg) { return; }
             Server.send(userId, [0, HISTORY_KEEPER_ID, 'MSG', userId, JSON.stringify(['FULL_HISTORY', msg])], readMore);
         }, (err) => {
             let parsedMsg = ['FULL_HISTORY_END', parsed[1]];

From 14a67b560025e654831bee04a569c0376cc26ad5 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Wed, 5 Feb 2020 13:03:44 -0500
Subject: [PATCH 17/25] fix broken removePins RPC

---
 lib/commands/pin-rpc.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/commands/pin-rpc.js b/lib/commands/pin-rpc.js
index 16998b8b5..663faa58b 100644
--- a/lib/commands/pin-rpc.js
+++ b/lib/commands/pin-rpc.js
@@ -199,7 +199,8 @@ Pinning.removePins = function (Env, safeKey, cb) {
             status: err? String(err): 'SUCCESS',
         });
 
-        cb(err);
+        if (err) { return void cb(err); }
+        cb(void 0, 'OK');
     });
 };
 

From d8199b8274ccdf0eec3ec9e45604e012bb9a9370 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Thu, 6 Feb 2020 11:34:52 +0100
Subject: [PATCH 18/25] Update UI for trim history

---
 www/common/common-ui-elements.js | 6 ++++--
 www/settings/inner.js            | 8 +++++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 4520e68fe..c12d23dc9 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -765,7 +765,7 @@ define([
                 if (bytes === 0) { return void cb(void 0, $d); }
                 var formatted = UIElements.prettySize(bytes);
 
-                if (!owned || !historyBytes || historyBytes > bytes) {
+                if (!owned || !historyBytes || historyBytes > bytes || historyBytes < 0) {
                     $d.append(h('div.cp-app-prop', [Messages.upload_size, h('br'), h('span.cp-app-prop-content', formatted)]));
                     return void cb(void 0, $d);
                 }
@@ -801,7 +801,9 @@ define([
 
                 var $button = $(button);
                 $button.click(function () {
-                    UI.confirm(Messages.trimHistory_confirm, function (yes) {
+                    UI.confirmButton(button, {
+                        classes: 'btn-danger'
+                    }, function (yes) {
                         if (!yes) { return; }
 
                         $button.remove();
diff --git a/www/settings/inner.js b/www/settings/inner.js
index 50a4c0205..e2a7881ef 100644
--- a/www/settings/inner.js
+++ b/www/settings/inner.js
@@ -1201,7 +1201,7 @@ define([
     makeBlock('trim-history', function (cb) {
         if (!common.isLoggedIn()) { return; }
         // XXX settings_trimHistoryTitle, settings_trimHistoryHint, trimHistory_button, trimHistory_error
-        // XXX trimHistory_success, trimHistory_confirm
+        // XXX trimHistory_success, trimHistory_confirm, trimHistory_noHistory
 
         //if (!privateData.isDriveOwned) { return; } // XXX
 
@@ -1237,6 +1237,10 @@ define([
                 size = UIElements.prettySize(Number(obj.size));
             }));
         }).nThen(function () {
+            if (!size || size < 1024) {
+                $(currentSize).html(Messages.trimHistory_noHistory || 'no history...')); // XXX
+                return;
+            }
             $(currentSize).html(Messages._getKey('trimHistory_currentSize', [size]));
             $button.click(function () {
                 //UI.confirm(Messages.trimHistory_confirm, function (yes) {
@@ -1255,6 +1259,8 @@ define([
                             return;
                         }
                         spinner.hide();
+                        // XXX redraw this block instead of displaying a green message?
+                        $(currentSize).remove();
                         $(content).append(h('div.alert.alert-success', Messages.trimHistory_success || 'ok')); // XXX
                     });
                 });

From 9c6ab86e4de011f5ecebbfab07be6bc3bb317802 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Thu, 6 Feb 2020 11:57:50 +0100
Subject: [PATCH 19/25] Fix syntax error

---
 www/settings/inner.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/settings/inner.js b/www/settings/inner.js
index e2a7881ef..8ec079b42 100644
--- a/www/settings/inner.js
+++ b/www/settings/inner.js
@@ -1238,7 +1238,7 @@ define([
             }));
         }).nThen(function () {
             if (!size || size < 1024) {
-                $(currentSize).html(Messages.trimHistory_noHistory || 'no history...')); // XXX
+                $(currentSize).html(Messages.trimHistory_noHistory || 'no history...'); // XXX
                 return;
             }
             $(currentSize).html(Messages._getKey('trimHistory_currentSize', [size]));

From 8d017112441b96205b0c201d4c8afee0f891dbf9 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Thu, 6 Feb 2020 12:00:12 +0100
Subject: [PATCH 20/25] Disable trim history is nothing to remove

---
 www/settings/inner.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/www/settings/inner.js b/www/settings/inner.js
index 8ec079b42..84c7f2294 100644
--- a/www/settings/inner.js
+++ b/www/settings/inner.js
@@ -1234,14 +1234,14 @@ define([
                     return;
                 }
                 channels = obj.channels;
-                size = UIElements.prettySize(Number(obj.size));
+                size = Number(obj.size);
             }));
         }).nThen(function () {
             if (!size || size < 1024) {
                 $(currentSize).html(Messages.trimHistory_noHistory || 'no history...'); // XXX
                 return;
             }
-            $(currentSize).html(Messages._getKey('trimHistory_currentSize', [size]));
+            $(currentSize).html(Messages._getKey('trimHistory_currentSize', [UIElements.prettySize(size)]));
             $button.click(function () {
                 //UI.confirm(Messages.trimHistory_confirm, function (yes) {
                 UI.confirmButton(button, {

From 753fdbdc12646b7ea9dc1356eca99df28d49501d Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Thu, 6 Feb 2020 12:01:35 +0100
Subject: [PATCH 21/25] Display error for pad history trim

---
 www/common/common-ui-elements.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index c12d23dc9..06ed02256 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -813,12 +813,13 @@ define([
                             channels: trimChannels,
                             teamId: typeof(owned) === "number" && owned
                         }, function (obj) {
+                            spinner.hide();
                             if (obj && obj.error) {
                                 console.error(obj.error);
                                 // XXX what are the possible errors?
+                                $(size).append(h('div.alert.alert-danger', Messages.trimHistory_error || 'error')); // XXX
                                 return;
                             }
-                            spinner.hide();
                             $(size).append(h('div.alert.alert-success', Messages.trimHistory_success || 'ok')); // XXX
                         });
                     });

From b585cbba4216861d77d5fecdfe12a987fe9f521a Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Tue, 11 Feb 2020 12:05:09 +0100
Subject: [PATCH 22/25] Improve trim history UI when completed

---
 www/common/common-ui-elements.js | 16 +++++++++----
 www/common/outer/history.js      |  2 --
 www/settings/inner.js            | 40 +++++++++++++++++++++-----------
 3 files changed, 39 insertions(+), 19 deletions(-)

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 358f2c703..62ac47083 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -789,7 +789,11 @@ define([
                 var formatted = UIElements.prettySize(bytes);
 
                 if (!owned || !historyBytes || historyBytes > bytes || historyBytes < 0) {
-                    $d.append(h('div.cp-app-prop', [Messages.upload_size, h('br'), h('span.cp-app-prop-content', formatted)]));
+                    $d.append(h('div.cp-app-prop', [
+                        Messages.upload_size,
+                        h('br'),
+                        h('span.cp-app-prop-content', formatted)
+                    ]));
                     return void cb(void 0, $d);
                 }
 
@@ -838,12 +842,16 @@ define([
                         }, function (obj) {
                             spinner.hide();
                             if (obj && obj.error) {
-                                console.error(obj.error);
-                                // XXX what are the possible errors?
                                 $(size).append(h('div.alert.alert-danger', Messages.trimHistory_error || 'error')); // XXX
                                 return;
                             }
-                            $(size).append(h('div.alert.alert-success', Messages.trimHistory_success || 'ok')); // XXX
+                            $(size).remove();
+                            var formatted = UIElements.prettySize(bytes - historyBytes);
+                            $d.append(h('div.cp-app-prop', [
+                                Messages.upload_size,
+                                h('br'),
+                                h('span.cp-app-prop-content', formatted)
+                            ]));
                         });
                     });
                 });
diff --git a/www/common/outer/history.js b/www/common/outer/history.js
index bae186174..efb39e11c 100644
--- a/www/common/outer/history.js
+++ b/www/common/outer/history.js
@@ -191,9 +191,7 @@ define([
 
         nThen(function (waitFor) {
             channels.forEach(function (obj) {
-                console.warn(obj); // XXX
                 rpc.trimHistory(obj, waitFor(function (err) {
-                    console.error(obj.channel, arguments); // XXX
                     if (err) {
                         warning.push(err);
                         return;
diff --git a/www/settings/inner.js b/www/settings/inner.js
index 408029344..b7ad7998a 100644
--- a/www/settings/inner.js
+++ b/www/settings/inner.js
@@ -1216,25 +1216,29 @@ define([
         return $div;
     };
 
-    makeBlock('trim-history', function (cb) {
-        if (!common.isLoggedIn()) { return; }
-        // XXX settings_trimHistoryTitle, settings_trimHistoryHint, trimHistory_button, trimHistory_error
-        // XXX trimHistory_success, trimHistory_confirm, trimHistory_noHistory
-
-        //if (!privateData.isDriveOwned) { return; } // XXX
-
+    var redrawTrimHistory = function (cb, $div) {
         var spinner = UI.makeSpinner();
         var button = h('button.btn.btn-danger-alt', {
             disabled: 'disabled'
         }, Messages.trimHistory_button || 'delete history... xxx'); // XXX
         var currentSize = h('p', $(spinner.spinner).clone()[0]);
-        var content = h('div', [
+        var content = h('div#cp-settings-trim-container', [
             currentSize,
             button,
             spinner.ok,
             spinner.spinner
         ]);
 
+        if (!privateData.isDriveOwned) {
+            var href = privateData.origin + privateData.pathname + '#' + 'account';
+            $(currentSize).html(Messages.trimHistory_needMigration || 'Need migration <a>Click</a>'); // XXX
+            $(currentSize).find('a').prop('href', href).click(function (e) {
+                e.preventDefault();
+                $('.cp-sidebarlayout-category[data-category="account"]').click();
+            });
+            return void cb(content);
+        }
+
         Messages.trimHistory_currentSize = 'Size XXX: <b>{0}</b>'; // XXX
 
         var $button = $(button);
@@ -1273,19 +1277,26 @@ define([
                         channels: channels
                     }, function (obj) {
                         if (obj && obj.error) {
-                            // XXX what are the possible errors?
+                            var error = h('div.alert.alert-danger', Messages.trimHistory_error || 'error'); // XXX
+                            $(content).empty().append(error);
                             return;
                         }
                         spinner.hide();
-                        // XXX redraw this block instead of displaying a green message?
-                        $(currentSize).remove();
-                        $(content).append(h('div.alert.alert-success', Messages.trimHistory_success || 'ok')); // XXX
+                        redrawTrimHistory(cb, $div);
                     });
                 });
             }).prop('disabled', '');
         });
 
+        $div.find('#cp-settings-trim-container').remove();
         cb(content);
+    };
+    makeBlock('trim-history', function (cb, $div) {
+        if (!common.isLoggedIn()) { return; }
+        // XXX settings_trimHistoryTitle, settings_trimHistoryHint, trimHistory_button, trimHistory_error
+        // XXX trimHistory_success, trimHistory_confirm, trimHistory_noHistory
+        // XXX trimHistory_needMigration (clickable <a> tag (no attribute) to go to the "account" part of settings)
+        redrawTrimHistory(cb, $div);
     }, true);
 
     /*
@@ -1713,7 +1724,10 @@ define([
         APP.$usage = $('<div>', {'class': 'usage'}).appendTo(APP.$leftside);
         var active = privateData.category || 'account';
         Object.keys(categories).forEach(function (key) {
-            var $category = $('<div>', {'class': 'cp-sidebarlayout-category'}).appendTo($categories);
+            var $category = $('<div>', {
+                'class': 'cp-sidebarlayout-category',
+                'data-category': key
+            }).appendTo($categories);
             if (key === 'account') { $category.append($('<span>', {'class': 'fa fa-user-o'})); }
             if (key === 'drive') { $category.append($('<span>', {'class': 'fa fa-hdd-o'})); }
             if (key === 'cursor') { $category.append($('<span>', {'class': 'fa fa-i-cursor' })); }

From 0617d9efc5c42013cf83bc535385fd068113d131 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Tue, 11 Feb 2020 13:35:58 +0100
Subject: [PATCH 23/25] Change UI for account migration in settings

---
 www/settings/app-settings.less |  7 +++++-
 www/settings/inner.js          | 45 +++++++++++++++-------------------
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/www/settings/app-settings.less b/www/settings/app-settings.less
index 091fd8263..f64455540 100644
--- a/www/settings/app-settings.less
+++ b/www/settings/app-settings.less
@@ -21,6 +21,11 @@
         max-width: 650px;
     }
 
+    div.alert {
+        font-size: @colortheme_app-font-size;
+        padding: 10px;
+    }
+
     #cp-export-container {
         font-size: 16px;
         display: flex;
@@ -171,7 +176,7 @@
                 }
             }
 
-            .cp-settings-change-password, .cp-settings-migrate {
+            .cp-settings-change-password, .cp-settings-own-drive {
                 [type="password"], [type="text"] {
                     width: @sidebar_button-width;
                     flex: unset;
diff --git a/www/settings/inner.js b/www/settings/inner.js
index b7ad7998a..e65d6376a 100644
--- a/www/settings/inner.js
+++ b/www/settings/inner.js
@@ -48,12 +48,12 @@ define([
 
     var categories = {
         'account': [
+            'cp-settings-own-drive',
             'cp-settings-info-block',
             'cp-settings-displayname',
             'cp-settings-language-selector',
             'cp-settings-resettips',
             'cp-settings-change-password',
-            'cp-settings-migrate',
             'cp-settings-delete'
         ],
         'security': [
@@ -147,6 +147,11 @@ define([
                 hintFunction(safeKey).appendTo($div);
             }
             getter(function (content) {
+                if (content === false) {
+                    $div.remove();
+                    $div = undefined;
+                    return;
+                }
                 $div.append(content);
             }, $div);
             return $div;
@@ -521,19 +526,12 @@ define([
         return $div;
     };
 
-    create['migrate'] = function () {
-        if (privateData.isDriveOwned) { return; }
-        if (!common.isLoggedIn()) { return; }
-
-        var $div = $('<div>', { 'class': 'cp-settings-migrate cp-sidebarlayout-element'});
-
-        $('<span>', {'class': 'label'}).text(Messages.settings_ownDriveTitle).appendTo($div);
-
-        $('<span>', {'class': 'cp-sidebarlayout-description'})
-            .append(Messages.settings_ownDriveHint).appendTo($div);
+    makeBlock('own-drive', function (cb, $div) {
+        if (privateData.isDriveOwned || !common.isLoggedIn()) {
+            return void cb(false);
+        }
 
-        var $ok = $('<span>', {'class': 'fa fa-check', title: Messages.saved});
-        var $spinner = $('<span>', {'class': 'fa fa-spinner fa-pulse'});
+        $div.addClass('alert alert-warning');
 
         var form = h('div', [
             UI.passwordInput({
@@ -542,13 +540,12 @@ define([
             }, true),
             h('button.btn.btn-primary', Messages.settings_ownDriveButton)
         ]);
-
-        $(form).appendTo($div);
+        var $form = $(form);
 
         var todo = function () {
-            var password = $(form).find('#cp-settings-migrate-password').val();
+            var password = $form.find('#cp-settings-migrate-password').val();
             if (!password) { return; }
-            $spinner.show();
+            spinner.spin();
             UI.confirm(Messages.settings_ownDriveConfirm, function (yes) {
                 if (!yes) { return; }
                 var data = {
@@ -562,16 +559,15 @@ define([
                 sframeChan.query('Q_CHANGE_USER_PASSWORD', data, function (err, obj) {
                     UI.removeLoadingScreen();
                     if (err || obj.error) { return UI.alert(Messages.settings_changePasswordError); }
-                    $ok.show();
-                    $spinner.hide();
+                    spinner.done();
                 });
             });
         };
 
-        $(form).find('button').click(function () {
+        $form.find('button').click(function () {
             todo();
         });
-        $(form).find('input').keydown(function (e) {
+        $form.find('input').keydown(function (e) {
             // Save on Enter
             if (e.which === 13) {
                 e.preventDefault();
@@ -580,11 +576,10 @@ define([
             }
         });
 
-        $spinner.hide().appendTo($div);
-        $ok.hide().appendTo($div);
+        var spinner = UI.makeSpinner($div);
 
-        return $div;
-    };
+        cb(form);
+    }, true);
 
     // Security
 

From 72d41e34febcc0d75f3a7bee289bd9bb63d42c29 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Tue, 11 Feb 2020 13:37:21 +0100
Subject: [PATCH 24/25] lint compliance

---
 www/settings/inner.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/settings/inner.js b/www/settings/inner.js
index e65d6376a..bf47aefcb 100644
--- a/www/settings/inner.js
+++ b/www/settings/inner.js
@@ -541,6 +541,7 @@ define([
             h('button.btn.btn-primary', Messages.settings_ownDriveButton)
         ]);
         var $form = $(form);
+        var spinner = UI.makeSpinner($form);
 
         var todo = function () {
             var password = $form.find('#cp-settings-migrate-password').val();
@@ -576,7 +577,6 @@ define([
             }
         });
 
-        var spinner = UI.makeSpinner($div);
 
         cb(form);
     }, true);

From 415fc275399e73edc257a1584cb34b4c76d38bf7 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Tue, 11 Feb 2020 14:08:11 +0100
Subject: [PATCH 25/25] Pin todo and trim its history

---
 www/common/outer/async-store.js | 6 +++++-
 www/common/outer/history.js     | 6 ++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/www/common/outer/async-store.js b/www/common/outer/async-store.js
index 3ed2f5084..43fa364bc 100644
--- a/www/common/outer/async-store.js
+++ b/www/common/outer/async-store.js
@@ -166,7 +166,7 @@ define([
             // It now includes channels from shared folders
             var list = store.manager.getChannelsList('pin');
 
-            // Get the avatar
+            // Get the avatar & profile
             var profile = store.proxy.profile;
             if (profile) {
                 var profileChan = profile.edit ? Hash.hrefToHexChannelId('/profile/#' + profile.edit, null) : null;
@@ -175,6 +175,10 @@ define([
                 if (avatarChan) { list.push(avatarChan); }
             }
 
+            if (store.proxy.todo) {
+                list.push(Hash.hrefToHexChannelId('/todo/#' + store.proxy.todo, null));
+            }
+
             if (store.proxy.friends) {
                 var fList = Messaging.getFriendChannelsList(store.proxy);
                 list = list.concat(fList);
diff --git a/www/common/outer/history.js b/www/common/outer/history.js
index efb39e11c..269821680 100644
--- a/www/common/outer/history.js
+++ b/www/common/outer/history.js
@@ -24,6 +24,12 @@ define([
             if (profileChan) { channels.push(profileChan); }
         }
 
+        // Todo
+        if (ctx.store.proxy.todo) {
+            channels.push(Hash.hrefToHexChannelId('/todo/#' + ctx.store.proxy.todo, null));
+        }
+
+
         // Mailboxes
         var mailboxes = ctx.store.proxy.mailboxes;
         if (mailboxes) {