diff --git a/CHANGELOG.md b/CHANGELOG.md index 95e94696a8..1b1b483917 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,8 @@ You can also check the ## Unreleased +- Maintenance + - Update available data sources after LINDAS PROD cut over - Fixes - Fix XSS vulnerability caused by unescaped map layer attributions - Allow GraphQL endpoint to return larger responses by increasing the response diff --git a/app/.env.development b/app/.env.development index eee2e5b3f6..18585d13fb 100644 --- a/app/.env.development +++ b/app/.env.development @@ -1,8 +1,8 @@ DATABASE_URL=postgres://postgres:password@localhost:5432/visualization_tool -ENDPOINT=sparql+https://lindas-cached.cluster.ldbar.ch/query +ENDPOINT=sparql+https://cached.lindas.admin.ch/query SPARQL_GEO_ENDPOINT=https://geo.ld.admin.ch/query GRAPHQL_ENDPOINT=/api/graphql -WHITELISTED_DATA_SOURCES=["Prod", "Prod-uncached", "Int", "Int-uncached", "Test", "Test-uncached", "LINDASnext-Prod", "LINDASnext-Prod-uncached", "LINDASnext-Int", "LINDASnext-Int-uncached", "LINDASold-Test", "LINDASold-Test-uncached"] +WHITELISTED_DATA_SOURCES=["Prod", "Prod-uncached", "Int", "Int-uncached", "Test", "Test-uncached", "LINDASold-Prod", "LINDASold-Prod-uncached", "LINDASold-Int", "LINDASold-Int-uncached", "LINDASold-Test", "LINDASold-Test-uncached"] NEXT_PUBLIC_VECTOR_TILE_URL=https://world.vectortiles.geo.admin.ch NEXT_PUBLIC_MAPTILER_STYLE_KEY=123 ADFS_PROFILE_URL=https://www.myaccount-r.eiam.admin.ch/ diff --git a/app/components/graphql-termsets.stories.tsx b/app/components/graphql-termsets.stories.tsx index 5ac2e4ec54..a505c7d710 100644 --- a/app/components/graphql-termsets.stories.tsx +++ b/app/components/graphql-termsets.stories.tsx @@ -19,7 +19,7 @@ export const Termsets = () => { variables: { locale: "en", sourceType: "sparql", - sourceUrl: "https://lindas-cached.cluster.ldbar.ch/query", + sourceUrl: "https://cached.lindas.admin.ch/query", cubeFilter: { iri: cube, }, diff --git a/app/docs/catalog/chart-preview-via-api.mdx b/app/docs/catalog/chart-preview-via-api.mdx index 9e95e8433b..6af6c4173f 100644 --- a/app/docs/catalog/chart-preview-via-api.mdx +++ b/app/docs/catalog/chart-preview-via-api.mdx @@ -165,7 +165,7 @@ An example configurator state is shown below. "https://energy.ld.admin.ch/sfoe/bfe_ogd84_einmalverguetung_fuer_photovoltaikanlagen/7", dataSource: { type: "sparql", - url: "https://lindas-cached.cluster.ldbar.ch/query", + url: "https://cached.lindas.admin.ch/query", }, meta: { title: { diff --git a/app/domain/data-source/constants.ts b/app/domain/data-source/constants.ts index 018bddbd3f..74a1ea9746 100644 --- a/app/domain/data-source/constants.ts +++ b/app/domain/data-source/constants.ts @@ -2,10 +2,9 @@ import keyBy from "lodash/keyBy"; import { WHITELISTED_DATA_SOURCES } from "../env"; -export const LEGACY_PROD_DATA_SOURCE_URL = "https://lindas.admin.ch/query"; +export const UNCACHED_PROD_DATA_SOURCE_URL = "https://lindas.admin.ch/query"; -export const PROD_DATA_SOURCE_URL = - "https://lindas-cached.cluster.ldbar.ch/query"; +export const PROD_DATA_SOURCE_URL = "https://cached.lindas.admin.ch/query"; interface SourceOption { value: string; @@ -26,32 +25,13 @@ export const SOURCE_OPTIONS: SourceOption[] = [ supportsCachingPerCubeIri: true, }, { - value: "sparql+https://lindas.admin.ch/query", + value: `sparql+${UNCACHED_PROD_DATA_SOURCE_URL}`, key: "Prod-uncached", label: "LINDAS PROD (uncached)", - url: "https://lindas.admin.ch/query", + url: UNCACHED_PROD_DATA_SOURCE_URL, isTrusted: true, supportsCachingPerCubeIri: true, }, - - // For LINDASnext - { - value: "sparql+https://cached.lindas.admin.ch/query", - key: "LINDASnext-Prod", - label: "LINDASnext PROD", - url: "https://cached.lindas.admin.ch/query", - isTrusted: true, - supportsCachingPerCubeIri: true, - }, - { - value: "sparql+https://lindas.cz-aws.net/query", - key: "LINDASnext-Prod-uncached", - label: "LINDASnext PROD (uncached)", - url: "https://lindas.cz-aws.net/query", - isTrusted: false, - supportsCachingPerCubeIri: true, - }, - // Migration done for the following data sources { value: "sparql+https://int.cached.lindas.admin.ch/query", key: "Int", @@ -86,6 +66,22 @@ export const SOURCE_OPTIONS: SourceOption[] = [ }, // 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", diff --git a/app/domain/data-source/index.spec.ts b/app/domain/data-source/index.spec.ts index 6d22616671..204cc088e3 100644 --- a/app/domain/data-source/index.spec.ts +++ b/app/domain/data-source/index.spec.ts @@ -33,7 +33,7 @@ const createRouter = ({ query }: { query: Record }) => { vi.mock("../env", () => ({ WHITELISTED_DATA_SOURCES: ["Test", "Prod", "Int"], - ENDPOINT: "sparql+https://lindas-cached.cluster.ldbar.ch/query", // Default is Prod in tests + ENDPOINT: "sparql+https://cached.lindas.admin.ch/query", // Default is Prod in tests })); describe("datasource state hook", () => { @@ -88,7 +88,7 @@ describe("datasource state hook", () => { expect(getState()).toEqual({ type: "sparql", - url: "https://lindas-cached.cluster.ldbar.ch/query", + url: "https://cached.lindas.admin.ch/query", }); }); @@ -125,7 +125,7 @@ describe("datasource state hook", () => { act(() => { setState({ type: "sparql", - url: "https://lindas-cached.cluster.ldbar.ch/query", + url: "https://cached.lindas.admin.ch/query", }); }); diff --git a/app/domain/env.ts b/app/domain/env.ts index d8a0dc8ae5..8cfffc326f 100644 --- a/app/domain/env.ts +++ b/app/domain/env.ts @@ -24,7 +24,7 @@ export const PUBLIC_URL = ( export const ENDPOINT = clientEnv?.ENDPOINT ?? process.env.ENDPOINT ?? - "sparql+https://lindas-cached.cluster.ldbar.ch/query"; + "sparql+https://cached.lindas.admin.ch/query"; export const WHITELISTED_DATA_SOURCES = clientEnv?.WHITELISTED_DATA_SOURCES ?? (process.env.WHITELISTED_DATA_SOURCES !== undefined diff --git a/app/pages/_preview.tsx b/app/pages/_preview.tsx index a3fc295ebd..1cbe03a6d8 100644 --- a/app/pages/_preview.tsx +++ b/app/pages/_preview.tsx @@ -55,7 +55,7 @@ const CONFIGURATOR_STATE_COLUMN = { "https://energy.ld.admin.ch/sfoe/bfe_ogd84_einmalverguetung_fuer_photovoltaikanlagen/2", dataSource: { type: "sparql", - url: "https://lindas-cached.cluster.ldbar.ch/query", + url: "https://cached.lindas.admin.ch/query", }, meta: { title: { de: "", fr: "", it: "", en: "" }, diff --git a/app/pages/_preview_post.tsx b/app/pages/_preview_post.tsx index 24a4c2f936..a293c1794b 100644 --- a/app/pages/_preview_post.tsx +++ b/app/pages/_preview_post.tsx @@ -39,7 +39,7 @@ const photovoltaikanlagenState = { "https://energy.ld.admin.ch/sfoe/bfe_ogd84_einmalverguetung_fuer_photovoltaikanlagen/7", dataSource: { type: "sparql", - url: "https://lindas-cached.cluster.ldbar.ch/query", + url: "https://cached.lindas.admin.ch/query", }, meta: { title: { @@ -111,7 +111,7 @@ const nfiState = { dataSet: "https://environment.ld.admin.ch/foen/nfi/nfi_C-1266/cube/2023-1", dataSource: { type: "sparql", - url: "https://lindas-cached.cluster.ldbar.ch/query", + url: "https://cached.lindas.admin.ch/query", }, meta: { title: { diff --git a/app/test/__fixtures/config/prod/column-1.json b/app/test/__fixtures/config/prod/column-1.json index 54826a04ad..2ee24d2782 100644 --- a/app/test/__fixtures/config/prod/column-1.json +++ b/app/test/__fixtures/config/prod/column-1.json @@ -2,13 +2,23 @@ "key": "g_Dcz7A82MNj", "data": { "meta": { - "title": { "de": "", "en": "", "fr": "", "it": "" }, - "description": { "de": "", "en": "", "fr": "", "it": "" } + "title": { + "de": "", + "en": "", + "fr": "", + "it": "" + }, + "description": { + "de": "", + "en": "", + "fr": "", + "it": "" + } }, "dataSet": "http://environment.ld.admin.ch/foen/px/0703010000_105/dataset", "dataSource": { "type": "sparql", - "url": "https://lindas-cached.cluster.ldbar.ch/query" + "url": "https://cached.lindas.admin.ch/query" }, "chartConfig": { "version": "1.2.1", diff --git a/app/test/__fixtures/config/prod/column-2.json b/app/test/__fixtures/config/prod/column-2.json index 49746a4a95..069771565a 100644 --- a/app/test/__fixtures/config/prod/column-2.json +++ b/app/test/__fixtures/config/prod/column-2.json @@ -2,13 +2,23 @@ "key": "jV7rbOyAYouu", "data": { "meta": { - "title": { "de": "", "en": "", "fr": "", "it": "" }, - "description": { "de": "", "en": "", "fr": "", "it": "" } + "title": { + "de": "", + "en": "", + "fr": "", + "it": "" + }, + "description": { + "de": "", + "en": "", + "fr": "", + "it": "" + } }, "dataSet": "http://ld.zazuko.com/foag/dataset", "dataSource": { "type": "sparql", - "url": "https://lindas-cached.cluster.ldbar.ch/query" + "url": "https://cached.lindas.admin.ch/query" }, "chartConfig": { "version": "1.2.1", @@ -20,7 +30,9 @@ }, "componentIri": "http://ld.zazuko.com/foag/week-date" }, - "y": { "componentIri": "http://ld.zazuko.com/foag/price" } + "y": { + "componentIri": "http://ld.zazuko.com/foag/price" + } }, "filters": { "http://ld.zazuko.com/foag/unit": { diff --git a/app/test/__fixtures/config/prod/column-3.json b/app/test/__fixtures/config/prod/column-3.json index 8fc40b42ed..f1cfd1f9e3 100644 --- a/app/test/__fixtures/config/prod/column-3.json +++ b/app/test/__fixtures/config/prod/column-3.json @@ -2,19 +2,32 @@ "key": "KXMuXhfWuN5d", "data": { "meta": { - "title": { "de": "", "en": "", "fr": "", "it": "" }, - "description": { "de": "", "en": "", "fr": "", "it": "" } + "title": { + "de": "", + "en": "", + "fr": "", + "it": "" + }, + "description": { + "de": "", + "en": "", + "fr": "", + "it": "" + } }, "dataSet": "http://environment.ld.admin.ch/foen/px/0703030000_135/dataset", "dataSource": { "type": "sparql", - "url": "https://lindas-cached.cluster.ldbar.ch/query" + "url": "https://cached.lindas.admin.ch/query" }, "chartConfig": { "version": "1.2.1", "fields": { "x": { - "sorting": { "sortingType": "byMeasure", "sortingOrder": "asc" }, + "sorting": { + "sortingType": "byMeasure", + "sortingOrder": "asc" + }, "componentIri": "http://environment.ld.admin.ch/foen/px/0703030000_135/dimension/1" }, "y": { diff --git a/app/test/__fixtures/config/prod/column-4.json b/app/test/__fixtures/config/prod/column-4.json index 30912fbd38..22f2ab8915 100644 --- a/app/test/__fixtures/config/prod/column-4.json +++ b/app/test/__fixtures/config/prod/column-4.json @@ -2,13 +2,23 @@ "key": "l8F-tvfGFrwU", "data": { "meta": { - "title": { "de": "", "en": "", "fr": "", "it": "" }, - "description": { "de": "", "en": "", "fr": "", "it": "" } + "title": { + "de": "", + "en": "", + "fr": "", + "it": "" + }, + "description": { + "de": "", + "en": "", + "fr": "", + "it": "" + } }, "dataSet": "http://environment.ld.admin.ch/foen/px/0703010000_102/dataset", "dataSource": { "type": "sparql", - "url": "https://lindas-cached.cluster.ldbar.ch/query" + "url": "https://cached.lindas.admin.ch/query" }, "chartConfig": { "version": "1.2.1", diff --git a/app/test/__fixtures/config/prod/column-5.json b/app/test/__fixtures/config/prod/column-5.json index 77848cb4ee..b026d47986 100644 --- a/app/test/__fixtures/config/prod/column-5.json +++ b/app/test/__fixtures/config/prod/column-5.json @@ -2,13 +2,23 @@ "key": "Qq3UMO9ysHZi", "data": { "meta": { - "title": { "de": "", "en": "", "fr": "", "it": "" }, - "description": { "de": "", "en": "", "fr": "", "it": "" } + "title": { + "de": "", + "en": "", + "fr": "", + "it": "" + }, + "description": { + "de": "", + "en": "", + "fr": "", + "it": "" + } }, "dataSet": "http://environment.ld.admin.ch/foen/px/0703030000_112/dataset", "dataSource": { "type": "sparql", - "url": "https://lindas-cached.cluster.ldbar.ch/query" + "url": "https://cached.lindas.admin.ch/query" }, "chartConfig": { "version": "1.2.1", diff --git a/app/test/__fixtures/config/prod/column-6.json b/app/test/__fixtures/config/prod/column-6.json index 93062ae62b..73b7b026d5 100644 --- a/app/test/__fixtures/config/prod/column-6.json +++ b/app/test/__fixtures/config/prod/column-6.json @@ -2,7 +2,12 @@ "key": "v71kJ5n-qKGw", "data": { "meta": { - "title": { "de": "Holz", "en": "", "fr": "", "it": "" }, + "title": { + "de": "Holz", + "en": "", + "fr": "", + "it": "" + }, "description": { "de": "aslkslkjfsadlfkj asékfàsaék", "en": "", @@ -13,7 +18,7 @@ "dataSet": "http://environment.ld.admin.ch/foen/px/0703010000_106/dataset", "dataSource": { "type": "sparql", - "url": "https://lindas-cached.cluster.ldbar.ch/query" + "url": "https://cached.lindas.admin.ch/query" }, "chartConfig": { "version": "1.2.1", diff --git a/app/test/__fixtures/config/prod/column-7.json b/app/test/__fixtures/config/prod/column-7.json index 5f3ae8bc22..6205d2d3d1 100644 --- a/app/test/__fixtures/config/prod/column-7.json +++ b/app/test/__fixtures/config/prod/column-7.json @@ -2,13 +2,23 @@ "key": "wfFzUGgvZVbp", "data": { "meta": { - "title": { "de": "", "en": "", "fr": "", "it": "" }, - "description": { "de": "", "en": "", "fr": "", "it": "" } + "title": { + "de": "", + "en": "", + "fr": "", + "it": "" + }, + "description": { + "de": "", + "en": "", + "fr": "", + "it": "" + } }, "dataSet": "http://environment.ld.admin.ch/foen/px/0703030000_112/dataset", "dataSource": { "type": "sparql", - "url": "https://lindas-cached.cluster.ldbar.ch/query" + "url": "https://cached.lindas.admin.ch/query" }, "chartConfig": { "version": "1.2.1", diff --git a/app/test/__fixtures/config/prod/column-traffic-pollution.json b/app/test/__fixtures/config/prod/column-traffic-pollution.json index f8d8efa82a..a1a249b43c 100644 --- a/app/test/__fixtures/config/prod/column-traffic-pollution.json +++ b/app/test/__fixtures/config/prod/column-traffic-pollution.json @@ -18,7 +18,7 @@ "dataSet": "https://environment.ld.admin.ch/foen/ubd003701/1", "dataSource": { "type": "sparql", - "url": "https://lindas-cached.cluster.ldbar.ch/query" + "url": "https://cached.lindas.admin.ch/query" }, "chartConfig": { "version": "1.2.1", diff --git a/app/test/__fixtures/config/prod/combo-line-dual.json b/app/test/__fixtures/config/prod/combo-line-dual.json index 31bb97534c..1d150f03ba 100644 --- a/app/test/__fixtures/config/prod/combo-line-dual.json +++ b/app/test/__fixtures/config/prod/combo-line-dual.json @@ -35,7 +35,7 @@ }, "version": "4.2.0", "dataSource": { - "url": "https://lindas-cached.cluster.ldbar.ch/query", + "url": "https://cached.lindas.admin.ch/query", "type": "sparql" }, "chartConfigs": [ diff --git a/app/test/__fixtures/config/prod/dashboard-free-canvas.json b/app/test/__fixtures/config/prod/dashboard-free-canvas.json index f816619506..ee7477a84f 100644 --- a/app/test/__fixtures/config/prod/dashboard-free-canvas.json +++ b/app/test/__fixtures/config/prod/dashboard-free-canvas.json @@ -55,7 +55,16 @@ "minH": 5, "moved": false, "static": false, - "resizeHandles": ["s", "w", "e", "n", "sw", "nw", "se", "ne"] + "resizeHandles": [ + "s", + "w", + "e", + "n", + "sw", + "nw", + "se", + "ne" + ] }, { "h": 5, @@ -67,7 +76,16 @@ "minH": 5, "moved": false, "static": false, - "resizeHandles": ["s", "w", "e", "n", "sw", "nw", "se", "ne"] + "resizeHandles": [ + "s", + "w", + "e", + "n", + "sw", + "nw", + "se", + "ne" + ] }, { "h": 5, @@ -79,7 +97,16 @@ "minH": 5, "moved": false, "static": false, - "resizeHandles": ["s", "w", "e", "n", "sw", "nw", "se", "ne"] + "resizeHandles": [ + "s", + "w", + "e", + "n", + "sw", + "nw", + "se", + "ne" + ] } ], "md": [ @@ -91,7 +118,16 @@ "y": 0, "maxW": 4, "minH": 5, - "resizeHandles": ["s", "w", "e", "n", "sw", "nw", "se", "ne"] + "resizeHandles": [ + "s", + "w", + "e", + "n", + "sw", + "nw", + "se", + "ne" + ] }, { "h": 5, @@ -101,7 +137,16 @@ "y": 0, "maxW": 4, "minH": 5, - "resizeHandles": ["s", "w", "e", "n", "sw", "nw", "se", "ne"] + "resizeHandles": [ + "s", + "w", + "e", + "n", + "sw", + "nw", + "se", + "ne" + ] }, { "h": 5, @@ -111,7 +156,16 @@ "y": 7, "maxW": 4, "minH": 5, - "resizeHandles": ["s", "w", "e", "n", "sw", "nw", "se", "ne"] + "resizeHandles": [ + "s", + "w", + "e", + "n", + "sw", + "nw", + "se", + "ne" + ] } ], "sm": [ @@ -123,7 +177,16 @@ "y": 0, "maxW": 4, "minH": 5, - "resizeHandles": ["s", "w", "e", "n", "sw", "nw", "se", "ne"] + "resizeHandles": [ + "s", + "w", + "e", + "n", + "sw", + "nw", + "se", + "ne" + ] }, { "h": 5, @@ -133,7 +196,16 @@ "y": 0, "maxW": 4, "minH": 5, - "resizeHandles": ["s", "w", "e", "n", "sw", "nw", "se", "ne"] + "resizeHandles": [ + "s", + "w", + "e", + "n", + "sw", + "nw", + "se", + "ne" + ] }, { "h": 5, @@ -143,7 +215,16 @@ "y": 7, "maxW": 4, "minH": 5, - "resizeHandles": ["s", "w", "e", "n", "sw", "nw", "se", "ne"] + "resizeHandles": [ + "s", + "w", + "e", + "n", + "sw", + "nw", + "se", + "ne" + ] } ], "xl": [ @@ -157,7 +238,16 @@ "minH": 5, "moved": false, "static": false, - "resizeHandles": ["s", "w", "e", "n", "sw", "nw", "se", "ne"] + "resizeHandles": [ + "s", + "w", + "e", + "n", + "sw", + "nw", + "se", + "ne" + ] }, { "h": 5, @@ -169,7 +259,16 @@ "minH": 5, "moved": false, "static": false, - "resizeHandles": ["s", "w", "e", "n", "sw", "nw", "se", "ne"] + "resizeHandles": [ + "s", + "w", + "e", + "n", + "sw", + "nw", + "se", + "ne" + ] }, { "h": 5, @@ -181,14 +280,23 @@ "minH": 5, "moved": false, "static": false, - "resizeHandles": ["s", "w", "e", "n", "sw", "nw", "se", "ne"] + "resizeHandles": [ + "s", + "w", + "e", + "n", + "sw", + "nw", + "se", + "ne" + ] } ] } }, "version": "4.2.0", "dataSource": { - "url": "https://lindas-cached.cluster.ldbar.ch/query", + "url": "https://cached.lindas.admin.ch/query", "type": "sparql" }, "chartConfigs": [ diff --git a/app/test/__fixtures/config/prod/dashboard-tall.json b/app/test/__fixtures/config/prod/dashboard-tall.json index c45fa34c11..7194308c32 100644 --- a/app/test/__fixtures/config/prod/dashboard-tall.json +++ b/app/test/__fixtures/config/prod/dashboard-tall.json @@ -4,7 +4,7 @@ "version": "4.2.0", "dataSource": { "type": "sparql", - "url": "https://lindas-cached.cluster.ldbar.ch/query" + "url": "https://cached.lindas.admin.ch/query" }, "layout": { "type": "dashboard", diff --git a/app/test/__fixtures/config/prod/line-1.json b/app/test/__fixtures/config/prod/line-1.json index 12c735261a..325402ecc0 100644 --- a/app/test/__fixtures/config/prod/line-1.json +++ b/app/test/__fixtures/config/prod/line-1.json @@ -2,13 +2,23 @@ "key": "5BmzFXXNtE1X", "data": { "meta": { - "title": { "de": "", "en": "", "fr": "", "it": "" }, - "description": { "de": "", "en": "", "fr": "", "it": "" } + "title": { + "de": "", + "en": "", + "fr": "", + "it": "" + }, + "description": { + "de": "", + "en": "", + "fr": "", + "it": "" + } }, "dataSet": "http://environment.ld.admin.ch/foen/px/0703010000_105/dataset", "dataSource": { "type": "sparql", - "url": "https://lindas-cached.cluster.ldbar.ch/query" + "url": "https://cached.lindas.admin.ch/query" }, "chartConfig": { "version": "1.4.2", diff --git a/app/test/__fixtures/config/prod/line-2.json b/app/test/__fixtures/config/prod/line-2.json index b1544d4cbb..b6a225de8c 100644 --- a/app/test/__fixtures/config/prod/line-2.json +++ b/app/test/__fixtures/config/prod/line-2.json @@ -8,12 +8,17 @@ "fr": "jklsdjfsdkl", "it": "kdsjfasdkl" }, - "description": { "de": "", "en": "", "fr": "", "it": "" } + "description": { + "de": "", + "en": "", + "fr": "", + "it": "" + } }, "dataSet": "http://environment.ld.admin.ch/foen/px/0703030000_112/dataset", "dataSource": { "type": "sparql", - "url": "https://lindas-cached.cluster.ldbar.ch/query" + "url": "https://cached.lindas.admin.ch/query" }, "chartConfig": { "version": "1.2.1", diff --git a/app/test/__fixtures/config/prod/map-1.json b/app/test/__fixtures/config/prod/map-1.json index d46198dc5b..c73c430515 100644 --- a/app/test/__fixtures/config/prod/map-1.json +++ b/app/test/__fixtures/config/prod/map-1.json @@ -3,7 +3,7 @@ "state": "CONFIGURING_CHART", "dataSource": { "type": "sparql", - "url": "https://lindas-cached.cluster.ldbar.ch/query" + "url": "https://cached.lindas.admin.ch/query" }, "layout": { "type": "tab", diff --git a/app/test/__fixtures/config/prod/most-recent-time-range-interactive-filter.json b/app/test/__fixtures/config/prod/most-recent-time-range-interactive-filter.json index 7221af7ef0..290300257d 100644 --- a/app/test/__fixtures/config/prod/most-recent-time-range-interactive-filter.json +++ b/app/test/__fixtures/config/prod/most-recent-time-range-interactive-filter.json @@ -35,7 +35,7 @@ }, "version": "4.2.0", "dataSource": { - "url": "https://lindas-cached.cluster.ldbar.ch/query", + "url": "https://cached.lindas.admin.ch/query", "type": "sparql" }, "chartConfigs": [ diff --git a/app/test/__fixtures/config/prod/pie-1.json b/app/test/__fixtures/config/prod/pie-1.json index 48aa3caa8f..0994521c22 100644 --- a/app/test/__fixtures/config/prod/pie-1.json +++ b/app/test/__fixtures/config/prod/pie-1.json @@ -2,13 +2,23 @@ "key": "o3MTv3YHMdUA", "data": { "meta": { - "title": { "de": "", "en": "", "fr": "", "it": "" }, - "description": { "de": "", "en": "", "fr": "", "it": "" } + "title": { + "de": "", + "en": "", + "fr": "", + "it": "" + }, + "description": { + "de": "", + "en": "", + "fr": "", + "it": "" + } }, "dataSet": "http://environment.ld.admin.ch/foen/px/0703010000_106/dataset", "dataSource": { "type": "sparql", - "url": "https://lindas-cached.cluster.ldbar.ch/query" + "url": "https://cached.lindas.admin.ch/query" }, "chartConfig": { "version": "1.2.1", @@ -18,7 +28,10 @@ }, "segment": { "palette": "category10", - "sorting": { "sortingType": "byMeasure", "sortingOrder": "asc" }, + "sorting": { + "sortingType": "byMeasure", + "sortingOrder": "asc" + }, "colorMapping": { "http://environment.ld.admin.ch/foen/px/0703010000_106/dimension/1/0": "#1f77b4", "http://environment.ld.admin.ch/foen/px/0703010000_106/dimension/1/1": "#ff7f0e", diff --git a/app/utils/chart-config/versioning.spec.ts b/app/utils/chart-config/versioning.spec.ts index 9315094221..6fd545b18f 100644 --- a/app/utils/chart-config/versioning.spec.ts +++ b/app/utils/chart-config/versioning.spec.ts @@ -195,7 +195,7 @@ describe("config migrations", () => { }, version: "4.0.0", dataSource: { - url: "https://lindas-cached.cluster.ldbar.ch/query", + url: "https://cached.lindas.admin.ch/query", type: "sparql", }, chartConfigs: [ diff --git a/app/utils/chart-config/versioning.ts b/app/utils/chart-config/versioning.ts index 9cb1fc717b..45a0008456 100644 --- a/app/utils/chart-config/versioning.ts +++ b/app/utils/chart-config/versioning.ts @@ -6,8 +6,8 @@ import { ChartConfig, ConfiguratorState } from "@/config-types"; import { mapValueIrisToColor } from "@/configurator/components/ui-helpers"; import { FIELD_VALUE_NONE } from "@/configurator/constants"; import { - LEGACY_PROD_DATA_SOURCE_URL, PROD_DATA_SOURCE_URL, + UNCACHED_PROD_DATA_SOURCE_URL, } from "@/domain/data-source/constants"; import { client } from "@/graphql/client"; import { isJoinById } from "@/graphql/join"; @@ -1922,7 +1922,7 @@ export const configuratorStateMigrations: Migration[] = [ type: "sparql", url: PROD_DATA_SOURCE_URL, }; - } else if (newConfig.dataSource.url === LEGACY_PROD_DATA_SOURCE_URL) { + } else if (newConfig.dataSource.url === UNCACHED_PROD_DATA_SOURCE_URL) { newConfig.dataSource.url = PROD_DATA_SOURCE_URL; } diff --git a/app/utils/hash-utils.spec.ts b/app/utils/hash-utils.spec.ts index a4ceeac4ad..145775eb75 100644 --- a/app/utils/hash-utils.spec.ts +++ b/app/utils/hash-utils.spec.ts @@ -8,7 +8,7 @@ it("should persist chart configs as is", () => { state: "CONFIGURING_CHART", dataSource: { type: "sparql", - url: "https://lindas-cached.cluster.ldbar.ch/query", + url: "https://cached.lindas.admin.ch/query", }, activeField: undefined, fakePropertyToTestNumbersParsing: 12345.6789, diff --git a/e2e/dashboard-date-filter.spec.ts b/e2e/dashboard-date-filter.spec.ts index 4ad2a4a5ae..fddae284eb 100644 --- a/e2e/dashboard-date-filter.spec.ts +++ b/e2e/dashboard-date-filter.spec.ts @@ -33,7 +33,7 @@ const CONFIGURATOR_STATE = { state: "LAYOUTING", dataSource: { type: "sparql", - url: "https://lindas-cached.cluster.ldbar.ch/query", + url: "https://cached.lindas.admin.ch/query", }, layout: { type: "tab", diff --git a/e2e/fixtures/forest-fire-danger-chart-config.json b/e2e/fixtures/forest-fire-danger-chart-config.json index dc608bffb0..dec2c9c403 100644 --- a/e2e/fixtures/forest-fire-danger-chart-config.json +++ b/e2e/fixtures/forest-fire-danger-chart-config.json @@ -3,7 +3,7 @@ "dataSet": "https://environment.ld.admin.ch/foen/gefahren-waldbrand-warnung/1", "dataSource": { "type": "sparql", - "url": "https://lindas-cached.cluster.ldbar.ch/query" + "url": "https://cached.lindas.admin.ch/query" }, "meta": { "title": { diff --git a/e2e/fixtures/map-nfi-chart-config.json b/e2e/fixtures/map-nfi-chart-config.json index 746fd450cf..d2e0887377 100644 --- a/e2e/fixtures/map-nfi-chart-config.json +++ b/e2e/fixtures/map-nfi-chart-config.json @@ -3,7 +3,7 @@ "dataSet": "https://environment.ld.admin.ch/foen/nfi/nfi_C-98/cube/2023-1", "dataSource": { "type": "sparql", - "url": "https://lindas-cached.cluster.ldbar.ch/query" + "url": "https://cached.lindas.admin.ch/query" }, "meta": { "title": { diff --git a/e2e/named-nodes.spec.ts b/e2e/named-nodes.spec.ts index be19801464..5a070c3786 100644 --- a/e2e/named-nodes.spec.ts +++ b/e2e/named-nodes.spec.ts @@ -25,7 +25,7 @@ test("@noci it should be possible to query dimension values from versioned dimen DataCubeComponentsDocument, { sourceType: "sparql", - sourceUrl: "https://lindas-cached.cluster.ldbar.ch/query", + sourceUrl: "https://cached.lindas.admin.ch/query", locale: "en", cubeFilter: { iri: cubeIri, loadValues: true }, } diff --git a/e2e/time-slider.spec.ts b/e2e/time-slider.spec.ts index 3835f82e06..1a40c837e8 100644 --- a/e2e/time-slider.spec.ts +++ b/e2e/time-slider.spec.ts @@ -31,7 +31,7 @@ const CONFIGURATOR_STATE = { state: "CONFIGURING_CHART", dataSource: { type: "sparql", - url: "https://lindas-cached.cluster.ldbar.ch/query", + url: "https://cached.lindas.admin.ch/query", }, layout: { type: "tab", diff --git a/e2e/tooltip.spec.ts b/e2e/tooltip.spec.ts index 7c17b27651..0f989190e3 100644 --- a/e2e/tooltip.spec.ts +++ b/e2e/tooltip.spec.ts @@ -103,7 +103,7 @@ const MAP_CONFIG_STATE = { state: "CONFIGURING_CHART", dataSource: { type: "sparql", - url: "https://lindas-cached.cluster.ldbar.ch/query", + url: "https://cached.lindas.admin.ch/query", }, layout: { type: "tab",