Skip to content

Make sidebar not cover page contents #234

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yousefmoazzam merged 1 commit into from
Oct 16, 2026
Merged

Make sidebar not cover page contents #234

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 29 additions & 16 deletions frontend/unified/src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import { SESSION_QUERY } from "./graphql/SessionQuery";

const VERTICAL_SPACING = 2;
const HORIZONTAL_SPACING = 2;
const SIDEBAR_WIDTH = 300;

const useFedid = (): string => {
const token = useAuth().getToken();
Expand Down Expand Up @@ -172,28 +173,40 @@ export const App: React.FC = () => {
const beamline = mapStringsToBeamline(session.instrument.name);

return (
<>
<Drawer variant="permanent">
<Box sx={{ display: "flex" }}>
<Drawer
variant="permanent"
sx={{
width: SIDEBAR_WIDTH,
flexShrink: 0,
"& .MuiDrawer-paper": {
width: SIDEBAR_WIDTH,
boxSizing: "border-box",
},
}}
>
<Sidebar
scanIds={selectedScanIds}
updateSelectedScanIds={setSelectedScanIds}
/>
</Drawer>
{/* Wrap the SessionSelector in a <Stack> as it the TextField won't remember
<Box sx={{ flexGrow: 1 }}>
{/* Wrap the SessionSelector in a <Stack> as it the TextField won't remember
the session text otherwise */}
<Stack>
{getSessionSelector(latestSessionAvailable, session, sessionName)}
</Stack>

<ApolloProvider client={apolloClientWorkflows}>
<WorkflowsDataFetcher
visit={selectedVisit}
beamline={beamline}
startTime={session.startTime}
scanIds={selectedScanIds}
/>
</ApolloProvider>
</>
<Stack>
{getSessionSelector(latestSessionAvailable, session, sessionName)}
</Stack>

<ApolloProvider client={apolloClientWorkflows}>
<WorkflowsDataFetcher
visit={selectedVisit}
beamline={beamline}
startTime={session.startTime}
scanIds={selectedScanIds}
/>
</ApolloProvider>
</Box>
</Box>
);
} else {
return (
Expand Down
Loading