Merge pull request #90 from karelhala/update-react-pf

feat(dependencies): update react to v 18
RedHatInsights · Jan 24, 2024 · ff728ed · ff728ed
2 parents 1f83117 + 2abdb61
commit ff728ed
Show file tree

Hide file tree

Showing 6 changed files with 363 additions and 250 deletions.
diff --git a/package.json b/package.json
@@ -22,14 +22,14 @@
     "@babel/core": "7.14.6",
     "@lerna/project": "3.21.0",
     "@oat-sa/rollup-plugin-wildcard-external": "0.1.0",
-    "@patternfly/react-core": "4.128.2",
-    "@patternfly/react-icons": "4.10.11",
-    "@patternfly/react-table": "4.27.24",
-    "@patternfly/react-tokens": "4.11.12",
-    "@redhat-cloud-services/frontend-components": "3.2.8",
+    "@patternfly/react-core": "4.278.1",
+    "@patternfly/react-icons": "4.93.7",
+    "@patternfly/react-table": "4.113.7",
+    "@patternfly/react-tokens": "4.94.7",
+    "@redhat-cloud-services/frontend-components": "3.11.7",
     "@redhat-cloud-services/frontend-components-notifications": "3.2.2",
     "@redhat-cloud-services/frontend-components-utilities": "3.5.0",
-    "@redhat-cloud-services/rbac-client": "1.0.98",
+    "@redhat-cloud-services/rbac-client": "^1.0.100",
     "@rollup/plugin-commonjs": "19.0.0",
     "@rollup/plugin-json": "4.1.0",
     "@rollup/plugin-node-resolve": "13.0.0",
@@ -49,7 +49,7 @@
     "@types/react-redux": "7.1.16",
     "@typescript-eslint/eslint-plugin": "4.27.0",
     "@typescript-eslint/parser": "4.27.0",
-    "axios": "0.21.1",
+    "axios": "0.27.2",
     "axios-mock-adapter": "1.19.0",
     "classnames": "2.3.1",
     "cross-fetch": "3.1.5",
@@ -76,14 +76,14 @@
     "lodash": "4.17.21",
     "npm-run-all": "4.1.5",
     "prop-types": "15.7.2",
-    "react": "17.0.2",
-    "react-content-loader": "6.0.3",
-    "react-dom": "17.0.2",
+    "react": "^18.0.0",
+    "react-content-loader": "6.2.0",
+    "react-dom": "^18.0.0",
     "react-fetching-library": "1.7.6",
-    "react-redux": "7.2.4",
+    "react-redux": "7.2.9",
     "react-router-dom": "^6.16.0",
-    "react-test-renderer": "17.0.2",
-    "react-use": "17.2.4",
+    "react-test-renderer": "^18.0.0",
+    "react-use": "17.4.3",
     "redux": "4.1.0",
     "redux-logger": "3.0.6",
     "redux-promise-middleware": "5.1.1",

diff --git a/packages/insights-common-typescript/package.json b/packages/insights-common-typescript/package.json
@@ -33,7 +33,7 @@
     "axios": "^0.21.1",
     "csx": "^10.0.2",
     "formik": "^2.2.9",
-    "react": "^17.0.2",
+    "react": "^18.0.0",
     "react-fetching-library": "^1.7.6",
     "react-router-dom": "^6.16.0",
     "react-use": "^17.2.4",

diff --git a/packages/insights-common-typescript/src/components/Formik/Patternfly/Checkbox.tsx b/packages/insights-common-typescript/src/components/Formik/Patternfly/Checkbox.tsx
@@ -3,12 +3,12 @@ import { useField } from 'formik';
 import { Checkbox as PFCheckbox, FormGroup, CheckboxProps as PFCheckboxProps } from '@patternfly/react-core';
 
 import { onChangePFAdapter } from './Common';
-import { OuiaComponentProps } from '../../../utils';
 import { getOuiaProps, withoutOuiaProps } from '../../../utils/Ouia';
 
-interface CheckboxProps extends OuiaComponentProps, Omit<PFCheckboxProps, 'onChange' | 'ref'> {
+interface CheckboxProps extends Omit<PFCheckboxProps, 'onChange' | 'ref' | 'ouiaId'> {
     name: string;
     isRequired?: boolean;
+    ouiaId?: string;
 }
 
 export const Checkbox: React.FunctionComponent<CheckboxProps> = (props) => {

diff --git a/packages/insights-common-typescript/src/components/Formik/Patternfly/FormText.tsx b/packages/insights-common-typescript/src/components/Formik/Patternfly/FormText.tsx
@@ -1,12 +1,13 @@
 import * as React from 'react';
 import { useField } from 'formik';
 import { FormGroup, Text, TextVariants, TextProps } from '@patternfly/react-core';
-import { getOuiaProps, OuiaComponentProps, withoutOuiaProps } from '../../../utils/Ouia';
+import { getOuiaProps, withoutOuiaProps } from '../../../utils/Ouia';
 
-interface FormTextProps extends OuiaComponentProps, Omit<TextProps, 'ref'> {
+interface FormTextProps extends Omit<TextProps, 'ref' | 'ouiaId'> {
     id: string;
     name: string;
     isRequired?: boolean;
+    ouiaId?: string;
 }
 
 export const FormText: React.FunctionComponent<FormTextProps> = (props) => {

diff --git a/packages/insights-common-typescript/src/components/Formik/Patternfly/FormTextInput.tsx b/packages/insights-common-typescript/src/components/Formik/Patternfly/FormTextInput.tsx
@@ -3,13 +3,14 @@ import { useField } from 'formik';
 import { FormGroup, Text, TextInput as PFTextInput, TextInputProps, TextVariants } from '@patternfly/react-core';
 
 import { onChangePFAdapter } from './Common';
-import { OuiaComponentProps, withoutOuiaProps } from '../../../utils';
+import { withoutOuiaProps } from '../../../utils';
 import { getOuiaProps } from '../../../utils/Ouia';
 
-interface FormTextInputProps extends OuiaComponentProps, Omit<TextInputProps, 'onChange' | 'innerRef'> {
+interface FormTextInputProps extends Omit<TextInputProps, 'onChange' | 'innerRef' | 'ouiaId'> {
     id: string;
     name: string;
     hint?: string;
+    ouiaId?: string;
 }
 
 export const FormTextInput: React.FunctionComponent<FormTextInputProps> = (props) => {