pollination-react-io 1.24.1 → 1.24.2

package/build/CreateStudy/CreateStudy.types.d.ts

@@ -1,9 +1,8 @@
-import type { UserPrivate } from '@pollination-solutions/pollination-sdk';
+import type { Project, RecipeInterface, UserPrivate } from '@pollination-solutions/pollination-sdk';
 import { CSSProperties } from 'react';
 import { APIClient } from '../hooks';
+import { Account } from '../SelectAccount/SelectAccount.types';
 export declare type CreateStudyProps = {
-    authUser?: UserPrivate;
-    client?: APIClient;
     style?: CSSProperties;
     controlledRecipeInputs?: {
         [index: string]: {
@@ -11,5 +10,10 @@ export declare type CreateStudyProps = {
             hidden?: boolean;
         };
     };
+    defaultAccount?: Account;
+    defaultProject?: Project;
+    defaultRecipe?: RecipeInterface;
     createStudySuccess?: (accountName: string, projectName: string, studyId: string) => void;
+    authUser?: UserPrivate;
+    client?: APIClient;
 };

package/build/index.esm.js

@@ -8702,6 +8702,8 @@ var ComboBox = React__default.forwardRef(function ComboBox(_a, ref) {
                     borderBottomLeftRadius: isOpen ? 0 : 4,
                     flex: 12,
                     lineHeight: '1.5rem',
+                }, onReset: function () {
+                    selectItem(undefined);
                 } }, inputProps), { onFocus: function () {
                     openMenu();
                 }, type: hidden ? 'hidden' : undefined })))),
@@ -14380,7 +14382,7 @@ Dropzone.propTypes = {
  * @property {Function} open Open the native file selection dialog
  */
 
-var initialState$1 = {
+var initialState = {
   isFocused: false,
   isFileDialogActive: false,
   isDragActive: false,
@@ -14515,7 +14517,7 @@ function useDropzone() {
   var rootRef = useRef(null);
   var inputRef = useRef(null);
 
-  var _useReducer = useReducer(reducer, initialState$1),
+  var _useReducer = useReducer(reducer, initialState),
       _useReducer2 = _slicedToArray(_useReducer, 2),
       state = _useReducer2[0],
       dispatch = _useReducer2[1];
@@ -14965,7 +14967,7 @@ function reducer(state, action) {
       });
 
     case "openDialog":
-      return _objectSpread(_objectSpread({}, initialState$1), {}, {
+      return _objectSpread(_objectSpread({}, initialState), {}, {
         isFileDialogActive: true
       });
 
@@ -14988,7 +14990,7 @@ function reducer(state, action) {
       });
 
     case "reset":
-      return _objectSpread({}, initialState$1);
+      return _objectSpread({}, initialState);
 
     default:
       return state;
@@ -37873,9 +37875,9 @@ function blobToBase64(blob) {
                         if (typeof reader.result !== 'string') {
                             return;
                         }
-                        resolve(btoa(reader.result));
+                        resolve(reader.result.split(',')[1]);
                     };
-                    reader.readAsText(blob);
+                    reader.readAsDataURL(blob);
                 })];
         });
     });
@@ -38096,14 +38098,16 @@ var useCreateStudy = function (accountName, projectName, client) {
                                 var input = recipe.inputs.find(function (i) { return i.name === d[0]; });
                                 return processEntryLocal(d, input, cloudProjectName);
                             }))
