@openshift-assisted/ui-lib 2.9.19-cim → 2.9.20-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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BMCForm.d.ts","sourceRoot":"","sources":["../../../../../lib/cim/components/Agent/BMCForm.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAiD/B,OAAO,EAAgB,YAAY,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"BMCForm.d.ts","sourceRoot":"","sources":["../../../../../lib/cim/components/Agent/BMCForm.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAiD/B,OAAO,EAAgB,YAAY,EAAE,MAAM,SAAS,CAAC;AA6LrD,QAAA,MAAM,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC,YAAY,CA6HnC,CAAC;AAEF,eAAe,OAAO,CAAC"}
|
|
@@ -99,31 +99,32 @@ const emptyValues = {
|
|
|
99
99
|
bootMACAddress: '',
|
|
100
100
|
disableCertificateVerification: true,
|
|
101
101
|
online: true,
|
|
102
|
-
nmState:
|
|
103
|
-
- name: <nic1_name
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
dns-resolver
|
|
112
|
-
config
|
|
113
|
-
server
|
|
114
|
-
- <dns_ip_address
|
|
115
|
-
routes
|
|
116
|
-
config
|
|
117
|
-
- destination: 0.0.0.0/0
|
|
118
|
-
next-hop-address: <next_hop_ip_address
|
|
119
|
-
next-hop-interface: <next_hop_nic1_name
|
|
120
|
-
|
|
102
|
+
nmState: `interfaces:
|
|
103
|
+
- name: <nic1_name>
|
|
104
|
+
type: ethernet
|
|
105
|
+
state: up
|
|
106
|
+
ipv4:
|
|
107
|
+
address:
|
|
108
|
+
- ip: <ip_address>
|
|
109
|
+
prefix-length: 24
|
|
110
|
+
enabled: true
|
|
111
|
+
dns-resolver:
|
|
112
|
+
config:
|
|
113
|
+
server:
|
|
114
|
+
- <dns_ip_address>
|
|
115
|
+
routes:
|
|
116
|
+
config:
|
|
117
|
+
- destination: 0.0.0.0/0
|
|
118
|
+
next-hop-address: <next_hop_ip_address>
|
|
119
|
+
next-hop-interface: <next_hop_nic1_name>
|
|
120
|
+
`,
|
|
121
121
|
macMapping: [{ macAddress: '', name: '' }],
|
|
122
122
|
};
|
|
123
|
-
const getInitValues = (bmh, nmState, secret, isEdit) => {
|
|
123
|
+
const getInitValues = (bmh, nmState, secret, isEdit, addNMState) => {
|
|
124
124
|
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
|
|
125
|
+
let values = emptyValues;
|
|
125
126
|
if (isEdit) {
|
|
126
|
-
|
|
127
|
+
values = {
|
|
127
128
|
name: ((_a = bmh === null || bmh === void 0 ? void 0 : bmh.metadata) === null || _a === void 0 ? void 0 : _a.name) || '',
|
|
128
129
|
hostname: ((_c = (_b = bmh === null || bmh === void 0 ? void 0 : bmh.metadata) === null || _b === void 0 ? void 0 : _b.annotations) === null || _c === void 0 ? void 0 : _c[common_2.BMH_HOSTNAME_ANNOTATION]) || '',
|
|
129
130
|
bmcAddress: ((_e = (_d = bmh === null || bmh === void 0 ? void 0 : bmh.spec) === null || _d === void 0 ? void 0 : _d.bmc) === null || _e === void 0 ? void 0 : _e.address) || '',
|
|
@@ -136,11 +137,13 @@ const getInitValues = (bmh, nmState, secret, isEdit) => {
|
|
|
136
137
|
macMapping: ((_o = nmState === null || nmState === void 0 ? void 0 : nmState.spec) === null || _o === void 0 ? void 0 : _o.interfaces) || [{ macAddress: '', name: '' }],
|
|
137
138
|
};
|
|
138
139
|
}
|
|
139
|
-
|
|
140
|
-
|
|
140
|
+
if (!addNMState) {
|
|
141
|
+
values.nmState = '';
|
|
141
142
|
}
|
|
143
|
+
return values;
|
|
142
144
|
};
|
|
143
145
|
const BMCForm = ({ onCreateBMH, onClose, hasDHCP, infraEnv, bmh, nmState, secret, isEdit, usedHostnames, }) => {
|
|
146
|
+
var _a;
|
|
144
147
|
const [error, setError] = React.useState();
|
|
145
148
|
const handleSubmit = (values) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
146
149
|
try {
|
|
@@ -155,10 +158,12 @@ const BMCForm = ({ onCreateBMH, onClose, hasDHCP, infraEnv, bmh, nmState, secret
|
|
|
155
158
|
});
|
|
156
159
|
const { t } = (0, use_translation_wrapper_1.useTranslation)();
|
|
157
160
|
const { initValues, validationSchema } = React.useMemo(() => {
|
|
158
|
-
|
|
161
|
+
var _a, _b;
|
|
162
|
+
const addNmState = ((_a = infraEnv.metadata) === null || _a === void 0 ? void 0 : _a.labels) && ((_b = infraEnv.metadata) === null || _b === void 0 ? void 0 : _b.labels['networkType']) === 'static';
|
|
163
|
+
const initValues = getInitValues(bmh, nmState, secret, isEdit, addNmState);
|
|
159
164
|
const validationSchema = getValidationSchema(usedHostnames, initValues.hostname, t);
|
|
160
165
|
return { initValues, validationSchema };
|
|
161
|
-
}, [usedHostnames, bmh, nmState, secret, isEdit, t]);
|
|
166
|
+
}, [(_a = infraEnv.metadata) === null || _a === void 0 ? void 0 : _a.labels, usedHostnames, bmh, nmState, secret, isEdit, t]);
|
|
162
167
|
return (React.createElement(formik_1.Formik, { initialValues: initValues, isInitialValid: false, validate: (0, common_1.getRichTextValidation)(validationSchema), onSubmit: handleSubmit }, ({ isSubmitting, isValid, submitForm }) => (React.createElement(React.Fragment, null,
|
|
163
168
|
React.createElement(react_core_1.ModalBoxBody, null,
|
|
164
169
|
React.createElement(react_core_1.Form, { id: "add-bmc-form" },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BMCForm.js","sourceRoot":"","sources":["../../../../../lib/cim/components/Agent/BMCForm.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"BMCForm.js","sourceRoot":"","sources":["../../../../../lib/cim/components/Agent/BMCForm.tsx"],"names":[],"mappings":"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"}
|
|
@@ -184,26 +184,25 @@ const emptyValues: AddBmcValues = {
|
|
|
184
184
|
bootMACAddress: '',
|
|
185
185
|
disableCertificateVerification: true, // TODO(mlibra)
|
|
186
186
|
online: true,
|
|
187
|
-
nmState:
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
next-hop-
|
|
205
|
-
|
|
206
|
-
',
|
|
187
|
+
nmState: `interfaces:
|
|
188
|
+
- name: <nic1_name>
|
|
189
|
+
type: ethernet
|
|
190
|
+
state: up
|
|
191
|
+
ipv4:
|
|
192
|
+
address:
|
|
193
|
+
- ip: <ip_address>
|
|
194
|
+
prefix-length: 24
|
|
195
|
+
enabled: true
|
|
196
|
+
dns-resolver:
|
|
197
|
+
config:
|
|
198
|
+
server:
|
|
199
|
+
- <dns_ip_address>
|
|
200
|
+
routes:
|
|
201
|
+
config:
|
|
202
|
+
- destination: 0.0.0.0/0
|
|
203
|
+
next-hop-address: <next_hop_ip_address>
|
|
204
|
+
next-hop-interface: <next_hop_nic1_name>
|
|
205
|
+
`,
|
|
207
206
|
macMapping: [{ macAddress: '', name: '' }],
|
|
208
207
|
};
|
|
209
208
|
|
|
@@ -212,9 +211,12 @@ const getInitValues = (
|
|
|
212
211
|
nmState?: NMStateK8sResource,
|
|
213
212
|
secret?: SecretK8sResource,
|
|
214
213
|
isEdit?: boolean,
|
|
214
|
+
addNMState?: boolean,
|
|
215
215
|
): AddBmcValues => {
|
|
216
|
+
let values = emptyValues;
|
|
217
|
+
|
|
216
218
|
if (isEdit) {
|
|
217
|
-
|
|
219
|
+
values = {
|
|
218
220
|
name: bmh?.metadata?.name || '',
|
|
219
221
|
hostname: bmh?.metadata?.annotations?.[BMH_HOSTNAME_ANNOTATION] || '',
|
|
220
222
|
bmcAddress: bmh?.spec?.bmc?.address || '',
|
|
@@ -226,9 +228,12 @@ const getInitValues = (
|
|
|
226
228
|
nmState: nmState ? yaml.dump(nmState?.spec?.config) : emptyValues.nmState,
|
|
227
229
|
macMapping: nmState?.spec?.interfaces || [{ macAddress: '', name: '' }],
|
|
228
230
|
};
|
|
229
|
-
} else {
|
|
230
|
-
return emptyValues;
|
|
231
231
|
}
|
|
232
|
+
|
|
233
|
+
if (!addNMState) {
|
|
234
|
+
values.nmState = '';
|
|
235
|
+
}
|
|
236
|
+
return values;
|
|
232
237
|
};
|
|
233
238
|
|
|
234
239
|
const BMCForm: React.FC<BMCFormProps> = ({
|
|
@@ -254,12 +259,16 @@ const BMCForm: React.FC<BMCFormProps> = ({
|
|
|
254
259
|
setError(getErrorMessage(e));
|
|
255
260
|
}
|
|
256
261
|
};
|
|
262
|
+
|
|
257
263
|
const { t } = useTranslation();
|
|
258
264
|
const { initValues, validationSchema } = React.useMemo(() => {
|
|
259
|
-
const
|
|
265
|
+
const addNmState =
|
|
266
|
+
infraEnv.metadata?.labels && infraEnv.metadata?.labels['networkType'] === 'static';
|
|
267
|
+
|
|
268
|
+
const initValues = getInitValues(bmh, nmState, secret, isEdit, addNmState);
|
|
260
269
|
const validationSchema = getValidationSchema(usedHostnames, initValues.hostname, t);
|
|
261
270
|
return { initValues, validationSchema };
|
|
262
|
-
}, [usedHostnames, bmh, nmState, secret, isEdit, t]);
|
|
271
|
+
}, [infraEnv.metadata?.labels, usedHostnames, bmh, nmState, secret, isEdit, t]);
|
|
263
272
|
|
|
264
273
|
return (
|
|
265
274
|
<Formik
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"dependencies": {
|
|
3
|
-
"@openshift-assisted/locales": "2.9.
|
|
4
|
-
"@openshift-assisted/types": "2.9.
|
|
3
|
+
"@openshift-assisted/locales": "2.9.20-cim",
|
|
4
|
+
"@openshift-assisted/types": "2.9.20-cim",
|
|
5
5
|
"@patternfly/patternfly": "^4.222.4",
|
|
6
6
|
"@patternfly/react-code-editor": "^4.82.113",
|
|
7
7
|
"@patternfly/react-core": "^4.168.8",
|
|
@@ -133,5 +133,5 @@
|
|
|
133
133
|
]
|
|
134
134
|
}
|
|
135
135
|
},
|
|
136
|
-
"version": "2.9.
|
|
136
|
+
"version": "2.9.20-cim"
|
|
137
137
|
}
|