mirror of
https://github.com/elastic/kibana.git
synced 2025-04-24 09:48:58 -04:00
Make add agent step statuses more consistent (#130198)
This commit is contained in:
parent
fae0afbd12
commit
19ed205f4f
6 changed files with 26 additions and 17 deletions
|
@ -26,7 +26,7 @@ export const AgentEnrollmentConfirmationStep = ({
|
|||
}): EuiContainedStepProps => {
|
||||
return {
|
||||
title: i18n.translate('xpack.fleet.agentEnrollment.stepAgentEnrollmentConfirmation', {
|
||||
defaultMessage: 'Confirm agent Enrollment',
|
||||
defaultMessage: 'Confirm agent enrollment',
|
||||
}),
|
||||
children: (
|
||||
<ConfirmAgentEnrollment
|
||||
|
@ -36,6 +36,6 @@ export const AgentEnrollmentConfirmationStep = ({
|
|||
agentCount={agentCount}
|
||||
/>
|
||||
),
|
||||
status: !agentCount ? 'incomplete' : 'complete',
|
||||
status: !agentCount ? undefined : 'complete',
|
||||
};
|
||||
};
|
||||
|
|
|
@ -145,7 +145,9 @@ export const StandaloneSteps: React.FunctionComponent<InstructionProps> = ({
|
|||
: [];
|
||||
|
||||
if (selectionType === 'radio') {
|
||||
steps.push(InstallationModeSelectionStep({ mode, setMode }));
|
||||
steps.push(
|
||||
InstallationModeSelectionStep({ selectedPolicyId: selectedPolicy?.id, mode, setMode })
|
||||
);
|
||||
}
|
||||
|
||||
steps.push(
|
||||
|
@ -236,7 +238,9 @@ export const ManagedSteps: React.FunctionComponent<InstructionProps> = ({
|
|||
];
|
||||
|
||||
if (selectionType === 'radio') {
|
||||
steps.push(InstallationModeSelectionStep({ mode, setMode }));
|
||||
steps.push(
|
||||
InstallationModeSelectionStep({ selectedPolicyId: selectedPolicy?.id, mode, setMode })
|
||||
);
|
||||
}
|
||||
|
||||
steps.push(
|
||||
|
@ -257,7 +261,7 @@ export const ManagedSteps: React.FunctionComponent<InstructionProps> = ({
|
|||
})
|
||||
);
|
||||
}
|
||||
if (selectedPolicy && enrolledAgentIds.length) {
|
||||
if (selectedPolicy) {
|
||||
steps.push(
|
||||
IncomingDataConfirmationStep({
|
||||
agentIds: enrolledAgentIds,
|
||||
|
|
|
@ -111,6 +111,6 @@ export const ConfigureStandaloneAgentStep = ({
|
|||
)}
|
||||
</>
|
||||
),
|
||||
status: !yaml ? 'loading' : 'incomplete',
|
||||
status: !yaml ? 'loading' : undefined,
|
||||
};
|
||||
};
|
||||
|
|
|
@ -34,14 +34,15 @@ export const IncomingDataConfirmationStep = ({
|
|||
: i18n.translate('xpack.fleet.agentEnrollment.stepConfirmIncomingData.completed', {
|
||||
defaultMessage: 'Incoming data confirmed',
|
||||
}),
|
||||
children: (
|
||||
<ConfirmIncomingData
|
||||
agentIds={agentIds}
|
||||
installedPolicy={installedPolicy}
|
||||
agentDataConfirmed={agentDataConfirmed}
|
||||
setAgentDataConfirmed={setAgentDataConfirmed}
|
||||
/>
|
||||
),
|
||||
status: !agentDataConfirmed ? 'loading' : 'complete',
|
||||
children:
|
||||
agentIds.length > 0 ? (
|
||||
<ConfirmIncomingData
|
||||
agentIds={agentIds}
|
||||
installedPolicy={installedPolicy}
|
||||
agentDataConfirmed={agentDataConfirmed}
|
||||
setAgentDataConfirmed={setAgentDataConfirmed}
|
||||
/>
|
||||
) : null,
|
||||
status: agentIds.length > 0 ? (!agentDataConfirmed ? 'loading' : 'complete') : 'disabled',
|
||||
};
|
||||
};
|
||||
|
|
|
@ -27,6 +27,7 @@ export const InstallManagedAgentStep = ({
|
|||
isK8s?: string;
|
||||
}): EuiContainedStepProps => {
|
||||
return {
|
||||
status: selectedApiKeyId ? undefined : 'disabled',
|
||||
title: i18n.translate('xpack.fleet.agentEnrollment.stepEnrollAndRunAgentTitle', {
|
||||
defaultMessage: 'Install Elastic Agent on your host',
|
||||
}),
|
||||
|
|
|
@ -15,9 +15,11 @@ import type { EuiContainedStepProps } from '@elastic/eui/src/components/steps/st
|
|||
import type { FlyoutMode } from '../types';
|
||||
|
||||
export const InstallationModeSelectionStep = ({
|
||||
selectedPolicyId,
|
||||
mode,
|
||||
setMode,
|
||||
}: {
|
||||
selectedPolicyId: string | undefined;
|
||||
mode: FlyoutMode;
|
||||
setMode: (v: FlyoutMode) => void;
|
||||
}): EuiContainedStepProps => {
|
||||
|
@ -32,10 +34,11 @@ export const InstallationModeSelectionStep = ({
|
|||
};
|
||||
|
||||
return {
|
||||
status: selectedPolicyId ? undefined : 'disabled',
|
||||
title: i18n.translate('xpack.fleet.agentEnrollment.stepInstallType', {
|
||||
defaultMessage: 'Enroll in Fleet?',
|
||||
}),
|
||||
children: (
|
||||
children: selectedPolicyId ? (
|
||||
<EuiRadioGroup
|
||||
options={[
|
||||
{
|
||||
|
@ -83,6 +86,6 @@ export const InstallationModeSelectionStep = ({
|
|||
onChange={onChangeCallback}
|
||||
name={`radio group ${radioSuffix}`}
|
||||
/>
|
||||
),
|
||||
) : null,
|
||||
};
|
||||
};
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue