pollination-react-io 1.12.0 → 1.12.1

package/build/RecipeInputsForm/RecipeInputsForm.types.d.ts

@@ -2,7 +2,7 @@ import { RecipeInterface } from '@pollination-solutions/pollination-sdk';
 import { APIClient, PanelMessageOut } from '../hooks';
 export interface RecipeInputsFormProps {
     recipe: RecipeInterface;
-    onSubmit?: (name: string, jobArguments: any[], description?: string) => Promise<void> | Promise<PanelMessageOut> | void;
+    onSubmit?: (name: string, jobArguments: any[], description?: string) => Promise<void> | Promise<PanelMessageOut>;
     projectOwner?: string;
     projectName?: string;
     client?: APIClient;

package/build/hooks/useCreateStudy.d.ts

@@ -12,7 +12,7 @@ interface JobArgs {
 }
 export declare const useCreateStudy: (accountName: string, projectName: string, client: APIClient) => {
     host: string;
-    createStudy: ({ name, source, description }: JobArgs, data: object) => Promise<void>;
+    createStudy: ({ name, source, description }: JobArgs, data: object, onSuccess?: (accountName: string, projectName: string, studyId: string) => void) => Promise<void>;
     createLocalStudy: ({ name, source, description }: JobArgs, data: object, key?: string) => Promise<import("./types").PanelMessageIn>;
 };
 export {};

package/build/index.esm.js

@@ -21805,6 +21805,9 @@ var useCreateStudy = function (accountName, projectName, client) {
                 });
             }
             else {
+                if (!uploadArtifact) {
+                    reject('useCreateStudy: uploadArtifact is undefined but the user needs to upload input files.');
+                }
                 resolve(uploadArtifact(undefined, value)
                     .then(function (data) { return ({
                     name: name,
@@ -21817,14 +21820,11 @@ var useCreateStudy = function (accountName, projectName, client) {
             }
         });
     }, [uploadArtifact]);
-    var createStudy = useCallback(function (_a, data) {
+    var createStudy = useCallback(function (_a, data, onSuccess) {
         var name = _a.name, source = _a.source, description = _a.description;
-        if (!client)
-            return;
-        if (!name || !source || !data)
-            return;
-        if (!uploadArtifact)
-            return;
+        if (!client || !name || !source || !data) {
+            return new Promise(function (resolve, reject) { return resolve(); });
+        }
         return Promise.all(Object.entries(data).map(function (d) { return processEntry(d); }))
             .then(function (jobArguments) {
             var job = {
@@ -21835,21 +21835,21 @@ var useCreateStudy = function (accountName, projectName, client) {
                 source: source,
                 arguments: [jobArguments]
             };
-            client.jobs.createJob({
+            return client.jobs.createJob({
                 owner: accountName,
                 name: projectName,
                 // @ts-ignore
                 job: job
             })
                 .then(function (res) {
-                window.open("https://app.pollination.cloud/".concat(accountName, "/projects/").concat(projectName, "/studies/").concat(res.data.id), '_newtab');
+                onSuccess && onSuccess(accountName, projectName, res.data.id);
             })
                 .catch(function (err) {
                 var data = err.response.data;
                 throw new Error(data.detail);
             });
         });
-    }, [accountName, client, processEntry, projectName, uploadArtifact]);
+    }, [accountName, client, processEntry, projectName]);
     var createLocalStudy = useCallback(function (_a, data, key) {
         var name = _a.name, source = _a.source, description = _a.description;
         if (key === void 0) { key = performance.now().toString(); }
@@ -39484,7 +39484,6 @@ var SelectCloudArtifacts = function (_a) {
             .then(function (facts) {
             var folders = facts.filter(function (f) { return f.file_type === 'folder'; });
             var files = facts.filter(function (f) { return f.file_type === 'file'; });
-            // const files = facts.filter(f => f.file_type === 'file' && f.file_name.match(fileNameMatch))
             setArtifacts({ folders: folders, files: files });
         })
             .finally(function () { return setLoading(false); });
@@ -39913,7 +39912,7 @@ var ComboFileSelector = function (_a) {
                 case 'get_model':
                     return (React__default.createElement(GetModel, { onChange: onChange, inputProps: inputProps, showHelpText: false }));
                 case 'get_cloud':
-                    return (React__default.createElement(SelectCloudArtifacts, { onChange: onChange, projectName: projectName, projectOwner: projectOwner, client: client, fileNameMatch: typeof inputProps.accept === 'string' ? ".*(".concat(inputProps.accept.replace(/\./g, '').split(', ').join('$|'), "$)") : undefined }));
+                    return (React__default.createElement(SelectCloudArtifacts, { projectOwner: projectOwner, projectName: projectName, fileNameMatch: typeof inputProps.accept === 'string' ? ".*(".concat(inputProps.accept.replace(/\./g, '').split(', ').join('$|'), "$)") : undefined, onChange: onChange, client: client }));
                 case 'get_local':
                     return (React__default.createElement(SelectLocalArtifacts, { onChange: onChange }));
                 default:
@@ -39972,8 +39971,10 @@ var RecipeInputsForm = function (_a) {
     }), control = _h.control, register = _h.register, handleSubmit = _h.handleSubmit, resetField = _h.resetField, _j = _h.formState, errors = _j.errors, isValid = _j.isValid; _j.isSubmitting;
     var _onSubmit = function (_data) {
         var data = __assign({}, _data);
+        // strip study name
         var studyName = data['study-name'];
         delete data['study-name'];
+        // strip default or null values
         // @ts-ignore
         var inputDefaults = new Map(recipe.inputs.map(function (i) { return [i.name, i.default]; }));
         Object.entries(data).forEach(function (_a) {
@@ -39987,12 +39988,9 @@ var RecipeInputsForm = function (_a) {
         });
         if (typeof onSubmit !== 'undefined') {
             setLoading(true);
-            var submit = onSubmit(studyName, data);
-            if (!submit) {
-                setLoading(false);
-                return;
-            }
-            submit.finally(function () {
+            onSubmit(studyName, data)
+                .finally(function () {
+                console.log('what??');
                 setLoading(false);
             });
         }
@@ -40006,7 +40004,11 @@ var RecipeInputsForm = function (_a) {
         }
         return p;
     }, [[], []]);
-    return (React__default.createElement(React__default.Fragment, null,
+    return (React__default.createElement("div", { style: {
+            display: 'flex',
+            flexDirection: 'column',
+            gap: 20
+        } },
         React__default.createElement($409067139f391064$export$be92b6f5f03c0fe9, { style: {
                 display: 'flex',
                 flexDirection: 'column',
@@ -40107,7 +40109,7 @@ var RecipeInputsForm = function (_a) {
                                                 // @ts-ignore
                                                 name: input.name, control: control, render: function (_a) {
                                                     var _b = _a.field; _b.value; var onChange = _b.onChange, field = __rest(_b, ["value", "onChange"]);
-                                                    return (React__default.createElement(ComboFileSelector, { inputProps: __assign(__assign({}, field), { accept: input.extensions.map(function (e) { return ".".concat(e); }).join(', ') }), onChange: onChange, defaultOption: getHost() === 'web' ? 'get_cloud' : 'get_file', projectName: projectName, projectOwner: projectOwner, client: client }));
+                                                    return (React__default.createElement(ComboFileSelector, { projectOwner: projectOwner, projectName: projectName, defaultOption: getHost() === 'web' ? 'get_cloud' : 'get_file', onChange: onChange, client: client, inputProps: __assign(__assign({}, field), { accept: input.extensions.map(function (e) { return ".".concat(e); }).join(', ') }) }));
                                                 } });
                                         case 'DAGStringInput':
                                             return typeof ((_a = input.spec) === null || _a === void 0 ? void 0 : _a.enum) !== 'undefined' ?