Skip to content

[Ingest Manager] Allow enrollment flyout to load well on slow networks #71487

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 13, 2020
Merged

[Ingest Manager] Allow enrollment flyout to load well on slow networks #71487

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions ...ons/ingest_manager/sections/fleet/components/agent_enrollment_flyout/config_selection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { sendGetEnrollmentAPIKeys, useCore } from '../../../../hooks';
import { AgentConfigPackageBadges } from '../agent_config_package_badges';

type Props = {
agentConfigs: AgentConfig[];
agentConfigs?: AgentConfig[];
onConfigChange?: (key: string) => void;
} & (
| {
Expand All @@ -37,9 +37,16 @@ export const EnrollmentStepAgentConfig: React.FC<Props> = (props) => {
const [selectedState, setSelectedState] = useState<{
agentConfigId?: string;
enrollmentAPIKeyId?: string;
}>({
agentConfigId: agentConfigs.length ? agentConfigs[0].id : undefined,
});
}>({});

useEffect(() => {
if (agentConfigs && agentConfigs.length && !selectedState.agentConfigId) {
setSelectedState({
...selectedState,
agentConfigId: agentConfigs[0].id,
});
}
}, [agentConfigs, selectedState]);

useEffect(() => {
if (onConfigChange && selectedState.agentConfigId) {
Expand Down Expand Up @@ -110,7 +117,8 @@ export const EnrollmentStepAgentConfig: React.FC<Props> = (props) => {
/>
</EuiText>
}
options={agentConfigs.map((config) => ({
isLoading={!agentConfigs}
options={(agentConfigs || []).map((config) => ({
value: config.id,
text: config.name,
}))}
Expand Down
4 changes: 2 additions & 2 deletions ...c/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@ import { StandaloneInstructions } from './standalone_instructions';

interface Props {
onClose: () => void;
agentConfigs: AgentConfig[];
agentConfigs?: AgentConfig[];
}

export const AgentEnrollmentFlyout: React.FunctionComponent<Props> = ({
onClose,
agentConfigs = [],
agentConfigs,
}) => {
const [mode, setMode] = useState<'managed' | 'standalone'>('managed');

Expand Down
6 changes: 3 additions & 3 deletions ...ingest_manager/sections/fleet/components/agent_enrollment_flyout/managed_instructions.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ import { ManualInstructions } from '../../../../components/enrollment_instructio
import { DownloadStep, AgentConfigSelectionStep } from './steps';

interface Props {
agentConfigs: AgentConfig[];
agentConfigs?: AgentConfig[];
}

export const ManagedInstructions: React.FunctionComponent<Props> = ({ agentConfigs = [] }) => {
export const ManagedInstructions: React.FunctionComponent<Props> = ({ agentConfigs }) => {
const { getHref } = useLink();
const core = useCore();
const fleetStatus = useFleetStatus();
Expand Down Expand Up @@ -85,7 +85,7 @@ export const ManagedInstructions: React.FunctionComponent<Props> = ({ agentConfi
}}
/>
</>
)}{' '}
)}
</>
);
};
4 changes: 2 additions & 2 deletions ...est_manager/sections/fleet/components/agent_enrollment_flyout/standalone_instructions.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@ import { DownloadStep, AgentConfigSelectionStep } from './steps';
import { configToYaml, agentConfigRouteService } from '../../../../services';

interface Props {
agentConfigs: AgentConfig[];
agentConfigs?: AgentConfig[];
}

const RUN_INSTRUCTIONS = './elastic-agent run';

export const StandaloneInstructions: React.FunctionComponent<Props> = ({ agentConfigs = [] }) => {
export const StandaloneInstructions: React.FunctionComponent<Props> = ({ agentConfigs }) => {
const core = useCore();
const { notifications } = core;

Expand Down
2 changes: 1 addition & 1 deletion ...c/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/steps.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ export const AgentConfigSelectionStep = ({
setSelectedAPIKeyId,
setSelectedConfigId,
}: {
agentConfigs: AgentConfig[];
agentConfigs?: AgentConfig[];
setSelectedAPIKeyId?: (key: string) => void;
setSelectedConfigId?: (configId: string) => void;
}) => {
Expand Down