Re-apply codemods after rebase

opendatahub-io · Oct 23, 2024 · c1ea58f · c1ea58f
1 parent 0aaf092
commit c1ea58f
Show file tree

Hide file tree

Showing 18 changed files with 30 additions and 35 deletions.
diff --git a/frontend/src/app/App.scss b/frontend/src/app/App.scss
@@ -49,16 +49,16 @@ body,
 // All classes reverted to pf-v5 prefix don't exist in v6 and could probably be removed since menu-toggle and menu__item are being targeted
 .pf-v6-c-page,
 .pf-v6-c-modal-box {
-  .pf-v5-c-app-launcher,
+  .pf-v6-c-app-launcher,
   .pf-v6-c-button,
-  .pf-v5-c-dropdown,
-  .pf-v5-c-dropdown__menu-item,
-  .pf-v5-c-dropdown__toggle,
+  .pf-v6-c-dropdown,
+  .pf-v6-c-dropdown__menu-item,
+  .pf-v6-c-dropdown__toggle,
   .pf-v6-c-menu-toggle,
   .pf-v6-c-menu__item,
-  .pf-v5-c-select,
-  .pf-v5-c-select__menu-item,
-  .pf-v5-c-select__toggle,
+  .pf-v6-c-select,
+  .pf-v6-c-select__menu-item,
+  .pf-v6-c-select__toggle,
   .pf-v6-c-text-input-group,
   .pf-v6-c-form-control {
     font-size: var(--pf-t--global--font--size--body--sm);

diff --git a/frontend/src/components/table/types.ts b/frontend/src/components/table/types.ts
@@ -24,6 +24,6 @@ export type SortableData<T> = Pick<
    * Assume ASC -- the result will be inverted internally if needed.
    */
   sortable: boolean | ((a: T, b: T, keyField: string) => number);
-  // The below can be removed when PatternFly adds a replacement utility class for pf-v5-u-background-color-200 in v6
+  // The below can be removed when PatternFly adds a replacement utility class for pf-v6-u-background-color-200 in v6
   style?: React.CSSProperties;
 };
diff --git a/frontend/src/concepts/pipelines/content/import/PipelineImportBase.tsx b/frontend/src/concepts/pipelines/content/import/PipelineImportBase.tsx
@@ -4,12 +4,12 @@ import {
   Button,
   Form,
   FormGroup,
-  Modal,
   Stack,
   StackItem,
   TextArea,
   TextInput,
 } from '@patternfly/react-core';
+import { Modal } from '@patternfly/react-core/deprecated';
 import { usePipelinesAPI } from '~/concepts/pipelines/context';
 import { PipelineKFv2, PipelineVersionKFv2 } from '~/concepts/pipelines/kfTypes';
 import { getDisplayNameFromK8sResource } from '~/concepts/k8s/utils';

diff --git a/frontend/src/concepts/pipelines/content/pipelinesDetails/pipelineRun/runLogs/LogsTab.tsx b/frontend/src/concepts/pipelines/content/pipelinesDetails/pipelineRun/runLogs/LogsTab.tsx
@@ -108,7 +108,7 @@ const LogsTab: React.FC<LogsTabProps> = ({ task, isCached }) => {
 
   React.useEffect(() => {
     const logWindowElement = document.querySelector(
-      '#dashboard-logviewer .pf-v5-c-log-viewer__main',
+      '#dashboard-logviewer .pf-v6-c-log-viewer__main',
     );
     if (logWindowElement) {
       logWindowElement.addEventListener('mousedown', () => setIsPaused(true));

diff --git a/frontend/src/concepts/pipelines/content/utils.tsx b/frontend/src/concepts/pipelines/content/utils.tsx
@@ -76,7 +76,7 @@ export const computeRunStatus = (run?: PipelineRunKFv2 | null): RunStatusDetails
       break;
     case RuntimeStateKF.CANCELED:
       icon = <BanIcon />;
-      color = 'gold';
+      color = 'orangered';
       label = runtimeStateLabels[RuntimeStateKF.CANCELED];
       break;
     case RuntimeStateKF.PAUSED:

diff --git a/frontend/src/concepts/roleBinding/RoleBindingPermissionsTableRow.tsx b/frontend/src/concepts/roleBinding/RoleBindingPermissionsTableRow.tsx
@@ -181,12 +181,11 @@ const RoleBindingPermissionsTableRow: React.FC<RoleBindingPermissionsTableRowPro
           ) : isDefaultGroup ? (
             <Tooltip content="The default group always has access to model registry.">
               <Button
+                icon={<EllipsisVIcon />}
                 variant="plain"
                 isAriaDisabled
                 aria-label="The default group always has access to model registry."
-              >
-                <EllipsisVIcon />
-              </Button>
+              />
             </Tooltip>
           ) : (
             <ActionsColumn

diff --git a/frontend/src/concepts/trustyai/content/InstallTrustyModal.tsx b/frontend/src/concepts/trustyai/content/InstallTrustyModal.tsx
@@ -1,5 +1,6 @@
 import * as React from 'react';
-import { Form, Modal, Radio } from '@patternfly/react-core';
+import { Form, Radio } from '@patternfly/react-core';
+import { Modal } from '@patternfly/react-core/deprecated';
 import DashboardModalFooter from '~/concepts/dashboard/DashboardModalFooter';
 import TrustyDBSecretFields from '~/concepts/trustyai/content/TrustyDBSecretFields';
 import useTrustyInstallModalData, {

diff --git a/frontend/src/concepts/trustyai/content/TrustyDBSecretFields.tsx b/frontend/src/concepts/trustyai/content/TrustyDBSecretFields.tsx
@@ -24,7 +24,7 @@ const TrustyField: React.FC<{
   return (
     <FormGroup
       label={label}
-      labelIcon={<FieldGroupHelpLabelIcon content={labelTooltip} />}
+      labelHelp={<FieldGroupHelpLabelIcon content={labelTooltip} />}
       isRequired
       fieldId={`${TRUSTYAI_INSTALL_MODAL_TEST_ID}-${id}`}
     >

diff --git a/frontend/src/pages/modelRegistry/screens/ModelVersionDetails/ModelVersionDetailsView.tsx b/frontend/src/pages/modelRegistry/screens/ModelVersionDetails/ModelVersionDetailsView.tsx
@@ -154,7 +154,7 @@ const ModelVersionDetailsView: React.FC<ModelVersionDetailsViewProps> = ({
             </>
           )}
         </DescriptionList>
-        <Title style={{ marginTop: '1em' }} headingLevel={TextVariants.h3}>
+        <Title style={{ marginTop: '1em' }} headingLevel="h3">
           Source model format
         </Title>
         <DescriptionList isFillColumns>

diff --git a/frontend/src/pages/modelServing/screens/global/InferenceServiceEndpoint.tsx b/frontend/src/pages/modelServing/screens/global/InferenceServiceEndpoint.tsx
@@ -90,7 +90,7 @@ const InferenceServiceEndpoint: React.FC<InferenceServiceEndpointProps> = ({
             <DescriptionListTerm>
               External (can be accessed from inside or outside the cluster)
             </DescriptionListTerm>
-            <DescriptionListDescription style={{ paddingLeft: 'var(--pf-v5-global--spacer--md)' }}>
+            <DescriptionListDescription style={{ paddingLeft: 'var(--pf-t--global--spacer--md)' }}>
               <ClipboardCopy
                 hoverTip="Copy"
                 clickTip="Copied"

diff --git a/frontend/src/pages/modelServing/screens/global/InternalServicePopoverContent.tsx b/frontend/src/pages/modelServing/screens/global/InternalServicePopoverContent.tsx
@@ -58,7 +58,7 @@ const InternalServicePopoverContent: React.FC<InternalServicePopoverContentProps
             <DescriptionListTerm>
               <ListItem>{route}</ListItem>
             </DescriptionListTerm>
-            <DescriptionListDescription style={{ paddingLeft: 'var(--pf-v5-global--spacer--md)' }}>
+            <DescriptionListDescription style={{ paddingLeft: 'var(--pf-t--global--spacer--md)' }}>
               <ClipboardCopy
                 hoverTip="Copy"
                 clickTip="Copied"

diff --git a/frontend/src/pages/projects/screens/detail/connections/ConnectionsTableRow.tsx b/frontend/src/pages/projects/screens/detail/connections/ConnectionsTableRow.tsx
@@ -47,7 +47,7 @@ const ConnectionsTableRow: React.FC<ConnectionsTableRowProps> = ({
           boldTitle={false}
           titleIcon={
             showWarningIcon ? (
-              <Icon status="warning" className="pf-v5-u-pl-lg">
+              <Icon status="warning" className="pf-v6-u-pl-lg">
                 <ExclamationTriangleIcon />
               </Icon>
             ) : undefined

diff --git a/frontend/src/pages/projects/screens/detail/connections/ManageConnectionsModal.tsx b/frontend/src/pages/projects/screens/detail/connections/ManageConnectionsModal.tsx
@@ -167,7 +167,7 @@ export const ManageConnectionModal: React.FC<Props> = ({
     >
       {isEdit && (
         <Alert
-          className="pf-v5-u-mb-lg"
+          className="pf-v6-u-mb-lg"
           variant="warning"
           isInline
           title="Dependent resources require further action"

diff --git a/frontend/src/pages/projects/screens/projects/ProjectTableRow.tsx b/frontend/src/pages/projects/screens/projects/ProjectTableRow.tsx
@@ -115,9 +115,9 @@ const ProjectTableRow: React.FC<ProjectTableRowProps> = ({
             <Spinner size="sm" />
           ) : (
             <div data-testid="notebook-column-count">
-              <PlayIcon className="pf-v5-u-mr-xs" />
+              <PlayIcon className="pf-v6-u-mr-xs" />
               {runningCount}
-              <OffIcon className="pf-v5-u-ml-sm pf-v5-u-mr-xs" />
+              <OffIcon className="pf-v6-u-ml-sm pf-v6-u-mr-xs" />
               {stoppedCount}
             </div>
           )}

diff --git a/frontend/src/pages/projects/screens/projects/tableData.tsx b/frontend/src/pages/projects/screens/projects/tableData.tsx
@@ -8,11 +8,11 @@ import { getDisplayNameFromK8sResource } from '~/concepts/k8s/utils';
 const WorkBenchDescription = (
   <div>
     <div>
-      <PlayIcon className="pf-v5-u-mr-xs" />
+      <PlayIcon className="pf-v6-u-mr-xs" />
       Indicates number of running or starting workbenches.
     </div>
     <div>
-      <OffIcon className="pf-v5-u-mr-xs" />
+      <OffIcon className="pf-v6-u-mr-xs" />
       Indicates number of stopped workbenches.
     </div>
   </div>

diff --git a/frontend/src/pages/projects/screens/spawner/connections/ConnectionsFormSection.tsx b/frontend/src/pages/projects/screens/spawner/connections/ConnectionsFormSection.tsx
@@ -4,8 +4,6 @@ import {
   Button,
   EmptyState,
   EmptyStateBody,
-  EmptyStateHeader,
-  EmptyStateIcon,
   Flex,
   FlexItem,
   FormSection,
@@ -188,12 +186,7 @@ export const ConnectionsFormSection: React.FC<Props> = ({
         />
       ) : (
         <Bullseye>
-          <EmptyState>
-            <EmptyStateHeader
-              icon={<EmptyStateIcon icon={PlusCircleIcon} />}
-              titleText="No connections"
-              headingLevel="h2"
-            />
+          <EmptyState headingLevel="h2" icon={PlusCircleIcon} titleText="No connections">
             <EmptyStateBody>
               Connections enable you to store and retrieve information that typically should not be
               stored in code. For example, you can store details (including credentials) for object

diff --git a/frontend/src/pages/projects/screens/spawner/connections/DetachConnectionModal.tsx b/frontend/src/pages/projects/screens/spawner/connections/DetachConnectionModal.tsx
@@ -1,5 +1,6 @@
 import React from 'react';
-import { Button, Modal } from '@patternfly/react-core';
+import { Button } from '@patternfly/react-core';
+import { Modal } from '@patternfly/react-core/deprecated';
 import { Connection } from '~/concepts/connectionTypes/types';
 import { getDisplayNameFromK8sResource } from '~/concepts/k8s/utils';
 

diff --git a/frontend/src/pages/projects/screens/spawner/connections/SelectConnectionsModal.tsx b/frontend/src/pages/projects/screens/spawner/connections/SelectConnectionsModal.tsx
@@ -1,5 +1,6 @@
 import React from 'react';
-import { Button, Flex, FlexItem, Form, FormGroup, Modal, Truncate } from '@patternfly/react-core';
+import { Button, Flex, FlexItem, Form, FormGroup, Truncate } from '@patternfly/react-core';
+import { Modal } from '@patternfly/react-core/deprecated';
 import { MultiSelection, SelectionOptions } from '~/components/MultiSelection';
 import { Connection, ConnectionTypeConfigMapObj } from '~/concepts/connectionTypes/types';
 import { getDescriptionFromK8sResource, getDisplayNameFromK8sResource } from '~/concepts/k8s/utils';