Skip to content

If no recipes are specified in the machine configuration then avoid the processing parameters setup page #21

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

Closed
d-j-hatton wants to merge 4 commits into from
Closed

If no recipes are specified in the machine configuration then avoid the processing parameters setup page #21

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
b3a438e
Check for recipes in machine configuration when deciding whether to r…
d-j-hatton May 9, 2025
c06716e
Skip processing parameters screen if no recipes are defined in machin…
d-j-hatton May 9, 2025
17daa81
Start multigrid watcher from directory selection page if we are skipp…
d-j-hatton May 9, 2025
817fb88
Await API calls inside an async function
d-j-hatton May 13, 2025
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 src/routes/MultigridSetup.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import { ArrowForwardIcon } from "@chakra-ui/icons";

import { Link as LinkRouter, useLoaderData, useParams } from "react-router-dom";
import { components } from "schema/main";
import { setupMultigridWatcher } from "loaders/multigridSetup";
import { setupMultigridWatcher, startMultigridWatcher } from "loaders/multigridSetup";
import { getSessionData } from "loaders/session_clients";
import { SetupStepper } from "components/setupStepper";
import React, { useEffect } from "react";
Expand Down Expand Up @@ -49,15 +49,18 @@ const MultigridSetup = () => {
const handleDirectorySelection = (e: React.ChangeEvent<HTMLSelectElement>) =>
setSelectedDirectory(e.target.value);

const handleSelection = () => {
const recipesDefined = machineConfig ? machineConfig.recipes ? Object.keys(machineConfig.recipes).length !== 0: false: false;

const handleSelection = async () => {
if (typeof sessid !== "undefined"){
setupMultigridWatcher(
await setupMultigridWatcher(
{
source: selectedDirectory,
skip_existing_processing: skipExistingProcessing,
} as MultigridWatcherSpec,
parseInt(sessid),
);
if(!recipesDefined) await startMultigridWatcher(parseInt(sessid));
}
};

Expand Down Expand Up @@ -140,7 +143,7 @@ const MultigridSetup = () => {
w={{ base: "100%", md: "19.6%" }}
_hover={{ textDecor: "none" }}
as={LinkRouter}
to={`../new_session/parameters/${sessid}`}
to={recipesDefined ? `../new_session/parameters/${sessid}`: `../sessions/${sessid}`}
>
<IconButton
aria-label="select"
Expand Down
4 changes: 3 additions & 1 deletion src/routes/Session.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,9 @@ const Session = () => {
setSelectedDirectory(mcfg["data_directories"][0]);
}

useEffect(() => {getSessionProcessingParameterData(sessid).then((params) => {if(params === null) navigate(`/new_session/parameters/${sessid}`);})})
const recipesDefined = machineConfig ? machineConfig.recipes ? Object.keys(machineConfig.recipes).length !== 0: false: false;

useEffect(() => {getSessionProcessingParameterData(sessid).then((params) => {if(params === null && recipesDefined) navigate(`/new_session/parameters/${sessid}`);})})

useEffect(() => {getMachineConfigData().then((mcfg) => handleMachineConfig(mcfg))}, []);

Expand Down
6 changes: 1 addition & 5 deletions src/routes/SessionSetup.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
import {
Button,
Box,
FormControl,
FormLabel,
Input,
RadioGroup,
Radio,
Stack,
Expand All @@ -12,7 +9,7 @@ import {
Heading,
} from "@chakra-ui/react";
import { getForm } from "components/forms";
import { Link as LinkRouter, useParams, useLoaderData, useNavigate } from "react-router-dom";
import { Link as LinkRouter, useParams, useLoaderData } from "react-router-dom";
import { SetupStepper } from "components/setupStepper";
import { components } from "schema/main";
import { getProcessingParameterData } from "loaders/processingParameters";
Expand Down Expand Up @@ -63,7 +60,6 @@ const SessionSetup = () => {
? 3
: 0
: 3;
let navigate = useNavigate();
return (
<div className="rootContainer">
<Box w="100%" bg="murfey.50">
Expand Down