github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 17:59:23 -04:00
Code Issues Projects Releases Packages Wiki Activity

[Fleet] Fix navigation to policy for policies created inline (#122470)

Browse source 
* Fix navigation to policy for policies created inline

* Fix inline agent policy creation check

* Add clarifying comment per review

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
This commit is contained in:
Kyle Pollich 2022-01-11 13:16:19 -05:00 • committed by GitHub
parent f30a299dcc
commit f9c6259b47
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

25
x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/index.tsx
View file

@ -146,6 +146,8 @@ export const CreatePackagePolicyPage: React.FunctionComponent = () => {
inputs: [],
});
const [wasNewAgentPolicyCreated, setWasNewAgentPolicyCreated] = useState<boolean>(false);
// Validation state
const [validationResults, setValidationResults] = useState<PackagePolicyValidationResults>();
const [hasAgentPolicyError, setHasAgentPolicyError] = useState<boolean>(false);
@ -276,6 +278,10 @@ export const CreatePackagePolicyPage: React.FunctionComponent = () => {
}, [packagePolicy, agentCount]);
const doOnSaveNavigation = useRef<boolean>(true);
const handleInlineAgentPolicyCreate = useCallback(() => {
setWasNewAgentPolicyCreated(true);
}, []);
// Detect if user left page
useEffect(() => {
return () => {
@ -295,12 +301,16 @@ export const CreatePackagePolicyPage: React.FunctionComponent = () => {
return;
}
const packagePolicyPath = getPath('policy_details', { policyId: packagePolicy.policy_id });
if (routeState?.onSaveNavigateTo && policy) {
const [appId, options] = routeState.onSaveNavigateTo;
if (options?.path) {
const pathWithQueryString = appendOnSaveQueryParamsToPath({
path: options.path,
// In cases where we created a new agent policy inline, we need to override the initial `path`
// value and navigate to the newly-created agent policy instead
path: wasNewAgentPolicyCreated ? packagePolicyPath : options.path,
policy,
mappingOptions: routeState.onSaveQueryParams,
paramsToApply,
@ -310,10 +320,10 @@ export const CreatePackagePolicyPage: React.FunctionComponent = () => {
navigateToApp(...routeState.onSaveNavigateTo);
}
} else {
history.push(getPath('policy_details', { policyId: agentPolicy!.id }));
history.push(packagePolicyPath);
}
},
[agentPolicy, getPath, navigateToApp, history, routeState]
[packagePolicy.policy_id, getPath, navigateToApp, history, routeState, wasNewAgentPolicyCreated]
);
const onSubmit = useCallback(async () => {
@ -400,9 +410,16 @@ export const CreatePackagePolicyPage: React.FunctionComponent = () => {
agentPolicy={agentPolicy}
updateAgentPolicy={updateAgentPolicy}
setHasAgentPolicyError={setHasAgentPolicyError}
onNewAgentPolicyCreate={handleInlineAgentPolicyCreate}
/>
),
[packageInfo, queryParamsPolicyId, agentPolicy, updateAgentPolicy]
[
packageInfo,
queryParamsPolicyId,
agentPolicy,
updateAgentPolicy,
handleInlineAgentPolicyCreate,
]
);
const extensionView = useUIExtension(packagePolicy.package?.name ?? '', 'package-policy-create');

3
x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/step_select_agent_policy.tsx
View file

@ -45,12 +45,14 @@ export const StepSelectAgentPolicy: React.FunctionComponent<{
agentPolicy: AgentPolicy | undefined;
updateAgentPolicy: (agentPolicy: AgentPolicy | undefined) => void;
setHasAgentPolicyError: (hasError: boolean) => void;
onNewAgentPolicyCreate: () => void;
}> = ({
packageInfo,
agentPolicy,
updateAgentPolicy,
defaultAgentPolicyId,
setHasAgentPolicyError,
onNewAgentPolicyCreate,
}) => {
const { isReady: isFleetReady } = useFleetStatus();
@ -203,6 +205,7 @@ export const StepSelectAgentPolicy: React.FunctionComponent<{
onClose={(newAgentPolicy?: AgentPolicy) => {
setIsCreateAgentPolicyFlyoutOpen(false);
if (newAgentPolicy) {
onNewAgentPolicyCreate();
refreshAgentPolicies();
setSelectedPolicyId(newAgentPolicy.id);
}