Synchronize dependencies with Console 4.13

Removes workarounds added in PRs #290 and #179 Note that following peerDependencies of legacy package are excluded: 1. dayjs ^1.11.5 - Console's yarn.lock includes it only as Cypress dependency (in version 1.10.7) 2. file-saver 1.3.x - a dependency of @patternfly/[email protected] 3. jsrsasign ^10.6.1 - missing in the Console's yarn.lock 4. netmask ^2.0.2 - missing in the Console's yarn.lock 5. yup ^0.32.11 - provided in version 0.27.0 6. react-syntax-highlighter ^15.5.0 - missing in the Console's yarn.lock 7. react-query ^3.39.2 - missing in the Console's yarn.lock Reference-Url: #179 Reference-Url: #290 Reference-Url: https://github.com/openshift/console/blob/c12a49c8cee92a0e5aace2faba83528b6f418908/frontend/package.json#L148 Reference-Url: https://github.com/openshift/console/blob/c12a49c8cee92a0e5aace2faba83528b6f418908/frontend/yarn.lock#L2019 Signed-off-by: Radoslaw Szwajkowski <[email protected]>
kubev2v · Oct 6, 2023 · 424c843 · 424c843
1 parent 4ee0525
commit 424c843
Show file tree

Hide file tree

Showing 12 changed files with 49 additions and 52 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/common/package.json b/packages/common/package.json
@@ -30,8 +30,8 @@
   "peerDependencies": {
     "@openshift-console/dynamic-plugin-sdk": "0.0.18",
     "@openshift/dynamic-plugin-sdk": "3.0.0",
-    "@patternfly/react-core": "4.221.3",
-    "@patternfly/react-table": "4.90.3",
+    "@patternfly/react-core": "4.276.6",
+    "@patternfly/react-table": "4.112.39",
     "react": "^17.0.1",
     "react-i18next": "^11.7.3",
     "react-query": "^3.39.2",
@@ -55,4 +55,4 @@
     "sass": "^1.63.3",
     "storybook": "^7.0.14"
   }
