From ecb39a6b84a7d755bd9fa21998ab7f5a85afcb51 Mon Sep 17 00:00:00 2001 From: Jimmy Domagala-Tang Date: Thu, 5 Dec 2024 17:27:08 -0500 Subject: [PATCH] Merge pull request #22360 from overleaf/jdt-fix-admin-panel-tests-ai feat: updating test defaults GitOrigin-RevId: 2be457097dcdebe13dd211f2ea24b45573b7744a --- services/web/app/src/Features/Subscription/FeaturesUpdater.js | 2 +- services/web/app/src/models/User.js | 2 +- .../components/notifications/user-notifications.tsx | 4 ---- services/web/test/acceptance/config/settings.test.defaults.js | 4 ++++ 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/services/web/app/src/Features/Subscription/FeaturesUpdater.js b/services/web/app/src/Features/Subscription/FeaturesUpdater.js index 70bcac0ed1..8b188183eb 100644 --- a/services/web/app/src/Features/Subscription/FeaturesUpdater.js +++ b/services/web/app/src/Features/Subscription/FeaturesUpdater.js @@ -176,7 +176,7 @@ function _aiAddOnFeatures(subscription) { if (subscription?.addOns?.some(addOn => addOn.addOnCode === AI_ADD_ON_CODE)) { return { aiErrorAssistant: true } } else { - return { aiErrorAssistant: false } + return {} } } diff --git a/services/web/app/src/models/User.js b/services/web/app/src/models/User.js index 707804ca63..2d1b23929f 100644 --- a/services/web/app/src/models/User.js +++ b/services/web/app/src/models/User.js @@ -137,9 +137,9 @@ const UserSchema = new Schema( type: Boolean, default: Settings.defaultFeatures.symbolPalette, }, - // labs feature, which shouldnt have a default as we havent decided pricing model yet aiErrorAssistant: { type: Boolean, + default: false, }, }, featuresOverrides: [ diff --git a/services/web/frontend/js/features/project-list/components/notifications/user-notifications.tsx b/services/web/frontend/js/features/project-list/components/notifications/user-notifications.tsx index 0f638aaa08..0834a46c4b 100644 --- a/services/web/frontend/js/features/project-list/components/notifications/user-notifications.tsx +++ b/services/web/frontend/js/features/project-list/components/notifications/user-notifications.tsx @@ -12,10 +12,6 @@ import customLocalStorage from '../../../../infrastructure/local-storage' import { sendMB } from '../../../../infrastructure/event-tracking' import GeoBanners from './geo-banners' import AccessibilitySurveyBanner from './accessibility-survey-banner' -import { - DeprecatedBrowser, - isDeprecatedBrowser, -} from '@/shared/components/deprecated-browser' const [enrollmentNotificationModule] = importOverleafModules( 'managedGroupSubscriptionEnrollmentNotification' diff --git a/services/web/test/acceptance/config/settings.test.defaults.js b/services/web/test/acceptance/config/settings.test.defaults.js index 72ca6c3616..b0db7f7449 100644 --- a/services/web/test/acceptance/config/settings.test.defaults.js +++ b/services/web/test/acceptance/config/settings.test.defaults.js @@ -115,6 +115,7 @@ module.exports = { compileGroup: 'standard', trackChanges: false, symbolPalette: false, + aiErrorAssistant: false, }, personal: { collaborators: 1, @@ -131,6 +132,7 @@ module.exports = { compileGroup: 'standard', trackChanges: false, symbolPalette: false, + aiErrorAssistant: false, }, collaborator: { collaborators: 10, @@ -147,6 +149,7 @@ module.exports = { compileGroup: 'priority', trackChanges: true, symbolPalette: true, + aiErrorAssistant: false, }, professional: { collaborators: -1, @@ -163,6 +166,7 @@ module.exports = { compileGroup: 'priority', trackChanges: true, symbolPalette: true, + aiErrorAssistant: false, }, }),