Skip to content

Commit 27fb21b

Browse files
vojtechszocsvojtechszocs
committed
Bump Console plugin SDK deps and fix useGetModifyApplicationAction usage
1 parent edce8bc commit 27fb21b

File tree

3 files changed

+40
-27
lines changed

3 files changed

+40
-27
lines changed

‎package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,9 @@
6868
"devDependencies": {
6969
"@cypress/webpack-preprocessor": "^6.0.2",
7070
"@kubevirt-ui/kubevirt-api": "^1.4.0",
71-
"@openshift-console/dynamic-plugin-sdk": "4.19.0-prerelease.2",
72-
"@openshift-console/dynamic-plugin-sdk-internal": "4.19.0-prerelease.2",
73-
"@openshift-console/dynamic-plugin-sdk-webpack": "4.19.0-prerelease.2",
71+
"@openshift-console/dynamic-plugin-sdk": "4.19.0",
72+
"@openshift-console/dynamic-plugin-sdk-internal": "4.21.0-prerelease.1",
73+
"@openshift-console/dynamic-plugin-sdk-webpack": "4.19.0",
7474
"@openshift-console/plugin-shared": "^0.0.3",
7575
"@testing-library/jest-dom": "^5.16.1",
7676
"@testing-library/react": "^12.1.2",

‎src/views/topology/hooks/useModifyApplicationActionProvider.ts‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,27 @@ import { useMemo } from 'react';
22

33
import VirtualMachineModel from '@kubevirt-ui/kubevirt-api/console/models/VirtualMachineModel';
44
import { Action, K8sResourceCommon } from '@openshift-console/dynamic-plugin-sdk';
5-
import { getModifyApplicationAction } from '@openshift-console/dynamic-plugin-sdk-internal';
5+
import { useGetModifyApplicationAction } from '@openshift-console/dynamic-plugin-sdk-internal';
66
import { GraphElement } from '@patternfly/react-topology';
77
import { isVMType } from '@topology/utils/utils';
88

99
type UseModifyApplicationActionProvider = (element: GraphElement) => [Action[], boolean, undefined];
1010

1111
const useModifyApplicationActionProvider: UseModifyApplicationActionProvider = (element) => {
12-
const actions = useMemo(() => {
13-
if (isVMType(element.getType())) return undefined;
12+
const isVM = useMemo(() => isVMType(element.getType()), [element]);
1413

15-
const resource = element?.getData()?.resources?.obj as K8sResourceCommon;
16-
return [getModifyApplicationAction(VirtualMachineModel, resource, 'vm-action-start')];
17-
}, [element]);
14+
const resource = useMemo<K8sResourceCommon>(
15+
() => (isVM ? undefined : element.getData()?.resources?.obj),
16+
[element, isVM],
17+
);
1818

19-
return useMemo(() => {
20-
if (!actions) return [[], true, undefined];
19+
const startAction = useGetModifyApplicationAction(
20+
VirtualMachineModel,
21+
resource,
22+
'vm-action-start',
23+
);
2124

22-
return [actions, true, undefined];
23-
}, [actions]);
25+
return useMemo(() => [[startAction], true, undefined], [startAction]);
2426
};
2527

2628
export default useModifyApplicationActionProvider;

‎yarn.lock‎

Lines changed: 25 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1218,11 +1218,12 @@
12181218
resolved "https://registry.yarnpkg.com/@novnc/novnc/-/novnc-1.5.0.tgz#7df3e4aca48eaa7c0d6f690e7dee89480232e2f1"
12191219
integrity sha512-4yGHOtUCnEJUCsgEt/L78eeJu00kthurLBWXFiaXfonNx0pzbs6R/3gJb1byZe6iAE8V9MF0syQb0xIL8MSOtQ==
12201220

1221-
"@openshift-console/dynamic-plugin-sdk-internal@4.19.0-prerelease.2":
1222-
version "4.19.0-prerelease.2"
1223-
resolved "https://registry.yarnpkg.com/@openshift-console/dynamic-plugin-sdk-internal/-/dynamic-plugin-sdk-internal-4.19.0-prerelease.2.tgz#7b30b9987d601a0ca4bded2992b0e6a57c4440a1"
1224-
integrity sha512-IqjaAgOBnaAXB8ff7JWFoI+0gD30Nr/84CAGO60dCe1kGkgefWD7ABdraULEjrce3V/ZDifZgO00yscMOa80Eg==
1221+
"@openshift-console/dynamic-plugin-sdk-internal@4.21.0-prerelease.1":
1222+
version "4.21.0-prerelease.1"
1223+
resolved "https://registry.yarnpkg.com/@openshift-console/dynamic-plugin-sdk-internal/-/dynamic-plugin-sdk-internal-4.21.0-prerelease.1.tgz#a16c849f0ab9470de22b74fce68d259f07f758b7"
1224+
integrity sha512-uCre2yb1BVJ7jiI6A0vq4PQoYk8Hm0JheTf5GKos7/N6kGv4kFK4+Kb0sxOErYu/m7xnwlgxgG2s3cDUSejbAQ==
12251225
dependencies:
1226+
"@openshift/dynamic-plugin-sdk" "^5.0.1"
12261227
"@patternfly/react-topology" "^6.2.0"
12271228
immutable "3.x"
12281229
react "^17.0.1"
@@ -1231,13 +1232,13 @@
12311232
react-router "5.3.x"
12321233
react-router-dom "5.3.x"
12331234
react-router-dom-v5-compat "^6.11.2"
1234-
redux "4.0.1"
1235+
redux "^4.0.4"
12351236
redux-thunk "2.4.0"
12361237

1237-
"@openshift-console/dynamic-plugin-sdk-webpack@4.19.0-prerelease.2":
1238-
version "4.19.0-prerelease.2"
1239-
resolved "https://registry.yarnpkg.com/@openshift-console/dynamic-plugin-sdk-webpack/-/dynamic-plugin-sdk-webpack-4.19.0-prerelease.2.tgz#ad790b0270a331fb93731c11e4d40c3e369b81e3"
1240-
integrity sha512-1EtkPsZoIIgmxpkkAlJWHs6baG2GZ0uHdKbELoQHkXO/wbbdoUVMMdHzHiw6KwJciVJcc8THXfNQa4h/Gv3T/Q==
1238+
"@openshift-console/dynamic-plugin-sdk-webpack@4.19.0":
1239+
version "4.19.0"
1240+
resolved "https://registry.yarnpkg.com/@openshift-console/dynamic-plugin-sdk-webpack/-/dynamic-plugin-sdk-webpack-4.19.0.tgz#6a0171702d9089f6cbe6cb74665ea855bb42af7e"
1241+
integrity sha512-a4zxkrEe4qhKir5R21OK/wJVCn8Gzm/y3smLxRDi/BjHFgcnNQKEgCMP4IhvTlT0NRJQ4Q9AmPT1WXBlV3ip3g==
12411242
dependencies:
12421243
"@openshift/dynamic-plugin-sdk-webpack" "^4.0.2"
12431244
ajv "^6.12.3"
@@ -1250,10 +1251,10 @@
12501251
semver "6.x"
12511252
webpack "^5.75.0"
12521253

1253-
"@openshift-console/dynamic-plugin-sdk@4.19.0-prerelease.2":
1254-
version "4.19.0-prerelease.2"
1255-
resolved "https://registry.yarnpkg.com/@openshift-console/dynamic-plugin-sdk/-/dynamic-plugin-sdk-4.19.0-prerelease.2.tgz#80691484cb1842ec05d4439a16303d6ccfcf1263"
1256-
integrity sha512-esjzQZMqJTt8ceepSdPWd9s8kKTRJAqcLfMtbfvIIuLWNDk+0OeopiG5k25DXBSe9L8zlOpkmJKogi5aJJl+FA==
1254+
"@openshift-console/dynamic-plugin-sdk@4.19.0":
1255+
version "4.19.0"
1256+
resolved "https://registry.yarnpkg.com/@openshift-console/dynamic-plugin-sdk/-/dynamic-plugin-sdk-4.19.0.tgz#c9b6c1338b14c174520bff827f4e2be5ab2290a4"
1257+
integrity sha512-v1pNt2eDCyXwRZX+66QDnaYtrwbLapRMtCQql65pgePsE5/5aoOSGIsTjIB812j+oagAB1yk4r7OUlopA2F8kw==
12571258
dependencies:
12581259
"@patternfly/react-topology" "^6.2.0"
12591260
classnames "2.x"
@@ -1289,6 +1290,16 @@
12891290
semver "^7.3.7"
12901291
yup "^0.32.11"
12911292

1293+
"@openshift/dynamic-plugin-sdk@^5.0.1":
1294+
version "5.0.1"
1295+
resolved "https://registry.yarnpkg.com/@openshift/dynamic-plugin-sdk/-/dynamic-plugin-sdk-5.0.1.tgz#3487afe57d07a28b9aba393e643d86ca13a3735c"
1296+
integrity sha512-+azUBN6FgcDmlcWMzG0bthcRUJC1u12wf9xa2aJGFbC/uTiOXwjrkcQ7LW/PyK5Em7wDhwaUdapaeOgh8I6Kjg==
1297+
dependencies:
1298+
lodash "^4.17.21"
1299+
semver "^7.3.7"
1300+
uuid "^8.3.2"
1301+
yup "^0.32.11"
1302+
12921303
"@patternfly/quickstarts@6.1.0":
12931304
version "6.1.0"
12941305
resolved "https://registry.yarnpkg.com/@patternfly/quickstarts/-/quickstarts-6.1.0.tgz#bb38064aefdb606cc1aec9e29024fd1755d79358"
@@ -9472,7 +9483,7 @@ redux@4.0.1:
94729483
loose-envify "^1.4.0"
94739484
symbol-observable "^1.2.0"
94749485

9475-
redux@^4.0.0:
9486+
redux@^4.0.0, redux@^4.0.4:
94769487
version "4.2.1"
94779488
resolved "https://registry.yarnpkg.com/redux/-/redux-4.2.1.tgz#c08f4306826c49b5e9dc901dee0452ea8fce6197"
94789489
integrity sha512-LAUYz4lc+Do8/g7aeRa8JkyDErK6ekstQaqWQrNRW//MY1TvCEpMtpTWvlQ+FPbWCx+Xixu/6SHt5N0HR+SB4w==

0 commit comments

Comments
 (0)