Avii/Radicale
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

CollectionScene: Clarify collections

Browse Source
This commit is contained in:
Max Berger
2026-03-13 23:34:59 +01:00
parent be7d6d4a61
commit b9aa03afb8
2 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
radicale/web/internal_data/js/scenes/CollectionsScene.js
View File

@@ -40,11 +40,11 @@ export class CollectionsScene {
/** /**
* @param {string} user * @param {string} user
* @param {string} password * @param {string} password
* @param {Collection} collection The collection to show sharing options for. * @param {Collection} principal_collection The princial collection
* @param {function(string):void} onerror Called when an error occurs, before the * @param {function(string):void} onerror Called when an error occurs, before the
* scene is popped. * scene is popped.
*/ */
constructor(user, password, collection, onerror) { constructor(user, password, principal_collection, onerror) {
/** @type {HTMLElement} */ let html_scene = document.getElementById("collectionsscene"); /** @type {HTMLElement} */ let html_scene = document.getElementById("collectionsscene");
/** @type {HTMLElement} */ let template = html_scene.querySelector("[data-name=collectiontemplate]"); /** @type {HTMLElement} */ let template = html_scene.querySelector("[data-name=collectiontemplate]");
/** @type {HTMLElement} */ let new_btn = html_scene.querySelector("[data-name=new]"); /** @type {HTMLElement} */ let new_btn = html_scene.querySelector("[data-name=new]");
@@ -53,12 +53,12 @@ export class CollectionsScene {
/** @type {?number} */ let scene_index = null; /** @type {?number} */ let scene_index = null;
/** @type {?XMLHttpRequest} */ let collections_req = null; /** @type {?XMLHttpRequest} */ let collections_req = null;
/** @type {?Array<Collection>} */ let collections = null; /** @type {?Array<Collection>} */ let child_collections = null;
/** @type {Array<HTMLElement>} */ let nodes = []; /** @type {Array<HTMLElement>} */ let nodes = [];
function onnew() { function onnew() {
try { try {
let create_collection_scene = new CreateEditCollectionScene(user, password, collection); let create_collection_scene = new CreateEditCollectionScene(user, password, principal_collection);
push_scene(create_collection_scene, false); push_scene(create_collection_scene, false);
} catch (err) { } catch (err) {
console.error(err); console.error(err);
@@ -68,7 +68,7 @@ export class CollectionsScene {
function onupload() { function onupload() {
try { try {
let upload_scene = new UploadCollectionScene(user, password, collection); let upload_scene = new UploadCollectionScene(user, password, principal_collection);
push_scene(upload_scene, false); push_scene(upload_scene, false);
} catch (err) { } catch (err) {
console.error(err); console.error(err);
@@ -86,6 +86,9 @@ export class CollectionsScene {
return false; return false;
} }
/**
* @param {Collection} collection
*/
function onedit(collection) { function onedit(collection) {
try { try {
let edit_collection_scene = new CreateEditCollectionScene(user, password, collection); let edit_collection_scene = new CreateEditCollectionScene(user, password, collection);
@@ -96,6 +99,9 @@ export class CollectionsScene {
return false; return false;
} }
/**
* @param {Collection} collection
*/
function onshare(collection) { function onshare(collection) {
try { try {
let share_collection_scene = new ShareCollectionScene(user, password, collection); let share_collection_scene = new ShareCollectionScene(user, password, collection);
@@ -106,6 +112,9 @@ export class CollectionsScene {
return false; return false;
} }
/**
* @param {Collection} collection
*/
function ondelete(collection) { function ondelete(collection) {
try { try {
let delete_collection_scene = new DeleteCollectionScene(user, password, collection); let delete_collection_scene = new DeleteCollectionScene(user, password, collection);
@@ -116,12 +125,15 @@ export class CollectionsScene {
return false; return false;
} }
/**
* @param {any[]} collections
*/
function show_collections(collections) { function show_collections(collections) {
/** @type {HTMLElement} */ let navBar = document.querySelector("#logoutview"); /** @type {HTMLElement} */ let navBar = document.querySelector("#logoutview");
let heightOfNavBar = navBar.offsetHeight + "px"; let heightOfNavBar = navBar.offsetHeight + "px";
html_scene.style.marginTop = heightOfNavBar; html_scene.style.marginTop = heightOfNavBar;
html_scene.style.height = "calc(100vh - " + heightOfNavBar + ")"; html_scene.style.height = "calc(100vh - " + heightOfNavBar + ")";
collections.forEach(function (collection) { collections.forEach(function (/** @type {Collection} */ collection) {
/** @type {HTMLElement} */ let node = /** @type {HTMLElement} */(template.cloneNode(true)); /** @type {HTMLElement} */ let node = /** @type {HTMLElement} */(template.cloneNode(true));
node.classList.remove("hidden"); node.classList.remove("hidden");
/** @type {HTMLElement} */ let title_form = node.querySelector("[data-name=title]"); /** @type {HTMLElement} */ let title_form = node.querySelector("[data-name=title]");
@@ -184,7 +196,7 @@ export class CollectionsScene {
function update() { function update() {
let loading_scene = new LoadingScene(); let loading_scene = new LoadingScene();
push_scene(loading_scene, false); push_scene(loading_scene, false);
collections_req = get_collections(user, password, collection, function (collections1, error) { collections_req = get_collections(user, password, principal_collection, function (child_collections_, error) {
if (scene_index === null) { if (scene_index === null) {
return; return;
} }
@@ -193,7 +205,7 @@ export class CollectionsScene {
onerror(error); onerror(error);
pop_scene(scene_index - 1); pop_scene(scene_index - 1);
} else { } else {
collections = collections1; child_collections = child_collections_;
pop_scene(scene_index); pop_scene(scene_index);
} }
}); });
@@ -204,12 +216,12 @@ export class CollectionsScene {
new_btn.onclick = onnew; new_btn.onclick = onnew;
upload_btn.onclick = onupload; upload_btn.onclick = onupload;
incomingshares_btn.onclick = onincomingshares; incomingshares_btn.onclick = onincomingshares;
if (collections === null) { if (child_collections === null) {
update(); update();
discover_server_features(user, password, maybe_enable_sharing_options); discover_server_features(user, password, maybe_enable_sharing_options);
} else { } else {
// from update loading scene // from update loading scene
show_collections(collections); show_collections(child_collections);
} }
}; };
this.hide = function () { this.hide = function () {
@@ -218,7 +230,7 @@ export class CollectionsScene {
new_btn.onclick = null; new_btn.onclick = null;
upload_btn.onclick = null; upload_btn.onclick = null;
incomingshares_btn.onclick = null; incomingshares_btn.onclick = null;
collections = null; child_collections = null;
// remove collection // remove collection
nodes.forEach(function (node) { nodes.forEach(function (node) {
node.parentNode.removeChild(node); node.parentNode.removeChild(node);
@@ -231,7 +243,7 @@ export class CollectionsScene {
collections_req.abort(); collections_req.abort();
collections_req = null; collections_req = null;
} }
collections = null; child_collections = null;
}; };
} }
} }

4
radicale/web/internal_data/js/scenes/LoginScene.js
View File

@@ -72,7 +72,7 @@ export class LoginScene {
// Fetch principal // Fetch principal
let loading_scene = new LoadingScene(); let loading_scene = new LoadingScene();
push_scene(loading_scene, false); push_scene(loading_scene, false);
principal_req = get_principal(user, password, function (collection, error1) { principal_req = get_principal(user, password, function (principal_collection, error1) {
if (scene_index === null) { if (scene_index === null) {
return; return;
} }
@@ -85,7 +85,7 @@ export class LoginScene {
let saved_user = user; let saved_user = user;
user = ""; user = "";
let collections_scene = new CollectionsScene( let collections_scene = new CollectionsScene(
saved_user, password, collection, function (error1) { saved_user, password, principal_collection, function (error1) {
errorHandler.setError(error1); errorHandler.setError(error1);
user = saved_user; user = saved_user;
}); });