Skip to content

Fix types in session selector #161

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 4 commits into from
Sep 4, 2026
+10 −20
Merged

Fix types in session selector #161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
732e3d9
Add minimal handling if account is null
yousefmoazzam Sep 4, 2026
ba21833
Use instrument session type from query response type
yousefmoazzam Sep 4, 2026
d022d22
Remove unnecessary uses of question mark operator
yousefmoazzam Sep 4, 2026
f8cee59
Add helper type for non-null account
yousefmoazzam Sep 4, 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
11 changes: 7 additions & 4 deletions frontend/unified/src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,12 @@ export const App: React.FC = () => {
if (data === undefined) {
return <p>Data undefined</p>;
}
if (data.account === null) {
return <p>Account null</p>;
}

const instrumentSession =
data.account?.instrumentSessionRoles.edges[0].node.instrumentSession;
data.account.instrumentSessionRoles.edges[0].node.instrumentSession;

const handleChangeTechnique = (
/**
Expand Down Expand Up @@ -200,9 +203,9 @@ export const App: React.FC = () => {
// a capitalised "proposal code", whereas the workflows service only accepts
// it in lowercase
proposalCode:
instrumentSession?.proposal.proposalCategory.toLowerCase(),
proposalNumber: instrumentSession?.proposal.proposalNumber,
number: instrumentSession?.instrumentSessionNumber,
instrumentSession.proposal.proposalCategory.toLowerCase(),
proposalNumber: instrumentSession.proposal.proposalNumber,
number: instrumentSession.instrumentSessionNumber,
}}
/>
</Stack>
Expand Down
19 changes: 3 additions & 16 deletions frontend/unified/src/components/SessionSelector.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,23 +14,10 @@ enum SessionSelectionMode {
Custom = "Custom",
}

type Proposal = {
proposalNumber: number;
proposalCategory: string;
};

type Instrument = {
name: string;
};

export type InstrumentSession = {
instrumentSessionNumber: number;
proposal: Proposal;
instrument: Instrument;
};
type NonNullAccount = NonNullable<SessionQueryQuery["account"]>;

type SessionSelectorProps = {
session: InstrumentSession;
session: NonNullAccount["instrumentSessionRoles"]["edges"][0]["node"]["instrumentSession"];
};

export const SessionSelector: React.FC<SessionSelectorProps> = ({
Expand All @@ -42,7 +29,7 @@ export const SessionSelector: React.FC<SessionSelectorProps> = ({
const [textInputValue, setTextInputValue] = useState<string>("");

const proposal = session?.proposal;
const latestSession = `${proposal?.proposalCategory?.toLowerCase()}${proposal?.proposalNumber}-${session?.instrumentSessionNumber}`;
const latestSession = `${proposal.proposalCategory?.toLowerCase()}${proposal.proposalNumber}-${session.instrumentSessionNumber}`;

return (
<Stack direction="row" spacing={2} alignItems={"center"}>
Expand Down
Loading