lhcb-ntuple-wizard 2.0.2 → 2.0.3

package/dist/components/DttNameInput.d.ts

@@ -3,7 +3,7 @@ interface Props {
     row: RowData;
     hideDownloadButtons: boolean;
     hideUploadButtons: boolean;
-    variablesPath: string;
+    basePath: string;
 }
-export declare function DttNameInput({ row, hideDownloadButtons, hideUploadButtons, variablesPath }: Props): import("react/jsx-runtime").JSX.Element | null;
+export declare function DttNameInput({ row, hideDownloadButtons, hideUploadButtons, basePath }: Props): import("react/jsx-runtime").JSX.Element | null;
 export {};

package/dist/components/DttNameInput.js

@@ -11,7 +11,8 @@ import { useMetadata } from "../providers/MetadataProvider";
 import { downloadText } from "../utils/utils";
 import { YamlFile } from "../models/yamlFile";
 import { UploadDttConfigModal } from "./modals/UploadDttConfigModal";
-export function DttNameInput({ row, hideDownloadButtons, hideUploadButtons, variablesPath }) {
+import { VARIABLES_PATH } from "../constants";
+export function DttNameInput({ row, hideDownloadButtons, hideUploadButtons, basePath }) {
     const { rows, updateRow } = useRows();
     const navigate = useNavigate();
     const metadata = useMetadata();
@@ -46,7 +47,7 @@ export function DttNameInput({ row, hideDownloadButtons, hideUploadButtons, vari
     };
     const handleConfigureDtt = () => {
         updateRow(row.id, (r) => ({ ...r, editTree: true }));
-        void navigate(variablesPath);
+        void navigate(`${basePath}${VARIABLES_PATH}`);
     };
     const handleDeleteDtt = () => {
         updateRow(row.id, (r) => ({ ...r, dtt: null }));

package/dist/components/RequestRow.d.ts

@@ -1,7 +1,7 @@
 interface Props {
     hideDownloadButtons: boolean;
     hideUploadButtons: boolean;
-    variablesPath: string;
+    basePath: string;
 }
-export declare function RequestRow({ hideDownloadButtons, hideUploadButtons, variablesPath }: Props): import("react/jsx-runtime").JSX.Element | null;
+export declare function RequestRow({ hideDownloadButtons, hideUploadButtons, basePath }: Props): import("react/jsx-runtime").JSX.Element | null;
 export {};

package/dist/components/RequestRow.js

@@ -9,12 +9,12 @@ import { useRows } from "../providers/RowsProvider";
 import { BookkeepingPathDropdown } from "./BookkeepingPathDropdown";
 import { StrippingLineDropdown } from "./StrippingLineDropdown";
 import { useRow } from "../providers/RowProvider";
-export function RequestRow({ hideDownloadButtons, hideUploadButtons, variablesPath }) {
+export function RequestRow({ hideDownloadButtons, hideUploadButtons, basePath }) {
     const metadata = useMetadata();
     const { row } = useRow();
     const { removeRow } = useRows();
     if (!metadata) {
         return null;
     }
-    return (_jsxs(Row, { className: "align-items-center", children: [_jsx(Col, { lg: true, children: _jsx(DttNameInput, { row: row, hideDownloadButtons: hideDownloadButtons, hideUploadButtons: hideUploadButtons, variablesPath: variablesPath }) }), _jsx(Col, { lg: true, children: _jsx(StrippingLineDropdown, {}) }), _jsx(Col, { xs: "auto", children: _jsx(OverlayTrigger, { trigger: "click", placement: "right", rootClose: true, overlay: _jsx(Popover, { children: _jsx(Popover.Body, { children: row.lines.map((line) => (_jsx(StrippingLineInfo, { line: line.line, stream: line.stream, versions: line.versions, showLink: true }, line.line))) }) }), children: _jsx(Button, { disabled: row.lines.length === 0, children: _jsx(InfoCircle, {}) }) }) }), _jsx(Col, { children: _jsx(BookkeepingPathDropdown, {}) }), _jsx(Col, { xs: "auto", children: _jsx(DeleteButton, { action: () => removeRow(row.id) }) })] }));
+    return (_jsxs(Row, { className: "align-items-center", children: [_jsx(Col, { lg: true, children: _jsx(DttNameInput, { row: row, hideDownloadButtons: hideDownloadButtons, hideUploadButtons: hideUploadButtons, basePath: basePath }) }), _jsx(Col, { lg: true, children: _jsx(StrippingLineDropdown, {}) }), _jsx(Col, { xs: "auto", children: _jsx(OverlayTrigger, { trigger: "click", placement: "right", rootClose: true, overlay: _jsx(Popover, { children: _jsx(Popover.Body, { children: row.lines.map((line) => (_jsx(StrippingLineInfo, { line: line.line, stream: line.stream, versions: line.versions, showLink: true }, line.line))) }) }), children: _jsx(Button, { disabled: row.lines.length === 0, children: _jsx(InfoCircle, {}) }) }) }), _jsx(Col, { children: _jsx(BookkeepingPathDropdown, {}) }), _jsx(Col, { xs: "auto", children: _jsx(DeleteButton, { action: () => removeRow(row.id) }) })] }));
 }

package/dist/components/modals/UploadDttConfigModal.js

@@ -16,25 +16,14 @@ export function UploadDttConfigModal({ onClose, currentRow }) {
             return;
         }
         setLoading(true);
-        const { rows, emails, errors, warnings } = await parseProductionFiles(Array.from(files), metadata);
+        const result = await parseProductionFiles(Array.from(files), metadata);
         setLoading(false);
-        if (Object.keys(errors).length > 0) {
-            const errorMessages = Object.entries(errors)
-                .map(([file, error]) => `${file}: ${error}`)
-                .join("\n");
-            alert(`Some errors were found while importing the configuration files:\n\n${errorMessages}`);
+        if (typeof result === "string") {
+            alert(result);
             return;
         }
-        else if (Object.keys(warnings).length > 0) {
-            const warningMessages = Object.entries(warnings)
-                .map(([file, warning]) => `${file}: ${warning}`)
-                .join("\n");
-            if (!confirm(`Some warnings were found while importing the configuration files:\n\n${warningMessages}\n\nContinue?`)) {
-                return;
-            }
-        }
         if (currentRow) {
-            const importedRow = rows[0];
+            const importedRow = result.rows[0];
             const importedConfig = importedRow.dtt.config;
             if (importedConfig.descriptorTemplate === currentRow.decay.descriptors.template) {
                 updateRow(currentRow.id, (r) => ({
@@ -48,8 +37,8 @@ export function UploadDttConfigModal({ onClose, currentRow }) {
             }
         }
         else {
-            setRows(rows);
-            setContactEmails(emails);
+            setRows(result.rows);
+            setContactEmails(result.emails);
             onClose();
         }
     }

package/dist/models/yamlFile.d.ts

@@ -1,6 +1,19 @@
 import Dtt from "./dtt";
 import { RowData } from "./rowData";
 import { MetadataContext } from "../providers/MetadataProvider";
+import { JobConfig } from "./jobConfig";
+interface InfoYamlDefaults {
+    application: string;
+    wg: string;
+    inform: string[];
+    automatically_configure: boolean;
+    output: string;
+}
+export type InfoYaml = {
+    defaults: InfoYamlDefaults;
+} & {
+    [K in string as K extends "defaults" ? never : K]?: JobConfig;
+};
 export declare class YamlFile {
     name: string;
     content: string;
@@ -8,3 +21,4 @@ export declare class YamlFile {
     static fromDtt(dtt: Dtt): YamlFile;
     static createInfoYaml(rows: RowData[], metadata: MetadataContext): YamlFile;
 }
+export {};

package/dist/models/yamlFile.js

@@ -14,15 +14,7 @@ export class YamlFile {
         const uniquePathSet = new Set(rows.flatMap((row) => row.paths));
         const uniquePaths = [...uniquePathSet].sort();
         const pathIndex = new Map(uniquePaths.map((p, i) => [p, i]));
-        const info = {
-            defaults: {
-                application: `DaVinci/${metadata.tupleTools.applicationInfo.DaVinci}`,
-                wg: "OpenData",
-                inform: [],
-                automatically_configure: true,
-                output: "DVNtuple.root",
-            },
-        };
+        const jobs = {};
         for (const row of rows) {
             if (!row.dtt)
                 continue;
@@ -32,8 +24,8 @@ export class YamlFile {
                     continue;
                 const key = `job${jobID}`;
                 const dttFile = row.dtt.getName();
-                if (key in info) {
-                    info[key].options.push(dttFile);
+                if (jobs[key]) {
+                    jobs[key].options.push(dttFile);
                 }
                 else {
                     const job = {
@@ -42,14 +34,23 @@ export class YamlFile {
                     };
                     if (path.includes("MDST")) {
                         const stream = row.lines[0]?.stream;
-                        if (stream) {
+                        if (stream)
                             job.root_in_tes = `/Event/${stream}`;
-                        }
                     }
-                    info[key] = job;
+                    jobs[key] = job;
                 }
             }
         }
+        const info = {
+            defaults: {
+                application: `DaVinci/${metadata.tupleTools.applicationInfo.DaVinci}`,
+                wg: "OpenData",
+                inform: [],
+                automatically_configure: true,
+                output: "DVNtuple.root",
+            },
+            ...jobs,
+        };
         return new YamlFile("info.yaml", yaml.dump(info));
     }
 }

package/dist/pages/RequestPage.d.ts

@@ -1,3 +1,13 @@
+/*****************************************************************************\
+ * (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 {

package/dist/pages/RequestPage.js

@@ -9,12 +9,11 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
  * granted to it by virtue of its status as an Intergovernmental Organization  *
  * or submit itself to any jurisdiction.                                       *
  \*****************************************************************************/
-import yaml from "js-yaml";
 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, parseProductionFiles } from "../utils/utils";
+import { downloadZip, processProductionFiles } from "../utils/utils";
 import { DeleteButton } from "../components/DeleteButton";
 import { useMetadata } from "../providers/MetadataProvider";
 import { ConfigFilesUploadingAlert } from "../components/ConfigFilesUploadingAlert";
@@ -23,7 +22,6 @@ import { useRequest } from "../providers/RequestProvider";
 import { LoadingIndicator } from "../components/LoadingIndicator";
 import { RequestRow } from "../components/RequestRow";
 import { UploadDttConfigModal } from "../components/modals/UploadDttConfigModal";
-import { VARIABLES_PATH } from "../constants";
 import { ReasonForRequestModal } from "../components/modals/ReasonForRequestModal";
 import { RowProvider } from "../providers/RowProvider";
 import { ProductionNameInput } from "../components/ProductionNameInput";
@@ -33,7 +31,7 @@ export function RequestPage({ basePath, submitLocation, requestReasonMessage, re
     const location = useLocation();
     const metadata = useMetadata();
     const { rows, setRows, generateAllFiles } = useRows();
-    const { emailIsKnown, productionName, validation, showErrors, clearAll, trySubmit } = useRequest();
+    const { emailIsKnown, productionName, setProductionName, validation, showErrors, clearAll, trySubmit } = useRequest();
     const [showProdUploadModal, setShowProdUploadModal] = useState(false);
     const [prodUploadLoading, setProdUploadLoading] = useState(false);
     const [requestSubmitted, setRequestSubmitted] = useState(false);
@@ -45,34 +43,32 @@ export function RequestPage({ basePath, submitLocation, requestReasonMessage, re
         }
         const urlParams = new URLSearchParams(location.search);
         if (urlParams.get("clone") === "1") {
-            handleClone().catch(console.error);
-        }
-    }, [metadata, location.search]);
-    async function handleClone() {
-        if (!metadata) {
-            return;
-        }
-        const raw = localStorage.getItem("yamlFilesToClone");
-        if (!raw) {
-            return;
-        }
-        setProdUploadLoading(true);
-        setRows([]);
-        try {
-            const yamlFiles = JSON.parse(raw);
-            for (const file of yamlFiles) {
-                if (file.defaults)
-                    file.name = "info.yaml";
-                file.blob = new Blob([yaml.dump(file)]);
+            const infoYamlString = localStorage.getItem("infoYamlToClone");
+            const dttConfigsString = localStorage.getItem("dttConfigsToClone");
+            if (!dttConfigsString) {
+                return;
+            }
+            setProdUploadLoading(true);
+            setRows([]);
+            try {
+                const infoYaml = infoYamlString ? JSON.parse(infoYamlString) : null;
+                const dttConfigs = JSON.parse(dttConfigsString);
+                const result = processProductionFiles(metadata, dttConfigs, infoYaml);
+                if (typeof result === "string") {
+                    // Show the error message
+                    alert(result);
+                    return;
+                }
+                setRows(result.rows);
+                setProductionName("");
+            }
+            finally {
+                setProdUploadLoading(false);
+                localStorage.removeItem("infoYamlToClone");
+                localStorage.removeItem("dttConfigsToClone");
             }
-            const { rows } = await parseProductionFiles(yamlFiles, metadata);
-            setRows(rows);
-        }
-        finally {
-            setProdUploadLoading(false);
-            localStorage.removeItem("yamlFilesToClone");
         }
-    }
+    }, [metadata, location.search]);
     const handlePrimaryAction = async () => {
         if (trySubmit()) {
             if (variant === "standalone") {
@@ -95,7 +91,7 @@ export function RequestPage({ basePath, submitLocation, requestReasonMessage, re
                     if (submitted) {
                         setRequestSubmitted(true);
                     }
-                } })), 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", variablesPath: VARIABLES_PATH }, 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-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 &&
                         (rows.length === 0 ||
                             !validation.allRowsHaveDtt ||
                             !validation.allRowsHaveStrippingLine ||

package/dist/utils/utils.d.ts

@@ -1,19 +1,15 @@
-import { YamlFile } from "../models/yamlFile";
-import { BlobFile } from "../models/blobFile";
+import { InfoYaml, YamlFile } from "../models/yamlFile";
+import { SavedDttConfig } from "../models/dtt";
 import { RowData } from "../models/rowData";
 import { MetadataContext } from "../providers/MetadataProvider";
-/**
- * Parses a set of production configuration files to DttConfigs and returns the corresponding rows and emails.
- * @param files The files to parse
- * @param metadata The metadata to use for parsing
- * @returns The parsed rows and emails
- */
-export declare const parseProductionFiles: (files: (BlobFile | File)[], metadata: MetadataContext) => Promise<{
+export declare function parseProductionFiles(files: File[], metadata: MetadataContext): Promise<string | {
     rows: RowData[];
     emails: string[];
-    errors: Record<string, string>;
-    warnings: Record<string, string>;
 }>;
+export declare function processProductionFiles(metadata: MetadataContext, configs: SavedDttConfig[], infoYaml: InfoYaml | null): string | {
+    rows: RowData[];
+    emails: string[];
+};
 /**
  * Sanitizes a user-provided filename to prevent path traversal (Zip Slip)
  * and unsafe filesystem characters.