[Fleet] Fix package edit redirect (elastic#174531)

(cherry picked from commit 66aa374)
nchaulet · Jan 15, 2024 · 97a58bf · 97a58bf
1 parent 9456432
commit 97a58bf
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 4 deletions.
diff --git a/...sections/agent_policy/details_page/components/package_policies/package_policies_table.tsx b/...sections/agent_policy/details_page/components/package_policies/package_policies_table.tsx
@@ -238,6 +238,7 @@ export const PackagePoliciesTable: React.FunctionComponent<Props> = ({
               return canWriteIntegrationPolicies ? (
                 <PackagePolicyActionsMenu
                   agentPolicy={agentPolicy}
+                  from={'fleet-policy-list'}
                   packagePolicy={packagePolicy}
                   upgradePackagePolicyHref={`${getHref('upgrade_package_policy', {
                     policyId: agentPolicy.id,

diff --git a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/policy/index.tsx b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/policy/index.tsx
@@ -6,28 +6,41 @@
  */
 
 import React, { memo } from 'react';
-import { useRouteMatch } from 'react-router-dom';
+import { useLocation, useRouteMatch } from 'react-router-dom';
 
 // TODO: Needs to be moved
 import { EditPackagePolicyForm } from '../../../../../fleet/sections/agent_policy/edit_package_policy_page';
+import type { EditPackagePolicyFrom } from '../../../../../fleet/sections/agent_policy/create_package_policy_page/types';
 import { useGetOnePackagePolicyQuery, useUIExtension } from '../../../../hooks';
 
 export const Policy = memo(() => {
   const {
     params: { packagePolicyId },
   } = useRouteMatch<{ packagePolicyId: string }>();
 
+  const { search } = useLocation();
   const { data: packagePolicyData } = useGetOnePackagePolicyQuery(packagePolicyId);
 
   const extensionView = useUIExtension(
     packagePolicyData?.item?.package?.name ?? '',
     'package-policy-edit'
   );
 
+  const qs = new URLSearchParams(search);
+  const fromQs = qs.get('from');
+
+  let from: EditPackagePolicyFrom | undefined;
+
+  if (fromQs && fromQs === 'fleet-policy-list') {
+    from = 'edit';
+  } else {
+    from = 'package-edit';
+  }
+
   return (
     <EditPackagePolicyForm
       packagePolicyId={packagePolicyId}
-      from="package-edit"
+      from={from}
       forceUpgrade={extensionView?.useLatestPackageVersion}
     />
   );

diff --git a/x-pack/plugins/fleet/public/components/package_policy_actions_menu.tsx b/x-pack/plugins/fleet/public/components/package_policy_actions_menu.tsx
@@ -24,12 +24,14 @@ export const PackagePolicyActionsMenu: React.FunctionComponent<{
   showAddAgent?: boolean;
   defaultIsOpen?: boolean;
   upgradePackagePolicyHref?: string;
+  from?: 'fleet-policy-list' | undefined;
 }> = ({
   agentPolicy,
   packagePolicy,
   showAddAgent,
   upgradePackagePolicyHref,
   defaultIsOpen = false,
+  from,
 }) => {
   const [isEnrollmentFlyoutOpen, setIsEnrollmentFlyoutOpen] = useState(false);
   const { getHref } = useLink();
@@ -80,9 +82,9 @@ export const PackagePolicyActionsMenu: React.FunctionComponent<{
       data-test-subj="PackagePolicyActionsEditItem"
       disabled={!canWriteIntegrationPolicies || !agentPolicy}
       icon="pencil"
-      href={getHref('integration_policy_edit', {
+      href={`${getHref('integration_policy_edit', {
         packagePolicyId: packagePolicy.id,
-      })}
+      })}${from ? `?from=${from}` : ''}`}
       key="packagePolicyEdit"
     >
       <FormattedMessage