pollination-react-io 1.18.0 → 1.18.2

package/build/atoms/ComboBox/ComboBox.types.d.ts

@@ -8,6 +8,7 @@ export interface ComboBoxProps {
     }[];
     renderItem?: (item: any, i?: number, arr?: any[]) => ReactNode;
     setSelected?: (item: any) => void;
+    onClear?: () => void;
     onScrollReachEnd?: (...args: any) => void;
     stateReducer?: (state: UseComboboxState<{
         id: string;

package/build/index.esm.js

@@ -8647,12 +8647,11 @@ var ScrollZone = function (_a) {
 
 var ICON_SIZE = 18;
 var ComboBox = React__default.forwardRef(function ComboBox(_a, ref) {
-    var _b;
-    var items = _a.items, renderItem = _a.renderItem, setSelected = _a.setSelected, onScrollReachEnd = _a.onScrollReachEnd, _c = _a.stateReducer, stateReducer = _c === void 0 ? function (state, _a) {
+    var items = _a.items, renderItem = _a.renderItem, setSelected = _a.setSelected, onClear = _a.onClear, onScrollReachEnd = _a.onScrollReachEnd, _b = _a.stateReducer, stateReducer = _b === void 0 ? function (state, _a) {
         _a.type; var changes = _a.changes;
         return changes;
-    } : _c, _d = _a.disabled, disabled = _d === void 0 ? false : _d, hidden = _a.hidden, _e = _a.loading, loading = _e === void 0 ? false : _e, _f = _a.icon, icon = _f === void 0 ? React__default.createElement(CursorText$1, null) : _f, inputStyle = _a.inputStyle, menuStyle = _a.menuStyle, _g = _a.maxHeight, maxHeight = _g === void 0 ? 180 : _g, inputProps = _a.inputProps, header = _a.header, footer = _a.footer, _h = _a.noMatchText, noMatchText = _h === void 0 ? 'No matching items' : _h;
-    var _j = useState(items), inputItems = _j[0], setInputItems = _j[1];
+    } : _b, _c = _a.disabled, disabled = _c === void 0 ? false : _c, hidden = _a.hidden, _d = _a.loading, loading = _d === void 0 ? false : _d, _e = _a.icon, icon = _e === void 0 ? React__default.createElement(CursorText$1, null) : _e, inputStyle = _a.inputStyle, menuStyle = _a.menuStyle, _f = _a.maxHeight, maxHeight = _f === void 0 ? 180 : _f, inputProps = _a.inputProps, header = _a.header, footer = _a.footer, _g = _a.noMatchText, noMatchText = _g === void 0 ? 'No matching items' : _g;
+    var _h = useState(items), inputItems = _h[0], setInputItems = _h[1];
     useEffect(function () {
         setInputItems(items);
     }, [items]);
@@ -8661,7 +8660,7 @@ var ComboBox = React__default.forwardRef(function ComboBox(_a, ref) {
             lodash_debounce(onScrollReachEnd, 1000, { leading: true, trailing: false })
             : undefined;
     }, [onScrollReachEnd]);
-    var _k = useCombobox({
+    var _j = useCombobox({
         items: inputItems,
         onInputValueChange: function (_a) {
             var inputValue = _a.inputValue;
@@ -8676,20 +8675,22 @@ var ComboBox = React__default.forwardRef(function ComboBox(_a, ref) {
         stateReducer: stateReducer
         // to what extent is this necessary?
         // environment: environment ? environment : undefined
-    }), isOpen = _k.isOpen, getToggleButtonProps = _k.getToggleButtonProps, getMenuProps = _k.getMenuProps, getInputProps = _k.getInputProps, getComboboxProps = _k.getComboboxProps, highlightedIndex = _k.highlightedIndex, getItemProps = _k.getItemProps, openMenu = _k.openMenu, closeMenu = _k.closeMenu, selectItem = _k.selectItem, selectedItem = _k.selectedItem, inputValue = _k.inputValue;
+    }), isOpen = _j.isOpen, getToggleButtonProps = _j.getToggleButtonProps, getMenuProps = _j.getMenuProps, getInputProps = _j.getInputProps, getComboboxProps = _j.getComboboxProps, highlightedIndex = _j.highlightedIndex, getItemProps = _j.getItemProps, openMenu = _j.openMenu, closeMenu = _j.closeMenu, selectItem = _j.selectItem, selectedItem = _j.selectedItem, inputValue = _j.inputValue, setInputValue = _j.setInputValue;
     useImperativeHandle(ref, function () { return ({
         selectItem: selectItem,
         selectedItem: selectedItem,
-        inputValue: inputValue
+        inputValue: inputValue,
+        setInputValue: setInputValue,
     }); });
     useEffect(function () {
-        // @ts-ignore
-        // console.log('combobox: ', selectedItem && (selectedItem.name || selectedItem.file_name) ? selectedItem.name ?? selectedItem.file_name : undefined,)
+        var _a;
         if (!selectedItem)
             return;
+        // @ts-ignore
+        setInputValue((_a = selectedItem.name) !== null && _a !== void 0 ? _a : selectedItem.file_name);
         setSelected && setSelected(selectedItem);
         closeMenu();
-    }, [closeMenu, selectedItem, setSelected]);
+    }, [closeMenu, selectedItem, setInputValue, setSelected]);
     return (React__default.createElement("div", { "data-testid": "ComboBoxSelect", className: hidden ? undefined : 'poll-combobox' },
         React__default.createElement(ButtonGroup, { wrapperProps: __assign(__assign({}, getComboboxProps()), { style: __assign(__assign({}, inputStyle), { position: 'relative', width: '100%' }) }), disabled: disabled },
             React__default.createElement("input", __assign({}, getInputProps(__assign(__assign({ placeholder: 'Search for something...', spellCheck: false, disabled: disabled, style: {
@@ -8698,9 +8699,7 @@ var ComboBox = React__default.forwardRef(function ComboBox(_a, ref) {
                     borderBottomLeftRadius: isOpen ? 0 : 4,
                     flex: 12,
                     lineHeight: '1.5rem',
-                }, 
-                // @ts-ignore
-                value: selectedItem && (selectedItem.name || selectedItem.file_name) ? (_b = selectedItem.name) !== null && _b !== void 0 ? _b : selectedItem.file_name : '' }, inputProps), { onFocus: function () {
+                } }, inputProps), { onFocus: function () {
                     openMenu();
                 }, type: hidden ? 'hidden' : undefined })))),
             !hidden &&
@@ -8722,15 +8721,16 @@ var ComboBox = React__default.forwardRef(function ComboBox(_a, ref) {
                     return React__default.createElement(React__default.Fragment, null);
                 }
                 else if (loading) {
-                    React__default.createElement("button", { type: 'button', tabIndex: -1, disabled: disabled, style: {
+                    return (React__default.createElement("button", { type: 'button', tabIndex: -1, disabled: disabled, style: {
                             borderBottomRightRadius: isOpen ? 0 : 4,
                         } },
-                        React__default.createElement(ArrowClockwise$1, { className: "spin", size: ICON_SIZE }));
+                        React__default.createElement(ArrowClockwise$1, { className: "spin", size: ICON_SIZE })));
                 }
-                else if (selectItem) {
+                else if (selectedItem) {
                     return (React__default.createElement("button", { type: 'button', tabIndex: -1, disabled: disabled, onClick: function () {
                             selectItem(null);
                             setSelected && setSelected(undefined);
+                            onClear && onClear();
                         }, style: {
                             borderBottomRightRadius: isOpen ? 0 : 4,
                         } },
@@ -40503,6 +40503,7 @@ var SelectCloudArtifacts = function (_a) {
     // Support default values
     var defaultValueRef = useRef(defaultValue ? defaultValue.split('/').splice(-1)[0] : undefined);
     var _g = useState(defaultValue ? defaultValue.split('/').slice(0, -1) : []), path = _g[0], setPath = _g[1];
+    var pathRef = useRef(defaultValue ? defaultValue.split('/').slice(0, -1) : []);
     var _h = useState(), selArtifact = _h[0], setSelArtifact = _h[1];
     useEffect(function () {
         setLoading(true);
@@ -40517,22 +40518,35 @@ var SelectCloudArtifacts = function (_a) {
                 if (defaultFile) {
                     comboBoxRef.current.selectItem(defaultFile);
                     defaultValueRef.current = undefined;
-                    onChange && onChange(__assign(__assign({}, selArtifact), { pollination_cloud_path: "".concat(path, "/").concat(defaultFile.file_name) }));
+                    setSelArtifact(defaultFile);
                 }
             }
         })
             .finally(function () { return setLoading(false); });
-    }, [client, defaultValue, fileNameMatch, host, jobId, listArtifacts, onChange, path, selArtifact]);
+    }, [
+        client,
+        defaultValue,
+        fileNameMatch,
+        host,
+        jobId,
+        listArtifacts,
+        onChange,
+        path,
+    ]);
     useEffect(function () {
         if (!selArtifact || selArtifact.file_type !== 'folder')
             return;
-        setPath(function (path) { return ["".concat(path, "/").concat(selArtifact.file_name)]; });
+        setPath(function (path) {
+            var newPath = ["".concat(path, "/").concat(selArtifact.file_name)];
+            pathRef.current = ["".concat(path, "/").concat(selArtifact.file_name)];
+            return newPath;
+        });
     }, [onChange, selArtifact]);
     useEffect(function () {
         if (!selArtifact || selArtifact.file_type !== 'file')
             return;
-        onChange && onChange(__assign(__assign({}, selArtifact), { pollination_cloud_path: "".concat(path, "/").concat(selArtifact.file_name) }));
-    }, [onChange, path, selArtifact]);
+        onChange && onChange(__assign(__assign({}, selArtifact), { pollination_cloud_path: "".concat(pathRef.current, "/").concat(selArtifact.file_name) }));
+    }, [onChange, selArtifact]);
     var stateReducer = useCallback(function (state, actionAndChanges) {
         var type = actionAndChanges.type, changes = actionAndChanges.changes;
         switch (type) {
@@ -40570,7 +40584,7 @@ var SelectCloudArtifacts = function (_a) {
                 } },
                 icon,
                 item.name));
-        }, setSelected: setSelArtifact, loading: loading, disabled: !projectName || !projectOwner, hidden: hidden, icon: React__default.createElement(CloudPlus$1, null), header: path.length > 0 &&
+        }, setSelected: setSelArtifact, onClear: function () { return setPath([]); }, loading: loading, disabled: !projectName || !projectOwner, hidden: hidden, icon: React__default.createElement(CloudPlus$1, null), header: path.length > 0 &&
             React__default.createElement("div", { key: "header", style: {
                     width: '100%',
                     display: 'flex',
@@ -41625,7 +41639,7 @@ var SelectProject = function (_a) {
         setQueryConfig(function (q) { return (__assign(__assign({}, q), { owner: [projectOwner], page: 1 })); });
     }, [projectOwner]);
     var fetchProjects = useCallback(function (queryConfig) {
-        if (!authUser)
+        if (!authUser || !client || !client.projects)
             return;
         if (!queryConfig.owner)
             return;
@@ -41644,7 +41658,7 @@ var SelectProject = function (_a) {
             .finally(function () {
             setLoading(false);
         });
-    }, [authUser, client.projects]);
+    }, [authUser, client]);
     useEffect(function () {
         fetchProjects(queryConfig);
     }, [fetchProjects, queryConfig]);
@@ -41695,7 +41709,7 @@ var SelectAccount = function (_a) {
         setQueryConfig(function (q) { return (__assign(__assign({}, q), { member: authUser ? [authUser === null || authUser === void 0 ? void 0 : authUser.username] : undefined, page: 1 })); });
     }, [authUser]);
     var fetchOrganizations = useCallback(function (queryConfig) {
-        if (!authUser)
+        if (!authUser || !client || !client.orgs)
             return;
         if (!queryConfig.member)
             return;
@@ -41715,7 +41729,7 @@ var SelectAccount = function (_a) {
             .finally(function () {
             setLoading(false);
         });
-    }, [authUser, client.orgs]);
+    }, [authUser, client]);
     useEffect(function () {
         fetchOrganizations(queryConfig);
     }, [fetchOrganizations, queryConfig]);
@@ -41787,7 +41801,7 @@ var SelectRecipe = function (_a) {
         setQueryConfig(function (q) { return (__assign(__assign({}, q), { owner: projectOwner, name: projectName, page: 1 })); });
     }, [projectOwner, projectName]);
     var fetchRecipes = useCallback(function (queryConfig) {
-        if (!authUser)
+        if (!authUser || !client || !client.projects)
             return;
         if (!queryConfig.owner || !queryConfig.name)
             return;
@@ -41807,7 +41821,7 @@ var SelectRecipe = function (_a) {
             .finally(function () {
             setLoading(false);
         });
-    }, [authUser, client.projects]);
+    }, [authUser, client]);
     useEffect(function () {
         fetchRecipes(queryConfig);
     }, [fetchRecipes, queryConfig]);
@@ -43856,7 +43870,7 @@ var RecipeInputsForm = function (_a) {
     var _e = useForm({
         resolver: Oe(schema),
         mode: 'all'
-    }), control = _e.control, register = _e.register, handleSubmit = _e.handleSubmit, resetField = _e.resetField, _f = _e.formState, errors = _f.errors, isValid = _f.isValid; _f.isSubmitting;
+    }), control = _e.control, register = _e.register, handleSubmit = _e.handleSubmit, reset = _e.reset, resetField = _e.resetField, _f = _e.formState, errors = _f.errors, isValid = _f.isValid; _f.isSubmitting;
     var _onSubmit = function (_data) {
         var data = __assign({}, _data);
         // strip study name
@@ -43878,6 +43892,7 @@ var RecipeInputsForm = function (_a) {
             setLoading(true);
             onSubmit(studyName, data)
                 .finally(function () {
+                reset();
                 setLoading(false);
             });
         }
@@ -43922,9 +43937,6 @@ var RecipeInputsForm = function (_a) {
                         } }, g.map(function (input, i) {
                         var _a;
                         var hidden = controlledValues && controlledValues[input.name] ? controlledValues[input.name].hidden : false;
-                        // if (hidden) {
-                        //   console.log(input)
-                        // }
                         var defaultValue = controlledValues && controlledValues[input.name] ? controlledValues[input.name].value : input.default;
                         var inputProps = __assign({}, register(input.name, {
                             valueAsNumber: ['DAGIntegerInput', 'DAGNumberInput'].includes(input.type)
@@ -45658,8 +45670,6 @@ var SelectLocalArtifacts = function (_a) {
         if (!selArtifact)
             return;
         if (selArtifact.kind === 'file') {
-            // console.log(selArtifact)
-            // directoryRef.current[0].resolve(selArtifact).then((path) => console.log(path) )
             var getFile = function (fileHandle) { return __awaiter$1(void 0, void 0, void 0, function () {
                 var path, _a, _b;
                 return __generator$1(this, function (_c) {
@@ -45846,7 +45856,7 @@ var SelectRun = function (_a) {
         setQueryConfig(function (q) { return (__assign(__assign({}, q), { jobId: jobId, owner: projectOwner, name: projectName, page: 1 })); });
     }, [jobId, projectOwner, projectName]);
     var fetchRuns = useCallback(function (queryConfig) {
-        if (!authUser)
+        if (!authUser || !client || !client.runs)
             return;
         if (!queryConfig.name || !queryConfig.owner || !queryConfig.jobId)
             return;
@@ -45866,7 +45876,7 @@ var SelectRun = function (_a) {
             .finally(function () {
             setLoading(false);
         });
-    }, [authUser, client.runs]);
+    }, [authUser, client]);
     useEffect(function () {
         fetchRuns(queryConfig);
     }, [fetchRuns, queryConfig]);
@@ -45937,7 +45947,7 @@ var SelectStudy = function (_a) {
         setQueryConfig(function (q) { return (__assign(__assign({}, q), { owner: projectOwner, name: projectName, page: 1 })); });
     }, [projectOwner, projectName]);
     var fetchStudies = useCallback(function (queryConfig) {
-        if (!authUser)
+        if (!authUser || !client || !client.jobs)
             return;
         if (!queryConfig.name || !queryConfig.owner)
             return;
@@ -45957,7 +45967,7 @@ var SelectStudy = function (_a) {
             .finally(function () {
             setLoading(false);
         });
-    }, [authUser, client.jobs]);
+    }, [authUser, client]);
     useEffect(function () {
         fetchStudies(queryConfig);
     }, [fetchStudies, queryConfig]);