add canceled script and software install activities

frontend/interfaces/activity.ts

@@ -97,6 +97,8 @@ export enum ActivityType {
   EnabledActivityAutomations = "enabled_activity_automations",
   EditedActivityAutomations = "edited_activity_automations",
   DisabledActivityAutomations = "disabled_activity_automations",
+  CanceledScript = "canceled_script",
+  CanceledSoftwareInstall = "canceled_software_install",
 }
 
 /** This is a subset of ActivityType that are shown only for the host past activities */
@@ -106,7 +108,9 @@ export type IHostPastActivityType =
   | ActivityType.UnlockedHost
   | ActivityType.InstalledSoftware
   | ActivityType.UninstalledSoftware
-  | ActivityType.InstalledAppStoreApp;
+  | ActivityType.InstalledAppStoreApp
+  | ActivityType.CanceledScript
+  | ActivityType.CanceledSoftwareInstall;
 
 /** This is a subset of ActivityType that are shown only for the host upcoming activities */
 export type IHostUpcomingActivityType =

frontend/pages/hosts/details/cards/Activity/ActivityConfig.tsx

@@ -14,18 +14,13 @@ import RanScriptActivityItem from "./ActivityItems/RanScriptActivityItem";
 import LockedHostActivityItem from "./ActivityItems/LockedHostActivityItem";
 import UnlockedHostActivityItem from "./ActivityItems/UnlockedHostActivityItem";
 import InstalledSoftwareActivityItem from "./ActivityItems/InstalledSoftwareActivityItem";
+import CanceledScriptActivityItem from "./ActivityItems/CanceledScriptActivityItem";
+import CanceledSoftwareInstallActivityItem from "./ActivityItems/CanceledSoftwareInstallActivityItem";
 
 /** The component props that all host activity items must adhere to */
 export interface IHostActivityItemComponentProps {
   activity: IHostPastActivity | IHostUpcomingActivity;
   tab: "past" | "upcoming";
-}
-
-/** Used for activity items component that need a show details handler */
-export interface IHostActivityItemComponentPropsWithShowDetails
-  extends IHostActivityItemComponentProps {
-  onShowDetails: ShowActivityDetailsHandler;
-  onCancel?: () => void;
   /** Set this to `true` when rendering only this activity by itself. This will
    * change the styles for the activity item for solo rendering.
    * @default false */
@@ -36,6 +31,13 @@ export interface IHostActivityItemComponentPropsWithShowDetails
   hideClose?: boolean;
 }
 
+/** Used for activity items component that need a show details handler */
+export interface IHostActivityItemComponentPropsWithShowDetails
+  extends IHostActivityItemComponentProps {
+  onShowDetails: ShowActivityDetailsHandler;
+  onCancel?: () => void;
+}
+
 export const pastActivityComponentMap: Record<
   IHostPastActivityType,
   | React.FC<IHostActivityItemComponentProps>
@@ -47,6 +49,8 @@ export const pastActivityComponentMap: Record<
   [ActivityType.InstalledSoftware]: InstalledSoftwareActivityItem,
   [ActivityType.UninstalledSoftware]: InstalledSoftwareActivityItem,
   [ActivityType.InstalledAppStoreApp]: InstalledSoftwareActivityItem,
+  [ActivityType.CanceledScript]: CanceledScriptActivityItem,
+  [ActivityType.CanceledSoftwareInstall]: CanceledSoftwareInstallActivityItem,
 };
 
 export const upcomingActivityComponentMap: Record<

frontend/pages/hosts/details/cards/Activity/ActivityItems/CanceledScriptActivityItem/CanceledScriptActivityItem.tsx

@@ -0,0 +1,24 @@
+import React from "react";
+
+import { formatScriptNameForActivityItem } from "utilities/helpers";
+
+import HostActivityItem from "../../HostActivityItem";
+import { IHostActivityItemComponentProps } from "../../ActivityConfig";
+
+const baseClass = "canceled-script-activity-item";
+
+const CanceledScriptActivityItem = ({
+  activity,
+}: IHostActivityItemComponentProps) => {
+  return (
+    <HostActivityItem className={baseClass} activity={activity}>
+      <>
+        <b>{activity.actor_full_name}</b> canceled{" "}
+        <b>{formatScriptNameForActivityItem(activity.details?.script_name)}</b>{" "}
+        script on this host.
+      </>
+    </HostActivityItem>
+  );
+};
+
+export default CanceledScriptActivityItem;

frontend/pages/hosts/details/cards/Activity/ActivityItems/CanceledScriptActivityItem/index.ts

@@ -0,0 +1 @@
+export { default } from "./CanceledScriptActivityItem";

frontend/pages/hosts/details/cards/Activity/ActivityItems/CanceledSoftwareInstallActivityItem/CanceledSoftwareInstallActivityItem.tsx

@@ -0,0 +1,21 @@
+import React from "react";
+
+import HostActivityItem from "../../HostActivityItem";
+import { IHostActivityItemComponentProps } from "../../ActivityConfig";
+
+const baseClass = "canceled-software-install-activity-item";
+
+const CanceledSoftwareInstallActivityItem = ({
+  activity,
+}: IHostActivityItemComponentProps) => {
+  return (
+    <HostActivityItem className={baseClass} activity={activity}>
+      <>
+        <b>{activity.actor_full_name}</b> canceled{" "}
+        <b>{activity.details?.software_title}</b> install on this host.
+      </>
+    </HostActivityItem>
+  );
+};
+
+export default CanceledSoftwareInstallActivityItem;

frontend/pages/hosts/details/cards/Activity/ActivityItems/CanceledSoftwareInstallActivityItem/index.ts

@@ -0,0 +1 @@
+export { default } from "./CanceledSoftwareInstallActivityItem";