@openshift-assisted/ui-lib 2.48.2 → 2.48.4
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/common/api/assisted-service/ClustersAPI.d.ts +0 -4
- package/build/@types/common/api/assisted-service/ClustersAPI.d.ts.map +1 -1
- package/build/@types/common/api/assisted-service/HostsAPI.d.ts +1 -0
- package/build/@types/common/api/assisted-service/HostsAPI.d.ts.map +1 -1
- package/build/@types/common/components/ui/formik/PullSecretField.d.ts.map +1 -1
- package/build/@types/ocm/components/Routes.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterWizard/ClusterWizardContext.d.ts +0 -3
- package/build/@types/ocm/components/clusterWizard/ClusterWizardContext.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterWizard/ClusterWizardContextProvider.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterWizard/ClusterWizardFooter.d.ts +1 -2
- package/build/@types/ocm/components/clusterWizard/ClusterWizardFooter.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterWizard/NewClusterWizard.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterWizard/constants.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterWizard/disconnected/BasicStep.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterWizard/disconnected/ReviewStep.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterWizard/index.d.ts +0 -1
- package/build/@types/ocm/components/clusterWizard/index.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterWizard/wizardTransition.d.ts +1 -1
- package/build/@types/ocm/components/clusterWizard/wizardTransition.d.ts.map +1 -1
- package/build/@types/ocm/services/ClustersService.d.ts +0 -4
- package/build/@types/ocm/services/ClustersService.d.ts.map +1 -1
- package/build/@types/ocm/services/HostsService.d.ts +1 -0
- package/build/@types/ocm/services/HostsService.d.ts.map +1 -1
- package/build/cjs/common/api/assisted-service/ClustersAPI.js +0 -3
- package/build/cjs/common/api/assisted-service/ClustersAPI.js.map +1 -1
- package/build/cjs/common/api/assisted-service/HostsAPI.js +3 -0
- package/build/cjs/common/api/assisted-service/HostsAPI.js.map +1 -1
- package/build/cjs/common/components/ui/WizardFooter.js +1 -1
- package/build/cjs/common/components/ui/WizardFooter.js.map +1 -1
- package/build/cjs/common/components/ui/formik/PullSecretField.js.map +1 -1
- package/build/cjs/ocm/components/Routes.js +1 -2
- package/build/cjs/ocm/components/Routes.js.map +1 -1
- package/build/cjs/ocm/components/clusterWizard/ClusterWizardContext.js.map +1 -1
- package/build/cjs/ocm/components/clusterWizard/ClusterWizardContextProvider.js +0 -4
- package/build/cjs/ocm/components/clusterWizard/ClusterWizardContextProvider.js.map +1 -1
- package/build/cjs/ocm/components/clusterWizard/ClusterWizardFooter.js +6 -21
- package/build/cjs/ocm/components/clusterWizard/ClusterWizardFooter.js.map +1 -1
- package/build/cjs/ocm/components/clusterWizard/NewClusterWizard.js +0 -3
- package/build/cjs/ocm/components/clusterWizard/NewClusterWizard.js.map +1 -1
- package/build/cjs/ocm/components/clusterWizard/constants.js +0 -1
- package/build/cjs/ocm/components/clusterWizard/constants.js.map +1 -1
- package/build/cjs/ocm/components/clusterWizard/disconnected/BasicStep.js +1 -45
- package/build/cjs/ocm/components/clusterWizard/disconnected/BasicStep.js.map +1 -1
- package/build/cjs/ocm/components/clusterWizard/disconnected/ReviewStep.js +5 -40
- package/build/cjs/ocm/components/clusterWizard/disconnected/ReviewStep.js.map +1 -1
- package/build/cjs/ocm/components/clusterWizard/index.js +1 -3
- package/build/cjs/ocm/components/clusterWizard/index.js.map +1 -1
- package/build/cjs/ocm/components/clusterWizard/wizardTransition.js +0 -3
- package/build/cjs/ocm/components/clusterWizard/wizardTransition.js.map +1 -1
- package/build/cjs/ocm/services/ClustersService.js +0 -6
- package/build/cjs/ocm/services/ClustersService.js.map +1 -1
- package/build/cjs/ocm/services/HostsService.js +6 -0
- package/build/cjs/ocm/services/HostsService.js.map +1 -1
- package/lib/common/api/assisted-service/ClustersAPI.ts +0 -6
- package/lib/common/api/assisted-service/HostsAPI.ts +5 -0
- package/lib/common/components/ui/WizardFooter.tsx +1 -1
- package/lib/common/components/ui/formik/PullSecretField.tsx +0 -1
- package/lib/ocm/components/Routes.tsx +1 -3
- package/lib/ocm/components/clusterWizard/ClusterWizardContext.tsx +0 -3
- package/lib/ocm/components/clusterWizard/ClusterWizardContextProvider.tsx +0 -6
- package/lib/ocm/components/clusterWizard/ClusterWizardFooter.tsx +5 -26
- package/lib/ocm/components/clusterWizard/NewClusterWizard.tsx +0 -3
- package/lib/ocm/components/clusterWizard/constants.ts +0 -1
- package/lib/ocm/components/clusterWizard/disconnected/BasicStep.tsx +1 -52
- package/lib/ocm/components/clusterWizard/disconnected/ReviewStep.tsx +7 -39
- package/lib/ocm/components/clusterWizard/index.ts +0 -1
- package/lib/ocm/components/clusterWizard/wizardTransition.ts +1 -5
- package/lib/ocm/services/ClustersService.ts +0 -6
- package/lib/ocm/services/HostsService.ts +8 -0
- package/package.json +3 -3
- package/build/@types/ocm/components/clusterWizard/disconnected/OptionalConfigurationsStep.d.ts +0 -4
- package/build/@types/ocm/components/clusterWizard/disconnected/OptionalConfigurationsStep.d.ts.map +0 -1
- package/build/cjs/ocm/components/clusterWizard/disconnected/OptionalConfigurationsStep.js +0 -128
- package/build/cjs/ocm/components/clusterWizard/disconnected/OptionalConfigurationsStep.js.map +0 -1
- package/lib/ocm/components/clusterWizard/disconnected/OptionalConfigurationsStep.tsx +0 -200
|
@@ -12,53 +12,18 @@ const formik_1 = require("formik");
|
|
|
12
12
|
const file_saver_1 = require("file-saver");
|
|
13
13
|
const react_router_dom_v5_compat_1 = require("react-router-dom-v5-compat");
|
|
14
14
|
const operatorSpecs_1 = require("../../../../common/components/operators/operatorSpecs");
|
|
15
|
-
const
|
|
16
|
-
const api_1 = require("../../../../common/api");
|
|
17
|
-
const AlertsContextProvider_1 = require("../../../../common/components/AlertsContextProvider");
|
|
18
|
-
const react_core_2 = require("@patternfly/react-core");
|
|
15
|
+
const downloadUrl = 'https://mirror.openshift.com/pub/cgw/assisted-installer-disconnected/latest/agent-ove.x86_64.iso';
|
|
19
16
|
const ReviewStep = () => {
|
|
20
|
-
const { moveBack
|
|
21
|
-
const { clusterId } = (0, react_router_dom_v5_compat_1.useParams)();
|
|
22
|
-
const { addAlert } = (0, AlertsContextProvider_1.useAlerts)();
|
|
17
|
+
const { moveBack } = (0, ClusterWizardContext_1.useClusterWizardContext)();
|
|
23
18
|
const opSpecs = (0, operatorSpecs_1.getOperatorSpecs)(() => undefined);
|
|
24
19
|
const navigate = (0, react_router_dom_v5_compat_1.useNavigate)();
|
|
25
20
|
return (React.createElement(formik_1.Formik, { initialValues: {}, onSubmit: () => {
|
|
26
21
|
// nothing to do
|
|
27
22
|
} },
|
|
28
23
|
React.createElement(common_1.ClusterWizardStep, { navigation: React.createElement(ClusterWizardNavigation_1.default, null), footer: React.createElement(ClusterWizardFooter_1.default, { onNext: () => {
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
}
|
|
33
|
-
if (clusterId) {
|
|
34
|
-
try {
|
|
35
|
-
yield ClustersService_1.default.remove(clusterId);
|
|
36
|
-
// Remove infraEnv from wizard context after successful deregistration
|
|
37
|
-
setDisconnectedInfraEnv(undefined);
|
|
38
|
-
// Navigate to cluster-list only after successful deregistration
|
|
39
|
-
navigate('/cluster-list');
|
|
40
|
-
}
|
|
41
|
-
catch (error) {
|
|
42
|
-
(0, api_1.handleApiError)(error, () => {
|
|
43
|
-
addAlert({
|
|
44
|
-
title: 'Failed to deregister cluster',
|
|
45
|
-
message: (0, api_1.getApiErrorMessage)(error),
|
|
46
|
-
variant: react_core_2.AlertVariant.danger,
|
|
47
|
-
});
|
|
48
|
-
});
|
|
49
|
-
// Error handling: continue with navigation even if deregistration fails
|
|
50
|
-
// Still clear the context to avoid stale data
|
|
51
|
-
setDisconnectedInfraEnv(undefined);
|
|
52
|
-
// Navigate even on error to avoid getting stuck
|
|
53
|
-
navigate('/cluster-list');
|
|
54
|
-
}
|
|
55
|
-
}
|
|
56
|
-
else {
|
|
57
|
-
// If there's no cluster to deregister, navigate immediately
|
|
58
|
-
navigate('/cluster-list');
|
|
59
|
-
}
|
|
60
|
-
}))();
|
|
61
|
-
}, onBack: moveBack, nextButtonText: "Download ISO", disconnectedClusterId: clusterId }) },
|
|
24
|
+
downloadUrl && (0, file_saver_1.saveAs)(downloadUrl);
|
|
25
|
+
navigate('/cluster-list');
|
|
26
|
+
}, onBack: moveBack, nextButtonText: "Download ISO" }) },
|
|
62
27
|
React.createElement(WithErrorBoundary_1.WithErrorBoundary, { title: "Failed to load Review step" },
|
|
63
28
|
React.createElement(react_core_1.Grid, { hasGutter: true },
|
|
64
29
|
React.createElement(react_core_1.Split, null,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ReviewStep.js","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterWizard/disconnected/ReviewStep.tsx"],"names":[],"mappings":";;;AAAA,qDAA+B;AAC/B,yFAAyD;AACzD,kEAAkE;AAClE,+CAK4B;AAC5B,iGAAiE;AACjE,qGAAkG;AAClG,uDAcgC;AAChC,mCAAgC;AAChC,2CAAoC;AACpC,
|
|
1
|
+
{"version":3,"file":"ReviewStep.js","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterWizard/disconnected/ReviewStep.tsx"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.OpenShiftVersionsContextProvider = exports.
|
|
6
|
+
exports.OpenShiftVersionsContextProvider = exports.ClusterWizardContextProvider = exports.ClusterWizard = exports.NewClusterWizard = exports.ClusterDetailsForm = void 0;
|
|
7
7
|
var ClusterDetailsForm_1 = require("./ClusterDetailsForm");
|
|
8
8
|
Object.defineProperty(exports, "ClusterDetailsForm", { enumerable: true, get: function () { return __importDefault(ClusterDetailsForm_1).default; } });
|
|
9
9
|
var NewClusterWizard_1 = require("./NewClusterWizard");
|
|
@@ -12,8 +12,6 @@ var ClusterWizard_1 = require("./ClusterWizard");
|
|
|
12
12
|
Object.defineProperty(exports, "ClusterWizard", { enumerable: true, get: function () { return __importDefault(ClusterWizard_1).default; } });
|
|
13
13
|
var ClusterWizardContextProvider_1 = require("./ClusterWizardContextProvider");
|
|
14
14
|
Object.defineProperty(exports, "ClusterWizardContextProvider", { enumerable: true, get: function () { return __importDefault(ClusterWizardContextProvider_1).default; } });
|
|
15
|
-
var ClusterWizardContext_1 = require("./ClusterWizardContext");
|
|
16
|
-
Object.defineProperty(exports, "useClusterWizardContext", { enumerable: true, get: function () { return ClusterWizardContext_1.useClusterWizardContext; } });
|
|
17
15
|
var OpenShiftVersionsContext_1 = require("./OpenShiftVersionsContext");
|
|
18
16
|
Object.defineProperty(exports, "OpenShiftVersionsContextProvider", { enumerable: true, get: function () { return OpenShiftVersionsContext_1.OpenShiftVersionsContextProvider; } });
|
|
19
17
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../lib/ocm/components/clusterWizard/index.ts"],"names":[],"mappings":";;;;;;AAAA,2DAAqE;AAA5D,yIAAA,OAAO,OAAsB;AACtC,uDAAiE;AAAxD,qIAAA,OAAO,OAAoB;AACpC,iDAA2D;AAAlD,+HAAA,OAAO,OAAiB;AACjC,+EAAyF;AAAhF,6JAAA,OAAO,OAAgC;AAChD
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../lib/ocm/components/clusterWizard/index.ts"],"names":[],"mappings":";;;;;;AAAA,2DAAqE;AAA5D,yIAAA,OAAO,OAAsB;AACtC,uDAAiE;AAAxD,qIAAA,OAAO,OAAoB;AACpC,iDAA2D;AAAlD,+HAAA,OAAO,OAAiB;AACjC,+EAAyF;AAAhF,6JAAA,OAAO,OAAgC;AAChD,uEAA8E;AAArE,4IAAA,gCAAgC,OAAA"}
|
|
@@ -19,7 +19,6 @@ const wizardStepsOrder = [
|
|
|
19
19
|
];
|
|
20
20
|
exports.disconnectedSteps = [
|
|
21
21
|
'disconnected-basic',
|
|
22
|
-
'disconnected-optional-configurations',
|
|
23
22
|
'disconnected-review',
|
|
24
23
|
];
|
|
25
24
|
exports.ClusterWizardFlowStateNew = 'new';
|
|
@@ -206,7 +205,6 @@ const credentialsValidationMap = buildEmptyValidationsMap();
|
|
|
206
205
|
const customManifestsValidationsMap = buildEmptyValidationsMap();
|
|
207
206
|
const disconnectedReviewValidationsMap = buildEmptyValidationsMap();
|
|
208
207
|
const disconnectedBasicValidationsMap = buildEmptyValidationsMap();
|
|
209
|
-
const disconnectedOptionalConfigurationsValidationsMap = buildEmptyValidationsMap();
|
|
210
208
|
exports.wizardStepsValidationsMap = {
|
|
211
209
|
'cluster-details': clusterDetailsStepValidationsMap,
|
|
212
210
|
'static-ip-yaml-view': staticIpValidationsMap,
|
|
@@ -221,7 +219,6 @@ exports.wizardStepsValidationsMap = {
|
|
|
221
219
|
'credentials-download': credentialsValidationMap,
|
|
222
220
|
'disconnected-review': disconnectedReviewValidationsMap,
|
|
223
221
|
'disconnected-basic': disconnectedBasicValidationsMap,
|
|
224
|
-
'disconnected-optional-configurations': disconnectedOptionalConfigurationsValidationsMap,
|
|
225
222
|
};
|
|
226
223
|
exports.allClusterWizardSoftValidationIds = (0, validationsInfoUtils_1.getAllClusterWizardSoftValidationIds)(exports.wizardStepsValidationsMap);
|
|
227
224
|
/*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wizardTransition.js","sourceRoot":"","sources":["../../../../../lib/ocm/components/clusterWizard/wizardTransition.ts"],"names":[],"mappings":";;;AAAA,wGAMuE;AAEvE,+EAA6F;AAK7F,iDAA8D;
|
|
1
|
+
{"version":3,"file":"wizardTransition.js","sourceRoot":"","sources":["../../../../../lib/ocm/components/clusterWizard/wizardTransition.ts"],"names":[],"mappings":"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"}
|
|
@@ -128,12 +128,6 @@ const ClustersService = {
|
|
|
128
128
|
updateCustomManifest(existingManifest, updatedManifest, clusterId) {
|
|
129
129
|
return ClustersAPI_1.default.updateCustomManifest(clusterId, this.getUpdateManifestParams(existingManifest, updatedManifest));
|
|
130
130
|
},
|
|
131
|
-
registerDisconnected(params) {
|
|
132
|
-
return ClustersAPI_1.default.registerDisconnected({
|
|
133
|
-
name: params.name,
|
|
134
|
-
openshiftVersion: params.openshiftVersion,
|
|
135
|
-
});
|
|
136
|
-
},
|
|
137
131
|
};
|
|
138
132
|
exports.default = ClustersService;
|
|
139
133
|
//# sourceMappingURL=ClustersService.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ClustersService.js","sourceRoot":"","sources":["../../../../lib/ocm/services/ClustersService.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"ClustersService.js","sourceRoot":"","sources":["../../../../lib/ocm/services/ClustersService.ts"],"names":[],"mappings":"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"}
|
|
@@ -69,6 +69,12 @@ const HostsService = {
|
|
|
69
69
|
}
|
|
70
70
|
return apis_1.HostsAPI.bindHost(host.infraEnvId, host.id, clusterId);
|
|
71
71
|
},
|
|
72
|
+
unbind(host) {
|
|
73
|
+
if (!host.infraEnvId) {
|
|
74
|
+
throw new Error(`Cannot unbind host ${host.id}, missing infraEnvId`);
|
|
75
|
+
}
|
|
76
|
+
return apis_1.HostsAPI.unbindHost(host.infraEnvId, host.id);
|
|
77
|
+
},
|
|
72
78
|
installAll(hosts) {
|
|
73
79
|
const promises = [];
|
|
74
80
|
for (const host of hosts) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HostsService.js","sourceRoot":"","sources":["../../../../lib/ocm/services/HostsService.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"HostsService.js","sourceRoot":"","sources":["../../../../lib/ocm/services/HostsService.ts"],"names":[],"mappings":"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"}
|
|
@@ -245,12 +245,6 @@ const ClustersAPI = {
|
|
|
245
245
|
headers: { 'Content-Type': 'application/json' },
|
|
246
246
|
});
|
|
247
247
|
},
|
|
248
|
-
registerDisconnected(params: { name: string; openshiftVersion: string }) {
|
|
249
|
-
return client.post<Cluster, AxiosResponse<Cluster>, { name: string; openshiftVersion: string }>(
|
|
250
|
-
`${ClustersAPI.makeBaseURI()}disconnected`,
|
|
251
|
-
params,
|
|
252
|
-
);
|
|
253
|
-
},
|
|
254
248
|
};
|
|
255
249
|
|
|
256
250
|
export default ClustersAPI;
|
|
@@ -75,6 +75,11 @@ const HostsAPI = {
|
|
|
75
75
|
},
|
|
76
76
|
);
|
|
77
77
|
},
|
|
78
|
+
unbindHost(infraEnvId: InfraEnv['id'], hostId: Host['id']) {
|
|
79
|
+
return client.post<Host, AxiosResponse<Host>, never>(
|
|
80
|
+
`${HostsAPI.makeActionsBaseURI(infraEnvId, hostId)}/unbind`,
|
|
81
|
+
);
|
|
82
|
+
},
|
|
78
83
|
};
|
|
79
84
|
|
|
80
85
|
export default HostsAPI;
|
|
@@ -69,7 +69,7 @@ export const WizardFooter: React.FC<WizardFooterProps> = ({
|
|
|
69
69
|
variant={ButtonVariant.primary}
|
|
70
70
|
name="next"
|
|
71
71
|
onClick={onNext}
|
|
72
|
-
isDisabled={isNextDisabled
|
|
72
|
+
isDisabled={isNextDisabled}
|
|
73
73
|
isLoading={isNextButtonLoading}
|
|
74
74
|
>
|
|
75
75
|
{nextButtonText || t('ai:Next')}
|
|
@@ -34,9 +34,7 @@ export const UILibRoutes = ({
|
|
|
34
34
|
<>
|
|
35
35
|
<Routes>
|
|
36
36
|
<Route path="assisted-installer/clusters" element={<Outlet />}>
|
|
37
|
-
<Route path="~new" element={<NewClusterPage />}
|
|
38
|
-
<Route path=":clusterId" element={<NewClusterPage />} />
|
|
39
|
-
</Route>
|
|
37
|
+
<Route path="~new" element={<NewClusterPage />} />
|
|
40
38
|
<Route path=":clusterId" element={<ClusterPage />} />
|
|
41
39
|
<Route index element={<Clusters />} />
|
|
42
40
|
</Route>
|
|
@@ -3,7 +3,6 @@ import { HostsNetworkConfigurationType } from '../../services';
|
|
|
3
3
|
import { StaticIpView } from '../clusterConfiguration/staticIp/data/dataTypes';
|
|
4
4
|
import { ClusterWizardStepsType } from './wizardTransition';
|
|
5
5
|
import { UISettingsValues } from '../../../common';
|
|
6
|
-
import { InfraEnv } from '@openshift-assisted/types/assisted-installer-service';
|
|
7
6
|
|
|
8
7
|
export type ClusterWizardContextType = {
|
|
9
8
|
currentStepId: ClusterWizardStepsType;
|
|
@@ -21,8 +20,6 @@ export type ClusterWizardContextType = {
|
|
|
21
20
|
uiSettings?: UISettingsValues;
|
|
22
21
|
installDisconnected: boolean;
|
|
23
22
|
setInstallDisconnected: (enabled: boolean) => void;
|
|
24
|
-
disconnectedInfraEnv?: InfraEnv;
|
|
25
|
-
setDisconnectedInfraEnv: (infraEnv: InfraEnv | undefined) => void;
|
|
26
23
|
};
|
|
27
24
|
|
|
28
25
|
export const ClusterWizardContext = React.createContext<ClusterWizardContextType | null>(null);
|
|
@@ -92,9 +92,6 @@ const ClusterWizardContextProvider = ({
|
|
|
92
92
|
const [wizardPerPage, setWizardPerPage] = React.useState(10);
|
|
93
93
|
const [customManifestsStep, setCustomManifestsStep] = React.useState<boolean>(false);
|
|
94
94
|
const [installDisconnected, setInstallDisconnected] = React.useState(false);
|
|
95
|
-
const [disconnectedInfraEnv, setDisconnectedInfraEnv] = React.useState<InfraEnv | undefined>(
|
|
96
|
-
infraEnv,
|
|
97
|
-
);
|
|
98
95
|
const location = useLocation();
|
|
99
96
|
const locationState = location.state as ClusterWizardFlowStateType | undefined;
|
|
100
97
|
const {
|
|
@@ -262,8 +259,6 @@ const ClusterWizardContextProvider = ({
|
|
|
262
259
|
connectedWizardStepIds?.length && onSetCurrentStepId(connectedWizardStepIds[0]);
|
|
263
260
|
}
|
|
264
261
|
},
|
|
265
|
-
disconnectedInfraEnv,
|
|
266
|
-
setDisconnectedInfraEnv,
|
|
267
262
|
};
|
|
268
263
|
}, [
|
|
269
264
|
wizardStepIds,
|
|
@@ -278,7 +273,6 @@ const ClusterWizardContextProvider = ({
|
|
|
278
273
|
installDisconnected,
|
|
279
274
|
setInstallDisconnected,
|
|
280
275
|
connectedWizardStepIds,
|
|
281
|
-
disconnectedInfraEnv,
|
|
282
276
|
]);
|
|
283
277
|
|
|
284
278
|
if (!contextValue) {
|
|
@@ -17,8 +17,6 @@ import { onFetchEvents } from '../fetching/fetchEvents';
|
|
|
17
17
|
import { Cluster } from '@openshift-assisted/types/assisted-installer-service';
|
|
18
18
|
import { useFeature } from '../../hooks/use-feature';
|
|
19
19
|
import { useModalDialogsContext } from '../hosts/ModalDialogsContext';
|
|
20
|
-
import ClustersService from '../../services/ClustersService';
|
|
21
|
-
import { handleApiError, getApiErrorMessage } from '../../../common/api';
|
|
22
20
|
|
|
23
21
|
type ClusterValidationSectionProps = {
|
|
24
22
|
cluster?: Cluster;
|
|
@@ -73,7 +71,6 @@ type ClusterWizardFooterProps = WizardFooterGenericProps & {
|
|
|
73
71
|
errorFields?: string[];
|
|
74
72
|
alertTitle?: string;
|
|
75
73
|
alertContent?: string | null;
|
|
76
|
-
disconnectedClusterId?: string;
|
|
77
74
|
};
|
|
78
75
|
|
|
79
76
|
const ClusterWizardFooter = ({
|
|
@@ -83,37 +80,19 @@ const ClusterWizardFooter = ({
|
|
|
83
80
|
alertTitle,
|
|
84
81
|
alertContent,
|
|
85
82
|
onCancel,
|
|
86
|
-
disconnectedClusterId,
|
|
87
83
|
...rest
|
|
88
84
|
}: ClusterWizardFooterProps) => {
|
|
89
|
-
const { alerts
|
|
85
|
+
const { alerts } = useAlerts();
|
|
90
86
|
const navigate = useNavigate();
|
|
91
87
|
const isSingleClusterFeatureEnabled = useFeature('ASSISTED_INSTALLER_SINGLE_CLUSTER_FEATURE');
|
|
92
88
|
const { currentStepId } = useClusterWizardContext();
|
|
93
89
|
const { resetSingleClusterDialog } = useModalDialogsContext();
|
|
94
|
-
const { setDisconnectedInfraEnv } = useClusterWizardContext();
|
|
95
90
|
|
|
96
|
-
const handleCancel = React.useCallback(
|
|
97
|
-
if (disconnectedClusterId) {
|
|
98
|
-
try {
|
|
99
|
-
await ClustersService.remove(disconnectedClusterId);
|
|
100
|
-
} catch (e) {
|
|
101
|
-
handleApiError(e, () =>
|
|
102
|
-
addAlert({
|
|
103
|
-
title: 'Failed to remove cluster',
|
|
104
|
-
message: getApiErrorMessage(e),
|
|
105
|
-
}),
|
|
106
|
-
);
|
|
107
|
-
}
|
|
108
|
-
}
|
|
109
|
-
setDisconnectedInfraEnv(undefined);
|
|
110
|
-
navigate('/cluster-list');
|
|
111
|
-
}, [navigate, setDisconnectedInfraEnv, addAlert, disconnectedClusterId]);
|
|
91
|
+
const handleCancel = React.useCallback(() => navigate('/cluster-list'), [navigate]);
|
|
112
92
|
|
|
113
|
-
const handleReset = React.useCallback(
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
);
|
|
93
|
+
const handleReset = React.useCallback(() => {
|
|
94
|
+
resetSingleClusterDialog.open({ cluster });
|
|
95
|
+
}, [resetSingleClusterDialog, cluster]);
|
|
117
96
|
|
|
118
97
|
const alertsSection = alerts.length ? <Alerts /> : undefined;
|
|
119
98
|
|
|
@@ -4,7 +4,6 @@ import ClusterDetails from './ClusterDetails';
|
|
|
4
4
|
import { useClusterWizardContext } from './ClusterWizardContext';
|
|
5
5
|
import ReviewStep from './disconnected/ReviewStep';
|
|
6
6
|
import BasicStep from './disconnected/BasicStep';
|
|
7
|
-
import OptionalConfigurationsStep from './disconnected/OptionalConfigurationsStep';
|
|
8
7
|
import { ClusterWizardStepsType } from './wizardTransition';
|
|
9
8
|
|
|
10
9
|
const getCurrentStep = (currentStepId: ClusterWizardStepsType) => {
|
|
@@ -13,8 +12,6 @@ const getCurrentStep = (currentStepId: ClusterWizardStepsType) => {
|
|
|
13
12
|
return <ReviewStep />;
|
|
14
13
|
case 'disconnected-basic':
|
|
15
14
|
return <BasicStep />;
|
|
16
|
-
case 'disconnected-optional-configurations':
|
|
17
|
-
return <OptionalConfigurationsStep />;
|
|
18
15
|
default:
|
|
19
16
|
return <ClusterDetails />;
|
|
20
17
|
}
|
|
@@ -14,7 +14,6 @@ export const wizardStepNames: { [key in ClusterWizardStepsType]: string } = {
|
|
|
14
14
|
'credentials-download': 'Download credentials',
|
|
15
15
|
'disconnected-review': 'Review and download ISO',
|
|
16
16
|
'disconnected-basic': 'Basic information',
|
|
17
|
-
'disconnected-optional-configurations': 'Optional configurations',
|
|
18
17
|
};
|
|
19
18
|
|
|
20
19
|
export const defaultWizardSteps: ClusterWizardStepsType[] = [
|
|
@@ -15,53 +15,10 @@ import ClusterWizardNavigation from '../ClusterWizardNavigation';
|
|
|
15
15
|
import { WithErrorBoundary } from '../../../../common/components/ErrorHandling/WithErrorBoundary';
|
|
16
16
|
import InstallDisconnectedSwitch from './InstallDisconnectedSwitch';
|
|
17
17
|
import { Formik } from 'formik';
|
|
18
|
-
import ClustersService from '../../../services/ClustersService';
|
|
19
|
-
import { handleApiError, getApiErrorMessage } from '../../../../common/api';
|
|
20
|
-
import { useAlerts } from '../../../../common/components/AlertsContextProvider';
|
|
21
|
-
import { AlertVariant } from '@patternfly/react-core';
|
|
22
|
-
import { ClusterWizardFlowStateNew } from '../wizardTransition';
|
|
23
|
-
import { useLocation, useNavigate } from 'react-router-dom-v5-compat';
|
|
24
|
-
import { AxiosResponse } from 'axios';
|
|
25
|
-
import { Cluster } from '@openshift-assisted/types//assisted-installer-service';
|
|
26
18
|
|
|
27
19
|
const BasicStep = () => {
|
|
28
20
|
const { t } = useTranslation();
|
|
29
21
|
const { moveNext } = useClusterWizardContext();
|
|
30
|
-
const { addAlert } = useAlerts();
|
|
31
|
-
const [isSubmitting, setIsSubmitting] = React.useState(false);
|
|
32
|
-
const navigate = useNavigate();
|
|
33
|
-
const location = useLocation();
|
|
34
|
-
const currentPath = location.pathname;
|
|
35
|
-
let disconnectedClusterId: string | undefined;
|
|
36
|
-
|
|
37
|
-
const onNext = async () => {
|
|
38
|
-
try {
|
|
39
|
-
setIsSubmitting(true);
|
|
40
|
-
// Create cluster only - infraEnv will be created in OptionalConfigurationsStep
|
|
41
|
-
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
|
|
42
|
-
const { data: disconnectedCluster }: AxiosResponse<Cluster> =
|
|
43
|
-
// eslint-disable-next-line @typescript-eslint/no-unsafe-call
|
|
44
|
-
await ClustersService.registerDisconnected({
|
|
45
|
-
name: 'disconnected-cluster',
|
|
46
|
-
openshiftVersion: '4.19',
|
|
47
|
-
});
|
|
48
|
-
disconnectedClusterId = disconnectedCluster.id;
|
|
49
|
-
navigate(`${currentPath}/${disconnectedClusterId}`, {
|
|
50
|
-
state: ClusterWizardFlowStateNew,
|
|
51
|
-
});
|
|
52
|
-
moveNext();
|
|
53
|
-
} catch (error: unknown) {
|
|
54
|
-
handleApiError(error, () => {
|
|
55
|
-
addAlert({
|
|
56
|
-
title: 'Failed to create disconnected cluster',
|
|
57
|
-
message: getApiErrorMessage(error),
|
|
58
|
-
variant: AlertVariant.danger,
|
|
59
|
-
});
|
|
60
|
-
});
|
|
61
|
-
} finally {
|
|
62
|
-
setIsSubmitting(false);
|
|
63
|
-
}
|
|
64
|
-
};
|
|
65
22
|
|
|
66
23
|
return (
|
|
67
24
|
<Formik
|
|
@@ -72,15 +29,7 @@ const BasicStep = () => {
|
|
|
72
29
|
>
|
|
73
30
|
<ClusterWizardStep
|
|
74
31
|
navigation={<ClusterWizardNavigation />}
|
|
75
|
-
footer={
|
|
76
|
-
<ClusterWizardFooter
|
|
77
|
-
onNext={() => {
|
|
78
|
-
void onNext();
|
|
79
|
-
}}
|
|
80
|
-
isSubmitting={isSubmitting}
|
|
81
|
-
disconnectedClusterId={disconnectedClusterId}
|
|
82
|
-
/>
|
|
83
|
-
}
|
|
32
|
+
footer={<ClusterWizardFooter onNext={moveNext} />}
|
|
84
33
|
>
|
|
85
34
|
<WithErrorBoundary title="Failed to load Basic step">
|
|
86
35
|
<Grid hasGutter>
|
|
@@ -26,18 +26,15 @@ import {
|
|
|
26
26
|
} from '@patternfly/react-core';
|
|
27
27
|
import { Formik } from 'formik';
|
|
28
28
|
import { saveAs } from 'file-saver';
|
|
29
|
-
import { useNavigate
|
|
29
|
+
import { useNavigate } from 'react-router-dom-v5-compat';
|
|
30
30
|
|
|
31
31
|
import { getOperatorSpecs } from '../../../../common/components/operators/operatorSpecs';
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
import { AlertVariant } from '@patternfly/react-core';
|
|
32
|
+
|
|
33
|
+
const downloadUrl =
|
|
34
|
+
'https://mirror.openshift.com/pub/cgw/assisted-installer-disconnected/latest/agent-ove.x86_64.iso';
|
|
36
35
|
|
|
37
36
|
const ReviewStep = () => {
|
|
38
|
-
const { moveBack
|
|
39
|
-
const { clusterId } = useParams<{ clusterId: string }>();
|
|
40
|
-
const { addAlert } = useAlerts();
|
|
37
|
+
const { moveBack } = useClusterWizardContext();
|
|
41
38
|
const opSpecs = getOperatorSpecs(() => undefined);
|
|
42
39
|
const navigate = useNavigate();
|
|
43
40
|
|
|
@@ -53,40 +50,11 @@ const ReviewStep = () => {
|
|
|
53
50
|
footer={
|
|
54
51
|
<ClusterWizardFooter
|
|
55
52
|
onNext={() => {
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
saveAs(disconnectedInfraEnv.downloadUrl);
|
|
59
|
-
}
|
|
60
|
-
if (clusterId) {
|
|
61
|
-
try {
|
|
62
|
-
await ClustersService.remove(clusterId);
|
|
63
|
-
// Remove infraEnv from wizard context after successful deregistration
|
|
64
|
-
setDisconnectedInfraEnv(undefined);
|
|
65
|
-
// Navigate to cluster-list only after successful deregistration
|
|
66
|
-
navigate('/cluster-list');
|
|
67
|
-
} catch (error) {
|
|
68
|
-
handleApiError(error, () => {
|
|
69
|
-
addAlert({
|
|
70
|
-
title: 'Failed to deregister cluster',
|
|
71
|
-
message: getApiErrorMessage(error),
|
|
72
|
-
variant: AlertVariant.danger,
|
|
73
|
-
});
|
|
74
|
-
});
|
|
75
|
-
// Error handling: continue with navigation even if deregistration fails
|
|
76
|
-
// Still clear the context to avoid stale data
|
|
77
|
-
setDisconnectedInfraEnv(undefined);
|
|
78
|
-
// Navigate even on error to avoid getting stuck
|
|
79
|
-
navigate('/cluster-list');
|
|
80
|
-
}
|
|
81
|
-
} else {
|
|
82
|
-
// If there's no cluster to deregister, navigate immediately
|
|
83
|
-
navigate('/cluster-list');
|
|
84
|
-
}
|
|
85
|
-
})();
|
|
53
|
+
downloadUrl && saveAs(downloadUrl);
|
|
54
|
+
navigate('/cluster-list');
|
|
86
55
|
}}
|
|
87
56
|
onBack={moveBack}
|
|
88
57
|
nextButtonText="Download ISO"
|
|
89
|
-
disconnectedClusterId={clusterId}
|
|
90
58
|
/>
|
|
91
59
|
}
|
|
92
60
|
>
|
|
@@ -2,5 +2,4 @@ export { default as ClusterDetailsForm } from './ClusterDetailsForm';
|
|
|
2
2
|
export { default as NewClusterWizard } from './NewClusterWizard';
|
|
3
3
|
export { default as ClusterWizard } from './ClusterWizard';
|
|
4
4
|
export { default as ClusterWizardContextProvider } from './ClusterWizardContextProvider';
|
|
5
|
-
export { useClusterWizardContext } from './ClusterWizardContext';
|
|
6
5
|
export { OpenShiftVersionsContextProvider } from './OpenShiftVersionsContext';
|
|
@@ -31,8 +31,7 @@ export type ClusterWizardStepsType =
|
|
|
31
31
|
| 'custom-manifests'
|
|
32
32
|
| 'credentials-download'
|
|
33
33
|
| 'disconnected-basic'
|
|
34
|
-
| 'disconnected-review'
|
|
35
|
-
| 'disconnected-optional-configurations';
|
|
34
|
+
| 'disconnected-review';
|
|
36
35
|
|
|
37
36
|
const wizardStepsOrder: ClusterWizardStepsType[] = [
|
|
38
37
|
'cluster-details',
|
|
@@ -50,7 +49,6 @@ const wizardStepsOrder: ClusterWizardStepsType[] = [
|
|
|
50
49
|
|
|
51
50
|
export const disconnectedSteps: ClusterWizardStepsType[] = [
|
|
52
51
|
'disconnected-basic',
|
|
53
|
-
'disconnected-optional-configurations',
|
|
54
52
|
'disconnected-review',
|
|
55
53
|
];
|
|
56
54
|
|
|
@@ -262,7 +260,6 @@ const credentialsValidationMap = buildEmptyValidationsMap();
|
|
|
262
260
|
const customManifestsValidationsMap = buildEmptyValidationsMap();
|
|
263
261
|
const disconnectedReviewValidationsMap = buildEmptyValidationsMap();
|
|
264
262
|
const disconnectedBasicValidationsMap = buildEmptyValidationsMap();
|
|
265
|
-
const disconnectedOptionalConfigurationsValidationsMap = buildEmptyValidationsMap();
|
|
266
263
|
|
|
267
264
|
export const wizardStepsValidationsMap: WizardStepsValidationMap<ClusterWizardStepsType> = {
|
|
268
265
|
'cluster-details': clusterDetailsStepValidationsMap,
|
|
@@ -278,7 +275,6 @@ export const wizardStepsValidationsMap: WizardStepsValidationMap<ClusterWizardSt
|
|
|
278
275
|
'credentials-download': credentialsValidationMap,
|
|
279
276
|
'disconnected-review': disconnectedReviewValidationsMap,
|
|
280
277
|
'disconnected-basic': disconnectedBasicValidationsMap,
|
|
281
|
-
'disconnected-optional-configurations': disconnectedOptionalConfigurationsValidationsMap,
|
|
282
278
|
};
|
|
283
279
|
|
|
284
280
|
export const allClusterWizardSoftValidationIds =
|
|
@@ -171,11 +171,5 @@ const ClustersService = {
|
|
|
171
171
|
this.getUpdateManifestParams(existingManifest, updatedManifest),
|
|
172
172
|
);
|
|
173
173
|
},
|
|
174
|
-
registerDisconnected(params: { name: string; openshiftVersion: string }) {
|
|
175
|
-
return ClustersAPI.registerDisconnected({
|
|
176
|
-
name: params.name,
|
|
177
|
-
openshiftVersion: params.openshiftVersion,
|
|
178
|
-
});
|
|
179
|
-
},
|
|
180
174
|
};
|
|
181
175
|
export default ClustersService;
|
|
@@ -93,6 +93,14 @@ const HostsService = {
|
|
|
93
93
|
return HostsAPI.bindHost(host.infraEnvId, host.id, clusterId);
|
|
94
94
|
},
|
|
95
95
|
|
|
96
|
+
unbind(host: Host) {
|
|
97
|
+
if (!host.infraEnvId) {
|
|
98
|
+
throw new Error(`Cannot unbind host ${host.id}, missing infraEnvId`);
|
|
99
|
+
}
|
|
100
|
+
|
|
101
|
+
return HostsAPI.unbindHost(host.infraEnvId, host.id);
|
|
102
|
+
},
|
|
103
|
+
|
|
96
104
|
installAll(hosts: Host[]) {
|
|
97
105
|
const promises = [];
|
|
98
106
|
for (const host of hosts) {
|