From 69a6a61ef83060f46d0a29ad98651948a6a164b5 Mon Sep 17 00:00:00 2001 From: Max Berger Date: Sat, 28 Mar 2026 09:36:29 +0100 Subject: [PATCH] Remove legacy sharing from frontend --- radicale/sharing/__init__.py | 2 -- radicale/web/internal_data/js/scenes/CollectionsScene.js | 3 +-- radicale/web/internal_data/js/scenes/IncomingSharingScene.js | 3 +-- radicale/web/internal_data/js/scenes/ShareCollectionScene.js | 3 +-- 4 files changed, 3 insertions(+), 8 deletions(-) diff --git a/radicale/sharing/__init__.py b/radicale/sharing/__init__.py index faee74a7..3ad3d35e 100644 --- a/radicale/sharing/__init__.py +++ b/radicale/sharing/__init__.py @@ -16,11 +16,9 @@ # along with Radicale. If not, see . import base64 -import copy # TODO: remove/3.7.0-final import io import json import logging -import os # TODO: remove/3.7.0-final import re import socket import uuid diff --git a/radicale/web/internal_data/js/scenes/CollectionsScene.js b/radicale/web/internal_data/js/scenes/CollectionsScene.js index c37a233c..a22c6324 100644 --- a/radicale/web/internal_data/js/scenes/CollectionsScene.js +++ b/radicale/web/internal_data/js/scenes/CollectionsScene.js @@ -183,8 +183,7 @@ export class CollectionsScene { let share_info = get_element(node, "[data-name=shared-by]"); let transformed_from = get_element(node, "[data-name=transformed-from]"); let share = (shares || []).find( - // TODO: Eventually remove the check for "bday" - s => (s.ShareType === "map" || s.ShareType === "bday") && + s => (s.ShareType === "map") && (s.PathOrToken || "").replace(/\/+$/, "") === (collection.href || "").replace(/\/+$/, "")); if (share) { if (share.Owner !== user) { diff --git a/radicale/web/internal_data/js/scenes/IncomingSharingScene.js b/radicale/web/internal_data/js/scenes/IncomingSharingScene.js index 557ab0ff..608cd71e 100644 --- a/radicale/web/internal_data/js/scenes/IncomingSharingScene.js +++ b/radicale/web/internal_data/js/scenes/IncomingSharingScene.js @@ -99,8 +99,7 @@ export class IncomingSharingScene { let prefix = "/" + user + "/"; let filtered_shares = shares.filter( - // TODO: Eventually remove bday - share => (share.ShareType === "map" || share.ShareType === "bday") + share => (share.ShareType === "map") && share.PathOrToken.startsWith(prefix)); if (filtered_shares.length === 0) { diff --git a/radicale/web/internal_data/js/scenes/ShareCollectionScene.js b/radicale/web/internal_data/js/scenes/ShareCollectionScene.js index befe225c..99c5d301 100644 --- a/radicale/web/internal_data/js/scenes/ShareCollectionScene.js +++ b/radicale/web/internal_data/js/scenes/ShareCollectionScene.js @@ -225,8 +225,7 @@ function add_share_rows(user, password, collection, shares, errorHandler) { if (share["ShareType"] === "token") { add_share_row_node(user, password, collection, share, token_template, "share", delete_share_by_token, errorHandler); } - // TODO: Eventually remove bday - else if (share["ShareType"] === "map" || share["ShareType"] === "bday") { + else if (share["ShareType"] === "map") { add_share_row_node(user, password, collection, share, map_template, "map", delete_share_by_map, errorHandler); } }