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

expose server version via PROPFIND on root collection and display in the UI for authenticated users

Browse Source
This commit is contained in:
Max Berger
2026-04-29 23:13:36 +02:00
parent 98d9257b84
commit cdf9e62e0b
7 changed files with 68 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
radicale/web/internal_data/css/main.css
View File

@@ -179,6 +179,17 @@ summary:hover {
float: left;
}
#logoutview .version {
float: right !important;
width: auto !important;
margin-right: 10px;
position: relative;
right: 25px;
font-size: 0.8em;
color: #999;
line-height: 2.2em;
}
#collectionsscene {
display: flex;
flex-direction: row;

1
radicale/web/internal_data/index.html
View File

@@ -22,6 +22,7 @@
<span data-name="user"></span>
<a href="#" class="green" data-name="refresh" title="Refresh">Refresh</a>
<a href="#" class="red" data-name="logout" title="Logout">Logout</a>
<span data-name="version" class="version"></span>
</nav>
<main>

9
radicale/web/internal_data/js/api/api.js
View File

@@ -42,6 +42,7 @@ export function get_principal(user, password, callback) {
if (xml) {
let principal_element = xml.querySelector("*|multistatus:root > *|response:first-of-type > *|propstat > *|prop > *|current-user-principal > *|href");
let displayname_element = xml.querySelector("*|multistatus:root > *|response:first-of-type > *|propstat > *|prop > *|displayname");
let version_element = xml.querySelector("*|multistatus:root > *|response:first-of-type > *|propstat > *|prop > *|version");
if (principal_element) {
callback(new Collection(
principal_element.textContent,
@@ -52,7 +53,8 @@ export function get_principal(user, password, callback) {
0,
0,
"",
[]), null,);
[],
version_element ? version_element.textContent : ""), null,);
} else {
callback(null, "No valid XML received")
}
@@ -64,10 +66,11 @@ export function get_principal(user, password, callback) {
}
};
request.send('<?xml version="1.0" encoding="utf-8" ?>' +
'<propfind xmlns="DAV:">' +
'<propfind xmlns="DAV:" xmlns:RADICALE="http://radicale.org/ns/">' +
'<prop>' +
'<current-user-principal />' +
'<displayname />' +
'<RADICALE:version />' +
'</prop>' +
'</propfind>');
return request;
@@ -259,7 +262,7 @@ function _parse_collection(response, collection_href) {
}
if (href.endsWith("/") && href !== collection_href && type) {
return new Collection(href, type, displayname, description, sane_color, count, size, source, permissions);
return new Collection(href, type, displayname, description, sane_color, count, size, source, permissions, "");
}
return null;
}

4
radicale/web/internal_data/js/models/collection.js
View File

@@ -123,8 +123,9 @@ export class Collection {
* @param {number} size
* @param {string} source
* @param {Array<string>} permissions
* @param {string} version
*/
constructor(href, type, displayname, description, color, contentcount, size, source, permissions) {
constructor(href, type, displayname, description, color, contentcount, size, source, permissions, version = "") {
this.href = href;
this.type = type;
this.displayname = displayname;
@@ -134,6 +135,7 @@ export class Collection {
this.contentcount = contentcount;
this.size = size;
this.permissions = permissions;
this.version = version;
}
has_permission(/** @type {string} */ permission) {

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

@@ -44,6 +44,7 @@ export class LoginScene {
this._logout_view = get_element_by_id("logoutview");
this._logout_user_form = get_element(this._logout_view, "[data-name=user]");
this._logout_btn = get_element(this._logout_view, "[data-name=logout]");
this._logout_version_form = get_element(this._logout_view, "[data-name=version]");
this._refresh_btn = get_element(this._logout_view, "[data-name=refresh]");
this._user = "";
@@ -91,6 +92,11 @@ export class LoginScene {
pop_scene();
} else if (principal_collection) {
this._logout_user_form.textContent = extract_title(principal_collection) + "'s Collections";
if (principal_collection.version) {
this._logout_version_form.textContent = "Radicale v" + principal_collection.version;
} else {
this._logout_version_form.textContent = "";
}
// clear error on successful login
this._errorHandler.clearError();