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

Unify deletion confirmation to use web dialog for share deletion as well

Browse Source
This commit is contained in:
Max Berger
2026-03-18 21:56:37 +01:00
parent f4dd3c5d50
commit f4ee4f7060
7 changed files with 80 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
integ_tests/test_delete.py
View File

@@ -41,18 +41,18 @@ def test_delete_wrong_confirmation(page: Page, radicale_server: str) -> None:
page.click('article:not(.hidden) a[data-name="delete"]', force=True)
# Input wrong confirmation
page.fill('#deletecollectionscene input[data-name="confirmationtxt"]', "foo")
page.click('#deletecollectionscene button[data-name="delete"]')
page.fill('#deleteconfirmationscene input[data-name="confirmationtxt"]', "foo")
page.click('#deleteconfirmationscene button[data-name="delete"]')
# Check for error message
error_locator = page.locator('#deletecollectionscene span[data-name="error"]')
error_locator = page.locator('#deleteconfirmationscene span[data-name="error"]')
expect(error_locator).to_be_visible()
expect(error_locator).to_contain_text(
"Please type DELETE in the confirmation field"
)
# Scene should still be visible
expect(page.locator("#deletecollectionscene")).to_be_visible()
expect(page.locator("#deleteconfirmationscene")).to_be_visible()
def test_delete_correct_confirmation(page: Page, radicale_server: str) -> None:
@@ -67,11 +67,11 @@ def test_delete_correct_confirmation(page: Page, radicale_server: str) -> None:
page.click('article:not(.hidden) a[data-name="delete"]', force=True)
# Input correct confirmation
page.fill('#deletecollectionscene input[data-name="confirmationtxt"]', "DELETE")
page.click('#deletecollectionscene button[data-name="delete"]')
page.fill('#deleteconfirmationscene input[data-name="confirmationtxt"]', "DELETE")
page.click('#deleteconfirmationscene button[data-name="delete"]')
# Verify collection is gone
expect(page.locator("article:not(.hidden)")).to_have_count(0)
# Scene should be hidden
expect(page.locator("#deletecollectionscene")).to_be_hidden()
expect(page.locator("#deleteconfirmationscene")).to_be_hidden()

16
integ_tests/test_scenes.py
View File

@@ -68,10 +68,10 @@ def test_navigation_delete_collection_cancel(page: Page, radicale_server: str) -
page.hover("article:not(.hidden)")
page.click('article:not(.hidden) a[data-name="delete"]', force=True)
expect(page.locator("#deletecollectionscene")).to_be_visible()
expect(page.locator("#deleteconfirmationscene")).to_be_visible()
page.click('#deletecollectionscene button[data-name="cancel"]')
expect(page.locator("#deletecollectionscene")).to_be_hidden()
page.click('#deleteconfirmationscene button[data-name="cancel"]')
expect(page.locator("#deleteconfirmationscene")).to_be_hidden()
expect(page.locator("#collectionsscene")).to_be_visible()
@@ -82,18 +82,18 @@ def test_navigation_delete_collection_confirm(page: Page, radicale_server: str)
page.hover("article:not(.hidden)")
page.click('article:not(.hidden) a[data-name="delete"]', force=True)
expect(page.locator("#deletecollectionscene")).to_be_visible()
expect(page.locator("#deleteconfirmationscene")).to_be_visible()
# We need to fill the confirmation text
confirmation_text = page.locator(
"#deletecollectionscene [data-name='deleteconfirmationtext']"
"#deleteconfirmationscene [data-name='deleteconfirmationtext']"
).inner_text()
page.locator("#deletecollectionscene input[data-name='confirmationtxt']").fill(
page.locator("#deleteconfirmationscene input[data-name='confirmationtxt']").fill(
confirmation_text
)
page.click('#deletecollectionscene button[data-name="delete"]')
page.click('#deleteconfirmationscene button[data-name="delete"]')
expect(page.locator("#deletecollectionscene")).to_be_hidden()
expect(page.locator("#deleteconfirmationscene")).to_be_hidden()
expect(page.locator("#collectionsscene")).to_be_visible()
expect(page.locator("article:not(.hidden)")).to_have_count(0)

16
integ_tests/test_sharing.py
View File

@@ -52,8 +52,8 @@ def test_create_and_delete_share_by_key(page: Page, radicale_server: str) -> Non
"tr[data-name='sharetokenrowtemplate']:not(.hidden) span[data-name='ro']"
)
).to_be_visible()
page.once("dialog", lambda dialog: dialog.accept())
page.click('tr:not(.hidden) button[data-name="delete"]', strict=True)
page.click('#deleteconfirmationscene button[data-name="delete"]')
expect(
page.locator("tr[data-name='sharetokenrowtemplate']:not(.hidden)")
).to_have_count(0)
@@ -68,8 +68,8 @@ def test_create_and_delete_share_by_key(page: Page, radicale_server: str) -> Non
"tr[data-name='sharetokenrowtemplate']:not(.hidden) span[data-name='rw']"
)
).to_be_visible()
page.once("dialog", lambda dialog: dialog.accept())
page.click('tr:not(.hidden) button[data-name="delete"]', strict=True)
page.click('#deleteconfirmationscene button[data-name="delete"]')
expect(
page.locator("tr[data-name='sharetokenrowtemplate']:not(.hidden)")
).to_have_count(0)
@@ -97,8 +97,8 @@ def test_create_and_delete_share_by_map(page: Page, radicale_server: str) -> Non
"tr[data-name='sharemaprowtemplate']:not(.hidden) span[data-name='ro']"
)
).to_be_visible()
page.once("dialog", lambda dialog: dialog.accept())
page.click('tr:not(.hidden) button[data-name="delete"]', strict=True)
page.click('#deleteconfirmationscene button[data-name="delete"]')
expect(
page.locator("tr[data-name='sharemaprowtemplate']:not(.hidden)")
).to_have_count(0)
@@ -115,8 +115,8 @@ def test_create_and_delete_share_by_map(page: Page, radicale_server: str) -> Non
"tr[data-name='sharemaprowtemplate']:not(.hidden) span[data-name='rw']"
)
).to_be_visible()
page.once("dialog", lambda dialog: dialog.accept())
page.click('tr:not(.hidden) button[data-name="delete"]', strict=True)
page.click('#deleteconfirmationscene button[data-name="delete"]')
expect(
page.locator("tr[data-name='sharemaprowtemplate']:not(.hidden)")
).to_have_count(0)
@@ -192,8 +192,12 @@ def test_share_journal_no_overrides(page: Page, radicale_server: str) -> None:
# Verify property override visibility
expect(page.locator('fieldset[data-name="properties_override"]')).to_be_visible()
expect(page.locator('input[data-name="displayname_override_enabled"]')).to_be_visible()
expect(page.locator('input[data-name="description_override_enabled"]')).to_be_hidden()
expect(
page.locator('input[data-name="displayname_override_enabled"]')
).to_be_visible()
expect(
page.locator('input[data-name="description_override_enabled"]')
).to_be_hidden()
expect(page.locator('input[data-name="color_override_enabled"]')).to_be_hidden()
# Create the share

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

