@geogirafe/lib-geoportal 1.2.0-dev.2681709337 → 1.2.0-dev.2682051281

package/components/selectiongrid/tools/selectiontabulatormanager.js

@@ -5,7 +5,7 @@ import ColumnAliasHelper from '../../../tools/utils/aliases.js';
 import { linkify } from '../../../tools/utils/utils.js';
 import { noop } from '../../../tools/utils/async.js';
 import tippy from 'tippy.js';
-import { sanitize } from '../../../tools/utils/selection.js';
+import { sanitize } from '../../../tools/utils/sanitize.js';
 const geometryColumns = new Set(['geom', 'the_geom', 'geometry']);
 export default class SelectionTabulatorManager {
     featureToGridData;

package/components/selectionwindow/component.js

@@ -8,7 +8,7 @@ import IconCenter from './images/center.svg';
 import ResizeWindow from '../../tools/resizewindow.js';
 import CsvManager from '../../tools/export/csvmanager.js';
 import ColumnAliasHelper from '../../tools/utils/aliases.js';
-import { sanitize } from '../../tools/utils/selection.js';
+import { sanitize } from '../../tools/utils/sanitize.js';
 /**
  * Represents a draggable and resizable selection window component.
  * Display itself when it should be visible and have selected features.

package/components/treeview/treeviewitem/component.js

@@ -72,7 +72,12 @@ ${this.htmlUnsafe(this.feedbackTemplateHtml ?? '')}`;
             return;
         }
         this.iconUrl = this.wmsLegendHelper.getIconUrl(this.layer);
-        this.legendUrls = this.wmsLegendHelper.getLegendUrls(this.layer);
+        if (this.isVisibleInCurrentResolution()) {
+            this.legendUrls = this.wmsLegendHelper.getLegendUrls(this.layer);
+        }
+        else {
+            this.legendUrls = {};
+        }
     }
     setWmtsLegend() {
         if (!(this.layer instanceof LayerWmts)) {
@@ -208,7 +213,7 @@ ${this.htmlUnsafe(this.feedbackTemplateHtml ?? '')}`;
         }
         const currentResolution = this.state.position.resolution;
         if (currentResolution) {
-            return this.layer.isVisibleAtResolution(this.state.position.resolution);
+            return this.layer.isVisibleAtResolution(currentResolution);
         }
         return false;
     }

package/package.json

@@ -5,7 +5,7 @@
     "name": "GeoGirafe PSC",
     "url": "https://doc.geogirafe.org"
   },
-  "version": "1.2.0-dev.2681709337",
+  "version": "1.2.0-dev.2682051281",
   "type": "module",
   "engines": {
     "node": ">=20.19.0"

package/templates/public/about.json

@@ -1 +1 @@
-{"version":"1.2.0-dev.2681709337", "build":"2681709337", "date":"16/07/2026"}
+{"version":"1.2.0-dev.2682051281", "build":"2682051281", "date":"16/07/2026"}

package/tools/main.d.ts

@@ -133,7 +133,7 @@ export { default as GirafeColorPicker } from './utils/girafecolorpicker.js';
 export { unByKeyAll, getOlayerByName, removeUnwantedOlParams, polygonFromCircle, getDistance, getAreaOfPolygon, getAreaOfCircle, isCoordinateInDegrees, getSelectionBoxFromMapClick, reprojectGeometry, ensurePolygonIsProperlyClosed, getHalfPoint, getLabelStyle, getRadiusDataForCircle, getLengthAsMetricText, getAreaAsMetricText, getAzimuthAsText } from './utils/olutils.js';
 export { getPropertyByPath, setPropertyByPath, createObjectFromPath, deletePropertyByPath, mergeObjects } from './utils/pathUtils.js';
 export { generateQrCode } from './utils/qrcode.js';
-export { sanitize } from './utils/selection.js';
+export { sanitize } from './utils/sanitize.js';
 export { default as ServiceWorkerHelper } from './utils/swhelper.js';
 export { systemIsInDarkMode, isSafari, isFirefox, getValidIndex, minMax, hexToRgbaArray, rgbStrToRgbaArray, colorToRgbaArray, isValidEmail, applyOpacityToLayers, applyFeaturesToSelection, linkify, applyDefaultPrefixToUrl, splitTrimAndConvertToNumber } from './utils/utils.js';
 export { default as VendorSpecificOgcServerManager } from './vendorspecificogcservermanager.js';

package/tools/main.js

@@ -100,7 +100,7 @@ export { default as GirafeColorPicker } from './utils/girafecolorpicker.js';
 export { unByKeyAll, getOlayerByName, removeUnwantedOlParams, polygonFromCircle, getDistance, getAreaOfPolygon, getAreaOfCircle, isCoordinateInDegrees, getSelectionBoxFromMapClick, reprojectGeometry, ensurePolygonIsProperlyClosed, getHalfPoint, getLabelStyle, getRadiusDataForCircle, getLengthAsMetricText, getAreaAsMetricText, getAzimuthAsText } from './utils/olutils.js';
 export { getPropertyByPath, setPropertyByPath, createObjectFromPath, deletePropertyByPath, mergeObjects } from './utils/pathUtils.js';
 export { generateQrCode } from './utils/qrcode.js';
-export { sanitize } from './utils/selection.js';
+export { sanitize } from './utils/sanitize.js';
 export { default as ServiceWorkerHelper } from './utils/swhelper.js';
 export { systemIsInDarkMode, isSafari, isFirefox, getValidIndex, minMax, hexToRgbaArray, rgbStrToRgbaArray, colorToRgbaArray, isValidEmail, applyOpacityToLayers, applyFeaturesToSelection, linkify, applyDefaultPrefixToUrl, splitTrimAndConvertToNumber } from './utils/utils.js';
 export { default as VendorSpecificOgcServerManager } from './vendorspecificogcservermanager.js';

package/tools/tests/mockconfig.d.ts

@@ -22,6 +22,9 @@ export declare const MockConfig: {
         'EPSG:2056': string;
         'EPSG:3857': string;
     };
+    query: {
+        legacy: boolean;
+    };
     map: {
         srid: string;
         scales: number[];

package/tools/tests/mockconfig.js

@@ -23,6 +23,9 @@ export const MockConfig = {
         'EPSG:2056': 'LV95',
         'EPSG:3857': 'W-M'
     },
+    query: {
+        legacy: true
+    },
     map: {
         srid: 'EPSG:2056',
         scales: [1000000, 500000, 200000, 100000, 50000, 20000, 10000, 5000, 2000, 1000, 500, 200],

package/tools/utils/sanitize.d.ts

@@ -0,0 +1,7 @@
+import GirafeConfig from '../configuration/girafeconfig.js';
+/**
+ * Use DOMPurify.sanitize to remove potentially harmful html/js code.
+ * @param unsanitized the raw text to sanitize.
+ * @param config Allowed tags and elements in a string.
+ */
+export declare const sanitize: (unsanitized: string, config: GirafeConfig) => string;

package/tools/utils/sanitize.js

@@ -0,0 +1,74 @@
+import DOMPurify from 'dompurify';
+/**
+ * Use DOMPurify.sanitize to remove potentially harmful html/js code.
+ * @param unsanitized the raw text to sanitize.
+ * @param config Allowed tags and elements in a string.
+ */
+export const sanitize = (unsanitized, config) => {
+    let sanitizeConfig = {
+        ...config.query.sanitizeConfig
+    };
+    if (config.query.legacy) {
+        sanitizeConfig = {
+            ...sanitizeConfig,
+            ADD_ATTR: ['onclick', 'data-gopenwindow'],
+            ADD_URI_SAFE_ATTR: ['onclick']
+        };
+    }
+    if (unsanitized.includes('gOpenWindow')) {
+        const unsanitizedWithDataGOpenWindow = transformOpenWindowLinksToData(unsanitized);
+        const sanitized = DOMPurify.sanitize(unsanitizedWithDataGOpenWindow, sanitizeConfig);
+        return transformDataOpenWindowToLinks(sanitized);
+    }
+    return DOMPurify.sanitize(unsanitized, sanitizeConfig);
+};
+/** A join tmp marker used to split again a string. */
+const gOpenWindowSplitArgChar = '°°°';
+/**
+ * Transforms a text (link) with <a href="javascript:gOpenWindow(args)">text</a> to a text without href and
+ * with a new "data-gopenwindow='args'". This allows sanitizing a string and keeping the
+ * GOpenWindow function arguments.
+ */
+const transformOpenWindowLinksToData = (text) => {
+    // Long regexp because we want to capture all arguments, 4 are optional and can be text or number.
+    // Title and or url can contain any character, including comma.
+    const gOpenWindowLinkRegExp = /<a\b[^>]*\bhref\s*=\s*"javascript:(?:window\.)?gOpenWindow\(\s*'([^']*)'\s*,\s*'([^']*)'(?:\s*,\s*(?:'([^']*)'|(\d+)))?(?:\s*,\s*(?:'([^']*)'|(\d+)))?(?:\s*,\s*(?:'([^']*)'|(\d+)))?(?:\s*,\s*(?:'([^']*)'|(\d+)))?\s*\)\s*;"[^>]*>([\s\S]*?)<\/a>/gi;
+    return text.replace(gOpenWindowLinkRegExp, (_, title, url, widthText, widthNumber, heightText, heightNumber, topText, topNumber, leftText, leftNumber, text) => {
+        const width = widthText ? `'${widthText}'` : widthNumber;
+        const height = heightText ? `'${heightText}'` : heightNumber;
+        const top = topText ? `'${topText}'` : topNumber;
+        const left = leftText ? `'${leftText}'` : leftNumber;
+        const gOpenWindowArgs = [title, url];
+        if (width)
+            gOpenWindowArgs.push(width);
+        if (height)
+            gOpenWindowArgs.push(height);
+        if (top)
+            gOpenWindowArgs.push(top);
+        if (left)
+            gOpenWindowArgs.push(left);
+        return `<a data-gopenwindow="${gOpenWindowArgs.join(gOpenWindowSplitArgChar)}">${text}</a>`;
+    });
+};
+/**
+ * Transforms a text (link) with a new "data-gopenwindow='args'" to a text like
+ * <a href="javascript:gOpenWindow(args)">text</a>.The args are split by
+ * the gOpenWindowSplitArgChar.
+ */
+const transformDataOpenWindowToLinks = (text) => {
+    const gOpenWindowDataRegExp = /<a\s+data-gopenwindow="([^"]*)">([^"]*)<\/a>/gi;
+    return text.replace(gOpenWindowDataRegExp, (_, data, text) => {
+        const [title, url, width, height, top, left] = data.split(gOpenWindowSplitArgChar);
+        const urlParts = [`<a href="javascript:gOpenWindow('${title}', '${url}'`];
+        if (width)
+            urlParts.push(`, ${width}`);
+        if (height)
+            urlParts.push(`, ${height}`);
+        if (top)
+            urlParts.push(`, ${top}`);
+        if (left)
+            urlParts.push(`, ${left}`);
+        urlParts.push(`);">${text}</a>`);
+        return urlParts.join('');
+    });
+};

package/tools/utils/selection.d.ts

@@ -1,2 +0,0 @@
-import GirafeConfig from '../configuration/girafeconfig.js';
-export declare const sanitize: (unsanitized: string, config: GirafeConfig) => string;

package/tools/utils/selection.js

@@ -1,14 +0,0 @@
-import DOMPurify from 'dompurify';
-export const sanitize = (unsanitized, config) => {
-    let sanitizeConfig = {
-        ...config.query.sanitizeConfig
-    };
-    if (config.query.legacy) {
-        sanitizeConfig = {
-            ...sanitizeConfig,
-            ADD_ATTR: ['onclick'],
-            ADD_URI_SAFE_ATTR: ['onclick']
-        };
-    }
-    return DOMPurify.sanitize(unsanitized, sanitizeConfig);
-};