Merge pull request #1671 from silx-kit/minor-fixes

Better error messages and minor styling fixes
silx-kit · Jun 18, 2024 · 08df670 · 08df670
2 parents 14028fb + 74f9b30
commit 08df670
Show file tree

Hide file tree

Showing 26 changed files with 17 additions and 7 deletions.
diff --git a/cypress/snapshots/app.cy.ts/auximage.snap.png b/cypress/snapshots/app.cy.ts/auximage.snap.png
diff --git a/cypress/snapshots/app.cy.ts/auxspectrum.snap.png b/cypress/snapshots/app.cy.ts/auxspectrum.snap.png
diff --git a/cypress/snapshots/app.cy.ts/bgr_image.snap.png b/cypress/snapshots/app.cy.ts/bgr_image.snap.png
diff --git a/cypress/snapshots/app.cy.ts/heatmap_2D.snap.png b/cypress/snapshots/app.cy.ts/heatmap_2D.snap.png
diff --git a/cypress/snapshots/app.cy.ts/heatmap_2D_complex.snap.png b/cypress/snapshots/app.cy.ts/heatmap_2D_complex.snap.png
diff --git a/cypress/snapshots/app.cy.ts/heatmap_2D_inverted_cmap.snap.png b/cypress/snapshots/app.cy.ts/heatmap_2D_inverted_cmap.snap.png
diff --git a/cypress/snapshots/app.cy.ts/heatmap_4d_default.snap.png b/cypress/snapshots/app.cy.ts/heatmap_4d_default.snap.png
diff --git a/cypress/snapshots/app.cy.ts/heatmap_4d_remapped.snap.png b/cypress/snapshots/app.cy.ts/heatmap_4d_remapped.snap.png
diff --git a/cypress/snapshots/app.cy.ts/heatmap_4d_sliced.snap.png b/cypress/snapshots/app.cy.ts/heatmap_4d_sliced.snap.png
diff --git a/cypress/snapshots/app.cy.ts/heatmap_4d_zeros.snap.png b/cypress/snapshots/app.cy.ts/heatmap_4d_zeros.snap.png
diff --git a/cypress/snapshots/app.cy.ts/heatmap_domain.snap.png b/cypress/snapshots/app.cy.ts/heatmap_domain.snap.png
diff --git a/cypress/snapshots/app.cy.ts/heatmap_flip.snap.png b/cypress/snapshots/app.cy.ts/heatmap_flip.snap.png
diff --git a/cypress/snapshots/app.cy.ts/line_1D.snap.png b/cypress/snapshots/app.cy.ts/line_1D.snap.png
diff --git a/cypress/snapshots/app.cy.ts/line_complex_1D.snap.png b/cypress/snapshots/app.cy.ts/line_complex_1D.snap.png
diff --git a/cypress/snapshots/app.cy.ts/logspectrum.snap.png b/cypress/snapshots/app.cy.ts/logspectrum.snap.png
diff --git a/cypress/snapshots/app.cy.ts/nximage.snap.png b/cypress/snapshots/app.cy.ts/nximage.snap.png
diff --git a/cypress/snapshots/app.cy.ts/nxrgb.snap.png b/cypress/snapshots/app.cy.ts/nxrgb.snap.png
diff --git a/cypress/snapshots/app.cy.ts/nxscatter.snap.png b/cypress/snapshots/app.cy.ts/nxscatter.snap.png
diff --git a/cypress/snapshots/app.cy.ts/nxspectrum.snap.png b/cypress/snapshots/app.cy.ts/nxspectrum.snap.png
diff --git a/cypress/snapshots/app.cy.ts/rgb_image.snap.png b/cypress/snapshots/app.cy.ts/rgb_image.snap.png
diff --git a/packages/app/src/explorer/Explorer.module.css b/packages/app/src/explorer/Explorer.module.css
@@ -64,6 +64,7 @@
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
+  line-height: 1.5; /* fix cropping of ascenders and descenders  */
 }
 
 .spinner {

diff --git a/packages/app/src/metadata-viewer/MetadataTable.tsx b/packages/app/src/metadata-viewer/MetadataTable.tsx
@@ -13,7 +13,7 @@ function MetadataTable(props: PropsWithChildren<Props>) {
     <table className={styles.table}>
       <thead>
         <tr>
-          <th scope="col" colSpan={2}>
+          <th className={styles.title} scope="col" colSpan={2}>
             {title}
           </th>
         </tr>

diff --git a/packages/app/src/metadata-viewer/MetadataViewer.module.css b/packages/app/src/metadata-viewer/MetadataViewer.module.css
@@ -9,9 +9,12 @@
   margin-top: 1rem;
 }
 
+.title {
+  text-transform: capitalize;
+}
+
 .table th {
   font-weight: 500;
-  text-transform: capitalize;
 }
 
 .table thead th {

diff --git a/packages/app/src/metadata-viewer/RawInspector.tsx b/packages/app/src/metadata-viewer/RawInspector.tsx
@@ -2,6 +2,8 @@ import type { ProvidedEntity } from '@h5web/shared/hdf5-models';
 
 import styles from './RawInspector.module.css';
 
+const KEYS_TO_SKIP = new Set(['parents', 'children', 'value']);
+
 interface Props {
   entity: ProvidedEntity;
 }
@@ -16,8 +18,8 @@ function RawInspector(props: Props) {
         {JSON.stringify(
           entity,
           (key, value) => {
-            // Bypass cyclic dependencies
-            return key !== 'parents' && key !== 'children' ? value : undefined;
+            // Bypass `value` and cyclic dependencies
+            return KEYS_TO_SKIP.has(key) ? undefined : value;
           },
           2,
         )}

diff --git a/packages/app/src/vis-packs/core/hooks.ts b/packages/app/src/vis-packs/core/hooks.ts
@@ -132,7 +132,6 @@ export function useMappedArrays(
   values: NumArray[],
   dims: number[],
   mapping: DimensionMapping,
-  autoScale?: boolean,
 ): NdArray<NumArray>[];
 
 export function useMappedArrays(

diff --git a/packages/app/src/vis-packs/nexus/utils.ts b/packages/app/src/vis-packs/nexus/utils.ts
@@ -137,10 +137,15 @@ export function findAssociatedDatasets(
     if (name === '.') {
       return undefined;
     }
+    if (name.includes('/')) {
+      throw new Error(
+        `Expected "${name}" to be the name of a child dataset, not a path`,
+      );
+    }
 
     const dataset = getChildEntity(group, name);
-    assertDefined(dataset);
-    assertDataset(dataset);
+    assertDefined(dataset, `Expected child entity "${name}" to exist`);
+    assertDataset(dataset, `Expected child "${name}" to be a dataset`);
     assertArrayShape(dataset);
     assertNumericType(dataset);
     return dataset;