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

wip(importer): use only one submit button and be smarter to guess action

Browse source
This commit is contained in:
Yohan Boniface 2024-06-05 18:37:02 +02:00
parent 8dd1c4bc7f
commit 35189cc9fb
3 changed files with 104 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
umap/static/umap/base.css
View file

@ -300,6 +300,10 @@ input + .help-text {
.formbox select { .formbox select {
width: calc(100% - 14px); width: calc(100% - 14px);
} }
fieldset.formbox {
border: none;
border-top: 1px solid var(--color-lightGray);
}
label { label {
display: block; display: block;
font-size: 12px; font-size: 12px;

68
umap/static/umap/js/modules/importer.js
View file

@ -6,33 +6,41 @@ import { SCHEMA } from './schema.js'
const TEMPLATE = ` const TEMPLATE = `
<h3><i class="icon icon-16 icon-upload"></i><span>${translate('Add data')}</span></h3> <h3><i class="icon icon-16 icon-upload"></i><span>${translate('Add data')}</span></h3>
<label class="counter">${translate('Choose data')}</label> <fieldset class="formbox">
<div class="formbox"> <legend class="counter">${translate('Choose data')}</legend>
<input type="file" multiple autofocus onchange /> <input type="file" multiple autofocus onchange />
<input type="url" placeholder="${translate('Provide an URL here')}" onchange /> <input type="url" placeholder="${translate('Provide an URL here')}" onchange />
<textarea onchange placeholder="${translate('Paste your data here')}"></textarea> <textarea onchange placeholder="${translate('Paste your data here')}"></textarea>
</div> <div class="importers">
<div class="importers"> <h5>${translate('Import helpers:')}</h5>
<h5>${translate('Import helpers:')}</h5> <div class="button-bar by4" id="importers">
<div class="button-bar by4" id="importers"> </div>
</div> </div>
</div> </fieldset>
<label class="counter">${translate('Choose the data format')} <fieldset class="formbox">
<legend class="counter">${translate('Choose the data format')}</legend>
<select name="format" onchange></select> <select name="format" onchange></select>
</label> </fieldset>
<div class="destination"> <fieldset class="destination formbox">
<label class="counter">${translate('Choose the layer to import in')} <legend class="counter">${translate('Choose the layer to import in')}</legend>
<select name="layer-id"></select> <select name="layer-id"></select>
<label>
<input type="checkbox" name="clear" />
${translate('Replace layer content')}
</label>
</fieldset>
<fieldset class="import-mode formbox">
<legend class="counter">${translate('Choose import mode')}</legend>
<label>
<input type="radio" name="action" value="copy" />
${translate('Copy into the layer')}
</label> </label>
<label> <label>
${translate('Replace layer content')} <input type="radio" name="action" value="link" />
<input type="checkbox" name="clear" /> ${translate('Link to the layer as remote data')}
</label> </label>
</div> </fieldset>
<label class="counter">${translate('Choose import mode')}</label> <input type="button" class="button" name="submit" value="${translate('Add data')}" />
<input type="button" class="button" name="copy" value="${translate('Copy into the layer')}" />
<input hidden type="button" class="button" name="link" value="${translate('Link to the layer as remote data')}" />
<input hidden type="button" class="button" name="full" value="${translate('Import full map data')}" />
` `
export default class Importer { export default class Importer {
@ -86,6 +94,10 @@ export default class Importer {
return Boolean(this.qs('[name=clear]').checked) return Boolean(this.qs('[name=clear]').checked)
} }
get action() {
return this.qs('[name=action]:checked').value
}
get layer() { get layer() {
const layerId = this.qs('[name=layer-id]').value const layerId = this.qs('[name=layer-id]').value
return this.map.datalayers[layerId] || this.map.createDataLayer() return this.map.datalayers[layerId] || this.map.createDataLayer()
@ -113,9 +125,7 @@ export default class Importer {
textContent: type, textContent: type,
}) })
} }
DomEvent.on(this.qs('[name=copy]'), 'click', this.copy, this) DomEvent.on(this.qs('[name=submit]'), 'click', this.submit, this)
DomEvent.on(this.qs('[name=link]'), 'click', this.link, this)
DomEvent.on(this.qs('[name=full]'), 'click', this.full, this)
DomEvent.on(this.qs('[type=file]'), 'change', this.onFileChange, this) DomEvent.on(this.qs('[type=file]'), 'change', this.onFileChange, this)
for (const element of this.container.querySelectorAll('[onchange]')) { for (const element of this.container.querySelectorAll('[onchange]')) {
DomEvent.on(element, 'change', this.onChange, this) DomEvent.on(element, 'change', this.onChange, this)
@ -123,13 +133,8 @@ export default class Importer {
} }
onChange() { onChange() {
this.qs('[name=link]').toggleAttribute(
'hidden',
!this.url || this.format === 'umap'
)
this.qs('[name=full]').toggleAttribute('hidden', this.format !== 'umap')
this.qs('[name=copy]').toggleAttribute('hidden', this.format === 'umap')
this.qs('.destination').toggleAttribute('hidden', this.format === 'umap') this.qs('.destination').toggleAttribute('hidden', this.format === 'umap')
this.qs('.import-mode').toggleAttribute('hidden', this.format === 'umap' || !this.url)
} }
onFileChange(e) { onFileChange(e) {
@ -181,8 +186,13 @@ export default class Importer {
this.fileInput.showPicker() this.fileInput.showPicker()
} }
submit() {
if (this.format === 'umap') this.full()
else if (!this.url) this.copy()
else if (this.action) this[this.action]()
}
full() { full() {
if (this.format !== 'umap') return
this.map.once('postsync', this.map._setDefaultCenter) this.map.once('postsync', this.map._setDefaultCenter)
try { try {
if (this.files.length) { if (this.files.length) {

97
umap/tests/integration/test_import.py
View file

@ -17,20 +17,16 @@ def test_layers_list_is_updated(live_server, tilelayer, page):
modifier = "Cmd" if platform.system() == "Darwin" else "Ctrl" modifier = "Cmd" if platform.system() == "Darwin" else "Ctrl"
page.get_by_role("link", name=f"Import data ({modifier}+I)").click() page.get_by_role("link", name=f"Import data ({modifier}+I)").click()
# Should work # Should work
page.get_by_label("Choose the layer to import").select_option( page.locator("[name=layer-id]").select_option(label="Import in a new layer")
label="Import in a new layer"
)
page.get_by_role("link", name="Manage layers").click() page.get_by_role("link", name="Manage layers").click()
page.get_by_role("button", name="Add a layer").click() page.get_by_role("button", name="Add a layer").click()
page.locator('input[name="name"]').click() page.locator('input[name="name"]').click()
page.locator('input[name="name"]').fill("foobar") page.locator('input[name="name"]').fill("foobar")
page.get_by_role("link", name=f"Import data ({modifier}+I)").click() page.get_by_role("link", name=f"Import data ({modifier}+I)").click()
# Should still work # Should still work
page.get_by_label("Choose the layer to import").select_option( page.locator("[name=layer-id]").select_option(label="Import in a new layer")
label="Import in a new layer"
)
# Now layer should be visible in the options # Now layer should be visible in the options
page.get_by_label("Choose the layer to import").select_option(label="foobar") page.locator("[name=layer-id]").select_option(label="foobar")
expect( expect(
page.get_by_role("button", name="Import full map data", exact=True) page.get_by_role("button", name="Import full map data", exact=True)
).to_be_hidden() ).to_be_hidden()
@ -48,12 +44,13 @@ def test_umap_import_from_file(live_server, tilelayer, page):
file_chooser = fc_info.value file_chooser = fc_info.value
path = Path(__file__).parent.parent / "fixtures/display_on_load.umap" path = Path(__file__).parent.parent / "fixtures/display_on_load.umap"
file_chooser.set_files(path) file_chooser.set_files(path)
button = page.get_by_role("button", name="Import full map data", exact=True)
expect( expect(
page.get_by_role("button", name="Copy into the layer", exact=True) page.get_by_role("button", name="Copy into the layer", exact=True)
).to_be_hidden() ).to_be_hidden()
expect(button).to_be_visible() expect(
button.click() page.get_by_role("button", name="Link to the layer as remote data", exact=True)
).to_be_hidden()
page.get_by_role("button", name="Add data", exact=True).click()
assert file_input.input_value() assert file_input.input_value()
# Close the import panel # Close the import panel
page.keyboard.press("Escape") page.keyboard.press("Escape")
@ -80,7 +77,7 @@ def test_umap_import_from_textarea(live_server, tilelayer, page, settings):
path = Path(__file__).parent.parent / "fixtures/test_upload_data.umap" path = Path(__file__).parent.parent / "fixtures/test_upload_data.umap"
textarea.fill(path.read_text()) textarea.fill(path.read_text())
page.locator('select[name="format"]').select_option("umap") page.locator('select[name="format"]').select_option("umap")
page.get_by_role("button", name="Import full map data", exact=True).click() page.get_by_role("button", name="Add data", exact=True).click()
layers = page.locator(".umap-browser .datalayer") layers = page.locator(".umap-browser .datalayer")
expect(layers).to_have_count(2) expect(layers).to_have_count(2)
expect(page.locator(".umap-main-edit-toolbox .map-name")).to_have_text( expect(page.locator(".umap-main-edit-toolbox .map-name")).to_have_text(
@ -115,9 +112,7 @@ def test_import_geojson_from_textarea(tilelayer, live_server, page):
path = Path(__file__).parent.parent / "fixtures/test_upload_data.json" path = Path(__file__).parent.parent / "fixtures/test_upload_data.json"
textarea.fill(path.read_text()) textarea.fill(path.read_text())
page.locator('select[name="format"]').select_option("geojson") page.locator('select[name="format"]').select_option("geojson")
button = page.get_by_role("button", name="Copy into the layer", exact=True) page.get_by_role("button", name="Add data", exact=True).click()
expect(button).to_be_visible()
button.click()
# A layer has been created # A layer has been created
expect(layers).to_have_count(1) expect(layers).to_have_count(1)
expect(markers).to_have_count(2) expect(markers).to_have_count(2)
@ -140,9 +135,7 @@ def test_import_kml_from_textarea(tilelayer, live_server, page):
path = Path(__file__).parent.parent / "fixtures/test_upload_data.kml" path = Path(__file__).parent.parent / "fixtures/test_upload_data.kml"
textarea.fill(path.read_text()) textarea.fill(path.read_text())
page.locator('select[name="format"]').select_option("kml") page.locator('select[name="format"]').select_option("kml")
button = page.get_by_role("button", name="Copy into the layer", exact=True) page.get_by_role("button", name="Add data", exact=True).click()
expect(button).to_be_visible()
button.click()
# A layer has been created # A layer has been created
expect(layers).to_have_count(1) expect(layers).to_have_count(1)
expect(markers).to_have_count(1) expect(markers).to_have_count(1)
@ -165,9 +158,7 @@ def test_import_gpx_from_textarea(tilelayer, live_server, page):
path = Path(__file__).parent.parent / "fixtures/test_upload_data.gpx" path = Path(__file__).parent.parent / "fixtures/test_upload_data.gpx"
textarea.fill(path.read_text()) textarea.fill(path.read_text())
page.locator('select[name="format"]').select_option("gpx") page.locator('select[name="format"]').select_option("gpx")
button = page.get_by_role("button", name="Copy into the layer", exact=True) page.get_by_role("button", name="Add data", exact=True).click()
expect(button).to_be_visible()
button.click()
# A layer has been created # A layer has been created
expect(layers).to_have_count(1) expect(layers).to_have_count(1)
expect(markers).to_have_count(1) expect(markers).to_have_count(1)
@ -188,7 +179,7 @@ def test_import_osm_from_textarea(tilelayer, live_server, page):
path = Path(__file__).parent.parent / "fixtures/test_upload_data_osm.json" path = Path(__file__).parent.parent / "fixtures/test_upload_data_osm.json"
textarea.fill(path.read_text()) textarea.fill(path.read_text())
page.locator('select[name="format"]').select_option("osm") page.locator('select[name="format"]').select_option("osm")
page.get_by_role("button", name="Copy into the layer", exact=True).click() page.get_by_role("button", name="Add data", exact=True).click()
# A layer has been created # A layer has been created
expect(layers).to_have_count(1) expect(layers).to_have_count(1)
expect(markers).to_have_count(2) expect(markers).to_have_count(2)
@ -208,7 +199,7 @@ def test_import_csv_from_textarea(tilelayer, live_server, page):
path = Path(__file__).parent.parent / "fixtures/test_upload_data.csv" path = Path(__file__).parent.parent / "fixtures/test_upload_data.csv"
textarea.fill(path.read_text()) textarea.fill(path.read_text())
page.locator('select[name="format"]').select_option("csv") page.locator('select[name="format"]').select_option("csv")
page.get_by_role("button", name="Copy into the layer", exact=True).click() page.get_by_role("button", name="Add data", exact=True).click()
# A layer has been created # A layer has been created
expect(layers).to_have_count(1) expect(layers).to_have_count(1)
expect(markers).to_have_count(2) expect(markers).to_have_count(2)
@ -227,7 +218,7 @@ def test_can_import_in_existing_datalayer(live_server, datalayer, page, openmap)
path = Path(__file__).parent.parent / "fixtures/test_upload_data.csv" path = Path(__file__).parent.parent / "fixtures/test_upload_data.csv"
textarea.fill(path.read_text()) textarea.fill(path.read_text())
page.locator('select[name="format"]').select_option("csv") page.locator('select[name="format"]').select_option("csv")
page.get_by_role("button", name="Copy into the layer", exact=True).click() page.get_by_role("button", name="Add data", exact=True).click()
# No layer has been created # No layer has been created
expect(layers).to_have_count(1) expect(layers).to_have_count(1)
expect(markers).to_have_count(3) expect(markers).to_have_count(3)
@ -247,7 +238,7 @@ def test_can_replace_datalayer_data(live_server, datalayer, page, openmap):
textarea.fill(path.read_text()) textarea.fill(path.read_text())
page.locator('select[name="format"]').select_option("csv") page.locator('select[name="format"]').select_option("csv")
page.get_by_label("Replace layer content").check() page.get_by_label("Replace layer content").check()
page.get_by_role("button", name="Copy into the layer", exact=True).click() page.get_by_role("button", name="Add data", exact=True).click()
# No layer has been created # No layer has been created
expect(layers).to_have_count(1) expect(layers).to_have_count(1)
expect(markers).to_have_count(2) expect(markers).to_have_count(2)
@ -265,11 +256,9 @@ def test_can_import_in_new_datalayer(live_server, datalayer, page, openmap):
textarea = page.locator(".umap-upload textarea") textarea = page.locator(".umap-upload textarea")
path = Path(__file__).parent.parent / "fixtures/test_upload_data.csv" path = Path(__file__).parent.parent / "fixtures/test_upload_data.csv"
textarea.fill(path.read_text()) textarea.fill(path.read_text())
page.locator('select[name="format"]').select_option("csv") page.locator("select[name=format]").select_option("csv")
page.get_by_label("Choose the layer to import").select_option( page.locator("[name=layer-id]").select_option(label="Import in a new layer")
label="Import in a new layer" page.get_by_role("button", name="Add data", exact=True).click()
)
page.get_by_role("button", name="Copy into the layer", exact=True).click()
# A new layer has been created # A new layer has been created
expect(layers).to_have_count(2) expect(layers).to_have_count(2)
expect(markers).to_have_count(3) expect(markers).to_have_count(3)
@ -311,7 +300,7 @@ def test_should_remove_dot_in_property_names(live_server, page, settings, tilela
textarea = page.locator(".umap-upload textarea") textarea = page.locator(".umap-upload textarea")
textarea.fill(json.dumps(data)) textarea.fill(json.dumps(data))
page.locator('select[name="format"]').select_option("geojson") page.locator('select[name="format"]').select_option("geojson")
page.get_by_role("button", name="Copy into the layer", exact=True).click() page.get_by_role("button", name="Add data", exact=True).click()
with page.expect_response(re.compile(r".*/datalayer/create/.*")): with page.expect_response(re.compile(r".*/datalayer/create/.*")):
page.get_by_role("button", name="Save").click() page.get_by_role("button", name="Save").click()
datalayer = DataLayer.objects.last() datalayer = DataLayer.objects.last()
@ -372,7 +361,7 @@ def test_import_geometry_collection(live_server, page, tilelayer):
textarea = page.locator(".umap-upload textarea") textarea = page.locator(".umap-upload textarea")
textarea.fill(json.dumps(data)) textarea.fill(json.dumps(data))
page.locator('select[name="format"]').select_option("geojson") page.locator('select[name="format"]').select_option("geojson")
page.get_by_role("button", name="Copy into the layer", exact=True).click() page.get_by_role("button", name="Add data", exact=True).click()
# A layer has been created # A layer has been created
expect(layers).to_have_count(1) expect(layers).to_have_count(1)
expect(markers).to_have_count(1) expect(markers).to_have_count(1)
@ -406,7 +395,7 @@ def test_import_multipolygon(live_server, page, tilelayer):
textarea = page.locator(".umap-upload textarea") textarea = page.locator(".umap-upload textarea")
textarea.fill(json.dumps(data)) textarea.fill(json.dumps(data))
page.locator('select[name="format"]').select_option("geojson") page.locator('select[name="format"]').select_option("geojson")
page.get_by_role("button", name="Copy into the layer", exact=True).click() page.get_by_role("button", name="Add data", exact=True).click()
# A layer has been created # A layer has been created
expect(layers).to_have_count(1) expect(layers).to_have_count(1)
expect(paths).to_have_count(1) expect(paths).to_have_count(1)
@ -438,7 +427,7 @@ def test_import_multipolyline(live_server, page, tilelayer):
textarea = page.locator(".umap-upload textarea") textarea = page.locator(".umap-upload textarea")
textarea.fill(json.dumps(data)) textarea.fill(json.dumps(data))
page.locator('select[name="format"]').select_option("geojson") page.locator('select[name="format"]').select_option("geojson")
page.get_by_role("button", name="Copy into the layer", exact=True).click() page.get_by_role("button", name="Add data", exact=True).click()
# A layer has been created # A layer has been created
expect(layers).to_have_count(1) expect(layers).to_have_count(1)
expect(paths).to_have_count(1) expect(paths).to_have_count(1)
@ -453,7 +442,7 @@ def test_import_csv_without_valid_latlon_headers(tilelayer, live_server, page):
textarea = page.locator(".umap-upload textarea") textarea = page.locator(".umap-upload textarea")
textarea.fill("a,b,c\n12.23,48.34,mypoint\n12.23,48.34,mypoint2") textarea.fill("a,b,c\n12.23,48.34,mypoint\n12.23,48.34,mypoint2")
page.locator('select[name="format"]').select_option("csv") page.locator('select[name="format"]').select_option("csv")
page.get_by_role("button", name="Copy into the layer", exact=True).click() page.get_by_role("button", name="Add data", exact=True).click()
# FIXME do not create a layer # FIXME do not create a layer
expect(layers).to_have_count(1) expect(layers).to_have_count(1)
expect(markers).to_have_count(0) expect(markers).to_have_count(0)
@ -485,8 +474,9 @@ def test_create_remote_data(page, live_server, tilelayer):
page.get_by_role("link", name="Import data (Ctrl+I)").click() page.get_by_role("link", name="Import data (Ctrl+I)").click()
page.get_by_placeholder("Provide an URL here").click() page.get_by_placeholder("Provide an URL here").click()
page.get_by_placeholder("Provide an URL here").fill("https://remote.org/data.json") page.get_by_placeholder("Provide an URL here").fill("https://remote.org/data.json")
page.get_by_label("Choose the data format").select_option("geojson") page.locator("[name=format]").select_option("geojson")
page.get_by_role("button", name="Link to the layer as remote").click() page.get_by_role("radio", name="Link to the layer as remote data").click()
page.get_by_role("button", name="Add data", exact=True).click()
expect(page.locator(".leaflet-marker-icon")).to_be_visible() expect(page.locator(".leaflet-marker-icon")).to_be_visible()
page.get_by_role("link", name="Manage layers").click() page.get_by_role("link", name="Manage layers").click()
page.get_by_role("button", name="Edit", exact=True).click() page.get_by_role("button", name="Edit", exact=True).click()
@ -494,3 +484,38 @@ def test_create_remote_data(page, live_server, tilelayer):
expect(page.locator('input[name="url"]')).to_have_value( expect(page.locator('input[name="url"]')).to_have_value(
"https://remote.org/data.json" "https://remote.org/data.json"
) )
def test_import_geojson_from_url(page, live_server, tilelayer):
def handle(route):
route.fulfill(
json={
"type": "FeatureCollection",
"features": [
{
"type": "Feature",
"properties": {},
"geometry": {
"type": "Point",
"coordinates": [4.3375, 51.2707],
},
}
],
}
)
# Intercept the route to the proxy
page.route("https://remote.org/data.json", handle)
page.goto(f"{live_server.url}/map/new/")
expect(page.locator(".leaflet-marker-icon")).to_be_hidden()
page.get_by_role("link", name="Import data (Ctrl+I)").click()
page.get_by_placeholder("Provide an URL here").click()
page.get_by_placeholder("Provide an URL here").fill("https://remote.org/data.json")
page.locator("[name=format]").select_option("geojson")
page.get_by_role("radio", name="Copy into the layer").click()
page.get_by_role("button", name="Add data", exact=True).click()
expect(page.locator(".leaflet-marker-icon")).to_be_visible()
page.get_by_role("link", name="Manage layers").click()
page.get_by_role("button", name="Edit", exact=True).click()
page.locator("summary").filter(has_text="Remote data").click()
expect(page.locator('input[name="url"]')).to_have_value("")