@openshift-assisted/ui-lib 2.10.5-cim → 2.11.0-cim
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/@types/cim/components/helpers/network.d.ts.map +1 -1
- package/build/@types/cim/components/helpers/versions.d.ts +2 -0
- package/build/@types/cim/components/helpers/versions.d.ts.map +1 -1
- package/build/@types/cim/components/modals/EditAgentModal.d.ts.map +1 -1
- package/build/cjs/cim/components/helpers/network.js +2 -3
- package/build/cjs/cim/components/helpers/network.js.map +1 -1
- package/build/cjs/cim/components/helpers/versions.js +15 -10
- package/build/cjs/cim/components/helpers/versions.js.map +1 -1
- package/build/cjs/cim/components/modals/EditAgentModal.js +4 -1
- package/build/cjs/cim/components/modals/EditAgentModal.js.map +1 -1
- package/lib/cim/components/helpers/network.ts +7 -6
- package/lib/cim/components/helpers/versions.ts +18 -8
- package/lib/cim/components/modals/EditAgentModal.tsx +4 -1
- package/package.json +3 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"network.d.ts","sourceRoot":"","sources":["../../../../../lib/cim/components/helpers/network.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,8BAA8B,EAAE,MAAM,uCAAuC,CAAC;
|
|
1
|
+
{"version":3,"file":"network.d.ts","sourceRoot":"","sources":["../../../../../lib/cim/components/helpers/network.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,8BAA8B,EAAE,MAAM,uCAAuC,CAAC;AAOvF,eAAO,MAAM,eAAe,WAClB,gBAAgB,EAAE,wBACJ,8BAA8B;;;GA+BrD,CAAC"}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import { AgentClusterInstallK8sResource, ClusterImageSetK8sResource, ClusterVersionK8sResource } from '../../types';
|
|
2
2
|
import { OpenshiftVersionOptionType } from '../../../common';
|
|
3
3
|
export declare const getVersionFromReleaseImage: (releaseImage?: string) => string | undefined;
|
|
4
|
+
export declare const supportedNutanixPlatforms: string[];
|
|
5
|
+
export declare const isValidImageSet: (cis: ClusterImageSetK8sResource, architectures?: string[]) => boolean;
|
|
4
6
|
export declare const getOCPVersions: (clusterImageSets: ClusterImageSetK8sResource[], isNutanix?: boolean | undefined) => OpenshiftVersionOptionType[];
|
|
5
7
|
export declare const getSelectedVersion: (clusterImages: ClusterImageSetK8sResource[], agentClusterInstall: AgentClusterInstallK8sResource) => string | undefined;
|
|
6
8
|
export declare const getCurrentClusterVersion: (cv?: ClusterVersionK8sResource) => string | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"versions.d.ts","sourceRoot":"","sources":["../../../../../lib/cim/components/helpers/versions.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,8BAA8B,EAC9B,0BAA0B,EAC1B,yBAAyB,EAC1B,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,0BAA0B,EAAE,MAAM,iBAAiB,CAAC;AAG7D,eAAO,MAAM,0BAA0B,+CAKtC,CAAC;AAqBF,eAAO,MAAM,cAAc,qBACP,0BAA0B,EAAE,cAClC,OAAO,GAAG,SAAS,KAC9B,0BAA0B,
|
|
1
|
+
{"version":3,"file":"versions.d.ts","sourceRoot":"","sources":["../../../../../lib/cim/components/helpers/versions.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,8BAA8B,EAC9B,0BAA0B,EAC1B,yBAAyB,EAC1B,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,0BAA0B,EAAE,MAAM,iBAAiB,CAAC;AAG7D,eAAO,MAAM,0BAA0B,+CAKtC,CAAC;AAqBF,eAAO,MAAM,yBAAyB,UAAuB,CAAC;AAE9D,eAAO,MAAM,eAAe,QAAS,0BAA0B,kBAAkB,MAAM,EAAE,YAUxF,CAAC;AAEF,eAAO,MAAM,cAAc,qBACP,0BAA0B,EAAE,cAClC,OAAO,GAAG,SAAS,KAC9B,0BAA0B,EA0B5B,CAAC;AAEF,eAAO,MAAM,kBAAkB,kBACd,0BAA0B,EAAE,uBACtB,8BAA8B,uBAQpD,CAAC;AAEF,eAAO,MAAM,wBAAwB,QAAS,yBAAyB,KAAG,MAAM,GAAG,SACZ,CAAC;AAExE,eAAO,MAAM,oBAAoB,8BAGhC,CAAC;AAEF,eAAO,MAAM,cAAc,eACb,0BAA0B,GAAG,SAAS,KACjD,eAAe,GAAG,cAC6E,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EditAgentModal.d.ts","sourceRoot":"","sources":["../../../../../lib/cim/components/modals/EditAgentModal.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAGjE,QAAA,MAAM,cAAc,EAAE,KAAK,CAAC,EAAE,CAAC,mBAAmB,
|
|
1
|
+
{"version":3,"file":"EditAgentModal.d.ts","sourceRoot":"","sources":["../../../../../lib/cim/components/modals/EditAgentModal.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAGjE,QAAA,MAAM,cAAc,EAAE,KAAK,CAAC,EAAE,CAAC,mBAAmB,CAajD,CAAC;AAEF,eAAe,cAAc,CAAC"}
|
|
@@ -7,12 +7,11 @@ const getHostNetworks = (agents, agentClusterInstall) => {
|
|
|
7
7
|
return [];
|
|
8
8
|
}
|
|
9
9
|
const connectivityMajorityGroups = JSON.parse(agentClusterInstall.status.connectivityMajorityGroups);
|
|
10
|
-
|
|
11
|
-
return Object.keys(connectivityMajorityGroups)
|
|
10
|
+
return Object.keys(connectivityMajorityGroups.majority_groups)
|
|
12
11
|
.filter((k) => !['IPv4', 'IPv6'].includes(k))
|
|
13
12
|
.map((cidr) => {
|
|
14
13
|
const hostIds = [];
|
|
15
|
-
connectivityMajorityGroups[cidr].forEach((hostName) => {
|
|
14
|
+
connectivityMajorityGroups.majority_groups[cidr].forEach((hostName) => {
|
|
16
15
|
var _a;
|
|
17
16
|
const agent = agents.find((agent) => { var _a; return ((_a = agent.metadata) === null || _a === void 0 ? void 0 : _a.name) === hostName; });
|
|
18
17
|
if (!((_a = agent === null || agent === void 0 ? void 0 : agent.metadata) === null || _a === void 0 ? void 0 : _a.uid)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"network.js","sourceRoot":"","sources":["../../../../../lib/cim/components/helpers/network.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"network.js","sourceRoot":"","sources":["../../../../../lib/cim/components/helpers/network.ts"],"names":[],"mappings":";;;AAQO,MAAM,eAAe,GAAG,CAC7B,MAA0B,EAC1B,mBAAoD,EACpD,EAAE;;IACF,IAAI,CAAC,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,CAAA,IAAI,CAAC,CAAA,MAAA,mBAAmB,aAAnB,mBAAmB,uBAAnB,mBAAmB,CAAE,MAAM,0CAAE,0BAA0B,CAAA,EAAE;QAC/E,OAAO,EAAE,CAAC;KACX;IAED,MAAM,0BAA0B,GAAG,IAAI,CAAC,KAAK,CAC3C,mBAAmB,CAAC,MAAM,CAAC,0BAA0B,CACxB,CAAC;IAEhC,OAAO,MAAM,CAAC,IAAI,CAAC,0BAA0B,CAAC,eAAe,CAAC;SAC3D,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;SAC5C,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QACZ,MAAM,OAAO,GAAa,EAAE,CAAC;QAE7B,0BAA0B,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,QAAgB,EAAE,EAAE;;YAC5E,MAAM,KAAK,GAAiC,MAAM,CAAC,IAAI,CACrD,CAAC,KAAK,EAAE,EAAE,WAAC,OAAA,CAAA,MAAA,KAAK,CAAC,QAAQ,0CAAE,IAAI,MAAK,QAAQ,CAAA,EAAA,CAC7C,CAAC;YACF,IAAI,CAAC,CAAA,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,QAAQ,0CAAE,GAAG,CAAA,EAAE;gBACzB,2DAA2D;aAC5D;iBAAM;gBACL,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;aAClC;QACH,CAAC,CAAC,CAAC;QAEH,OAAO;YACL,IAAI;YACJ,OAAO;SACR,CAAC;IACJ,CAAC,CAAC,CAAC;AACP,CAAC,CAAC;AAjCW,QAAA,eAAe,mBAiC1B"}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getNetworkType = exports.getMajorMinorVersion = exports.getCurrentClusterVersion = exports.getSelectedVersion = exports.getOCPVersions = exports.getVersionFromReleaseImage = void 0;
|
|
3
|
+
exports.getNetworkType = exports.getMajorMinorVersion = exports.getCurrentClusterVersion = exports.getSelectedVersion = exports.getOCPVersions = exports.isValidImageSet = exports.supportedNutanixPlatforms = exports.getVersionFromReleaseImage = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const uniqBy_js_1 = tslib_1.__importDefault(require("lodash-es/uniqBy.js"));
|
|
6
6
|
const getVersionFromReleaseImage = (releaseImage = '') => {
|
|
7
7
|
const match = /.+:(.*)-/gm.exec(releaseImage);
|
|
8
|
-
if (match && match[1]) {
|
|
8
|
+
if (match && match.length > 1 && match[1]) {
|
|
9
9
|
return match[1];
|
|
10
10
|
}
|
|
11
11
|
};
|
|
@@ -23,16 +23,21 @@ const getSupportLevelFromChannel = (channel) => {
|
|
|
23
23
|
}
|
|
24
24
|
return 'beta';
|
|
25
25
|
};
|
|
26
|
+
exports.supportedNutanixPlatforms = ['x86_64', 'x86-64'];
|
|
27
|
+
const isValidImageSet = (cis, architectures) => {
|
|
28
|
+
var _a, _b;
|
|
29
|
+
if (((_b = (_a = cis.metadata) === null || _a === void 0 ? void 0 : _a.labels) === null || _b === void 0 ? void 0 : _b.visible) !== 'true') {
|
|
30
|
+
return false;
|
|
31
|
+
}
|
|
32
|
+
if (!architectures) {
|
|
33
|
+
return true;
|
|
34
|
+
}
|
|
35
|
+
return architectures.some((arch) => { var _a, _b, _c; return ((_a = cis.spec) === null || _a === void 0 ? void 0 : _a.releaseImage.endsWith(arch)) || ((_c = (_b = cis.metadata) === null || _b === void 0 ? void 0 : _b.labels) === null || _c === void 0 ? void 0 : _c.architecture) === arch; });
|
|
36
|
+
};
|
|
37
|
+
exports.isValidImageSet = isValidImageSet;
|
|
26
38
|
const getOCPVersions = (clusterImageSets, isNutanix) => {
|
|
27
39
|
const versions = clusterImageSets
|
|
28
|
-
.filter((clusterImageSet) =>
|
|
29
|
-
var _a, _b, _c;
|
|
30
|
-
let supportedPlatform = true;
|
|
31
|
-
if (isNutanix && ((_a = clusterImageSet.spec) === null || _a === void 0 ? void 0 : _a.releaseImage)) {
|
|
32
|
-
supportedPlatform = clusterImageSet.spec.releaseImage.endsWith('-x86_64');
|
|
33
|
-
}
|
|
34
|
-
return supportedPlatform && ((_c = (_b = clusterImageSet.metadata) === null || _b === void 0 ? void 0 : _b.labels) === null || _c === void 0 ? void 0 : _c.visible) !== 'false';
|
|
35
|
-
})
|
|
40
|
+
.filter((clusterImageSet) => (0, exports.isValidImageSet)(clusterImageSet, isNutanix ? exports.supportedNutanixPlatforms : undefined))
|
|
36
41
|
.map((clusterImageSet) => {
|
|
37
42
|
var _a, _b, _c, _d;
|
|
38
43
|
const version = (0, exports.getVersionFromReleaseImage)((_a = clusterImageSet.spec) === null || _a === void 0 ? void 0 : _a.releaseImage);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../lib/cim/components/helpers/versions.ts"],"names":[],"mappings":";;;;AAAA,4EAAyC;AAUlC,MAAM,0BAA0B,GAAG,CAAC,YAAY,GAAG,EAAE,EAAE,EAAE;IAC9D,MAAM,KAAK,GAAG,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAC9C,IAAI,KAAK,IAAI,KAAK,CAAC,CAAC,CAAC,EAAE;
|
|
1
|
+
{"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../lib/cim/components/helpers/versions.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,10 @@ const EditAgentModal = (_a) => {
|
|
|
8
8
|
var _b;
|
|
9
9
|
var { agent, onSave } = _a, rest = tslib_1.__rest(_a, ["agent", "onSave"]);
|
|
10
10
|
const [host] = agent ? (0, toAssisted_1.getAIHosts)([agent]) : [];
|
|
11
|
-
return (React.createElement(EditHostModal_1.default, Object.assign({ host: host, inventory: (_b = agent === null || agent === void 0 ? void 0 : agent.status) === null || _b === void 0 ? void 0 : _b.inventory }, rest, { onSave: ({ hostname }) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
11
|
+
return (React.createElement(EditHostModal_1.default, Object.assign({ host: host, inventory: (_b = agent === null || agent === void 0 ? void 0 : agent.status) === null || _b === void 0 ? void 0 : _b.inventory }, rest, { onSave: ({ hostname }) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
12
|
+
agent && (yield onSave(agent, hostname));
|
|
13
|
+
rest.onClose();
|
|
14
|
+
}) })));
|
|
12
15
|
};
|
|
13
16
|
exports.default = EditAgentModal;
|
|
14
17
|
//# sourceMappingURL=EditAgentModal.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EditAgentModal.js","sourceRoot":"","sources":["../../../../../lib/cim/components/modals/EditAgentModal.tsx"],"names":[],"mappings":";;;AAAA,qDAA+B;AAC/B,2GAA2E;AAE3E,sDAAmD;AAEnD,MAAM,cAAc,GAAkC,CAAC,EAA0B,EAAE,EAAE;;QAA9B,EAAE,KAAK,EAAE,MAAM,OAAW,EAAN,IAAI,sBAAxB,mBAA0B,CAAF;IAC7E,MAAM,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,IAAA,uBAAU,EAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAChD,OAAO,CACL,oBAAC,uBAAa,kBACZ,IAAI,EAAE,IAAI,EACV,SAAS,EAAE,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,MAAM,0CAAE,SAAS,IAC/B,IAAI,IACR,MAAM,EAAE,CAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,
|
|
1
|
+
{"version":3,"file":"EditAgentModal.js","sourceRoot":"","sources":["../../../../../lib/cim/components/modals/EditAgentModal.tsx"],"names":[],"mappings":";;;AAAA,qDAA+B;AAC/B,2GAA2E;AAE3E,sDAAmD;AAEnD,MAAM,cAAc,GAAkC,CAAC,EAA0B,EAAE,EAAE;;QAA9B,EAAE,KAAK,EAAE,MAAM,OAAW,EAAN,IAAI,sBAAxB,mBAA0B,CAAF;IAC7E,MAAM,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,IAAA,uBAAU,EAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAChD,OAAO,CACL,oBAAC,uBAAa,kBACZ,IAAI,EAAE,IAAI,EACV,SAAS,EAAE,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,MAAM,0CAAE,SAAS,IAC/B,IAAI,IACR,MAAM,EAAE,CAAO,EAAE,QAAQ,EAAE,EAAE,EAAE;YAC7B,KAAK,IAAI,CAAC,MAAM,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC;YACzC,IAAI,CAAC,OAAO,EAAE,CAAC;QACjB,CAAC,CAAA,IACD,CACH,CAAC;AACJ,CAAC,CAAC;AAEF,kBAAe,cAAc,CAAC"}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import { AgentK8sResource } from '../../types/k8s/agent';
|
|
2
2
|
import { AgentClusterInstallK8sResource } from '../../types/k8s/agent-cluster-install';
|
|
3
3
|
|
|
4
|
-
type
|
|
5
|
-
|
|
4
|
+
type ConnectivityMajorityGroups = {
|
|
5
|
+
l3_connected_addresses: object;
|
|
6
|
+
majority_groups: { [key: string]: string[] };
|
|
6
7
|
};
|
|
7
8
|
|
|
8
9
|
export const getHostNetworks = (
|
|
@@ -15,14 +16,14 @@ export const getHostNetworks = (
|
|
|
15
16
|
|
|
16
17
|
const connectivityMajorityGroups = JSON.parse(
|
|
17
18
|
agentClusterInstall.status.connectivityMajorityGroups,
|
|
18
|
-
) as
|
|
19
|
+
) as ConnectivityMajorityGroups;
|
|
19
20
|
|
|
20
|
-
|
|
21
|
-
return Object.keys(connectivityMajorityGroups)
|
|
21
|
+
return Object.keys(connectivityMajorityGroups.majority_groups)
|
|
22
22
|
.filter((k) => !['IPv4', 'IPv6'].includes(k))
|
|
23
23
|
.map((cidr) => {
|
|
24
24
|
const hostIds: string[] = [];
|
|
25
|
-
|
|
25
|
+
|
|
26
|
+
connectivityMajorityGroups.majority_groups[cidr].forEach((hostName: string) => {
|
|
26
27
|
const agent: AgentK8sResource | undefined = agents.find(
|
|
27
28
|
(agent) => agent.metadata?.name === hostName,
|
|
28
29
|
);
|
|
@@ -10,7 +10,7 @@ import { OpenshiftVersion } from '@openshift-assisted/types/assisted-installer-s
|
|
|
10
10
|
|
|
11
11
|
export const getVersionFromReleaseImage = (releaseImage = '') => {
|
|
12
12
|
const match = /.+:(.*)-/gm.exec(releaseImage);
|
|
13
|
-
if (match && match[1]) {
|
|
13
|
+
if (match && match.length > 1 && match[1]) {
|
|
14
14
|
return match[1];
|
|
15
15
|
}
|
|
16
16
|
};
|
|
@@ -34,18 +34,28 @@ const getSupportLevelFromChannel = (
|
|
|
34
34
|
return 'beta';
|
|
35
35
|
};
|
|
36
36
|
|
|
37
|
+
export const supportedNutanixPlatforms = ['x86_64', 'x86-64'];
|
|
38
|
+
|
|
39
|
+
export const isValidImageSet = (cis: ClusterImageSetK8sResource, architectures?: string[]) => {
|
|
40
|
+
if (cis.metadata?.labels?.visible !== 'true') {
|
|
41
|
+
return false;
|
|
42
|
+
}
|
|
43
|
+
if (!architectures) {
|
|
44
|
+
return true;
|
|
45
|
+
}
|
|
46
|
+
return architectures.some(
|
|
47
|
+
(arch) => cis.spec?.releaseImage.endsWith(arch) || cis.metadata?.labels?.architecture === arch,
|
|
48
|
+
);
|
|
49
|
+
};
|
|
50
|
+
|
|
37
51
|
export const getOCPVersions = (
|
|
38
52
|
clusterImageSets: ClusterImageSetK8sResource[],
|
|
39
53
|
isNutanix?: boolean | undefined,
|
|
40
54
|
): OpenshiftVersionOptionType[] => {
|
|
41
55
|
const versions = clusterImageSets
|
|
42
|
-
.filter((clusterImageSet) =>
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
supportedPlatform = clusterImageSet.spec.releaseImage.endsWith('-x86_64');
|
|
46
|
-
}
|
|
47
|
-
return supportedPlatform && clusterImageSet.metadata?.labels?.visible !== 'false';
|
|
48
|
-
})
|
|
56
|
+
.filter((clusterImageSet) =>
|
|
57
|
+
isValidImageSet(clusterImageSet, isNutanix ? supportedNutanixPlatforms : undefined),
|
|
58
|
+
)
|
|
49
59
|
.map((clusterImageSet): OpenshiftVersionOptionType => {
|
|
50
60
|
const version = getVersionFromReleaseImage(clusterImageSet.spec?.releaseImage);
|
|
51
61
|
return {
|
|
@@ -10,7 +10,10 @@ const EditAgentModal: React.FC<EditAgentModalProps> = ({ agent, onSave, ...rest
|
|
|
10
10
|
host={host}
|
|
11
11
|
inventory={agent?.status?.inventory}
|
|
12
12
|
{...rest}
|
|
13
|
-
onSave={async ({ hostname }) =>
|
|
13
|
+
onSave={async ({ hostname }) => {
|
|
14
|
+
agent && (await onSave(agent, hostname));
|
|
15
|
+
rest.onClose();
|
|
16
|
+
}}
|
|
14
17
|
/>
|
|
15
18
|
);
|
|
16
19
|
};
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"dependencies": {
|
|
3
|
-
"@openshift-assisted/locales": "2.
|
|
4
|
-
"@openshift-assisted/types": "2.
|
|
3
|
+
"@openshift-assisted/locales": "2.11.0-cim",
|
|
4
|
+
"@openshift-assisted/types": "2.11.0-cim",
|
|
5
5
|
"@openshift-console/dynamic-plugin-sdk": "0.0.3",
|
|
6
6
|
"@patternfly/patternfly": "^4.222.4",
|
|
7
7
|
"@patternfly/react-code-editor": "^4.82.113",
|
|
@@ -141,5 +141,5 @@
|
|
|
141
141
|
]
|
|
142
142
|
}
|
|
143
143
|
},
|
|
144
|
-
"version": "2.
|
|
144
|
+
"version": "2.11.0-cim"
|
|
145
145
|
}
|