From 853843ced83df38b275dafca03d8c951fb725a60 Mon Sep 17 00:00:00 2001 From: streamer45 Date: Thu, 31 Oct 2024 13:37:48 -0600 Subject: [PATCH] Fix rendering of AllowScreenSharing config setting --- e2e/tests/admin_console.spec.ts | 4 ++++ .../admin_console_settings/allow_screen_sharing.tsx | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/e2e/tests/admin_console.spec.ts b/e2e/tests/admin_console.spec.ts index 27004b95d..de021684d 100644 --- a/e2e/tests/admin_console.spec.ts +++ b/e2e/tests/admin_console.spec.ts @@ -78,5 +78,9 @@ test.describe('admin console', () => { // Check dropdown input await page.getByTestId('PluginSettings.Plugins.com+mattermost+calls.recordingqualitydropdown').selectOption('High'); await expect(await resizeAndScreenshot(page, 'PluginSettings.Plugins.com+mattermost+calls.recordingquality')).toMatchSnapshot('calls-system-console-recording-quality.png'); + + // Ensure AllowScreenSharing defaults to true + await expect(page.getByTestId('PluginSettings.Plugins.com+mattermost+calls.allowscreensharingtrue')).toBeChecked(); + await expect(page.getByTestId('PluginSettings.Plugins.com+mattermost+calls.allowscreensharingfalse')).not.toBeChecked(); }); }); diff --git a/webapp/src/components/admin_console_settings/allow_screen_sharing.tsx b/webapp/src/components/admin_console_settings/allow_screen_sharing.tsx index cd628c0ca..61b7b824b 100644 --- a/webapp/src/components/admin_console_settings/allow_screen_sharing.tsx +++ b/webapp/src/components/admin_console_settings/allow_screen_sharing.tsx @@ -10,8 +10,9 @@ export default function AllowScreenSharing(props: CustomComponentProps) { props.onChange(props.id, e.target.value === 'true'); }; + // This setting has a default of true so we need to handle the unset case. // @ts-ignore val is a boolean, but the signature says 'string'. (being defensive here, just in case) - const checked = props.value === 'true' || props.value === true; + const checked = typeof props.value === 'undefined' || props.value === 'true' || props.value === true; return (