From b69261d1190e6695da84aea59fc7eb742572c26e Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Mon, 10 Feb 2020 15:10:36 +0100
Subject: [PATCH] Display the share modal after folder conversion to sf

---
 www/common/drive-ui.js      | 95 ++++++++++++++++++++++---------------
 www/common/proxy-manager.js |  4 +-
 2 files changed, 59 insertions(+), 40 deletions(-)

diff --git a/www/common/drive-ui.js b/www/common/drive-ui.js
index 01025b6a1..e86fa3351 100644
--- a/www/common/drive-ui.js
+++ b/www/common/drive-ui.js
@@ -1936,6 +1936,44 @@ define([
         };
         var getIcon = UI.getIcon;
 
+        var createShareButton = function (id, $container) {
+            var $shareBlock = $('<button>', {
+                'class': 'cp-toolbar-share-button',
+                title: Messages.shareButton
+            });
+            $sharedIcon.clone().appendTo($shareBlock);
+            $('<span>').text(Messages.shareButton).appendTo($shareBlock);
+            var data = manager.getSharedFolderData(id);
+            var parsed = (data.href && data.href.indexOf('#') !== -1) ? Hash.parsePadUrl(data.href) : {};
+            var roParsed = Hash.parsePadUrl(data.roHref) || {};
+            if (!parsed.hash && !roParsed.hash) { return void console.error("Invalid href: "+(data.href || data.roHref)); }
+            var friends = common.getFriends();
+            var ro = folders[id] && folders[id].version >= 2;
+            var modal = UIElements.createShareModal({
+                teamId: APP.team,
+                origin: APP.origin,
+                pathname: "/drive/",
+                friends: friends,
+                title: data.title,
+                password: data.password,
+                sharedFolder: true,
+                common: common,
+                hashes: {
+                    editHash: parsed.hash,
+                    viewHash: ro && roParsed.hash,
+                }
+            });
+            // If we're a viewer and this is an old shared folder (no read-only mode), we
+            // can't share the read-only URL and we don't have access to the edit one.
+            // We should hide the share button.
+            if (!modal) { return; }
+            $shareBlock.click(function () {
+                UI.openCustomModal(modal);
+            });
+            $container.append($shareBlock);
+            return $shareBlock;
+        };
+
         // Create the "li" element corresponding to the file/folder located in "path"
         var createElement = function (path, elPath, root, isFolder) {
             // Forbid drag&drop inside the trash
@@ -2016,6 +2054,15 @@ define([
                 });
                 delete APP.newFolder;
             }
+
+            if (isSharedFolder && APP.convertedFolder === element) {
+                setTimeout(function () {
+                    var $fakeButton = createShareButton(element, $('<div>'));
+                    if (!$fakeButton) { return; }
+                    $fakeButton.click();
+                }, 100);
+            }
+
             return $element;
         };
 
@@ -2553,43 +2600,6 @@ define([
             $container.append($block);
         };
 
-        var createShareButton = function (id, $container) {
-            var $shareBlock = $('<button>', {
-                'class': 'cp-toolbar-share-button',
-                title: Messages.shareButton
-            });
-            $sharedIcon.clone().appendTo($shareBlock);
-            $('<span>').text(Messages.shareButton).appendTo($shareBlock);
-            var data = manager.getSharedFolderData(id);
-            var parsed = (data.href && data.href.indexOf('#') !== -1) ? Hash.parsePadUrl(data.href) : {};
-            var roParsed = Hash.parsePadUrl(data.roHref) || {};
-            if (!parsed.hash && !roParsed.hash) { return void console.error("Invalid href: "+(data.href || data.roHref)); }
-            var friends = common.getFriends();
-            var ro = folders[id] && folders[id].version >= 2;
-            var modal = UIElements.createShareModal({
-                teamId: APP.team,
-                origin: APP.origin,
-                pathname: "/drive/",
-                friends: friends,
-                title: data.title,
-                password: data.password,
-                sharedFolder: true,
-                common: common,
-                hashes: {
-                    editHash: parsed.hash,
-                    viewHash: ro && roParsed.hash,
-                }
-            });
-            // If we're a viewer and this is an old shared folder (no read-only mode), we
-            // can't share the read-only URL and we don't have access to the edit one.
-            // We should hide the share button.
-            if (!modal) { return; }
-            $shareBlock.click(function () {
-                UI.openCustomModal(modal);
-            });
-            $container.append($shareBlock);
-        };
-
         var SORT_FOLDER_DESC = 'sortFoldersDesc';
         var SORT_FILE_BY = 'sortFilesBy';
         var SORT_FILE_DESC = 'sortFilesDesc';
@@ -3485,6 +3495,9 @@ define([
             } else {
                 $content.scrollTop(s);
             }
+
+            delete APP.convertedFolder;
+
             appStatus.ready(true);
         };
         var displayDirectory = APP.displayDirectory = function (path, force) {
@@ -4087,10 +4100,14 @@ define([
                             if (!res) { return; }
                             var password = $(convertContent).find('#cp-upload-password').val() || undefined;
                             var owned = Util.isChecked($(convertContent).find('#cp-upload-owned'));
-                            manager.convertFolderToSharedFolder(paths[0].path, owned, password, refresh);
+                            manager.convertFolderToSharedFolder(paths[0].path, owned, password, function (err, obj) {
+                                if (err || obj && obj.error) { return void console.error(err || obj.error); }
+                                if (obj && obj.fId) { APP.convertedFolder = obj.fId; }
+                                refresh();
+                            });
                         });
                     }
-                } else { // File
+                } else { // File or shared folder
                     var sf = manager.isSharedFolder(el);
                     data = sf ? manager.getSharedFolderData(el) : manager.getFileData(el);
                     parsed = (data.href && data.href.indexOf('#') !== -1) ? Hash.parsePadUrl(data.href) : {};
diff --git a/www/common/proxy-manager.js b/www/common/proxy-manager.js
index 2fa3751f7..83e10c50c 100644
--- a/www/common/proxy-manager.js
+++ b/www/common/proxy-manager.js
@@ -689,7 +689,9 @@ define([
 
             // remove folder
             Env.user.userObject.delete([path], function () {
-                cb();
+                cb({
+                    fId: SFId
+                });
             });
         });
     };