diff --git a/umap/static/umap/js/modules/data/layer.js b/umap/static/umap/js/modules/data/layer.js index febef6dc..f05b2ce3 100644 --- a/umap/static/umap/js/modules/data/layer.js +++ b/umap/static/umap/js/modules/data/layer.js @@ -1237,23 +1237,14 @@ export class DataLayer { translate('Delete layer') ) if (this.isReadOnly()) { - DomUtil.addClass(container, 'readonly') + container.classList.add('readonly') } else { - DomEvent.on(edit, 'click', this.edit, this) - DomEvent.on(table, 'click', this.tableEdit, this) - DomEvent.on( - remove, - 'click', - function () { - if (!this.isVisible()) return - this._umap.dialog - .confirm(translate('Are you sure you want to delete this layer?')) - .then(() => { - this.del() - }) - }, - this - ) + edit.addEventListener('click', () => this.edit()) + table.addEventListener('click', () => this.tableEdit()) + remove.addEventListener('click', () => { + if (!this.isVisible()) return + this.del() + }) } DomEvent.on(toggle, 'click', () => this.toggle()) DomEvent.on(zoomTo, 'click', this.zoomTo, this) diff --git a/umap/tests/integration/test_edit_datalayer.py b/umap/tests/integration/test_edit_datalayer.py index bd06ca87..9477d7eb 100644 --- a/umap/tests/integration/test_edit_datalayer.py +++ b/umap/tests/integration/test_edit_datalayer.py @@ -61,7 +61,6 @@ def test_cancel_deleting_datalayer_should_restore( expect(markers).to_have_count(1) page.get_by_role("button", name="Manage layers").click() page.locator(".panel.right").get_by_title("Delete layer").click() - page.get_by_role("button", name="OK").click() expect(markers).to_have_count(0) expect(page.get_by_text("test datalayer")).to_be_hidden() page.get_by_role("button", name="Undo").click() @@ -203,7 +202,6 @@ def test_deleting_datalayer_should_remove_from_browser_and_layers_list( expect(panel.get_by_text("test datalayer")).to_be_visible() expect(edit_panel.get_by_text("test datalayer")).to_be_visible() page.locator(".panel.right").get_by_title("Delete layer").click() - page.get_by_role("button", name="OK").click() expect(panel.get_by_text("test datalayer")).to_be_hidden() expect(edit_panel.get_by_text("test datalayer")).to_be_hidden() @@ -217,7 +215,6 @@ def test_deleting_datalayer_should_remove_from_caption( page.get_by_role("button", name="Manage layers").click() expect(panel.get_by_text("test datalayer")).to_be_visible() page.locator(".panel.right").get_by_title("Delete layer").click() - page.get_by_role("button", name="OK").click() expect(panel.get_by_text("test datalayer")).to_be_hidden() diff --git a/umap/tests/integration/test_owned_map.py b/umap/tests/integration/test_owned_map.py index 57ed5ca0..0e0af0bc 100644 --- a/umap/tests/integration/test_owned_map.py +++ b/umap/tests/integration/test_owned_map.py @@ -241,7 +241,6 @@ def test_can_delete_datalayer(live_server, map, login, datalayer): expect(markers).to_have_count(1) page.get_by_role("button", name="Manage layers").click() page.locator(".panel.right").get_by_title("Delete layer").click() - page.get_by_role("button", name="OK").click() with page.expect_response(re.compile(r".*/datalayer/delete/.*")): page.get_by_role("button", name="Save").click() expect(markers).to_have_count(0) diff --git a/umap/tests/integration/test_websocket_sync.py b/umap/tests/integration/test_websocket_sync.py index bae3c167..ec50be44 100644 --- a/umap/tests/integration/test_websocket_sync.py +++ b/umap/tests/integration/test_websocket_sync.py @@ -485,7 +485,6 @@ def test_should_sync_datalayers_delete(new_page, asgi_live_server, tilelayer): # Delete "datalayer 2" in peerA peerA.locator(".datalayer").get_by_role("button", name="Delete layer").first.click() - peerA.get_by_role("button", name="OK").click() expect(peerA.locator(".panel").get_by_text("datalayer 2")).to_be_hidden() expect(peerB.locator(".panel").get_by_text("datalayer 2")).to_be_hidden()