From c6cb38f2c8fb84d356418ff409b510bf045cd65f Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 5 Jul 2023 16:31:45 +0300
Subject: [PATCH] Fix folder selection issues

---
 customize.dist/src/less2/include/tree.less |  6 +-
 www/common/sframe-common-file.js           | 83 ++++------------------
 www/common/sframe-common-outer.js          | 11 +--
 www/secureiframe/app-secure.less           |  2 +
 4 files changed, 26 insertions(+), 76 deletions(-)

diff --git a/customize.dist/src/less2/include/tree.less b/customize.dist/src/less2/include/tree.less
index 779ae8b2c..b1a80a4bd 100644
--- a/customize.dist/src/less2/include/tree.less
+++ b/customize.dist/src/less2/include/tree.less
@@ -9,6 +9,10 @@
     .cp-tree {
         color: @cryptpad_text_col;
 
+        &, ul {
+            list-style-type: none;
+        }
+
         li.cp-tree-line {
             margin-left: 1em;
         }
@@ -46,4 +50,4 @@
         }
     }
 
-}
\ No newline at end of file
+}
diff --git a/www/common/sframe-common-file.js b/www/common/sframe-common-file.js
index 4ab01970d..8c94ed9d5 100644
--- a/www/common/sframe-common-file.js
+++ b/www/common/sframe-common-file.js
@@ -342,73 +342,11 @@ define([
                 ])
             ];
 
-            var defaultPath = 'Drive/Images/Example';
+            var defaultPath = 'Drive'; // XXX
             defaultPath.split('/').forEach(function(folder) {
                 breadcrumbContent.push(h('li.breadcrumb-item', folder));
             });
 
-            var drives =
-            [
-                {
-                  name: "drive",
-                  pathName: "root",
-                  isShared: false,
-                  children: [
-                    {
-                      name: "Folder 1",
-                      pathName: "Folder 1",
-                      isShared: false,
-                      children: [
-                        {
-                          name: "Subfolder1",
-                          pathName: "Subfolder1",
-                          isShared: false,
-                          children: []
-                        },
-                        {
-                          name: "Subfolder2",
-                          pathName: "Subfolder2",
-                          isShared: false,
-                                                                   children: []
-                        }
-                      ]
-                    },
-                    {
-                      name: "Shared Folder",
-                      pathName: ["id675478998765", "root"],
-                      isShared: true,
-                      children: [
-                        {
-                          name: "SubFolderInSharedFolder",
-                          pathName: "SubFolderInSharedFolder",
-                          isShared: false,
-                                                                   children: []
-                        }
-                      ]
-                    }
-                  ]
-                },
-                {
-                  name: "teamID1",
-                  isShared: false,
-                  pathName: "teamID1",
-                  children: [
-                    {
-                      name: "FolderA",
-                      pathName: "FolderA",
-                      isShared: false,
-                                                               children: []
-                    },
-                    {
-                      name: "FolderB",
-                      pathName: "FolderB",
-                      isShared: false,
-                                                               children: []
-                    }
-                  ]
-                }
-            ];
-
             let pathContainer;
 
             // Ask for name, password and owner
@@ -460,9 +398,10 @@ define([
             });
 
             // Tree initializer
+            var selectedPath = false;
             $content.find('button').click(function() {
                 $(this).hide();
-                
+
                 // Just remove the breadcrumb
                 var $container = $(pathContainer);
                 $container.empty();
@@ -476,9 +415,8 @@ define([
                     $container.append($tree);
 
                     var $selection = false;
-                    var selectedPath = false;
 
-                    var createTreeLine = function ($parent, item, parentPath) {
+                    var createTreeLine = function ($parent, item, parentPath, itemTeamId) {
                         var isOpen = false;
 
                         var $line = $('<li class="cp-tree-line">');
@@ -528,7 +466,7 @@ define([
                             var $ul = $('<ul>').hide();
                             $line.append($ul);
                             item.children.forEach(function (child) {
-                                createTreeLine($ul, child, itemPath);
+                                createTreeLine($ul, child, itemPath, itemTeamId);
                             });
                         }
 
@@ -539,13 +477,14 @@ define([
                             }
                             $selection = $selectable;
                             selectedPath = itemPath;
+                            teamId = itemTeamId;
                             console.log(itemPath.join('/'));
                         });
-                    }
+                    };
 
                     drives.forEach(function (item) {
-                        createTreeLine($tree, item, []);
-                    })
+                        createTreeLine($tree, item, [], item.teamId);
+                    });
                 });
             });
 
@@ -573,6 +512,7 @@ define([
                     password: password,
                     owned: owned,
                     forceSave: forceSave,
+                    path: selectedPath || undefined,
                     alt: alt,
                 });
             });
@@ -700,6 +640,9 @@ define([
                         owned = obj.owned;
                         forceSave = obj.forceSave;
                         alt = obj.alt;
+                        if (obj.path) {
+                            e.path = obj.path;
+                        }
                         finish();
                     }, preview);
                 }
diff --git a/www/common/sframe-common-outer.js b/www/common/sframe-common-outer.js
index 9a3d3a4f5..19485af91 100644
--- a/www/common/sframe-common-outer.js
+++ b/www/common/sframe-common-outer.js
@@ -1152,6 +1152,12 @@ define([
                     Cryptpad.changePadPassword(Cryptget, Crypto, data, cb);
                 });
 
+                sframeChan.on('Q_GET_FOLDERS_LIST', function (data, cb) {
+                    Cryptpad.getFoldersList(cb);
+                });
+
+
+
                 sframeChan.on('Q_DELETE_OWNED', function (data, cb) {
                     Cryptpad.userObjectCommand({
                         cmd: 'deleteOwned',
@@ -1729,11 +1735,6 @@ define([
                 });
             });
 
-            sframeChan.on('Q_GET_FOLDERS_LIST', function (data, cb) {
-                Cryptpad.getFoldersList(cb);
-            });
-
-
             sframeChan.on('Q_CHANGE_USER_PASSWORD', function (data, cb) {
                 Cryptpad.changeUserPassword(Cryptget, edPublic, data, cb);
             });
diff --git a/www/secureiframe/app-secure.less b/www/secureiframe/app-secure.less
index 3b7a76a1a..3854d3e38 100644
--- a/www/secureiframe/app-secure.less
+++ b/www/secureiframe/app-secure.less
@@ -9,6 +9,7 @@
 @import (reference) '../../customize/src/less2/include/modals-ui-elements.less';
 @import (reference) '../../customize/src/less2/include/usergrid.less';
 @import (reference) '../../customize/src/less2/include/forms.less';
+@import (reference) '../../customize/src/less2/include/tree.less';
 
 &.cp-app-secureiframe {
     .modals-ui-elements_main();
@@ -21,6 +22,7 @@
     .modal_main();
     .usergrid_main();
     .forms_main();
+    .tree_main();
 
     .fa-shhare-alt:before { content: "\f1e0"; }