diff --git a/packages/compass-e2e-tests/tests/atlas-cloud/collection-ai-query.test.ts b/packages/compass-e2e-tests/tests/atlas-cloud/collection-ai-query.test.ts index 374c50d9d9e..657c3a435bb 100644 --- a/packages/compass-e2e-tests/tests/atlas-cloud/collection-ai-query.test.ts +++ b/packages/compass-e2e-tests/tests/atlas-cloud/collection-ai-query.test.ts @@ -44,10 +44,7 @@ describe('Collection ai query', function () { ); await browser.setFeature('enableGenAIFeaturesAtlasProject', true); - await browser.setFeature( - 'enableGenAISampleDocumentPassingOnAtlasProject', - true - ); + await browser.setFeature('enableGenAISampleDocumentPassing', true); await browser.setFeature('enableGenAIFeaturesAtlasOrg', true); await browser.setFeature('optInGenAIFeatures', true); }); @@ -165,10 +162,7 @@ describe('Collection ai query', function () { ); await browser.setFeature('enableGenAIFeaturesAtlasProject', true); - await browser.setFeature( - 'enableGenAISampleDocumentPassingOnAtlasProject', - true - ); + await browser.setFeature('enableGenAISampleDocumentPassing', true); await browser.setFeature('enableGenAIFeaturesAtlasOrg', false); await browser.setFeature('optInGenAIFeatures', true); }); diff --git a/packages/compass-generative-ai/src/components/ai-optin-modal.spec.tsx b/packages/compass-generative-ai/src/components/ai-optin-modal.spec.tsx index 8e624f935c3..36ad18a8f59 100644 --- a/packages/compass-generative-ai/src/components/ai-optin-modal.spec.tsx +++ b/packages/compass-generative-ai/src/components/ai-optin-modal.spec.tsx @@ -127,7 +127,6 @@ describe('AIOptInModal Component', function () { it('should show warning banner when AI features are disabled', async function () { await mockPreferences.savePreferences({ enableGenAIFeaturesAtlasProject: false, - enableGenAISampleDocumentPassingOnAtlasProject: false, }); render( @@ -147,7 +146,7 @@ describe('AIOptInModal Component', function () { it('should show info banner with correct copy when only the "Sending Sample Field Values in DE Gen AI Features" setting is disabled', async function () { await mockPreferences.savePreferences({ enableGenAIFeaturesAtlasProject: true, - enableGenAISampleDocumentPassingOnAtlasProject: false, + enableGenAISampleDocumentPassing: false, }); render( @@ -169,7 +168,7 @@ describe('AIOptInModal Component', function () { it('should show info banner with correct copy when both project settings are enabled', async function () { await mockPreferences.savePreferences({ enableGenAIFeaturesAtlasProject: true, - enableGenAISampleDocumentPassingOnAtlasProject: true, + enableGenAISampleDocumentPassing: true, }); render( diff --git a/packages/compass-generative-ai/src/components/ai-optin-modal.tsx b/packages/compass-generative-ai/src/components/ai-optin-modal.tsx index b29694ffb57..175be53c93d 100644 --- a/packages/compass-generative-ai/src/components/ai-optin-modal.tsx +++ b/packages/compass-generative-ai/src/components/ai-optin-modal.tsx @@ -174,7 +174,7 @@ export const AIOptInModal: React.FunctionComponent = ({ }) => { const isProjectAIEnabled = usePreference('enableGenAIFeaturesAtlasProject'); const isSampleDocumentPassingEnabled = usePreference( - 'enableGenAISampleDocumentPassingOnAtlasProject' + 'enableGenAISampleDocumentPassing' ); const track = useTelemetry(); const darkMode = useDarkMode(); diff --git a/packages/compass-preferences-model/src/compass-web-preferences-access.ts b/packages/compass-preferences-model/src/compass-web-preferences-access.ts index 2e265de6207..48b4fe92b63 100644 --- a/packages/compass-preferences-model/src/compass-web-preferences-access.ts +++ b/packages/compass-preferences-model/src/compass-web-preferences-access.ts @@ -14,7 +14,7 @@ const editablePreferences: (keyof UserPreferences)[] = [ 'showIndexesGuidanceVariant', // Exposed for testing purposes. - 'enableGenAISampleDocumentPassingOnAtlasProject', + 'enableGenAISampleDocumentPassing', 'enableGenAIFeaturesAtlasOrg', 'enableGenAIFeaturesAtlasProject', 'enableDataModeling', diff --git a/packages/compass-preferences-model/src/preferences-schema.tsx b/packages/compass-preferences-model/src/preferences-schema.tsx index 6b8ead5b276..a14c23463e5 100644 --- a/packages/compass-preferences-model/src/preferences-schema.tsx +++ b/packages/compass-preferences-model/src/preferences-schema.tsx @@ -153,7 +153,6 @@ export type NonUserPreferences = { export type AtlasProjectPreferences = { enableGenAIFeaturesAtlasProject: boolean; - enableGenAISampleDocumentPassingOnAtlasProject: boolean; }; export type AtlasOrgPreferences = { @@ -1000,16 +999,6 @@ export const storedUserPreferencesProps: Required<{ validator: z.boolean().default(true), type: 'boolean', }, - enableGenAISampleDocumentPassingOnAtlasProject: { - ui: false, - cli: true, - global: true, - description: { - short: 'Enable Gen AI Sample Document Passing on Atlas Project Level', - }, - validator: z.boolean().default(true), - type: 'boolean', - }, enableGenAIFeaturesAtlasOrg: { ui: false, cli: true, diff --git a/packages/compass-web/sandbox/index.tsx b/packages/compass-web/sandbox/index.tsx index addeb660aaa..dd672cc805e 100644 --- a/packages/compass-web/sandbox/index.tsx +++ b/packages/compass-web/sandbox/index.tsx @@ -46,7 +46,7 @@ const App = () => { csrfToken, csrfTime, enableGenAIFeaturesAtlasProject, - enableGenAISampleDocumentPassingOnAtlasProject, + enableGenAISampleDocumentPassing, enableGenAIFeaturesAtlasOrg, optInGenAIFeatures, } = projectParams ?? {}; @@ -131,8 +131,8 @@ const App = () => { showDisabledConnections: true, enableGenAIFeaturesAtlasProject: isAtlas && !!enableGenAIFeaturesAtlasProject, - enableGenAISampleDocumentPassingOnAtlasProject: - isAtlas && !!enableGenAISampleDocumentPassingOnAtlasProject, + enableGenAISampleDocumentPassing: + isAtlas && !!enableGenAISampleDocumentPassing, enableGenAIFeaturesAtlasOrg: isAtlas && !!enableGenAIFeaturesAtlasOrg, optInGenAIFeatures: isAtlas && !!optInGenAIFeatures, diff --git a/packages/compass-web/sandbox/sandbox-atlas-sign-in.tsx b/packages/compass-web/sandbox/sandbox-atlas-sign-in.tsx index c1c257881c7..27d6e6bf900 100644 --- a/packages/compass-web/sandbox/sandbox-atlas-sign-in.tsx +++ b/packages/compass-web/sandbox/sandbox-atlas-sign-in.tsx @@ -17,7 +17,7 @@ type ProjectParams = { csrfToken: string; csrfTime: string; enableGenAIFeaturesAtlasProject: boolean; - enableGenAISampleDocumentPassingOnAtlasProject: boolean; + enableGenAISampleDocumentPassing: boolean; enableGenAIFeaturesAtlasOrg: boolean; optInGenAIFeatures: boolean; }; @@ -131,9 +131,9 @@ export function useAtlasProxySignIn(): AtlasLoginReturnValue { csrfTime, optInGenAIFeatures: isOptedIntoDataExplorerGenAIFeatures, enableGenAIFeaturesAtlasOrg: genAIFeaturesEnabled, - enableGenAISampleDocumentPassingOnAtlasProject: - groupEnabledFeatureFlags.includes( - 'ENABLE_DATA_EXPLORER_GEN_AI_SAMPLE_DOCUMENT_PASSING' + enableGenAISampleDocumentPassing: + !groupEnabledFeatureFlags.includes( + 'DISABLE_DATA_EXPLORER_GEN_AI_SAMPLE_DOCUMENT_PASSING' ), enableGenAIFeaturesAtlasProject: groupEnabledFeatureFlags.includes( 'ENABLE_DATA_EXPLORER_GEN_AI_FEATURES' diff --git a/packages/compass-web/src/preferences.tsx b/packages/compass-web/src/preferences.tsx index b2b45fae3aa..d7ee2c5f2a2 100644 --- a/packages/compass-web/src/preferences.tsx +++ b/packages/compass-web/src/preferences.tsx @@ -44,7 +44,7 @@ export function useCompassWebPreferences( enableImportExport: false, enableGenAIFeatures: true, enableGenAIFeaturesAtlasProject: false, - enableGenAISampleDocumentPassingOnAtlasProject: false, + enableGenAISampleDocumentPassing: false, enableGenAIFeaturesAtlasOrg: false, enablePerformanceAdvisorBanner: true, enableMyQueries: false,