lhcb-ntuple-wizard-test 2.0.6 → 2.1.0

package/dist/providers/WizardConfigProvider.js

@@ -0,0 +1,21 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { createContext, useContext } from "react";
+const WizardConfigContext = createContext(null);
+export const WizardConfigProvider = ({ basePath, submitLocation, requestReasonMessage, requestSubmittedMessage, onRequestSubmitted, children, }) => {
+    const variant = submitLocation ? "embedded" : "standalone";
+    return (_jsx(WizardConfigContext.Provider, { value: {
+            variant,
+            basePath,
+            submitLocation,
+            requestReasonMessage,
+            requestSubmittedMessage,
+            onRequestSubmitted,
+        }, children: children }));
+};
+export const useWizardConfig = () => {
+    const ctx = useContext(WizardConfigContext);
+    if (!ctx) {
+        throw new Error("useWizardConfig must be used within a WizardConfigProvider");
+    }
+    return ctx;
+};

package/dist/utils/utils.js

@@ -23,18 +23,41 @@ const parseInput = (decay, input) => {
         versions: decay.lines[`${stream}/${line}`],
     };
 };
+const getDttName = (value) => {
+    const basename = value.split("/").pop() ?? value;
+    return basename.replace(/\.py$/i, "");
+};
+const getConfigOrderFromInfoYaml = (infoYaml) => {
+    const order = new Map();
+    if (!infoYaml) {
+        return order;
+    }
+    for (const [key, jobConfig] of Object.entries(infoYaml)) {
+        if (key === "defaults") {
+            continue;
+        }
+        const job = jobConfig;
+        for (const option of job.options) {
+            const dttName = getDttName(option);
+            if (!order.has(dttName)) {
+                order.set(dttName, order.size);
+            }
+        }
+    }
+    return order;
+};
 const addBkPathsToRows = (infoYaml, rows) => {
     for (const row of rows) {
         if (!row.dtt?.config.name) {
             continue;
         }
-        const dttName = row.dtt.config.name.split("/")[1];
+        const dttName = getDttName(row.dtt.config.name);
         for (const [key, jobConfig] of Object.entries(infoYaml)) {
             if (key === "defaults") {
                 continue;
             }
             const job = jobConfig;
-            if (job.options.some((option) => option.split(".")[0] === dttName)) {
+            if (job.options.some((option) => getDttName(option) === dttName)) {
                 row.paths.push(job.input.bk_query);
             }
         }
@@ -516,7 +539,17 @@ export async function parseProductionFiles(files, metadata) {
 export function processProductionFiles(metadata, configs, infoYaml) {
     const rows = [];
     const emailsToInform = [];
-    for (const config of configs) {
+    const configOrder = getConfigOrderFromInfoYaml(infoYaml);
+    const orderedConfigs = [...configs].sort((a, b) => {
+        const aName = getDttName(a.name ?? "");
+        const bName = getDttName(b.name ?? "");
+        const aOrder = configOrder.get(aName) ?? Number.MAX_SAFE_INTEGER;
+        const bOrder = configOrder.get(bName) ?? Number.MAX_SAFE_INTEGER;
+        if (aOrder !== bOrder)
+            return aOrder - bOrder;
+        return aName.localeCompare(bName);
+    });
+    for (const config of orderedConfigs) {
         const decay = Object.values(metadata.decays).find((d) => d.descriptors.template === config.descriptorTemplate);
         if (!decay) {
             return `[${config.name}] Unknown decay '${config.descriptorTemplate}'`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lhcb-ntuple-wizard-test",
-  "version": "2.0.6",
+  "version": "2.1.0",
   "description": "An application to access large-scale open data from LHCb",
   "url": "https://gitlab.cern.ch/lhcb-dpa/wp6-analysis-preservation-and-open-data/lhcb-ntuple-wizard-frontend/issues",
   "private": false,
@@ -19,6 +19,8 @@
     "@mathjax/src": "4.1.0",
     "better-react-mathjax": "2.3.0",
     "bootstrap": "5.3.8",
+    "cytoscape": "3.33.1",
+    "cytoscape-dagre": "^2.5.0",
     "dompurify": "^3.3.1",
     "email-validator": "2.0.4",
     "js-yaml": "4.1.1",
@@ -29,9 +31,10 @@
     "pako": "2.1.0",
     "react-bootstrap": "2.10.10",
     "react-bootstrap-icons": "1.11.6",
-    "react-graph-vis": "1.0.7",
+    "react-cytoscapejs": "^2.0.0",
     "react-infinite-scroll-component": "^6.1.1",
     "react-select": "5.10.2",
+    "react-toastify": "^11.0.5",
     "typia": "^11.0.3"
   },
   "peerDependencies": {
@@ -69,19 +72,21 @@
     "@babel/preset-react": "7.27.1",
     "@eslint/js": "^9.17.0",
     "@kennethwkz/unplugin-typia": "^2.6.7",
+    "@types/cytoscape-dagre": "^2.3.4",
     "@types/jest": "^30.0.0",
     "@types/js-yaml": "^4.0.9",
     "@types/lodash": "^4.17.21",
     "@types/lodash.memoize": "^4.1.9",
     "@types/pako": "^2.0.4",
     "@types/react": "^19.2.7",
+    "@types/react-cytoscapejs": "^1.2.6",
     "@types/react-dom": "^19.2.3",
     "@types/react-router-dom": "^5.3.3",
     "@types/vis": "^4.21.27",
-    "@typescript-eslint/eslint-plugin": "^8.51.0",
-    "@typescript-eslint/parser": "^8.51.0",
+    "@typescript-eslint/eslint-plugin": "^8.56.0",
+    "@typescript-eslint/parser": "^8.56.0",
     "@vitejs/plugin-react": "5.1.2",
-    "eslint": "^9.17.0",
+    "eslint": "^9.39.3",
     "eslint-plugin-react": "^7.37.5",
     "globals": "^16.0.0",
     "react": "^19.2.3",

package/dist/components/DttNameInput.d.ts

@@ -1,9 +0,0 @@
-import { RowData } from "../models/rowData";
-interface Props {
-    row: RowData;
-    hideDownloadButtons: boolean;
-    hideUploadButtons: boolean;
-    basePath: string;
-}
-export declare function DttNameInput({ row, hideDownloadButtons, hideUploadButtons, basePath }: Props): import("react/jsx-runtime").JSX.Element | null;
-export {};