-                                .then(function (jobArguments) { return ({
-                                type: 'Job',
-                                api_version: 'v1beta1',
-                                name: name,
-                                description: description,
-                                source: recipe.source,
-                                arguments: [jobArguments]
-                            }); }).catch(function (err) {
+                                .then(function (jobArguments) {
+                                return ({
+                                    type: 'Job',
+                                    api_version: 'v1beta1',
+                                    name: name,
+                                    description: description,
+                                    source: recipe.source,
+                                    arguments: [jobArguments]
+                                });
+                            }).catch(function (err) {
                                 var data = err.response.data;
                                 console.error(data.detail);
                             })];
@@ -38121,7 +38125,6 @@ var useCreateStudy = function (accountName, projectName, client) {
                         console.log(jobInfo);
                         response = window.parent.chrome.webview.hostObjects.study.RunSimulation(JSON.stringify(jobInfo))
                             .then(function (value) {
-                            console.log(value);
                             onSuccess && onSuccess(cloudProjectOwner, cloudProjectName, value);
                         }, function (reason) {
                             console.error(reason);
@@ -40658,7 +40661,8 @@ var SelectCloudArtifacts = function (_a) {
     }, [selArtifact]);
     useEffect(function () {
         // nonmemoized value from react-hook-form or other parent causes infinite rerendering
-        if (lodash_isequal(valueRef.current, selArtifact)) {
+        if (lodash_isequal(valueRef.current, selArtifact) ||
+            (!valueRef.current && !selArtifact)) {
             return;
         }
         // if selection is a folder instead of an artifact
@@ -40788,7 +40792,7 @@ var SelectLocalArtifactNative = function (_a) {
         }
         catch (error) {
             // common error is incorrect fileMatchPattern
-            console.log(error);
+            console.error(error);
         }
         if (res && typeof res.data === 'string') {
             setSelPath(res.data);
@@ -44046,8 +44050,8 @@ var RecipeInputsForm = function (_a) {
     var host = getHost();
     var _f = useForm({
         resolver: Oe(schema),
-        mode: 'all'
-    }), control = _f.control, register = _f.register, handleSubmit = _f.handleSubmit, reset = _f.reset, resetField = _f.resetField, _g = _f.formState, errors = _g.errors, isValid = _g.isValid; _g.isSubmitting;
+        mode: 'all',
+    }), control = _f.control, register = _f.register, handleSubmit = _f.handleSubmit, reset = _f.reset, resetField = _f.resetField, _g = _f.formState, errors = _g.errors, isValid = _g.isValid, isSubmitSuccessful = _g.isSubmitSuccessful;
     var _onSubmit = function (_data) {
         var data = __assign({}, _data);
         // strip study name
@@ -44069,6 +44073,14 @@ var RecipeInputsForm = function (_a) {
             setLoading(true);
             onSubmit(studyName, data, 'description', localConfig)
                 .finally(function () {
+                // @ts-ignore
+                var defaults = recipe.inputs.map(function (input) {
+                    var _a;
+                    var _b;
+                    return (_a = {}, _a[input.name] = (_b = input.default) !== null && _b !== void 0 ? _b : '', _a);
+                });
+                defaults.push({ 'study-name': '' });
+                // console.log(defaults)
                 reset();
                 setLoading(false);
             });
@@ -44089,7 +44101,7 @@ var RecipeInputsForm = function (_a) {
             gap: 20
         } },
         React__default.createElement(FormInput, { name: 'study-name', description: 'Study name is a required field.', errorMessage: errors['study-name'] ? (_b = errors['study-name']) === null || _b === void 0 ? void 0 : _b.message : undefined },
-            React__default.createElement(TextInput, { inputProps: __assign({ form: recipe.metadata.name }, register('study-name')), reset: function () { return resetField('study-name'); } })),
+            React__default.createElement(TextInput, { inputProps: __assign({ form: recipe.metadata.name }, register('study-name')) })),
         host !== 'web' &&
             React__default.createElement(ConfigureLocalRun, { onChange: function (localConfig) { return setLocalConfig(localConfig); }, defaultVal: localConfig }),
         React__default.createElement(Tabs, { forceRenderTabPanel: true },
@@ -44131,7 +44143,7 @@ var RecipeInputsForm = function (_a) {
                                                     get_model: input.extensions.includes('hbjson') && host !== 'web',
                                                     get_local: host !== 'web',
                                                     get_file: host === 'web'
-                                                }, value: value, onChange: onChange, client: client, inputProps: __assign(__assign({}, field), { accept: input.extensions.map(function (e) { return ".".concat(e); }).join(', ') }), hidden: hidden }));
+                                                }, value: value, onChange: onChange, inputProps: __assign(__assign({}, field), { accept: input.extensions.map(function (e) { return ".".concat(e); }).join(', ') }), hidden: hidden, client: client }));
                                         } });
                                 case 'DAGStringInput':
                                     return typeof ((_a = input.spec) === null || _a === void 0 ? void 0 : _a.enum) !== 'undefined' ?
@@ -44163,7 +44175,7 @@ var RecipeInputsForm = function (_a) {
                                 // @ts-ignore
                                 React__default.createElement("li", { key: key, style: { color: 'red', fontSize: '0.8rem', listStyle: 'none' } }, "".concat(key, " ").concat(val.message, ".")));
                             }))) :
-                        'Recipe input isn\'t valid yet.' },
+                        isSubmitSuccessful ? 'Study has been successfully submitted.' : 'Study input isn\'t valid.' },
                     React__default.createElement(Button, { type: 'submit', form: recipe.metadata.name, disabled: !isValid || loading, style: {
                             width: 'fit-content',
                         }, loading: loading }, "Create Study"))))));
