updated CredentialTestTable.tsx

updated DashboardLayoutToolbar.tsx updated DashboardLayoutToolbar.tsx pass object correctly updated DashboardLayoutToolbar.tsx pass object correctly2 updated DashboardLayoutToolbar.tsx pass object correctly3 updated DashboardLayoutToolbar.tsx pass object correctly4
cryostatio · Jan 11, 2024 · 4a3d5a1 · 4a3d5a1
1 parent 20d992e
commit 4a3d5a1
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 13 deletions.
diff --git a/src/app/Dashboard/DashboardLayoutToolbar.tsx b/src/app/Dashboard/DashboardLayoutToolbar.tsx
@@ -287,11 +287,13 @@ export const DashboardLayoutToolbar: React.FC<DashboardLayoutToolbarProps> = (_p
     () => (
       <PF5Dropdown
         onSelect={onCreateDropdownSelect}
+        onOpenChange={(open) => setIsCreateDropdownOpen(open)}
         toggle={(toggleRef: React.Ref<MenuToggleElement>) => (
           <MenuToggle
             ref={toggleRef}
             className="dashboard-layout-create-dropdown-toggle"
-            splitButton={[
+            splitButtonOptions={{
+              items:[
               <DropdownItem
                 key="action"
                 onClick={(_e) => {
@@ -304,10 +306,11 @@ export const DashboardLayoutToolbar: React.FC<DashboardLayoutToolbarProps> = (_p
                   {t('DashboardLayoutToolbar.NEW_LAYOUT')}
                 </span>
               </DropdownItem>,
-            ]}
+            ]
+            }}
             variant="primary"
             //splitButtonVariant="action"
-            onToggle={(_event, open) => setIsCreateDropdownOpen(open)}
+
           >
             <EllipsisVIcon />
           </MenuToggle>

diff --git a/src/app/SecurityPanel/Credentials/CredentialTestTable.tsx b/src/app/SecurityPanel/Credentials/CredentialTestTable.tsx
@@ -39,8 +39,11 @@ import {
   Tooltip,
   ValidatedOptions,
   EmptyStateHeader,
+  DropdownList,
+  Select,
+  SelectOption,
 } from '@patternfly/react-core';
-import { Select, SelectOption, SelectVariant } from '@patternfly/react-core/deprecated';
+//import { Select, SelectOption, SelectVariant } from '@patternfly/react-core/deprecated';
 import { ExclamationCircleIcon, SearchIcon, WarningTriangleIcon } from '@patternfly/react-icons';
 import {
   InnerScrollContainer,
@@ -371,19 +374,20 @@ const StatusFilter: React.FC<StatusFilterProps> = ({ onChange, filters, ...props
   return (
     <Select
       {...props}
-      variant={SelectVariant.checkbox}
+      role="menu"
       aria-label="Status"
-      onToggle={handleToggle}
+      toggle={handleToggle}
       onSelect={handleSelect}
-      selections={filters}
+      selected={filters}
       isOpen={isOpen}
-      placeholderText="Status"
     >
-      {Object.values(CredentialTestState).map((state) => (
-        <SelectOption key={state} value={state}>
-          <Label color={getColor(state)}>{state}</Label>
-        </SelectOption>
-      ))}
+      <DropdownList>
+        {Object.values(CredentialTestState).map((state) => (
+          <SelectOption key={state} value={state}>
+            <Label color={getColor(state)}>{state}</Label>
+          </SelectOption>
+        ))}
+      </DropdownList>
     </Select>
   );
 };