diff --git a/changes/20293-script-pending-tooltip b/changes/20293-script-pending-tooltip new file mode 100644 index 0000000000..0f262cd68c --- /dev/null +++ b/changes/20293-script-pending-tooltip @@ -0,0 +1 @@ +- Fixed UI issue where "Script is already running" tooltip incorrectly displayed when the script is not running. diff --git a/frontend/pages/hosts/details/HostDetailsPage/modals/RunScriptModal/ScriptsTableConfig.tsx b/frontend/pages/hosts/details/HostDetailsPage/modals/RunScriptModal/ScriptsTableConfig.tsx index c870ab55e4..d115185f1a 100644 --- a/frontend/pages/hosts/details/HostDetailsPage/modals/RunScriptModal/ScriptsTableConfig.tsx +++ b/frontend/pages/hosts/details/HostDetailsPage/modals/RunScriptModal/ScriptsTableConfig.tsx @@ -1,8 +1,4 @@ import React from "react"; -import ReactTooltip from "react-tooltip"; -import { noop } from "lodash"; - -import { COLORS } from "styles/var/colors"; import { IDropdownOption } from "interfaces/dropdownOption"; import { IHostScript, ILastExecution } from "interfaces/script"; @@ -42,6 +38,7 @@ const generateActionDropdownOptions = ( teamId: number | null, { last_execution }: IHostScript ): IDropdownOption[] => { + const isPending = last_execution?.status === "pending"; const hasRunPermission = !!currentUser && (isGlobalAdmin(currentUser) || @@ -58,14 +55,15 @@ const generateActionDropdownOptions = ( disabled: last_execution === null, value: "showDetails", }, - { - label: "Run", - disabled: last_execution?.status === "pending", - value: "run", - tooltipContent: "Script is already running.", - }, ]; - return hasRunPermission ? options : options.slice(0, 1); + hasRunPermission && + options.push({ + label: "Run", + disabled: isPending, + value: "run", + tooltipContent: isPending ? "Script is already running." : undefined, + }); + return options; }; // eslint-disable-next-line import/prefer-default-export