Skip to content

fix: Add setting check for Outlook Calendar action reactivity #39986

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dionisio-bot merged 3 commits into from
Apr 2, 2026
Merged

fix: Add setting check for Outlook Calendar action reactivity #39986

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bc89e8f
fix(outlook): Rely on server setting check for display Outlook Calend…
dougfabris Mar 31, 2026
0b4e468
Merge branch 'develop' into fix/outlookCalendarAction-reactivity
dougfabris Apr 1, 2026
31d5ab6
chore: changeset
dougfabris Apr 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/nasty-tomatoes-bake.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': patch
---

Fixes an issue where the outlook calendar action isn't being reactive based on the setting
Comment thread
dougfabris marked this conversation as resolved.
8 changes: 4 additions & 4 deletions apps/meteor/client/hooks/roomActions/useOutlookCalenderRoomAction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import { useUser } from '@rocket.chat/ui-contexts';
import { useSetting } from '@rocket.chat/ui-contexts';
import type { RoomToolboxActionConfig } from '@rocket.chat/ui-contexts';
import { lazy, useMemo } from 'react';

const OutlookEventsRoute = lazy(() => import('../../views/outlookCalendar/OutlookEventsRoute'));

export const useOutlookCalenderRoomAction = () => {
const user = useUser();
const enabled = useSetting('Outlook_Calendar_Enabled', false);
Comment thread
dougfabris marked this conversation as resolved.

return useMemo((): RoomToolboxActionConfig | undefined => {
if (!user?.settings?.calendar?.outlook?.Enabled) {
if (!enabled) {
return undefined;
}

Expand All @@ -20,5 +20,5 @@ export const useOutlookCalenderRoomAction = () => {
tabComponent: OutlookEventsRoute,
order: 999,
};
}, [user?.settings?.calendar?.outlook?.Enabled]);
}, [enabled]);
};
Loading