Skip to content

[Fleet] Fleet Server flyout fixes #136566

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 6 commits into from
Jul 19, 2022
Merged

[Fleet] Fleet Server flyout fixes #136566

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b4a335f
Go to Fleet mode when continue enrolling is selected
kpollich Jul 18, 2022
5860b06
Fix max width in Fleet Server flyout
kpollich Jul 18, 2022
4949171
Use fleet mode when fleet server ready, standalone mode otherwise per…
kpollich Jul 19, 2022
e3825a5
Merge branch 'main' into 2022-07-18-fleet-server-flyout-fixes
kibanamachine Jul 19, 2022
77908db
Fix storybook:
kpollich Jul 19, 2022
1573066
Merge branch 'main' into 2022-07-18-fleet-server-flyout-fixes
kibanamachine Jul 19, 2022
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
9 changes: 7 additions & 2 deletions x-pack/plugins/fleet/public/applications/fleet/app.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import type { FleetConfigType, FleetStartServices } from '../../plugin';

import { PackageInstallProvider } from '../integrations/hooks';

import { useAuthz, useFlyoutContext } from './hooks';
import { useAuthz, useFleetStatus, useFlyoutContext } from './hooks';

import {
ConfigContext,
Expand Down Expand Up @@ -304,6 +304,7 @@ const FleetTopNav = memo(
export const AppRoutes = memo(
({ setHeaderActionMenu }: { setHeaderActionMenu: AppMountParameters['setHeaderActionMenu'] }) => {
const flyoutContext = useFlyoutContext();
const fleetStatus = useFleetStatus();

return (
<>
Expand Down Expand Up @@ -361,7 +362,11 @@ export const AppRoutes = memo(
{flyoutContext.isEnrollmentFlyoutOpen && (
<EuiPortal>
<AgentEnrollmentFlyout
defaultMode="standalone"
defaultMode={
fleetStatus.isReady && !fleetStatus.missingRequirements?.includes('fleet_server')
? 'managed'
: 'standalone'
}
isIntegrationFlow={true}
onClose={() => flyoutContext.closeEnrollmentFlyout()}
/>
Expand Down
6 changes: 5 additions & 1 deletion ...leet/public/applications/fleet/components/fleet_server_instructions/steps/get_started.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,11 @@ const GettingStartedStepContent: React.FunctionComponent<{

<EuiForm onSubmit={quickStartCreateForm.submit}>
<EuiFlexGroup>
<EuiFlexItem>
<EuiFlexItem
css={`
max-width: 100%;
`}
>
<FleetServerHostComboBox
fleetServerHost={fleetServerHost}
fleetServerHostSettings={fleetServerHostSettings}
Expand Down
14 changes: 12 additions & 2 deletions x-pack/plugins/fleet/public/applications/integrations/app.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,12 @@ import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';

import type { FleetConfigType, FleetStartServices } from '../../plugin';

import { ConfigContext, FleetStatusProvider, KibanaVersionContext } from '../../hooks';
import {
ConfigContext,
FleetStatusProvider,
KibanaVersionContext,
useFleetStatus,
} from '../../hooks';

import { FleetServerFlyout } from '../fleet/components';

Expand Down Expand Up @@ -110,6 +115,7 @@ export const IntegrationsAppContext: React.FC<{

export const AppRoutes = memo(() => {
const flyoutContext = useFlyoutContext();
const fleetStatus = useFleetStatus();

return (
<>
Expand Down Expand Up @@ -142,7 +148,11 @@ export const AppRoutes = memo(() => {
{flyoutContext.isEnrollmentFlyoutOpen && (
<EuiPortal>
<AgentEnrollmentFlyout
defaultMode="standalone"
defaultMode={
fleetStatus.isReady && fleetStatus.missingRequirements?.includes('fleet_server')
? 'managed'
: 'standalone'
}
isIntegrationFlow={true}
onClose={() => flyoutContext.closeEnrollmentFlyout()}
/>
Expand Down
4 changes: 3 additions & 1 deletion x-pack/plugins/fleet/public/hooks/use_flyout_context.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,9 @@ export const FlyoutContextProvider: React.FunctionComponent = ({ children }) =>
<agentFlyoutContext.Provider
value={{
isEnrollmentFlyoutOpen,
openEnrollmentFlyout: () => setIsEnrollmentFlyoutOpen(true),
openEnrollmentFlyout: () => {
setIsEnrollmentFlyoutOpen(true);
},
closeEnrollmentFlyout: () => setIsEnrollmentFlyoutOpen(false),
isFleetServerFlyoutOpen,
openFleetServerFlyout: () => setIsFleetServerFlyoutOpen(true),
Expand Down