@openshift-assisted/ui-lib 2.15.3-cim → 2.16.1-cim

package/lib/common/components/ui/ClusterEventsToolbar.tsx

@@ -235,6 +235,7 @@ const ClusterEventsToolbar = ({
               isOpen={isHostExpanded}
               onSelect={(e, value) => onHostSelect(value as string, isSelectEventChecked(e))}
               onOpenChange={onHostToggle}
+              isScrollable
               toggle={(toggleRef: React.Ref<MenuToggleElement>) => (
                 <MenuToggle
                   id="cluster-events-hosts-dropdown-button"
@@ -243,6 +244,7 @@ const ClusterEventsToolbar = ({
                   onClick={onHostToggle}
                   isExpanded={isHostExpanded}
                   badge={hostChips.length && <Badge isRead>{hostChips.length}</Badge>}
+                  data-testid="cluster-events-hosts-dropdown-button"
                 >
                   <Placeholder text="Hosts" />
                 </MenuToggle>
@@ -252,6 +254,7 @@ const ClusterEventsToolbar = ({
               <DropdownList>
                 <DropdownItem
                   id={`checkbox-${CLUSTER_LEVEL}`}
+                  data-testid="cluster-level-events-filter-option"
                   hasCheckbox
                   isSelected={getSelections().includes(CLUSTER_LEVEL)}
                   key={CLUSTER_LEVEL}
@@ -261,6 +264,7 @@ const ClusterEventsToolbar = ({
                 </DropdownItem>
                 <DropdownItem
                   id={`checkbox-${DELETED_HOSTS}`}
+                  data-testid="deleted-hosts-filter-option"
                   hasCheckbox
                   isSelected={getSelections().includes(DELETED_HOSTS)}
                   key={DELETED_HOSTS}
@@ -271,6 +275,7 @@ const ClusterEventsToolbar = ({
                 {...sortedHosts.map((host) => (
                   <DropdownItem
                     id={`checkbox-${host.id}`}
+                    data-testid={`host-${host.id}-filter-option`}
                     hasCheckbox
                     isSelected={getSelections().includes(host.id)}
                     key={host.id}
@@ -313,6 +318,7 @@ const ClusterEventsToolbar = ({
                 badge={
                   filters.severities?.length && <Badge isRead>{filters.severities.length}</Badge>
                 }
+                data-testid="cluster-events-severity-dropdown-button"
               >
                 <Placeholder text="Severity" />
               </MenuToggle>

package/lib/common/components/ui/OpenShiftSelectWithSearch.tsx

@@ -1,36 +1,24 @@
-import React, { Dispatch, SetStateAction } from 'react';
-import {
-  Select,
-  SelectOption,
-  SelectList,
-  SelectOptionProps,
-  MenuToggle,
-  MenuToggleElement,
-  TextInputGroup,
-  TextInputGroupMain,
-  TextInputGroupUtilities,
-  Button,
-  Divider,
-  FormHelperText,
-  HelperText,
-  HelperTextItem,
-} from '@patternfly/react-core';
-import TimesIcon from '@patternfly/react-icons/dist/esm/icons/times-icon';
+import React from 'react';
+import { SelectOptionProps } from '@patternfly/react-core';
+import { useField } from 'formik';
 import { OpenshiftVersionOptionType } from '../../types';
 import { HelperTextType } from './OpenShiftVersionDropdown';
-import { useTranslation } from '../../hooks/use-translation-wrapper';
+import { useTranslation } from '../../hooks';
+import { SelectFieldWithSearch } from './formik';
+import { ClusterDetailsValues } from '../clusterWizard';
 
 type OpenshiftSelectWithSearchProps = {
   versions: OpenshiftVersionOptionType[];
   getHelperText?: HelperTextType;
-  setCustomOpenshiftSelect: Dispatch<SetStateAction<OpenshiftVersionOptionType | undefined>>;
 };
 
 export const OpenShiftSelectWithSearch: React.FunctionComponent<OpenshiftSelectWithSearchProps> = ({
   versions,
   getHelperText,
-  setCustomOpenshiftSelect,
 }: OpenshiftSelectWithSearchProps) => {
+  const { t } = useTranslation();
+  const [{ value }] =
+    useField<ClusterDetailsValues['customOpenshiftSelect']>('customOpenshiftSelect');
   const initialSelectOptions = React.useMemo(
     () =>
       versions.map((version) => ({
@@ -43,22 +31,11 @@ export const OpenShiftSelectWithSearch: React.FunctionComponent<OpenshiftSelectW
     [versions],
   );
 
-  const [isOpen, setIsOpen] = React.useState(false);
-  const [selected, setSelected] = React.useState<string>('');
-  const [inputValue, setInputValue] = React.useState<string>('');
   const [filterValue, setFilterValue] = React.useState<string>('');
   const [selectOptions, setSelectOptions] =
     React.useState<SelectOptionProps[]>(initialSelectOptions);
-  const [focusedItemIndex, setFocusedItemIndex] = React.useState<number | null>(null);
-  const [activeItem, setActiveItem] = React.useState<string | null>(null);
-  const textInputRef = React.useRef<HTMLInputElement>();
-  const { t } = useTranslation();
 
-  React.useEffect(() => {
-    if (textInputRef.current) {
-      textInputRef.current.maxLength = 30;
-    }
-  }, []);
+  const helperText = getHelperText && getHelperText(value, true);
 
   React.useEffect(() => {
     let newSelectOptions: SelectOptionProps[] = initialSelectOptions;
@@ -74,221 +51,43 @@ export const OpenShiftSelectWithSearch: React.FunctionComponent<OpenshiftSelectW
         newSelectOptions = [
           {
             isDisabled: true,
-            children: `No results found for "${filterValue}"`,
-            value: 'no results',
+            children: t('ai:No results found for {{filter}}', { filter: filterValue }),
+            value: 'no_results',
           },
         ];
       }
-
-      // Open the menu when the input value changes and the new value is not empty
-      if (!isOpen) {
-        setIsOpen(true);
-      }
-    }
-
-    setSelectOptions(newSelectOptions);
-    setActiveItem(null);
-    setFocusedItemIndex(null);
-  }, [filterValue, initialSelectOptions, isOpen]);
-
-  const onToggleClick = () => {
-    setIsOpen(!isOpen);
-  };
-
-  const onSelect = (
-    _event: React.MouseEvent<Element, MouseEvent> | undefined,
-    value: string | number | undefined,
-  ) => {
-    // Check if the specific value exists in newSelectOptions
-    const foundItem = selectOptions.find((menuItem) => String(menuItem.value) === String(value));
-    const newLabel = foundItem?.children;
-    if (value && value !== 'no results') {
-      setInputValue(newLabel as string);
-      setFilterValue('');
-      setSelected(value as string);
-      const filteredVersions = versions.filter((version) => version.value === value);
-      setCustomOpenshiftSelect({
-        label:
-          filteredVersions[0].supportLevel === 'beta'
-            ? filteredVersions[0].label + ' - ' + t('ai:Developer preview release')
-            : filteredVersions[0].label,
-        value: filteredVersions[0].value,
-        version: filteredVersions[0].version,
-        default: filteredVersions[0].default,
-        supportLevel: filteredVersions[0].supportLevel,
-      });
-    }
-    setIsOpen(false);
-    setFocusedItemIndex(null);
-    setActiveItem(null);
-  };
-
-  const onTextInputChange = (_event: React.FormEvent<HTMLInputElement>, value: string) => {
-    setInputValue(value);
-    setFilterValue(value);
-  };
-
-  const handleMenuArrowKeys = (key: string) => {
-    let indexToFocus;
-
-    if (isOpen) {
-      if (key === 'ArrowUp') {
-        // When no index is set or at the first index, focus to the last, otherwise decrement focus index
-        if (focusedItemIndex === null || focusedItemIndex === 0) {
-          indexToFocus = selectOptions.length - 1;
-        } else {
-          indexToFocus = focusedItemIndex - 1;
-        }
-      }
-
-      if (key === 'ArrowDown') {
-        // When no index is set or at the last index, focus to the first, otherwise increment focus index
-        if (focusedItemIndex === null || focusedItemIndex === selectOptions.length - 1) {
-          indexToFocus = 0;
-        } else {
-          indexToFocus = focusedItemIndex + 1;
-        }
-      }
-
-      setFocusedItemIndex(indexToFocus ?? 0);
-      const focusedItem = selectOptions.filter((option) => !option.isDisabled)[indexToFocus ?? 0];
-      setActiveItem(`select-typeahead-${(focusedItem.value as string).replace(' ', '-')}`);
     }
-  };
-
-  const onInputKeyDown = (event: React.KeyboardEvent<HTMLInputElement>) => {
-    const enabledMenuItems = selectOptions.filter((option) => !option.isDisabled);
-    const [firstMenuItem] = enabledMenuItems;
-    const focusedItem = focusedItemIndex ? enabledMenuItems[focusedItemIndex] : firstMenuItem;
 
-    switch (event.key) {
-      // Select the first available option
-      case 'Enter':
-        if (isOpen && focusedItem.value !== 'no results') {
-          setInputValue(String(focusedItem.children));
-          setFilterValue('');
-          setSelected(String(focusedItem.children));
-        }
+    const selectOptionsWithDividers = newSelectOptions.map((option, index) => {
+      const match = (option.value as string).match(/\d+\.(\d+)\.\d+/);
+      const y = match ? match[1] : null;
 
-        setIsOpen((prevIsOpen) => !prevIsOpen);
-        setFocusedItemIndex(null);
-        setActiveItem(null);
+      const previousY =
+        index > 0
+          ? ((newSelectOptions[index - 1].value as string).match(/\d+\.(\d+)\.\d+/) || [])[1]
+          : null;
 
-        break;
-      case 'Tab':
-      case 'Escape':
-        setIsOpen(false);
-        setActiveItem(null);
-        break;
-      case 'ArrowUp':
-      case 'ArrowDown':
-        event.preventDefault();
-        handleMenuArrowKeys(event.key);
-        break;
-    }
-  };
+      return {
+        ...option,
+        showDivider: previousY !== null && y !== previousY,
+      };
+    });
 
-  const toggle = (toggleRef: React.Ref<MenuToggleElement>) => (
-    <MenuToggle
-      ref={toggleRef}
-      variant="typeahead"
-      onClick={onToggleClick}
-      isExpanded={isOpen}
-      isFullWidth
-    >
-      <TextInputGroup isPlain>
-        <TextInputGroupMain
-          value={inputValue}
-          onClick={onToggleClick}
-          onChange={onTextInputChange}
-          onKeyDown={onInputKeyDown}
-          id="typeahead-select-input"
-          autoComplete="off"
-          innerRef={textInputRef}
-          placeholder=""
-          {...(activeItem && { 'aria-activedescendant': activeItem })}
-          role="combobox"
-          isExpanded={isOpen}
-          aria-controls="select-typeahead-listbox"
-        />
-
-        <TextInputGroupUtilities>
-          {!!inputValue && (
-            <Button
-              variant="plain"
-              onClick={() => {
-                setSelected('');
-                setInputValue('');
-                setFilterValue('');
-                textInputRef?.current?.focus();
-              }}
-              aria-label="Clear input value"
-            >
-              <TimesIcon aria-hidden />
-            </Button>
-          )}
-        </TextInputGroupUtilities>
-      </TextInputGroup>
-    </MenuToggle>
-  );
-
-  const helperText = getHelperText && getHelperText(selected, true);
+    setSelectOptions(selectOptionsWithDividers);
+  }, [filterValue, initialSelectOptions, t]);
 
   return (
-    <>
-      <Select
-        id="customOpenshiftSelect"
-        isOpen={isOpen}
-        selected={selected}
-        onSelect={onSelect}
-        onOpenChange={() => {
-          setIsOpen(false);
-        }}
-        toggle={toggle}
-        isScrollable
-      >
-        <SelectList id="select-typeahead-listbox">
-          {selectOptions.reverse().map((option, index) => {
-            const match = (option.value as string).match(/\d+\.(\d+)\.\d+/);
-            const y = match ? match[1] : null;
-
-            const previousY =
-              index > 0
-                ? ((selectOptions[index - 1].value as string).match(/\d+\.(\d+)\.\d+/) || [])[1]
-                : null;
-
-            const showDivider = previousY !== null && y !== previousY;
-            return (
-              <React.Fragment key={index}>
-                {showDivider && (
-                  <Divider
-                    component="li"
-                    id={`divider-${option.value as string}`}
-                    key={`divider-${option.value as string}`}
-                  />
-                )}
-                <SelectOption
-                  key={option.value as string}
-                  isFocused={focusedItemIndex === index}
-                  className={option.className}
-                  onClick={() => setSelected(option.value as string)}
-                  id={`select-typeahead-${(option.value as string).replace(' ', '-')}`}
-                  {...option}
-                  ref={null}
-                />
-              </React.Fragment>
-            );
-          })}
-        </SelectList>
-      </Select>
-      <FormHelperText>
-        <HelperText>
-          <HelperTextItem variant="default">
-            {helperText ??
-              'Select an OpenShift version from the list or use the type ahead to narrow down the list.'}
-          </HelperTextItem>
-        </HelperText>
-      </FormHelperText>
-    </>
+    <SelectFieldWithSearch
+      selectOptions={selectOptions}
+      filterValue={filterValue}
+      setFilterValue={setFilterValue}
+      name={'customOpenshiftSelect'}
+      helperText={
+        helperText ??
+        t(
+          'ai:Select an OpenShift version from the list or use the type ahead to narrow down the list.',
+        )
+      }
+    />
   );
 };

package/lib/common/components/ui/OpenShiftVersionDropdown.tsx

@@ -21,7 +21,7 @@ import ExternalLink from './ExternalLink';
 import { OCP_RELEASES_PAGE } from '../../config';
 import { ClusterDetailsValues, ItemDropdown } from '../clusterWizard';
 
-export type HelperTextType = (value: string | undefined, inModal?: boolean) => JSX.Element | null;
+export type HelperTextType = (value: string | null, inModal?: boolean) => JSX.Element | null;
 
 type OpenShiftVersionDropdownProps = {
   name: string;
@@ -30,7 +30,7 @@ type OpenShiftVersionDropdownProps = {
   getHelperText?: HelperTextType;
   showReleasesLink: boolean;
   showOpenshiftVersionModal: () => void;
-  customItems: ItemDropdown;
+  customItem?: OpenshiftVersionOptionType;
 };
 
 const getParsedVersions = (items: ItemDropdown) => {
@@ -49,7 +49,7 @@ export const OpenShiftVersionDropdown = ({
   getHelperText,
   showReleasesLink,
   showOpenshiftVersionModal,
-  customItems,
+  customItem,
 }: OpenShiftVersionDropdownProps) => {
   const [field, , { setValue }] = useField<string>(name);
   const [isOpen, setOpen] = React.useState(false);
@@ -61,9 +61,13 @@ export const OpenShiftVersionDropdown = ({
   const [current, setCurrent] = React.useState<string>();
 
   React.useEffect(() => {
-    const defaultVersion = customOpenshiftSelect
-      ? customOpenshiftSelect
-      : versions.find((item) => item.default);
+    let defaultVersion = versions.find((item) => item.default);
+    if (customOpenshiftSelect && customItem) {
+      defaultVersion = customItem;
+    } else if (customOpenshiftSelect) {
+      defaultVersion = versions.find((item) => item.value === customOpenshiftSelect);
+    }
+
     setCurrent(defaultVersion?.label || '');
     setValue(defaultVersion?.value || '');
     // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -85,30 +89,17 @@ export const OpenShiftVersionDropdown = ({
     return items;
   });
 
-  const parsedVersionsForCustomItems = getParsedVersions(customItems);
-  let lastCustomY: string | undefined = '';
-  const customDropdownItems = parsedVersionsForCustomItems.parsedVersions.map(({ y, versions }) => {
-    const customItems = versions.map(({ value, label }) => (
-      <DropdownItem key={value} id={value} value={value}>
-        {label}
-      </DropdownItem>
-    ));
-    if (lastCustomY !== null && y !== lastCustomY) {
-      customItems.push(<Divider key={`separator-${y || ''}`} />);
-    }
-    lastCustomY = y;
-    return customItems;
-  });
-
   const dropdownGroup = [
     dropdownItems.length && (
       <DropdownGroup label="Latest releases" key="latest-releases">
         {dropdownItems}
       </DropdownGroup>
     ),
-    customDropdownItems.length && (
+    customItem && (
       <DropdownGroup label="Custom releases" key="custom-releases">
-        {customDropdownItems}
+        <DropdownItem key={customItem.value} id={customItem.value} value={customItem.value}>
+          {customItem.label}
+        </DropdownItem>
       </DropdownGroup>
     ),
     <DropdownGroup key="all-available-versions">

package/lib/common/components/ui/OpenShiftVersionModal.tsx

@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import React from 'react';
 import { Button, ButtonVariant, FormGroup, Modal, ModalVariant } from '@patternfly/react-core';
 import { OpenShiftSelectWithSearch } from './OpenShiftSelectWithSearch';
 import { HelperTextType } from './OpenShiftVersionDropdown';
@@ -18,14 +18,10 @@ export const OpenShiftVersionModal = ({
   getHelperText,
 }: OpenShiftVersionModalProps) => {
   const { setFieldValue } = useFormikContext<ClusterDetailsValues>();
-  const onClose = () => setOpenshiftVersionModalOpen(false);
-  const [customOpenshiftSelect, setCustomOpenshiftSelect] = useState<OpenshiftVersionOptionType>(); // Cambiar el tipo según lo que esperes aquí
 
-  const handleSelect = () => {
-    if (customOpenshiftSelect) {
-      setFieldValue('customOpenshiftSelect', customOpenshiftSelect);
-    }
-    onClose();
+  const onCancel = () => {
+    setFieldValue('customOpenshiftSelect', null);
+    setOpenshiftVersionModalOpen(false);
   };
 
   return (
@@ -34,14 +30,18 @@ export const OpenShiftVersionModal = ({
       id="available-openshift-versions-modal"
       isOpen
       actions={[
-        <Button key="select-custom-ocp" variant={ButtonVariant.primary} onClick={handleSelect}>
+        <Button
+          key="select-custom-ocp"
+          variant={ButtonVariant.primary}
+          onClick={() => setOpenshiftVersionModalOpen(false)}
+        >
           Select
         </Button>,
-        <Button key="close-custom-ocp" variant={ButtonVariant.link} onClick={onClose}>
+        <Button key="close-custom-ocp" variant={ButtonVariant.link} onClick={onCancel}>
           Cancel
         </Button>,
       ]}
-      onClose={onClose}
+      onClose={onCancel}
       variant={ModalVariant.small}
     >
       <FormGroup
@@ -50,11 +50,7 @@ export const OpenShiftVersionModal = ({
         label={'OpenShift version'}
         isRequired
       >
-        <OpenShiftSelectWithSearch
-          versions={allVersions}
-          getHelperText={getHelperText}
-          setCustomOpenshiftSelect={setCustomOpenshiftSelect}
-        />
+        <OpenShiftSelectWithSearch versions={allVersions} getHelperText={getHelperText} />
       </FormGroup>
     </Modal>
   );

package/lib/common/components/ui/SimpleDropdown.tsx

@@ -63,7 +63,6 @@ export const SimpleDropdown = ({
       onOpenChange={() => setOpen(!isOpen)}
       toggle={toggle}
       isOpen={isOpen}
-      isPlain
       id={idPrefix ? `${idPrefix}-dropdown-toggle` : undefined}
       popperProps={{ appendTo: menuAppendTo }}
     >