Merge pull request #3441 from project-koku/release_prod-stable.8008

Deployment commit for prod-stable

.archive/components/drawers/optimzations/optimizations.scss

@@ -0,0 +1,40 @@
+@import url("~@patternfly/patternfly/base/patternfly-variables.css");
+
+.optimizationsOverride {
+  div {
+    display: block;
+    margin-right: 0;
+    margin-bottom: var(--pf-v5-global--spacer--xs);
+    &.iconOverride {
+      &.decrease {
+        // color: var(--pf-v5-global--success-color--100);
+      }
+      &.increase {
+        // color: var(--pf-v5-global--danger-color--100);
+      }
+      .fa-equals {
+        margin-left: 25px;
+        position: relative;
+      }
+      .fa-sort-up {
+        margin-left: 25px;
+        position: relative;
+        top: 3px;
+      }
+      .fa-sort-down {
+        margin-left: 25px;
+        position: relative;
+        top: -3px;
+      }
+      .fa-sort-up::before {
+        // color: var(--pf-v5-global--danger-color--100);
+      }
+      .fa-sort-down::before {
+        // color: var(--pf-v5-global--success-color--100);
+      }
+      span {
+        margin-right: -17px !important;
+      }
+    }
+  }
+}

src/components/drawers/optimzations/optimizationsContent.tsx → .archive/components/drawers/optimzations/optimizationsContent.tsx

@@ -13,7 +13,7 @@ import {
   TextListVariants,
 } from '@patternfly/react-core';
 import { ExclamationTriangleIcon } from '@patternfly/react-icons/dist/esm/icons/exclamation-triangle-icon';
-import { TableComposable, TableVariant, Tbody, Td, Th, Thead, Tr } from '@patternfly/react-table';
+import { Table, TableVariant, Tbody, Td, Th, Thead, Tr } from '@patternfly/react-table';
 import type { RecommendationItem, RecommendationReportData } from 'api/ros/recommendations';
 import { RosPathsType, RosType } from 'api/ros/ros';
 import type { AxiosError } from 'axios';
@@ -265,10 +265,9 @@ class OptimizationsContentBase extends React.Component<OptimizationsContentProps
     const memVariationUnits = hasVariationLimitsMemory ? term.variation.limits.memory.format : undefined;
 
     return (
-      <TableComposable
+      <Table
         aria-label={intl.formatMessage(messages.optimizationsTableAriaLabel)}
         borders={false}
-        hasSelectableRowCaption
         variant={TableVariant.compact}
       >
         <Thead>
@@ -313,7 +312,7 @@ class OptimizationsContentBase extends React.Component<OptimizationsContentProps
             <Td>{this.getChangeValue(memVariation, memVariationUnits)}</Td>
           </Tr>
         </Tbody>
-      </TableComposable>
+      </Table>
     );
   };
 
@@ -377,10 +376,9 @@ class OptimizationsContentBase extends React.Component<OptimizationsContentProps
     const memVariationUnits = hasVariationRequestsMemory ? term.variation.requests.memory.format : undefined;
 
     return (
-      <TableComposable
+      <Table
         aria-label={intl.formatMessage(messages.optimizationsTableAriaLabel)}
         borders={false}
-        hasSelectableRowCaption
         variant={TableVariant.compact}
       >
         <Thead>
@@ -425,7 +423,7 @@ class OptimizationsContentBase extends React.Component<OptimizationsContentProps
             <Td>{this.getChangeValue(memVariation, memVariationUnits)}</Td>
           </Tr>
         </Tbody>
-      </TableComposable>
+      </Table>
     );
   };
 

src/components/drawers/optimzations/optimizationsLink.tsx → .archive/components/drawers/optimzations/optimizationsLink.tsx

