@@ -26,6 +28,7 @@ const DropdownCell = ({
placeholder={placeholder}
searchable={false}
options={options}
+ disabled={disabled ?? false}
/>
);
diff --git a/frontend/components/TableContainer/DataTable/DropdownCell/_styles.scss b/frontend/components/TableContainer/DataTable/DropdownCell/_styles.scss
index f04bca94d7..eaf1d1c3c2 100644
--- a/frontend/components/TableContainer/DataTable/DropdownCell/_styles.scss
+++ b/frontend/components/TableContainer/DataTable/DropdownCell/_styles.scss
@@ -21,6 +21,14 @@
}
}
+ &.is-disabled {
+ .Select-control {
+ .Select-placeholder {
+ @include disabled;
+ }
+ }
+ }
+
.Select-control {
display: flex;
background-color: initial;
diff --git a/frontend/interfaces/config.ts b/frontend/interfaces/config.ts
index 3305330548..e34992fdcc 100644
--- a/frontend/interfaces/config.ts
+++ b/frontend/interfaces/config.ts
@@ -118,6 +118,7 @@ export interface IConfig {
enable_analytics: boolean;
deferred_save_host: boolean;
query_reports_disabled: boolean;
+ scripts_disabled: boolean;
};
smtp_settings: {
enable_smtp: boolean;
diff --git a/frontend/pages/ManageControlsPage/Scripts/Scripts.tsx b/frontend/pages/ManageControlsPage/Scripts/Scripts.tsx
index 0140fdc7f0..4e0d8eff2c 100644
--- a/frontend/pages/ManageControlsPage/Scripts/Scripts.tsx
+++ b/frontend/pages/ManageControlsPage/Scripts/Scripts.tsx
@@ -15,6 +15,7 @@ import CustomLink from "components/CustomLink";
import Spinner from "components/Spinner";
import DataError from "components/DataError";
import PremiumFeatureMessage from "components/PremiumFeatureMessage";
+import InfoBanner from "components/InfoBanner";
import ScriptListHeading from "./components/ScriptListHeading";
import ScriptListItem from "./components/ScriptListItem";
import ScriptListPagination from "./components/ScriptListPagination";
@@ -75,6 +76,9 @@ const Scripts = ({ router, currentPage, teamIdForApi }: IScriptsProps) => {
router.push(path.concat(`&page=${currentPage + 1}`));
}, [router, path, currentPage]);
+ const { config } = useContext(AppContext);
+ if (!config) return null;
+
// The user is not a premium tier, so show the premium feature message.
if (!isPremiumTier) {
return (
@@ -137,6 +141,15 @@ const Scripts = ({ router, currentPage, teamIdForApi }: IScriptsProps) => {
);
};
+ const renderScriptsDisabledBanner = () => (
+
@@ -148,6 +161,8 @@ const Scripts = ({ router, currentPage, teamIdForApi }: IScriptsProps) => {
newTab
/>
+
+ {config.server_settings.scripts_disabled && renderScriptsDisabledBanner()}
{renderScriptsList()}
{showDeleteScriptModal && selectedScript.current && (
diff --git a/frontend/pages/admin/OrgSettingsPage/cards/Advanced/Advanced.tsx b/frontend/pages/admin/OrgSettingsPage/cards/Advanced/Advanced.tsx
index ae20bbbbf6..98999e1102 100644
--- a/frontend/pages/admin/OrgSettingsPage/cards/Advanced/Advanced.tsx
+++ b/frontend/pages/admin/OrgSettingsPage/cards/Advanced/Advanced.tsx
@@ -28,6 +28,7 @@ const Advanced = ({
disableLiveQuery: appConfig.server_settings.live_query_disabled || false,
disableQueryReports:
appConfig.server_settings.query_reports_disabled || false,
+ disableScripts: appConfig.server_settings.scripts_disabled || false,
});
const {
@@ -37,6 +38,7 @@ const Advanced = ({
enableHostExpiry,
hostExpiryWindow,
disableLiveQuery,
+ disableScripts,
disableQueryReports,
} = formData;
@@ -68,6 +70,7 @@ const Advanced = ({
live_query_disabled: disableLiveQuery,
enable_analytics: appConfig.server_settings.enable_analytics,
query_reports_disabled: disableQueryReports,
+ scripts_disabled: disableScripts,
},
smtp_settings: {
enable_smtp: appConfig.smtp_settings.enable_smtp || false,
@@ -210,6 +213,24 @@ const Advanced = ({
>
Disable live queries
+
+ Disabling scripts will block access to run scripts. Scripts{" "}
+
may still be added and removed in the UI and API.{" "}
+
+
+ (Default: Off)
+
+
+ }
+ >
+ Disable scripts
+
{
@@ -93,7 +97,10 @@ const Scripts = ({
if (isErrorScriptData) {
return ;
}
- const scriptColumnConfigs = generateTableColumnConfigs(onActionSelection);
+ const scriptColumnConfigs = generateTableColumnConfigs(
+ onActionSelection,
+ config.server_settings.scripts_disabled
+ );
const data = generateDataSet(
currentUser,
host,
diff --git a/frontend/pages/hosts/details/cards/Scripts/ScriptsTableConfig.tsx b/frontend/pages/hosts/details/cards/Scripts/ScriptsTableConfig.tsx
index 16010fb87b..ec24c041f4 100644
--- a/frontend/pages/hosts/details/cards/Scripts/ScriptsTableConfig.tsx
+++ b/frontend/pages/hosts/details/cards/Scripts/ScriptsTableConfig.tsx
@@ -17,6 +17,7 @@ import {
isGlobalObserver,
isTeamObserver,
} from "utilities/permissions/permissions";
+import TooltipWrapper from "components/TooltipWrapper";
import ScriptStatusCell from "./components/ScriptStatusCell";
@@ -67,7 +68,8 @@ const ScriptRunActionDropdownLabel = ({
// eslint-disable-next-line import/prefer-default-export
export const generateTableColumnConfigs = (
- actionSelectHandler: (value: string, script: IHostScript) => void
+ actionSelectHandler: (value: string, script: IHostScript) => void,
+ disableActions = false
) => {
return [
{
@@ -90,15 +92,35 @@ export const generateTableColumnConfigs = (
Header: "",
disableSortBy: true,
accessor: "actions",
- Cell: (cellProps: IDropdownCellProps) => (
-
- actionSelectHandler(value, cellProps.row.original)
- }
- placeholder={"Actions"}
- />
- ),
+ Cell: (cellProps: IDropdownCellProps) =>
+ disableActions ? (
+
+ Running scripts is disabled in organization settings
+ }
+ >
+