@@ -44172,11 +44184,6 @@ var RecipeInputsForm = function (_a) {
 var css_248z$3 = ".react-tabs {\n  -webkit-tap-highlight-color: transparent;\n}\n\n.react-tabs__tab-list {\n  border-bottom: 1px solid #aaa;\n  margin: 0 0 10px;\n  padding: 0;\n}\n\n.react-tabs__tab {\n  display: inline-block;\n  border: 1px solid transparent;\n  border-bottom: none;\n  bottom: -1px;\n  position: relative;\n  list-style: none;\n  padding: 6px 12px;\n  cursor: pointer;\n}\n\n.react-tabs__tab--selected {\n  background: #fff;\n  border-color: #aaa;\n  color: black;\n  border-radius: 5px 5px 0 0;\n}\n\n.react-tabs__tab--disabled {\n  color: GrayText;\n  cursor: default;\n}\n\n.react-tabs__tab:focus {\n  outline: none;\n}\n\n.react-tabs__tab:focus:after {\n  content: '';\n  position: absolute;\n  height: 5px;\n  left: -4px;\n  right: -4px;\n  bottom: -5px;\n  background: #fff;\n}\n\n.react-tabs__tab-panel {\n  display: none;\n}\n\n.react-tabs__tab-panel--selected {\n  display: block;\n}\n";
 styleInject(css_248z$3);
 
-var initialState = {
-    account: undefined,
-    project: undefined,
-    recipe: undefined,
-};
 var defaultStyle = {
     display: 'flex',
     flexDirection: 'column',
@@ -44184,27 +44191,20 @@ var defaultStyle = {
 };
 var CreateStudy = function (_a) {
     var _b;
-    var authUser = _a.authUser, client = _a.client, style = _a.style, controlledRecipeInputs = _a.controlledRecipeInputs, createStudySuccess = _a.createStudySuccess;
+    var style = _a.style, controlledRecipeInputs = _a.controlledRecipeInputs, defaultAccount = _a.defaultAccount, defaultProject = _a.defaultProject, defaultRecipe = _a.defaultRecipe, createStudySuccess = _a.createStudySuccess, authUser = _a.authUser, client = _a.client;
     var _c = useState(0), activeTabIndex = _c[0], setActiveTabIndex = _c[1];
-    var _d = useState(initialState), state = _d[0], setState = _d[1];
-    var setSelAccount = useCallback(function (account) {
-        setState(function (state) { return (__assign(__assign({}, state), { account: account, project: undefined })); });
-    }, []);
-    var setSelProject = useCallback(function (project) {
-        setState(function (state) { return (__assign(__assign({}, state), { project: project, recipe: undefined })); });
-    }, []);
-    var setSelRecipe = useCallback(function (recipe) {
-        setState(function (state) { return (__assign(__assign({}, state), { recipe: recipe })); });
-    }, []);
+    var _d = useState(defaultAccount), selAccount = _d[0], setSelAccount = _d[1];
+    var _e = useState(defaultProject), selProject = _e[0], setSelProject = _e[1];
+    var _f = useState(defaultRecipe), selRecipe = _f[0], setSelRecipe = _f[1];
     // @ts-ignore
-    var projectOwner = !state || !state.account ? undefined : ((_b = state.account.username) !== null && _b !== void 0 ? _b : state.account.account_name);
-    var projectSlug = !state || !state.project ? undefined : state.project.slug.split('/')[1];
-    var _e = useCreateStudy(projectOwner, projectSlug, client), host = _e.host, createStudy = _e.createStudy, createLocalStudy = _e.createLocalStudy;
+    var projectOwner = selAccount ? ((_b = selAccount.username) !== null && _b !== void 0 ? _b : selAccount.account_name) : undefined;
+    var projectSlug = selProject ? selProject.slug.split('/')[1] : undefined;
+    var _g = useCreateStudy(projectOwner, projectSlug, client), host = _g.host, createStudy = _g.createStudy, createLocalStudy = _g.createLocalStudy;
     useEffect(function () {
-        if (!state.recipe)
+        if (!selRecipe)
             return;
         setActiveTabIndex(1);
-    }, [state.recipe]);
+    }, [selRecipe]);
     var basePath = useMemo(function () {
         return client.config.basePath.replace('api', 'app');
     }, [client]);
@@ -44216,19 +44216,19 @@ var CreateStudy = function (_a) {
         window.open("".concat(basePath, "/").concat(accountName, "/projects/").concat(projectName, "/studies/").concat(studyId));
     }, [basePath]);
     var handleCreateStudy = useCallback(function (name, data, description, localConfig) {
-        if (!state || !state.recipe || !state.recipe.source) {
+        if (!selRecipe) {
             return new Promise(function (resolve, reject) { return resolve(); });
         }
         var handleSuccess = createStudySuccess !== null && createStudySuccess !== void 0 ? createStudySuccess : handleCreateStudySuccess;
         // don't attempt navigation if the study is a local study
         var handleWebSuccess = localConfig && localConfig.isLocalJob ? handleSuccess : undefined;
         if (host !== 'web') {
-            return createLocalStudy({ name: name, recipe: state.recipe, description: description }, data, localConfig, handleWebSuccess);
+            return createLocalStudy({ name: name, recipe: selRecipe, description: description }, data, localConfig, handleWebSuccess);
         }
         else {
-            return createStudy({ name: name, recipe: state.recipe, description: description }, data, handleWebSuccess);
+            return createStudy({ name: name, recipe: selRecipe, description: description }, data, handleWebSuccess);
         }
-    }, [state, host, createLocalStudy, createStudy, createStudySuccess, handleCreateStudySuccess]);
+    }, [createLocalStudy, createStudy, createStudySuccess, handleCreateStudySuccess, host, selRecipe]);
     return (React__default.createElement("div", { "data-testid": "CreateProject", style: __assign(__assign({}, defaultStyle), style) },
         React__default.createElement(Tabs, { selectedIndex: activeTabIndex, onSelect: function (index) { return setActiveTabIndex(index); }, forceRenderTabPanel: true },
             React__default.createElement("div", { style: {
@@ -44241,7 +44241,7 @@ var CreateStudy = function (_a) {
                         flex: 1
                     } },
                     React__default.createElement(Tab, null, "Select Recipe"),
-                    state.recipe &&
+                    selRecipe &&
                         React__default.createElement(Tab, null, "Recipe Inputs"))),
             React__default.createElement(TabPanel, { style: {
                     padding: '8px 8px'
@@ -44251,14 +44251,14 @@ var CreateStudy = function (_a) {
                         flexDirection: 'column',
                         gap: 8
                     } },
-                    React__default.createElement(Label, { label: state.account ? state.account.name : 'Account' },
-                        React__default.createElement(SelectAccount, { authUser: authUser, client: client, onChange: setSelAccount })),
-                    React__default.createElement(Label, { label: state.project ? state.project.name : 'Project' },
-                        React__default.createElement(SelectProject, { authUser: authUser, client: client, onChange: setSelProject, projectOwner: projectOwner })),
-                    React__default.createElement(Label, { label: state.recipe && state.recipe.metadata ?
-                            state.recipe.metadata.name : 'Recipe' },
-                        React__default.createElement(SelectRecipe, { authUser: authUser, client: client, projectOwner: projectOwner, projectName: state.project ? state === null || state === void 0 ? void 0 : state.project.name : undefined, onChange: setSelRecipe })))),
-            state.recipe &&
+                    React__default.createElement(Label, { label: selAccount ? selAccount.name : 'Account' },
+                        React__default.createElement(SelectAccount, { authUser: authUser, client: client, onChange: setSelAccount, value: selAccount })),
+                    React__default.createElement(Label, { label: selProject ? selProject.name : 'Project' },
+                        React__default.createElement(SelectProject, { authUser: authUser, client: client, onChange: setSelProject, projectOwner: projectOwner, value: selProject })),
+                    React__default.createElement(Label, { label: selRecipe && selRecipe.metadata ?
+                            selRecipe.metadata.name : 'Recipe' },
+                        React__default.createElement(SelectRecipe, { authUser: authUser, client: client, projectOwner: projectOwner, projectName: selProject ? selProject.name : undefined, onChange: setSelRecipe, value: selRecipe })))),
+            selRecipe &&
                 React__default.createElement(React__default.Fragment, null,
                     React__default.createElement(TabPanel, { style: {
                             padding: 8
@@ -44268,14 +44268,14 @@ var CreateStudy = function (_a) {
                                 flexDirection: 'column',
                                 gap: 24
                             } },
-                            state.recipe &&
+                            selRecipe &&
                                 React__default.createElement("h5", { style: {
                                         marginBottom: 0
-                                    } }, state.recipe.metadata.name
+                                    } }, selRecipe.metadata.name
                                     .split('-')
                                     .map(function (v) { return v.charAt(0).toUpperCase() + v.slice(1); })
                                     .join(' ')),
-                            React__default.createElement(RecipeInputsForm, { client: client, projectOwner: projectOwner, projectName: projectSlug, recipe: state.recipe, onSubmit: handleCreateStudy, controlledValues: controlledRecipeInputs })))))));
+                            React__default.createElement(RecipeInputsForm, { client: client, projectOwner: projectOwner, projectName: projectSlug, recipe: selRecipe, onSubmit: handleCreateStudy, controlledValues: controlledRecipeInputs })))))));
 };
 
 // Generated with util/create-component.js