pollination-react-io 1.67.0 → 1.67.2

package/build/index.js

@@ -38098,12 +38098,13 @@ var usePollinationPanel = function () {
     /**
      * Fetch local run
      */
-    var fetchLocalRun = React.useCallback(function (path) {
+    var fetchLocalRun = React.useCallback(function (path, subfolder) {
         if (path === void 0) { path = ''; }
+        if (subfolder === void 0) { subfolder = undefined; }
         if (!panel)
             return;
         try {
-            var message = panel.FetchSimulationFile(path, SimulationFileType[SimulationFileType.status]);
+            var message = panel.FetchSimulationFile(path, subfolder, SimulationFileType[SimulationFileType.status]);
             var run = JSON.parse(message.data);
             return run;
         }
@@ -38114,13 +38115,14 @@ var usePollinationPanel = function () {
     /**
      * Fetch local job
      */
-    var fetchLocalJob = React.useCallback(function (path) {
+    var fetchLocalJob = React.useCallback(function (path, subfolder) {
         var _a;
         if (path === void 0) { path = ''; }
+        if (subfolder === void 0) { subfolder = undefined; }
         if (!panel)
             return;
         try {
-            var message = panel.FetchSimulationFile(path, SimulationFileType[SimulationFileType.job]);
+            var message = panel.FetchSimulationFile(path, subfolder, SimulationFileType[SimulationFileType.job]);
             var localJob = JSON.parse(message.data);
             var job = (_a = localJob === null || localJob === void 0 ? void 0 : localJob.LocalJob) === null || _a === void 0 ? void 0 : _a.Job;
             return job;
@@ -38133,12 +38135,13 @@ var usePollinationPanel = function () {
     /**
      * Fetch local log
      */
-    var fetchLocalLog = React.useCallback(function (path) {
+    var fetchLocalLog = React.useCallback(function (path, subfolder) {
         if (path === void 0) { path = ''; }
+        if (subfolder === void 0) { subfolder = undefined; }
         if (!panel)
             return;
         try {
-            var message = panel.FetchSimulationFile(path, SimulationFileType[SimulationFileType.logs]);
+            var message = panel.FetchSimulationFile(path, subfolder, SimulationFileType[SimulationFileType.logs]);
             return message.data;
         }
         catch (error) {
@@ -38208,13 +38211,14 @@ var usePollinationPanel = function () {
      * Delete job with the same input/ouput folder from DB
      * @param projectSlug Project slug
      * @param path Location where files are
+     * @param subfolder Subfolder
      * @returns Message with number of deleted records
      */
-    var deleteJob = function (projectSlug, path) {
+    var deleteJob = function (projectSlug, path, subfolder) {
         if (!panel)
             return;
         try {
-            var message = panel.DeleteJob(projectSlug, path);
+            var message = panel.DeleteJob(projectSlug, path, subfolder);
             var count = JSON.parse(message.data);
             return count;
         }
@@ -44890,9 +44894,9 @@ var RecipeForm = function (_a) {
     React.useEffect(function () {
         if (!localStudyWarning)
             return;
-        n$1("Study with the same name and Local run folder detected. \n      If the study will be submitted it will override the previous data. \n      You can change the study name or Local run folder to avoid the loss of data.", {
+        n$1("A local run with the same name exists. \n      Try to change the study name or local run folder to avoid the overwrite.", {
             duration: 8000,
-            position: 'top-center',
+            position: 'bottom-left',
             icon: '⚠️',
             style: { fontSize: '14px' },
             iconTheme: {
@@ -49045,14 +49049,14 @@ var RunCard = function (_a) {
     /*
      * From run and stop when it is done
      */
-    var _4 = useSWR(authUser && _run ? (!localRun ? [projectOwner, projectName, _run.id] : [_run.id]) : undefined, localRun ? fetchLocalRun : fetchRun, {
+    var _4 = useSWR(authUser && _run ? (!localRun ? [projectOwner, projectName, _run.id] : [_run.id, _run['subfolder']]) : undefined, localRun ? fetchLocalRun : fetchRun, {
         revalidateOnFocus: false,
         refreshInterval: stopRefresh ? undefined : interval,
         fallbackData: localRun ? undefined : _run,
         errorRetryCount: 3,
         onSuccess: function (run, key, config) {
             if (localRun) {
-                var jobInfo = fetchLocalJob(_run.id);
+                var jobInfo = fetchLocalJob(_run.id, _run['subfolder']);
                 setLocalStudy(jobInfo);
             } // It is written at the end of the simulation
             sendRun(run);
@@ -49167,7 +49171,7 @@ var RunCard = function (_a) {
                 window.location.href = "/".concat(projectOwner, "/projects/").concat(projectName, "/studies/").concat(study.id, "/runs/").concat(run.id);
             }
             else {
-                window.location.href = "/".concat(projectOwner, "/projects/").concat(projectName, "/localStudies/").concat(localStudyURLname, "/?path=").concat(_run.id);
+                window.location.href = "/".concat(projectOwner, "/projects/").concat(projectName, "/localStudies/").concat(localStudyURLname, "/?path=").concat(_run.id, "&subfolder=").concat(_run['subfolder']);
             }
         } },
         React__default["default"].createElement("div", { className: 'item1' },
@@ -49238,7 +49242,9 @@ var RunCard = function (_a) {
                                     getTab(RunTabs.debug);
                                     if (localRun) {
                                         // Get study name
-                                        var path = "".concat(_run.id, "/").concat(localStudyURLname, "/__logs__/logs.log");
+                                        var path = !_run['subfolder']
+                                            ? "".concat(_run.id, "/").concat(localStudyURLname, "/__logs__/logs.log")
+                                            : "".concat(_run.id, "/").concat(_run['subfolder'], "/").concat(localStudyURLname, "/__logs__/logs.log");
                                         fileExplorer(path);
                                     }
                                     else {
@@ -49345,9 +49351,9 @@ var RunCard = function (_a) {
                         e.stopPropagation();
                         if (!run)
                             return;
-                        var count = deleteJob("".concat(projectOwner, "/").concat(projectName), _run.id);
+                        var count = deleteJob("".concat(projectOwner, "/").concat(projectName), _run.id, _run['subfolder']);
                         if (count > 0) {
-                            if (window.location.href.includes("?path=".concat(_run.id))) {
+                            if (window.location.href.includes("?path=")) {
                                 window.history.back();
                             }
                             else {