lhcb-ntuple-wizard 2.0.3 → 2.1.0

package/dist/components/VerticalLine.js

@@ -0,0 +1,4 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+export function VerticalLine({ width = "1px", height = "100%", color = "#bbb" }) {
+    return _jsx("div", { style: { borderLeft: `${width} solid ${color}`, height } });
+}

package/dist/components/modals/AddTupleToolModal.d.ts

@@ -1,7 +1,6 @@
+import { TupleTool } from "../../models/tupleTool";
 interface Props {
-    branch: string[];
-    filterToolTags: string[];
-    onClose: () => void;
+    onClose: (newTool: TupleTool | null) => void;
 }
-export declare function AddTupleToolModal({ branch, filterToolTags, onClose }: Props): import("react/jsx-runtime").JSX.Element;
+export declare function AddTupleToolModal({ onClose }: Props): import("react/jsx-runtime").JSX.Element;
 export {};

package/dist/components/modals/AddTupleToolModal.js

@@ -1,18 +1,18 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { Button, FormControl, InputGroup, Modal } from "react-bootstrap";
-import { TupleToolDropdown } from "../TupleToolDropdown";
+import { Button, ButtonGroup, FormControl, InputGroup, Modal } from "react-bootstrap";
+import { TupleToolClassDropdown } from "../TupleToolClassDropdown";
 import { TupleToolDocsAccordion } from "../TupleToolDocsAccordion";
 import { useDtt } from "../../providers/DttProvider";
 import { TupleTool } from "../../models/tupleTool";
 import { useEffect, useRef, useState } from "react";
