From 740ea5bef35b4f8a68c6bff1aff51692e68edaed Mon Sep 17 00:00:00 2001 From: Lova Andriarimalala <43842786+Xpirix@users.noreply.github.com> Date: Tue, 17 Dec 2024 09:11:36 +0300 Subject: [PATCH] Add GDPR info in documentation page --- content/resources/hub.md | 9 ++++++++- playwright/ci-test/tests/06-resources-page.spec.ts | 3 +++ .../ci-test/tests/fixtures/qgis-resources-page.ts | 11 +++++++++++ .../layouts/shortcodes/tabs.html | 4 ++++ 4 files changed, 26 insertions(+), 1 deletion(-) diff --git a/content/resources/hub.md b/content/resources/hub.md index bc36af731..ab3207229 100644 --- a/content/resources/hub.md +++ b/content/resources/hub.md @@ -33,7 +33,7 @@ You will find documentation for every QGIS Long Term Release (LTR) on the respec {{< language-select >}} -{{< tabs tab1="QGIS |ltrversion|" tab2="QGIS |version|" tab3="QGIS testing (>|version|)" tab4="Archived releases">}} +{{< tabs tab1="QGIS |ltrversion|" tab2="QGIS |version|" tab3="QGIS testing (>|version|)" tab4="Archived releases" tab5="Data protection">}} {{< tab-content-start tab="1" >}} @@ -164,6 +164,13 @@ We are still updating (not translating yet) the documentation for releases newer {{< tab-content-end >}} +{{< tab-content-start tab="5" >}} + +In line with GDPR and related data protection regulations, we provide the following documentation: + +{{< rich-list listLink="https://docs.qgis.org/latest/en/docs/user_manual/appendices/qgis_desktop_network_connections.html" layoutClass="inline-block" listTitle="QGIS Application Network Connections" >}} + +{{< tab-content-end >}} {{< rich-box-start >}} {{< rich-content-start themeClass="coloring-6">}} diff --git a/playwright/ci-test/tests/06-resources-page.spec.ts b/playwright/ci-test/tests/06-resources-page.spec.ts index 923ad17a7..318c8d3a9 100644 --- a/playwright/ci-test/tests/06-resources-page.spec.ts +++ b/playwright/ci-test/tests/06-resources-page.spec.ts @@ -77,6 +77,9 @@ test.describe("Resources pages", () => { for (const text of qgisResourcesPage.textList) { await expect(qgisResourcesPage.pageBody).toContainText(text); } + + await qgisResourcesPage.dataProtectionLink.click(); + await expect(qgisResourcesPage.appNetworkConnectionsLink).toBeVisible(); }); test("Installation guide", async ({ sidebar, installationGuidePage }) => { diff --git a/playwright/ci-test/tests/fixtures/qgis-resources-page.ts b/playwright/ci-test/tests/fixtures/qgis-resources-page.ts index 099a81bc5..092ce9017 100644 --- a/playwright/ci-test/tests/fixtures/qgis-resources-page.ts +++ b/playwright/ci-test/tests/fixtures/qgis-resources-page.ts @@ -19,6 +19,8 @@ export class QgisResourcesPage { public readonly pdfManualsLink: Locator; public readonly htmlZipManualsLink: Locator; public readonly viewSupportOptionsLink: Locator; + public readonly dataProtectionLink: Locator; + public readonly appNetworkConnectionsLink: Locator; public readonly textList: string[] = [ "Resources", "🖖 Installation troubles?", @@ -28,6 +30,7 @@ export class QgisResourcesPage { "For developers", "For download", "Support", + "Data protection", ]; constructor(public readonly page: Page) { @@ -77,6 +80,14 @@ export class QgisResourcesPage { this.htmlZipManualsLink = this.page.getByRole("link", { name: "HTML zip of the manuals", }); + + this.dataProtectionLink = this.page.getByText( + 'Data protection', + { exact: true } + ); + this.appNetworkConnectionsLink = this.page.getByRole("link", { + name: "QGIS Application Network Connections", + }); this.viewSupportOptionsLink = this.page.getByRole("link", { name: "View support options", }); diff --git a/themes/hugo-bulma-blocks-theme/layouts/shortcodes/tabs.html b/themes/hugo-bulma-blocks-theme/layouts/shortcodes/tabs.html index 1bc770ad9..f1c6ab46a 100644 --- a/themes/hugo-bulma-blocks-theme/layouts/shortcodes/tabs.html +++ b/themes/hugo-bulma-blocks-theme/layouts/shortcodes/tabs.html @@ -2,6 +2,7 @@ {{ $tab2 := .Get "tab2" }} {{ $tab3 := .Get "tab3" }} {{ $tab4 := .Get "tab4" }} +{{ $tab5 := .Get "tab5" }} {{ with index .Site.Data.conf }} {{ $tab1 = replace $tab1 "|ltrversion|" .ltrversion }} @@ -24,6 +25,9 @@ {{ if $tab4 }}