diff --git a/services/web/app/src/Features/Email/EmailBuilder.mjs b/services/web/app/src/Features/Email/EmailBuilder.mjs index d3d35bb74a..0ce977fcac 100644 --- a/services/web/app/src/Features/Email/EmailBuilder.mjs +++ b/services/web/app/src/Features/Email/EmailBuilder.mjs @@ -1122,6 +1122,42 @@ templates.groupMemberLimitWarning = ctaTemplate({ }, }) +templates.groupAiFeaturesDisabled = NoCTAEmailTemplate({ + subject() { + return `AI features have been disabled for your ${settings.appName} group` + }, + title() { + return `AI features disabled` + }, + greeting(opts) { + return opts.firstName ? `Hi ${opts.firstName},` : 'Hi there,' + }, + message() { + return [ + `Your organization has disabled AI features for your ${settings.appName} group. This means you won't see AI Assistant or other ${settings.appName} AI tools in the editor.`, + `If you have questions about this change, please contact your group administrator.`, + ] + }, +}) + +templates.groupAiFeaturesEnabled = NoCTAEmailTemplate({ + subject() { + return `AI features have been enabled for your ${settings.appName} group` + }, + title() { + return `AI features enabled` + }, + greeting(opts) { + return opts.firstName ? `Hi ${opts.firstName},` : 'Hi there,' + }, + message() { + return [ + `Your organization has enabled AI features for your ${settings.appName} group. You now have access to AI Assistant and other ${settings.appName} AI tools in the editor.`, + `If you have questions about this change, please contact your group administrator.`, + ] + }, +}) + templates.groupDomainCapturedByGroupChanged = ctaTemplate({ subject(opts) { return opts.domainCapturedByGroup diff --git a/services/web/app/src/Features/Subscription/SubscriptionLocator.mjs b/services/web/app/src/Features/Subscription/SubscriptionLocator.mjs index 11904b1843..b6d4e9c128 100644 --- a/services/web/app/src/Features/Subscription/SubscriptionLocator.mjs +++ b/services/web/app/src/Features/Subscription/SubscriptionLocator.mjs @@ -34,13 +34,15 @@ const SubscriptionLocator = { return subscription }, - async getManagedGroupSubscriptions(userOrId) { + async getManagedGroupSubscriptions(userOrId, populate = []) { if (!Features.hasFeature('saas')) return [] + // eslint-disable-next-line no-restricted-syntax return await Subscription.find({ manager_ids: userOrId, groupPlan: true, }) .populate('admin_id', ['_id', 'email']) + .populate(populate) .exec() }, diff --git a/services/web/app/src/Features/Subscription/SubscriptionViewModelBuilder.mjs b/services/web/app/src/Features/Subscription/SubscriptionViewModelBuilder.mjs index 6cc04fa302..d3fbd4d267 100644 --- a/services/web/app/src/Features/Subscription/SubscriptionViewModelBuilder.mjs +++ b/services/web/app/src/Features/Subscription/SubscriptionViewModelBuilder.mjs @@ -82,7 +82,11 @@ async function buildUsersSubscriptionViewModel(user, locale = 'en') { SubscriptionLocator.getMemberSubscriptions(user, cb) }, managedGroupSubscriptions(cb) { - SubscriptionLocator.getManagedGroupSubscriptions(user, cb) + SubscriptionLocator.getManagedGroupSubscriptions( + user, + ['groupPolicy'], + cb + ) }, currentInstitutionsWithLicence(cb) { InstitutionsGetter.getCurrentInstitutionsWithLicence( @@ -139,6 +143,14 @@ async function buildUsersSubscriptionViewModel(user, locale = 'en') { id => id.toString() === user._id.toString() ) + const groupPolicy = group.groupPolicy + ? { + userCannotUseChat: group.groupPolicy.userCannotUseChat, + userCannotUseDropbox: group.groupPolicy.userCannotUseDropbox, + userCannotUseAIFeatures: group.groupPolicy.userCannotUseAIFeatures, + } + : undefined + const groupDataForView = { _id: group._id, planCode: group.planCode, @@ -146,6 +158,8 @@ async function buildUsersSubscriptionViewModel(user, locale = 'en') { teamName: group.teamName, admin_id: { _id: group.admin_id._id, email: group.admin_id.email }, features: group.features, + managedUsersEnabled: !!group.managedUsersEnabled, + groupPolicy, userIsGroupMember, } diff --git a/services/web/frontend/extracted-translations.json b/services/web/frontend/extracted-translations.json index bfa250759a..2b5318e23c 100644 --- a/services/web/frontend/extracted-translations.json +++ b/services/web/frontend/extracted-translations.json @@ -122,6 +122,11 @@ "ai_assistant_disabled": "", "ai_can_make_mistakes": "", "ai_features": "", + "ai_features_couldnt_be_toggled": "", + "ai_features_managed_by_overleaf_support": "", + "ai_features_off": "", + "ai_features_on": "", + "ai_features_section_subtext": "", "ai_features_unavailable_on_this_project": "", "ai_feedback_please_provide_more_detail": "", "ai_feedback_tell_us_what_was_wrong_so_we_can_improve": "", @@ -539,7 +544,10 @@ "dropbox_duplicate_project_names": "", "dropbox_duplicate_project_names_suggestion": "", "dropbox_for_link_share_projs": "", + "dropbox_integration": "", "dropbox_integration_lowercase": "", + "dropbox_integration_managed_by_overleaf_support": "", + "dropbox_integration_section_description": "", "dropbox_sync_both": "", "dropbox_sync_description": "", "dropbox_sync_error": "", @@ -665,7 +673,10 @@ "fast": "", "fast_draft": "", "fast_optimize_images": "", + "feature_controls": "", + "feature_disabled_by_organization_contact_support": "", "feature_enabled_or_disabled": "", + "feature_settings_subtext": "", "features_like_track_changes": "", "feedback": "", "figure": "", @@ -943,6 +954,9 @@ "imported_from_zotero_at_date": "", "importing": "", "importing_and_merging_changes_in_github": "", + "in_editor_chat": "", + "in_editor_chat_managed_by_overleaf_support": "", + "in_editor_chat_section_description": "", "in_order_to_match_institutional_metadata_2": "", "in_order_to_match_institutional_metadata_associated": "", "inactive": "", diff --git a/services/web/frontend/js/features/subscription/components/dashboard/managed-group-subscriptions.tsx b/services/web/frontend/js/features/subscription/components/dashboard/managed-group-subscriptions.tsx index 740f54348a..19475b998e 100644 --- a/services/web/frontend/js/features/subscription/components/dashboard/managed-group-subscriptions.tsx +++ b/services/web/frontend/js/features/subscription/components/dashboard/managed-group-subscriptions.tsx @@ -111,6 +111,16 @@ export default function ManagedGroupSubscriptions() { {managedGroupSubscriptions.map(subscription => { const isAdmin = usersEmail === subscription.admin_id.email + // Feature controls are currently rendered only for managed groups, where the admin can + // toggle AI Feature on/off. For non-managed groups, the section only displays notifications + // for features that have been disabled by Overleaf Support. + // This flag will be deleted once AI Features toggling is available to all groups. + const shouldDisplayFeatureControls = + subscription.managedUsersEnabled || + subscription.groupPolicy?.userCannotUseAIFeatures || + subscription.groupPolicy?.userCannotUseChat || + subscription.groupPolicy?.userCannotUseDropbox + return (

{t('group_management')}

@@ -159,6 +169,14 @@ export default function ManagedGroupSubscriptions() { icon="share" /> )} + {shouldDisplayFeatureControls && ( + + )} Contact Overleaf support to enable it.", "feature_enabled_or_disabled": "Feature enabled/disabled", "feature_included": "Feature included", "feature_not_included": "Feature not included", + "feature_settings_subtext": "View and manage features available to your group members", "featured": "Featured", "featured_latex_templates": "Featured LaTeX Templates", "features": "Features", @@ -1204,6 +1214,9 @@ "imported_from_zotero_at_date": "Imported from Zotero at __formattedDate__ __relativeDate__", "importing": "Importing", "importing_and_merging_changes_in_github": "Importing and merging changes in GitHub", + "in_editor_chat": "In-editor chat", + "in_editor_chat_managed_by_overleaf_support": "In-editor chat is managed by Overleaf support.", + "in_editor_chat_section_description": "Lets collaborators leave and reply to comments directly within a project.", "in_order_to_have_a_secure_account_make_sure_your_password": "To help keep your account secure, make sure your new password:", "in_order_to_match_institutional_metadata_2": "In order to match your institutional metadata, we’ve linked your account using <0>__email__.", "in_order_to_match_institutional_metadata_associated": "In order to match your institutional metadata, your account is associated with the email __email__.", diff --git a/services/web/test/frontend/features/subscription/components/dashboard/managed-group-subscriptions.test.tsx b/services/web/test/frontend/features/subscription/components/dashboard/managed-group-subscriptions.test.tsx index 9b09e7efbe..de3656104b 100644 --- a/services/web/test/frontend/features/subscription/components/dashboard/managed-group-subscriptions.test.tsx +++ b/services/web/test/frontend/features/subscription/components/dashboard/managed-group-subscriptions.test.tsx @@ -22,6 +22,7 @@ function getManagedGroupSubscriptions( groupSSO, managedUsers, }, + managedUsersEnabled: false, teamName: 'GAS', } @@ -36,6 +37,7 @@ function getManagedGroupSubscriptions( groupSSO, managedUsers, }, + managedUsersEnabled: false, teamName: 'GASWPLC', } @@ -50,6 +52,7 @@ function getManagedGroupSubscriptions( groupSSO, managedUsers, }, + managedUsersEnabled: false, teamName: 'Testing', } @@ -64,6 +67,7 @@ function getManagedGroupSubscriptions( groupSSO, managedUsers, }, + managedUsersEnabled: false, teamName: 'Testing Another', } @@ -306,4 +310,113 @@ describe('', function () { expect(screen.queryByText('Configure and manage SSO and Managed Users')).to .not.exist }) + + describe('Feature controls row', function () { + const adminEmail = 'admin@example.com' + + function makeSubscription( + overrides: Partial + ): ManagedGroupSubscription[] { + return [ + { + _id: 'sub123', + userIsGroupMember: false, + planLevelName: 'Pro', + admin_id: { email: adminEmail }, + features: { groupSSO: false, managedUsers: false }, + managedUsersEnabled: false, + teamName: 'Test Group', + ...overrides, + }, + ] + } + + describe('when managedUsersEnabled === true', function () { + it('renders the feature controls row when the user is admin', async function () { + renderWithSubscriptionDashContext(, { + metaTags: [ + { + name: 'ol-managedGroupSubscriptions', + value: makeSubscription({ managedUsersEnabled: true }), + }, + { name: 'ol-usersEmail', value: adminEmail }, + ], + }) + await screen.findByText('Feature controls') + }) + + it('does not render the feature controls row when the user is not the group admin', function () { + renderWithSubscriptionDashContext(, { + metaTags: [ + { + name: 'ol-managedGroupSubscriptions', + value: makeSubscription({ managedUsersEnabled: true }), + }, + { name: 'ol-usersEmail', value: 'other@example.com' }, + ], + }) + expect(screen.queryByText('Feature controls')).to.be.null + }) + }) + + describe('when managedUsersEnabled === false', function () { + it('renders the feature controls row when ai features are disabled', async function () { + renderWithSubscriptionDashContext(, { + metaTags: [ + { + name: 'ol-managedGroupSubscriptions', + value: makeSubscription({ + groupPolicy: { userCannotUseAIFeatures: true }, + }), + }, + { name: 'ol-usersEmail', value: adminEmail }, + ], + }) + await screen.findByText('Feature controls') + }) + + it('renders the feature controls row when chat is disabled', async function () { + renderWithSubscriptionDashContext(, { + metaTags: [ + { + name: 'ol-managedGroupSubscriptions', + value: makeSubscription({ + groupPolicy: { userCannotUseChat: true }, + }), + }, + { name: 'ol-usersEmail', value: adminEmail }, + ], + }) + await screen.findByText('Feature controls') + }) + + it('renders the feature controls row when dropbox is disabled', async function () { + renderWithSubscriptionDashContext(, { + metaTags: [ + { + name: 'ol-managedGroupSubscriptions', + value: makeSubscription({ + groupPolicy: { userCannotUseDropbox: true }, + }), + }, + { name: 'ol-usersEmail', value: adminEmail }, + ], + }) + await screen.findByText('Feature controls') + }) + + it('does not render the feature controls row when no group policies are set', function () { + renderWithSubscriptionDashContext(, { + metaTags: [ + { + name: 'ol-managedGroupSubscriptions', + value: makeSubscription({ managedUsersEnabled: false }), + }, + { name: 'ol-usersEmail', value: adminEmail }, + ], + }) + expect(screen.queryByText('Feature controls')).to.be.null + }) + }) + }) }) diff --git a/services/web/types/subscription/dashboard/subscription.ts b/services/web/types/subscription/dashboard/subscription.ts index a8d9b3d819..fdeb0f67aa 100644 --- a/services/web/types/subscription/dashboard/subscription.ts +++ b/services/web/types/subscription/dashboard/subscription.ts @@ -103,6 +103,8 @@ export type ManagedGroupSubscription = { groupSSO: boolean | null managedUsers: boolean | null } + managedUsersEnabled: boolean + groupPolicy?: GroupPolicy teamName?: string }