OHIF-285/OHIF-274: Fix default hanging of display sets into the ViewportGrid (#1917)

* OHIF-285/OHIF-274: Fix default hanging of display sets into the ViewportGrid

Co-authored-by: James A. Petts <jamesapetts@gmail.com>

extensions/measurement-tracking/src/panels/PanelMeasurementTableTracking/ActionButtons.jsx

@@ -5,8 +5,8 @@ import { Button, ButtonGroup, Icon, IconButton } from '@ohif/ui';
 function ActionButtons({ onExportClick, onCreateReportClick }) {
   return (
     <React.Fragment>
-      <ButtonGroup color="black" onClick={onExportClick} size="inherit">
-        <Button className="text-base px-2 py-2">Export</Button>
+      <ButtonGroup color="black" size="inherit">
+        <Button className="text-base px-2 py-2" onClick={onExportClick}>Export</Button>
         <IconButton
           className="px-2"
           color="black"

extensions/measurement-tracking/src/panels/PanelStudyBrowserTracking/PanelStudyBrowserTracking.jsx

@@ -447,6 +447,18 @@ function _createStudyBrowserTabs(
     const displaySetsForStudy = displaySets.filter(
       ds => ds.StudyInstanceUID === study.studyInstanceUid
     );
+
+    displaySetsForStudy.sort((a,b) => {
+      if (a.seriesNumber !== b.seriesNumber) {
+        return a.seriesNumber - b.seriesNumber;
+      }
+
+      const seriesDateA = Date.parse(a.seriesDate);
+      const seriesDateB = Date.parse(b.seriesDate);
+
+      return seriesDateA - seriesDateB;
+    });
+
     const tabStudy = Object.assign({}, study, {
       displaySets: displaySetsForStudy,
     });