Assert image subclass if present in RGB vis container

Author: axelboc

packages/app/src/vis-packs/core/rgb/RgbVisContainer.tsx

@@ -8,12 +8,14 @@ import {
 
 import { useDimMappingState } from '../../../dim-mapping-store';
 import { useValuesInCache } from '../../../hooks';
+import { useDataContext } from '../../../providers/DataProvider';
 import visualizerStyles from '../../../visualizer/Visualizer.module.css';
 import { type VisContainerProps } from '../../models';
 import VisBoundary from '../../VisBoundary';
 import ValueFetcher from '../ValueFetcher';
 import { useRgbConfig } from './config';
 import MappedRgbVis from './MappedRgbVis';
+import { assertSubclassIfPresent } from './utils';
 
 function RgbVisContainer(props: VisContainerProps) {
   const { entity, toolbarContainer } = props;
@@ -22,6 +24,9 @@ function RgbVisContainer(props: VisContainerProps) {
   assertMinDims(entity, 3);
   assertNumericType(entity);
 
+  const { attrValuesStore } = useDataContext();
+  assertSubclassIfPresent(entity, attrValuesStore);
+
   const { dims } = entity.shape;
   const [dimMapping, setDimMapping] = useDimMappingState({
     dims,

packages/app/src/vis-packs/core/rgb/utils.ts

@@ -0,0 +1,23 @@
+import { hasScalarShape, hasStringType } from '@h5web/shared/guards';
+import { type Dataset } from '@h5web/shared/hdf5-models';
+
+import { type AttrValuesStore } from '../../../providers/models';
+import { findAttribute, getAttributeValue } from '../../../utils';
+
+export function assertSubclassIfPresent(
+  dataset: Dataset,
+  attrValuesStore: AttrValuesStore,
+): boolean {
+  const subClassAttr = findAttribute(dataset, 'IMAGE_SUBCLASS');
+
+  if (
+    !subClassAttr ||
+    !hasScalarShape(subClassAttr) ||
+    !hasStringType(subClassAttr)
+  ) {
+    return true;
+  }
+
+  const subClass = getAttributeValue(dataset, subClassAttr, attrValuesStore);
+  return subClass === 'IMAGE_TRUECOLOR';
+}

packages/app/src/vis-packs/core/visualizations.ts

@@ -149,23 +149,14 @@ export const CORE_VIS = {
     ConfigProvider: RgbConfigProvider,
     supportsDataset: (dataset, attrValuesStore) => {
       const classAttr = findAttribute(dataset, 'CLASS');
-      const subClassAttr = findAttribute(dataset, 'IMAGE_SUBCLASS');
 
       const classVal =
         classAttr && hasScalarShape(classAttr) && hasStringType(classAttr)
           ? getAttributeValue(dataset, classAttr, attrValuesStore)
           : undefined;
 
-      const subClassVal =
-        subClassAttr &&
-        hasScalarShape(subClassAttr) &&
-        hasStringType(subClassAttr)
-          ? getAttributeValue(dataset, subClassAttr, attrValuesStore)
-          : undefined;
-
       return (
         classVal === 'IMAGE' &&
-        (!subClassVal || subClassVal === 'IMAGE_TRUECOLOR') &&
         hasArrayShape(dataset) &&
         hasMinDims(dataset, 3) && // 2 for axes + 1 for RGB channels
         dataset.shape.dims[dataset.shape.dims.length - 1] === 3 && // 3 channels on last dim

packages/app/src/vis-packs/nexus/containers/NxRgbContainer.tsx

@@ -2,9 +2,11 @@ import { DimensionMapper, getSliceSelection } from '@h5web/lib';
 import { assertGroup, assertMinDims } from '@h5web/shared/guards';
 
 import { useDimMappingState } from '../../../dim-mapping-store';
+import { useDataContext } from '../../../providers/DataProvider';
 import visualizerStyles from '../../../visualizer/Visualizer.module.css';
 import { useRgbConfig } from '../../core/rgb/config';
 import MappedRgbVis from '../../core/rgb/MappedRgbVis';
+import { assertSubclassIfPresent } from '../../core/rgb/utils';
 import { type VisContainerProps } from '../../models';
 import VisBoundary from '../../VisBoundary';
 import { assertNumericNxData } from '../guards';
@@ -21,11 +23,10 @@ function NxRgbContainer(props: VisContainerProps) {
   const { signalDef, axisDefs, defaultSlice } = nxData;
   assertMinDims(signalDef.dataset, 3);
 
-  const { dims } = signalDef.dataset.shape;
-  if (dims[dims.length - 1] !== 3) {
-    throw new Error('Expected last dimension to have size 3');
-  }
+  const { attrValuesStore } = useDataContext();
+  assertSubclassIfPresent(signalDef.dataset, attrValuesStore);
 
+  const { dims } = signalDef.dataset.shape;
   const [dimMapping, setDimMapping] = useDimMappingState({
     dims,
     axesCount: 2,

packages/app/src/vis-packs/nexus/visualizations.ts

@@ -95,23 +95,14 @@ export const NX_DATA_VIS = {
     ConfigProvider: RgbConfigProvider,
     supports: (_, signal, interpretation, attrValuesStore) => {
       const classAttr = findAttribute(signal, 'CLASS');
-      const subClassAttr = findAttribute(signal, 'IMAGE_SUBCLASS');
 
       const classVal =
         classAttr && hasScalarShape(classAttr) && hasStringType(classAttr)
           ? getAttributeValue(signal, classAttr, attrValuesStore)
           : undefined;
 
-      const subClassVal =
-        subClassAttr &&
-        hasScalarShape(subClassAttr) &&
-        hasStringType(subClassAttr)
-          ? getAttributeValue(signal, subClassAttr, attrValuesStore)
-          : undefined;
-
       return (
         (interpretation === NxInterpretation.RGB || classVal === 'IMAGE') &&
-        (!subClassVal || subClassVal === 'IMAGE_TRUECOLOR') &&
         hasMinDims(signal, 3) && // 2 for axes + 1 for RGB channels
         signal.shape.dims[signal.shape.dims.length - 1] === 3 && // 3 channels
         hasNumericType(signal)