@vitessce/statistical-plots 3.6.7 → 3.6.9

package/src/DotPlotSubscriber.js

@@ -70,35 +70,57 @@ export function DotPlotSubscriber(props) {
   const isStratified = Array.isArray(sampleSetSelection) && sampleSetSelection.length > 1;
 
   // Get data from loaders using the data hooks.
-  // eslint-disable-next-line no-unused-vars
-  const [expressionData, loadedFeatureSelection, featureSelectionStatus] = useFeatureSelection(
+  const [
+    // eslint-disable-next-line no-unused-vars
+    expressionData, loadedFeatureSelection, featureSelectionStatus, featureSelectionErrors,
+  ] = useFeatureSelection(
     loaders, dataset, false, geneSelection,
     { obsType, featureType, featureValueType },
   );
   // TODO: support multiple feature labels using featureLabelsType coordination values.
-  const [{ featureLabelsMap }, featureLabelsStatus, featureLabelsUrl] = useFeatureLabelsData(
+  const [
+    { featureLabelsMap }, featureLabelsStatus, featureLabelsUrl, featureLabelsError,
+  ] = useFeatureLabelsData(
     loaders, dataset, false, {}, {},
     { featureType },
   );
-  const [{ obsIndex }, matrixIndicesStatus, matrixIndicesUrl] = useObsFeatureMatrixIndices(
+  const [
+    { obsIndex }, matrixIndicesStatus, matrixIndicesUrl, matrixIndicesError,
+  ] = useObsFeatureMatrixIndices(
     loaders, dataset, false,
     { obsType, featureType, featureValueType },
   );
-  const [{ obsSets: cellSets }, obsSetsStatus, obsSetsUrl] = useObsSetsData(
+  const [
+    { obsSets: cellSets }, obsSetsStatus, obsSetsUrl, obsSetsError,
+  ] = useObsSetsData(
     loaders, dataset, true, {}, {},
     { obsType },
   );
 
-  const [{ sampleSets }, sampleSetsStatus, sampleSetsUrl] = useSampleSetsData(
+  const [
+    { sampleSets }, sampleSetsStatus, sampleSetsUrl, sampleSetsError,
+  ] = useSampleSetsData(
     loaders, dataset, false, {}, {},
     { sampleType },
   );
 
-  const [{ sampleEdges }, sampleEdgesStatus, sampleEdgesUrl] = useSampleEdgesData(
+  const [
+    { sampleEdges }, sampleEdgesStatus, sampleEdgesUrl, sampleEdgesError,
+  ] = useSampleEdgesData(
     loaders, dataset, false, {}, {},
     { obsType, sampleType },
   );
 
+  // Consolidate error values from data hooks.
+  const errors = [
+    ...featureSelectionErrors,
+    featureLabelsError,
+    matrixIndicesError,
+    obsSetsError,
+    sampleSetsError,
+    sampleEdgesError,
+  ];
+
   const isReady = useReady([
     featureSelectionStatus,
     matrixIndicesStatus,
@@ -135,6 +157,7 @@ export function DotPlotSubscriber(props) {
       theme={theme}
       isReady={isReady}
       helpText={helpText}
+      errors={errors}
       options={(
         <CellSetExpressionPlotOptions
           featureValueTransform={featureValueTransform}

package/src/ExpressionHistogramSubscriber.js

@@ -58,16 +58,25 @@ export function ExpressionHistogramSubscriber(props) {
 
   // Get data from loaders using the data hooks.
   const [
-    { obsIndex, featureIndex, obsFeatureMatrix }, matrixStatus, matrixUrls,
+    { obsIndex, featureIndex, obsFeatureMatrix },
+    matrixStatus, matrixUrls, matrixError,
   ] = useObsFeatureMatrixData(
     loaders, dataset, true, {}, {},
     { obsType, featureType, featureValueType },
   );
-  // eslint-disable-next-line no-unused-vars
-  const [expressionData, loadedFeatureSelection, featureSelectionStatus] = useFeatureSelection(
+  const [
+    // eslint-disable-next-line no-unused-vars
+    expressionData, loadedFeatureSelection, featureSelectionStatus, featureSelectionErrors,
+  ] = useFeatureSelection(
     loaders, dataset, false, geneSelection,
     { obsType, featureType, featureValueType },
   );
+  // Consolidate error values from data hooks.
+  const errors = [
+    matrixError,
+    ...featureSelectionErrors,
+  ];
+
   const isReady = useReady([
     matrixStatus,
     featureSelectionStatus,
@@ -129,6 +138,7 @@ export function ExpressionHistogramSubscriber(props) {
       theme={theme}
       isReady={isReady}
       helpText={helpText}
+      errors={errors}
     >
       <div ref={containerRef} className={classes.vegaContainer}>
         <ExpressionHistogram

package/src/FeatureBarPlotSubscriber.js

@@ -56,22 +56,32 @@ export function FeatureBarPlotSubscriber(props) {
   const [width, height, containerRef] = useGridItemSize();
 
   // Get data from loaders using the data hooks.
-  // eslint-disable-next-line no-unused-vars
-  const [expressionData, loadedFeatureSelection, featureSelectionStatus] = useFeatureSelection(
+  const [
+    // eslint-disable-next-line no-unused-vars
+    expressionData, loadedFeatureSelection, featureSelectionStatus, featureSelectionErrors,
+  ] = useFeatureSelection(
     loaders, dataset, false, geneSelection,
     { obsType, featureType, featureValueType },
   );
   // TODO: support multiple feature labels using featureLabelsType coordination values.
-  const [{ featureLabelsMap }, featureLabelsStatus, featureLabelsUrls] = useFeatureLabelsData(
+  const [
+    { featureLabelsMap }, featureLabelsStatus, featureLabelsUrls, featureLabelsError,
+  ] = useFeatureLabelsData(
     loaders, dataset, false, {}, {},
     { featureType },
   );
   const [
-    { obsIndex }, matrixIndicesStatus, matrixIndicesUrls,
+    { obsIndex }, matrixIndicesStatus, matrixIndicesUrls, matrixIndicesError,
   ] = useObsFeatureMatrixIndices(
     loaders, dataset, false,
     { obsType, featureType, featureValueType },
   );
+  // Consolidate error values from data hooks.
+  const errors = [
+    ...featureSelectionErrors,
+    featureLabelsError,
+    matrixIndicesError,
+  ];
   const isReady = useReady([
     featureSelectionStatus,
     matrixIndicesStatus,
@@ -128,6 +138,7 @@ export function FeatureBarPlotSubscriber(props) {
       theme={theme}
       isReady={isReady}
       helpText={helpText}
+      errors={errors}
     >
       <div ref={containerRef} className={classes.vegaContainer}>
         {expressionArr ? (

package/src/FeatureSetEnrichmentBarPlotSubscriber.js

@@ -98,13 +98,19 @@ export function FeatureSetEnrichmentBarPlotSubscriber(props) {
   const rawSampleSetSelection = useRawSetPaths(sampleSetsColumnNameMapping, sampleSetSelection);
   const rawObsSetSelection = useRawSetPaths(obsSetsColumnNameMapping, obsSetSelection);
 
-  const [{ featureSetStats }, featureSetStatsStatus] = useFeatureSetStatsData(
+  const [
+    { featureSetStats }, featureSetStatsStatus, featureSetStatsUrls, featureSetStatsError,
+  ] = useFeatureSetStatsData(
     loaders, dataset, false,
     { obsType, featureType, sampleType },
     // These volcanoOptions are passed to ObsSetStatsAnndataLoader.loadMulti():
     { sampleSetSelection: rawSampleSetSelection, obsSetSelection: rawObsSetSelection },
   );
 
+  const errors = [
+    featureSetStatsError,
+  ];
+
   const isReady = useReady([
     featureSetStatsStatus,
   ]);
@@ -139,6 +145,7 @@ export function FeatureSetEnrichmentBarPlotSubscriber(props) {
       theme={theme}
       isReady={isReady}
       helpText={helpText}
+      errors={errors}
     >
       <div ref={containerRef} className={classes.vegaContainer}>
         {featureSetStats ? (

package/src/FeatureStatsTableSubscriber.js

@@ -86,13 +86,19 @@ export function FeatureStatsTableSubscriber(props) {
   const rawSampleSetSelection = useRawSetPaths(sampleSetsColumnNameMapping, sampleSetSelection);
   const rawObsSetSelection = useRawSetPaths(obsSetsColumnNameMapping, obsSetSelection);
 
-  const [{ featureStats }, featureStatsStatus] = useFeatureStatsData(
+  const [
+    { featureStats }, featureStatsStatus, featureStatsUrls, featureStatsError,
+  ] = useFeatureStatsData(
     loaders, dataset, false,
     { obsType, featureType, sampleType },
     // These volcanoOptions are passed to FeatureStatsAnndataLoader.loadMulti():
     { sampleSetSelection: rawSampleSetSelection, obsSetSelection: rawObsSetSelection },
   );
 
+  const errors = [
+    featureStatsError,
+  ];
+
   const isReady = useReady([
     featureStatsStatus,
   ]);
@@ -104,6 +110,7 @@ export function FeatureStatsTableSubscriber(props) {
       theme={theme}
       isReady={isReady}
       helpText={helpText}
+      errors={errors}
       withPadding={false}
     >
       {featureStats ? (

package/src/TreemapSubscriber.js

@@ -88,16 +88,20 @@ export function TreemapSubscriber(props) {
   const [width, height, containerRef] = useGridItemSize();
 
   // TODO: how to deal with multimodal cases (multiple obsIndex, one per modality)?
-  const [{ obsIndex }, matrixIndicesStatus, matrixIndicesUrls] = useObsFeatureMatrixIndices(
+  const [
+    { obsIndex }, matrixIndicesStatus, matrixIndicesUrls, matrixIndicesError,
+  ] = useObsFeatureMatrixIndices(
     loaders, dataset, false,
     { obsType, featureType, featureValueType },
   );
-  const [{ obsSets }, obsSetsStatus, obsSetsUrls] = useObsSetsData(
+  const [{ obsSets }, obsSetsStatus, obsSetsUrls, obsSetsError] = useObsSetsData(
     loaders, dataset, true, {}, {},
     { obsType },
   );
 
-  const [{ sampleIndex, sampleSets }, sampleSetsStatus, sampleSetsUrls] = useSampleSetsData(
+  const [
+    { sampleIndex, sampleSets }, sampleSetsStatus, sampleSetsUrls, sampleSetsError,
+  ] = useSampleSetsData(
     loaders,
     dataset,
     // TODO: support `false`, i.e., configurations in which
@@ -108,7 +112,9 @@ export function TreemapSubscriber(props) {
     { sampleType },
   );
 
-  const [{ sampleEdges }, sampleEdgesStatus, sampleEdgesUrls] = useSampleEdgesData(
+  const [
+    { sampleEdges }, sampleEdgesStatus, sampleEdgesUrls, sampleEdgesError,
+  ] = useSampleEdgesData(
     loaders,
     dataset,
     // TODO: support `false`, i.e., configurations in which
@@ -119,6 +125,13 @@ export function TreemapSubscriber(props) {
     { obsType, sampleType },
   );
 
+  const errors = [
+    matrixIndicesError,
+    obsSetsError,
+    sampleSetsError,
+    sampleEdgesError,
+  ];
+
   const isReady = useReady([
     matrixIndicesStatus,
     obsSetsStatus,
@@ -237,6 +250,7 @@ export function TreemapSubscriber(props) {
       theme={theme}
       isReady={isReady}
       helpText={helpText}
+      errors={errors}
       withPadding={false}
       options={(
         <TreemapOptions

package/src/VolcanoPlotSubscriber.js

@@ -95,12 +95,22 @@ export function VolcanoPlotSubscriber(props) {
   const rawSampleSetSelection = useRawSetPaths(sampleSetsColumnNameMapping, sampleSetSelection);
   const rawObsSetSelection = useRawSetPaths(obsSetsColumnNameMapping, obsSetSelection);
 
-  const [{ featureStats }, featureStatsStatus] = useFeatureStatsData(
+  // Get data from loaders using the data hooks.
+  const [
+    { featureStats },
+    featureStatsStatus,
+    featureStatsUrls,
+    featureStatsError,
+  ] = useFeatureStatsData(
     loaders, dataset, false,
     { obsType, featureType, sampleType },
     // These volcanoOptions are passed to FeatureStatsAnndataLoader.loadMulti():
     { sampleSetSelection: rawSampleSetSelection, obsSetSelection: rawObsSetSelection },
   );
+  // Consolidate error values from data hooks.
+  const errors = [
+    featureStatsError,
+  ];
 
   const isReady = useReady([
     featureStatsStatus,
@@ -117,6 +127,7 @@ export function VolcanoPlotSubscriber(props) {
       theme={theme}
       isReady={isReady}
       helpText={helpText}
+      errors={errors}
       options={(
         <VolcanoPlotOptions
           obsType={obsType}