almet/umap
1
0
Fork 0
mirror of https://github.com/umap-project/umap.git synced 2025-04-28 19:42:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

feat: remove confirm for datalayer delete

Browse source 
Now that we have granular undo, no needs for this I'd say.
This commit is contained in:
Yohan Boniface 2025-04-07 10:35:39 +02:00
parent 190cac3105
commit a2749ce805
4 changed files with 7 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
umap/static/umap/js/modules/data/layer.js
View file

@ -1237,23 +1237,14 @@ export class DataLayer {
translate('Delete layer') translate('Delete layer')
) )
if (this.isReadOnly()) { if (this.isReadOnly()) {
DomUtil.addClass(container, 'readonly') container.classList.add('readonly')
} else { } else {
DomEvent.on(edit, 'click', this.edit, this) edit.addEventListener('click', () => this.edit())
DomEvent.on(table, 'click', this.tableEdit, this) table.addEventListener('click', () => this.tableEdit())
DomEvent.on( remove.addEventListener('click', () => {
remove, if (!this.isVisible()) return
'click', this.del()
function () { })
if (!this.isVisible()) return
this._umap.dialog
.confirm(translate('Are you sure you want to delete this layer?'))
.then(() => {
this.del()
})
},
this
)
} }
DomEvent.on(toggle, 'click', () => this.toggle()) DomEvent.on(toggle, 'click', () => this.toggle())
DomEvent.on(zoomTo, 'click', this.zoomTo, this) DomEvent.on(zoomTo, 'click', this.zoomTo, this)

3
umap/tests/integration/test_edit_datalayer.py
View file

@ -61,7 +61,6 @@ def test_cancel_deleting_datalayer_should_restore(
expect(markers).to_have_count(1) expect(markers).to_have_count(1)
page.get_by_role("button", name="Manage layers").click() page.get_by_role("button", name="Manage layers").click()
page.locator(".panel.right").get_by_title("Delete layer").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(markers).to_have_count(0)
expect(page.get_by_text("test datalayer")).to_be_hidden() expect(page.get_by_text("test datalayer")).to_be_hidden()
page.get_by_role("button", name="Undo").click() 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(panel.get_by_text("test datalayer")).to_be_visible()
expect(edit_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.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(panel.get_by_text("test datalayer")).to_be_hidden()
expect(edit_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() page.get_by_role("button", name="Manage layers").click()
expect(panel.get_by_text("test datalayer")).to_be_visible() expect(panel.get_by_text("test datalayer")).to_be_visible()
page.locator(".panel.right").get_by_title("Delete layer").click() 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(panel.get_by_text("test datalayer")).to_be_hidden()

1
umap/tests/integration/test_owned_map.py
View file

@ -241,7 +241,6 @@ def test_can_delete_datalayer(live_server, map, login, datalayer):
expect(markers).to_have_count(1) expect(markers).to_have_count(1)
page.get_by_role("button", name="Manage layers").click() page.get_by_role("button", name="Manage layers").click()
page.locator(".panel.right").get_by_title("Delete layer").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/.*")): with page.expect_response(re.compile(r".*/datalayer/delete/.*")):
page.get_by_role("button", name="Save").click() page.get_by_role("button", name="Save").click()
expect(markers).to_have_count(0) expect(markers).to_have_count(0)

1
umap/tests/integration/test_websocket_sync.py
View file

@ -485,7 +485,6 @@ def test_should_sync_datalayers_delete(new_page, asgi_live_server, tilelayer):
# Delete "datalayer 2" in peerA # Delete "datalayer 2" in peerA
peerA.locator(".datalayer").get_by_role("button", name="Delete layer").first.click() 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(peerA.locator(".panel").get_by_text("datalayer 2")).to_be_hidden()
expect(peerB.locator(".panel").get_by_text("datalayer 2")).to_be_hidden() expect(peerB.locator(".panel").get_by_text("datalayer 2")).to_be_hidden()