Skip to content

Add new scan selector #256

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
echen-dls merged 7 commits into from
Oct 29, 2026
Merged

Add new scan selector #256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7c677ff
Add new scan selector
echen-dls Oct 28, 2026
1beecde
Clean up code
echen-dls Oct 28, 2026
2ad1d86
Clear selected scan IDs on session change, change scanRequest parsing
echen-dls Oct 29, 2026
cc481ac
Merge branch 'main' into ec/scan-selector
echen-dls Oct 29, 2026
668e465
Clean up code
echen-dls Oct 29, 2026
3a3e1ae
Change ulims_schema to camel case
echen-dls Oct 29, 2026
76bab10
Merge branch 'main' into ec/scan-selector
echen-dls Oct 29, 2026
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
2 changes: 1 addition & 1 deletion frontend/graphqlCodegen.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import type { CodegenConfig } from "@graphql-codegen/cli";
const config: CodegenConfig = {
overwrite: true,

schema: ["./src/instrument_sessions.graphql", "./src/workflows.graphql"],
schema: ["./src/ulims_dev.graphql", "./src/workflows.graphql"],
documents: [
"./*/src/components/**/*.{ts,tsx}",
"./unified/src/App.tsx",
Expand Down
121 changes: 121 additions & 0 deletions frontend/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions frontend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
"js-yaml": "^4.3.0",
"keycloak-js": "^26.2.4",
"lucide-react": "^1.31.0",
"material-react-table": "^3.2.1",
"ndarray": "^1.0.19",
"react": "^18.3.1",
"react-dnd": "^16.0.1",
Expand Down
16 changes: 16 additions & 0 deletions frontend/src/ApolloClient.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import { GraphQLWsLink } from "@apollo/client/link/subscriptions";
import { OperationTypeNode } from "graphql";
import { createClient } from "graphql-ws";
import { readTokenStore } from "./token";
import { relayStylePagination } from "./pagination";

const httpLinkWorkflows = new HttpLink({
uri: import.meta.env.VITE_WORKFLOWS_GRAPHQL_HTTP_ENDPOINT,
Expand Down Expand Up @@ -75,3 +76,18 @@ export const apolloClientUlims = new ApolloClient({
link: authLink.concat(httpLinkUlims),
cache: new InMemoryCache(),
});

export const apolloClientUlimsScans = new ApolloClient({
Comment thread
echen-dls marked this conversation as resolved.
Resolved
link: authLink.concat(httpLinkUlims),
cache: new InMemoryCache({
typePolicies: {
InstrumentSession: {
keyFields: ["proposal"],
fields: {
// https://www.apollographql.com/docs/react/pagination/cursor-based#relay-style-cursor-pagination
datasets: relayStylePagination(["reference", "filter"]), //, "pagination", ["first", "after"]]),
},
},
},
}),
});
78 changes: 42 additions & 36 deletions frontend/src/Layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,11 @@ import { ApolloProvider } from "@apollo/client/react";
import { AppState, AppStatus, OutletContextType } from "../unified/src/types";

const MainContainer = styled(Box)({
display: "grid",
display: "flex",
flexDirection: "column",
gap: "30px",
flex: 1,
alignItems: "flex-start",
minHeight: 0,
flexGrow: 1,
});

const Layout = () => {
Expand Down Expand Up @@ -53,42 +54,48 @@ const Layout = () => {
};

return (
<>
<Box
sx={{
height: "100vh",
maxHeight: "100vh",
display: "flex",
flexDirection: "column",
}}
>
<CssBaseline />
<Navbar
logo="theme"
containerWidth={false}
position="static"
leftSlot={
<>
<Stack
direction="row"
alignItems="center"
spacing={2}
divider={<Divider orientation="vertical" flexItem />}
>
<NavLinks>
<NavLink to="/" linkComponent={RouterNavLink}>
Home
</NavLink>
<NavLink to="/post-processing" linkComponent={RouterNavLink}>
Post Processing
</NavLink>
<NavLink to="/tomography" linkComponent={RouterNavLink}>
Tomography
</NavLink>
<NavLink to="/i14" linkComponent={RouterNavLink}>
I14
</NavLink>
<NavLink to="/ePSIC" linkComponent={RouterNavLink}>
ePSIC
</NavLink>
</NavLinks>
<Stack
direction="row"
alignItems="center"
spacing={2}
divider={<Divider orientation="vertical" flexItem />}
>
<NavLinks>
<NavLink to="/" linkComponent={RouterNavLink}>
Home
</NavLink>
<NavLink to="/post-processing" linkComponent={RouterNavLink}>
Post Processing
</NavLink>
<NavLink to="/tomography" linkComponent={RouterNavLink}>
Tomography
</NavLink>
<NavLink to="/i14" linkComponent={RouterNavLink}>
I14
</NavLink>
<NavLink to="/ePSIC" linkComponent={RouterNavLink}>
ePSIC
</NavLink>
</NavLinks>

<ApolloProvider client={apolloClientUlims}>
<NavbarSessionSelector setAppStatus={setAppStatus} />
</ApolloProvider>
</Stack>
</>
<ApolloProvider client={apolloClientUlims}>
<NavbarSessionSelector setAppStatus={setAppStatus} />
</ApolloProvider>
</Stack>
}
rightSlot={
<>
Expand All @@ -97,12 +104,11 @@ const Layout = () => {
</>
}
sx={{ zIndex: (theme) => theme.zIndex.drawer + 1 }}
position="sticky"
></Navbar>
/>
<MainContainer>
<Outlet context={ctx satisfies OutletContextType} />
</MainContainer>
</>
</Box>
);
};

Expand Down
Loading
Loading