diff --git a/CHANGELOG.md b/CHANGELOG.md index 2a5c2fa5f1..8f3bd32f07 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,9 @@ You can also check the ## Unreleased +- Maintenance + - Remove LINDASold endpoints + ### 6.4.0 – 2026-03-13 - Maintenance diff --git a/app/configurator/components/add-dataset-drawer.mock.ts b/app/configurator/components/add-dataset-drawer.mock.ts index 7cd75acc52..2c5a1607ed 100644 --- a/app/configurator/components/add-dataset-drawer.mock.ts +++ b/app/configurator/components/add-dataset-drawer.mock.ts @@ -5,7 +5,7 @@ export const photovoltaikChartStateMock: ConfiguratorStateConfiguringChart = { state: "CONFIGURING_CHART", dataSource: { type: "sparql", - url: "https://lindas-cached.int.cluster.ldbar.ch/query", + url: "https://int.cached.lindas.admin.ch/query", }, layout: { activeField: "y", diff --git a/app/domain/data-source/constants.ts b/app/domain/data-source/constants.ts index 2d519fd0da..4e6fda4b6a 100644 --- a/app/domain/data-source/constants.ts +++ b/app/domain/data-source/constants.ts @@ -64,56 +64,6 @@ export const SOURCE_OPTIONS: SourceOption[] = [ isTrusted: false, supportsCachingPerCubeIri: true, }, - - // For LINDASold - { - value: "sparql+https://lindas-cached.cluster.ldbar.ch/query", - key: "LINDASold-Prod", - label: "LINDASold PROD", - url: "https://lindas-cached.cluster.ldbar.ch/query", - isTrusted: false, - supportsCachingPerCubeIri: true, - }, - { - value: "sparql+https://old.ld.ldbar.ch/query", - key: "LINDASold-Prod-uncached", - label: "LINDASold PROD (uncached)", - url: "https://old.ld.ldbar.ch/query", - isTrusted: false, - supportsCachingPerCubeIri: true, - }, - { - value: "sparql+https://lindas-cached.int.cluster.ldbar.ch/query", - key: "LINDASold-Int", - label: "LINDASold INT", - url: "https://lindas-cached.int.cluster.ldbar.ch/query", - isTrusted: false, - supportsCachingPerCubeIri: true, - }, - { - value: "sparql+https://old.int.ld.ldbar.ch/query", - key: "LINDASold-Int-uncached", - label: "LINDASold INT (uncached)", - url: "https://old.int.ld.ldbar.ch/query", - isTrusted: false, - supportsCachingPerCubeIri: true, - }, - { - value: "sparql+https://lindas-cached.test.cluster.ldbar.ch/query", - key: "LINDASold-Test", - label: "LINDASold TEST", - url: "https://lindas-cached.test.cluster.ldbar.ch/query", - isTrusted: false, - supportsCachingPerCubeIri: true, - }, - { - value: "sparql+https://old.test.ld.ldbar.ch/query", - key: "LINDASold-Test-uncached", - label: "LINDASold TEST (uncached)", - url: "https://old.test.ld.ldbar.ch/query", - isTrusted: false, - supportsCachingPerCubeIri: true, - }, ].filter((d) => WHITELISTED_DATA_SOURCES.includes(d.key)); export const SOURCES_BY_KEY = keyBy(SOURCE_OPTIONS, (d) => d.key); diff --git a/app/pages/_pivot.tsx b/app/pages/_pivot.tsx index 052e172d2c..79ec36e30d 100644 --- a/app/pages/_pivot.tsx +++ b/app/pages/_pivot.tsx @@ -36,7 +36,7 @@ const Card = styled(MUICard)({ }); const intDatasource = { - sourceUrl: "https://lindas-cached.int.cluster.ldbar.ch/query", + sourceUrl: "https://int.cached.lindas.admin.ch/query", sourceType: "sparql", }; diff --git a/app/test/__fixtures/config/int/bathing-water-quality-hierarchie.json b/app/test/__fixtures/config/int/bathing-water-quality-hierarchie.json index 7db20bbe1f..632f742d1f 100644 --- a/app/test/__fixtures/config/int/bathing-water-quality-hierarchie.json +++ b/app/test/__fixtures/config/int/bathing-water-quality-hierarchie.json @@ -17,7 +17,7 @@ }, "dataSet": "https://environment.ld.admin.ch/foen/ubd0104/11", "dataSource": { - "url": "https://lindas-cached.int.cluster.ldbar.ch/query", + "url": "https://int.cached.lindas.admin.ch/query", "type": "sparql" }, "chartConfig": { diff --git a/app/test/__fixtures/config/int/column-heavy-metals.json b/app/test/__fixtures/config/int/column-heavy-metals.json index 99188da29b..2cd74d391a 100644 --- a/app/test/__fixtures/config/int/column-heavy-metals.json +++ b/app/test/__fixtures/config/int/column-heavy-metals.json @@ -18,7 +18,7 @@ "dataSet": "https://environment.ld.admin.ch/foen/ubd0066/15", "dataSource": { "type": "sparql", - "url": "https://lindas-cached.int.cluster.ldbar.ch/query" + "url": "https://int.cached.lindas.admin.ch/query" }, "chartConfig": { "version": "1.2.1", diff --git a/app/test/__fixtures/config/int/map-nfi.json b/app/test/__fixtures/config/int/map-nfi.json index 9e5962399a..d1f90c3b57 100644 --- a/app/test/__fixtures/config/int/map-nfi.json +++ b/app/test/__fixtures/config/int/map-nfi.json @@ -5,7 +5,7 @@ "dataSet": "https://environment.ld.admin.ch/foen/nfi/nfi_C-98/cube/2023-1", "dataSource": { "type": "sparql", - "url": "https://lindas-cached.int.cluster.ldbar.ch/query" + "url": "https://int.cached.lindas.admin.ch/query" }, "meta": { "title": { diff --git a/app/test/__fixtures/config/int/pie-red-list.json b/app/test/__fixtures/config/int/pie-red-list.json index 3fa56bcf32..ba0fa54874 100644 --- a/app/test/__fixtures/config/int/pie-red-list.json +++ b/app/test/__fixtures/config/int/pie-red-list.json @@ -4,7 +4,7 @@ "dataSet": "https://environment.ld.admin.ch/foen/UBD003002/5", "dataSource": { "type": "sparql", - "url": "https://lindas-cached.int.cluster.ldbar.ch/query" + "url": "https://int.cached.lindas.admin.ch/query" }, "meta": { "title": { @@ -13,7 +13,12 @@ "it": "", "en": "Amphibians red list status" }, - "description": { "de": "", "fr": "", "it": "", "en": "" } + "description": { + "de": "", + "fr": "", + "it": "", + "en": "" + } }, "chartConfig": { "version": "1.2.1", @@ -25,13 +30,23 @@ } }, "interactiveFiltersConfig": { - "legend": { "active": false, "componentIri": "" }, + "legend": { + "active": false, + "componentIri": "" + }, "timeRange": { "active": false, "componentIri": "", - "presets": { "type": "range", "from": "", "to": "" } + "presets": { + "type": "range", + "from": "", + "to": "" + } }, - "dataFilters": { "active": false, "componentIris": [] } + "dataFilters": { + "active": false, + "componentIris": [] + } }, "fields": { "y": { @@ -40,7 +55,10 @@ "segment": { "componentIri": "https://environment.ld.admin.ch/foen/UBD003002/status", "palette": "category10", - "sorting": { "sortingType": "byMeasure", "sortingOrder": "asc" }, + "sorting": { + "sortingType": "byMeasure", + "sortingOrder": "asc" + }, "colorMapping": { "https://environment.ld.admin.ch/foen/UBD003002/Status/DD": "#1f77b4", "https://environment.ld.admin.ch/foen/UBD003002/Status/LC": "#ff7f0e", diff --git a/app/test/__fixtures/config/int/scatterplot-palmer-penguins.json b/app/test/__fixtures/config/int/scatterplot-palmer-penguins.json index da9534effc..8e182df9c6 100644 --- a/app/test/__fixtures/config/int/scatterplot-palmer-penguins.json +++ b/app/test/__fixtures/config/int/scatterplot-palmer-penguins.json @@ -5,7 +5,7 @@ "dataSet": "https://environment.ld.admin.ch/foen/palmer-penguins/18", "dataSource": { "type": "sparql", - "url": "https://lindas-cached.int.cluster.ldbar.ch/query" + "url": "https://int.cached.lindas.admin.ch/query" }, "meta": { "title": { @@ -14,7 +14,12 @@ "it": "", "en": "Mean bill depth vs mean bill depth for Adelie Penguins" }, - "description": { "de": "", "fr": "", "it": "", "en": "" } + "description": { + "de": "", + "fr": "", + "it": "", + "en": "" + } }, "chartConfig": { "version": "1.2.1", @@ -35,13 +40,23 @@ }, "cubes": [], "interactiveFiltersConfig": { - "legend": { "active": false, "componentIri": "" }, + "legend": { + "active": false, + "componentIri": "" + }, "timeRange": { "active": false, "componentIri": "", - "presets": { "type": "range", "from": "", "to": "" } + "presets": { + "type": "range", + "from": "", + "to": "" + } }, - "dataFilters": { "active": false, "componentIris": [] } + "dataFilters": { + "active": false, + "componentIris": [] + } }, "fields": { "x": { diff --git a/e2e/fixtures/hierarchy-test-13-municipality-population.json b/e2e/fixtures/hierarchy-test-13-municipality-population.json index c92110848b..4cb7f689b2 100644 --- a/e2e/fixtures/hierarchy-test-13-municipality-population.json +++ b/e2e/fixtures/hierarchy-test-13-municipality-population.json @@ -3,11 +3,21 @@ "dataSet": "https://environment.ld.admin.ch/foen/fab_hierarchy_test12_switzerland_canton_municipality/5", "dataSource": { "type": "sparql", - "url": "https://lindas-cached.int.cluster.ldbar.ch/query" + "url": "https://int.cached.lindas.admin.ch/query" }, "meta": { - "title": { "de": "", "fr": "", "it": "", "en": "" }, - "description": { "de": "", "fr": "", "it": "", "en": "" } + "title": { + "de": "", + "fr": "", + "it": "", + "en": "" + }, + "description": { + "de": "", + "fr": "", + "it": "", + "en": "" + } }, "chartConfig": { "version": "1.3.0", @@ -26,14 +36,26 @@ } }, "interactiveFiltersConfig": { - "legend": { "active": false, "componentIri": "" }, + "legend": { + "active": false, + "componentIri": "" + }, "timeRange": { "active": false, "componentIri": "", - "presets": { "type": "range", "from": "", "to": "" } + "presets": { + "type": "range", + "from": "", + "to": "" + } + }, + "timeSlider": { + "componentIri": "" }, - "timeSlider": { "componentIri": "" }, - "dataFilters": { "active": false, "componentIris": [] } + "dataFilters": { + "active": false, + "componentIris": [] + } }, "fields": { "x": { diff --git a/e2e/fixtures/offentliche-ausgaben-chart-config.json b/e2e/fixtures/offentliche-ausgaben-chart-config.json index 9db834c16b..a954c1e1f3 100644 --- a/e2e/fixtures/offentliche-ausgaben-chart-config.json +++ b/e2e/fixtures/offentliche-ausgaben-chart-config.json @@ -3,11 +3,21 @@ "dataSet": "https://environment.ld.admin.ch/foen/fab_Offentliche_Ausgaben_test3/7", "dataSource": { "type": "sparql", - "url": "https://lindas-cached.int.cluster.ldbar.ch/query" + "url": "https://int.cached.lindas.admin.ch/query" }, "meta": { - "title": { "de": "", "fr": "", "it": "", "en": "" }, - "description": { "de": "", "fr": "", "it": "", "en": "" } + "title": { + "de": "", + "fr": "", + "it": "", + "en": "" + }, + "description": { + "de": "", + "fr": "", + "it": "", + "en": "" + } }, "chartConfig": { "version": "1.2.1", @@ -27,18 +37,31 @@ } }, "interactiveFiltersConfig": { - "legend": { "active": false, "componentIri": "" }, + "legend": { + "active": false, + "componentIri": "" + }, "timeRange": { "active": false, "componentIri": "", - "presets": { "type": "range", "from": "", "to": "" } + "presets": { + "type": "range", + "from": "", + "to": "" + } }, - "dataFilters": { "active": false, "componentIris": [] } + "dataFilters": { + "active": false, + "componentIris": [] + } }, "fields": { "x": { "componentIri": "https://environment.ld.admin.ch/foen/fab_Offentliche_Ausgaben_test3/jahr", - "sorting": { "sortingType": "byDimensionLabel", "sortingOrder": "asc" } + "sorting": { + "sortingType": "byDimensionLabel", + "sortingOrder": "asc" + } }, "y": { "componentIri": "https://environment.ld.admin.ch/foen/fab_Offentliche_Ausgaben_test3/in-pct" @@ -47,7 +70,10 @@ "componentIri": "https://environment.ld.admin.ch/foen/fab_Offentliche_Ausgaben_test3/code", "palette": "category10", "type": "stacked", - "sorting": { "sortingType": "byDimensionLabel", "sortingOrder": "asc" }, + "sorting": { + "sortingType": "byDimensionLabel", + "sortingOrder": "asc" + }, "colorMapping": { "https://ld.admin.ch/cube/dimension/cofog/gf01": "#1f77b4", "https://ld.admin.ch/cube/dimension/cofog/gf0101": "#ff7f0e", diff --git a/e2e/limits.spec.ts b/e2e/limits.spec.ts index 197b6003ff..6de90044ed 100644 --- a/e2e/limits.spec.ts +++ b/e2e/limits.spec.ts @@ -32,7 +32,7 @@ const CONFIGURATOR_STATE = { state: "CONFIGURING_CHART", dataSource: { type: "sparql", - url: "https://lindas-cached.int.cluster.ldbar.ch/query", + url: "https://int.cached.lindas.admin.ch/query", }, layout: { type: "tab", diff --git a/e2e/query-hierarchies.spec.ts b/e2e/query-hierarchies.spec.ts index ded192c733..9577afa86b 100644 --- a/e2e/query-hierarchies.spec.ts +++ b/e2e/query-hierarchies.spec.ts @@ -94,7 +94,7 @@ const runTest = async ({ const res = await client .query(DimensionHierarchyDocument, { cubeIri: cubeIri, - sourceUrl: "https://lindas-cached.int.cluster.ldbar.ch/query", + sourceUrl: "https://int.cached.lindas.admin.ch/query", sourceType: "sparql", dimensionIri: "https://environment.ld.admin.ch/foen/nfi/unitOfReference", locale,