pollination-react-io 1.67.1 → 1.67.2

package/build/hooks/useCreateStudy.d.ts

@@ -20,6 +20,7 @@ export interface ProjectJobInfo {
     jobName?: string;
     jobDescription?: string;
     platform?: string;
+    subfolder?: string;
 }
 export interface LocalConfig {
     localCPUCount: number;

package/build/hooks/usePollinationPanel.d.ts

@@ -6,12 +6,12 @@ export declare const usePollinationPanel: () => {
     saveFileBase64: (key: string, file: File | Blob, subFolder: string, fileName: string) => Promise<PanelMessageOut>;
     fromFileToBase64: (filePath: string) => PanelMessageOut;
     getFilesFromDir: (root: any) => PanelMessageOut;
-    fetchLocalRun: (path?: any) => Run;
-    fetchLocalJob: (path?: any) => Job;
-    fetchLocalLog: (path?: any) => any;
+    fetchLocalRun: (path?: any, subfolder?: any) => Run;
+    fetchLocalJob: (path?: any, subfolder?: any) => Job;
+    fetchLocalLog: (path?: any, subfolder?: any) => any;
     fileExplorer: (root: string) => PanelMessageOut;
     getPaginatedJob: (projectSlug: string, pageSize: number, curPage: number) => ProjectJobInfo[];
     getJob: (projectSlug: string) => ProjectJobInfo[];
-    deleteJob: (projectSlug: string, path: string) => any;
+    deleteJob: (projectSlug: string, path: string, subfolder: string) => any;
     getPlatforms: (projectSlug: string) => {};
 };

package/build/index.esm.js

@@ -38072,12 +38072,13 @@ var usePollinationPanel = function () {
     /**
      * Fetch local run
      */
-    var fetchLocalRun = useCallback(function (path) {
+    var fetchLocalRun = 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;
         }
@@ -38088,13 +38089,14 @@ var usePollinationPanel = function () {
     /**
      * Fetch local job
      */
-    var fetchLocalJob = useCallback(function (path) {
+    var fetchLocalJob = 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;
@@ -38107,12 +38109,13 @@ var usePollinationPanel = function () {
     /**
      * Fetch local log
      */
-    var fetchLocalLog = useCallback(function (path) {
+    var fetchLocalLog = 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) {
@@ -38182,13 +38185,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;
         }
@@ -49019,14 +49023,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);
@@ -49141,7 +49145,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.createElement("div", { className: 'item1' },
@@ -49212,7 +49216,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 {
@@ -49319,9 +49325,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 {