Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Backport release_3_5] [Bugfix] Load relations from embedded layers #3901

Closed
wants to merge 2 commits into from
Closed

[Backport release_3_5] [Bugfix] Load relations from embedded layers #3901

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bd59467
[Bugfix] Load relation from embedded layers
mind84 Sep 28, 2023
5521b56
added tests
mind84 Sep 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lizmap/modules/lizmap/lib/Project/QgisProject.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1194,11 +1194,11 @@ protected function readXmlProject($qgs_path)
$this->WMSInformation = $this->readWMSInformation($qgsXml);
$this->canvasColor = $this->readCanvasColor($qgsXml);
$this->allProj4 = $this->readAllProj4($qgsXml);
list($this->relations, $this->relationsFields) = $this->readRelations($qgsXml);
$this->themes = $this->readThemes($qgsXml);
$this->customProjectVariables = $this->readCustomProjectVariables($qgsXml);
$this->useLayerIDs = $this->readUseLayerIDs($qgsXml);
$this->layers = $this->readLayers($qgsXml);
list($this->relations, $this->relationsFields) = $this->readRelations($qgsXml);
}

protected function readWMSInformation($qgsLoad)
Expand Down
102 changes: 102 additions & 0 deletions tests/end2end/playwright/embedded-relation.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
import { test, expect } from '@playwright/test';

test.describe('Display embedded relation in popup',()=>{
test.beforeEach(async ({ page }) => {
const url = '/index.php/view/map/?repository=testsrepository&project=relations_project_embed';
await page.goto(url, { waitUntil: 'networkidle' });
await page.locator('#dock-close').click();
});

test('Visualize popup for embedded layers', async ({ page }) => {

let getFeatureInfoRequestPromise = page.waitForRequest(request => request.method() === 'POST' && request.postData().includes('GetFeatureInfo'));

//first point
await page.locator('#OpenLayers_Layer_Vector_45 canvas').click({
position: {
x: 74,
y: 40
}
});

await getFeatureInfoRequestPromise;

//time for rendering the popup
await page.waitForTimeout(500);

await expect(page.locator('.lizmapPopupContent > .lizmapPopupSingleFeature .lizmapPopupTitle').first()).toHaveText("father_layer");

let firstPointElements = page.locator(".container.popup_lizmap_dd .before-tabs p b");
await expect(firstPointElements).toHaveCount(3);

await expect(firstPointElements.nth(0)).toHaveText("fid");
await expect(firstPointElements.nth(1)).toHaveText("ref_id");
await expect(firstPointElements.nth(2)).toHaveText("description");


let firstElementsValues = page.locator(".container.popup_lizmap_dd .before-tabs div.field");
await expect(firstElementsValues).toHaveCount(3);
await expect(firstElementsValues.nth(0)).toHaveText("3");
await expect(firstElementsValues.nth(1)).toHaveText("1");
await expect(firstElementsValues.nth(2)).toHaveText("Father 1");

//check childrens
let firstChildrendElements = page.locator('.lizmapPopupSingleFeature .lizmapPopupChildren .lizmapPopupSingleFeature');
await expect(firstChildrendElements).toHaveCount(2);

let firstElementfirstChildRows = firstChildrendElements.nth(0).getByRole('table').locator('tbody tr');
await expect(firstElementfirstChildRows).toHaveCount(3);
await expect(firstElementfirstChildRows.nth(0).locator("td")).toHaveText("2");
await expect(firstElementfirstChildRows.nth(1).locator("td")).toHaveText("1");
await expect(firstElementfirstChildRows.nth(2).locator("td")).toHaveText("Child 2");
let firstElementSecondChildRow = firstChildrendElements.nth(1).getByRole('table').locator('tbody tr');
await expect(firstElementSecondChildRow.nth(0).locator("td")).toHaveText("1");
await expect(firstElementSecondChildRow.nth(1).locator("td")).toHaveText("1");
await expect(firstElementSecondChildRow.nth(2).locator("td")).toHaveText("Child 1");

//clear screen
await page.locator('#dock-close').click();

//second point
await page.locator('#OpenLayers_Layer_Vector_45 canvas').click({
position: {
x: 392,
y: 257
}
});
await getFeatureInfoRequestPromise;

//time for rendering the popup
await page.waitForTimeout(500);

await expect(page.locator('.lizmapPopupContent > .lizmapPopupSingleFeature .lizmapPopupTitle').first()).toHaveText("father_layer");

let elements = page.locator(".container.popup_lizmap_dd .before-tabs p b");
await expect(elements).toHaveCount(3);

await expect(elements.nth(0)).toHaveText("fid");
await expect(elements.nth(1)).toHaveText("ref_id");
await expect(elements.nth(2)).toHaveText("description");


let elementsValues = page.locator(".container.popup_lizmap_dd .before-tabs div.field");
await expect(elementsValues).toHaveCount(3);
await expect(elementsValues.nth(0)).toHaveText("4");
await expect(elementsValues.nth(1)).toHaveText("2");
await expect(elementsValues.nth(2)).toHaveText("Father 2");

//check childrens
let childrendElements = page.locator('.lizmapPopupSingleFeature .lizmapPopupChildren .lizmapPopupSingleFeature');
await expect(childrendElements).toHaveCount(2);

let firstChildRows = childrendElements.nth(0).getByRole('table').locator('tbody tr');
await expect(firstChildRows).toHaveCount(3);
await expect(firstChildRows.nth(0).locator("td")).toHaveText("4");
await expect(firstChildRows.nth(1).locator("td")).toHaveText("2");
await expect(firstChildRows.nth(2).locator("td")).toHaveText("Child 4");
let secondChildRow = childrendElements.nth(1).getByRole('table').locator('tbody tr');
await expect(secondChildRow.nth(0).locator("td")).toHaveText("3");
await expect(secondChildRow.nth(1).locator("td")).toHaveText("2");
await expect(secondChildRow.nth(2).locator("td")).toHaveText("Child 3");
});
})
Loading
Loading