Merge branch 'master' into feat-improve-annotation-styles

docs/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [0.35.1](https://github.com/ImagingDataCommons/slim/compare/v0.35.0...v0.35.1) (2024-11-22)
+
+
+### Bug Fixes
+
+* **DICOMTagBrowser:** Searched items should display all tree ([#255](https://github.com/ImagingDataCommons/slim/issues/255)) ([4633031](https://github.com/ImagingDataCommons/slim/commit/463303113ae9d4cb13b5aec8314947f21d39a725))
+
+# [0.35.0](https://github.com/ImagingDataCommons/slim/compare/v0.34.0...v0.35.0) (2024-11-21)
+
+
+### Features
+
+* bump dmv version ([#254](https://github.com/ImagingDataCommons/slim/issues/254)) ([fe9bb49](https://github.com/ImagingDataCommons/slim/commit/fe9bb496aa503c54ee65ffba86a0cf14b7e7c20f))
+
 # [0.34.0](https://github.com/ImagingDataCommons/slim/compare/v0.33.0...v0.34.0) (2024-11-20)
 
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "slim",
-  "version": "0.34.0",
+  "version": "0.35.1",
   "homepage": "https://github.com/imagingdatacommons/slim",
   "private": true,
   "author": "ImagingDataCommons",
@@ -58,7 +58,7 @@
     "craco-less": "^2.0.0",
     "dcmjs": "^0.35.0",
     "detect-browser": "^5.2.1",
-    "dicom-microscopy-viewer": "^0.47.0",
+    "dicom-microscopy-viewer": "^0.47.2",
     "dicomweb-client": "^0.10.3",
     "gh-pages": "^5.0.0",
     "oidc-client": "^1.11.5",

src/components/DicomTagBrowser/DicomTagBrowser.tsx

@@ -50,7 +50,12 @@ const DicomTagBrowser = ({ clients, studyInstanceUID }: DicomTagBrowserProps): J
   const debouncedSearchValue = useDebounce(searchInput, 300)
 
   useEffect(() => {
-    setFilterValue(debouncedSearchValue)
+    if (debouncedSearchValue === '') {
+      setFilterValue('')
+      setExpandedKeys([])
+    } else {
+      setFilterValue(debouncedSearchValue)
+    }
   }, [debouncedSearchValue])
 
   useEffect(() => {
@@ -229,15 +234,11 @@ const DicomTagBrowser = ({ clients, studyInstanceUID }: DicomTagBrowserProps): J
     return transformTagsToTableData(tags)
   }, [instanceNumber, selectedDisplaySetInstanceUID, displaySets])
 
-  // Reset expanded keys when search value changes
-  useEffect(() => {
-    setExpandedKeys([])
-  }, [filterValue])
-
   const filteredData = useMemo(() => {
     if (filterValue === undefined || filterValue === '') return tableData
 
     const searchLower = filterValue.toLowerCase()
+    const matchedKeys = new Set<string>()
 
     const nodeMatches = (node: TableDataItem): boolean => {
       return (
@@ -248,42 +249,69 @@ const DicomTagBrowser = ({ clients, studyInstanceUID }: DicomTagBrowserProps): J
       )
     }
 
-    const findMatchingNodes = (nodes: TableDataItem[]): TableDataItem[] => {
-      const results: TableDataItem[] = []
-
-      const searchNode = (node: TableDataItem): void => {
-        if (nodeMatches(node)) {
-          // Create a new matching node with its original structure
-          const matchingNode: TableDataItem = {
-            key: node.key,
-            tag: node.tag,
-            vr: node.vr,
-            keyword: node.keyword,
-            value: node.value
-          }
+    // First pass: find all matching nodes and their parent paths
+    const findMatchingPaths = (
+      node: TableDataItem,
+      parentPath: TableDataItem[] = []
+    ): TableDataItem[][] => {
+      const currentPath = [...parentPath, node]
+      let matchingPaths: TableDataItem[][] = []
 
-          // If the node has children, preserve them for expansion
-          matchingNode.children = node?.children?.map((child): TableDataItem => ({
-            key: child.key,
-            tag: child.tag,
-            vr: child.vr,
-            keyword: child.keyword,
-            value: child.value,
-            children: child.children
-          }))
-
-          results.push(matchingNode)
-        }
+      if (nodeMatches(node)) {
+        matchingPaths.push(currentPath)
+      }
 
-        // Continue searching through children
-        node?.children?.forEach(searchNode)
+      if (node.children != null) {
+        node.children.forEach(child => {
+          const childPaths = findMatchingPaths(child, currentPath)
+          matchingPaths = [...matchingPaths, ...childPaths]
+        })
       }
 
-      nodes.forEach(searchNode)
-      return results
+      return matchingPaths
+    }
+
+    // Find all paths that contain matches
+    const matchingPaths = tableData.flatMap(node => findMatchingPaths(node))
+
+    // Second pass: reconstruct the tree with matching paths
+    const reconstructTree = (
+      paths: TableDataItem[][],
+      level = 0
+    ): TableDataItem[] => {
+      if (paths.length === 0 || level >= paths[0].length) return []
+
+      const nodesAtLevel = new Map<string, {
+        node: TableDataItem
+        childPaths: TableDataItem[][]
+      }>()
+
+      paths.forEach(path => {
+        if (level < path.length) {
+          const node = path[level]
+          if (!nodesAtLevel.has(node.key)) {
+            nodesAtLevel.set(node.key, {
+              node: { ...node },
+              childPaths: []
+            })
+          }
+          if (level + 1 < path.length) {
+            nodesAtLevel.get(node.key)?.childPaths.push(path)
+          }
+        }
+      })
+
+      return Array.from(nodesAtLevel.values()).map(({ node, childPaths }) => {
+        matchedKeys.add(node.key)
+        const children = reconstructTree(childPaths, level + 1)
+        return children.length > 0 ? { ...node, children } : node
+      })
     }
 
-    return findMatchingNodes(tableData)
+    const filtered = reconstructTree(matchingPaths)
+    setExpandedKeys(Array.from(matchedKeys))
+
+    return filtered
   }, [tableData, filterValue])
 
   if (isLoading) {

yarn.lock

@@ -4554,9 +4554,9 @@ create-require@^1.1.0:
   integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==
 
 cross-spawn@^7.0.0, cross-spawn@^7.0.2, cross-spawn@^7.0.3:
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
-  integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
+  version "7.0.6"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.6.tgz#8a58fe78f00dcd70c370451759dfbfaf03e8ee9f"
+  integrity sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==
   dependencies:
     path-key "^3.1.0"
     shebang-command "^2.0.0"
@@ -4982,10 +4982,10 @@ detective@^5.2.1:
     defined "^1.0.0"
     minimist "^1.2.6"
 
-dicom-microscopy-viewer@^0.47.0:
-  version "0.47.0"
-  resolved "https://registry.yarnpkg.com/dicom-microscopy-viewer/-/dicom-microscopy-viewer-0.47.0.tgz#ec87344f7df3457ead8edaa08f6bfc209307fdff"
-  integrity sha512-w4mimmVTHddGNAKvCv4VX+3x3Rc1KrSJcYfo5Tg8Ng3wyxiq/wY9eX6jM7ywpePVa3bIicc6Gv33XIg3UF4fEA==
+dicom-microscopy-viewer@^0.47.2:
+  version "0.47.2"
+  resolved "https://registry.yarnpkg.com/dicom-microscopy-viewer/-/dicom-microscopy-viewer-0.47.2.tgz#cc7b2ee5321872f14b3097480355385755831250"
+  integrity sha512-h+YaZwokxMFGNTdF4/YmiIaLyXA/Vn2A8ikS6JdSQOBkysHbolqzHelCCzZgpXO/ZPAF/p/hyrEjDuaE+LGDmw==
   dependencies:
     "@cornerstonejs/codec-charls" "^1.2.3"
     "@cornerstonejs/codec-libjpeg-turbo-8bit" "^1.2.2"