From 1f66377104190bfd29013937516879129b673e50 Mon Sep 17 00:00:00 2001 From: Yohan Boniface Date: Fri, 31 Jan 2025 18:25:20 +0100 Subject: [PATCH] fix: show user URL in remote data loading error Instead of the proxied one, which is less readable and actionable for the user reading the alert message. --- umap/static/umap/js/modules/data/layer.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/umap/static/umap/js/modules/data/layer.js b/umap/static/umap/js/modules/data/layer.js index eab990ea..fa839b35 100644 --- a/umap/static/umap/js/modules/data/layer.js +++ b/umap/static/umap/js/modules/data/layer.js @@ -305,14 +305,14 @@ export class DataLayer extends ServerStored { return this.isRemoteLayer() && Boolean(this.options.remoteData?.dynamic) } - async getUrl(url) { + async getUrl(url, initialUrl) { const response = await this._umap.request.get(url) return new Promise((resolve) => { if (response?.ok) return resolve(response.text()) Alert.error( translate('Cannot load remote data for layer "{layer}" with url "{url}"', { layer: this.getName(), - url: url, + url: initialUrl || url, }) ) }) @@ -328,7 +328,7 @@ export class DataLayer extends ServerStored { if (this.options.remoteData.proxy) { url = this._umap.proxyUrl(url, this.options.remoteData.ttl) } - return await this.getUrl(url).then((raw) => { + return await this.getUrl(url, remoteUrl).then((raw) => { this.clear() return this._umap.formatter .parse(raw, this.options.remoteData.format)