Merge pull request #1053 from PintoGideon/Redesigning-Pacs-Q/R

Fix the sidebar bug in the niivue page
FNNDSC · Feb 7, 2024 · 93479a4 · 93479a4
2 parents baa13f9 + dc34c68
commit 93479a4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/components/VisualDatasets/index.tsx b/src/components/VisualDatasets/index.tsx
@@ -102,7 +102,7 @@ const VisualDatasets: React.FunctionComponent = () => {
   // --------------------------------------------------------------------------------
 
   // when the web app is ready, hide the sidebar and set the page title.
-  React.useEffect(() => {
+  useEffect(() => {
     document.title = "Fetal MRI Viewer";
     dispatch(setIsNavOpen(false));
     dispatch(

diff --git a/src/components/Wrapper/index.tsx b/src/components/Wrapper/index.tsx
@@ -14,6 +14,7 @@ import "./wrapper.css";
 interface IOtherProps {
   children: any;
   user: IUserState;
+  niivueActive: boolean;
 }
 interface IPropsFromDispatch {
   onSidebarToggle: typeof onSidebarToggle;
@@ -22,7 +23,7 @@ interface IPropsFromDispatch {
 type AllProps = IUiState & IOtherProps & IPropsFromDispatch;
 
 const Wrapper: React.FC<AllProps> = (props: AllProps) => {
-  const { children, user }: IOtherProps = props;
+  const { children, user, niivueActive }: IOtherProps = props;
   const onNavToggle = () => {
     props.setIsNavOpen(!props.isNavOpen);
   };
@@ -34,7 +35,9 @@ const Wrapper: React.FC<AllProps> = (props: AllProps) => {
     if (data.mobileView) {
       props.setIsNavOpen(false);
     }
-    if (!data.mobileView) {
+
+    // The default setting of the niivue viewer is without a sidebar active. It explicitly set's it to false in it's component.
+    if (!data.mobileView && !niivueActive) {
       props.setIsNavOpen(true);
     }
   };
@@ -66,6 +69,7 @@ const mapDispatchToProps = (dispatch: Dispatch) => ({
 const mapStateToProps = ({ ui, user }: ApplicationState) => ({
   isNavOpen: ui.isNavOpen,
   loading: ui.loading,
+  niivueActive: ui.sidebarActiveItem === "niivue",
   user,
 });