-export function AddTupleToolModal({ branch, filterToolTags, onClose }) {
-    const { dtt, addTool } = useDtt();
+export function AddTupleToolModal({ onClose }) {
+    const { dtt, addTool, selectedBranch } = useDtt();
     const nameInputRef = useRef(null);
     const [selectedTool, setSelectedTool] = useState(null);
     useEffect(() => {
         nameInputRef.current?.focus();
     }, [selectedTool]);
-    return (_jsxs(Modal, { show: true, onHide: onClose, children: [_jsx(Modal.Header, { closeButton: true, children: "Add TupleTool" }), _jsxs(Modal.Body, { className: "gap-3 d-flex flex-column", children: [_jsxs(InputGroup, { hasValidation: true, children: [_jsx(TupleToolDropdown, { filterToolTags: filterToolTags, placeholder: "TupleTool class", onChange: (option) => {
+    return (_jsxs(Modal, { show: true, onHide: () => onClose(null), children: [_jsx(Modal.Header, { closeButton: true, children: "Add TupleTool" }), _jsxs(Modal.Body, { className: "gap-3 d-flex flex-column", children: [_jsxs(InputGroup, { hasValidation: true, children: [_jsx(TupleToolClassDropdown, { onChange: (option) => {
                                     if (option) {
                                         setSelectedTool((prev) => new TupleTool(option.value, prev?.name || ""));
                                     }
@@ -20,13 +20,13 @@ export function AddTupleToolModal({ branch, filterToolTags, onClose }) {
                                     // Remove all non-word characters
                                     const name = event.target.value.replaceAll(/[^\w]/g, "");
                                     setSelectedTool((prev) => new TupleTool(prev.class, name));
-                                }, value: selectedTool?.name || "", disabled: !selectedTool, isInvalid: !!selectedTool && dtt.toolExists(selectedTool, branch), onKeyDown: (event) => {
+                                }, value: selectedTool?.name || "", disabled: !selectedTool, isInvalid: !!selectedTool && dtt.toolExists(selectedTool, selectedBranch), onKeyDown: (event) => {
                                     if (event.key === "Enter") {
-                                        addTool(branch, selectedTool);
-                                        onClose();
+                                        addTool(selectedBranch, selectedTool);
+                                        onClose(selectedTool);
                                     }
-                                } }), selectedTool && (_jsxs(FormControl.Feedback, { type: "invalid", children: ["A ", selectedTool.class, " with the name \"", selectedTool.name, "\" already exists"] }))] }), selectedTool && _jsx(TupleToolDocsAccordion, { toolClass: selectedTool.class }), _jsx(Button, { className: "align-self-end", variant: "success", disabled: !selectedTool || dtt.toolExists(selectedTool, branch), onClick: () => {
-                            addTool(branch, selectedTool);
-                            onClose();
-                        }, children: "Add tool" })] })] }));
+                                } }), selectedTool && (_jsxs(FormControl.Feedback, { type: "invalid", children: ["A ", selectedTool.class, " with the name \"", selectedTool.name, "\" already exists"] }))] }), selectedTool && _jsx(TupleToolDocsAccordion, { toolClass: selectedTool.class }), _jsxs(ButtonGroup, { className: "align-self-end", children: [_jsx(Button, { variant: "outline-dark", onClick: () => onClose(null), children: "Cancel" }), _jsx(Button, { disabled: !selectedTool || dtt.toolExists(selectedTool, selectedBranch), onClick: () => {
+                                    addTool(selectedBranch, selectedTool);
+                                    onClose(selectedTool);
+                                }, children: "Add tool" })] })] })] }));
 }

package/dist/components/modals/ConfigureTupleToolModal.d.ts

@@ -1,8 +1,8 @@
 import { TupleTool } from "../../models/tupleTool";
 interface Props {
-    branch: string[];
     tool: TupleTool;
+    deleteIfCancelled: boolean;
     onClose: () => void;
 }
-export declare function ConfigureTupleToolModal({ branch, tool, onClose }: Props): import("react/jsx-runtime").JSX.Element;
+export declare function ConfigureTupleToolModal({ tool, deleteIfCancelled, onClose }: Props): import("react/jsx-runtime").JSX.Element;
 export {};

package/dist/components/modals/ConfigureTupleToolModal.js

@@ -1,5 +1,5 @@
 import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
-import { Button, Col, Form, Modal, OverlayTrigger, Row, Tooltip } from "react-bootstrap";
+import { Button, ButtonGroup, Col, Form, Modal, OverlayTrigger, Row, Tooltip } from "react-bootstrap";
 import { StrParamInput } from "../tupleToolParams/StrParamInput";
 import { BoolParamInput } from "../tupleToolParams/BoolParamInput";
 import { NumParamInput } from "../tupleToolParams/NumParamInput";
@@ -8,36 +8,53 @@ import { DictParamInput } from "../tupleToolParams/DictParamInput";
 import { QuestionCircle } from "react-bootstrap-icons";
 import { TupleToolDocsAccordion } from "../TupleToolDocsAccordion";
 import { useDtt } from "../../providers/DttProvider";
-export function ConfigureTupleToolModal({ branch, tool, onClose }) {
-    const { dtt, updateToolParam } = useDtt();
-    return (_jsxs(Modal, { show: true, size: "xl", fullscreen: "lg-down", onHide: onClose, children: [_jsxs(Modal.Header, { closeButton: true, children: ["Configure ", tool.toString()] }), _jsxs(Modal.Body, { className: "gap-3 d-flex flex-column", children: [tool ? (_jsx(Form, { children: Object.entries(dtt.getToolConfig(branch, tool)).map(([paramName, param]) => {
+import { config } from "../../config";
+import { toast } from "react-toastify";
+export function ConfigureTupleToolModal({ tool, deleteIfCancelled, onClose }) {
+    const { dtt, updateToolParam, removeTool, selectedBranch } = useDtt();
+    const toolConfig = dtt.getToolConfig(selectedBranch, tool);
+    return (_jsxs(Modal, { show: true, size: "xl", fullscreen: "lg-down", backdrop: "static", keyboard: false, children: [_jsxs(Modal.Header, { children: ["Configure ", tool.toString()] }), _jsxs(Modal.Body, { className: "gap-3 d-flex flex-column", children: [_jsx(Form, { children: Object.entries(toolConfig).map(([paramName, param]) => {
                             const { description, type, default: defaultValue, value } = param;
                             let inputComponent;
                             switch (type) {
                                 case "str":
-                                    inputComponent = (_jsx(StrParamInput, { value: value, defaultValue: defaultValue, onChange: (newValue) => updateToolParam(branch, tool, paramName, newValue), param: paramName }));
+                                    inputComponent = (_jsx(StrParamInput, { value: value, defaultValue: defaultValue, onChange: (newValue) => updateToolParam(selectedBranch, tool, paramName, newValue), param: paramName }));
                                     break;
                                 case "bool":
-                                    inputComponent = (_jsx(BoolParamInput, { value: value, onChange: (newValue) => updateToolParam(branch, tool, paramName, newValue) }));
+                                    inputComponent = (_jsx(BoolParamInput, { value: value, onChange: (newValue) => updateToolParam(selectedBranch, tool, paramName, newValue) }));
                                     break;
                                 case "int":
                                 case "uint":
                                 case "float":
-                                    inputComponent = (_jsx(NumParamInput, { type: type, value: value, defaultValue: defaultValue, onChange: (newValue) => updateToolParam(branch, tool, paramName, newValue) }));
+                                    inputComponent = (_jsx(NumParamInput, { type: type, value: value, defaultValue: defaultValue, onChange: (newValue) => updateToolParam(selectedBranch, tool, paramName, newValue) }));
                                     break;
                                 case "text":
-                                    inputComponent = (_jsx(ListParamInput, { initialValues: value, defaultValues: defaultValue, newItemValue: "", onChange: (newValue) => updateToolParam(branch, tool, paramName, newValue), buildInnerInput: (props) => _jsx(StrParamInput, { ...props, param: paramName }) }));
+                                    inputComponent = (_jsx(ListParamInput, { initialValues: value, defaultValues: defaultValue, newItemValue: "", onChange: (newValue) => updateToolParam(selectedBranch, tool, paramName, newValue), buildInnerInput: (props) => _jsx(StrParamInput, { ...props, param: paramName }) }));
                                     break;
                                 case "[int]":
                                 case "[uint]":
                                 case "[float]":
-                                    inputComponent = (_jsx(ListParamInput, { initialValues: value, defaultValues: defaultValue, newItemValue: 0, onChange: (newValue) => updateToolParam(branch, tool, paramName, newValue), buildInnerInput: (props) => (_jsx(NumParamInput, { type: type.slice(1, -1), ...props })) }));
+                                    inputComponent = (_jsx(ListParamInput, { initialValues: value, defaultValues: defaultValue, newItemValue: 0, onChange: (newValue) => updateToolParam(selectedBranch, tool, paramName, newValue), buildInnerInput: (props) => (_jsx(NumParamInput, { type: type.slice(1, -1), ...props })) }));
                                     break;
                                 case "{str:str}":
                                 case "{str:[str]}":
-                                    inputComponent = (_jsx(DictParamInput, { value: value, onChange: (newValue) => updateToolParam(branch, tool, paramName, newValue) }));
+                                    inputComponent = (_jsx(DictParamInput, { value: value, onChange: (newValue) => updateToolParam(selectedBranch, tool, paramName, newValue) }));
                                     break;
                             }
                             return (_jsxs(Form.Group, { as: Row, className: "mb-2", children: [_jsxs(Form.Label, { column: true, sm: 3, children: [_jsx(OverlayTrigger, { overlay: _jsx(Tooltip, { children: description }), children: _jsx(QuestionCircle, {}) }), _jsxs("code", { children: [" ", paramName, " "] })] }), _jsx(Form.Label, { column: true, sm: 2, children: _jsxs("code", { children: [" ", type, " "] }) }), _jsx(Col, { sm: 7, children: inputComponent })] }, paramName));
-                        }) })) : ("No tool selected"), _jsx(TupleToolDocsAccordion, { toolClass: tool.class }), _jsx(Button, { className: "align-self-end", onClick: onClose, children: "Save & close" })] })] }));
+                        }) }), _jsx(TupleToolDocsAccordion, { toolClass: tool.class }), _jsxs(ButtonGroup, { className: "align-self-end", children: [_jsx(Button, { variant: deleteIfCancelled ? "outline-danger" : "outline-dark", onClick: () => {
+                                    if (deleteIfCancelled) {
+                                        removeTool(selectedBranch, tool);
+                                    }
+                                    onClose();
+                                }, children: "Cancel" }), _jsx(Button, { onClick: () => {
+                                    if (Object.keys(config.tupleToolValidation).includes(tool.class)) {
+                                        const errorMsg = config.tupleToolValidation[tool.class].validate(toolConfig);
+                                        if (errorMsg) {
+                                            toast(errorMsg, { type: "error" });
+                                            return;
+                                        }
+                                    }
+                                    onClose();
+                                }, children: "Save & close" })] })] })] }));
 }

package/dist/components/modals/ReasonForRequestModal.d.ts

@@ -1,7 +1,5 @@
 interface Props {
-    submitLocation: string;
     onClose: (submitted: boolean) => void;
-    requestReasonMessage: string;
 }
-export declare function ReasonForRequestModal({ submitLocation, onClose, requestReasonMessage }: Props): import("react/jsx-runtime").JSX.Element;
+export declare function ReasonForRequestModal({ onClose }: Props): import("react/jsx-runtime").JSX.Element;
 export {};

package/dist/components/modals/ReasonForRequestModal.js

@@ -3,12 +3,14 @@ import { Alert, Button, FormControl, InputGroup, Modal, OverlayTrigger, Spinner,
 import { useRequest } from "../../providers/RequestProvider";
 import { useState } from "react";
 import { useRows } from "../../providers/RowsProvider";
-export function ReasonForRequestModal({ submitLocation, onClose, requestReasonMessage }) {
+import { useWizardConfig } from "../../providers/WizardConfigProvider";
+export function ReasonForRequestModal({ onClose }) {
     const { generateAllFiles } = useRows();
     const { productionName, reasonForRequest, setReasonForRequest } = useRequest();
+    const { requestReasonMessage, submitLocation } = useWizardConfig();
     const [requestLoading, setRequestLoading] = useState(false);
     const [requestError, setRequestError] = useState(null);
-    const submitRequest = (url) => {
+    const submitRequest = () => {
         setRequestLoading(true);
         setRequestError(null);
         const allFiles = generateAllFiles();
@@ -19,7 +21,7 @@ export function ReasonForRequestModal({ submitLocation, onClose, requestReasonMe
         formData.append("email", localStorage.getItem("email") || "");
         formData.append("name", productionName);
         formData.append("reasonForRequest", reasonForRequest);
-        fetch(url, {
+        fetch(submitLocation, {
             method: "POST",
             body: formData,
             credentials: "include",
@@ -38,5 +40,5 @@ export function ReasonForRequestModal({ submitLocation, onClose, requestReasonMe
             setRequestLoading(false);
         });
     };
-    return (_jsxs(Modal, { show: true, onHide: () => onClose(false), size: "lg", children: [_jsx(Modal.Header, { closeButton: true, children: _jsx(Modal.Title, { children: "Reason for request" }) }), _jsxs(Modal.Body, { children: [_jsx(Alert, { children: requestReasonMessage }), requestError && _jsx(Alert, { variant: "danger", children: requestError }), _jsxs(InputGroup, { hasValidation: true, children: [_jsx(OverlayTrigger, { overlay: _jsx(Tooltip, { children: "Reason for requesting the chosen ntuples" }), children: _jsx(InputGroup.Text, { children: "Reason for request" }) }), _jsx(FormControl, { as: "textarea", rows: 3, value: reasonForRequest, onChange: (event) => setReasonForRequest(event.target.value), isValid: !!reasonForRequest, placeholder: "I need these ntuples for..." })] })] }), _jsx(Modal.Footer, { children: _jsx(Button, { variant: "primary", disabled: !reasonForRequest || requestLoading, onClick: () => submitRequest(submitLocation), children: requestLoading ? (_jsxs(_Fragment, { children: [_jsx(Spinner, { animation: "border", size: "sm" }), " Submitting..."] })) : ("Submit request") }) })] }));
+    return (_jsxs(Modal, { show: true, onHide: () => onClose(false), size: "lg", children: [_jsx(Modal.Header, { closeButton: true, children: _jsx(Modal.Title, { children: "Reason for request" }) }), _jsxs(Modal.Body, { children: [_jsx(Alert, { children: requestReasonMessage }), requestError && _jsx(Alert, { variant: "danger", children: requestError }), _jsxs(InputGroup, { hasValidation: true, children: [_jsx(OverlayTrigger, { overlay: _jsx(Tooltip, { children: "Reason for requesting the chosen ntuples" }), children: _jsx(InputGroup.Text, { children: "Reason for request" }) }), _jsx(FormControl, { as: "textarea", rows: 3, value: reasonForRequest, onChange: (event) => setReasonForRequest(event.target.value), isValid: !!reasonForRequest, placeholder: "I need these ntuples for..." })] })] }), _jsx(Modal.Footer, { children: _jsx(Button, { variant: "primary", disabled: !reasonForRequest || requestLoading, onClick: submitRequest, children: requestLoading ? (_jsxs(_Fragment, { children: [_jsx(Spinner, { animation: "border", size: "sm" }), " Submitting..."] })) : ("Submit request") }) })] }));
 }

package/dist/config.d.ts

@@ -1,3 +1,5 @@
+import { DagreLayoutOptions } from "cytoscape-dagre";
+import { ToolConfig } from "./models/dtt";
 export declare const config: {
     metadata_baseurl: string;
     metadata_files: {
@@ -21,58 +23,27 @@ export declare const config: {
         lifetime: string;
     };
     dttGraphOptions: {
-        layout: {
-            hierarchical: {
-                sortMethod: string;
-            };
-        };
+        height: string;
+        zoomMin: number;
+        zoomMax: number;
+        zoomStep: number;
+        layout: DagreLayoutOptions;
         nodes: {
-            borderWidth: number;
-            borderWidthSelected: number;
-            imagePadding: number;
-            font: {
-                strokeWidth: number;
-                background: string;
-            };
-            color: {
-                background: string;
-                highlight: {
-                    background: string;
-                };
-                hover: {
-                    background: string;
-                };
-            };
-            scaling: {
-                min: number;
-                max: number;
-            };
-            value: number;
-            shape: string;
-            shapeProperties: {
-                useBorderWithImage: boolean;
-                useImageSize: boolean;
-            };
+            draggable: boolean;
+            width: number;
+            height: number;
+            hoverColor: string;
         };
         edges: {
             color: string;
             width: number;
-            selectionWidth: number;
-            hoverWidth: number;
-        };
-        physics: {
-            enabled: boolean;
         };
-        interaction: {
-            dragNodes: boolean;
-            multiselect: boolean;
-            selectConnectedEdges: boolean;
-            hoverConnectedEdges: boolean;
-            hover: boolean;
-            zoomView: boolean;
-        };
-        height: string;
-        autoResize: boolean;
-        width: string;
     };
+    tupleToolValidation: TupleToolValidation;
 };
+interface TupleToolValidation {
+    [toolClass: string]: {
+        validate: (config: ToolConfig) => string | null;
+    };
+}
+export {};

package/dist/config.js

@@ -21,52 +21,39 @@ export const config = {
         lifetime: "secondary",
     },
     dttGraphOptions: {
+        height: "500px",
+        zoomMin: 0.2,
+        zoomMax: 3.0,
+        zoomStep: 0.018,
         layout: {
-            hierarchical: { sortMethod: "directed" },
+            rankDir: "TB", // top -> bottom
+            nodeSep: 50,
+            rankSep: 80,
+            animate: false,
         },
         nodes: {
-            borderWidth: 0,
-            borderWidthSelected: 0,
-            imagePadding: 10,
-            font: {
-                strokeWidth: 20,
-                background: "white",
-            },
-            color: {
-                background: "white",
-                highlight: { background: "white" },
-                hover: { background: "#eee" },
-            },
-            scaling: {
-                min: 32,
-                max: 32,
-            },
-            value: 1,
-            shape: "image",
-            shapeProperties: {
-                useBorderWithImage: true,
-                useImageSize: false,
-            },
+            draggable: false,
+            width: 80,
+            height: 30,
+            hoverColor: "royalblue",
         },
         edges: {
-            color: "black",
+            color: "#222",
             width: 1,
-            selectionWidth: 0,
-            hoverWidth: 0,
         },
-        physics: {
-            enabled: false,
-        },
-        interaction: {
-            dragNodes: false,
-            multiselect: true,
-            selectConnectedEdges: false,
-            hoverConnectedEdges: false,
-            hover: true,
-            zoomView: false,
+    },
+    tupleToolValidation: {
+        ["LoKi__Hybrid__TupleTool"]: {
+            validate: (config) => {
+                const hasVariables = Object.entries(config["Variables"].value).length > 0;
+                const hasBoolVariables = Object.entries(config["BoolVariables"].value).length > 0;
+                const hasFloatVariables = Object.entries(config["FloatVariables"].value).length > 0;
+                const hasIntVariables = Object.entries(config["IntVariables"].value).length > 0;
+                if (!hasVariables && !hasBoolVariables && !hasFloatVariables && !hasIntVariables) {
+                    return "Please add at least one variable";
+                }
+                return null;
+            },
         },
-        height: "500px",
-        autoResize: true,
-        width: "100%",
     },
 };

package/dist/pages/DecaySearchPage.d.ts

@@ -1,5 +1 @@
-interface Props {
-    basePath: string;
-}
-export declare function DecaySearchPage({ basePath }: Props): import("react/jsx-runtime").JSX.Element;
-export {};
+export declare function DecaySearchPage(): import("react/jsx-runtime").JSX.Element;

package/dist/pages/DecaySearchPage.js

@@ -20,6 +20,7 @@ import { ParticleDropdown } from "../components/ParticleDropdown";
 import { getSelectTagOptions, TagDropdown } from "../components/TagDropdown";
 import { useRows } from "../providers/RowsProvider";
 import { LoadingIndicator } from "../components/LoadingIndicator";
+import { useWizardConfig } from "../providers/WizardConfigProvider";
 var MatchType;
 (function (MatchType) {
     MatchType["any"] = "any";
@@ -31,9 +32,10 @@ var HeadMatchType;
     HeadMatchType["exactly"] = "exactly";
     HeadMatchType["category"] = "category";
 })(HeadMatchType || (HeadMatchType = {}));
-export function DecaySearchPage({ basePath }) {
+export function DecaySearchPage() {
     const metadata = useMetadata();
     const { rows, setRows } = useRows();
+    const { basePath } = useWizardConfig();
     const [selectedContains, setSelectedContains] = useState([]);
     const [selectedHead, setSelectedHead] = useState(null);
     const [selectedHeadTags, setSelectedHeadTags] = useState([]);

package/dist/pages/DecayTreeConfigPage.d.ts

@@ -1,5 +1 @@
-interface Props {
-    basePath: string;
-}
-export declare function DecayTreeConfigPage({ basePath }: Props): import("react/jsx-runtime").JSX.Element;
-export {};
+export declare function DecayTreeConfigPage(): import("react/jsx-runtime").JSX.Element;

package/dist/pages/DecayTreeConfigPage.js

@@ -9,7 +9,7 @@ import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-run
  * granted to it by virtue of its status as an Intergovernmental Organization  *
  * or submit itself to any jurisdiction.                                       *
  \*****************************************************************************/
-import { Button, Col, OverlayTrigger, Row, Stack, Tooltip } from "react-bootstrap";
+import { Button, OverlayTrigger, Stack, Tooltip } from "react-bootstrap";
 import { useNavigate } from "react-router-dom";
 import { useMetadata } from "../providers/MetadataProvider";
 import { DecayTreeCard } from "../components/DecayTreeCard";
@@ -18,10 +18,12 @@ import Dtt from "../models/dtt";
 import { DttProvider } from "../providers/DttProvider";
 import { LoadingIndicator } from "../components/LoadingIndicator";
 import { useEffect, useState } from "react";
-export function DecayTreeConfigPage({ basePath }) {
+import { useWizardConfig } from "../providers/WizardConfigProvider";
+export function DecayTreeConfigPage() {
     const navigate = useNavigate();
     const metadata = useMetadata();
     const { rows, updateRow } = useRows();
+    const { basePath } = useWizardConfig();
     const [dirtyDtts, setDirtyDtts] = useState(new Set());
     // Listen for when the user is about to leave the page and alert them if there are unsaved changes
     useEffect(() => {
@@ -39,18 +41,18 @@ export function DecayTreeConfigPage({ basePath }) {
         return _jsx(LoadingIndicator, { height: "70vh" });
     }
     const rowsToEdit = rows.filter((row) => !!row.editTree);
-    return (_jsxs(_Fragment, { children: [_jsx("h3", { children: "DecayTreeTuple configuration" }), _jsx(Stack, { gap: 5, children: rowsToEdit.map((row) => (_jsx(Row, { className: "justify-content-lg-center", children: _jsx(Col, { lg: "auto", children: _jsx(DttProvider, { metadata: metadata, decay: row.decay, initialConfig: row.dtt.config, children: _jsx(DecayTreeCard, { onConfigSaved: (newConfig) => {
-                                    updateRow(row.id, (r) => ({ ...r, dtt: new Dtt(newConfig, {}) }));
-                                }, onDirtyUpdated: (dttName, dirty) => setDirtyDtts((prev) => {
-                                    if (dirty) {
-                                        return new Set(prev.add(dttName));
-                                    }
-                                    else {
-                                        const newSet = new Set(prev);
-                                        newSet.delete(dttName);
-                                        return newSet;
-                                    }
-                                }) }) }) }, row.id) }, row.id))) }), _jsx(OverlayTrigger, { placement: "right", overlay: _jsx(Tooltip, { children: "Return to Stripping line and dataset selection" }), children: _jsx(Button, { className: "mt-2 mb-4", type: "submit", onClick: () => {
+    return (_jsxs(_Fragment, { children: [_jsx("h3", { className: "mb-4", children: "DecayTreeTuple configuration" }), _jsx(Stack, { gap: 5, children: rowsToEdit.map((row) => (_jsx(DttProvider, { metadata: metadata, decay: row.decay, initialConfig: row.dtt.config, children: _jsx(DecayTreeCard, { onConfigSaved: (newConfig) => {
+                            updateRow(row.id, (r) => ({ ...r, dtt: new Dtt(newConfig, {}) }));
+                        }, onDirtyUpdated: (dttName, dirty) => setDirtyDtts((prev) => {
+                            if (dirty) {
+                                return new Set(prev.add(dttName));
+                            }
+                            else {
+                                const newSet = new Set(prev);
+                                newSet.delete(dttName);
+                                return newSet;
+                            }
+                        }) }) }, row.id))) }), _jsx(OverlayTrigger, { placement: "right", overlay: _jsx(Tooltip, { children: "Return to Stripping line and dataset selection" }), children: _jsx(Button, { className: "mt-2 mb-4", type: "submit", onClick: () => {
                         if (dirtyDtts.size > 0) {
                             if (!confirm("You have unsaved changes. Are you sure you want to discard them?")) {
                                 return;

package/dist/pages/RequestPage.d.ts

@@ -1,20 +1 @@
-/*****************************************************************************\
- * (c) Copyright 2021-2024 CERN for the benefit of the LHCb Collaboration      *
- *                                                                             *
- * This software is distributed under the terms of the GNU General Public      *
- * Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   *
- *                                                                             *
- * In applying this licence, CERN does not waive the privileges and immunities *
- * granted to it by virtue of its status as an Intergovernmental Organization  *
- * or submit itself to any jurisdiction.                                       *
- \*****************************************************************************/
-import { ReactNode } from "react";
-export type NtupleWizardVariant = "standalone" | "embedded";
-interface Props {
-    basePath: string;
-    submitLocation?: string;
-    requestReasonMessage?: string;
-    requestSubmittedMessage?: ReactNode;
-}
-export declare function RequestPage({ basePath, submitLocation, requestReasonMessage, requestSubmittedMessage }: Props): import("react/jsx-runtime").JSX.Element;
-export {};
+export declare function RequestPage(): import("react/jsx-runtime").JSX.Element;

package/dist/pages/RequestPage.js

@@ -12,7 +12,6 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
 import { useEffect, useState } from "react";
 import { Alert, Button, Col, Row, Stack } from "react-bootstrap";
 import { Download, Send } from "react-bootstrap-icons";
-import { useLocation } from "react-router-dom";
 import { downloadZip, processProductionFiles } from "../utils/utils";
 import { DeleteButton } from "../components/DeleteButton";
 import { useMetadata } from "../providers/MetadataProvider";
@@ -27,27 +26,25 @@ import { RowProvider } from "../providers/RowProvider";
 import { ProductionNameInput } from "../components/ProductionNameInput";
 import { RequestEmailInput } from "../components/RequestEmailInput";
 import { RequestButtonGroup } from "../components/RequestButtonGroup";
-export function RequestPage({ basePath, submitLocation, requestReasonMessage, requestSubmittedMessage }) {
-    const location = useLocation();
+import { useWizardConfig } from "../providers/WizardConfigProvider";
+export function RequestPage() {
     const metadata = useMetadata();
     const { rows, setRows, generateAllFiles } = useRows();
     const { emailIsKnown, productionName, setProductionName, validation, showErrors, clearAll, trySubmit } = useRequest();
+    const { variant, requestSubmittedMessage, onRequestSubmitted } = useWizardConfig();
     const [showProdUploadModal, setShowProdUploadModal] = useState(false);
     const [prodUploadLoading, setProdUploadLoading] = useState(false);
     const [requestSubmitted, setRequestSubmitted] = useState(false);
     const [showReasonForRequestModal, setShowReasonForRequestModal] = useState(false);
-    const variant = submitLocation ? "embedded" : "standalone";
+    const [checkedIfCloneNeeded, setCheckedIfCloneNeeded] = useState(false);
     useEffect(() => {
         if (!metadata) {
             return;
         }
-        const urlParams = new URLSearchParams(location.search);
-        if (urlParams.get("clone") === "1") {
-            const infoYamlString = localStorage.getItem("infoYamlToClone");
-            const dttConfigsString = localStorage.getItem("dttConfigsToClone");
-            if (!dttConfigsString) {
-                return;
-            }
+        // If the localStorage has been set, we should clone the configuration
+        const infoYamlString = localStorage.getItem("infoYamlToClone");
+        const dttConfigsString = localStorage.getItem("dttConfigsToClone");
+        if (dttConfigsString) {
             setProdUploadLoading(true);
             setRows([]);
             try {
@@ -68,7 +65,8 @@ export function RequestPage({ basePath, submitLocation, requestReasonMessage, re
                 localStorage.removeItem("dttConfigsToClone");
             }
         }
-    }, [metadata, location.search]);
+        setCheckedIfCloneNeeded(true);
+    }, [metadata]);
     const handlePrimaryAction = async () => {
         if (trySubmit()) {
             if (variant === "standalone") {
@@ -80,22 +78,23 @@ export function RequestPage({ basePath, submitLocation, requestReasonMessage, re
             }
         }
     };
-    if (!metadata) {
+    if (!metadata || !checkedIfCloneNeeded) {
         return _jsx(LoadingIndicator, { height: "70vh" });
     }
     if (requestSubmitted) {
         return (_jsx(Row, { className: "mt-3", children: _jsx(Col, { children: _jsxs(Alert, { variant: "success", dismissible: true, onClose: () => setRequestSubmitted(false), children: [_jsx(Alert.Heading, { children: "Request submitted!" }), requestSubmittedMessage] }) }) }));
     }
-    return (_jsxs(_Fragment, { children: [showReasonForRequestModal && (_jsx(ReasonForRequestModal, { submitLocation: submitLocation, requestReasonMessage: requestReasonMessage, onClose: (submitted) => {
+    return (_jsxs(_Fragment, { children: [showReasonForRequestModal && (_jsx(ReasonForRequestModal, { onClose: (submitted) => {
                     setShowReasonForRequestModal(false);
                     if (submitted) {
                         setRequestSubmitted(true);
+                        onRequestSubmitted?.();
                     }
-                } })), showProdUploadModal && _jsx(UploadDttConfigModal, { onClose: () => setShowProdUploadModal(false) }), _jsxs("div", { className: "d-flex flex-column gap-3", children: [rows.map((row) => (_jsx(RowProvider, { row: row, children: _jsx(RequestRow, { hideDownloadButtons: variant === "standalone", hideUploadButtons: variant === "standalone", basePath: basePath }, row.id) }, row.id))), prodUploadLoading && _jsx(ConfigFilesUploadingAlert, {}), requestSubmitted && (_jsxs(Alert, { variant: "success", dismissible: true, onClose: () => setRequestSubmitted(false), children: [_jsx(Alert.Heading, { children: "Request submitted!" }), requestSubmittedMessage] })), showErrors &&
+                } })), showProdUploadModal && _jsx(UploadDttConfigModal, { onClose: () => setShowProdUploadModal(false) }), _jsxs("div", { className: "d-flex flex-column gap-4", children: [rows.map((row) => (_jsx(RowProvider, { row: row, children: _jsx(RequestRow, {}, row.id) }, row.id))), prodUploadLoading && _jsx(ConfigFilesUploadingAlert, {}), showErrors &&
                         (rows.length === 0 ||
                             !validation.allRowsHaveDtt ||
                             !validation.allRowsHaveStrippingLine ||
                             !validation.allRowsHavePaths) && (_jsx(Alert, { variant: "danger", className: "mb-0", children: rows.length === 0
                             ? "Please select at least one decay"
-                            : "Please name all DecayTreeTuples and select at least one stripping line and bookkeeping path for each decay" })), _jsx(Row, { children: _jsx(Col, { xs: "auto", children: _jsx(RequestButtonGroup, { variant: variant, basePath: basePath }) }) }), _jsx(Row, { children: _jsxs(Col, { xs: 4, children: [_jsx(ProductionNameInput, {}), !emailIsKnown && _jsx(RequestEmailInput, {}), _jsxs(Stack, { direction: "horizontal", gap: 1, className: "mt-3 mb-3", children: [_jsxs(Button, { className: "align-items-center d-flex gap-1", onClick: () => void handlePrimaryAction(), children: [variant === "standalone" ? _jsx(Download, {}) : _jsx(Send, {}), variant === "standalone" ? "Download" : "Submit"] }), _jsx(DeleteButton, { action: clearAll, disabled: validation.isEmptySession, outline: undefined, children: "Clear all" })] })] }) })] })] }));
+                            : "Please name all DecayTreeTuples and select at least one stripping line and bookkeeping path for each decay" })), _jsx(Row, { children: _jsx(Col, { xs: "auto", children: _jsx(RequestButtonGroup, {}) }) }), _jsx(Row, { children: _jsxs(Col, { xs: "auto", children: [_jsx(ProductionNameInput, {}), !emailIsKnown && _jsx(RequestEmailInput, {}), _jsxs(Stack, { direction: "horizontal", gap: 1, className: "mt-3 mb-3", children: [_jsxs(Button, { className: "align-items-center d-flex gap-1", onClick: () => void handlePrimaryAction(), children: [variant === "standalone" ? _jsx(Download, {}) : _jsx(Send, {}), variant === "standalone" ? "Download" : "Submit"] }), _jsx(DeleteButton, { action: clearAll, disabled: validation.isEmptySession, outline: undefined, children: "Clear all" })] })] }) })] })] }));
 }

package/dist/providers/DttProvider.d.ts

@@ -12,6 +12,8 @@ interface DttContextType {
     dirty: boolean;
     save(this: void): void;
     revert(this: void): void;
+    selectedBranch: string[];
+    setSelectedBranch: (branch: string[]) => void;
 }
 interface DttProviderProps {
     initialConfig: DttConfig;

package/dist/providers/DttProvider.js

@@ -1,5 +1,5 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { createContext, useCallback, useContext, useReducer } from "react";
+import { createContext, useCallback, useContext, useReducer, useState } from "react";
 import Dtt from "../models/dtt";
 const DttContext = createContext(null);
 function reducer(state, action) {
@@ -31,6 +31,7 @@ function reducer(state, action) {
     }
 }
 export function DttProvider({ initialConfig, decay, metadata, children }) {
+    const [selectedBranch, setSelectedBranch] = useState([]);
     const [state, dispatch] = useReducer(reducer, null, () => ({
         dtt: new Dtt(structuredClone(initialConfig), metadata.tupleTools.tupleTools),
         decay,
@@ -66,6 +67,8 @@ export function DttProvider({ initialConfig, decay, metadata, children }) {
         removeTool,
         save,
         revert,
+        selectedBranch,
+        setSelectedBranch,
     };
     return _jsx(DttContext.Provider, { value: value, children: children });
 }

package/dist/providers/WizardConfigProvider.d.ts

@@ -0,0 +1,21 @@
+import { ReactNode } from "react";
+type NtupleWizardVariant = "standalone" | "embedded";
+interface WizardConfigContextType {
+    variant: NtupleWizardVariant;
+    basePath: string;
+    submitLocation?: string;
+    requestReasonMessage?: string;
+    requestSubmittedMessage?: ReactNode;
+    onRequestSubmitted?: () => void;
+}
+interface WizardConfigProviderProps {
+    basePath: string;
+    submitLocation?: string;
+    requestReasonMessage?: string;
+    requestSubmittedMessage?: ReactNode;
+    onRequestSubmitted?: () => void;
+    children: ReactNode;
+}
+export declare const WizardConfigProvider: ({ basePath, submitLocation, requestReasonMessage, requestSubmittedMessage, onRequestSubmitted, children, }: WizardConfigProviderProps) => import("react/jsx-runtime").JSX.Element;
+export declare const useWizardConfig: () => WizardConfigContextType;
+export {};