[8.x] [UII] Support content packages in UI (#195831) (#196398)

# Backport This will backport the following commits from `main` to `8.x`: - [[UII] Support content packages in UI (#195831)](#195831)  ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport)
elastic · Oct 15, 2024 · f952c2d · f952c2d
1 parent a35203b
commit f952c2d
Show file tree

Hide file tree

Showing 20 changed files with 252 additions and 91 deletions.
diff --git a/.../fleet/sections/agent_policy/create_package_policy_page/single_page_layout/hooks/form.tsx b/.../fleet/sections/agent_policy/create_package_policy_page/single_page_layout/hooks/form.tsx
@@ -391,7 +391,7 @@ export function useOnSubmit({
 
       // Check if agentless is configured in ESS and Serverless until Agentless API migrates to Serverless
       const isAgentlessConfigured =
-        isAgentlessAgentPolicy(createdPolicy) || isAgentlessPackagePolicy(data!.item);
+        isAgentlessAgentPolicy(createdPolicy) || (data && isAgentlessPackagePolicy(data.item));
 
       // Removing this code will disabled the Save and Continue button. We need code below update form state and trigger correct modal depending on agent count
       if (hasFleetAddAgentsPrivileges && !isAgentlessConfigured) {

diff --git a/...k/plugins/fleet/public/applications/integrations/sections/epm/components/package_card.tsx b/...k/plugins/fleet/public/applications/integrations/sections/epm/components/package_card.tsx
@@ -57,6 +57,7 @@ export function PackageCard({
   name,
   title,
   version,
+  type,
   icons,
   integration,
   url,
@@ -78,7 +79,6 @@ export function PackageCard({
   maxCardHeight,
 }: PackageCardProps) {
   let releaseBadge: React.ReactNode | null = null;
-
   if (release && release !== 'ga') {
     releaseBadge = (
       <EuiFlexItem grow={false}>
@@ -108,7 +108,6 @@ export function PackageCard({
   }
 
   let hasDeferredInstallationsBadge: React.ReactNode | null = null;
-
   if (isReauthorizationRequired && showLabels) {
     hasDeferredInstallationsBadge = (
       <EuiFlexItem grow={false}>
@@ -127,7 +126,6 @@ export function PackageCard({
   }
 
   let updateAvailableBadge: React.ReactNode | null = null;
-
   if (isUpdateAvailable && showLabels) {
     updateAvailableBadge = (
       <EuiFlexItem grow={false}>
@@ -145,7 +143,6 @@ export function PackageCard({
   }
 
   let collectionButton: React.ReactNode | null = null;
-
   if (isCollectionCard) {
     collectionButton = (
       <EuiFlexItem>
@@ -163,6 +160,23 @@ export function PackageCard({
     );
   }
 
+  let contentBadge: React.ReactNode | null = null;
+  if (type === 'content') {
+    contentBadge = (
+      <EuiFlexItem grow={false}>
+        <EuiSpacer size="xs" />
+        <span>
+          <EuiBadge color="hollow">
+            <FormattedMessage
+              id="xpack.fleet.packageCard.contentPackageLabel"
+              defaultMessage="Content only"
+            />
+          </EuiBadge>
+        </span>
+      </EuiFlexItem>
+    );
+  }
+
   const { application } = useStartServices();
   const isGuidedOnboardingActive = useIsGuidedOnboardingActive(name);
 
@@ -235,6 +249,7 @@ export function PackageCard({
             {showLabels && extraLabelsBadges ? extraLabelsBadges : null}
             {verifiedBadge}
             {updateAvailableBadge}
+            {contentBadge}
             {releaseBadge}
             {hasDeferredInstallationsBadge}
             {collectionButton}

diff --git a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/index.tsx b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/index.tsx
@@ -90,6 +90,7 @@ import { Configs } from './configs';
 
 import './index.scss';
 import type { InstallPkgRouteOptions } from './utils/get_install_route_options';
+import { InstallButton } from './settings/install_button';
 
 export type DetailViewPanelName =
   | 'overview'
@@ -362,13 +363,23 @@ export function Detail() {
                 </EuiFlexItem>
                 <EuiFlexItem>
                   <EuiFlexGroup gutterSize="xs">
-                    <EuiFlexItem grow={false}>
-                      <EuiBadge color="default">
-                        {i18n.translate('xpack.fleet.epm.elasticAgentBadgeLabel', {
-                          defaultMessage: 'Elastic Agent',
-                        })}
-                      </EuiBadge>
-                    </EuiFlexItem>
+                    {packageInfo?.type === 'content' ? (
+                      <EuiFlexItem grow={false}>
+                        <EuiBadge color="default">
+                          {i18n.translate('xpack.fleet.epm.contentPackageBadgeLabel', {
+                            defaultMessage: 'Content only',
+                          })}
+                        </EuiBadge>
+                      </EuiFlexItem>
+                    ) : (
+                      <EuiFlexItem grow={false}>
+                        <EuiBadge color="default">
+                          {i18n.translate('xpack.fleet.epm.elasticAgentBadgeLabel', {
+                            defaultMessage: 'Elastic Agent',
+                          })}
+                        </EuiBadge>
+                      </EuiFlexItem>
+                    )}
                     {packageInfo?.release && packageInfo.release !== 'ga' ? (
                       <EuiFlexItem grow={false}>
                         <HeaderReleaseBadge release={getPackageReleaseLabel(packageInfo.version)} />
@@ -520,7 +531,7 @@ export function Detail() {
                   </EuiFlexGroup>
                 ),
               },
-              ...(isInstalled
+              ...(isInstalled && packageInfo.type !== 'content'
                 ? [
                     { isDivider: true },
                     {
@@ -532,31 +543,37 @@ export function Detail() {
                     },
                   ]
                 : []),
-              { isDivider: true },
-              {
-                content: (
-                  <WithGuidedOnboardingTour
-                    packageKey={pkgkey}
-                    tourType={'addIntegrationButton'}
-                    isTourVisible={isOverviewPage && isGuidedOnboardingActive}
-                    tourOffset={10}
-                  >
-                    <AddIntegrationButton
-                      userCanInstallPackages={userCanInstallPackages}
-                      href={getHref('add_integration_to_policy', {
-                        pkgkey,
-                        ...(integration ? { integration } : {}),
-                        ...(agentPolicyIdFromContext
-                          ? { agentPolicyId: agentPolicyIdFromContext }
-                          : {}),
-                      })}
-                      missingSecurityConfiguration={missingSecurityConfiguration}
-                      packageName={integrationInfo?.title || packageInfo.title}
-                      onClick={handleAddIntegrationPolicyClick}
-                    />
-                  </WithGuidedOnboardingTour>
-                ),
-              },
+              ...(packageInfo.type === 'content'
+                ? !isInstalled
+                  ? [{ isDivider: true }, { content: <InstallButton {...packageInfo} /> }]
+                  : [] // if content package is already installed, don't show install button in header
+                : [
+                    { isDivider: true },
+                    {
+                      content: (
+                        <WithGuidedOnboardingTour
+                          packageKey={pkgkey}
+                          tourType={'addIntegrationButton'}
+                          isTourVisible={isOverviewPage && isGuidedOnboardingActive}
+                          tourOffset={10}
+                        >
+                          <AddIntegrationButton
+                            userCanInstallPackages={userCanInstallPackages}
+                            href={getHref('add_integration_to_policy', {
+                              pkgkey,
+                              ...(integration ? { integration } : {}),
+                              ...(agentPolicyIdFromContext
+                                ? { agentPolicyId: agentPolicyIdFromContext }
+                                : {}),
+                            })}
+                            missingSecurityConfiguration={missingSecurityConfiguration}
+                            packageName={integrationInfo?.title || packageInfo.title}
+                            onClick={handleAddIntegrationPolicyClick}
+                          />
+                        </WithGuidedOnboardingTour>
+                      ),
+                    },
+                  ]),
             ].map((item, index) => (
               <EuiFlexItem grow={false} key={index} data-test-subj={item['data-test-subj']}>
                 {item.isDivider ?? false ? (
@@ -619,7 +636,7 @@ export function Detail() {
       },
     ];
 
-    if (canReadIntegrationPolicies && isInstalled) {
+    if (canReadIntegrationPolicies && isInstalled && packageInfo.type !== 'content') {
       tabs.push({
         id: 'policies',
         name: (

diff --git a/...pplications/integrations/sections/epm/screens/detail/settings/confirm_package_install.tsx b/...pplications/integrations/sections/epm/screens/detail/settings/confirm_package_install.tsx
@@ -14,9 +14,13 @@ interface ConfirmPackageInstallProps {
   onConfirm: () => void;
   packageName: string;
   numOfAssets: number;
+  numOfTransformAssets: number;
 }
+
+import { TransformInstallWithCurrentUserPermissionCallout } from '../../../../../../../components/transform_install_as_current_user_callout';
+
 export const ConfirmPackageInstall = (props: ConfirmPackageInstallProps) => {
-  const { onCancel, onConfirm, packageName, numOfAssets } = props;
+  const { onCancel, onConfirm, packageName, numOfAssets, numOfTransformAssets } = props;
   return (
     <EuiConfirmModal
       title={
@@ -53,6 +57,12 @@ export const ConfirmPackageInstall = (props: ConfirmPackageInstallProps) => {
           />
         }
       />
+      {numOfTransformAssets > 0 ? (
+        <>
+          <EuiSpacer size="m" />
+          <TransformInstallWithCurrentUserPermissionCallout count={numOfTransformAssets} />
+        </>
+      ) : null}
       <EuiSpacer size="l" />
       <p>
         <FormattedMessage

diff --git a/.../public/applications/integrations/sections/epm/screens/detail/settings/install_button.tsx b/.../public/applications/integrations/sections/epm/screens/detail/settings/install_button.tsx
@@ -13,23 +13,37 @@ import type { PackageInfo, UpgradePackagePolicyDryRunResponse } from '../../../.
 import { InstallStatus } from '../../../../../types';
 import { useAuthz, useGetPackageInstallStatus, useInstallPackage } from '../../../../../hooks';
 
+import { getNumTransformAssets } from '../../../../../../../components/transform_install_as_current_user_callout';
+
 import { ConfirmPackageInstall } from './confirm_package_install';
-type InstallationButtonProps = Pick<PackageInfo, 'name' | 'title' | 'version'> & {
+
+type InstallationButtonProps = Pick<PackageInfo, 'name' | 'title' | 'version' | 'assets'> & {
   disabled?: boolean;
   dryRunData?: UpgradePackagePolicyDryRunResponse | null;
   isUpgradingPackagePolicies?: boolean;
   latestVersion?: string;
-  numOfAssets: number;
   packagePolicyIds?: string[];
   setIsUpgradingPackagePolicies?: React.Dispatch<React.SetStateAction<boolean>>;
 };
 export function InstallButton(props: InstallationButtonProps) {
-  const { name, numOfAssets, title, version } = props;
+  const { name, title, version, assets } = props;
+
   const canInstallPackages = useAuthz().integrations.installPackages;
   const installPackage = useInstallPackage();
   const getPackageInstallStatus = useGetPackageInstallStatus();
   const { status: installationStatus } = getPackageInstallStatus(name);
 
+  const numOfAssets = Object.entries(assets).reduce(
+    (acc, [serviceName, serviceNameValue]) =>
+      acc +
+      Object.entries(serviceNameValue || {}).reduce(
+        (acc2, [assetName, assetNameValue]) => acc2 + assetNameValue.length,
+        0
+      ),
+    0
+  );
+  const numOfTransformAssets = getNumTransformAssets(assets);
+
   const isInstalling = installationStatus === InstallStatus.installing;
   const [isInstallModalVisible, setIsInstallModalVisible] = useState<boolean>(false);
   const toggleInstallModal = useCallback(() => {
@@ -44,6 +58,7 @@ export function InstallButton(props: InstallationButtonProps) {
   const installModal = (
     <ConfirmPackageInstall
       numOfAssets={numOfAssets}
+      numOfTransformAssets={numOfTransformAssets}
       packageName={title}
       onCancel={toggleInstallModal}
       onConfirm={handleClickInstall}
@@ -61,15 +76,15 @@ export function InstallButton(props: InstallationButtonProps) {
         {isInstalling ? (
           <FormattedMessage
             id="xpack.fleet.integrations.installPackage.installingPackageButtonLabel"
-            defaultMessage="Installing {title} assets"
+            defaultMessage="Installing {title}"
             values={{
               title,
             }}
           />
         ) : (
           <FormattedMessage
             id="xpack.fleet.integrations.installPackage.installPackageButtonLabel"
-            defaultMessage="Install {title} assets"
+            defaultMessage="Install {title}"
             values={{
               title,
             }}

diff --git a/.../fleet/public/applications/integrations/sections/epm/screens/detail/settings/settings.tsx b/.../fleet/public/applications/integrations/sections/epm/screens/detail/settings/settings.tsx
@@ -23,11 +23,6 @@ import {
 
 import { i18n } from '@kbn/i18n';
 
-import {
-  getNumTransformAssets,
-  TransformInstallWithCurrentUserPermissionCallout,
-} from '../../../../../../../components/transform_install_as_current_user_callout';
-
 import type { FleetStartServices } from '../../../../../../../plugin';
 import type { PackageInfo, PackageMetadata } from '../../../../../types';
 import { InstallStatus } from '../../../../../types';
@@ -238,22 +233,6 @@ export const SettingsPage: React.FC<Props> = memo(
 
     const isUpdating = installationStatus === InstallStatus.installing && installedVersion;
 
-    const { numOfAssets, numTransformAssets } = useMemo(
-      () => ({
-        numTransformAssets: getNumTransformAssets(packageInfo.assets),
-        numOfAssets: Object.entries(packageInfo.assets).reduce(
-          (acc, [serviceName, serviceNameValue]) =>
-            acc +
-            Object.entries(serviceNameValue).reduce(
-              (acc2, [assetName, assetNameValue]) => acc2 + assetNameValue.length,
-              0
-            ),
-          0
-        ),
-      }),
-      [packageInfo.assets]
-    );
-
     return (
       <>
         <EuiFlexGroup alignItems="flexStart">
@@ -365,15 +344,6 @@ export const SettingsPage: React.FC<Props> = memo(
                         </h4>
                       </EuiTitle>
                       <EuiSpacer size="s" />
-
-                      {numTransformAssets > 0 ? (
-                        <>
-                          <TransformInstallWithCurrentUserPermissionCallout
-                            count={numTransformAssets}
-                          />
-                          <EuiSpacer size="s" />
-                        </>
-                      ) : null}
                       <p>
                         <FormattedMessage
                           id="xpack.fleet.integrations.settings.packageInstallDescription"
@@ -388,7 +358,6 @@ export const SettingsPage: React.FC<Props> = memo(
                           <p>
                             <InstallButton
                               {...packageInfo}
-                              numOfAssets={numOfAssets}
                               disabled={packageMetadata?.has_policies}
                             />
                           </p>
@@ -418,7 +387,6 @@ export const SettingsPage: React.FC<Props> = memo(
                           <div>
                             <UninstallButton
                               {...packageInfo}
-                              numOfAssets={numOfAssets}
                               latestVersion={latestVersion}
                               disabled={packageMetadata?.has_policies}
                             />

diff --git a/...ublic/applications/integrations/sections/epm/screens/detail/settings/uninstall_button.tsx b/...ublic/applications/integrations/sections/epm/screens/detail/settings/uninstall_button.tsx
@@ -16,17 +16,16 @@ import { useAuthz, useGetPackageInstallStatus, useUninstallPackage } from '../..
 
 import { ConfirmPackageUninstall } from './confirm_package_uninstall';
 
-interface UninstallButtonProps extends Pick<PackageInfo, 'name' | 'title' | 'version'> {
+interface UninstallButtonProps extends Pick<PackageInfo, 'name' | 'title' | 'version' | 'assets'> {
   disabled?: boolean;
   latestVersion?: string;
-  numOfAssets: number;
 }
 
 export const UninstallButton: React.FunctionComponent<UninstallButtonProps> = ({
   disabled = false,
   latestVersion,
   name,
-  numOfAssets,
+  assets,
   title,
   version,
 }) => {
@@ -38,6 +37,16 @@ export const UninstallButton: React.FunctionComponent<UninstallButtonProps> = ({
 
   const [isUninstallModalVisible, setIsUninstallModalVisible] = useState<boolean>(false);
 
+  const numOfAssets = Object.entries(assets).reduce(
+    (acc, [serviceName, serviceNameValue]) =>
+      acc +
+      Object.entries(serviceNameValue || {}).reduce(
+        (acc2, [assetName, assetNameValue]) => acc2 + assetNameValue.length,
+        0
+      ),
+    0
+  );
+
   const handleClickUninstall = useCallback(() => {
     uninstallPackage({ name, version, title, redirectToVersion: latestVersion ?? version });
     setIsUninstallModalVisible(false);