From 06681d688d74b0efffe327ef62473c7aa56319b2 Mon Sep 17 00:00:00 2001 From: volterra79 Date: Mon, 24 Feb 2025 09:30:51 +0100 Subject: [PATCH 1/3] =?UTF-8?q?=F0=9F=90=9B=20Fix=20editable=20relation=20?= =?UTF-8?q?check=20for=20child=20layers=20in=20toolbox?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- toolboxes/toolbox.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/toolboxes/toolbox.js b/toolboxes/toolbox.js index a00bde64..f254b7e4 100644 --- a/toolboxes/toolbox.js +++ b/toolboxes/toolbox.js @@ -91,7 +91,8 @@ export class ToolBox extends G3WObject { const editable_relations = layer.getRelations().getArray() .filter(relation => { const l = CatalogLayersStoresRegistry.getLayerById(getRelationId({ layerId: layer.getId(), relation })); - return l.isEditable(); + //@since 3.9.1 Fix in case child layer is not visible on TOC (set view permission from admin) + return l && l.isEditable(); }) .map(r => r); this._start = false; From d9443f9b310bec1578cbfaa23a1121daea7e0e1a Mon Sep 17 00:00:00 2001 From: Raruto Date: Mon, 24 Feb 2025 13:38:14 +0100 Subject: [PATCH 2/3] code format --- toolboxes/toolbox.js | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/toolboxes/toolbox.js b/toolboxes/toolbox.js index f254b7e4..7014ceb2 100644 --- a/toolboxes/toolbox.js +++ b/toolboxes/toolbox.js @@ -87,14 +87,13 @@ export class ToolBox extends G3WObject { const is_table = Layer.LayerTypes.TABLE === layer.getType(); const isMultiGeometry = geometryType && Geometry.isMultiGeometry(geometryType); const iconGeometry = is_vector && (is_point ? 'Point' : is_line ? 'Line' : 'Polygon'); - //@since 3.9.0 Check if layer has relation layers editable + //@since 3.9.0 Check if layer has "relation layers" that are editable const editable_relations = layer.getRelations().getArray() - .filter(relation => { - const l = CatalogLayersStoresRegistry.getLayerById(getRelationId({ layerId: layer.getId(), relation })); - //@since 3.9.1 Fix in case child layer is not visible on TOC (set view permission from admin) - return l && l.isEditable(); - }) - .map(r => r); + .filter(relation => { + const l = CatalogLayersStoresRegistry.getLayerById(getRelationId({ layerId: layer.getId(), relation })); + return l && l.isEditable(); + }) + .map(r => r); this._start = false; /** constraint loading features to a filter set */ From fb1122c7bcba5355019348d4985491d93760b1f2 Mon Sep 17 00:00:00 2001 From: volterra79 Date: Mon, 24 Feb 2025 14:05:08 +0100 Subject: [PATCH 3/3] =?UTF-8?q?=F0=9F=8E=A8=20Clean=20code=20-=20https://g?= =?UTF-8?q?ithub.com/g3w-suite/g3w-client-plugin-editing/pull/148/files/d9?= =?UTF-8?q?443f9b310bec1578cbfaa23a1121daea7e0e1a?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- toolboxes/toolbox.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/toolboxes/toolbox.js b/toolboxes/toolbox.js index 7014ceb2..8c607e18 100644 --- a/toolboxes/toolbox.js +++ b/toolboxes/toolbox.js @@ -92,8 +92,8 @@ export class ToolBox extends G3WObject { .filter(relation => { const l = CatalogLayersStoresRegistry.getLayerById(getRelationId({ layerId: layer.getId(), relation })); return l && l.isEditable(); - }) - .map(r => r); + }); + this._start = false; /** constraint loading features to a filter set */