From 802a8d5f1b8659f44c6d4d147eada7c4018d3b42 Mon Sep 17 00:00:00 2001
From: Gustavo Lelis <galelis@gmail.com>
Date: Wed, 22 Apr 2020 13:14:48 -0300
Subject: [PATCH] Fix propTypes and update tracked series tag

---
 .../components/StudyBrowser/StudyBrowser.jsx  | 22 ++++++++++++++-----
 .../ui/src/components/StudyItem/StudyItem.jsx | 12 +++++-----
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/platform/ui/src/components/StudyBrowser/StudyBrowser.jsx b/platform/ui/src/components/StudyBrowser/StudyBrowser.jsx
index 760a89b3f..d2b019be7 100644
--- a/platform/ui/src/components/StudyBrowser/StudyBrowser.jsx
+++ b/platform/ui/src/components/StudyBrowser/StudyBrowser.jsx
@@ -7,16 +7,27 @@ import { ButtonGroup, Button, StudyItem, ThumbnailList } from '@ohif/ui';
 const buttonClasses = 'text-white text-base border-none bg-black p-2 min-w-18';
 const activeButtonClasses = 'bg-primary-main';
 
-const getInitialActiveTab = (tabs) => {
+const getInitialActiveTab = tabs => {
   return tabs && tabs[0] && tabs[0].name;
 };
 
+const getTrackedSeries = displaySets => {
+  let trackedSeries = 0;
+  displaySets.forEach(displaySet => {
+    if (displaySet.isTracked) {
+      trackedSeries++;
+    }
+  });
+
+  return trackedSeries;
+};
+
 const StudyBrowser = ({ tabs }) => {
   const [tabActive, setTabActive] = useState(getInitialActiveTab(tabs));
   const [studyActive, setStudyActive] = useState(null);
 
   const getTabContent = () => {
-    const tabData = tabs.find((tab) => tab.name === tabActive);
+    const tabData = tabs.find(tab => tab.name === tabActive);
 
     if (!tabData || !tabData.studies || !Array.isArray(tabData.studies)) {
       return;
@@ -29,8 +40,7 @@ const StudyBrowser = ({ tabs }) => {
         studyDescription,
         instances,
         modalities,
-        trackedSeries,
-        thumbnails,
+        displaySets,
       }) => {
         const isActive = studyActive === studyInstanceUid;
         return (
@@ -40,7 +50,7 @@ const StudyBrowser = ({ tabs }) => {
               studyDescription={studyDescription}
               instances={instances}
               modalities={modalities}
-              trackedSeries={trackedSeries}
+              trackedSeries={getTrackedSeries(displaySets)}
               isActive={isActive}
               onClick={() => {
                 setStudyActive(isActive ? null : studyInstanceUid);
@@ -63,7 +73,7 @@ const StudyBrowser = ({ tabs }) => {
           color="inherit"
           className="border border-secondary-light rounded-md"
         >
-          {tabs.map((tab) => {
+          {tabs.map(tab => {
             const { name, label } = tab;
             const isActive = tabActive === name;
             return (
diff --git a/platform/ui/src/components/StudyItem/StudyItem.jsx b/platform/ui/src/components/StudyItem/StudyItem.jsx
index 423151b93..9bb0820d6 100644
--- a/platform/ui/src/components/StudyItem/StudyItem.jsx
+++ b/platform/ui/src/components/StudyItem/StudyItem.jsx
@@ -60,12 +60,12 @@ const StudyItem = ({
 };
 
 StudyItem.propTypes = {
-  studyDate: PropTypes.any,
-  studyDescription: PropTypes.any,
-  modalities: PropTypes.any,
-  instances: PropTypes.any,
-  trackedSeries: PropTypes.any,
-  isActive: PropTypes.any,
+  date: PropTypes.string.isRequired,
+  description: PropTypes.string.isRequired,
+  modalities: PropTypes.string.isRequired,
+  numInstances: PropTypes.number.isRequired,
+  trackedSeries: PropTypes.number,
+  isActive: PropTypes.bool,
   onClick: PropTypes.func.isRequired,
 };