feat: Add Hours, Minutes, Seconds fields while taking input as idleTimeLimit

.changeset/wild-sheep-hug.md

@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Enhanced userPresence options by adding hours and minutes fields alongside seconds for idleTimeLimit, allowing more flexible idle time configuration.

apps/meteor/client/startup/startup.ts

@@ -48,7 +48,14 @@ Meteor.startup(() => {
 		}
 
 		if (getUserPreference(user, 'enableAutoAway')) {
-			const idleTimeLimit = (getUserPreference(user, 'idleTimeLimit') as number | null | undefined) || 300;
+			const idleTimeLimitH = (getUserPreference(user, 'idleTimeLimitH') as number | null | undefined) || 0;
+
+			const idleTimeLimitM = (getUserPreference(user, 'idleTimeLimitM') as number | null | undefined) || 5;
+
+			const idleTimeLimitS = (getUserPreference(user, 'idleTimeLimitS') as number | null | undefined) || 0;
+
+			const idleTimeLimit = (idleTimeLimitH || 0) * 3600 + (idleTimeLimitM || 0)* 60 + (idleTimeLimitS || 0);
+
 			UserPresence.awayTime = idleTimeLimit * 1000;
 		} else {
 			delete UserPresence.awayTime;

apps/meteor/client/views/account/preferences/PreferencesUserPresenceSection.tsx

@@ -9,7 +9,10 @@ const PreferencesUserPresenceSection = () => {
 	const { register, control } = useFormContext();
 
 	const enableAutoAwayId = useUniqueId();
-	const idleTimeLimit = useUniqueId();
+	const idleTimeLimitH = useUniqueId();
+	const idleTimeLimitM = useUniqueId();
+	const idleTimeLimitS = useUniqueId();
+
 
 	return (
 		<Accordion.Item title={t('User_Presence')}>
@@ -27,14 +30,19 @@ const PreferencesUserPresenceSection = () => {
 					</FieldRow>
 				</Field>
 				<Field>
-					<FieldLabel htmlFor={idleTimeLimit}>{t('Idle_Time_Limit')}</FieldLabel>
+					<FieldLabel htmlFor={idleTimeLimitH}>{t('Idle_Time_Limit')}</FieldLabel>
 					<FieldRow>
-						<NumberInput id={idleTimeLimit} {...register('idleTimeLimit')} />
+					<FieldLabel htmlFor="idleTimeLimitH">{t('hours')} </FieldLabel>
+						<NumberInput id={idleTimeLimitH} {...register('idleTimeLimitH')} />
+						<FieldLabel htmlFor="idleTimeLimitM">{t('minutes')} </FieldLabel>
+						<NumberInput id={idleTimeLimitM} {...register('idleTimeLimitM')} max={59} min={0} />
+						<FieldLabel htmlFor="idleTimeLimitS">{t('seconds')} </FieldLabel>
+						<NumberInput id={idleTimeLimitS} {...register('idleTimeLimitS')} max={59} min={0} />
 					</FieldRow>
 				</Field>
 			</FieldGroup>
 		</Accordion.Item>
 	);
 };
 
-export default PreferencesUserPresenceSection;
+export default PreferencesUserPresenceSection;

apps/meteor/client/views/account/preferences/useAccountPreferencesValues.ts

@@ -4,7 +4,9 @@ export type AccountPreferencesData = {
 	language?: string;
 	dontAskAgainList?: string[];
 	enableAutoAway?: boolean;
-	idleTimeLimit?: number;
+	idleTimeLimitH?: number;
+	idleTimeLimitM?: number;
+	idleTimeLimitS?: number;
 	desktopNotificationRequireInteraction?: boolean;
 	desktopNotifications?: string;
 	pushNotifications?: string;
@@ -43,8 +45,10 @@ export const useAccountPreferencesValues = (): AccountPreferencesData => {
 	const userDontAskAgainList = useUserPreference<{ action: string; label: string }[]>('dontAskAgainList') || [];
 	const dontAskAgainList = userDontAskAgainList.map(({ action }) => action);
 	const enableAutoAway = useUserPreference<boolean>('enableAutoAway');
-	const idleTimeLimit = useUserPreference<number>('idleTimeLimit');
-
+	const idleTimeLimitH = useUserPreference<number>('idleTimeLimitH');
+	const idleTimeLimitM = useUserPreference<number>('idleTimeLimitM');
+	const idleTimeLimitS = useUserPreference<number>('idleTimeLimitS');
+
 	const desktopNotificationRequireInteraction = useUserPreference<boolean>('desktopNotificationRequireInteraction');
 	const desktopNotifications = useUserPreference<string>('desktopNotifications');
 	const pushNotifications = useUserPreference<string>('pushNotifications');
@@ -76,7 +80,9 @@ export const useAccountPreferencesValues = (): AccountPreferencesData => {
 		language,
 		dontAskAgainList,
 		enableAutoAway,
-		idleTimeLimit,
+		idleTimeLimitH,
+		idleTimeLimitM,
+		idleTimeLimitS,
 		desktopNotificationRequireInteraction,
 		desktopNotifications,
 		pushNotifications,

apps/meteor/server/methods/saveUserPreferences.ts

@@ -36,6 +36,9 @@ type UserPreferences = {
 	hideFlexTab: boolean;
 	sendOnEnter: string;
 	idleTimeLimit: number;
+	idleTimeLimitH: number;
+	idleTimeLimitM: number;
+	idleTimeLimitS: number;
 	sidebarShowFavorites: boolean;
 	sidebarShowUnread: boolean;
 	sidebarSortby: string;
@@ -107,6 +110,9 @@ export const saveUserPreferences = async (settings: Partial<UserPreferences>, us
 		displayAvatars: Match.Optional(Boolean),
 		hideFlexTab: Match.Optional(Boolean),
 		sendOnEnter: Match.Optional(String),
+		idleTimeLimitH: Match.Optional(Number),
+		idleTimeLimitM: Match.Optional(Number),
+		idleTimeLimitS: Match.Optional(Number),
 		idleTimeLimit: Match.Optional(Number),
 		sidebarShowFavorites: Match.Optional(Boolean),
 		sidebarShowUnread: Match.Optional(Boolean),
@@ -153,10 +159,13 @@ export const saveUserPreferences = async (settings: Partial<UserPreferences>, us
 		settings.emailNotificationMode = 'nothing';
 	}
 
-	if (settings.idleTimeLimit != null && settings.idleTimeLimit < 60) {
-		throw new Meteor.Error('invalid-idle-time-limit-value', 'Invalid idleTimeLimit');
+	const idleTimeLimit = (settings.idleTimeLimitH || 0) * 3600 + (settings.idleTimeLimitM || 0) * 60 + (settings.idleTimeLimitS || 0);
+
+	if (settings.idleTimeLimit != null && idleTimeLimit < 60) {
+	throw new Meteor.Error('invalid-idle-time-limit-value', 'Idle time limit must be at least 1 minutes.');
 	}
 
+
 	await Users.setPreferences(user._id, settings);
 
 	const diff = (Object.keys(settings) as (keyof UserPreferences)[]).reduce<Record<string, any>>((data, key) => {

apps/meteor/server/settings/accounts.ts

@@ -867,4 +867,4 @@ export const createAccountSettings = () =>
 				i18nDescription: 'Password_History_Amount_Description',
 			});
 		});
-	});
+	});

packages/rest-typings/src/v1/users/UsersSetPreferenceParamsPOST.ts

@@ -46,7 +46,9 @@ export type UsersSetPreferencesParamsPOST = {
 		fontSize?: FontSize;
 		receiveLoginDetectionEmail?: boolean;
 		notifyCalendarEvents?: boolean;
-		idleTimeLimit?: number;
+		idleTimeLimitH?: number;
+		idleTimeLimitM?: number;
+		idleTimeLimitS?: number;
 		omnichannelTranscriptEmail?: boolean;
 		omnichannelTranscriptPDF?: boolean;
 		omnichannelHideConversationAfterClosing?: boolean;
@@ -231,7 +233,15 @@ const UsersSetPreferencesParamsPostSchema = {
 					type: 'boolean',
 					nullable: true,
 				},
-				idleTimeLimit: {
+				idleTimeLimitH: {
+					type: 'number',
+					nullable: true,
+				},
+				idleTimeLimitM: {
+					type: 'number',
+					nullable: true,
+				},
+				idleTimeLimitS: {
 					type: 'number',
 					nullable: true,
 				},