pollination-react-io 1.18.2 → 1.19.0

package/build/SelectAccount/SelectAccount.types.d.ts

@@ -4,5 +4,6 @@ export declare type Account = Organization | UserPrivate;
 export interface SelectAccountProps {
     authUser?: UserPrivate;
     client?: APIClient;
+    defaultValue?: string;
     setSelAccount?: (account: Account) => void;
 }

package/build/SelectProject/SelectProject.types.d.ts

@@ -3,6 +3,7 @@ import { APIClient } from '../hooks';
 export interface SelectProjectProps {
     authUser?: UserPrivate;
     client?: APIClient;
-    projectOwner: string;
+    projectOwner?: string;
+    defaultValue?: string;
     setSelProject?: (project: Project) => void;
 }

package/build/SelectRun/SelectRun.types.d.ts

@@ -4,6 +4,7 @@ export interface SelectRunProps {
     projectOwner?: string;
     projectName?: string;
     jobId?: string[];
+    defaultValue?: string;
     setSelRun?: (recipe: Run) => void;
     authUser?: UserPrivate;
     client?: APIClient;

package/build/SelectStudy/SelectStudy.types.d.ts

@@ -4,6 +4,7 @@ export interface SelectStudyProps {
     projectName?: string;
     projectOwner?: string;
     authUser?: UserPrivate;
+    defaultValue?: string;
     client?: APIClient;
     setSelStudy?: (project: CloudJob) => void;
 }

package/build/index.esm.js

@@ -41610,24 +41610,26 @@ TabPanel.defaultProps = defaultProps;
 
 var SelectProject = function (_a) {
     var _b, _c;
-    var authUser = _a.authUser, client = _a.client, projectOwner = _a.projectOwner, setSelProject = _a.setSelProject;
+    var authUser = _a.authUser, client = _a.client, projectOwner = _a.projectOwner, _defaultValue = _a.defaultValue, setSelProject = _a.setSelProject;
     var comboBoxRef = useRef();
-    var _d = useState(), projects = _d[0], setProjects = _d[1];
-    var _e = useState(false), loading = _e[0], setLoading = _e[1];
-    var totalRunsRef = useRef({
+    var _d = useState(_defaultValue ? [_defaultValue] : undefined), defaultValue = _d[0], setDefaultValue = _d[1];
+    var _e = useState([]), projects = _e[0], setProjects = _e[1];
+    var _f = useState(false), loading = _f[0], setLoading = _f[1];
+    var totalProjectsRef = useRef({
         loaded: 0,
         total: undefined
     });
-    var _f = useState(0), total = _f[0], setTotal = _f[1];
-    var _g = useState({
+    var _g = useState(0), total = _g[0], setTotal = _g[1];
+    var _h = useState({
         owner: (_b = [projectOwner]) !== null && _b !== void 0 ? _b : (authUser && [authUser.username]),
         page: 1,
         perPage: 10,
-    }), queryConfig = _g[0], setQueryConfig = _g[1];
+        ids: defaultValue
+    }), queryConfig = _h[0], setQueryConfig = _h[1];
     // resetting query
     useEffect(function () {
         // reset total loaded
-        totalRunsRef.current = {
+        totalProjectsRef.current = {
             loaded: 0,
             total: undefined
         };
@@ -41636,14 +41638,14 @@ var SelectProject = function (_a) {
             comboBoxRef.current.selectItem(null);
         }
         setProjects([]);
-        setQueryConfig(function (q) { return (__assign(__assign({}, q), { owner: [projectOwner], page: 1 })); });
-    }, [projectOwner]);
+        setQueryConfig(function (q) { return (__assign(__assign({}, q), { owner: [projectOwner], ids: defaultValue, page: 1 })); });
+    }, [defaultValue, projectOwner]);
     var fetchProjects = useCallback(function (queryConfig) {
         if (!authUser || !client || !client.projects)
             return;
         if (!queryConfig.owner)
             return;
-        var _a = totalRunsRef.current, total = _a.total, loaded = _a.loaded;
+        var _a = totalProjectsRef.current, total = _a.total, loaded = _a.loaded;
         if (total && loaded >= total)
             return;
         setLoading(true);
@@ -41652,8 +41654,8 @@ var SelectProject = function (_a) {
             var data = _a.data;
             setProjects(function (state) { return state ? __spreadArray(__spreadArray([], state, true), data.resources, true) : __spreadArray([], data.resources, true); });
             setTotal(data.total_count);
-            totalRunsRef.current.loaded += data.resources.length;
-            totalRunsRef.current.total = data.total_count;
+            totalProjectsRef.current.loaded += data.resources.length;
+            totalProjectsRef.current.total = data.total_count;
         })
             .finally(function () {
             setLoading(false);
@@ -41662,14 +41664,26 @@ var SelectProject = function (_a) {
     useEffect(function () {
         fetchProjects(queryConfig);
     }, [fetchProjects, queryConfig]);
+    useEffect(function () {
+        if (!defaultValue || !projects.length)
+            return;
+        // if this were to become a multiselect could use defaultValue.includes(p.id)
+        // other things would have to change
+        var selDefault = projects.find(function (p) { return p.id === defaultValue[0]; });
+        if (selDefault) {
+            setSelProject(selDefault);
+            comboBoxRef.current.selectItem(selDefault);
+            return;
+        }
+    }, [defaultValue, projects, setSelProject]);
     var onScrollReachEnd = useCallback(function () {
         // already loaded all runs
-        var _a = totalRunsRef.current, total = _a.total, loaded = _a.loaded;
+        var _a = totalProjectsRef.current, total = _a.total, loaded = _a.loaded;
         if (total && loaded >= total)
             return;
         setQueryConfig(function (q) { return (__assign(__assign({}, q), { page: q.page ? q.page + 1 : 1 })); });
     }, []);
-    return (React__default.createElement(ComboBox, { ref: comboBoxRef, items: projects !== null && projects !== void 0 ? projects : [], setSelected: setSelProject, inputProps: {
+    return (React__default.createElement(ComboBox, { ref: comboBoxRef, items: projects !== null && projects !== void 0 ? projects : [], setSelected: setSelProject, onClear: function () { return setDefaultValue(undefined); }, inputProps: {
             placeholder: 'Select a project...',
         }, loading: loading, disabled: !authUser || !queryConfig.owner, footer: (React__default.createElement("div", { key: "footer", style: {
                 width: '100%',
@@ -41681,11 +41695,11 @@ var SelectProject = function (_a) {
 
 var SelectAccount = function (_a) {
     var _b;
-    var authUser = _a.authUser, client = _a.client, setSelAccount = _a.setSelAccount;
+    var authUser = _a.authUser, client = _a.client, defaultValue = _a.defaultValue, setSelAccount = _a.setSelAccount;
     var comboBoxRef = useRef();
     var _c = useState(function () { return authUser ? [authUser] : []; }), accounts = _c[0], setAccounts = _c[1];
     var _d = useState(false), loading = _d[0], setLoading = _d[1];
-    var totalRunsRef = useRef({
+    var totalAccountsRef = useRef({
         loaded: 0,
         total: undefined
     });
@@ -41696,8 +41710,10 @@ var SelectAccount = function (_a) {
     }), queryConfig = _f[0], setQueryConfig = _f[1];
     // resetting query
     useEffect(function () {
+        if (!authUser)
+            return;
         // reset total loaded
-        totalRunsRef.current = {
+        totalAccountsRef.current = {
             loaded: 0,
             total: undefined
         };
@@ -41705,16 +41721,16 @@ var SelectAccount = function (_a) {
         if (comboBoxRef.current) {
             comboBoxRef.current.selectItem(null);
         }
-        setAccounts(authUser ? [authUser] : []);
-        setQueryConfig(function (q) { return (__assign(__assign({}, q), { member: authUser ? [authUser === null || authUser === void 0 ? void 0 : authUser.username] : undefined, page: 1 })); });
-    }, [authUser]);
+        setAccounts([authUser]);
+        setQueryConfig(function (q) { return (__assign(__assign({}, q), { member: [authUser === null || authUser === void 0 ? void 0 : authUser.username], page: 1 })); });
+    }, [authUser, defaultValue, setSelAccount]);
     var fetchOrganizations = useCallback(function (queryConfig) {
         if (!authUser || !client || !client.orgs)
             return;
         if (!queryConfig.member)
             return;
-        // we've already loaded all Runs
-        var _a = totalRunsRef.current, total = _a.total, loaded = _a.loaded;
+        var _a = totalAccountsRef.current, total = _a.total, loaded = _a.loaded;
+        // we've already loaded all accounts
         if (total && loaded >= total)
             return;
         setLoading(true);
@@ -41723,8 +41739,8 @@ var SelectAccount = function (_a) {
             var data = _a.data;
             setAccounts(function (state) { return state ? __spreadArray(__spreadArray([], state, true), data.resources, true) : __spreadArray([], data.resources, true); });
             setTotal(data.total_count);
-            totalRunsRef.current.loaded += data.resources.length;
-            totalRunsRef.current.total = data.total_count;
+            totalAccountsRef.current.loaded += data.resources.length;
+            totalAccountsRef.current.total = data.total_count;
         })
             .finally(function () {
             setLoading(false);
@@ -41733,9 +41749,20 @@ var SelectAccount = function (_a) {
     useEffect(function () {
         fetchOrganizations(queryConfig);
     }, [fetchOrganizations, queryConfig]);
+    useEffect(function () {
+        if (!defaultValue || !accounts.length)
+            return;
+        // @ts-ignore
+        var selDefault = accounts.find(function (a) { return typeof a.username !== 'undefined' ? a.username === defaultValue : a.account_name === defaultValue; });
+        if (selDefault) {
+            setSelAccount(selDefault);
+            comboBoxRef.current.selectItem(selDefault);
+            return;
+        }
+    }, [defaultValue, accounts, setSelAccount, authUser]);
     var onScrollReachEnd = useCallback(function () {
         // already loaded all runs
-        var _a = totalRunsRef.current, total = _a.total, loaded = _a.loaded;
+        var _a = totalAccountsRef.current, total = _a.total, loaded = _a.loaded;
         if (total && loaded >= total)
             return;
         setQueryConfig(function (q) { return (__assign(__assign({}, q), { page: q.page ? q.page + 1 : 1 })); });
@@ -45825,22 +45852,23 @@ var SelectLocalArtifacts = function (_a) {
 
 var SelectRun = function (_a) {
     var _b, _c;
-    var authUser = _a.authUser, client = _a.client, projectOwner = _a.projectOwner, projectName = _a.projectName, jobId = _a.jobId, setSelRun = _a.setSelRun;
+    var authUser = _a.authUser, client = _a.client, projectOwner = _a.projectOwner, projectName = _a.projectName, jobId = _a.jobId, _defaultValue = _a.defaultValue, setSelRun = _a.setSelRun;
     var comboBoxRef = useRef();
-    var _d = useState(), runs = _d[0], setRuns = _d[1];
-    var _e = useState(false), loading = _e[0], setLoading = _e[1];
+    var _d = useState(_defaultValue), defaultValue = _d[0], setDefaultValue = _d[1];
+    var _e = useState(), runs = _e[0], setRuns = _e[1];
+    var _f = useState(false), loading = _f[0], setLoading = _f[1];
     var totalRunsRef = useRef({
         loaded: 0,
         total: undefined
     });
-    var _f = useState(0), total = _f[0], setTotal = _f[1];
-    var _g = useState({
+    var _g = useState(0), total = _g[0], setTotal = _g[1];
+    var _h = useState({
         owner: projectOwner !== null && projectOwner !== void 0 ? projectOwner : (authUser && authUser.username),
         name: projectName,
         jobId: jobId,
         page: 1,
         perPage: 10,
-    }), queryConfig = _g[0], setQueryConfig = _g[1];
+    }), queryConfig = _h[0], setQueryConfig = _h[1];
     // resetting query
     useEffect(function () {
         // reset total loaded
@@ -45850,6 +45878,7 @@ var SelectRun = function (_a) {
         };
         // deselect items
         if (comboBoxRef.current) {
+            console.log('clear selection');
             comboBoxRef.current.selectItem(null);
         }
         setRuns([]);
@@ -45868,7 +45897,13 @@ var SelectRun = function (_a) {
         client.runs.listRuns(queryConfig)
             .then(function (_a) {
             var data = _a.data;
-            setRuns(function (state) { return state ? __spreadArray(__spreadArray([], state, true), data.resources, true) : __spreadArray([], data.resources, true); });
+            setRuns(function (state) {
+                if (!state)
+                    return __spreadArray([], data.resources, true);
+                var newRuns = __spreadArray(__spreadArray([], state, true), data.resources, true);
+                var uniqueRuns = newRuns.filter(function (run, i, arr) { return arr.findIndex(function (v) { return v.id === run.id; }) === i; });
+                return uniqueRuns;
+            });
             setTotal(data.total_count);
             totalRunsRef.current.loaded += data.resources.length;
             totalRunsRef.current.total = data.total_count;
@@ -45880,6 +45915,28 @@ var SelectRun = function (_a) {
     useEffect(function () {
         fetchRuns(queryConfig);
     }, [fetchRuns, queryConfig]);
+    useEffect(function () {
+        if (!defaultValue || !client || !client.runs)
+            return;
+        client.runs.getRun({
+            owner: projectOwner,
+            name: projectName,
+            runId: defaultValue
+        }).then(function (_a) {
+            var data = _a.data;
+            if (!data)
+                return;
+            setRuns(function (state) {
+                if (!state)
+                    return [data];
+                var newRuns = __spreadArray(__spreadArray([], state, true), [data], false);
+                var uniqueRuns = newRuns.filter(function (run, i, arr) { return arr.findIndex(function (v) { return v.id === run.id; }) === i; });
+                return uniqueRuns;
+            });
+            setSelRun(data);
+            comboBoxRef.current.selectItem(__assign(__assign({}, data), { name: "".concat(data.recipe.metadata.name, " : ").concat(data.status.status) }));
+        });
+    }, [client, defaultValue, projectName, projectOwner, setSelRun]);
     var onScrollReachEnd = useCallback(function () {
         // already loaded all runs
         var _a = totalRunsRef.current, total = _a.total, loaded = _a.loaded;
@@ -45904,7 +45961,7 @@ var SelectRun = function (_a) {
                     width: 24,
                     display: 'flex',
                     justifyContent: 'flex-end'
-                }, className: 'secondary' }, "".concat(i)))); }, setSelected: setSelRun, inputProps: {
+                }, className: 'secondary' }, "".concat(i)))); }, setSelected: setSelRun, onClear: function () { return setDefaultValue(undefined); }, inputProps: {
             placeholder: 'Select a run...',
         }, loading: loading, disabled: !authUser || !queryConfig.name || !queryConfig.owner, footer: (React__default.createElement("div", { key: "footer", style: {
                 width: '100%',
@@ -45915,23 +45972,36 @@ var SelectRun = function (_a) {
             } }, "Showing ".concat((_c = runs === null || runs === void 0 ? void 0 : runs.length) !== null && _c !== void 0 ? _c : 0, " of ").concat(total, " runs"))), onScrollReachEnd: onScrollReachEnd }));
 };
 
+var formatStudy = function (study) {
+    var name = study.spec.name;
+    if (!name) {
+        if (study.recipe && study.recipe.metadata) {
+            name = "".concat(study.recipe.metadata.name, " : ").concat(study.status.id.slice(0, 5), "...");
+        }
+        else {
+            name = 'No name';
+        }
+    }
+    return (__assign(__assign({}, study), { name: name }));
+};
 var SelectStudy = function (_a) {
     var _b, _c;
-    var authUser = _a.authUser, client = _a.client, projectName = _a.projectName, projectOwner = _a.projectOwner, setSelStudy = _a.setSelStudy;
+    var authUser = _a.authUser, client = _a.client, projectName = _a.projectName, projectOwner = _a.projectOwner, _defaultValue = _a.defaultValue, setSelStudy = _a.setSelStudy;
     var comboBoxRef = useRef();
-    var _d = useState(), studies = _d[0], setStudies = _d[1];
-    var _e = useState(false), loading = _e[0], setLoading = _e[1];
+    var _d = useState(_defaultValue), defaultValue = _d[0], setDefaultValue = _d[1];
+    var _e = useState([]), studies = _e[0], setStudies = _e[1];
+    var _f = useState(false), loading = _f[0], setLoading = _f[1];
     var totalRunsRef = useRef({
         loaded: 0,
         total: undefined
     });
-    var _f = useState(0), total = _f[0], setTotal = _f[1];
-    var _g = useState({
+    var _g = useState(0), total = _g[0], setTotal = _g[1];
+    var _h = useState({
         owner: projectOwner !== null && projectOwner !== void 0 ? projectOwner : (authUser && authUser.username),
         name: projectName,
         page: 1,
         perPage: 10,
-    }), queryConfig = _g[0], setQueryConfig = _g[1];
+    }), queryConfig = _h[0], setQueryConfig = _h[1];
     // resetting query
     useEffect(function () {
         // reset total loaded
@@ -45959,7 +46029,13 @@ var SelectStudy = function (_a) {
         client.jobs.listJobs(queryConfig)
             .then(function (_a) {
             var data = _a.data;
-            setStudies(function (state) { return state ? __spreadArray(__spreadArray([], state, true), data.resources, true) : __spreadArray([], data.resources, true); });
+            setStudies(function (state) {
+                if (!state)
+                    return __spreadArray([], data.resources, true);
+                var newStudies = __spreadArray(__spreadArray([], state, true), data.resources, true);
+                var uniqueStudies = newStudies.filter(function (study, i, arr) { return arr.findIndex(function (v) { return v.id === study.id; }) === i; });
+                return uniqueStudies;
+            });
             setTotal(data.total_count);
             totalRunsRef.current.loaded += data.resources.length;
             totalRunsRef.current.total = data.total_count;
@@ -45971,6 +46047,28 @@ var SelectStudy = function (_a) {
     useEffect(function () {
         fetchStudies(queryConfig);
     }, [fetchStudies, queryConfig]);
+    useEffect(function () {
+        if (!defaultValue || !client || !client.jobs)
+            return;
+        client.jobs.getJob({
+            owner: projectOwner,
+            name: projectName,
+            jobId: defaultValue
+        }).then(function (_a) {
+            var data = _a.data;
+            if (!data)
+                return;
+            setStudies(function (state) {
+                if (!state)
+                    return [data];
+                var newStudies = __spreadArray(__spreadArray([], state, true), [data], false);
+                var uniqueStudies = newStudies.filter(function (study, i, arr) { return arr.findIndex(function (v) { return v.id === study.id; }) === i; });
+                return uniqueStudies;
+            });
+            setSelStudy(data);
+            comboBoxRef.current.selectItem(formatStudy(data));
+        });
+    }, [client, defaultValue, projectName, projectOwner, setSelStudy]);
     var onScrollReachEnd = useCallback(function () {
         // already loaded all runs
         var _a = totalRunsRef.current, total = _a.total, loaded = _a.loaded;
@@ -45978,18 +46076,7 @@ var SelectStudy = function (_a) {
             return;
         setQueryConfig(function (q) { return (__assign(__assign({}, q), { page: q.page ? q.page + 1 : 1 })); });
     }, []);
-    return (React__default.createElement(ComboBox, { ref: comboBoxRef, items: (_b = studies === null || studies === void 0 ? void 0 : studies.map(function (r) {
-            var name = r.spec.name;
-            if (!name) {
-                if (r.recipe && r.recipe.metadata) {
-                    name = "".concat(r.recipe.metadata.name, " : ").concat(r.status.id.slice(0, 5), "...");
-                }
-                else {
-                    name = 'No name';
-                }
-            }
-            return (__assign(__assign({}, r), { name: name }));
-        })) !== null && _b !== void 0 ? _b : [], setSelected: setSelStudy, inputProps: {
+    return (React__default.createElement(ComboBox, { ref: comboBoxRef, items: (_b = studies === null || studies === void 0 ? void 0 : studies.map(formatStudy)) !== null && _b !== void 0 ? _b : [], setSelected: setSelStudy, onClear: function () { return setDefaultValue(undefined); }, inputProps: {
             placeholder: 'Select a study...',
         }, loading: loading, disabled: !authUser || !queryConfig.name || !queryConfig.owner, footer: (React__default.createElement("div", { key: "footer", style: {
                 width: '100%',