feat: Unversion cube iri for LightCube

...as the DataCubePreview will be re-used in #1890
visualize-admin · Nov 20, 2024 · 61535ba · 61535ba
1 parent 04eeb38
commit 61535ba
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 17 deletions.
diff --git a/app/graphql/resolvers/rdf.ts b/app/graphql/resolvers/rdf.ts
@@ -388,7 +388,10 @@ export const dataCubeComponentTermsets: NonNullable<
 > = async (_, { locale, cubeFilter }, { setup }, info) => {
   const { sparqlClient } = await setup(info);
   const { iri } = cubeFilter;
-  const cube = new LightCube({ iri, locale, sparqlClient });
+  const unversionedIri =
+    (await queryCubeUnversionedIri(sparqlClient, iri)) ?? iri;
+  const cube = new LightCube({ iri, unversionedIri, locale, sparqlClient });
+
   return await cube.fetchComponentTermsets();
 };
 
@@ -397,7 +400,10 @@ export const dataCubeMetadata: NonNullable<
 > = async (_, { locale, cubeFilter }, { setup }, info) => {
   const { sparqlClient } = await setup(info);
   const { iri } = cubeFilter;
-  const cube = new LightCube({ iri, locale, sparqlClient });
+  const unversionedIri =
+    (await queryCubeUnversionedIri(sparqlClient, iri)) ?? iri;
+  const cube = new LightCube({ iri, unversionedIri, locale, sparqlClient });
+
   return await cube.fetchMetadata();
 };
 
@@ -445,7 +451,10 @@ export const dataCubePreview: NonNullable<
 > = async (_, { locale, cubeFilter }, { setup }, info) => {
   const { sparqlClient } = await setup(info);
   const { iri } = cubeFilter;
-  const cube = new LightCube({ iri, locale, sparqlClient });
+  const unversionedIri =
+    (await queryCubeUnversionedIri(sparqlClient, iri)) ?? iri;
+  const cube = new LightCube({ iri, unversionedIri, locale, sparqlClient });
+
   return await cube.fetchPreview();
 };
 

diff --git a/app/rdf/light-cube.ts b/app/rdf/light-cube.ts
@@ -14,6 +14,7 @@ import {
 
 type LightCubeOptions = {
   iri: string;
+  unversionedIri: string;
   locale: string;
   sparqlClient: ParsingClient;
 };
@@ -23,15 +24,17 @@ type LightCubeOptions = {
  */
 export class LightCube {
   public iri: string;
+  public unversionedIri: string;
   private locale: string;
   public metadata: DataCubeMetadata | undefined;
   public preview: DataCubePreview | undefined;
   public components: DataCubeComponents | undefined;
   private sparqlClient: ParsingClient;
 
   constructor(options: LightCubeOptions) {
-    const { iri, locale, sparqlClient } = options;
+    const { iri, unversionedIri, locale, sparqlClient } = options;
     this.iri = iri;
+    this.unversionedIri = unversionedIri;
     this.locale = locale;
     this.sparqlClient = sparqlClient;
   }
@@ -61,6 +64,7 @@ export class LightCube {
 
   public async fetchPreview() {
     this.preview = await getCubePreview(this.iri, {
+      unversionedIri: this.unversionedIri,
       locale: this.locale,
       sparqlClient: this.sparqlClient,
     });

diff --git a/app/rdf/parse-search-results.ts b/app/rdf/parse-search-results.ts
@@ -105,10 +105,10 @@ function buildSearchCubes(
           const dim = bySubjectAndPredicate.get(x.object.value);
           return {
             iri: stringifyComponentId({
-              // TODO
               // Technically we don't need to unversion the cube iri here, as
               // search cubes are temporary and dimensions coming from here
-              // aren't stored in chart config, but would be nice to be consistent.
+              // aren't stored in chart config.
+              // We don't do it due to performance reasons.
               unversionedCubeIri: iri,
               unversionedComponentIri: x.object.value,
             }),

diff --git a/app/rdf/query-cube-preview.ts b/app/rdf/query-cube-preview.ts
@@ -34,11 +34,12 @@ import { buildLocalizedSubQuery } from "./query-utils";
 export const getCubePreview = async (
   iri: string,
   options: {
+    unversionedIri: string;
     locale: string;
     sparqlClient: ParsingClient;
   }
 ): Promise<DataCubePreview> => {
-  const { sparqlClient, locale } = options;
+  const { unversionedIri, sparqlClient, locale } = options;
   const qs = await sparqlClient.query.construct(
     `PREFIX cube: <https://cube.link/>
 PREFIX meta: <https://cube.link/meta/>
@@ -228,11 +229,7 @@ CONSTRUCT {
         Object.entries(observation).map(([k, v]) => {
           return [
             stringifyComponentId({
-              // TODO
-              // Technically we don't need to unversion the cube iri here, as
-              // cube preview is temporary and dimensions coming from here
-              // aren't stored in chart config, but would be nice to be consistent.
-              unversionedCubeIri: iri,
+              unversionedCubeIri: unversionedIri,
               unversionedComponentIri: k,
             }),
             v,
@@ -282,12 +279,8 @@ CONSTRUCT {
 
     const baseComponent: BaseComponent = {
       cubeIri: iri,
-      // TODO
-      // Technically we don't need to unversion the cube iri here, as
-      // cube preview is temporary and dimensions coming from here
-      // aren't stored in chart config, but would be nice to be consistent.
       id: stringifyComponentId({
-        unversionedCubeIri: iri,
+        unversionedCubeIri: unversionedIri,
         unversionedComponentIri: dimIri,
       }),
       label: qLabel?.object.value ?? "",