pollination-react-io 1.53.5 → 1.53.7

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

@@ -4,16 +4,10 @@ import { APIClient } from '../hooks';
 import { Account } from '../SelectAccount/SelectAccount.types';
 export declare type CreateStudyProps = {
     style?: CSSProperties;
-    controlledRecipeInputs?: {
-        [index: string]: {
-            value: string;
-            hidden?: boolean;
-        };
-    };
     defaultAccount?: Account;
     defaultProject?: Project;
     defaultRecipe?: RecipeInterface;
-    createStudySuccess?: (accountName: string, projectName: string, studyId: string) => void;
+    onSuccess?: (accountName: string, projectName: string, studyId: string, isCloud: boolean) => any;
     authUser?: UserPrivate;
     client?: APIClient;
 };

package/build/index.esm.js

@@ -40633,12 +40633,9 @@ var GetModel = function (_a) {
         var sub = Boolean(optionsConfig) && typeof optionsConfig !== 'undefined' &&
             typeof optionsConfig.subscribe !== 'undefined' &&
             typeof optionsConfig.subscribe.selected !== 'undefined' ? optionsConfig.subscribe.selected : false;
-        var prev = Boolean(optionsConfig) && typeof optionsConfig !== 'undefined' &&
-            typeof optionsConfig.preview !== 'undefined' &&
-            typeof optionsConfig.preview.selected !== 'undefined' ? optionsConfig.preview.selected : false;
+        // Do not trigger prev props - for streamlit
         setSelection(sel);
         setSubscribe(sub);
-        setSubscribe(prev);
     }, [optionsConfig]);
     useEffect(function () {
         if (!hbjson)
@@ -44659,84 +44656,72 @@ var defaultStyle = {
 };
 var CreateStudy = function (_a) {
     var _b;
-    var style = _a.style, 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(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];
-    var _g = useState(undefined), currJobId = _g[0], setCurrJobId = _g[1];
-    var _h = useState(undefined), isCloud = _h[0], setIsCloud = _h[1];
-    // Single run only...
-    var _j = useState(undefined); _j[0]; var setCurrRunId = _j[1];
+    var style = _a.style, defaultAccount = _a.defaultAccount, defaultProject = _a.defaultProject, defaultRecipe = _a.defaultRecipe, authUser = _a.authUser, client = _a.client, _c = _a.onSuccess, onSuccess = _c === void 0 ? undefined : _c;
+    var _d = useState(0), activeTabIndex = _d[0], setActiveTabIndex = _d[1];
+    var _e = useState(defaultAccount), selAccount = _e[0], setSelAccount = _e[1];
+    var _f = useState(defaultProject), selProject = _f[0], setSelProject = _f[1];
+    var _g = useState(defaultRecipe), selRecipe = _g[0], setSelRecipe = _g[1];
     // @ts-ignore
     var projectOwner = selAccount ? ((_b = selAccount.username) !== null && _b !== void 0 ? _b : selAccount.account_name) : undefined;
     var projectSlug = selProject ? selProject.slug.split('/')[1] : undefined;
-    var _k = useCreateStudy(projectOwner, projectSlug, client), host = _k.host, createStudy = _k.createStudy, createLocalStudy = _k.createLocalStudy;
-    var listRuns = useRuns(client).listRuns;
+    var _h = useCreateStudy(projectOwner, projectSlug, client), host = _h.host, createStudy = _h.createStudy, createLocalStudy = _h.createLocalStudy;
+    useRuns(client).listRuns;
     useEffect(function () {
         if (!selRecipe)
             return;
         setActiveTabIndex(1);
     }, [selRecipe]);
-    /*
-     * If cloud job fetch the job and search the first run
-     */
-    useEffect(function () {
-        if (!currJobId || !selAccount || !selProject || isCloud)
-            return;
-        listRuns(selAccount === null || selAccount === void 0 ? void 0 : selAccount.name.toLowerCase(), selProject === null || selProject === void 0 ? void 0 : selProject.name, [currJobId])
-            .then(function (d) {
-            setCurrRunId(d.resources[0].id);
-            setActiveTabIndex(2);
-        })
-            .catch(function () {
-            setCurrRunId(undefined);
-            setCurrJobId(undefined);
-            setActiveTabIndex(1);
-        });
-    }, [currJobId]);
     var basePath = useMemo(function () {
         return client.config.basePath.replace('api', 'app');
     }, [client]);
-    var handleCreateStudySuccess = useCallback(function (accountName, projectName, studyId) {
+    var _onSuccessCloud = function (accountName, projectName, studyId) {
         if (!basePath) {
             throw new Error('CreateStudy: client.configuration.basepath not defined.');
         }
-        setCurrJobId(studyId);
-        // If success fetch the job and get the studyId
-        window.location.href = "".concat(basePath, "/").concat(accountName, "/projects/").concat(projectName, "/studies/").concat(studyId);
-    }, []);
-    var handleCreateStudySuccessLocal = useCallback(function (accountName, projectName, studyId) {
-        _t.success("Study is running! Do not close the console.\nYou will find output here ".concat(studyId, "."), { duration: 4000, position: 'bottom-left', style: { minWidth: '300px', fontSize: '12px' } });
-        // Local studyId == path
-        setCurrJobId(studyId);
-        setCurrRunId(studyId);
-        setActiveTabIndex(2);
-    }, []);
+        // Custom or default callback
+        if (onSuccess) {
+            onSuccess(accountName, projectName, studyId, true);
+        }
+        else {
+            _t.success('Study submitted!', { duration: 4000, position: 'bottom-left', style: { minWidth: '300px', fontSize: '12px' }
+            });
+            setTimeout(function () {
+                window.location.href = "".concat(basePath, "/").concat(accountName, "/projects/").concat(projectName, "/studies/").concat(studyId);
+            }, 3000);
+        }
+    };
+    var _onSuccessLocal = function (accountName, projectName, studyId) {
+        if (!basePath) {
+            throw new Error('CreateStudy: client.configuration.basepath not defined.');
+        }
+        // Custom or default callback
+        // local study ID === run ID
+        if (onSuccess) {
+            onSuccess(accountName, projectName, studyId, false);
+        }
+        else {
+            _t.success("Study is running! Do not close the console.\nYou will find output here ".concat(studyId, "."), { duration: 4000, position: 'bottom-left', style: { minWidth: '300px', fontSize: '12px' } });
+        }
+    };
     var handleCreateStudy = useCallback(function (name, jobArgs, description, localConfig) {
         if (!selRecipe) {
             return Promise.reject();
         }
-        setCurrRunId(undefined);
-        setIsCloud(localConfig.isLocalJob);
-        // Custom cloud action
-        var handleCloudSuccess = createStudySuccess !== null && createStudySuccess !== void 0 ? createStudySuccess : handleCreateStudySuccess;
-        var handleSuccess = localConfig && localConfig.isLocalJob ? handleCreateStudySuccessLocal : handleCloudSuccess;
         if (host !== 'web' && localConfig) {
             return createLocalStudy({
                 name: name,
                 recipe: selRecipe,
                 description: description !== null && description !== void 0 ? description : 'Study created from pollination',
-            }, jobArgs, localConfig, handleSuccess);
+            }, jobArgs, localConfig, localConfig.isLocalJob ? _onSuccessLocal : _onSuccessCloud);
         }
         else {
             return createStudy({
                 name: name,
                 recipe: selRecipe,
                 description: description !== null && description !== void 0 ? description : 'Study created from pollination',
-            }, jobArgs, handleCloudSuccess);
+            }, jobArgs, _onSuccessCloud);
         }
-    }, [selRecipe, host, createLocalStudy, handleCreateStudySuccess, createStudySuccess, createStudy]);
+    }, [selRecipe, host, createLocalStudy, onSuccess, createStudy]);
     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: {
@@ -44814,12 +44799,9 @@ var GetGeometry = function (_a) {
         var sub = Boolean(optionsConfig) && typeof optionsConfig !== 'undefined' &&
             typeof optionsConfig.subscribe !== 'undefined' &&
             typeof optionsConfig.subscribe.selected !== 'undefined' ? optionsConfig.subscribe.selected : false;
-        var prev = Boolean(optionsConfig) && typeof optionsConfig !== 'undefined' &&
-            typeof optionsConfig.preview !== 'undefined' &&
-            typeof optionsConfig.preview.selected !== 'undefined' ? optionsConfig.preview.selected : false;
+        // Do not trigger prev props - for streamlit
         setSelection(sel);
         setSubscribe(sub);
-        setPreview(prev);
     }, [optionsConfig]);
     useEffect(function () {
         if (!geometry || !setParentState)