@openshift-assisted/ui-lib 2.17.3-cim → 2.17.4-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/Agent/BMHStatusInfo.d.ts.map +1 -1
- package/build/@types/cim/components/Agent/MinimalHWRequirements.d.ts.map +1 -1
- package/build/@types/cim/components/Hypershift/DetailsPage/ConditionsTable.d.ts.map +1 -1
- package/build/@types/cim/components/Hypershift/DetailsPage/HostedClusterProgress.d.ts.map +1 -1
- package/build/@types/cim/components/Hypershift/DetailsPage/NodePoolsProgress.d.ts.map +1 -1
- package/build/@types/cim/components/Hypershift/utils/status.d.ts +2 -2
- package/build/@types/cim/components/Hypershift/utils/status.d.ts.map +1 -1
- package/build/@types/cim/components/InfraEnv/EnvironmentDetails.d.ts.map +1 -1
- package/build/@types/cim/components/InfraEnv/InfraEnvHostsTabAgentsWarning.d.ts.map +1 -1
- package/build/@types/cim/components/helpers/agentStatus.d.ts +1 -1
- package/build/@types/cim/components/helpers/agentStatus.d.ts.map +1 -1
- package/build/@types/cim/components/modals/CimConfiguration/CimConfigurationFormFields.d.ts.map +1 -1
- package/build/@types/cim/components/modals/CimConfiguration/CimConfigurationModal.d.ts.map +1 -1
- package/build/@types/cim/components/modals/CimConfiguration/persist.d.ts.map +1 -1
- package/build/@types/cim/components/modals/CimConfiguration/types.d.ts +1 -1
- package/build/@types/cim/components/modals/MassDeleteAgentModal.d.ts.map +1 -1
- package/build/@types/common/components/clusterConfiguration/DiscoveryTroubleshootingModal.d.ts.map +1 -1
- package/build/@types/common/components/clusterDetail/FinalizingProgress.d.ts +1 -1
- package/build/@types/common/components/clusterDetail/FinalizingProgress.d.ts.map +1 -1
- package/build/@types/common/components/clusterDetail/OperatorsProgressItem.d.ts.map +1 -1
- package/build/@types/common/components/clusterDetail/ProgressBarTexts.d.ts.map +1 -1
- package/build/@types/common/components/clusterWizard/ReviewValidations.d.ts.map +1 -1
- package/build/@types/common/components/clusterWizard/networkingSteps/VirtualIPControlGroup.d.ts.map +1 -1
- package/build/@types/common/components/hosts/HostPropertyValidationPopover.d.ts.map +1 -1
- package/build/@types/common/components/hosts/HostStatus.d.ts.map +1 -1
- package/build/@types/common/components/hosts/HostValidationGroups.d.ts.map +1 -1
- package/build/@types/common/components/hosts/Hostname.d.ts.map +1 -1
- package/build/@types/common/components/hosts/MassChangeHostnameModal.d.ts.map +1 -1
- package/build/@types/common/components/hosts/VMRebootConfigurationInfo.d.ts.map +1 -1
- package/build/@types/common/components/hosts/status.d.ts.map +1 -1
- package/build/@types/common/components/storage/DisksTable.d.ts.map +1 -1
- package/build/@types/common/components/storage/StorageUtils.d.ts +1 -1
- package/build/@types/common/components/storage/StorageUtils.d.ts.map +1 -1
- package/build/@types/common/components/ui/WizardNavItem.d.ts.map +1 -1
- package/build/@types/common/components/ui/formik/RemovableField.d.ts.map +1 -1
- package/build/@types/common/components/ui/formik/RichInputField.d.ts.map +1 -1
- package/build/@types/common/components/ui/index.d.ts +0 -1
- package/build/@types/common/components/ui/index.d.ts.map +1 -1
- package/build/@types/common/validationSchemas/addressValidation.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterConfiguration/OcmOperatorProgressItem.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterConfiguration/OpenshiftVersionHelperText.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterConfiguration/networkConfiguration/NetworkConfigurationForm.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterConfiguration/platformIntegration/PlatformIntegrationNote.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterConfiguration/review/ReviewPreflightChecks.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterDetail/HostInventoryExpandable.d.ts +1 -1
- package/build/@types/ocm/components/clusterDetail/HostInventoryExpandable.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterDetail/OpenShiftVersionDetail.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterDetail/ResetClusterModal.d.ts.map +1 -1
- package/build/@types/ocm/components/clusters/ClusterStatus.d.ts.map +1 -1
- package/build/@types/ocm/components/featureSupportLevels/ReviewClusterFeatureSupportLevels.d.ts.map +1 -1
- package/build/@types/ocm/components/ui/InfoLinkWithModal.d.ts.map +1 -1
- package/build/cjs/cim/components/Agent/BMHStatusInfo.js +4 -4
- package/build/cjs/cim/components/Agent/BMHStatusInfo.js.map +1 -1
- package/build/cjs/cim/components/Agent/MinimalHWRequirements.js +2 -2
- package/build/cjs/cim/components/Agent/MinimalHWRequirements.js.map +1 -1
- package/build/cjs/cim/components/Hypershift/DetailsPage/ConditionsTable.js +7 -6
- package/build/cjs/cim/components/Hypershift/DetailsPage/ConditionsTable.js.map +1 -1
- package/build/cjs/cim/components/Hypershift/DetailsPage/HostedClusterProgress.js +3 -2
- package/build/cjs/cim/components/Hypershift/DetailsPage/HostedClusterProgress.js.map +1 -1
- package/build/cjs/cim/components/Hypershift/DetailsPage/NodePoolsProgress.js +2 -2
- package/build/cjs/cim/components/Hypershift/DetailsPage/NodePoolsProgress.js.map +1 -1
- package/build/cjs/cim/components/Hypershift/utils/status.js +8 -7
- package/build/cjs/cim/components/Hypershift/utils/status.js.map +1 -1
- package/build/cjs/cim/components/InfraEnv/EnvironmentDetails.js +4 -4
- package/build/cjs/cim/components/InfraEnv/EnvironmentDetails.js.map +1 -1
- package/build/cjs/cim/components/InfraEnv/InfraEnvHostsTabAgentsWarning.js +3 -3
- package/build/cjs/cim/components/InfraEnv/InfraEnvHostsTabAgentsWarning.js.map +1 -1
- package/build/cjs/cim/components/helpers/agentStatus.js +3 -2
- package/build/cjs/cim/components/helpers/agentStatus.js.map +1 -1
- package/build/cjs/cim/components/modals/CimConfiguration/CimConfigurationFormFields.js +7 -3
- package/build/cjs/cim/components/modals/CimConfiguration/CimConfigurationFormFields.js.map +1 -1
- package/build/cjs/cim/components/modals/CimConfiguration/CimConfigurationModal.js +4 -3
- package/build/cjs/cim/components/modals/CimConfiguration/CimConfigurationModal.js.map +1 -1
- package/build/cjs/cim/components/modals/CimConfiguration/persist.js +7 -0
- package/build/cjs/cim/components/modals/CimConfiguration/persist.js.map +1 -1
- package/build/cjs/cim/components/modals/MassDeleteAgentModal.js +2 -2
- package/build/cjs/cim/components/modals/MassDeleteAgentModal.js.map +1 -1
- package/build/cjs/common/components/clusterConfiguration/DiscoveryTroubleshootingModal.js +2 -1
- package/build/cjs/common/components/clusterConfiguration/DiscoveryTroubleshootingModal.js.map +1 -1
- package/build/cjs/common/components/clusterDetail/FinalizingProgress.js +8 -7
- package/build/cjs/common/components/clusterDetail/FinalizingProgress.js.map +1 -1
- package/build/cjs/common/components/clusterDetail/OperatorsProgressItem.js +4 -4
- package/build/cjs/common/components/clusterDetail/OperatorsProgressItem.js.map +1 -1
- package/build/cjs/common/components/clusterDetail/ProgressBarTexts.js +5 -4
- package/build/cjs/common/components/clusterDetail/ProgressBarTexts.js.map +1 -1
- package/build/cjs/common/components/clusterWizard/ReviewValidations.js +7 -6
- package/build/cjs/common/components/clusterWizard/ReviewValidations.js.map +1 -1
- package/build/cjs/common/components/clusterWizard/networkingSteps/VirtualIPControlGroup.js +2 -2
- package/build/cjs/common/components/clusterWizard/networkingSteps/VirtualIPControlGroup.js.map +1 -1
- package/build/cjs/common/components/hosts/HostPropertyValidationPopover.js +6 -6
- package/build/cjs/common/components/hosts/HostPropertyValidationPopover.js.map +1 -1
- package/build/cjs/common/components/hosts/HostStatus.js +2 -1
- package/build/cjs/common/components/hosts/HostStatus.js.map +1 -1
- package/build/cjs/common/components/hosts/HostValidationGroups.js +6 -6
- package/build/cjs/common/components/hosts/HostValidationGroups.js.map +1 -1
- package/build/cjs/common/components/hosts/Hostname.js +4 -3
- package/build/cjs/common/components/hosts/Hostname.js.map +1 -1
- package/build/cjs/common/components/hosts/MassChangeHostnameModal.js +2 -2
- package/build/cjs/common/components/hosts/MassChangeHostnameModal.js.map +1 -1
- package/build/cjs/common/components/hosts/VMRebootConfigurationInfo.js +2 -1
- package/build/cjs/common/components/hosts/VMRebootConfigurationInfo.js.map +1 -1
- package/build/cjs/common/components/hosts/status.js +19 -13
- package/build/cjs/common/components/hosts/status.js.map +1 -1
- package/build/cjs/common/components/storage/DisksTable.js +4 -2
- package/build/cjs/common/components/storage/DisksTable.js.map +1 -1
- package/build/cjs/common/components/storage/StorageUtils.js +3 -2
- package/build/cjs/common/components/storage/StorageUtils.js.map +1 -1
- package/build/cjs/common/components/ui/WizardNavItem.js +2 -2
- package/build/cjs/common/components/ui/WizardNavItem.js.map +1 -1
- package/build/cjs/common/components/ui/formik/RemovableField.js +3 -3
- package/build/cjs/common/components/ui/formik/RemovableField.js.map +1 -1
- package/build/cjs/common/components/ui/formik/RichInputField.js +4 -4
- package/build/cjs/common/components/ui/formik/RichInputField.js.map +1 -1
- package/build/cjs/common/components/ui/index.js +1 -3
- package/build/cjs/common/components/ui/index.js.map +1 -1
- package/build/cjs/common/validationSchemas/addressValidation.js +16 -4
- package/build/cjs/common/validationSchemas/addressValidation.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/OcmOperatorProgressItem.js +4 -4
- package/build/cjs/ocm/components/clusterConfiguration/OcmOperatorProgressItem.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/OpenshiftVersionHelperText.js +5 -2
- package/build/cjs/ocm/components/clusterConfiguration/OpenshiftVersionHelperText.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/NetworkConfigurationForm.js +5 -2
- package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/NetworkConfigurationForm.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/platformIntegration/PlatformIntegrationNote.js +5 -3
- package/build/cjs/ocm/components/clusterConfiguration/platformIntegration/PlatformIntegrationNote.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/review/ReviewPreflightChecks.js +11 -7
- package/build/cjs/ocm/components/clusterConfiguration/review/ReviewPreflightChecks.js.map +1 -1
- package/build/cjs/ocm/components/clusterDetail/HostInventoryExpandable.js +5 -4
- package/build/cjs/ocm/components/clusterDetail/HostInventoryExpandable.js.map +1 -1
- package/build/cjs/ocm/components/clusterDetail/OpenShiftVersionDetail.js +4 -3
- package/build/cjs/ocm/components/clusterDetail/OpenShiftVersionDetail.js.map +1 -1
- package/build/cjs/ocm/components/clusterDetail/ResetClusterModal.js +4 -2
- package/build/cjs/ocm/components/clusterDetail/ResetClusterModal.js.map +1 -1
- package/build/cjs/ocm/components/clusters/ClusterStatus.js +13 -7
- package/build/cjs/ocm/components/clusters/ClusterStatus.js.map +1 -1
- package/build/cjs/ocm/components/featureSupportLevels/ReviewClusterFeatureSupportLevels.js +7 -6
- package/build/cjs/ocm/components/featureSupportLevels/ReviewClusterFeatureSupportLevels.js.map +1 -1
- package/build/cjs/ocm/components/ui/InfoLinkWithModal.js +2 -2
- package/build/cjs/ocm/components/ui/InfoLinkWithModal.js.map +1 -1
- package/lib/cim/components/Agent/BMHStatusInfo.tsx +12 -4
- package/lib/cim/components/Agent/MinimalHWRequirements.tsx +4 -2
- package/lib/cim/components/Hypershift/DetailsPage/ConditionsTable.tsx +13 -7
- package/lib/cim/components/Hypershift/DetailsPage/HostedClusterProgress.tsx +8 -4
- package/lib/cim/components/Hypershift/DetailsPage/NodePoolsProgress.tsx +6 -2
- package/lib/cim/components/Hypershift/utils/status.tsx +20 -9
- package/lib/cim/components/InfraEnv/EnvironmentDetails.tsx +11 -4
- package/lib/cim/components/InfraEnv/InfraEnvHostsTabAgentsWarning.tsx +4 -6
- package/lib/cim/components/helpers/agentStatus.tsx +7 -3
- package/lib/cim/components/modals/CimConfiguration/CimConfigurationFormFields.tsx +7 -5
- package/lib/cim/components/modals/CimConfiguration/CimConfigurationModal.tsx +4 -3
- package/lib/cim/components/modals/CimConfiguration/persist.ts +11 -0
- package/lib/cim/components/modals/CimConfiguration/types.ts +1 -1
- package/lib/cim/components/modals/MassDeleteAgentModal.tsx +12 -5
- package/lib/common/components/clusterConfiguration/DiscoveryTroubleshootingModal.tsx +5 -2
- package/lib/common/components/clusterDetail/FinalizingProgress.tsx +21 -10
- package/lib/common/components/clusterDetail/OperatorsProgressItem.tsx +11 -5
- package/lib/common/components/clusterDetail/ProgressBarTexts.tsx +17 -5
- package/lib/common/components/clusterWizard/ReviewValidations.tsx +15 -6
- package/lib/common/components/clusterWizard/networkingSteps/VirtualIPControlGroup.tsx +0 -2
- package/lib/common/components/hosts/HostPropertyValidationPopover.tsx +9 -5
- package/lib/common/components/hosts/HostStatus.tsx +14 -3
- package/lib/common/components/hosts/HostValidationGroups.tsx +9 -5
- package/lib/common/components/hosts/Hostname.tsx +7 -4
- package/lib/common/components/hosts/MassChangeHostnameModal.tsx +6 -2
- package/lib/common/components/hosts/VMRebootConfigurationInfo.tsx +12 -3
- package/lib/common/components/hosts/status.tsx +46 -13
- package/lib/common/components/storage/DisksTable.tsx +15 -4
- package/lib/common/components/storage/StorageUtils.tsx +6 -4
- package/lib/common/components/ui/WizardNavItem.tsx +4 -7
- package/lib/common/components/ui/formik/RemovableField.tsx +8 -4
- package/lib/common/components/ui/formik/RichInputField.tsx +10 -6
- package/lib/common/components/ui/index.ts +0 -2
- package/lib/common/validationSchemas/addressValidation.tsx +16 -11
- package/lib/ocm/components/clusterConfiguration/OcmOperatorProgressItem.tsx +11 -5
- package/lib/ocm/components/clusterConfiguration/OpenshiftVersionHelperText.tsx +8 -7
- package/lib/ocm/components/clusterConfiguration/networkConfiguration/NetworkConfigurationForm.tsx +6 -3
- package/lib/ocm/components/clusterConfiguration/platformIntegration/PlatformIntegrationNote.tsx +6 -3
- package/lib/ocm/components/clusterConfiguration/review/ReviewPreflightChecks.tsx +28 -15
- package/lib/ocm/components/clusterDetail/HostInventoryExpandable.tsx +11 -5
- package/lib/ocm/components/clusterDetail/OpenShiftVersionDetail.tsx +8 -5
- package/lib/ocm/components/clusterDetail/ResetClusterModal.tsx +6 -3
- package/lib/ocm/components/clusters/ClusterStatus.tsx +30 -8
- package/lib/ocm/components/featureSupportLevels/ReviewClusterFeatureSupportLevels.tsx +12 -8
- package/lib/ocm/components/ui/InfoLinkWithModal.tsx +4 -2
- package/package.json +3 -3
- package/build/@types/common/components/ui/UiIcon.d.ts +0 -11
- package/build/@types/common/components/ui/UiIcon.d.ts.map +0 -1
- package/build/cjs/common/components/ui/UiIcon.js +0 -11
- package/build/cjs/common/components/ui/UiIcon.js.map +0 -1
- package/lib/common/components/ui/UiIcon.tsx +0 -21
|
@@ -62,7 +62,7 @@ export const CimConfigurationModal: React.FC<CimConfigurationModalProps> = ({
|
|
|
62
62
|
fsVolSizeGiB: values.fsVolSize,
|
|
63
63
|
imgVolSizeGiB: values.imgVolSize,
|
|
64
64
|
configureLoadBalancer: values.configureLoadBalancer,
|
|
65
|
-
ciscoIntersightURL: values.
|
|
65
|
+
ciscoIntersightURL: values.addCiscoIntersightURL ? values.ciscoIntersightURL : undefined,
|
|
66
66
|
})
|
|
67
67
|
) {
|
|
68
68
|
// successfully persisted
|
|
@@ -95,7 +95,7 @@ export const CimConfigurationModal: React.FC<CimConfigurationModalProps> = ({
|
|
|
95
95
|
agentServiceConfig?.spec?.imageStorage?.resources?.requests?.storage,
|
|
96
96
|
),
|
|
97
97
|
configureLoadBalancer: platform === 'AWS',
|
|
98
|
-
|
|
98
|
+
addCiscoIntersightURL: !!agentServiceConfig?.metadata?.annotations?.['ciscoIntersightURL'],
|
|
99
99
|
ciscoIntersightURL: agentServiceConfig?.metadata?.annotations?.['ciscoIntersightURL'] || '',
|
|
100
100
|
};
|
|
101
101
|
|
|
@@ -110,7 +110,8 @@ export const CimConfigurationModal: React.FC<CimConfigurationModalProps> = ({
|
|
|
110
110
|
.min(MIN_IMG_VOL_SIZE, t('ai:Minimal value is 10Gi'))
|
|
111
111
|
.required(t('ai:Required field')),
|
|
112
112
|
configureLoadBalancer: Yup.boolean(),
|
|
113
|
-
|
|
113
|
+
addCiscoIntersightURL: Yup.boolean(),
|
|
114
|
+
ciscoIntersightURL: Yup.string().when('addCiscoIntersightURL', {
|
|
114
115
|
is: true,
|
|
115
116
|
then: (schema) =>
|
|
116
117
|
schema
|
|
@@ -13,11 +13,13 @@ import {
|
|
|
13
13
|
AgentServiceConfigK8sResource,
|
|
14
14
|
AgentServiceConfigModel,
|
|
15
15
|
IngressControllerModel,
|
|
16
|
+
K8sPatch,
|
|
16
17
|
ProvisioningModel,
|
|
17
18
|
RouteK8sResource,
|
|
18
19
|
RouteModel,
|
|
19
20
|
} from '../../../types';
|
|
20
21
|
import { LOCAL_STORAGE_ID_LAST_UPDATE_TIMESTAMP } from './utils';
|
|
22
|
+
import { appendPatch } from '../../../utils';
|
|
21
23
|
|
|
22
24
|
export type SetErrorFuncType = ({
|
|
23
25
|
title,
|
|
@@ -352,6 +354,15 @@ export const onEnableCIM = async ({
|
|
|
352
354
|
) {
|
|
353
355
|
return false;
|
|
354
356
|
}
|
|
357
|
+
} else {
|
|
358
|
+
const patches = [] as K8sPatch;
|
|
359
|
+
appendPatch(
|
|
360
|
+
patches,
|
|
361
|
+
'/metadata/annotations/ciscoIntersightURL',
|
|
362
|
+
ciscoIntersightURL,
|
|
363
|
+
agentServiceConfig.metadata?.annotations?.['ciscoIntersightURL'],
|
|
364
|
+
);
|
|
365
|
+
await k8sPatch({ model: AgentServiceConfigModel, resource: agentServiceConfig, data: patches });
|
|
355
366
|
}
|
|
356
367
|
|
|
357
368
|
// see isCIMConfigProgressing()
|
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
import * as React from 'react';
|
|
2
|
-
import {
|
|
2
|
+
import { TFunction } from 'i18next';
|
|
3
|
+
import { Button, Flex, FlexItem, Icon, Popover } from '@patternfly/react-core';
|
|
3
4
|
import { InfoCircleIcon } from '@patternfly/react-icons/dist/js/icons/info-circle-icon';
|
|
4
5
|
import { Link } from 'react-router-dom-v5-compat';
|
|
5
|
-
|
|
6
|
+
|
|
7
|
+
import { Host } from '@openshift-assisted/types/assisted-installer-service';
|
|
6
8
|
import {
|
|
7
9
|
getHostname,
|
|
8
10
|
getInventory,
|
|
@@ -23,8 +25,6 @@ import BMHStatus from '../Agent/BMHStatus';
|
|
|
23
25
|
import { getBMHStatus, getAgentStatus } from '../helpers';
|
|
24
26
|
import { usePagination } from '../../../common/components/hosts/usePagination';
|
|
25
27
|
import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
|
|
26
|
-
import { TFunction } from 'i18next';
|
|
27
|
-
import { Host } from '@openshift-assisted/types/assisted-installer-service';
|
|
28
28
|
import { agentStatus, bmhStatus } from '../helpers/agentStatus';
|
|
29
29
|
|
|
30
30
|
const hostnameColumn = (agents: AgentK8sResource[], t: TFunction): TableRow<Host> => {
|
|
@@ -99,7 +99,14 @@ const statusColumn = (
|
|
|
99
99
|
</Link>
|
|
100
100
|
}
|
|
101
101
|
>
|
|
102
|
-
<Button
|
|
102
|
+
<Button
|
|
103
|
+
variant="link"
|
|
104
|
+
icon={
|
|
105
|
+
<Icon status="info">
|
|
106
|
+
<InfoCircleIcon />
|
|
107
|
+
</Icon>
|
|
108
|
+
}
|
|
109
|
+
>
|
|
103
110
|
{t('ai:Cannot be deleted')}
|
|
104
111
|
</Button>
|
|
105
112
|
</Popover>
|
|
@@ -14,9 +14,10 @@ import {
|
|
|
14
14
|
ModalHeader,
|
|
15
15
|
ModalFooter,
|
|
16
16
|
ModalBody,
|
|
17
|
+
Icon,
|
|
17
18
|
} from '@patternfly/react-core';
|
|
18
19
|
import { InfoCircleIcon } from '@patternfly/react-icons/dist/js/icons/info-circle-icon';
|
|
19
|
-
import { PrismCode
|
|
20
|
+
import { PrismCode } from '../ui';
|
|
20
21
|
import { useTranslation } from '../../hooks/use-translation-wrapper';
|
|
21
22
|
import { Trans } from 'react-i18next';
|
|
22
23
|
import { saveAs } from 'file-saver';
|
|
@@ -207,7 +208,9 @@ export const HostsNotShowingLink = ({
|
|
|
207
208
|
<Button variant={ButtonVariant.link} onClick={() => setDiscoveryHintModalOpen(true)} isInline>
|
|
208
209
|
{!isInline && (
|
|
209
210
|
<>
|
|
210
|
-
<
|
|
211
|
+
<Icon size="sm">
|
|
212
|
+
<InfoCircleIcon />
|
|
213
|
+
</Icon>
|
|
211
214
|
|
|
212
215
|
</>
|
|
213
216
|
)}
|
|
@@ -1,16 +1,15 @@
|
|
|
1
|
-
import { Cluster } from '@openshift-assisted/types/assisted-installer-service';
|
|
2
|
-
import { EventListFetchProps } from '../../types';
|
|
3
1
|
import React from 'react';
|
|
4
|
-
import
|
|
5
|
-
import { Button, ButtonVariant, Popover, Content } from '@patternfly/react-core';
|
|
2
|
+
import capitalize from 'lodash-es/capitalize.js';
|
|
3
|
+
import { Button, ButtonVariant, Popover, Content, Icon } from '@patternfly/react-core';
|
|
6
4
|
import { CheckCircleIcon } from '@patternfly/react-icons/dist/js/icons/check-circle-icon';
|
|
7
5
|
import { ExclamationCircleIcon } from '@patternfly/react-icons/dist/js/icons/exclamation-circle-icon';
|
|
8
6
|
import { InProgressIcon } from '@patternfly/react-icons/dist/js/icons/in-progress-icon';
|
|
9
7
|
import { PendingIcon } from '@patternfly/react-icons/dist/js/icons/pending-icon';
|
|
10
|
-
|
|
11
|
-
import {
|
|
8
|
+
|
|
9
|
+
import { Cluster } from '@openshift-assisted/types/assisted-installer-service';
|
|
10
|
+
import { EventsModal } from '../ui';
|
|
11
|
+
import { EventListFetchProps } from '../../types';
|
|
12
12
|
import ClusterProgressItem from './ClusterProgressItem';
|
|
13
|
-
import capitalize from 'lodash-es/capitalize.js';
|
|
14
13
|
import { useTranslation } from '../../hooks/use-translation-wrapper';
|
|
15
14
|
|
|
16
15
|
type FinalizingProgressProps = {
|
|
@@ -32,7 +31,11 @@ const areAllBuiltInOperatorsAvailable = (
|
|
|
32
31
|
export const getFinalizingStatus = (cluster: Cluster) => {
|
|
33
32
|
let finalizingIcon, initializationStatus;
|
|
34
33
|
if (areAllBuiltInOperatorsAvailable(cluster.monitoredOperators)) {
|
|
35
|
-
finalizingIcon =
|
|
34
|
+
finalizingIcon = (
|
|
35
|
+
<Icon status="success">
|
|
36
|
+
<CheckCircleIcon />
|
|
37
|
+
</Icon>
|
|
38
|
+
);
|
|
36
39
|
initializationStatus = 'completed';
|
|
37
40
|
} else {
|
|
38
41
|
switch (cluster.status) {
|
|
@@ -42,12 +45,20 @@ export const getFinalizingStatus = (cluster: Cluster) => {
|
|
|
42
45
|
break;
|
|
43
46
|
case 'error':
|
|
44
47
|
case 'cancelled':
|
|
45
|
-
finalizingIcon =
|
|
48
|
+
finalizingIcon = (
|
|
49
|
+
<Icon status="danger">
|
|
50
|
+
<ExclamationCircleIcon />
|
|
51
|
+
</Icon>
|
|
52
|
+
);
|
|
46
53
|
initializationStatus = 'failed';
|
|
47
54
|
break;
|
|
48
55
|
case 'installed':
|
|
49
56
|
case 'adding-hosts':
|
|
50
|
-
finalizingIcon =
|
|
57
|
+
finalizingIcon = (
|
|
58
|
+
<Icon status="success">
|
|
59
|
+
<CheckCircleIcon />
|
|
60
|
+
</Icon>
|
|
61
|
+
);
|
|
51
62
|
initializationStatus = 'completed';
|
|
52
63
|
break;
|
|
53
64
|
default:
|
|
@@ -1,11 +1,9 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
|
-
import { Button, ButtonVariant, List, ListItem, Popover } from '@patternfly/react-core';
|
|
2
|
+
import { Button, ButtonVariant, Icon, List, ListItem, Popover } from '@patternfly/react-core';
|
|
3
3
|
import { CheckCircleIcon } from '@patternfly/react-icons/dist/js/icons/check-circle-icon';
|
|
4
4
|
import { ExclamationCircleIcon } from '@patternfly/react-icons/dist/js/icons/exclamation-circle-icon';
|
|
5
5
|
import { InProgressIcon } from '@patternfly/react-icons/dist/js/icons/in-progress-icon';
|
|
6
6
|
import { PendingIcon } from '@patternfly/react-icons/dist/js/icons/pending-icon';
|
|
7
|
-
import { t_global_icon_color_status_danger_default as dangerColor } from '@patternfly/react-tokens/dist/js/t_global_icon_color_status_danger_default';
|
|
8
|
-
import { t_global_color_status_success_default as okColor } from '@patternfly/react-tokens/dist/js/t_global_color_status_success_default';
|
|
9
7
|
import { pluralize } from 'humanize-plus';
|
|
10
8
|
import { TFunction } from 'i18next';
|
|
11
9
|
import {
|
|
@@ -60,9 +58,17 @@ export function getOperatorsLabel(operators: MonitoredOperatorsList, t: TFunctio
|
|
|
60
58
|
export function getOperatorsIcon(status: OperatorStatus | 'pending') {
|
|
61
59
|
switch (status) {
|
|
62
60
|
case 'available':
|
|
63
|
-
return
|
|
61
|
+
return (
|
|
62
|
+
<Icon status="success">
|
|
63
|
+
<CheckCircleIcon />
|
|
64
|
+
</Icon>
|
|
65
|
+
);
|
|
64
66
|
case 'failed':
|
|
65
|
-
return
|
|
67
|
+
return (
|
|
68
|
+
<Icon status="danger">
|
|
69
|
+
<ExclamationCircleIcon />
|
|
70
|
+
</Icon>
|
|
71
|
+
);
|
|
66
72
|
case 'progressing':
|
|
67
73
|
return <InProgressIcon />;
|
|
68
74
|
default:
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
|
-
import {
|
|
2
|
+
import { Icon } from '@patternfly/react-core';
|
|
3
3
|
import { CheckCircleIcon } from '@patternfly/react-icons/dist/js/icons/check-circle-icon';
|
|
4
4
|
import { ExclamationCircleIcon } from '@patternfly/react-icons/dist/js/icons/exclamation-circle-icon';
|
|
5
5
|
import { InProgressIcon } from '@patternfly/react-icons/dist/js/icons/in-progress-icon';
|
|
6
|
-
|
|
7
|
-
import {
|
|
6
|
+
|
|
7
|
+
import { Host, HostRole } from '@openshift-assisted/types/assisted-installer-service';
|
|
8
8
|
import ClusterProgressItem from './ClusterProgressItem';
|
|
9
9
|
import { useTranslation } from '../../hooks/use-translation-wrapper';
|
|
10
10
|
|
|
@@ -24,7 +24,13 @@ export const ProgressBarTexts = ({ hosts, hostRole }: HostProgressProps) => {
|
|
|
24
24
|
if (hosts.some((host) => ['cancelled', 'error'].includes(host.status))) {
|
|
25
25
|
const failedHostsCount = hosts.filter((host) => host.status === 'error').length;
|
|
26
26
|
return (
|
|
27
|
-
<ClusterProgressItem
|
|
27
|
+
<ClusterProgressItem
|
|
28
|
+
icon={
|
|
29
|
+
<Icon status="danger">
|
|
30
|
+
<ExclamationCircleIcon />
|
|
31
|
+
</Icon>
|
|
32
|
+
}
|
|
33
|
+
>
|
|
28
34
|
<>
|
|
29
35
|
{hostRoleText}
|
|
30
36
|
<br />
|
|
@@ -73,7 +79,13 @@ export const ProgressBarTexts = ({ hosts, hostRole }: HostProgressProps) => {
|
|
|
73
79
|
}
|
|
74
80
|
|
|
75
81
|
return (
|
|
76
|
-
<ClusterProgressItem
|
|
82
|
+
<ClusterProgressItem
|
|
83
|
+
icon={
|
|
84
|
+
<Icon status="success">
|
|
85
|
+
<CheckCircleIcon />
|
|
86
|
+
</Icon>
|
|
87
|
+
}
|
|
88
|
+
>
|
|
77
89
|
<>
|
|
78
90
|
{hostRoleText}
|
|
79
91
|
<br />
|
|
@@ -1,10 +1,9 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
2
|
import lodashValues from 'lodash-es/values.js';
|
|
3
|
-
import { Button, ButtonVariant } from '@patternfly/react-core';
|
|
3
|
+
import { Button, ButtonVariant, Icon } from '@patternfly/react-core';
|
|
4
4
|
import { CheckCircleIcon } from '@patternfly/react-icons/dist/js/icons/check-circle-icon';
|
|
5
5
|
import { ExclamationCircleIcon } from '@patternfly/react-icons/dist/js/icons/exclamation-circle-icon';
|
|
6
6
|
import { ExclamationTriangleIcon } from '@patternfly/react-icons/dist/js/icons/exclamation-triangle-icon';
|
|
7
|
-
import { t_global_color_status_success_default as okColor } from '@patternfly/react-tokens/dist/js/t_global_color_status_success_default';
|
|
8
7
|
|
|
9
8
|
import {
|
|
10
9
|
ValidationsInfo as ClusterValidationsInfo,
|
|
@@ -30,13 +29,15 @@ import {
|
|
|
30
29
|
import { useTranslation } from '../../hooks/use-translation-wrapper';
|
|
31
30
|
import { Trans } from 'react-i18next';
|
|
32
31
|
import { getKeys, stringToJSON } from '../../utils';
|
|
33
|
-
import { UiIcon } from '../ui';
|
|
34
32
|
|
|
35
33
|
const AllValidationsPassed = () => {
|
|
36
34
|
const { t } = useTranslation();
|
|
37
35
|
return (
|
|
38
36
|
<>
|
|
39
|
-
<
|
|
37
|
+
<Icon status="success">
|
|
38
|
+
<CheckCircleIcon />
|
|
39
|
+
</Icon>{' '}
|
|
40
|
+
{t('ai:All checks passed')}
|
|
40
41
|
</>
|
|
41
42
|
);
|
|
42
43
|
};
|
|
@@ -124,9 +125,17 @@ const FailingValidation = <S extends string>({
|
|
|
124
125
|
|
|
125
126
|
let icon;
|
|
126
127
|
if (severity === 'warning') {
|
|
127
|
-
icon =
|
|
128
|
+
icon = (
|
|
129
|
+
<Icon status="warning">
|
|
130
|
+
<ExclamationTriangleIcon />
|
|
131
|
+
</Icon>
|
|
132
|
+
);
|
|
128
133
|
} else {
|
|
129
|
-
icon =
|
|
134
|
+
icon = (
|
|
135
|
+
<Icon status="danger">
|
|
136
|
+
<ExclamationCircleIcon />
|
|
137
|
+
</Icon>
|
|
138
|
+
);
|
|
130
139
|
}
|
|
131
140
|
|
|
132
141
|
return (
|
|
@@ -243,7 +243,6 @@ export const VirtualIPControlGroup = ({
|
|
|
243
243
|
}
|
|
244
244
|
name="apiVips.1.ip"
|
|
245
245
|
maxLength={45}
|
|
246
|
-
isRequired
|
|
247
246
|
isDisabled={isVipInputDisabled || isViewerMode}
|
|
248
247
|
labelInfo={t('ai:Secondary')}
|
|
249
248
|
/>
|
|
@@ -275,7 +274,6 @@ export const VirtualIPControlGroup = ({
|
|
|
275
274
|
</>
|
|
276
275
|
}
|
|
277
276
|
maxLength={45}
|
|
278
|
-
isRequired
|
|
279
277
|
isDisabled={isVipInputDisabled || isViewerMode}
|
|
280
278
|
labelInfo={t('ai:Secondary')}
|
|
281
279
|
/>
|
|
@@ -1,10 +1,8 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
|
-
import { Button, ButtonVariant, Flex, Popover } from '@patternfly/react-core';
|
|
2
|
+
import { Button, ButtonVariant, Flex, Icon, Popover } from '@patternfly/react-core';
|
|
3
3
|
import { CheckCircleIcon } from '@patternfly/react-icons/dist/js/icons/check-circle-icon';
|
|
4
4
|
import { ExclamationCircleIcon } from '@patternfly/react-icons/dist/js/icons/exclamation-circle-icon';
|
|
5
5
|
import { PendingIcon } from '@patternfly/react-icons/dist/js/icons/pending-icon';
|
|
6
|
-
import { t_global_icon_color_status_danger_default as dangerColor } from '@patternfly/react-tokens/dist/js/t_global_icon_color_status_danger_default';
|
|
7
|
-
import { t_global_color_status_success_default as successColor } from '@patternfly/react-tokens/dist/js/t_global_color_status_success_default';
|
|
8
6
|
import { toSentence } from '../ui';
|
|
9
7
|
import { hostValidationFailureHints, hostValidationLabels } from '../../config';
|
|
10
8
|
import { Validation } from '../../types/hosts';
|
|
@@ -61,7 +59,10 @@ const HostPropertyValidationPopover: React.FC<HostPropertyValidationPopoverProps
|
|
|
61
59
|
return (
|
|
62
60
|
<ValidationPopover validation={validation} actions={failureActions}>
|
|
63
61
|
<Flex columnGap={{ default: 'columnGapSm' }} alignItems={{ default: 'alignItemsCenter' }}>
|
|
64
|
-
<
|
|
62
|
+
<Icon status="danger">
|
|
63
|
+
<ExclamationCircleIcon />
|
|
64
|
+
</Icon>{' '}
|
|
65
|
+
{children}
|
|
65
66
|
</Flex>
|
|
66
67
|
</ValidationPopover>
|
|
67
68
|
);
|
|
@@ -79,7 +80,10 @@ const HostPropertyValidationPopover: React.FC<HostPropertyValidationPopoverProps
|
|
|
79
80
|
return (
|
|
80
81
|
<>
|
|
81
82
|
<Flex columnGap={{ default: 'columnGapSm' }} alignItems={{ default: 'alignItemsCenter' }}>
|
|
82
|
-
<
|
|
83
|
+
<Icon status="success">
|
|
84
|
+
<CheckCircleIcon />
|
|
85
|
+
</Icon>{' '}
|
|
86
|
+
{children}
|
|
83
87
|
</Flex>
|
|
84
88
|
</>
|
|
85
89
|
);
|
|
@@ -1,5 +1,14 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
|
-
import {
|
|
2
|
+
import {
|
|
3
|
+
Popover,
|
|
4
|
+
Button,
|
|
5
|
+
Content,
|
|
6
|
+
FlexItem,
|
|
7
|
+
Flex,
|
|
8
|
+
Stack,
|
|
9
|
+
StackItem,
|
|
10
|
+
Icon,
|
|
11
|
+
} from '@patternfly/react-core';
|
|
3
12
|
import { PopoverProps } from '@patternfly/react-core/dist/js/components/Popover/Popover';
|
|
4
13
|
import { ExclamationTriangleIcon } from '@patternfly/react-icons/dist/js/icons/exclamation-triangle-icon';
|
|
5
14
|
import { UnknownIcon } from '@patternfly/react-icons/dist/js/icons/unknown-icon';
|
|
@@ -8,7 +17,7 @@ import hdate from 'human-date';
|
|
|
8
17
|
|
|
9
18
|
import { Host, HostProgressInfo } from '@openshift-assisted/types/assisted-installer-service';
|
|
10
19
|
import { ValidationsInfo } from '../../types/hosts';
|
|
11
|
-
import { ExternalLink,
|
|
20
|
+
import { ExternalLink, getHumanizedDateTime } from '../ui';
|
|
12
21
|
|
|
13
22
|
import HostProgress from './HostProgress';
|
|
14
23
|
import { getHostProgressStageNumber, getHostProgressStages } from './utils';
|
|
@@ -225,7 +234,9 @@ const getHostStatusIcon = (
|
|
|
225
234
|
minWidth="20rem"
|
|
226
235
|
maxWidth="30rem"
|
|
227
236
|
>
|
|
228
|
-
<
|
|
237
|
+
<Icon size="sm" status="warning">
|
|
238
|
+
<ExclamationTriangleIcon />
|
|
239
|
+
</Icon>
|
|
229
240
|
</Popover>
|
|
230
241
|
);
|
|
231
242
|
} else return icon;
|
|
@@ -1,7 +1,5 @@
|
|
|
1
1
|
import React, { Fragment, ReactElement } from 'react';
|
|
2
|
-
import { Alert, AlertGroup, AlertVariant, Level, LevelItem } from '@patternfly/react-core';
|
|
3
|
-
import { t_global_icon_color_status_warning_default as warningColor } from '@patternfly/react-tokens/dist/js/t_global_icon_color_status_warning_default';
|
|
4
|
-
import { t_global_color_status_success_default as okColor } from '@patternfly/react-tokens/dist/js/t_global_color_status_success_default';
|
|
2
|
+
import { Alert, AlertGroup, AlertVariant, Icon, Level, LevelItem } from '@patternfly/react-core';
|
|
5
3
|
import { PendingIcon } from '@patternfly/react-icons/dist/js/icons/pending-icon';
|
|
6
4
|
import { CheckCircleIcon } from '@patternfly/react-icons/dist/js/icons/check-circle-icon';
|
|
7
5
|
import { ExclamationTriangleIcon } from '@patternfly/react-icons/dist/js/icons/exclamation-triangle-icon';
|
|
@@ -293,7 +291,10 @@ export const HostValidationGroups = ({
|
|
|
293
291
|
if (failedValidations.length) {
|
|
294
292
|
return (
|
|
295
293
|
<>
|
|
296
|
-
{t('ai:Failed')}
|
|
294
|
+
{t('ai:Failed')}{' '}
|
|
295
|
+
<Icon status="warning">
|
|
296
|
+
<ExclamationTriangleIcon />
|
|
297
|
+
</Icon>
|
|
297
298
|
</>
|
|
298
299
|
);
|
|
299
300
|
} else if (pendingValidations.length) {
|
|
@@ -305,7 +306,10 @@ export const HostValidationGroups = ({
|
|
|
305
306
|
}
|
|
306
307
|
return (
|
|
307
308
|
<>
|
|
308
|
-
{t('ai:Ready')}
|
|
309
|
+
{t('ai:Ready')}{' '}
|
|
310
|
+
<Icon status="success">
|
|
311
|
+
<CheckCircleIcon />
|
|
312
|
+
</Icon>
|
|
309
313
|
</>
|
|
310
314
|
);
|
|
311
315
|
};
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
|
-
import { Button, ButtonVariant, Flex, FlexItem, Popover } from '@patternfly/react-core';
|
|
2
|
+
import { Button, ButtonVariant, Flex, FlexItem, Icon, Popover } from '@patternfly/react-core';
|
|
3
3
|
import { ExclamationTriangleIcon } from '@patternfly/react-icons/dist/js/icons/exclamation-triangle-icon';
|
|
4
|
-
import { t_global_icon_color_status_warning_default as warningColor } from '@patternfly/react-tokens/dist/js/t_global_icon_color_status_warning_default';
|
|
5
4
|
import type { Host, Inventory } from '@openshift-assisted/types/assisted-installer-service';
|
|
6
5
|
import { getHostname } from './utils';
|
|
7
6
|
import { DASH } from '../constants';
|
|
@@ -44,7 +43,9 @@ const Hostname: React.FC<HostnameProps> = ({
|
|
|
44
43
|
<Flex alignItems={{ default: 'alignItemsCenter' }}>
|
|
45
44
|
{onEditHostname && !isValid && (
|
|
46
45
|
<FlexItem className={'pf-v6-u-mr-xs'}>
|
|
47
|
-
<
|
|
46
|
+
<Icon status="warning">
|
|
47
|
+
<ExclamationTriangleIcon />
|
|
48
|
+
</Icon>
|
|
48
49
|
</FlexItem>
|
|
49
50
|
)}
|
|
50
51
|
<FlexItem>{hostname}</FlexItem>
|
|
@@ -61,7 +62,9 @@ const Hostname: React.FC<HostnameProps> = ({
|
|
|
61
62
|
headerContent={
|
|
62
63
|
<Flex alignItems={{ default: 'alignItemsCenter' }}>
|
|
63
64
|
<FlexItem className={'pf-v6-u-mr-xs'}>
|
|
64
|
-
<
|
|
65
|
+
<Icon status="warning">
|
|
66
|
+
<ExclamationTriangleIcon />
|
|
67
|
+
</Icon>
|
|
65
68
|
</FlexItem>
|
|
66
69
|
<FlexItem>{t('ai:Hostname is not valid')}</FlexItem>
|
|
67
70
|
</Flex>
|
|
@@ -7,6 +7,7 @@ import {
|
|
|
7
7
|
Form,
|
|
8
8
|
HelperText,
|
|
9
9
|
HelperTextItem,
|
|
10
|
+
Icon,
|
|
10
11
|
Modal,
|
|
11
12
|
ModalBody,
|
|
12
13
|
ModalFooter,
|
|
@@ -19,7 +20,6 @@ import {
|
|
|
19
20
|
} from '@patternfly/react-core';
|
|
20
21
|
import { Formik, useFormikContext } from 'formik';
|
|
21
22
|
import * as Yup from 'yup';
|
|
22
|
-
import { t_global_icon_color_status_info_default as blueInfoColor } from '@patternfly/react-tokens/dist/js/t_global_icon_color_status_info_default';
|
|
23
23
|
import { InfoCircleIcon } from '@patternfly/react-icons/dist/js/icons/info-circle-icon';
|
|
24
24
|
import { TFunction } from 'i18next';
|
|
25
25
|
|
|
@@ -235,7 +235,11 @@ const MassChangeHostnameForm = ({
|
|
|
235
235
|
>
|
|
236
236
|
<Button
|
|
237
237
|
variant="link"
|
|
238
|
-
icon={
|
|
238
|
+
icon={
|
|
239
|
+
<Icon status="info">
|
|
240
|
+
<InfoCircleIcon />
|
|
241
|
+
</Icon>
|
|
242
|
+
}
|
|
239
243
|
isInline
|
|
240
244
|
>
|
|
241
245
|
{t('ai:Not changeable')}
|
|
@@ -1,8 +1,15 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
|
-
import {
|
|
2
|
+
import {
|
|
3
|
+
Button,
|
|
4
|
+
ButtonVariant,
|
|
5
|
+
Popover,
|
|
6
|
+
Content,
|
|
7
|
+
ContentVariants,
|
|
8
|
+
Icon,
|
|
9
|
+
} from '@patternfly/react-core';
|
|
3
10
|
import { InfoCircleIcon } from '@patternfly/react-icons/dist/js/icons/info-circle-icon';
|
|
4
11
|
import { Trans } from 'react-i18next';
|
|
5
|
-
import { PrismCode
|
|
12
|
+
import { PrismCode } from '../../../common/components/ui';
|
|
6
13
|
import { useTranslation } from '../../hooks/use-translation-wrapper';
|
|
7
14
|
|
|
8
15
|
export const VMRebootConfigurationContent = () => {
|
|
@@ -43,7 +50,9 @@ const VMRebootConfigurationInfo = () => {
|
|
|
43
50
|
<Popover bodyContent={<VMRebootConfigurationContent />} minWidth="35rem">
|
|
44
51
|
<Button variant={ButtonVariant.link} isInline>
|
|
45
52
|
<>
|
|
46
|
-
<
|
|
53
|
+
<Icon size="sm">
|
|
54
|
+
<InfoCircleIcon />
|
|
55
|
+
</Icon>
|
|
47
56
|
|
|
48
57
|
</>
|
|
49
58
|
{t('ai:Check your VM reboot configuration')}
|