address feedback

opendatahub-io · Dec 16, 2024 · eed3c61 · eed3c61
1 parent 7d62552
commit eed3c61
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 111 deletions.
diff --git a/backend/src/utils/constants.ts b/backend/src/utils/constants.ts
@@ -62,7 +62,7 @@ export const blankDashboardCR: DashboardConfig = {
       disableKServeRaw: true,
       disableModelMesh: false,
       disableAcceleratorProfiles: false,
-      disableHardwareProfiles: true,
+      disableHardwareProfiles: false,
       disableDistributedWorkloads: false,
       disableModelRegistry: false,
       disableModelRegistrySecureDB: true,

diff --git a/frontend/src/__tests__/cypress/cypress/pages/hardwareProfile.ts b/frontend/src/__tests__/cypress/cypress/pages/hardwareProfile.ts
@@ -1,5 +1,4 @@
 import { Contextual } from '~/__tests__/cypress/cypress/pages/components/Contextual';
-import { Modal } from './components/Modal';
 import { TableRow } from './components/table';
 
 class HardwareProfileTableToolbar extends Contextual<HTMLElement> {
@@ -105,19 +104,4 @@ class HardwareProfile {
   }
 }
 
-class DisableHardwareProfileModal extends Modal {
-  constructor() {
-    super('Disable hardware profile');
-  }
-
-  findDisableButton() {
-    return this.findFooter().findByRole('button', { name: 'Disable' });
-  }
-
-  findCancelButton() {
-    return this.findFooter().findByRole('button', { name: 'Cancel' });
-  }
-}
-
 export const hardwareProfile = new HardwareProfile();
-export const disableHardwareProfileModal = new DisableHardwareProfileModal();
diff --git a/frontend/src/__tests__/cypress/cypress/tests/mocked/hardwareProfiles/hardwareProfiles.cy.ts b/frontend/src/__tests__/cypress/cypress/tests/mocked/hardwareProfiles/hardwareProfiles.cy.ts
@@ -1,7 +1,4 @@
-import {
-  hardwareProfile,
-  disableHardwareProfileModal,
-} from '~/__tests__/cypress/cypress/pages/hardwareProfile';
+import { hardwareProfile } from '~/__tests__/cypress/cypress/pages/hardwareProfile';
 import { mockHardwareProfile } from '~/__mocks__/mockHardwareProfile';
 import { deleteModal } from '~/__tests__/cypress/cypress/pages/components/DeleteModal';
 import { HardwareProfileModel } from '~/__tests__/cypress/cypress/utils/models';
@@ -90,7 +87,9 @@ describe('Hardware Profile', () => {
       hardwareProfileTableToolbar.findFilterInput('name').clear();
       hardwareProfile.findRows().should('have.length', 2);
 
-      hardwareProfileTableToolbar.findFilterMenuOption('filter-toolbar-dropdown', 'Enable').click();
+      hardwareProfileTableToolbar
+        .findFilterMenuOption('filter-toolbar-dropdown', 'Enabled')
+        .click();
       hardwareProfileTableToolbar.selectEnableFilter('Enabled');
       hardwareProfile.findRows().should('have.length', 1);
       hardwareProfile.getRow('Test Hardware Profile').find().should('exist');
@@ -133,7 +132,6 @@ describe('Hardware Profile', () => {
       hardwareProfile.getRow('Test Hardware Profile Delete').findEnabled().should('not.be.checked');
       hardwareProfile.getRow('Test Hardware Profile').findEnabled().should('be.checked');
       hardwareProfile.getRow('Test Hardware Profile').findEnableSwitch().click();
-      disableHardwareProfileModal.findDisableButton().click();
 
       cy.wait('@toggleHardwareProfile').then((interception) => {
         expect(interception.request.body).to.eql([

diff --git a/frontend/src/pages/hardwareProfiles/DisableHardwareProfileModal.tsx b/frontend/src/pages/hardwareProfiles/DisableHardwareProfileModal.tsx
diff --git a/frontend/src/pages/hardwareProfiles/HardwareProfileEnableToggle.tsx b/frontend/src/pages/hardwareProfiles/HardwareProfileEnableToggle.tsx
@@ -4,8 +4,6 @@ import useNotification from '~/utilities/useNotification';
 import { toggleHardwareProfileEnablement } from '~/api';
 import { HardwareProfileKind } from '~/k8sTypes';
 
-import DisableHardwareProfileModal from '~/pages/hardwareProfiles/DisableHardwareProfileModal';
-
 type HardwareProfileEnableToggleProps = {
   hardwareProfile: HardwareProfileKind;
   refreshHardwareProfiles: () => void;
@@ -16,8 +14,6 @@ const HardwareProfileEnableToggle: React.FC<HardwareProfileEnableToggleProps> =
   refreshHardwareProfiles,
 }) => {
   const { enabled } = hardwareProfile.spec;
-  const label = enabled ? 'enabled' : 'stopped';
-  const [isModalOpen, setIsModalOpen] = React.useState(false);
   const [isEnabled, setEnabled] = React.useState(enabled);
   const [isLoading, setLoading] = React.useState(false);
   const notification = useNotification();
@@ -46,33 +42,14 @@ const HardwareProfileEnableToggle: React.FC<HardwareProfileEnableToggleProps> =
   };
 
   return (
-    <>
-      <Switch
-        aria-label={label}
-        data-testid="enable-switch"
-        id={`${hardwareProfile.metadata.name}-enable-switch`}
-        isChecked={isEnabled}
-        isDisabled={isLoading}
-        onChange={() => {
-          if (isEnabled) {
-            setIsModalOpen(true);
-          } else {
-            handleChange(true);
-          }
-        }}
-      />
-      {isModalOpen ? (
-        <DisableHardwareProfileModal
-          data-testid="disable-hardware-profile-modal"
-          onClose={(confirmStatus) => {
-            if (confirmStatus) {
-              handleChange(false);
-            }
-            setIsModalOpen(false);
-          }}
-        />
-      ) : null}
-    </>
+    <Switch
+      aria-label={enabled ? 'enabled' : 'stopped'}
+      data-testid="enable-switch"
+      id={`${hardwareProfile.metadata.name}-enable-switch`}
+      isChecked={isEnabled}
+      isDisabled={isLoading}
+      onChange={(_e, checked) => handleChange(checked)}
+    />
   );
 };
 

diff --git a/frontend/src/pages/hardwareProfiles/HardwareProfilesTable.tsx b/frontend/src/pages/hardwareProfiles/HardwareProfilesTable.tsx
@@ -33,7 +33,7 @@ const HardwareProfilesTable: React.FC<HardwareProfilesTableProps> = ({
     () =>
       hardwareProfiles.filter((cr) => {
         const nameFilter = filterData.Name?.toLowerCase();
-        const enableFilter = filterData.Enable;
+        const enableFilter = filterData.Enabled;
 
         if (nameFilter && !cr.spec.displayName.toLowerCase().includes(nameFilter)) {
           return false;

diff --git a/frontend/src/pages/hardwareProfiles/HardwareProfilesTableRow.tsx b/frontend/src/pages/hardwareProfiles/HardwareProfilesTableRow.tsx
@@ -5,7 +5,6 @@ import {
   StackItem,
   Timestamp,
   TimestampTooltipVariant,
-  Title,
 } from '@patternfly/react-core';
 import { ActionsColumn, ExpandableRowContent, Tbody, Td, Tr } from '@patternfly/react-table';
 import { relativeTime } from '~/utilities/time';
@@ -51,7 +50,7 @@ const HardwareProfilesTableRow: React.FC<HardwareProfilesTableRowProps> = ({
             truncateDescriptionLines={2}
           />
         </Td>
-        <Td dataLabel="Enable">
+        <Td dataLabel="Enabled">
           <HardwareProfileEnableToggle
             hardwareProfile={hardwareProfile}
             refreshHardwareProfiles={refreshHardwareProfiles}
@@ -105,29 +104,23 @@ const HardwareProfilesTableRow: React.FC<HardwareProfilesTableRowProps> = ({
               {hardwareProfile.spec.identifiers &&
                 hardwareProfile.spec.identifiers.length !== 0 && (
                   <StackItem>
-                    <Title headingLevel="h6" size="md">
-                      Node resources
-                    </Title>
+                    <p className="pf-v6-u-font-weight-bold">Node resources</p>
                     <NodeResourceTable nodeResources={hardwareProfile.spec.identifiers} />
                     <Divider />
                   </StackItem>
                 )}
               {hardwareProfile.spec.nodeSelectors &&
                 hardwareProfile.spec.nodeSelectors.length !== 0 && (
                   <StackItem>
-                    <Title headingLevel="h6" size="md">
-                      Node selectors
-                    </Title>
+                    <p className="pf-v6-u-font-weight-bold">Node selectors</p>
                     <NodeSelectorTable nodeSelectors={hardwareProfile.spec.nodeSelectors} />
                     <Divider />
                   </StackItem>
                 )}
               {hardwareProfile.spec.tolerations &&
                 hardwareProfile.spec.tolerations.length !== 0 && (
                   <StackItem>
-                    <Title headingLevel="h6" size="md">
-                      Tolerations
-                    </Title>
+                    <p className="pf-v6-u-font-weight-bold">Tolerations</p>
                     <TolerationTable tolerations={hardwareProfile.spec.tolerations} />
                     <Divider />
                   </StackItem>

diff --git a/frontend/src/pages/hardwareProfiles/HardwareProfilesToolbar.tsx b/frontend/src/pages/hardwareProfiles/HardwareProfilesToolbar.tsx
@@ -30,7 +30,7 @@ const HardwareProfilesToolbar: React.FC<HardwareProfilesToolbarProps> = ({
           onChange={(_event, value) => onChange(value)}
         />
       ),
-      [HardwareProfileFilterOptions.enable]: ({ value, onChange, ...props }) => (
+      [HardwareProfileFilterOptions.enabled]: ({ value, onChange, ...props }) => (
         <SimpleSelect
           {...props}
           dataTestId="hardware-profile-filter-enable-select"

diff --git a/frontend/src/pages/hardwareProfiles/const.ts b/frontend/src/pages/hardwareProfiles/const.ts
@@ -16,7 +16,7 @@ export const hardwareProfileColumns: SortableData<HardwareProfileKind>[] = [
   },
   {
     field: 'enablement',
-    label: 'Enable',
+    label: 'Enabled',
     sortable: false,
     info: {
       popover: 'Indicates whether the hardware profile is available for new resources.',
@@ -131,12 +131,12 @@ export enum HardwareProfileEnableType {
 
 export enum HardwareProfileFilterOptions {
   name = 'Name',
-  enable = 'Enable',
+  enabled = 'Enabled',
 }
 
 export const hardwareProfileFilterOptions = {
   [HardwareProfileFilterOptions.name]: 'Name',
-  [HardwareProfileFilterOptions.enable]: 'Enable',
+  [HardwareProfileFilterOptions.enabled]: 'Enabled',
 };
 
 export type HardwareProfileFilterDataType = Record<
@@ -146,5 +146,5 @@ export type HardwareProfileFilterDataType = Record<
 
 export const initialHardwareProfileFilterData: HardwareProfileFilterDataType = {
   [HardwareProfileFilterOptions.name]: '',
-  [HardwareProfileFilterOptions.enable]: undefined,
+  [HardwareProfileFilterOptions.enabled]: undefined,
 };