Merge pull request 3liz#4456 from mind84/reload_after_edit_singlewms

[Bugfix] SingleWMSLayer - refresh layer after editing
nworr · May 24, 2024 · 59281fe · 59281fe
2 parents 2152626 + 789c707
commit 59281fe
Show file tree

Hide file tree

Showing 4 changed files with 1,966 additions and 1,896 deletions.
diff --git a/assets/src/modules/map.js b/assets/src/modules/map.js
@@ -992,6 +992,11 @@ export default class map extends olMap {
      * @returns {ImageLayer|undefined} The OpenLayers layer or undefined
      */
     getLayerByName(name){
+        // if the layer is included in the singleWMSLayer, return the single ImageLayer instance
+        if(this._statesSingleWMSLayers.get(name)){
+            return this._singleImageWmsGroup.getLayersArray()[0]
+        }
+
         return this.overlayLayers.find(
             layer => layer.get('name') === name
         );

diff --git a/tests/end2end/playwright/singleWMS.spec.ts b/tests/end2end/playwright/singleWMS.spec.ts
@@ -411,4 +411,44 @@ test.describe('Single WMS layer', () => {
         expect(switchBaseLayersReqPromiseresp?.status()).toBe(200)
 
     })
+
+    test('Edit a layer', async ({ page }) => {
+        const url = '/index.php/view/map/?repository=testsrepository&project=single_wms_image';
+        await page.goto(url,{waitUntil:'networkidle'});
+
+        await page.locator('#button-edition').click();
+        await page.locator('a#edition-draw').click();
+
+        await page.waitForTimeout(300);
+
+        // edition id done on #map
+        await page.locator('#map').click({
+          position: {
+            x: 532,
+            y: 293
+          }
+        });
+
+        page.locator("#jforms_view_edition input#jforms_view_edition_title").fill("Test insert");
+
+         const reloadMapPromise = page.waitForRequest(request =>
+            request.url().includes('GetMap') &&
+            request.method() === 'GET' &&
+            // check format
+            request.url().includes('FORMAT=image%2Fpng') &&
+            // check service
+            request.url().includes('SERVICE=WMS') &&
+            // check styles
+            request.url().includes('STYLES=default%2Cdefault%2Cdefault%2Cdefault%2Cdefault%2C') &&
+            // check layers
+            request.url().includes('LAYERS=single_wms_baselayer%2Csingle_wms_lines%2Csingle_wms_points%2Csingle_wms_points_group%2Csingle_wms_lines_group%2CGroupAsLayer')
+        );
+
+        await page.locator("#jforms_view_edition #jforms_view_edition__submit_submit").click();
+        const reloaded = await reloadMapPromise;
+
+        const reloadReqPromise = await reloaded.response();
+        expect(reloadReqPromise?.status()).toBe(200)
+
+    })
 })