@@ -344,9 +344,9 @@
<br>
</section>
<section id="deletecollectionscene" class="container hidden">
<h1>Delete Collection</h1>
<p>To delete the collection <span class="title" data-name="title">title</span> please enter the phrase <strong
<section id="deleteconfirmationscene" class="container hidden">
<h1 data-name="headertitle">Delete Collection</h1>
<p data-name="confirmationprompt">To delete the collection <span class="title" data-name="title">title</span> please enter the phrase <strong
data-name="deleteconfirmationtext"></strong> in the box below:</p>
<input type="text" class="deleteconfirmationtxt" data-name="confirmationtxt" />
<p class="red">WARNING: This action cannot be reversed.</p>

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

@@ -19,12 +19,13 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
import { delete_collection } from "../api/api.js";
import { SERVER } from "../constants.js";
import { Collection, CollectionType } from "../models/collection.js";
import { collectionsCache } from "../utils/collections_cache.js";
import { bytesToHumanReadable } from "../utils/misc.js";
import { CreateEditCollectionScene } from "./CreateEditCollectionScene.js";
import { DeleteCollectionScene } from "./DeleteCollectionScene.js";
import { DeleteConfirmationScene } from "./DeleteConfirmationScene.js";
import { IncomingSharingScene } from "./IncomingSharingScene.js";
import { Scene, push_scene } from "./scene_manager.js";
import { ShareCollectionScene, maybe_enable_sharing_options } from "./ShareCollectionScene.js";
@@ -111,7 +112,10 @@ export class CollectionsScene {
*/
function ondelete(collection) {
try {
let delete_collection_scene = new DeleteCollectionScene(user, password, collection);
let delete_collection_scene = new DeleteConfirmationScene(
user, password, "Delete Collection", collection, collection.displayname || collection.href,
delete_collection, true
);
push_scene(delete_collection_scene);
} catch (err) {
console.error(err);

55
radicale/web/internal_data/js/scenes/DeleteCollectionScene.js → radicale/web/internal_data/js/scenes/DeleteConfirmationScene.js
View File

@@ -19,62 +19,83 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
import { delete_collection } from "../api/api.js";
import { DELETE_CONFIRMATION_TEXT } from "../constants.js";
import { Collection } from "../models/collection.js";
import { collectionsCache } from "../utils/collections_cache.js";
import { ErrorHandler } from "../utils/error.js";
import { FormValidator, validate_equals } from "../utils/form_validator.js";
import { LoadingScene } from "./LoadingScene.js";
import { Scene, is_current_scene, pop_scene, pop_to_parent, push_scene } from "./scene_manager.js";
import { Scene, is_current_scene, pop_scene, push_scene } from "./scene_manager.js";
/**
* @implements {Scene}
*/
export class DeleteCollectionScene {
export class DeleteConfirmationScene {
/**
* @param {string} user
* @param {string} password
* @param {Collection} collection
* @param {string} header_title
* @param {any} item
* @param {string} item_title
* @param {function} delete_action
* @param {boolean} needsconfirmation
* @param {function} [on_success]
*/
constructor(user, password, collection) {
/** @type {HTMLElement} */ let html_scene = document.getElementById("deletecollectionscene");
constructor(user, password, header_title, item, item_title, delete_action, needsconfirmation, on_success) {
/** @type {HTMLElement} */ let html_scene = document.getElementById("deleteconfirmationscene");
/** @type {HTMLElement} */ let header_html = html_scene.querySelector("[data-name=headertitle]");
if (header_html) header_html.textContent = header_title;
/** @type {HTMLElement} */ let title_form = html_scene.querySelector("[data-name=title]");
/** @type {HTMLElement} */ let error_form = html_scene.querySelector("[data-name=error]");
/** @type {HTMLElement} */ let confirmation_prompt = html_scene.querySelector("[data-name=confirmationprompt]");
/** @type {HTMLInputElement} */ let confirmation_txt = html_scene.querySelector("[data-name=confirmationtxt]");
/** @type {HTMLElement} */ let delete_confirmation_lbl = html_scene.querySelector("[data-name=deleteconfirmationtext]");
/** @type {HTMLElement} */ let delete_btn = html_scene.querySelector("[data-name=delete]");
/** @type {HTMLElement} */ let cancel_btn = html_scene.querySelector("[data-name=cancel]");
delete_confirmation_lbl.innerHTML = DELETE_CONFIRMATION_TEXT;
confirmation_txt.value = "";
confirmation_txt.addEventListener("keydown", onkeydown);
if (needsconfirmation) {
delete_confirmation_lbl.innerHTML = DELETE_CONFIRMATION_TEXT;
confirmation_txt.value = "";
confirmation_txt.addEventListener("keydown", onkeydown);
confirmation_prompt.classList.remove("hidden");
confirmation_txt.classList.remove("hidden");
} else {
confirmation_prompt.classList.add("hidden");
confirmation_txt.classList.add("hidden");
confirmation_txt.removeEventListener("keydown", onkeydown);
}
/** @type {?XMLHttpRequest} */ let delete_req = null;
let errorHandler = new ErrorHandler(error_form);
let validator = new FormValidator(errorHandler);
validator.addValidator(confirmation_txt, validate_equals(confirmation_txt, DELETE_CONFIRMATION_TEXT, "confirmation"));
if (needsconfirmation) {
validator.addValidator(confirmation_txt, validate_equals(confirmation_txt, DELETE_CONFIRMATION_TEXT, "confirmation"));
}
function ondelete() {
if (!validator.validate()) {
if (needsconfirmation && !validator.validate()) {
return false;
}
try {
let loading_scene = new LoadingScene();
push_scene(loading_scene);
delete_req = delete_collection(user, password, collection, function (error1) {
delete_req = delete_action(user, password, item, function (error1) {
if (!is_current_scene(loading_scene)) {
return;
}
delete_req = null;
if (error1) {
errorHandler.setError(error1);
pop_scene();
errorHandler.setError(error1);
} else {
collectionsCache.invalidate();
pop_to_parent();
pop_scene();
if (on_success) {
on_success();
} else {
collectionsCache.invalidate();
pop_scene();
}
}
});
} catch (err) {
@@ -102,7 +123,7 @@ export class DeleteCollectionScene {
this.show = function () {
this.release();
html_scene.classList.remove("hidden");
title_form.textContent = collection.displayname || collection.href;
title_form.textContent = item_title;
delete_btn.onclick = ondelete;
cancel_btn.onclick = oncancel;
validator.validate();

22
radicale/web/internal_data/js/scenes/ShareCollectionScene.js
View File

@@ -29,6 +29,7 @@ import { collectionsCache } from "../utils/collections_cache.js";
import { ErrorHandler } from "../utils/error.js";
import { displayPermissions } from "../utils/permissions.js";
import { CreateEditShareScene } from "./CreateEditShareScene.js";
import { DeleteConfirmationScene } from "./DeleteConfirmationScene.js";
import { Scene, pop_scene, push_scene } from "./scene_manager.js";
/**
@@ -188,21 +189,14 @@ function add_share_row_node(user, password, collection, share, template, delete_
/** @type {HTMLElement} */ let delete_btn = node.querySelector("[data-name=delete]");
delete_btn.onclick = function () {
if (!confirm("Are you sure you want to delete " + delete_label + " " + pathortoken + "?")) {
return;
}
delete_action(
user,
password,
share,
function (error) {
if (error) {
errorHandler.setError(error);
} else {
update_share_list(user, password, collection, errorHandler);
}
},
let delete_collection_scene = new DeleteConfirmationScene(
user, password, "Delete Share", share, delete_label + " " + pathortoken, delete_action, false,
function () {
pop_scene();
update_share_list(user, password, collection, errorHandler);
}
);
push_scene(delete_collection_scene);
};
template.parentNode.insertBefore(node, template);