From 86eb8fd05824b27370db5515ea5c04d9267f660a Mon Sep 17 00:00:00 2001 From: jacobshandling <61553566+jacobshandling@users.noreply.github.com> Date: Tue, 26 Nov 2024 12:30:30 -0800 Subject: [PATCH] UI - Update help text for Policy automations (scripts & software) (#24138) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Addresses #22527 Figma: Screenshot 2024-11-25 at 5 30 48 PM UI: Screenshot 2024-11-25 at 12 17 23 PM Screenshot 2024-11-25 at 12 03 53 PM - [x] Changes file added for user-visible changes in `changes/` - [x] Manual QA for all new/changed functionality --------- Co-authored-by: Jacob Shandling --- .../22527-policy-automation-ui-improvements | 1 + .../InstallSoftwareModal.tsx | 20 +++++++++++++++---- .../PolicyRunScriptModal.tsx | 17 ++++++++++++++-- 3 files changed, 32 insertions(+), 6 deletions(-) create mode 100644 changes/22527-policy-automation-ui-improvements diff --git a/changes/22527-policy-automation-ui-improvements b/changes/22527-policy-automation-ui-improvements new file mode 100644 index 0000000000..6d56f7efa6 --- /dev/null +++ b/changes/22527-policy-automation-ui-improvements @@ -0,0 +1 @@ +- Update help text for policy automation Install software and Run script modals diff --git a/frontend/pages/policies/ManagePoliciesPage/components/InstallSoftwareModal/InstallSoftwareModal.tsx b/frontend/pages/policies/ManagePoliciesPage/components/InstallSoftwareModal/InstallSoftwareModal.tsx index 0d9681c203..d21cc7a6c3 100644 --- a/frontend/pages/policies/ManagePoliciesPage/components/InstallSoftwareModal/InstallSoftwareModal.tsx +++ b/frontend/pages/policies/ManagePoliciesPage/components/InstallSoftwareModal/InstallSoftwareModal.tsx @@ -20,6 +20,7 @@ import TooltipTruncatedText from "components/TooltipTruncatedText"; import CustomLink from "components/CustomLink"; import Button from "components/buttons/Button"; import { ISoftwareTitle } from "interfaces/software"; +import TooltipWrapper from "components/TooltipWrapper"; const getPlatformDisplayFromPackageExtension = (ext: string | undefined) => { switch (ext) { @@ -223,6 +224,16 @@ const InstallSoftwareModal = ({ ); } + const compatibleTipContent = ( + <> + .pkg for macOS. +
+ .msi or .exe for Windows. +
+ .deb for Linux. + + ); + return (
@@ -233,10 +244,11 @@ const InstallSoftwareModal = ({ )} - Selected software will be installed when hosts fail the policy. Host - counts will reset when a new software is -
- selected.{" "} + Selected software, if{" "} + + compatible + {" "} + with the host, will be installed when hosts fail the chosen policy.{" "} + Shell (.sh) for macOS and Linux. +
+ PowerShell (.ps1) for Windows. + + ); + return (
@@ -201,8 +210,12 @@ const PolicyRunScriptModal = ({ )} - Selected script will run when hosts fail the policy. Host counts - will reset when a new script is selected.{" "} + Selected script, if{" "} + + compatible + {" "} + with the host, will run when hosts fail the policy. Host counts will + reset when a new script is selected.{" "}