pollination-react-io 1.67.1 → 1.68.0

package/build/hooks/useCreateStudy.d.ts

@@ -11,6 +11,7 @@ interface JobArgs {
     recipe: RecipeInterface;
     description?: string;
     recipeFilter?: ProjectRecipeFilter;
+    authUserName?: string;
 }
 export interface ProjectJobInfo {
     accountName: string;
@@ -20,6 +21,7 @@ export interface ProjectJobInfo {
     jobName?: string;
     jobDescription?: string;
     platform?: string;
+    subfolder?: string;
 }
 export interface LocalConfig {
     localCPUCount: number;
@@ -31,6 +33,6 @@ export interface LocalConfig {
 export declare const useCreateStudy: (accountName: string, projectName: string, client: APIClient) => {
     host: string;
     createStudy: ({ name, recipe, description }: JobArgs, data: object, onSuccess?: (projectJobInfo: ProjectJobInfo) => void) => Promise<void>;
-    createLocalStudy: ({ name, description, recipe, recipeFilter }: JobArgs, data: object, { localCPUCount, localRunFolder, isLocalJob, cloudProjectName, cloudProjectOwner }: LocalConfig, onSuccess?: (projectJobInfo: ProjectJobInfo) => void, key?: string) => Promise<any>;
+    createLocalStudy: ({ name, description, recipe, recipeFilter, authUserName }: JobArgs, data: object, { localCPUCount, localRunFolder, isLocalJob, cloudProjectName, cloudProjectOwner }: LocalConfig, onSuccess?: (projectJobInfo: ProjectJobInfo) => void, key?: string) => Promise<any>;
 };
 export {};

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,15 +38089,17 @@ var usePollinationPanel = function () {
     /**
      * Fetch local job
      */
-    var fetchLocalJob = useCallback(function (path) {
-        var _a;
+    var fetchLocalJob = useCallback(function (path, subfolder) {
+        var _a, _b;
         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;
+            job['author'] = (_b = localJob === null || localJob === void 0 ? void 0 : localJob.LocalJob) === null || _b === void 0 ? void 0 : _b.JobAuthor;
             return job;
         }
         catch (error) {
@@ -38107,12 +38110,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 +38186,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;
         }
@@ -38381,11 +38386,11 @@ var useCreateStudy = function (accountName, projectName, client) {
         });
     }, [accountName, client, processEntryCloud, projectName]);
     var createLocalStudy = useCallback(function (_a, data, _b, onSuccess, key) {
-        var name = _a.name, description = _a.description, recipe = _a.recipe, recipeFilter = _a.recipeFilter;
+        var name = _a.name, description = _a.description, recipe = _a.recipe, recipeFilter = _a.recipeFilter, authUserName = _a.authUserName;
         var localCPUCount = _b.localCPUCount, localRunFolder = _b.localRunFolder, isLocalJob = _b.isLocalJob, cloudProjectName = _b.cloudProjectName, cloudProjectOwner = _b.cloudProjectOwner;
         if (key === void 0) { key = performance.now().toString(); }
         return __awaiter$1(void 0, void 0, void 0, function () {
-            var job, jobInfo, response;
+            var job, author, data_1, err_1, jobInfo, response;
             var _c;
             return __generator$1(this, function (_d) {
                 switch (_d.label) {
@@ -38410,10 +38415,24 @@ var useCreateStudy = function (accountName, projectName, client) {
                             }).catch(function (err) {
                                 console.error(err);
                             })
-                            // JobInfo mapping
+                            // Try getting account
                         ];
                     case 1:
                         job = _d.sent();
+                        author = undefined;
+                        _d.label = 2;
+                    case 2:
+                        _d.trys.push([2, 4, , 5]);
+                        return [4 /*yield*/, client.accounts.getAccount({ name: authUserName })];
+                    case 3:
+                        data_1 = (_d.sent()).data;
+                        author = data_1;
+                        return [3 /*break*/, 5];
+                    case 4:
+                        err_1 = _d.sent();
+                        console.log(err_1);
+                        return [3 /*break*/, 5];
+                    case 5:
                         jobInfo = {
                             RecipeOwner: (_c = recipeFilter.owner) !== null && _c !== void 0 ? _c : 'ladybug-tools',
                             Recipe: recipe,
@@ -38422,7 +38441,8 @@ var useCreateStudy = function (accountName, projectName, client) {
                             ProjectSlug: "".concat(cloudProjectOwner, "/").concat(cloudProjectName),
                             LocalCPUNumber: localCPUCount,
                             LocalRunFolder: localRunFolder,
-                            Platform: host
+                            Platform: host,
+                            JobAuthor: author,
                         };
                         console.log(jobInfo);
                         response = window.parent.chrome.webview.hostObjects.study.RunSimulation(JSON.stringify(jobInfo))
@@ -44938,9 +44958,15 @@ var RecipeForm = function (_a) {
             host !== 'web' &&
                 React__default.createElement(ConfigureLocalRun, { onChange: function (localConfig) { return setLocalConfig(localConfig); }, defaultVal: localConfig }),
             React__default.createElement(Ie, null),
-            React__default.createElement(Button, { type: 'submit', style: { width: '100%',
+            host === 'web' && React__default.createElement(Button, { type: 'submit', style: { width: '100%',
+                    margin: '10px 0 0 0',
+                    justifyContent: 'center' }, disabled: isValid !== true, form: recipe.metadata.name }, "Create Study"),
+            host !== 'web' && React__default.createElement(Button, { type: 'submit', style: { width: '100%',
                     margin: '10px 0 0 0',
-                    justifyContent: 'center' }, disabled: isValid !== true, form: recipe.metadata.name }, "Create Study")));
+                    justifyContent: 'center' }, disabled: isValid !== true ||
+                    localConfig.isLocalJob
+                    ? localConfig.localRunFolder == null
+                    : false, form: recipe.metadata.name }, "Create Study")));
 };
 
 var defaultStyle = {
@@ -45039,7 +45065,8 @@ var CreateStudy = function (_a) {
                 name: name,
                 recipe: selRecipe,
                 description: description !== null && description !== void 0 ? description : 'Study created from pollination',
-                recipeFilter: selRecipeFilter
+                recipeFilter: selRecipeFilter,
+                authUserName: authUser.username
             }, jobArgs, localConfig, localConfig.isLocalJob ? _onSuccessLocal : _onSuccessCloud);
         }
         else {
@@ -48998,9 +49025,9 @@ var formatDuration = function (duration) {
 };
 var RunCard = function (_a) {
     var _b;
-    var _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
-    var projectName = _a.projectName, projectOwner = _a.projectOwner, _run = _a.run, authUser = _a.authUser, client = _a.client, _o = _a.enableClick, enableClick = _o === void 0 ? true : _o, _p = _a.style, style = _p === void 0 ? {} : _p, _q = _a.getTab, getTab = _q === void 0 ? function (tab) { return undefined; } : _q, _r = _a.defaultTab, defaultTab = _r === void 0 ? RunTabs.details : _r, _s = _a.getValue, getValue = _s === void 0 ? function (run) { return undefined; } : _s, _t = _a.interval, interval = _t === void 0 ? 5000 : _t, _u = _a.canWrite, canWrite = _u === void 0 ? false : _u, _v = _a.localRun, localRun = _v === void 0 ? false : _v, _w = _a.loaderNode, loaderNode = _w === void 0 ? undefined : _w;
-    var _x = usePollinationPanel(), fetchLocalRun = _x.fetchLocalRun, fetchLocalJob = _x.fetchLocalJob, fileExplorer = _x.fileExplorer, deleteJob = _x.deleteJob;
+    var _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
+    var projectName = _a.projectName, projectOwner = _a.projectOwner, _run = _a.run, authUser = _a.authUser, client = _a.client, _s = _a.enableClick, enableClick = _s === void 0 ? true : _s, _t = _a.style, style = _t === void 0 ? {} : _t, _u = _a.getTab, getTab = _u === void 0 ? function (tab) { return undefined; } : _u, _v = _a.defaultTab, defaultTab = _v === void 0 ? RunTabs.details : _v, _w = _a.getValue, getValue = _w === void 0 ? function (run) { return undefined; } : _w, _x = _a.interval, interval = _x === void 0 ? 5000 : _x, _y = _a.canWrite, canWrite = _y === void 0 ? false : _y, _z = _a.localRun, localRun = _z === void 0 ? false : _z, _0 = _a.loaderNode, loaderNode = _0 === void 0 ? undefined : _0;
+    var _1 = usePollinationPanel(), fetchLocalRun = _1.fetchLocalRun, fetchLocalJob = _1.fetchLocalJob, fileExplorer = _1.fileExplorer, deleteJob = _1.deleteJob;
     var disabled = useMemo(function () {
         if (!localRun)
             return;
@@ -49010,23 +49037,23 @@ var RunCard = function (_a) {
      * Fetch run
      */
     var fetchJob = useJobs(client).fetchJob;
-    var _y = useRuns(client), fetchRun = _y.fetchRun, statusMap = _y.statusMap, getDuration = _y.getDuration, cancelRun = _y.cancelRun;
-    var _z = useWindowDimensions(), width = _z.width; _z.height;
-    var _0 = useState(false), seeDescription = _0[0], setSeeDescription = _0[1];
-    var _1 = useState(false), seeAction = _1[0], setSeeAction = _1[1];
-    var _2 = useState(false), stopRefresh = _2[0], setStopRefresh = _2[1];
-    var _3 = useState(false), isReady = _3[0], setIsReady = _3[1];
+    var _2 = useRuns(client), fetchRun = _2.fetchRun, statusMap = _2.statusMap, getDuration = _2.getDuration, cancelRun = _2.cancelRun;
+    var _3 = useWindowDimensions(), width = _3.width; _3.height;
+    var _4 = useState(false), seeDescription = _4[0], setSeeDescription = _4[1];
+    var _5 = useState(false), seeAction = _5[0], setSeeAction = _5[1];
+    var _6 = useState(false), stopRefresh = _6[0], setStopRefresh = _6[1];
+    var _7 = useState(false), isReady = _7[0], setIsReady = _7[1];
     /*
      * 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 _8 = 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);
@@ -49034,7 +49061,7 @@ var RunCard = function (_a) {
                 setStopRefresh(true);
             setIsReady(true);
         },
-    }), run = _4.data, error = _4.error;
+    }), run = _8.data, error = _8.error;
     var sendRun = useCallback(function (run) { return getValue(run); }, [run]);
     /**
      * Fetch job just one time
@@ -49058,9 +49085,9 @@ var RunCard = function (_a) {
             return undefined;
         return run.status.status;
     }, [run]);
-    var _5 = useState(), study = _5[0], setStudy = _5[1];
-    var _6 = useState(), localStudy = _6[0], setLocalStudy = _6[1];
-    var _7 = useState(getDuration(run)), duration = _7[0], setDuration = _7[1];
+    var _9 = useState(), study = _9[0], setStudy = _9[1];
+    var _10 = useState(), localStudy = _10[0], setLocalStudy = _10[1];
+    var _11 = useState(getDuration(run)), duration = _11[0], setDuration = _11[1];
     useEffect(function () {
         if (!run)
             return undefined;
@@ -49091,7 +49118,7 @@ var RunCard = function (_a) {
         info: false,
         settings: false,
     };
-    var _8 = useState(__assign(__assign({}, initialValues), (_b = {}, _b[defaultTab] = true, _b))), hover = _8[0], setHover = _8[1];
+    var _12 = useState(__assign(__assign({}, initialValues), (_b = {}, _b[defaultTab] = true, _b))), hover = _12[0], setHover = _12[1];
     var toggleHover = useCallback(function (id, value) {
         if (value === void 0) { value = false; }
         setHover(function (prevHover) {
@@ -49141,7 +49168,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 +49239,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 {
@@ -49261,15 +49290,22 @@ var RunCard = function (_a) {
         React__default.createElement("div", { className: 'item4', title: run && dayjs_min(run.status.started_at).format('[on] MMM DD YYYY [at] hh:mm') }, run ? dayjs_min(run.status.started_at).format('[on] MMM DD YYYY') : '--'),
         React__default.createElement("div", { className: 'item5' },
             React__default.createElement("span", { style: { marginRight: '0.75rem' } },
-                React__default.createElement(Avatar, { color: hover.author ? '#40a9ff' : undefined, src: run ? (_j = run.author) === null || _j === void 0 ? void 0 : _j.picture_url : '', size: 24 })),
+                !localRun && React__default.createElement(Avatar, { color: hover.author ? '#40a9ff' : undefined, src: run ? (_j = run.author) === null || _j === void 0 ? void 0 : _j.picture_url : '', size: 24 }),
+                localRun && run && localStudy && React__default.createElement(Avatar, { color: hover.author ? '#40a9ff' : undefined, src: (localStudy === null || localStudy === void 0 ? void 0 : localStudy.author) ? (_k = localStudy.author) === null || _k === void 0 ? void 0 : _k.picture_url : (_l = run.author) === null || _l === void 0 ? void 0 : _l.picture_url, size: 24 })),
             React__default.createElement("a", { className: 'link', onClick: function (e) {
+                    var _a;
                     e.stopPropagation();
+                    if (!run)
+                        return;
                     if (!localRun) {
-                        if (!run)
-                            return;
                         window.location.href = "/".concat(run.author.name);
                     }
-                }, title: 'Go to author page', target: '_blank', rel: 'noreferrer', onMouseOver: function (e) { return toggleHover('author', true); }, onMouseLeave: function (e) { return toggleHover('author', false); }, style: hover.author ? { color: '#40a9ff' } : {} }, run ? ((_l = (_k = run.author) === null || _k === void 0 ? void 0 : _k.display_name) !== null && _l !== void 0 ? _l : (_m = run.author) === null || _m === void 0 ? void 0 : _m.name) : '--')),
+                    else {
+                        window.location.href = "/".concat((_a = localStudy === null || localStudy === void 0 ? void 0 : localStudy.author) === null || _a === void 0 ? void 0 : _a.name);
+                    }
+                }, title: 'Go to author page', target: '_blank', rel: 'noreferrer', onMouseOver: function (e) { return toggleHover('author', true); }, onMouseLeave: function (e) { return toggleHover('author', false); }, style: hover.author ? { color: '#40a9ff' } : {} },
+                !localRun && run && ((_o = (_m = run.author) === null || _m === void 0 ? void 0 : _m.display_name) !== null && _o !== void 0 ? _o : (_p = run.author) === null || _p === void 0 ? void 0 : _p.name),
+                localRun && localStudy && ((_r = (_q = localStudy.author) === null || _q === void 0 ? void 0 : _q.display_name) !== null && _r !== void 0 ? _r : run.author.display_name))),
         React__default.createElement("div", { className: 'item6' },
             React__default.createElement("span", { style: { marginRight: '0.75rem' } },
                 React__default.createElement(Avatar, { color: hover.recipe ? '#40a9ff' : undefined, src: run ? run.recipe.metadata.icon : '', size: 24 })),
@@ -49319,9 +49355,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 {