From 179fa06f92c9911702cbc6c1b3eb709d168ff30c Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Thu, 15 Oct 2020 13:38:53 +0200
Subject: [PATCH] Fix drive history with deleted shared folder

---
 www/common/drive-ui.js | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/www/common/drive-ui.js b/www/common/drive-ui.js
index d3c5d0e11..3604bf7b0 100644
--- a/www/common/drive-ui.js
+++ b/www/common/drive-ui.js
@@ -1957,8 +1957,8 @@ define([
             if (manager.isSharedFolder(element)) {
                 var data = manager.getSharedFolderData(element);
                 var fId = element;
-                key = data.title || data.lastTitle;
-                element = manager.folders[element].proxy[manager.user.userObject.ROOT];
+                key = data.title || data.lastTitle || Messages.fm_deletedFolder;
+                element = Util.find(manager, ['folders', element, 'proxy', manager.user.userObject.ROOT]) || {};
                 $span.addClass('cp-app-drive-element-sharedf');
                 _addOwnership($span, $state, data);
 
@@ -2095,6 +2095,10 @@ define([
                     UI.warn(Messages.fm_restricted);
                     return;
                 }
+                if (isSharedFolder && !manager.folders[isSharedFolder]) {
+                    UI.warn(Messages.fm_deletedFolder);
+                    return;
+                }
                 if (isFolder) {
                     APP.displayDirectory(newPath);
                     return;
@@ -3799,6 +3803,7 @@ define([
             });
         };
 
+Messages.fm_deletedFolder = "Deleted folder"; // XXX
         var createTreeElement = function (name, $icon, path, draggable, droppable, collapsable, active, isSharedFolder) {
             var $name = $('<span>', { 'class': 'cp-app-drive-element' }).text(name);
             $icon.css("color", isSharedFolder ? getFolderColor(path.slice(0, -1)) : getFolderColor(path));
@@ -3808,6 +3813,10 @@ define([
             }
             var $elementRow = $('<span>', {'class': 'cp-app-drive-element-row'}).append($collapse).append($icon).append($name).click(function (e) {
                 e.stopPropagation();
+                if (isSharedFolder && !manager.folders[isSharedFolder]) {
+                    UI.warn(Messages.fm_deletedFolder);
+                    return;
+                }
                 if (files.restrictedFolders[isSharedFolder]) {
                     UI.warn(Messages.fm_restricted);
                     return;
@@ -3907,10 +3916,10 @@ define([
                     newPath.push(manager.user.userObject.ROOT);
                     isCurrentFolder = manager.comparePath(newPath, currentPath);
                     // Subfolders?
-                    var newRoot = manager.folders[sfId].proxy[manager.user.userObject.ROOT];
+                    var newRoot = Util.find(manager, ['folders', sfId, 'proxy', manager.user.userObject.ROOT]) || {};
                     subfolder = manager.hasSubfolder(newRoot);
                     // Fix name
-                    key = manager.getSharedFolderData(sfId).title;
+                    key = manager.getSharedFolderData(sfId).title || Messages.fm_deletedFolder;
                     // Fix icon
                     $icon = isCurrentFolder ? $sharedFolderOpenedIcon : $sharedFolderIcon;
                     isSharedFolder = sfId;
@@ -3935,6 +3944,7 @@ define([
                 if (sfId && !editable) {
                     $element.attr('data-ro', true);
                 }
+                if (!subfolder) { return; }
                 createTree($element, newPath);
             });
         };