-}
+}
diff --git a/packages/common/src/components-stories/TableView/TableView.stories.tsx b/packages/common/src/components-stories/TableView/TableView.stories.tsx
@@ -89,7 +89,7 @@ const visibleColumns: ResourceField[] = [
 
 function SimpleRow<T>({ resourceFields, resourceData }: RowProps<T>) {
   return (
-    <Tr ouiaId={undefined} ouiaSafe={undefined}>
+    <Tr>
       {resourceFields.map(({ resourceFieldId, label }) => (
         <Td key={resourceFieldId} dataLabel={label}>
           {String(resourceData[resourceFieldId] ?? '')}

diff --git a/packages/common/src/components/Filter/FreetextFilter.tsx b/packages/common/src/components/Filter/FreetextFilter.tsx
@@ -47,10 +47,7 @@ export const FreetextFilter = ({
           placeholder={placeholderLabel}
           value={inputValue}
           onChange={(event, value) => {
-            // starting with react-core 4.273.0 parameters were re-ordered
-            // the workaround can be removed when last supported Console version is 4.13
-            const isReactCoreBefore4_273_0 = typeof value === 'object';
-            setInputValue(isReactCoreBefore4_273_0 ? event : value);
+            setInputValue(value);
           }}
           onSearch={onTextInput}
           onClear={() => setInputValue('')}

diff --git a/packages/forklift-console-plugin/package.json b/packages/forklift-console-plugin/package.json
@@ -34,10 +34,10 @@
   "peerDependencies": {
     "@openshift-console/dynamic-plugin-sdk": "0.0.18",
     "@openshift/dynamic-plugin-sdk": "3.0.0",
-    "@patternfly/react-core": "4.221.3",
-    "@patternfly/react-table": "4.90.3",
-    "@patternfly/react-charts": "6.94.19",
-    "react-dom": "^17",
+    "@patternfly/react-core": "4.276.6",
+    "@patternfly/react-table": "4.112.39",
+    "@patternfly/react-charts": "6.94.18",
+    "react-dom": "^17.0.1",
     "react": "^17.0.1",
     "react-i18next": "^11.7.3",
     "react-router": "5.2.0",

diff --git a/packages/forklift-console-plugin/src/components/mappings/MappingRow.tsx b/packages/forklift-console-plugin/src/components/mappings/MappingRow.tsx
@@ -121,7 +121,7 @@ function MappingRow<T extends CommonMapping>({
   );
   return (
     <>
-      <Tr ouiaId={undefined} ouiaSafe={undefined}>
+      <Tr>
         <Td
           expand={{
             rowIndex,
@@ -153,7 +153,7 @@ function MappingRow<T extends CommonMapping>({
           );
         })}
       </Tr>
-      <Tr isExpanded={isRowExpanded} ouiaId={undefined} ouiaSafe={undefined}>
+      <Tr isExpanded={isRowExpanded}>
         <Td dataLabel={t('Mapping graph')} noPadding colSpan={resourceFields.length}>
           {isRowExpanded && (
             <ExpandableRowContent>

diff --git a/packages/forklift-console-plugin/src/components/page/__tests__/StandardPage.test.tsx b/packages/forklift-console-plugin/src/components/page/__tests__/StandardPage.test.tsx
@@ -11,7 +11,7 @@ afterEach(cleanup);
 
 function SimpleRow<T>({ resourceFields, resourceData }: RowProps<T>) {
   return (
-    <Tr ouiaId={undefined} ouiaSafe={undefined}>
+    <Tr>
       {resourceFields.map(({ resourceFieldId, label }) => (
         <Td key={resourceFieldId} dataLabel={label}>
           {String(resourceData[resourceFieldId] ?? '')}

diff --git a/packages/forklift-console-plugin/src/modules/Plans/PlanRow.tsx b/packages/forklift-console-plugin/src/modules/Plans/PlanRow.tsx
@@ -201,7 +201,7 @@ const PlanRow = ({
 }: RowProps<FlatPlan>) => {
   const primaryAction = getPrimaryActionFromPlanState(resourceData.status);
   return (
-    <Tr ouiaId={undefined} ouiaSafe={undefined}>
+    <Tr>
       {resourceFields.map(({ resourceFieldId, label }) => {
         const Cell = cellCreator[resourceFieldId] ?? TextCell;
         return resourceFieldId === C.DESCRIPTION ? (

diff --git a/...orklift-console-plugin/src/modules/Providers/views/details/tabs/Hosts/VSphereHostsRow.tsx b/...orklift-console-plugin/src/modules/Providers/views/details/tabs/Hosts/VSphereHostsRow.tsx
@@ -20,7 +20,7 @@ export const VSphereHostsRow: React.FC<RowProps<InventoryHostPair>> = ({
   resourceIndex: rowIndex,
 }) => {
   return (
-    <Tr ouiaId={undefined} ouiaSafe={undefined}>
+    <Tr>
       {!!toggleSelect && (
         <Td
           select={{

diff --git a/packages/forklift-console-plugin/src/modules/Providers/views/list/ProviderRow.tsx b/packages/forklift-console-plugin/src/modules/Providers/views/list/ProviderRow.tsx
@@ -35,7 +35,7 @@ import {
  */
 export const ProviderRow: React.FC<RowProps<ProviderData>> = ({ resourceFields, resourceData }) => {
   return (
-    <Tr ouiaId={undefined} ouiaSafe={undefined}>
+    <Tr>
       {resourceFields.map(({ resourceFieldId }) =>
         renderTd({ resourceData, resourceFieldId, resourceFields }),
       )}

diff --git a/packages/legacy/package.json b/packages/legacy/package.json
@@ -62,8 +62,8 @@
   "peerDependencies": {
     "@migtools/lib-ui": "8.4.1",
     "@openshift-console/dynamic-plugin-sdk": "0.0.18",
-    "@patternfly/react-core": "4.221.3",
-    "@patternfly/react-table": "4.90.3",
+    "@patternfly/react-core": "4.276.6",
+    "@patternfly/react-table": "4.112.39",
     "axios": "^0.21.2",
     "classnames": "2.x",
     "dayjs": "^1.11.5",
@@ -85,4 +85,4 @@
     "@typescript-eslint/eslint-plugin": "^5.29.0",
     "@typescript-eslint/parser": "^5.29.0"
   }
-}
+}
diff --git a/packages/legacy/src/Plans/components/CutoverConfirmModal.tsx b/packages/legacy/src/Plans/components/CutoverConfirmModal.tsx
@@ -100,7 +100,7 @@ export const CutoverConfirmModal: React.FunctionComponent<ICutoverConfirmModalPr
                   <>
                     <InputGroup className={spacing.mtSm}>
                       <DatePicker
-                        onChange={(_inputDate, newDate) => {
+                        onChange={(event, _inputDate, newDate) => {
                           if (newDate && isValidDate(newDate)) {
                             setCutoverDay(newDate);
                           } else {
@@ -114,7 +114,7 @@ export const CutoverConfirmModal: React.FunctionComponent<ICutoverConfirmModalPr
                       <TimePicker
                         aria-label="Cutover scheduled time"
                         style={{ width: '150px' }}
-                        onChange={(_time, hour, minute) => {
+                        onChange={(event, _time, hour, minute) => {
                           if ((hour || hour === 0) && (minute || minute === 0)) {
                             setCutoverTime({ hour, minute });
                           } else {