@@ -82,7 +82,7 @@ class OptimizationsLinkBase extends React.Component<OptimizationsLinkProps, any>
   };
 
   public render() {
-    const { intl, isStandalone, project, report, router } = this.props;
+    const { intl, isStandalone, project, report } = this.props;
 
     if (!isStandalone || !report) {
       return null;
@@ -92,12 +92,11 @@ class OptimizationsLinkBase extends React.Component<OptimizationsLinkProps, any>
     const isDisabled = computedItems.length === 0;
 
     const breakdownPath = getBreakdownPath({
-      basePath: formatPath(routes.ocpDetailsBreakdown.path),
+      basePath: formatPath(routes.ocpBreakdown.path),
       groupBy: 'project',
       id: project,
       isOptimizationsPath: true,
       isOptimizationsTab: true,
-      router,
       title: project,
     });
 
@@ -111,11 +110,7 @@ class OptimizationsLinkBase extends React.Component<OptimizationsLinkProps, any>
       </Button>
     );
     if (isDisabled) {
-      return (
-        <Tooltip content={intl.formatMessage(messages.optimizationsViewAllDisabled)} removeFindDomNode>
-          {buttonComponent}
-        </Tooltip>
-      );
+      return <Tooltip content={intl.formatMessage(messages.optimizationsViewAllDisabled)}>{buttonComponent}</Tooltip>;
     }
     return buttonComponent;
   }

.archive/routes/components/dataToolbar/workloadType.tsx

@@ -1,7 +1,8 @@
 import './dataToolbar.scss';
 
-import type { SelectOptionObject, ToolbarChipGroup } from '@patternfly/react-core';
-import { Select, SelectOption, SelectVariant } from '@patternfly/react-core';
+import type { ToolbarChipGroup } from '@patternfly/react-core';
+import type { SelectOptionObject } from '@patternfly/react-core/deprecated';
+import { Select, SelectOption, SelectVariant } from '@patternfly/react-core/deprecated';
 import messages from 'locales/messages';
 import React from 'react';
 import type { WrappedComponentProps } from 'react-intl';
@@ -60,8 +61,8 @@ class WorkloadTypeBase extends React.Component<WorkloadTypeProps, WorkloadTypeSt
         isDisabled={isDisabled}
         variant={SelectVariant.checkbox}
         aria-label={intl.formatMessage(messages.filterByWorkloadTypeAriaLabel)}
-        onToggle={this.onToggle}
         onSelect={onSelect}
+        onToggle={(_evt, isExpanded) => this.onToggle(isExpanded)}
         selections={selections}
         isOpen={isWorkloadTypeExpanded}
         placeholderText={intl.formatMessage(messages.chooseValuePlaceholder)}

.eslintrc.json

@@ -136,6 +136,8 @@
         "react/prop-types": 0,
         "simple-import-sort/imports": "error",
         "spaced-comment": "error",
+        "rulesdir/disallow-pf-migrated-components": "off",
+        "rulesdir/forbid-pf-relative-imports": "off",
         "testing-library/await-async-queries": "error",
         "testing-library/no-await-sync-queries": "error",
         "testing-library/no-debugging-utils": "warn",

fec.config.js

@@ -37,6 +37,8 @@ module.exports = {
   interceptChromeConfig: false, // Change to false after your app is registered in configuration files
   proxyVerbose: true,
   sassPrefix: `.${moduleName}`,
+  // sassPrefix: 'body', // For PF v5 testing only
+  // bundlePfModules: true, // For PF v5 testing only
   stats,
   standalone: process.env.LOCAL_API_PORT ? true : false,
   useCache: true,
@@ -61,9 +63,9 @@ module.exports = {
       './RootApp': path.resolve(__dirname, './src/appEntry.tsx'),
     },
     shared: [
-      { 'react-redux': { requiredVersion: dependencies['react-redux'] } },
-      { 'react-router-dom': { import: false, requiredVersion: '*', singleton: true } },
-      { '@unleash/proxy-client-react': { requiredVersion: '*', singleton: true } },
+      { 'react-redux': { version: dependencies['react-redux'] } },
+      { 'react-router-dom': { version: dependencies['react-router-dom'], import: false, singleton: true } },
+      { '@unleash/proxy-client-react': { version: dependencies['@unleash/proxy-client-react'], singleton: true } },
     ],
   },
   /**