@openshift-assisted/ui-lib 2.46.1 → 2.46.2
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/ocm/components/clusterWizard/ClusterDetails.d.ts.map +1 -1
- package/build/cjs/ocm/components/clusterWizard/ClusterDetails.js +8 -1
- package/build/cjs/ocm/components/clusterWizard/ClusterDetails.js.map +1 -1
- package/lib/ocm/components/clusterWizard/ClusterDetails.tsx +10 -1
- package/package.json +3 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ClusterDetails.d.ts","sourceRoot":"","sources":["../../../../../lib/ocm/components/clusterWizard/ClusterDetails.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAyB1B,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,sDAAsD,CAAC;
|
|
1
|
+
{"version":3,"file":"ClusterDetails.d.ts","sourceRoot":"","sources":["../../../../../lib/ocm/components/clusterWizard/ClusterDetails.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAyB1B,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,sDAAsD,CAAC;AAGzF,KAAK,mBAAmB,GAAG;IACzB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,QAAQ,CAAC;CACrB,CAAC;AAEF,QAAA,MAAM,cAAc,0BAA2B,mBAAmB,sBAoHjE,CAAC;AAEF,eAAe,cAAc,CAAC"}
|
|
@@ -15,6 +15,7 @@ const OpenShiftVersionsContext_1 = require("./OpenShiftVersionsContext");
|
|
|
15
15
|
const ClusterDetailsForm_1 = tslib_1.__importDefault(require("./ClusterDetailsForm"));
|
|
16
16
|
const ClusterWizardNavigation_1 = tslib_1.__importDefault(require("./ClusterWizardNavigation"));
|
|
17
17
|
const services_1 = require("../../services");
|
|
18
|
+
const BundleService_1 = tslib_1.__importDefault(require("../../services/BundleService"));
|
|
18
19
|
const ClusterDetails = ({ cluster, infraEnv }) => {
|
|
19
20
|
const clusterWizardContext = (0, ClusterWizardContext_1.useClusterWizardContext)();
|
|
20
21
|
const managedDomains = (0, hooks_2.useManagedDomains)();
|
|
@@ -45,9 +46,15 @@ const ClusterDetails = ({ cluster, infraEnv }) => {
|
|
|
45
46
|
try {
|
|
46
47
|
const searchParams = new URLSearchParams(location.search);
|
|
47
48
|
const isAssistedMigration = searchParams.get('source') === 'assisted_migration';
|
|
48
|
-
//For Assisted Migration we need
|
|
49
|
+
//For Assisted Migration we need the LVMs operator and also the virtualization bundle operators
|
|
49
50
|
if (isAssistedMigration) {
|
|
50
51
|
params.olmOperators = [{ name: 'lvm' }];
|
|
52
|
+
const selectedBundle = (yield BundleService_1.default.listBundles()).find((b) => b.id === 'virtualization');
|
|
53
|
+
const virtOperators = selectedBundle === null || selectedBundle === void 0 ? void 0 : selectedBundle.operators;
|
|
54
|
+
params.olmOperators = [
|
|
55
|
+
...params.olmOperators,
|
|
56
|
+
...(virtOperators ? virtOperators.map((op) => ({ name: op })) : []),
|
|
57
|
+
];
|
|
51
58
|
}
|
|
52
59
|
const cluster = yield services_1.ClustersService.create(params, isAssistedMigration);
|
|
53
60
|
navigate(`../${cluster.id}`, { state: wizardTransition_1.ClusterWizardFlowStateNew });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ClusterDetails.js","sourceRoot":"","sources":["../../../../../lib/ocm/components/clusterWizard/ClusterDetails.tsx"],"names":[],"mappings":";;;AAAA,0DAA0B;AAC1B,2EAAsE;AACtE,6CAA0C;AAC1C,4CAMyB;AACzB,uCAA4C;AAC5C,6CAA+F;AAC/F,oEAA+F;AAC/F,iEAAiE;AACjE,yDAAsF;AACtF,uCAAqE;AACrE,yEAAyE;AACzE,sFAAsD;AACtD,gGAAgE;AAChE,6CAKwB;
|
|
1
|
+
{"version":3,"file":"ClusterDetails.js","sourceRoot":"","sources":["../../../../../lib/ocm/components/clusterWizard/ClusterDetails.tsx"],"names":[],"mappings":"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"}
|
|
@@ -24,6 +24,7 @@ import {
|
|
|
24
24
|
UISettingService,
|
|
25
25
|
} from '../../services';
|
|
26
26
|
import { Cluster, InfraEnv } from '@openshift-assisted/types/assisted-installer-service';
|
|
27
|
+
import BundleService from '../../services/BundleService';
|
|
27
28
|
|
|
28
29
|
type ClusterDetailsProps = {
|
|
29
30
|
cluster?: Cluster;
|
|
@@ -81,9 +82,17 @@ const ClusterDetails = ({ cluster, infraEnv }: ClusterDetailsProps) => {
|
|
|
81
82
|
try {
|
|
82
83
|
const searchParams = new URLSearchParams(location.search);
|
|
83
84
|
const isAssistedMigration = searchParams.get('source') === 'assisted_migration';
|
|
84
|
-
//For Assisted Migration we need
|
|
85
|
+
//For Assisted Migration we need the LVMs operator and also the virtualization bundle operators
|
|
85
86
|
if (isAssistedMigration) {
|
|
86
87
|
params.olmOperators = [{ name: 'lvm' }];
|
|
88
|
+
const selectedBundle = (await BundleService.listBundles()).find(
|
|
89
|
+
(b) => b.id === 'virtualization',
|
|
90
|
+
);
|
|
91
|
+
const virtOperators = selectedBundle?.operators;
|
|
92
|
+
params.olmOperators = [
|
|
93
|
+
...params.olmOperators,
|
|
94
|
+
...(virtOperators ? virtOperators.map((op) => ({ name: op })) : []),
|
|
95
|
+
];
|
|
87
96
|
}
|
|
88
97
|
const cluster = await ClustersService.create(params, isAssistedMigration);
|
|
89
98
|
navigate(`../${cluster.id}`, { state: ClusterWizardFlowStateNew });
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"dependencies": {
|
|
3
|
-
"@openshift-assisted/locales": "2.46.
|
|
4
|
-
"@openshift-assisted/types": "2.46.
|
|
3
|
+
"@openshift-assisted/locales": "2.46.2",
|
|
4
|
+
"@openshift-assisted/types": "2.46.2",
|
|
5
5
|
"@openshift-console/dynamic-plugin-sdk": "0.0.3",
|
|
6
6
|
"@patternfly/patternfly": "6.2.3",
|
|
7
7
|
"@patternfly/react-code-editor": "6.2.2",
|
|
@@ -140,5 +140,5 @@
|
|
|
140
140
|
]
|
|
141
141
|
}
|
|
142
142
|
},
|
|
143
|
-
"version": "2.46.
|
|
143
|
+
"version": "2.46.2"
|
|
144
144
|
}
|