From e7a72896d5d5c6b518a2ddc656048508a1326c80 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 3 Mar 2021 16:54:38 +0100
Subject: [PATCH] Enable properties modal when the pad is not stored

---
 www/common/common-ui-elements.js  |  7 +-----
 www/common/inner/properties.js    | 36 ++++++++++++++++++++-----------
 www/common/onlyoffice/main.js     |  8 +++++++
 www/common/sframe-common-outer.js | 11 +++++++++-
 www/secureiframe/inner.js         |  2 +-
 www/secureiframe/main.js          |  1 +
 6 files changed, 45 insertions(+), 20 deletions(-)

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 14c7a298b..104756fac 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -836,12 +836,7 @@ define([
                 .text(Messages.propertiesButton))
                 .click(common.prepareFeedback(type))
                 .click(function () {
-                    common.isPadStored(function (err, data) {
-                        if (!data) {
-                            return void UI.alert(Messages.autostore_notAvailable);
-                        }
-                        sframeChan.event('EV_PROPERTIES_OPEN');
-                    });
+                    sframeChan.event('EV_PROPERTIES_OPEN');
                 });
                 break;
             case 'save': // OnlyOffice save
diff --git a/www/common/inner/properties.js b/www/common/inner/properties.js
index f5780d4c2..ddbf017fc 100644
--- a/www/common/inner/properties.js
+++ b/www/common/inner/properties.js
@@ -18,6 +18,16 @@ define([
         opts = opts || {};
         var $d = $('<div>');
         if (!data) { return void cb(void 0, $d); }
+        data = Util.clone(data);
+
+        var privateData = common.getMetadataMgr().getPrivateData();
+        if (privateData.propChannels) {
+            var p = privateData.propChannels;
+            data.channel = data.channel || p.channel;
+            data.rtChannel = data.rtChannel || p.rtChannel;
+            data.lastVersion = data.lastVersion || p.lastVersion;
+            data.lastCpHash = data.lastCpHash || p.lastCpHash;
+        }
 
         if (data.channel) {
             $('<label>', { 'for': 'cp-app-prop-id'}).text(Messages.documentID).appendTo($d);
@@ -26,18 +36,20 @@ define([
             }));
         }
 
-        if (data.href) {
-            $('<label>', {'for': 'cp-app-prop-link'}).text(Messages.editShare).appendTo($d);
-            $d.append(UI.dialog.selectable(data.href, {
-                id: 'cp-app-prop-link',
-            }));
-        }
+        if (!data.fakeHref) {
+            if (data.href) {
+                $('<label>', {'for': 'cp-app-prop-link'}).text(Messages.editShare).appendTo($d);
+                $d.append(UI.dialog.selectable(data.href, {
+                    id: 'cp-app-prop-link',
+                }));
+            }
 
-        if (data.roHref && !opts.noReadOnly) {
-            $('<label>', {'for': 'cp-app-prop-rolink'}).text(Messages.viewShare).appendTo($d);
-            $d.append(UI.dialog.selectable(data.roHref, {
-                id: 'cp-app-prop-rolink',
-            }));
+            if (data.roHref && !opts.noReadOnly) {
+                $('<label>', {'for': 'cp-app-prop-rolink'}).text(Messages.viewShare).appendTo($d);
+                $d.append(UI.dialog.selectable(data.roHref, {
+                    id: 'cp-app-prop-rolink',
+                }));
+            }
         }
 
         if (data.tags && Array.isArray(data.tags)) {
@@ -54,7 +66,6 @@ define([
 
         if (!common.isLoggedIn()) { return void cb(void 0, $d); }
 
-        var privateData = common.getMetadataMgr().getPrivateData();
         if (privateData.offline) { return void cb(void 0, $d); }
 
         // File and history size...
@@ -179,6 +190,7 @@ define([
     Properties.getPropertiesModal = function (common, opts, cb) {
         cb = cb || function () {};
         opts = opts || {};
+        opts.access = true;
         var tabs = [{
             getTab: getPadProperties,
             title: Messages.fc_prop,
diff --git a/www/common/onlyoffice/main.js b/www/common/onlyoffice/main.js
index 7e4e8b8d5..b7626a589 100644
--- a/www/common/onlyoffice/main.js
+++ b/www/common/onlyoffice/main.js
@@ -26,6 +26,10 @@ define([
             obj.ooVersionHash = version;
             obj.ooForceVersion = localStorage.CryptPad_ooVersion || "";
         };
+        var channels = {};
+        var getPropChannels = function () {
+            return channels;
+        };
         var addRpc = function (sframeChan, Cryptpad, Utils) {
             sframeChan.on('Q_OO_SAVE', function (data, cb) {
                 var chanId = Utils.Hash.hrefToHexChannelId(data.url);
@@ -38,14 +42,17 @@ define([
                 Cryptpad.pinPads([chanId], function (e) {
                     if (e) { return void cb(e); }
                     Cryptpad.setPadAttribute('lastVersion', data.url, cb);
+                    channels.lastVersion = data.url;
                 });
                 Cryptpad.setPadAttribute('lastCpHash', data.hash, cb);
+                channels.lastCpHash = data.hash;
             });
             sframeChan.on('Q_OO_OPENCHANNEL', function (data, cb) {
                 Cryptpad.getPadAttribute('rtChannel', function (err, res) {
                     // If already stored, don't pin it again
                     if (res && res === data.channel) { return; }
                     Cryptpad.pinPads([data.channel], function () {
+                        channels.rtChannel = data.channel;
                         Cryptpad.setPadAttribute('rtChannel', data.channel, function () {});
                     });
                 });
@@ -144,6 +151,7 @@ define([
             useCreationScreen: true,
             addData: addData,
             addRpc: addRpc,
+            getPropChannels: getPropChannels,
             messaging: true
         });
     });
diff --git a/www/common/sframe-common-outer.js b/www/common/sframe-common-outer.js
index 7ecf9fa35..409911693 100644
--- a/www/common/sframe-common-outer.js
+++ b/www/common/sframe-common-outer.js
@@ -1378,6 +1378,14 @@ define([
             // Secure modal
             var SecureModal = {};
             // Create or display the iframe and modal
+            var getPropChannels = function () {
+                var channels = {};
+                if (cfg.getPropChannels) {
+                    channels = Utils.Util.clone(cfg.getPropChannels());
+                }
+                channels.channel = secret.channel;
+                return channels;
+            };
             var initSecureModal = function (type, cfg, cb) {
                 cfg.modal = type;
                 SecureModal.cb = cb;
@@ -1397,7 +1405,8 @@ define([
                         app: parsed.type,
                         hashes: hashes,
                         password: password,
-                        isTemplate: isTemplate
+                        isTemplate: isTemplate,
+                        getPropChannels: getPropChannels
                     };
                     config.addCommonRpc = addCommonRpc;
                     config.modules = {
diff --git a/www/secureiframe/inner.js b/www/secureiframe/inner.js
index 4d5b8ee4f..01635cbaa 100644
--- a/www/secureiframe/inner.js
+++ b/www/secureiframe/inner.js
@@ -33,7 +33,7 @@ define([
         var metadataMgr = common.getMetadataMgr();
         var sframeChan = common.getSframeChannel();
         var $body = $('body');
-    var displayed;
+        var displayed;
 
         var hideIframe = function () {
             if (!displayed) { return; }
diff --git a/www/secureiframe/main.js b/www/secureiframe/main.js
index ede5f9281..bb7f05cca 100644
--- a/www/secureiframe/main.js
+++ b/www/secureiframe/main.js
@@ -103,6 +103,7 @@ define([
                             feedbackAllowed: Utils.Feedback.state,
                             hashes: config.data.hashes,
                             password: config.data.password,
+                            propChannels: config.data.getPropChannels(),
                             isTemplate: isTemplate,
                             file: config.data.file,
                             secureIframe: true,