Merge pull request #753 from rszwajko/bumpDepTo4_13

Synchronize dependencies with Console 4.13
kubev2v · Oct 8, 2023 · b85d662 · b85d662
2 parents 4ee0525 + 1bbd8d6
commit b85d662
Show file tree

Hide file tree

Showing 14 changed files with 69 additions and 54 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,23 +121,23 @@ function MappingRow<T extends CommonMapping>({
   );
   return (
     <>
-      <Tr ouiaId={undefined} ouiaSafe={undefined}>
+      <Tr>
         <Td
           expand={{
             rowIndex,
             isExpanded: isRowExpanded,
             onToggle: toggleExpand,
           }}
         />
-        {resourceFields.map(({ resourceFieldId, label }) => {
+        {resourceFields.map(({ resourceFieldId, label }, columnIndex) => {
           const Cell = cellCreator[resourceFieldId] ?? TextCell;
           return (
             <Td
               key={resourceFieldId}
               dataLabel={label}
               compoundExpand={
                 resourceFieldId === C.FROM || resourceFieldId === C.TO
-                  ? { isExpanded: isRowExpanded, onToggle: toggleExpand }
+                  ? { isExpanded: isRowExpanded, onToggle: toggleExpand, rowIndex, columnIndex }
                   : undefined
               }
             >
@@ -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/...t-console-plugin/src/modules/NetworkMaps/__tests__/__snapshots__/MappingRow.test.tsx.snap b/...t-console-plugin/src/modules/NetworkMaps/__tests__/__snapshots__/MappingRow.test.tsx.snap
@@ -104,6 +104,7 @@ exports[`NetworkMap rows plantest1-generated-zxcv 1`] = `
           <button
             aria-expanded="false"
             class="pf-c-table__button"
+            id="expand-toggle-0-4"
             type="button"
           >
             <span
@@ -164,6 +165,7 @@ exports[`NetworkMap rows plantest1-generated-zxcv 1`] = `
           <button
             aria-expanded="false"
             class="pf-c-table__button"
+            id="expand-toggle-0-6"
             type="button"
           >
             <span
@@ -307,6 +309,7 @@ exports[`NetworkMap rows vcenter1-netstore-to-ocp1-network1 1`] = `
           <button
             aria-expanded="false"
             class="pf-c-table__button"
+            id="expand-toggle-0-4"
             type="button"
           >
             <span
@@ -367,6 +370,7 @@ exports[`NetworkMap rows vcenter1-netstore-to-ocp1-network1 1`] = `
           <button
             aria-expanded="false"
             class="pf-c-table__button"
+            id="expand-toggle-0-6"
             type="button"
           >
             <span
@@ -510,6 +514,7 @@ exports[`NetworkMap rows vcenter1-netstore-to-ocp1-network2 1`] = `
           <button
             aria-expanded="false"
             class="pf-c-table__button"
+            id="expand-toggle-0-4"
             type="button"
           >
             <span
@@ -570,6 +575,7 @@ exports[`NetworkMap rows vcenter1-netstore-to-ocp1-network2 1`] = `
           <button
             aria-expanded="false"
             class="pf-c-table__button"
+            id="expand-toggle-0-6"
             type="button"
           >
             <span
@@ -731,6 +737,7 @@ exports[`NetworkMap rows vcenter3-invalid-network-map 1`] = `
           <button
             aria-expanded="false"
             class="pf-c-table__button"
+            id="expand-toggle-0-4"
             type="button"
           >
             <span
@@ -791,6 +798,7 @@ exports[`NetworkMap rows vcenter3-invalid-network-map 1`] = `
           <button
             aria-expanded="false"
             class="pf-c-table__button"
+            id="expand-toggle-0-6"
             type="button"
           >
             <span
@@ -934,6 +942,7 @@ exports[`NetworkMap rows vcenter4-invalid-network-map 1`] = `
           <button
             aria-expanded="false"
             class="pf-c-table__button"
+            id="expand-toggle-0-4"
             type="button"
           >
             <span
@@ -994,6 +1003,7 @@ exports[`NetworkMap rows vcenter4-invalid-network-map 1`] = `
           <button
             aria-expanded="false"
             class="pf-c-table__button"
+            id="expand-toggle-0-6"
             type="button"
           >
             <span

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/...t-console-plugin/src/modules/StorageMaps/__tests__/__snapshots__/MappingRow.test.tsx.snap b/...t-console-plugin/src/modules/StorageMaps/__tests__/__snapshots__/MappingRow.test.tsx.snap
@@ -104,6 +104,7 @@ exports[`StorageMap rows plantest1-generated-asdf 1`] = `
           <button
             aria-expanded="false"
             class="pf-c-table__button"
+            id="expand-toggle-0-4"
             type="button"
           >
             <span
@@ -164,6 +165,7 @@ exports[`StorageMap rows plantest1-generated-asdf 1`] = `
           <button
             aria-expanded="false"
             class="pf-c-table__button"
+            id="expand-toggle-0-6"
             type="button"
           >
             <span
@@ -307,6 +309,7 @@ exports[`StorageMap rows vcenter1-datastore-to-ocpv-storageclass1 1`] = `
           <button
             aria-expanded="false"
             class="pf-c-table__button"
+            id="expand-toggle-0-4"
             type="button"
           >
             <span
@@ -367,6 +370,7 @@ exports[`StorageMap rows vcenter1-datastore-to-ocpv-storageclass1 1`] = `
           <button
             aria-expanded="false"
             class="pf-c-table__button"
+            id="expand-toggle-0-6"
             type="button"
           >
             <span
@@ -510,6 +514,7 @@ exports[`StorageMap rows vcenter1-invalid-storage-mapping 1`] = `
           <button
             aria-expanded="false"
             class="pf-c-table__button"
+            id="expand-toggle-0-4"
             type="button"
           >
             <span
@@ -570,6 +575,7 @@ exports[`StorageMap rows vcenter1-invalid-storage-mapping 1`] = `
           <button
             aria-expanded="false"
             class="pf-c-table__button"
+            id="expand-toggle-0-6"
             type="button"
           >
             <span
@@ -713,6 +719,7 @@ exports[`StorageMap rows vcenter3-datastore-to-ocpv-storageclass2 1`] = `
           <button
             aria-expanded="false"
             class="pf-c-table__button"
+            id="expand-toggle-0-4"
             type="button"
           >
             <span
@@ -773,6 +780,7 @@ exports[`StorageMap rows vcenter3-datastore-to-ocpv-storageclass2 1`] = `
           <button
             aria-expanded="false"
             class="pf-c-table__button"
+            id="expand-toggle-0-6"
             type="button"
           >
             <span