@openshift-assisted/ui-lib 2.52.1 → 2.52.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/common/components/clusters/PullSecret.d.ts +0 -1
- package/build/@types/common/components/clusters/PullSecret.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterConfiguration/OcmClusterDetailsFormFields.d.ts.map +1 -1
- package/build/cjs/common/components/clusters/PullSecret.js +17 -19
- package/build/cjs/common/components/clusters/PullSecret.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/OcmClusterDetailsFormFields.js +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/OcmClusterDetailsFormFields.js.map +1 -1
- package/lib/common/components/clusters/PullSecret.tsx +28 -38
- package/lib/ocm/components/clusterConfiguration/OcmClusterDetailsFormFields.tsx +7 -6
- package/package.json +3 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PullSecret.d.ts","sourceRoot":"","sources":["../../../../../lib/common/components/clusters/PullSecret.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAO1B,MAAM,MAAM,eAAe,GAAG;IAC5B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,
|
|
1
|
+
{"version":3,"file":"PullSecret.d.ts","sourceRoot":"","sources":["../../../../../lib/common/components/clusters/PullSecret.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAO1B,MAAM,MAAM,eAAe,GAAG;IAC5B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,6BAA6B,CAAC,EAAE,OAAO,CAAC;CACzC,CAAC;AAEF,QAAA,MAAM,UAAU,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,CAqCzC,CAAC;AAEF,eAAe,UAAU,CAAC"}
|
package/build/@types/ocm/components/clusterConfiguration/OcmClusterDetailsFormFields.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OcmClusterDetailsFormFields.d.ts","sourceRoot":"","sources":["../../../../../lib/ocm/components/clusterConfiguration/OcmClusterDetailsFormFields.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAK/B,OAAO,EAEL,0BAA0B,EAS3B,MAAM,iBAAiB,CAAC;AAczB,OAAO,EACL,OAAO,EACP,aAAa,EAEd,MAAM,sDAAsD,CAAC;AAQ9D,MAAM,MAAM,gCAAgC,GAAG;IAC7C,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,KAAK,EAAE,OAAO,CAAC;IACf,cAAc,CAAC,EAAE,aAAa,EAAE,CAAC;IACjC,QAAQ,EAAE,0BAA0B,EAAE,CAAC;CACxC,CAAC;AAEF,eAAO,MAAM,2BAA2B,GAAI,kEAMzC,gCAAgC,
|
|
1
|
+
{"version":3,"file":"OcmClusterDetailsFormFields.d.ts","sourceRoot":"","sources":["../../../../../lib/ocm/components/clusterConfiguration/OcmClusterDetailsFormFields.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAK/B,OAAO,EAEL,0BAA0B,EAS3B,MAAM,iBAAiB,CAAC;AAczB,OAAO,EACL,OAAO,EACP,aAAa,EAEd,MAAM,sDAAsD,CAAC;AAQ9D,MAAM,MAAM,gCAAgC,GAAG;IAC7C,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,KAAK,EAAE,OAAO,CAAC;IACf,cAAc,CAAC,EAAE,aAAa,EAAE,CAAC;IACjC,QAAQ,EAAE,0BAA0B,EAAE,CAAC;CACxC,CAAC;AAEF,eAAO,MAAM,2BAA2B,GAAI,kEAMzC,gCAAgC,sBA4KlC,CAAC"}
|
|
@@ -6,28 +6,26 @@ const react_core_1 = require("@patternfly/react-core");
|
|
|
6
6
|
const formik_1 = require("formik");
|
|
7
7
|
const ui_1 = require("../ui");
|
|
8
8
|
const use_translation_wrapper_1 = require("../../hooks/use-translation-wrapper");
|
|
9
|
-
const PullSecret = ({ defaultPullSecret, isOcm = false,
|
|
10
|
-
|
|
11
|
-
const [isExpanded, setExpanded] = react_1.default.useState(() => isPullSecretSet ? false : !defaultPullSecret);
|
|
9
|
+
const PullSecret = ({ defaultPullSecret, isOcm = false, isSingleClusterFeatureEnabled = false, }) => {
|
|
10
|
+
const [isExpanded, setExpanded] = react_1.default.useState(!defaultPullSecret);
|
|
12
11
|
const { setFieldValue } = (0, formik_1.useFormikContext)();
|
|
13
12
|
const { t } = (0, use_translation_wrapper_1.useTranslation)();
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
return react_1.default.createElement(
|
|
13
|
+
if (isOcm || isSingleClusterFeatureEnabled) {
|
|
14
|
+
const onCheckboxChange = () => {
|
|
15
|
+
if (isExpanded) {
|
|
16
|
+
// about to collapse, reset to original value
|
|
17
|
+
setFieldValue('pullSecret', defaultPullSecret);
|
|
18
|
+
}
|
|
19
|
+
setExpanded(!isExpanded);
|
|
20
|
+
};
|
|
21
|
+
return (react_1.default.createElement(react_1.default.Fragment, null,
|
|
22
|
+
react_1.default.createElement(react_core_1.Checkbox, { id: "checkbox-pull-secret", className: "pf-v6-u-display-inline-flex", "aria-label": t('ai:edit pull secret'), isChecked: isExpanded, onChange: onCheckboxChange, label: react_1.default.createElement(react_1.default.Fragment, null,
|
|
23
|
+
t('ai:Edit pull secret'),
|
|
24
|
+
" ",
|
|
25
|
+
react_1.default.createElement(ui_1.PullSecretInfo, { isOcm: isOcm })) }),
|
|
26
|
+
isExpanded && react_1.default.createElement(ui_1.PullSecretField, { isOcm: isOcm })));
|
|
23
27
|
}
|
|
24
|
-
return
|
|
25
|
-
isPullSecretSet && (react_1.default.createElement(react_core_1.Alert, { variant: react_core_1.AlertVariant.success, isInline: true, title: t('ai:Pull secret configured') }, t('ai:A pull secret has already been set for this cluster. You can edit it below.'))),
|
|
26
|
-
react_1.default.createElement(react_core_1.Checkbox, { id: "checkbox-pull-secret", className: "pf-v6-u-display-inline-flex", "aria-label": t('ai:edit pull secret'), isChecked: isExpanded, onChange: onCheckboxChange, label: react_1.default.createElement(react_1.default.Fragment, null,
|
|
27
|
-
t('ai:Edit pull secret'),
|
|
28
|
-
" ",
|
|
29
|
-
react_1.default.createElement(ui_1.PullSecretInfo, { isOcm: isOcm })) }),
|
|
30
|
-
isExpanded && react_1.default.createElement(ui_1.PullSecretField, { isOcm: isOcm })));
|
|
28
|
+
return react_1.default.createElement(ui_1.PullSecretField, { isOcm: isOcm });
|
|
31
29
|
};
|
|
32
30
|
exports.default = PullSecret;
|
|
33
31
|
//# sourceMappingURL=PullSecret.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PullSecret.js","sourceRoot":"","sources":["../../../../../lib/common/components/clusters/PullSecret.tsx"],"names":[],"mappings":";;;AAAA,0DAA0B;AAC1B,
|
|
1
|
+
{"version":3,"file":"PullSecret.js","sourceRoot":"","sources":["../../../../../lib/common/components/clusters/PullSecret.tsx"],"names":[],"mappings":";;;AAAA,0DAA0B;AAC1B,uDAAkD;AAClD,mCAA0C;AAE1C,8BAAwD;AACxD,iFAAqE;AAQrE,MAAM,UAAU,GAA8B,CAAC,EAC7C,iBAAiB,EACjB,KAAK,GAAG,KAAK,EACb,6BAA6B,GAAG,KAAK,GACtC,EAAE,EAAE;IACH,MAAM,CAAC,UAAU,EAAE,WAAW,CAAC,GAAG,eAAK,CAAC,QAAQ,CAAC,CAAC,iBAAiB,CAAC,CAAC;IACrE,MAAM,EAAE,aAAa,EAAE,GAAG,IAAA,yBAAgB,GAAuB,CAAC;IAClE,MAAM,EAAE,CAAC,EAAE,GAAG,IAAA,wCAAc,GAAE,CAAC;IAC/B,IAAI,KAAK,IAAI,6BAA6B,EAAE,CAAC;QAC3C,MAAM,gBAAgB,GAAG,GAAG,EAAE;YAC5B,IAAI,UAAU,EAAE,CAAC;gBACf,6CAA6C;gBAC7C,aAAa,CAAC,YAAY,EAAE,iBAAiB,CAAC,CAAC;YACjD,CAAC;YACD,WAAW,CAAC,CAAC,UAAU,CAAC,CAAC;QAC3B,CAAC,CAAC;QAEF,OAAO,CACL;YACE,8BAAC,qBAAQ,IACP,EAAE,EAAC,sBAAsB,EACzB,SAAS,EAAC,6BAA6B,gBAC3B,CAAC,CAAC,qBAAqB,CAAC,EACpC,SAAS,EAAE,UAAU,EACrB,QAAQ,EAAE,gBAAgB,EAC1B,KAAK,EACH;oBACG,CAAC,CAAC,qBAAqB,CAAC;;oBAAE,8BAAC,mBAAc,IAAC,KAAK,EAAE,KAAK,GAAI,CAC1D,GAEL;YACD,UAAU,IAAI,8BAAC,oBAAe,IAAC,KAAK,EAAE,KAAK,GAAI,CAC/C,CACJ,CAAC;IACJ,CAAC;IAED,OAAO,8BAAC,oBAAe,IAAC,KAAK,EAAE,KAAK,GAAI,CAAC;AAC3C,CAAC,CAAC;AAEF,kBAAe,UAAU,CAAC"}
|
|
@@ -73,7 +73,7 @@ const OcmClusterDetailsFormFields = ({ managedDomains = [], versions, defaultPul
|
|
|
73
73
|
React.createElement(OcmBaseDomainField_1.OcmBaseDomainField, { managedDomains: managedDomains, clusterExists: clusterExists }),
|
|
74
74
|
clusterExists || isSingleClusterFeatureEnabled ? (React.createElement(OcmOpenShiftVersion_1.default, { versions: versions, openshiftVersion: values.openshiftVersion, clusterCpuArchitecture: values.cpuArchitecture, withPreviewText: true, withMultiText: true })) : (React.createElement(OcmOpenShiftVersionSelect_1.default, null)),
|
|
75
75
|
clusterExists || isSingleClusterFeatureEnabled ? (React.createElement(common_1.StaticTextField, { name: "cpuArchitecture", label: "CPU architecture", isRequired: true }, cpuArchitecture)) : (React.createElement(CpuArchitectureDropdown_1.default, { openshiftVersion: openshiftVersion, cpuArchitectures: cpuArchitectures })),
|
|
76
|
-
|
|
76
|
+
!(cluster === null || cluster === void 0 ? void 0 : cluster.pullSecretSet) && (React.createElement(common_1.PullSecret, { isOcm: isOcm, defaultPullSecret: defaultPullSecret, isSingleClusterFeatureEnabled: isSingleClusterFeatureEnabled })),
|
|
77
77
|
!isSingleClusterFeatureEnabled &&
|
|
78
78
|
(clusterExists ? (React.createElement(common_1.StaticTextField, { name: "platform", label: "Integrate with external partner platforms", isRequired: true }, constants_1.ExternalPlatformLabels[values.platform])) : (React.createElement(ExternalPlatformDropdown_1.ExternalPlatformDropdown, { onChange: handleExternalPartnerIntegrationsChange, cpuArchitecture: values.cpuArchitecture, featureSupportLevelData: featureSupportLevelData, isSNO: values.controlPlaneCount === 1 }))),
|
|
79
79
|
clusterExists ? (React.createElement(common_1.StaticTextField, { name: "controlPlaneCount", label: React.createElement(ControlPlaneNodesDropdown_1.ControlPlaneNodesLabel, null) }, values.controlPlaneCount)) : (React.createElement(ControlPlaneNodesDropdown_1.default, { featureSupportLevelData: featureSupportLevelData })),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OcmClusterDetailsFormFields.js","sourceRoot":"","sources":["../../../../../lib/ocm/components/clusterConfiguration/OcmClusterDetailsFormFields.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"OcmClusterDetailsFormFields.js","sourceRoot":"","sources":["../../../../../lib/ocm/components/clusterConfiguration/OcmClusterDetailsFormFields.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
|
-
import {
|
|
2
|
+
import { Checkbox } from '@patternfly/react-core';
|
|
3
3
|
import { useFormikContext } from 'formik';
|
|
4
4
|
import { ClusterCreateParams } from '@openshift-assisted/types/assisted-installer-service';
|
|
5
5
|
import { PullSecretField, PullSecretInfo } from '../ui';
|
|
@@ -8,56 +8,46 @@ import { useTranslation } from '../../hooks/use-translation-wrapper';
|
|
|
8
8
|
export type PullSecretProps = {
|
|
9
9
|
defaultPullSecret?: string;
|
|
10
10
|
isOcm?: boolean;
|
|
11
|
-
isPullSecretSet?: boolean;
|
|
12
11
|
isSingleClusterFeatureEnabled?: boolean;
|
|
13
12
|
};
|
|
14
13
|
|
|
15
14
|
const PullSecret: React.FC<PullSecretProps> = ({
|
|
16
15
|
defaultPullSecret,
|
|
17
16
|
isOcm = false,
|
|
18
|
-
isPullSecretSet = false,
|
|
19
17
|
isSingleClusterFeatureEnabled = false,
|
|
20
18
|
}) => {
|
|
21
|
-
|
|
22
|
-
const [isExpanded, setExpanded] = React.useState(() =>
|
|
23
|
-
isPullSecretSet ? false : !defaultPullSecret,
|
|
24
|
-
);
|
|
19
|
+
const [isExpanded, setExpanded] = React.useState(!defaultPullSecret);
|
|
25
20
|
const { setFieldValue } = useFormikContext<ClusterCreateParams>();
|
|
26
21
|
const { t } = useTranslation();
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
22
|
+
if (isOcm || isSingleClusterFeatureEnabled) {
|
|
23
|
+
const onCheckboxChange = () => {
|
|
24
|
+
if (isExpanded) {
|
|
25
|
+
// about to collapse, reset to original value
|
|
26
|
+
setFieldValue('pullSecret', defaultPullSecret);
|
|
27
|
+
}
|
|
28
|
+
setExpanded(!isExpanded);
|
|
29
|
+
};
|
|
34
30
|
|
|
35
|
-
|
|
36
|
-
|
|
31
|
+
return (
|
|
32
|
+
<>
|
|
33
|
+
<Checkbox
|
|
34
|
+
id="checkbox-pull-secret"
|
|
35
|
+
className="pf-v6-u-display-inline-flex"
|
|
36
|
+
aria-label={t('ai:edit pull secret')}
|
|
37
|
+
isChecked={isExpanded}
|
|
38
|
+
onChange={onCheckboxChange}
|
|
39
|
+
label={
|
|
40
|
+
<>
|
|
41
|
+
{t('ai:Edit pull secret')} <PullSecretInfo isOcm={isOcm} />
|
|
42
|
+
</>
|
|
43
|
+
}
|
|
44
|
+
/>
|
|
45
|
+
{isExpanded && <PullSecretField isOcm={isOcm} />}
|
|
46
|
+
</>
|
|
47
|
+
);
|
|
37
48
|
}
|
|
38
49
|
|
|
39
|
-
return
|
|
40
|
-
<>
|
|
41
|
-
{isPullSecretSet && (
|
|
42
|
-
<Alert variant={AlertVariant.success} isInline title={t('ai:Pull secret configured')}>
|
|
43
|
-
{t('ai:A pull secret has already been set for this cluster. You can edit it below.')}
|
|
44
|
-
</Alert>
|
|
45
|
-
)}
|
|
46
|
-
<Checkbox
|
|
47
|
-
id="checkbox-pull-secret"
|
|
48
|
-
className="pf-v6-u-display-inline-flex"
|
|
49
|
-
aria-label={t('ai:edit pull secret')}
|
|
50
|
-
isChecked={isExpanded}
|
|
51
|
-
onChange={onCheckboxChange}
|
|
52
|
-
label={
|
|
53
|
-
<>
|
|
54
|
-
{t('ai:Edit pull secret')} <PullSecretInfo isOcm={isOcm} />
|
|
55
|
-
</>
|
|
56
|
-
}
|
|
57
|
-
/>
|
|
58
|
-
{isExpanded && <PullSecretField isOcm={isOcm} />}
|
|
59
|
-
</>
|
|
60
|
-
);
|
|
50
|
+
return <PullSecretField isOcm={isOcm} />;
|
|
61
51
|
};
|
|
62
52
|
|
|
63
53
|
export default PullSecret;
|
|
@@ -179,12 +179,13 @@ export const OcmClusterDetailsFormFields = ({
|
|
|
179
179
|
/>
|
|
180
180
|
)}
|
|
181
181
|
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
182
|
+
{!cluster?.pullSecretSet && (
|
|
183
|
+
<PullSecret
|
|
184
|
+
isOcm={isOcm}
|
|
185
|
+
defaultPullSecret={defaultPullSecret}
|
|
186
|
+
isSingleClusterFeatureEnabled={isSingleClusterFeatureEnabled}
|
|
187
|
+
/>
|
|
188
|
+
)}
|
|
188
189
|
|
|
189
190
|
{!isSingleClusterFeatureEnabled &&
|
|
190
191
|
(clusterExists ? (
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"dependencies": {
|
|
3
|
-
"@openshift-assisted/locales": "2.52.
|
|
4
|
-
"@openshift-assisted/types": "2.52.
|
|
3
|
+
"@openshift-assisted/locales": "2.52.2",
|
|
4
|
+
"@openshift-assisted/types": "2.52.2",
|
|
5
5
|
"@openshift-console/dynamic-plugin-sdk": "^4.19.1",
|
|
6
6
|
"@patternfly/patternfly": "6.4.0",
|
|
7
7
|
"@patternfly/react-code-editor": "6.4.1",
|
|
@@ -136,5 +136,5 @@
|
|
|
136
136
|
]
|
|
137
137
|
}
|
|
138
138
|
},
|
|
139
|
-
"version": "2.52.
|
|
139
|
+
"version": "2.52.2"
|
|
140
140
|
}
|