diff --git a/frontend/components/TableContainer/DataTable/TextCell/TextCell.tsx b/frontend/components/TableContainer/DataTable/TextCell/TextCell.tsx
index 3678f09b4b..eabf2da046 100644
--- a/frontend/components/TableContainer/DataTable/TextCell/TextCell.tsx
+++ b/frontend/components/TableContainer/DataTable/TextCell/TextCell.tsx
@@ -4,7 +4,7 @@ import ReactTooltip from "react-tooltip";
import { DEFAULT_EMPTY_CELL_VALUE } from "utilities/constants";
interface ITextCellProps {
- value?: string | number | boolean | { timeString: string };
+ value?: string | number | boolean | { timeString: string } | null;
formatter?: (val: any) => JSX.Element | string; // string, number, or null
greyed?: boolean;
classes?: string;
diff --git a/frontend/components/forms/fields/InputFieldHiddenContent/_styles.scss b/frontend/components/forms/fields/InputFieldHiddenContent/_styles.scss
index c7ee1c90a9..39cdca6b09 100644
--- a/frontend/components/forms/fields/InputFieldHiddenContent/_styles.scss
+++ b/frontend/components/forms/fields/InputFieldHiddenContent/_styles.scss
@@ -21,6 +21,8 @@
}
.input-field {
+ padding-right: 16%;
+
&--disabled {
letter-spacing: 0;
}
diff --git a/frontend/interfaces/activity.ts b/frontend/interfaces/activity.ts
index 818c3cb88d..8895198545 100644
--- a/frontend/interfaces/activity.ts
+++ b/frontend/interfaces/activity.ts
@@ -49,6 +49,9 @@ export enum ActivityType {
EnabledWindowsMdm = "enabled_windows_mdm",
DisabledWindowsMdm = "disabled_windows_mdm",
RanScript = "ran_script",
+ AddedScript = "added_script",
+ DeletedScript = "deleted_script",
+ EditedScript = "edited_script",
}
export interface IActivity {
created_at: string;
@@ -91,4 +94,5 @@ export interface IActivityDetails {
bootstrap_package_name?: string;
name?: string;
script_execution_id?: string;
+ script_name?: string;
}
diff --git a/frontend/interfaces/mdm.ts b/frontend/interfaces/mdm.ts
index 1120e1ab62..db43e33669 100644
--- a/frontend/interfaces/mdm.ts
+++ b/frontend/interfaces/mdm.ts
@@ -103,17 +103,6 @@ export const isWindowsDiskEncryptionStatus = (
export const FLEET_FILEVAULT_PROFILE_DISPLAY_NAME = "Disk encryption";
-// TODO: update when we have API
-export interface IMdmScript {
- id: number;
- name: string;
- ran: number;
- pending: number;
- errors: number;
- created_at: string;
- updated_at: string;
-}
-
export interface IMdmSSOReponse {
url: string;
}
diff --git a/frontend/pages/DashboardPage/cards/ActivityFeed/ActivityItem/ActivityItem.tests.tsx b/frontend/pages/DashboardPage/cards/ActivityFeed/ActivityItem/ActivityItem.tests.tsx
index 4e6726c022..e451e8aa2a 100644
--- a/frontend/pages/DashboardPage/cards/ActivityFeed/ActivityItem/ActivityItem.tests.tsx
+++ b/frontend/pages/DashboardPage/cards/ActivityFeed/ActivityItem/ActivityItem.tests.tsx
@@ -769,4 +769,117 @@ describe("Activity Feed", () => {
})
).toBeInTheDocument();
});
+
+ it("renders an 'added_script' type activity for a team", () => {
+ const activity = createMockActivity({
+ type: ActivityType.AddedScript,
+ details: { script_name: "foo.sh", team_name: "Alphas" },
+ });
+ render(
);
+
+ expect(
+ screen.getByText("added script ", { exact: false })
+ ).toBeInTheDocument();
+ expect(screen.getByText("foo.sh", { exact: false })).toBeInTheDocument();
+ expect(
+ screen.getByText(" to the ", {
+ exact: false,
+ })
+ ).toBeInTheDocument();
+ expect(screen.getByText("Alphas")).toBeInTheDocument();
+ expect(screen.getByText(" team.", { exact: false })).toBeInTheDocument();
+ const withNoTeams = screen.queryByText("no team");
+ expect(withNoTeams).toBeNull();
+ });
+
+ it("renders a 'deleted_script' type activity for a team", () => {
+ const activity = createMockActivity({
+ type: ActivityType.DeletedScript,
+ details: { script_name: "foo.sh", team_name: "Alphas" },
+ });
+ render(
);
+
+ expect(
+ screen.getByText("deleted script ", { exact: false })
+ ).toBeInTheDocument();
+ expect(screen.getByText("foo.sh", { exact: false })).toBeInTheDocument();
+ expect(
+ screen.getByText(" from the ", {
+ exact: false,
+ })
+ ).toBeInTheDocument();
+ expect(screen.getByText("Alphas")).toBeInTheDocument();
+ expect(screen.getByText(" team.", { exact: false })).toBeInTheDocument();
+ const withNoTeams = screen.queryByText("no team");
+ expect(withNoTeams).toBeNull();
+ });
+
+ it("renders an 'added_script' type activity for hosts with no team.", () => {
+ const activity = createMockActivity({
+ type: ActivityType.AddedScript,
+ details: { script_name: "foo.sh" },
+ });
+ render(
);
+
+ expect(
+ screen.getByText("added script ", { exact: false })
+ ).toBeInTheDocument();
+ expect(screen.getByText("foo.sh", { exact: false })).toBeInTheDocument();
+ expect(
+ screen.getByText("to no team.", { exact: false })
+ ).toBeInTheDocument();
+ });
+
+ it("renders a 'deleted_script' type activity for hosts with no team.", () => {
+ const activity = createMockActivity({
+ type: ActivityType.DeletedScript,
+ details: { script_name: "foo.sh" },
+ });
+ render(
);
+
+ expect(
+ screen.getByText("deleted script ", { exact: false })
+ ).toBeInTheDocument();
+ expect(screen.getByText("foo.sh", { exact: false })).toBeInTheDocument();
+ expect(
+ screen.getByText("from no team.", { exact: false })
+ ).toBeInTheDocument();
+ });
+
+ it("renders an 'edited_script' type activity for a team", () => {
+ const activity = createMockActivity({
+ type: ActivityType.EditedScript,
+ details: { team_name: "Alphas" },
+ });
+ render(
);
+
+ expect(
+ screen.getByText("edited scripts", { exact: false })
+ ).toBeInTheDocument();
+ expect(
+ screen.getByText(" for the ", {
+ exact: false,
+ })
+ ).toBeInTheDocument();
+ expect(screen.getByText("Alphas")).toBeInTheDocument();
+ expect(
+ screen.getByText(" team via fleetctl.", { exact: false })
+ ).toBeInTheDocument();
+ const withNoTeams = screen.queryByText("no team");
+ expect(withNoTeams).toBeNull();
+ });
+ it("renders an 'edited_script' type activity for hosts with no team.", () => {
+ const activity = createMockActivity({
+ type: ActivityType.EditedScript,
+ details: {},
+ });
+ render(
);
+
+ expect(
+ screen.getByText("edited scripts", { exact: false })
+ ).toBeInTheDocument();
+ expect(
+ screen.getByText("for no team via fleetctl.", { exact: false })
+ ).toBeInTheDocument();
+ });
});
diff --git a/frontend/pages/DashboardPage/cards/ActivityFeed/ActivityItem/ActivityItem.tsx b/frontend/pages/DashboardPage/cards/ActivityFeed/ActivityItem/ActivityItem.tsx
index 2ef3d66715..2acb4dcf07 100644
--- a/frontend/pages/DashboardPage/cards/ActivityFeed/ActivityItem/ActivityItem.tsx
+++ b/frontend/pages/DashboardPage/cards/ActivityFeed/ActivityItem/ActivityItem.tsx
@@ -518,6 +518,72 @@ const TAGGED_TEMPLATES = {
);
},
+ addedScript: (activity: IActivity) => {
+ const scriptName = activity.details?.script_name;
+ return (
+ <>
+ {" "}
+ added{" "}
+ {scriptName ? (
+ <>
+ script
{scriptName}{" "}
+
+ ) : (
+ "a script "
+ )}
+ to{" "}
+ {activity.details?.team_name ? (
+ <>
+ the
{activity.details.team_name} team
+
+ ) : (
+ "no team"
+ )}
+ .
+
+ );
+ },
+ deletedScript: (activity: IActivity) => {
+ const scriptName = activity.details?.script_name;
+ return (
+ <>
+ {" "}
+ deleted{" "}
+ {scriptName ? (
+ <>
+ script
{scriptName}{" "}
+
+ ) : (
+ "a script "
+ )}
+ from{" "}
+ {activity.details?.team_name ? (
+ <>
+ the
{activity.details.team_name} team
+
+ ) : (
+ "no team"
+ )}
+ .
+
+ );
+ },
+ editedScript: (activity: IActivity) => {
+ return (
+ <>
+ {" "}
+ edited scripts for{" "}
+ {activity.details?.team_name ? (
+ <>
+ the
{activity.details.team_name} team
+
+ ) : (
+ "no team"
+ )}{" "}
+ via fleetctl.
+
+ );
+ },
};
const getDetail = (
@@ -634,6 +700,15 @@ const getDetail = (
case ActivityType.RanScript: {
return TAGGED_TEMPLATES.ranScript(activity, onDetailsClick);
}
+ case ActivityType.AddedScript: {
+ return TAGGED_TEMPLATES.addedScript(activity);
+ }
+ case ActivityType.DeletedScript: {
+ return TAGGED_TEMPLATES.deletedScript(activity);
+ }
+ case ActivityType.EditedScript: {
+ return TAGGED_TEMPLATES.editedScript(activity);
+ }
default: {
return TAGGED_TEMPLATES.defaultActivityTemplate(activity);
}
diff --git a/frontend/pages/LabelPage/LabelForm/LabelForm.tsx b/frontend/pages/LabelPage/LabelForm/LabelForm.tsx
index 4dc3945ad2..c2b640b3b4 100644
--- a/frontend/pages/LabelPage/LabelForm/LabelForm.tsx
+++ b/frontend/pages/LabelPage/LabelForm/LabelForm.tsx
@@ -104,6 +104,7 @@ const LabelForm = ({
const onLoad = (editor: IAceEditor) => {
editor.setOptions({
enableLinking: true,
+ enableMultiselect: false, // Disables command + click creating multiple cursors
});
// @ts-expect-error
diff --git a/frontend/pages/ManageControlsPage/MacOSScripts/MacOSScripts.tsx b/frontend/pages/ManageControlsPage/MacOSScripts/MacOSScripts.tsx
deleted file mode 100644
index 5ce01809b7..0000000000
--- a/frontend/pages/ManageControlsPage/MacOSScripts/MacOSScripts.tsx
+++ /dev/null
@@ -1,111 +0,0 @@
-import React, { useRef, useState } from "react";
-
-import { IMdmScript } from "interfaces/mdm";
-
-import CustomLink from "components/CustomLink";
-
-import ScriptListHeading from "./components/ScriptListHeading";
-import ScriptListItem from "./components/ScriptListItem";
-import DeleteScriptModal from "./components/DeleteScriptModal";
-import FileUploader from "../components/FileUploader";
-import UploadList from "../components/UploadList";
-import RerunScriptModal from "./components/RerunScriptModal";
-
-// TODO: remove when get integrate with API.
-const scripts = [
- {
- id: 1,
- name: "Test.py",
- ran: 57,
- pending: 2304,
- errors: 0,
- created_at: new Date().toString(),
- },
-];
-
-const baseClass = "mac-os-scripts";
-
-const MacOSScripts = () => {
- const [showRerunScriptModal, setShowRerunScriptModal] = useState(false);
- const [showDeleteScriptModal, setShowDeleteScriptModal] = useState(false);
-
- const selectedScript = useRef
(null);
-
- const onClickRerun = (script: IMdmScript) => {
- selectedScript.current = script;
- setShowRerunScriptModal(true);
- };
-
- const onClickDelete = (script: IMdmScript) => {
- selectedScript.current = script;
- setShowDeleteScriptModal(true);
- };
-
- const onCancelRerun = () => {
- selectedScript.current = null;
- setShowRerunScriptModal(false);
- };
-
- const onCancelDelete = () => {
- selectedScript.current = null;
- setShowDeleteScriptModal(false);
- };
-
- // TODO: change when integrating with API
- const onRerunScript = (scriptId: number) => {
- console.log("rerun", scriptId);
- setShowRerunScriptModal(false);
- };
-
- // TODO: change when integrating with API
- const onDeleteScript = (scriptId: number) => {
- console.log("delete", scriptId);
- setShowDeleteScriptModal(false);
- };
-
- return (
-
-
- Upload scripts to change configuration and remediate issues on macOS
- hosts. Each script runs once per host. All scripts can be rerun on end
- users’ My device page.
-
-
(
-
- )}
- />
- {
- return null;
- }}
- />
- {showRerunScriptModal && selectedScript.current && (
-
- )}
- {showDeleteScriptModal && selectedScript.current && (
-
- )}
-