perf: Initial DataCubeComponents / dimension values query optimizations

app/rdf/query-dimension-values.ts

@@ -232,39 +232,59 @@ const getQueryFilters = (
   cube: ExtendedCube,
   dimensionIri: string | undefined
 ) => {
-  return filtersList.length > 0
-    ? filtersList.map(([iri, value], i) => {
-        const dimension = cube.dimensions.find((d) => d.path?.value === iri);
-
-        // Ignore the current dimension
-        if (!dimension || dimensionIri === iri) {
-          return "";
-        }
-
-        // Ignore filters with no value or with the special value
-        if (
-          value.type === "single" &&
-          (value.value === FIELD_VALUE_NONE || isDynamicMaxValue(value.value))
-        ) {
-          return "";
-        }
-
-        // Ignore range filters for now
-        if (value.type === "range") {
-          return "";
-        }
-
-        const versioned = dimension ? dimensionIsVersioned(dimension) : false;
-
-        return sparql`${
-          versioned
-            ? sparql`?dimension${i} ${ns.schema.sameAs} ?dimension_unversioned${i}.`
-            : ""
-        }
-      ?observation <${iri}> ?dimension${i}.
-      ${formatFilterIntoSparqlFilter(value, dimension, versioned, i)}`;
-      })
-    : "";
+  if (filtersList.length === 0) {
+    return "";
+  }
+
+  let i = 0;
+  const filterDimensionIris = filtersList.map(([iri]) => iri);
+  // Also include other dimensions to make sure we don't return values that could
+  // result in no observations
+  const otherDimensionFilters = cube.dimensions
+    .filter(
+      (dim) =>
+        !filterDimensionIris.includes(dim.path?.value ?? "") ||
+        dim.path?.equals(ns.cube.observedBy)
+    )
+    .map((dim) => `?observation <${dim.path?.value}> ?dimension${i++} .`);
+  const filterDimensionFilters = filtersList.map(([iri, value], j) => {
+    const dimension = cube.dimensions.find((d) => d.path?.value === iri);
+
+    // Ignore the current dimension
+    if (!dimension || dimensionIri === iri) {
+      return "";
+    }
+
+    // Ignore filters with no value or with the special value
+    if (
+      value.type === "single" &&
+      (value.value === FIELD_VALUE_NONE || isDynamicMaxValue(value.value))
+    ) {
+      return "";
+    }
+
+    // Ignore range filters for now
+    if (value.type === "range") {
+      return "";
+    }
+
+    const versioned = dimension ? dimensionIsVersioned(dimension) : false;
+
+    return sparql`${
+      versioned
+        ? sparql`?dimension${i + j} ${ns.schema.sameAs} ?dimension_unversioned${
+            i + j
+          } .`
+        : ""
+    }
+?observation <${iri}> ?dimension${i + j} .
+${formatFilterIntoSparqlFilter(value, dimension, versioned, i + j)}`;
+  });
+
+  return `
+    ${otherDimensionFilters.join("\n")}
+    ${filterDimensionFilters.join("\n")}
+  `;
 };
 
 type MinMaxResult = [{ minValue: LiteralExt; maxValue: LiteralExt }];