set metadata tree

Pixilib · Nov 25, 2024 · ccc9679 · ccc9679
1 parent 8cf9cea
commit ccc9679
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 24 deletions.
diff --git a/src/content/series/Tags.tsx b/src/content/series/Tags.tsx
@@ -3,10 +3,12 @@ import { getInstancesOfSeries } from "../../services/orthanc";
 import { Input, Spinner } from "../../ui";
 import { useCustomQuery } from "../../utils";
 import { instanceHeader, instanceTags } from "../../services/instances";
-
+import { Metadata, Tag } from "../../utils/types";
+import { Meta } from "@storybook/react";
 type TagsProps = {
   seriesId: string;
 };
+
 const Tags = ({ seriesId }: TagsProps) => {
   const { data: instances } = useCustomQuery(
     ["series", seriesId, "instances"],
@@ -19,15 +21,15 @@ const Tags = ({ seriesId }: TagsProps) => {
       ? instances[instanceNumber - 1].id
       : null;
 
-  const { data: header } = useCustomQuery(
+  const { data: header } = useCustomQuery<Metadata>(
     ["instances", currentInstanceId, "metadata"],
     () => instanceHeader(currentInstanceId),
     {
       enabled: currentInstanceId !== null,
     }
   );
 
-  const { data: tags } = useCustomQuery(
+  const { data: tags } = useCustomQuery<Metadata>(
     ["instances", currentInstanceId, "tags"],
     () => instanceTags(currentInstanceId),
     {
@@ -43,27 +45,33 @@ const Tags = ({ seriesId }: TagsProps) => {
     };
   }, [header, tags]);
 
-  const getComponent = (
-    tagName: string,
-    tag: string | Record<string, string>[]
-  ) => {
-    if (Array.isArray(tag)) {
-      return tag.map((tagItem) => {
-        return Object.entries(tagItem).map(([key, tag]) => {
-          return getComponent(key, tag);
-        });
+  const getComponent = (tagAddress: string, tag: Tag) => {
+    if (Array.isArray(tag.Value)) {
+      return tag.Value.map((metadata) => {
+        return (
+          <li>
+            {tag.Name}
+            <ul className="list-disc">
+              {Object.entries(metadata).map(([adressTag, tag]) =>
+                getComponent(adressTag, tag)
+              )}
+            </ul>
+          </li>
+        );
       });
     } else {
       return (
-        <span>
-          <strong>{tagName}:</strong> {tag}
-        </span>
+        <li className="ml-4 px-2" key={tag.Name}>
+          {tag.Name} - {tag.Value}
+        </li>
       );
     }
   };
 
   if (!instances) return <Spinner />;
 
+  console.log(metadata);
+
   return (
     <>
       <Input
@@ -73,11 +81,13 @@ const Tags = ({ seriesId }: TagsProps) => {
         value={instanceNumber ?? 1}
         onChange={(event) => setInstanceNumber(Number(event.target?.value))}
       />
-      <ul>
-        {Object.entries(metadata).map(([key, tag]) => (
-          <li key={key}>{getComponent(key, tag)}</li>
-        ))}
-      </ul>
+      <div>
+        <ul className="list-disc">
+          {Object.entries(metadata).map(([tagAdress, tag]) =>
+            getComponent(tagAdress, tag)
+          )}
+        </ul>
+      </div>
     </>
   );
 };

diff --git a/src/services/instances.ts b/src/services/instances.ts
@@ -1,5 +1,5 @@
 import axios from "./axios";
-import { OrthancImportDicom, Tags } from "../utils/types";
+import { Metadata, OrthancImportDicom, Tags } from "../utils/types";
 
 export const sendDicom = (payload: Uint8Array): Promise<OrthancImportDicom> => {
   return axios
@@ -73,7 +73,7 @@ export const previewFrame = (
 
 export const instanceTags = (
   instanceId: string
-): Promise<Tags> => {
+): Promise<Metadata> => {
   return axios
     .get("/api/instances/" + instanceId + "/tags?simplfy")
     .then((response) => {
@@ -89,7 +89,7 @@ export const instanceTags = (
 
 export const instanceHeader = (
   instanceId: string
-): Promise<Tags> => {
+): Promise<Metadata> => {
   return axios
     .get("/api/instances/" + instanceId + "/header?simplfy")
     .then((response) => {

diff --git a/src/utils/types.ts b/src/utils/types.ts
@@ -399,4 +399,9 @@ export type Queue = {
   userId: number;
 };
 
-export type Tags = Record<string, string | Record<string, string>[]>;
+export type Tag = {
+  Name : string,
+  Type : string,
+  Value : string | Metadata[]
+}
+export type Metadata = Record<string, Tag>;