cherry pick more scoped software fixes (#25126)

cherry pick for more scoped software via labels fixes
fleetdm · Jan 6, 2025 · 1f05269 · 1f05269
1 parent 82d9f46
commit 1f05269
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 15 deletions.
diff --git a/frontend/components/PlatformSelector/PlatformSelector.tsx b/frontend/components/PlatformSelector/PlatformSelector.tsx
@@ -71,8 +71,9 @@ export const PlatformSelector = ({
         </Checkbox>
       </span>
       <div className="form-field__help-text">
-        To apply the profile to new hosts, you&apos;ll have to delete it and
-        upload a new profile.
+        Your policy will only run on the selected platform(s). Additionally, if
+        install software automation is enabled, it will only be installed on
+        hosts defined in the software scope.
       </div>
     </div>
   );

diff --git a/frontend/interfaces/software.ts b/frontend/interfaces/software.ts
@@ -82,7 +82,7 @@ export interface ISoftwarePackage {
     pending_uninstall: number;
     failed_uninstall: number;
   };
-  automatic_install_policies?: ISoftwarePackagePolicy[];
+  automatic_install_policies?: ISoftwarePackagePolicy[] | null;
   install_during_setup?: boolean;
   labels_include_any: ILabelSoftwareTitle[] | null;
   labels_exclude_any: ILabelSoftwareTitle[] | null;

diff --git a/...SoftwarePage/SoftwareTitleDetailsPage/ConfirmSaveChangesModal/ConfirmSaveChangesModal.tsx b/...SoftwarePage/SoftwareTitleDetailsPage/ConfirmSaveChangesModal/ConfirmSaveChangesModal.tsx
@@ -3,8 +3,6 @@ import React from "react";
 import Button from "components/buttons/Button";
 import Modal from "components/Modal";
 
-import { IPackageFormData } from "pages/SoftwarePage/components/PackageForm/PackageForm";
-
 const baseClass = "save-changes-modal";
 
 export interface IConfirmSaveChangesModalProps {
@@ -38,7 +36,7 @@ const ConfirmSaveChangesModal = ({
         <p>{warningText}</p>
         <p>
           Installs or uninstalls currently running on a host will still
-          complete, but results won’t appear in Fleet.
+          complete, but results won&apos;t appear in Fleet.
         </p>
         <p>You cannot undo this action.</p>
         <div className="modal-cta-wrap">

diff --git a/frontend/pages/SoftwarePage/SoftwareTitleDetailsPage/EditSoftwareModal/EditSoftwareModal.tsx b/frontend/pages/SoftwarePage/SoftwareTitleDetailsPage/EditSoftwareModal/EditSoftwareModal.tsx
@@ -24,6 +24,7 @@ import { IPackageFormData } from "pages/SoftwarePage/components/PackageForm/Pack
 import {
   generateSelectedLabels,
   getCustomTarget,
+  getInstallType,
   getTargetType,
 } from "pages/SoftwarePage/components/PackageForm/helpers";
 
@@ -70,11 +71,7 @@ const EditSoftwareModal = ({
   });
   const [uploadProgress, setUploadProgress] = useState(0);
 
-  const {
-    data: labels,
-    isLoading: isLoadingLabels,
-    isError: isErrorLabels,
-  } = useQuery<ILabelSummary[], Error>(
+  const { data: labels } = useQuery<ILabelSummary[], Error>(
     ["custom_labels"],
     () => labelsAPI.summary().then((res) => getCustomLabels(res.labels)),
     {
@@ -178,6 +175,7 @@ const EditSoftwareModal = ({
       postInstallScript: software.post_install_script || "",
       uninstallScript: software.uninstall_script || "",
       selfService: software.self_service || false,
+      installType: getInstallType(software),
       targetType: getTargetType(software),
       customTarget: getCustomTarget(software),
       labelTargets: generateSelectedLabels(software),

diff --git a/frontend/pages/SoftwarePage/components/PackageForm/helpers.tsx b/frontend/pages/SoftwarePage/components/PackageForm/helpers.tsx
@@ -120,6 +120,10 @@ export const CUSTOM_TARGET_OPTIONS: IDropdownOption[] = [
   },
 ];
 
+export const getInstallType = (softwarePackage: ISoftwarePackage) => {
+  return softwarePackage.automatic_install_policies ? "automatic" : "manual";
+};
+
 export const getTargetType = (softwarePackage: ISoftwarePackage) => {
   if (!softwarePackage) return "All hosts";
 

diff --git a/frontend/pages/hosts/ManageHostsPage/components/DeleteLabelModal/DeleteLabelModal.tsx b/frontend/pages/hosts/ManageHostsPage/components/DeleteLabelModal/DeleteLabelModal.tsx
@@ -26,11 +26,13 @@ const DeleteLabelModal = ({
       <>
         <p>
           If a configuration profile uses this label as a custom target, the
-          profile will break: it won&apos;t be applied to new hosts.
+          profile will break. After deleting the label, remove broken profiles
+          and upload new profiles in their place.
         </p>
         <p>
-          To apply the profile to new hosts, you&apos;ll have to delete it and
-          upload a new profile.
+          If software uses this label as a custom target, the label will not be
+          able to be deleted. Please remove the label from the software target
+          first before deleting.
         </p>
         <div className="modal-cta-wrap">
           <Button

diff --git a/frontend/pages/hosts/ManageHostsPage/helpers.ts b/frontend/pages/hosts/ManageHostsPage/helpers.ts
@@ -40,7 +40,7 @@ export const getDeleteLabelErrorMessages = (error: unknown): string => {
   if (hasStatusKey(error) && error.status === 422) {
     return getErrorReason(error).includes("built-in")
       ? "Built-in labels can't be modified or deleted."
-      : "Couldn't delete. Software uses this label as a custom target. Please delete the software and try again.";
+      : "Couldn't delete. Software uses this label as a custom target. Remove the label from the software target and try again.";
   }
 
   return "Could not delete label. Please try again.";