Fix some typings

RocketChat · Mar 10, 2023 · 599586c · 599586c
1 parent 09b0d25
commit 599586c
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 9 deletions.
diff --git a/apps/meteor/app/settings/client/lib/settings.ts b/apps/meteor/app/settings/client/lib/settings.ts
@@ -13,7 +13,7 @@ class Settings extends SettingsBase {
 
 	dict = new ReactiveDict('settings');
 
-	get<TValue extends EJSONableProperty>(_id: string | RegExp, ...args: []): TValue | undefined {
+	get<TValue extends EJSONableProperty = any>(_id: string | RegExp, ...args: []): TValue | undefined {
 		if (_id instanceof RegExp) {
 			throw new Error('RegExp Settings.get(RegExp)');
 		}

diff --git a/apps/meteor/app/ui-login/client/username/username.ts b/apps/meteor/app/ui-login/client/username/username.ts
@@ -21,7 +21,7 @@ Template.username.onCreated(function () {
 		const accountsCustomFields = settings.get('Accounts_CustomFields');
 		if (typeof accountsCustomFields === 'string' && accountsCustomFields.trim() !== '') {
 			try {
-				return this.customFields.set(JSON.parse(settings.get('Accounts_CustomFields')));
+				return this.customFields.set(JSON.parse(settings.get('Accounts_CustomFields') ?? 'null'));
 			} catch (error1) {
 				return console.error('Invalid JSON for Accounts_CustomFields');
 			}

diff --git a/apps/meteor/app/ui-message/client/messageBox/messageBoxFormatting.ts b/apps/meteor/app/ui-message/client/messageBox/messageBoxFormatting.ts
@@ -64,6 +64,6 @@ export const formattingButtons: ReadonlyArray<FormattingButton> = [
 			}
 		},
 		link: 'https://khan.github.io/KaTeX/function-support.html',
-		condition: () => settings.get('Katex_Enabled'),
+		condition: () => settings.get('Katex_Enabled') ?? false,
 	},
 ] as const;
diff --git a/apps/meteor/client/lib/rooms/roomCoordinator.ts b/apps/meteor/client/lib/rooms/roomCoordinator.ts
@@ -191,7 +191,7 @@ class RoomCoordinatorClient extends RoomCoordinator {
 			return false;
 		}
 		if (isRoomFederated(room)) {
-			return settings.get('Federation_Matrix_enabled');
+			return settings.get('Federation_Matrix_enabled') ?? false;
 		}
 		return true;
 	}

diff --git a/apps/meteor/client/lib/utils/fireGlobalEvent.ts b/apps/meteor/client/lib/utils/fireGlobalEvent.ts
@@ -19,7 +19,7 @@ export const fireGlobalEvent = (eventName: string, detail?: unknown): void => {
 					eventName,
 					data: detail,
 				},
-				settings.get('Iframe_Integration_send_target_origin'),
+				settings.get('Iframe_Integration_send_target_origin') ?? '/',
 			);
 		}
 	});

diff --git a/apps/meteor/client/startup/actionButtons/webdavUpload.ts b/apps/meteor/client/startup/actionButtons/webdavUpload.ts
@@ -24,7 +24,7 @@ Meteor.startup(() => {
 				return false;
 			}
 
-			return settings.get('Webdav_Integration_Enabled');
+			return settings.get('Webdav_Integration_Enabled') ?? false;
 		},
 		action(_, props) {
 			const { message = messageArgs(this).msg } = props;

diff --git a/apps/meteor/client/views/account/sidebarItems.ts b/apps/meteor/client/views/account/sidebarItems.ts
@@ -17,19 +17,20 @@ export const {
 		href: 'profile',
 		i18nLabel: 'Profile',
 		icon: 'user',
-		permissionGranted: (): boolean => settings.get('Accounts_AllowUserProfileChange'),
+		permissionGranted: (): boolean => settings.get('Accounts_AllowUserProfileChange') ?? false,
 	},
 	{
 		href: 'security',
 		i18nLabel: 'Security',
 		icon: 'lock',
-		permissionGranted: (): boolean => settings.get('Accounts_TwoFactorAuthentication_Enabled') || settings.get('E2E_Enable'),
+		permissionGranted: (): boolean =>
+			(settings.get('Accounts_TwoFactorAuthentication_Enabled') ?? false) || (settings.get('E2E_Enable') ?? false),
 	},
 	{
 		href: 'integrations',
 		i18nLabel: 'Integrations',
 		icon: 'code',
-		permissionGranted: (): boolean => settings.get('Webdav_Integration_Enabled'),
+		permissionGranted: (): boolean => settings.get('Webdav_Integration_Enabled') ?? false,
 	},
 	{
 		href: 'tokens',