pollination-react-io 1.16.3 → 1.16.5

package/build/StudyCard/StudyCard.types.d.ts

@@ -5,7 +5,8 @@ export interface StudyCardProps {
     projectOwner: string;
     projectName: string;
     study: CloudJob;
+    runList?: boolean;
     style?: CSSProperties;
     authUser?: UserPrivate;
-    client: APIClient;
+    client?: APIClient;
 }

package/build/hooks/useJobs.d.ts

@@ -1,8 +1,8 @@
-import type { CloudJob } from '@pollination-solutions/pollination-sdk';
+import type { CloudJob, CloudJobList, JobStatusEnum } from '@pollination-solutions/pollination-sdk';
 import { APIClient } from './useAPIClient';
 export declare const useJobs: (client: APIClient) => {
-    listJobs: (projectOwner: string, projectName: string) => Promise<any>;
-    fetchJob: (owner: string, name: string, jobId: string) => Promise<CloudJob>;
+    listJobs: (projectOwner: string, projectName: string, jobIds?: string[], page?: number, perPage?: number, status?: JobStatusEnum) => Promise<CloudJobList>;
+    fetchJob: (projectOwner: string, projectName: string, jobId: string) => Promise<CloudJob>;
     deleteJob: (projectOwner: string, projectName: string, jobId: string) => Promise<any>;
     cancelJob: (projectOwner: string, projectName: string, jobId: string) => Promise<any>;
 };

package/build/index.esm.js

