Fix display of .zarray .zattrs and zarr.json in UI

ome · Jun 12, 2024 · 190c0b7 · 190c0b7
1 parent 23d9b26
commit 190c0b7
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 7 deletions.
diff --git a/src/JsonValidator/MultiscaleArrays/ZarrArray/index.svelte b/src/JsonValidator/MultiscaleArrays/ZarrArray/index.svelte
@@ -1,12 +1,12 @@
 <script>
-  import { getZarrArrayJson, formatBytes, getChunkShape, getArrayDtype } from "../../../utils";
+  import { getJson, formatBytes, getChunkShape, getArrayDtype } from "../../../utils";
   import Cube3D from "./Cube3D.svelte";
   import ChunkLoader from "./ChunkLoader.svelte";
 
   export let source;
   export let path;
 
-  const promise = getZarrArrayJson(source + "/" + path);
+  const promise = getJson(source + "/" + path);
 
   function totalChunkCount(zarray) {
     return chunkCounts(zarray).reduce((prev, curr) => prev * curr, 1);
@@ -28,7 +28,7 @@
 </script>
 
 <div class="array">
-  <p>Path <a href="{source + "/" + path + '/.zarray'} ">{path + "/.zarray"}</a></p>
+  <p>Path <a href="{source + "/" + path} ">{path}</a></p>
 
   {#await promise}
     <div>loading array .zarray ...</div>
@@ -64,7 +64,7 @@
     <Cube3D {zarray} />
 
     <details>
-      <summary>{path}/.zarray</summary>
+      <summary>{path}</summary>
       <pre><code>{JSON.stringify(zarray, null, 2)}</code></pre>
     </details>
   {:catch error}

diff --git a/src/JsonValidator/MultiscaleArrays/index.svelte b/src/JsonValidator/MultiscaleArrays/index.svelte
@@ -1,17 +1,21 @@
 <script>
   import ZarrArray from "./ZarrArray/index.svelte";
   import Multiscale from "./Multiscale.svelte";
+  import {getVersion, getZarrArrayAttrsFileName} from "../../utils";
 
   export let source;
   export let rootAttrs;
+
+  const msVersion = getVersion(rootAttrs);
+  const zarrAttrsFileName = getZarrArrayAttrsFileName(msVersion);
 </script>
 
 {#each rootAttrs.multiscales as multiscale, idx}
   <article>
     <h2>Multiscale {idx}</h2>
     <Multiscale {source} {multiscale} /> 
     {#each multiscale.datasets as dataset}
-      <ZarrArray {source} path={dataset.path} />
+      <ZarrArray {source} path={dataset.path + "/" + zarrAttrsFileName} />
     {/each}
   </article>
 {/each}

diff --git a/src/JsonValidator/index.svelte b/src/JsonValidator/index.svelte
@@ -15,6 +15,7 @@
     getJson,
     getVersion,
     getDataType,
+    getZarrGroupAttrsFileName,
   } from "../utils";
 
   export let source;
@@ -32,12 +33,13 @@
   const zarrName = dirs[dirs.length - 1];
 
   // check for labels/.zattrs
-  const labelsPromise = getJson(source + '/labels/.zattrs');
+  const zarrAttrsFileName = getZarrGroupAttrsFileName(msVersion);
+  const labelsPromise = getJson(source + '/labels/' + zarrAttrsFileName);
 </script>
 
 <article>
   <p>
-    Validating: <a href={source}>/{zarrName}/.zattrs</a>
+    Validating: <a href={source}>/{zarrName}/{zarrAttrsFileName}</a>
   </p>
 
   {#if !msVersion}No version found. Using {CURRENT_VERSION}<br />{/if}

diff --git a/src/utils.js b/src/utils.js
@@ -66,6 +66,19 @@ async function fetchHandleError(url) {
   throw Error(msg);
 }
 
+export function getZarrGroupAttrsFileName(ngffVersion) {
+  if (["0.1", "0.2", "0.3", "0.4"].includes(ngffVersion)) {
+    return ".zattrs";
+  }
+  return "zarr.json";
+}
+
+export function getZarrArrayAttrsFileName(ngffVersion) {
+  if (["0.1", "0.2", "0.3", "0.4"].includes(ngffVersion)) {
+    return ".zarray";
+  }
+  return "zarr.json";
+}
 
 export async function getZarrArrayJson(zarr_dir) {
   return getZarrJson(zarr_dir, ".zarray");
@@ -145,6 +158,7 @@ export function getNgffData(jsonData) {
 
 export function getVersion(jsonData) {
   let ngffData = getNgffData(jsonData);
+  // TODO: v0.5 won't likely have version at multiscales[0].version
   console.log("getVersion", jsonData, ngffData);
   let version = ngffData.multiscales
     ? ngffData.multiscales[0].version