From f5296ab4002223fea0d5f0c51289c4ca214ca6d7 Mon Sep 17 00:00:00 2001
From: Sarah Gillespie <73313222+gillespi314@users.noreply.github.com>
Date: Thu, 18 Jul 2024 17:39:19 -0500
Subject: [PATCH] Fix unreleased issues in VPP feature branch (#20590)

---
 docs/Using Fleet/Audit-logs.md                            | 4 ++--
 .../cards/ActivityFeed/ActivityItem/ActivityItem.tsx      | 4 ++--
 .../SoftwarePage/components/AppStoreVpp/AppStoreVpp.tsx   | 8 +++++++-
 .../cards/Vpp/VppSetupPage/VppSetupPage.tsx               | 5 ++++-
 .../components/DisableVppModal/DisableVppModal.tsx        | 8 ++++++--
 frontend/utilities/endpoints.ts                           | 2 +-
 server/fleet/activities.go                                | 4 ++--
 7 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/docs/Using Fleet/Audit-logs.md b/docs/Using Fleet/Audit-logs.md
index cbffea6455..b547f659d8 100644
--- a/docs/Using Fleet/Audit-logs.md	
+++ b/docs/Using Fleet/Audit-logs.md	
@@ -1174,13 +1174,13 @@ This activity contains the following fields:
 }
 ```
 
-## vpp_enabled
+## enabled_vpp
 
 Generated when the VPP feature is enabled in Fleet.
 
 
 
-## vpp_disabled
+## disabled_vpp
 
 Generated when the VPP feature is disabled in Fleet.
 
diff --git a/frontend/pages/DashboardPage/cards/ActivityFeed/ActivityItem/ActivityItem.tsx b/frontend/pages/DashboardPage/cards/ActivityFeed/ActivityItem/ActivityItem.tsx
index 9919fe65f3..d4f4d87ef6 100644
--- a/frontend/pages/DashboardPage/cards/ActivityFeed/ActivityItem/ActivityItem.tsx
+++ b/frontend/pages/DashboardPage/cards/ActivityFeed/ActivityItem/ActivityItem.tsx
@@ -833,7 +833,7 @@ const TAGGED_TEMPLATES = {
       <>
         {" "}
         added <b>{activity.details?.software_title}</b> (
-        {activity.details?.software_package}) software to{" "}
+        {activity.details?.software_package}) to{" "}
         {activity.details?.team_name ? (
           <>
             {" "}
@@ -850,7 +850,7 @@ const TAGGED_TEMPLATES = {
       <>
         {" "}
         deleted <b>{activity.details?.software_title}</b> (
-        {activity.details?.software_package}) software from{" "}
+        {activity.details?.software_package}) from{" "}
         {activity.details?.team_name ? (
           <>
             {" "}
diff --git a/frontend/pages/SoftwarePage/components/AppStoreVpp/AppStoreVpp.tsx b/frontend/pages/SoftwarePage/components/AppStoreVpp/AppStoreVpp.tsx
index 0d226efb90..54b3b6f0ad 100644
--- a/frontend/pages/SoftwarePage/components/AppStoreVpp/AppStoreVpp.tsx
+++ b/frontend/pages/SoftwarePage/components/AppStoreVpp/AppStoreVpp.tsx
@@ -130,7 +130,13 @@ const AppStoreVpp = ({ teamId, router, onExit }: IAppStoreVppProps) => {
       });
       router.push(`${PATHS.SOFTWARE}?${queryParams}`);
     } catch (e) {
-      renderFlash("error", getErrorReason(e));
+      const reason = getErrorReason(e);
+      // TODO: update with pre-defined error messages we want to pass through from the API
+      if (reason.toLowerCase().includes("already")) {
+        renderFlash("error", reason);
+      } else {
+        renderFlash("error", "Couldn’t add software. Please try again.");
+      }
     }
     onExit();
   };
diff --git a/frontend/pages/admin/IntegrationsPage/cards/Vpp/VppSetupPage/VppSetupPage.tsx b/frontend/pages/admin/IntegrationsPage/cards/Vpp/VppSetupPage/VppSetupPage.tsx
index 0d0ce44069..a4289664e6 100644
--- a/frontend/pages/admin/IntegrationsPage/cards/Vpp/VppSetupPage/VppSetupPage.tsx
+++ b/frontend/pages/admin/IntegrationsPage/cards/Vpp/VppSetupPage/VppSetupPage.tsx
@@ -172,7 +172,10 @@ const VppSetupPage = ({ router }: IVppSetupPageProps) => {
         <>{renderContent()}</>
       </>
       {showDisableModal && (
-        <DisableVppModal onExit={() => setShowDisableModal(false)} />
+        <DisableVppModal
+          router={router}
+          onExit={() => setShowDisableModal(false)}
+        />
       )}
       {showRenewModal && (
         <RenewVppTokenModal
diff --git a/frontend/pages/admin/IntegrationsPage/cards/Vpp/VppSetupPage/components/DisableVppModal/DisableVppModal.tsx b/frontend/pages/admin/IntegrationsPage/cards/Vpp/VppSetupPage/components/DisableVppModal/DisableVppModal.tsx
index 272d7bbfb7..b601dc4847 100644
--- a/frontend/pages/admin/IntegrationsPage/cards/Vpp/VppSetupPage/components/DisableVppModal/DisableVppModal.tsx
+++ b/frontend/pages/admin/IntegrationsPage/cards/Vpp/VppSetupPage/components/DisableVppModal/DisableVppModal.tsx
@@ -1,4 +1,6 @@
 import React, { useContext, useState } from "react";
+import { InjectedRouter } from "react-router";
+import paths from "router/paths";
 
 import mdmAppleAPI from "services/entities/mdm_apple";
 import { NotificationContext } from "context/notification";
@@ -9,21 +11,23 @@ import Button from "components/buttons/Button";
 const baseClass = "diable-vpp-modal";
 
 interface IDisableVppModalProps {
+  router: InjectedRouter;
   onExit: () => void;
 }
 
-const DisableVppModal = ({ onExit }: IDisableVppModalProps) => {
+const DisableVppModal = ({ router, onExit }: IDisableVppModalProps) => {
   const { renderFlash } = useContext(NotificationContext);
   const [isDisabling, setIsDisabling] = useState(false);
 
   const onDisableVpp = async () => {
-    // TODO: API integration
+    setIsDisabling(true);
     try {
       await mdmAppleAPI.disableVpp();
       renderFlash(
         "success",
         "Volume Purchasing Program (VPP) disabled successfully."
       );
+      router.push(paths.ADMIN_INTEGRATIONS_VPP);
     } catch {
       renderFlash(
         "error",
diff --git a/frontend/utilities/endpoints.ts b/frontend/utilities/endpoints.ts
index cc2d46ca16..235029bf70 100644
--- a/frontend/utilities/endpoints.ts
+++ b/frontend/utilities/endpoints.ts
@@ -155,7 +155,7 @@ export default {
   SOFTWARE_PACKAGE_INSTALL: (id: number) =>
     `/${API_VERSION}/fleet/software/packages/${id}`,
   SOFTWARE_AVAILABLE_FOR_INSTALL: (id: number) =>
-    `/${API_VERSION}/fleet/software/${id}/available_for_install`,
+    `/${API_VERSION}/fleet/software/titles/${id}/available_for_install`,
 
   // AI endpoints
   AUTOFILL_POLICY: `/${API_VERSION}/fleet/autofill/policy`,
diff --git a/server/fleet/activities.go b/server/fleet/activities.go
index 4a22ea3d07..e2794d957b 100644
--- a/server/fleet/activities.go
+++ b/server/fleet/activities.go
@@ -1607,7 +1607,7 @@ func LogRoleChangeActivities(
 type ActivityEnabledVPP struct{}
 
 func (a ActivityEnabledVPP) ActivityName() string {
-	return "vpp_enabled"
+	return "enabled_vpp"
 }
 
 func (a ActivityEnabledVPP) Documentation() (activity string, details string, detailsExample string) {
@@ -1617,7 +1617,7 @@ func (a ActivityEnabledVPP) Documentation() (activity string, details string, de
 type ActivityDisabledVPP struct{}
 
 func (a ActivityDisabledVPP) ActivityName() string {
-	return "vpp_disabled"
+	return "disabled_vpp"
 }
 
 func (a ActivityDisabledVPP) Documentation() (activity string, details string, detailsExample string) {