@@ -24020,26 +24020,30 @@ var useHbjsontoVTK = function () {
 };
 
 var useJobs = function (client) {
-    var listJobs = useCallback(function (projectOwner, projectName) {
+    var listJobs = useCallback(function (projectOwner, projectName, jobIds, page, perPage, status) {
         if (!client || !client.jobs)
             return;
         return client.jobs
             .listJobs({
             owner: projectOwner,
-            name: projectName
+            name: projectName,
+            ids: jobIds,
+            status: status,
+            page: page !== null && page !== void 0 ? page : 1,
+            perPage: perPage !== null && perPage !== void 0 ? perPage : 10,
         })
             .then(function (_a) {
             var data = _a.data;
             return data;
         });
     }, [client]);
-    var fetchJob = useCallback(function (owner, name, jobId) {
+    var fetchJob = useCallback(function (projectOwner, projectName, jobId) {
         if (!client || !client.jobs)
             return;
         return client.jobs
             .getJob({
-            owner: owner,
-            name: name,
+            owner: projectOwner,
+            name: projectName,
             jobId: jobId
         })
             .then(function (_a) {
@@ -24234,7 +24238,7 @@ var getSummaryColor = function (status) {
 };
 var getDuration = function (run) {
     if (!run)
-        return dayjs_min.duration({ seconds: 1 });
+        return dayjs_min.duration({ seconds: 0 });
     var status = run.status;
     var end = status.finished_at ? dayjs_min(status.finished_at) : dayjs_min().utc();
     return status.finished_at ?
@@ -42084,7 +42088,8 @@ var RunCard = function (_a) {
                             display: 'flex',
                             justifyContent: 'end',
                         } },
-                        "   ", "Run ".concat(run.status.status, "."))),
+                        "   ",
+                        run.status.status)),
                 React__default.createElement(Tag, { style: {
                         color: statusMap[run.status.status].color,
                         borderColor: statusMap[run.status.status].color,
@@ -42122,7 +42127,8 @@ var RunCard = function (_a) {
                         display: 'inline-block'
                     } }, run.id),
                 React__default.createElement("div", { style: {
-                        display: 'flex'
+                        display: 'flex',
+                        alignItems: 'center'
                     } },
                     React__default.createElement(Dropdown, { trigger: React__default.createElement("button", { type: 'button', style: {
                                 width: 32,
@@ -42139,7 +42145,7 @@ var RunCard = function (_a) {
                             {
                                 options: [{
                                         type: 'button',
-                                        id: 'cancel-study',
+                                        id: 'cancel-run',
                                         label: 'Cancel',
                                         icon: React__default.createElement(XOctagon$1, null),
                                         disabled: typeof run.status.finished_at === 'string',
@@ -42153,12 +42159,11 @@ var RunCard = function (_a) {
             React__default.createElement("div", { style: {
                     display: 'flex',
                     flexDirection: 'column',
-                    gap: 4
+                    gap: 8
                 } },
                 React__default.createElement("div", { style: {
                         display: 'flex',
                         flexDirection: 'column',
-                        gap: 8
                     } },
                     React__default.createElement("span", { style: {
                             fontWeight: 600,
@@ -42178,7 +42183,6 @@ var RunCard = function (_a) {
                 React__default.createElement("div", { style: {
                         display: 'flex',
                         flexDirection: 'column',
-                        gap: 6
                     } },
                     React__default.createElement("span", { style: {
                             fontWeight: 600,
@@ -42197,7 +42201,6 @@ var RunCard = function (_a) {
                 React__default.createElement("div", { style: {
                         display: 'flex',
                         flexDirection: 'column',
-                        gap: 6,
                     } },
                     React__default.createElement("span", { style: {
                             fontWeight: 600,
@@ -42269,16 +42272,15 @@ var RunsList = function (_a) {
                             cancelRun(projectOwner, projectName, item.id);
                         } },
                         React__default.createElement(XOctagon$1, null)),
+                React__default.createElement(Link45deg$1, { size: 16, color: statusMap[item.status.status].color }),
                 React__default.createElement("a", { href: "/".concat(projectOwner, "/projects/").concat(projectName, "/studies/").concat(jobId, "/runs/").concat(item.id), style: {
                         color: statusMap[item.status.status].color
-                    } },
-                    React__default.createElement(Link45deg$1, { size: 16, color: statusMap[item.status.status].color }),
-                    item.status.status),
+                    } }, item.status.status),
                 React__default.createElement(Tag, { style: {
                         color: statusMap[item.status.status].color,
                         borderColor: statusMap[item.status.status].color,
                         backgroundColor: 'white'
-                    } }, "".concat(((item.meta.progress.completed / item.meta.progress.total) * 100).toFixed(2), "% Complete"))),
+                    } }, "".concat(item.meta.progress.completed, " of ").concat(item.meta.progress.total, " steps complete."))),
             React__default.createElement("div", { style: {
                     display: 'grid',
                     gridTemplateColumns: '1fr 1fr',
@@ -42313,14 +42315,21 @@ var RunsList = function (_a) {
                         width: '100%',
                         display: 'flex',
                         justifyContent: 'center'
-                    } }, !runs ? React__default.createElement(ThreeDots$1, null) :
+                    } }, !runs ?
                     React__default.createElement("span", { style: {
+                            height: '22px',
                             display: 'flex',
-                            alignItems: 'center',
-                            cursor: 'pointer',
-                            gap: 8
-                        } }, "".concat(runs.total_count, " Total Runs"),
-                        runs.total_count > 0 && (isValidating ? React__default.createElement(LoadingIcon, { size: 16 }) : React__default.createElement(ChevronCompactDown$1, null))))),
+                            alignItems: 'center'
+                        } },
+                        React__default.createElement(ThreeDots$1, null))
+                    :
+                        React__default.createElement("span", { style: {
+                                display: 'flex',
+                                alignItems: 'center',
+                                cursor: 'pointer',
+                                gap: 8
+                            } }, "".concat(runs.total_count, " Total Runs"),
+                            runs.total_count > 0 && (isValidating ? React__default.createElement(LoadingIcon, { size: 16 }) : React__default.createElement(ChevronCompactDown$1, null))))),
             runs &&
                 React__default.createElement($409067139f391064$export$7c6e2c02157bb7d2, { className: 'collapse-content' },
                     React__default.createElement("div", { style: {
@@ -43174,14 +43183,14 @@ var getStudyDuration = function (study) {
             dayjs_min.duration(end.diff(dayjs_min(study.status.started_at).utc(true)));
 };
 var StudyCard = function (_a) {
-    var _b;
-    var projectName = _a.projectName, projectOwner = _a.projectOwner, _study = _a.study, style = _a.style, authUser = _a.authUser, client = _a.client;
-    var _c = useJobs(client), cancelJob = _c.cancelJob, deleteJob = _c.deleteJob, fetchJob = _c.fetchJob;
-    var _d = useSWR(authUser ? [projectOwner, projectName, _study.id] : undefined, fetchJob, {
+    var _b, _c;
+    var projectName = _a.projectName, projectOwner = _a.projectOwner, _study = _a.study, runList = _a.runList, style = _a.style, authUser = _a.authUser, client = _a.client;
+    var _d = useJobs(client), cancelJob = _d.cancelJob, deleteJob = _d.deleteJob, fetchJob = _d.fetchJob;
+    var _e = useSWR(authUser ? [projectOwner, projectName, _study.id] : undefined, fetchJob, {
         revalidateOnFocus: false,
         refreshInterval: _study.status.finished_at ? undefined : 5000,
         fallbackData: _study
-    }), study = _d.data; _d.error; var isValidating = _d.isValidating;
+    }), study = _e.data; _e.error; var isValidating = _e.isValidating;
     var status = useMemo(function () {
         var _a, _b, _c, _d, _e;
         if (!study)
@@ -43194,7 +43203,7 @@ var StudyCard = function (_a) {
             canceled: (_e = study.status.runs_cancelled) !== null && _e !== void 0 ? _e : 0,
         });
     }, [study]);
-    var _e = useState(getStudyDuration(study)), duration = _e[0], setDuration = _e[1];
+    var _f = useState(getStudyDuration(study)), duration = _f[0], setDuration = _f[1];
     useEffect(function () {
         if (study.status.finished_at) {
             setDuration(getStudyDuration(study));
@@ -43218,24 +43227,24 @@ var StudyCard = function (_a) {
                     alignContent: 'center',
                     alignItems: 'center',
                     flexDirection: 'column',
-                    gap: 6,
+                    gap: 18,
                 } },
                 React__default.createElement("div", { style: {
                         display: 'flex',
                         flexDirection: 'column',
-                        gap: 4
                     } }, Object.entries(status).map(function (_a, i) {
                     var key = _a[0], val = _a[1];
                     return val > 0 &&
                         React__default.createElement("span", { key: "".concat(key, "-").concat(i), style: {
-                                fontSize: '1.4rem',
+                                fontSize: '1.25rem',
+                                lineHeight: '1.5rem',
                                 fontWeight: '500',
                                 color: statusMap[key].color,
                                 borderRadius: 999,
                                 display: 'flex',
                                 justifyContent: 'end',
                             } },
-                            "   ", "".concat(val, " run").concat(val === 1 ? '' : 's', " ").concat(key, "."));
+                            "   ", "".concat(val, " ").concat(key, "."));
                 })),
                 React__default.createElement(Tag, { style: {
                         color: getSummaryColor(status),
@@ -43250,6 +43259,7 @@ var StudyCard = function (_a) {
                 flexDirection: 'column',
                 justifyContent: 'space-between',
                 padding: '10px 18px',
+                gap: 12
             } },
             React__default.createElement("div", { style: {
                     display: 'grid',
@@ -43273,9 +43283,10 @@ var StudyCard = function (_a) {
                         overflow: 'hidden',
                         textOverflow: 'ellipsis',
                         display: 'inline-block'
-                    } }, study.spec.name),
+                    } }, (_b = study.spec.name) !== null && _b !== void 0 ? _b : "Study: ".concat(study.id)),
                 React__default.createElement("div", { style: {
-                        display: 'flex'
+                        display: 'flex',
+                        alignItems: 'center'
                     } },
                     React__default.createElement(Dropdown, { trigger: React__default.createElement("button", { type: 'button', style: {
                                 width: 32,
@@ -43286,7 +43297,8 @@ var StudyCard = function (_a) {
                                 borderRadius: 9999,
                                 border: '1px solid #d0d7de',
                                 backgroundColor: 'white',
-                                outlineColor: 'var(--primary)'
+                                outlineColor: 'var(--primary)',
+                                cursor: 'pointer'
                             } }, isValidating ? React__default.createElement(LoadingIcon, null) : React__default.createElement(Gear$1, null)), optionGroups: [
                             {
                                 options: [{
@@ -43313,7 +43325,10 @@ var StudyCard = function (_a) {
                     flexDirection: 'column',
                     gap: 8
                 } },
-                React__default.createElement("div", null,
+                React__default.createElement("div", { style: {
+                        display: 'flex',
+                        flexDirection: 'column',
+                    } },
                     React__default.createElement("span", { style: {
                             fontWeight: 600,
                         } }, "Recipe"),
@@ -43332,7 +43347,6 @@ var StudyCard = function (_a) {
                 React__default.createElement("div", { style: {
                         display: 'flex',
                         flexDirection: 'column',
-                        gap: 6
                     } },
                     React__default.createElement("span", { style: {
                             fontWeight: 600,
@@ -43347,14 +43361,15 @@ var StudyCard = function (_a) {
                         React__default.createElement("a", { href: "/".concat(study.author.name), target: '_blank', rel: "noreferrer", style: {
                                 fontSize: '1.125rem',
                                 color: 'var(--primary)'
-                            } }, (_b = study.author.display_name) !== null && _b !== void 0 ? _b : study.author.name))))),
-        React__default.createElement("div", { style: {
-                width: '100%',
-                gridArea: '2 / 1 / 2 / 3',
-                borderTop: '1px solid #d0d7de',
-                padding: '4px 8px'
-            } },
-            React__default.createElement(RunsList, { projectOwner: projectOwner, projectName: projectName, jobId: [study.id], subscribe: !study.status.finished_at, client: client, authUser: authUser }))));
+                            } }, (_c = study.author.display_name) !== null && _c !== void 0 ? _c : study.author.name))))),
+        runList &&
+            React__default.createElement("div", { style: {
+                    width: '100%',
+                    gridArea: '2 / 1 / 2 / 3',
+                    borderTop: '1px solid #d0d7de',
+                    padding: '4px 8px'
+                } },
+                React__default.createElement(RunsList, { projectOwner: projectOwner, projectName: projectName, jobId: [study.id], subscribe: !study.status.finished_at, client: client, authUser: authUser }))));
 };
 
 export { APIClient, AuthUser, ComboFileSelector, ConfigureLocalRun, CreateStudy, GetGeometry, GetModel, RecipeInputsForm, RunCard, SelectAccount, SelectCloudArtifacts, SelectLocalArtifacts, SelectProject, SelectRecipe, SelectRun, SelectStudy, SendGeometry, SendModel, SendResults, StudyCard, checkDotNet, checkRuby, formatBytes, getDuration, getHost, getSummaryColor, recipeLinkFromSource, sendMessageDotNet, sendMessageRuby, statusMap, useAPIClient, useArtifacts, useCreateStudy, useGetGeometry, useGetHbjson, useHbjsontoVTK, useJobs, useManageSettings, useRunCommand, useRuns, useSendHbjson, useSendMessage };