Skip to content

Commit f508d7e

Browse files
authored
fix(preferences): use one enableGenAISampleDocumentPassing preference CLOUDP-346490 (#7351)
1 parent 63de775 commit f508d7e

File tree

8 files changed

+14
-32
lines changed

8 files changed

+14
-32
lines changed

packages/compass-e2e-tests/tests/atlas-cloud/collection-ai-query.test.ts

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,7 @@ describe('Collection ai query', function () {
4444
);
4545

4646
await browser.setFeature('enableGenAIFeaturesAtlasProject', true);
47-
await browser.setFeature(
48-
'enableGenAISampleDocumentPassingOnAtlasProject',
49-
true
50-
);
47+
await browser.setFeature('enableGenAISampleDocumentPassing', true);
5148
await browser.setFeature('enableGenAIFeaturesAtlasOrg', true);
5249
await browser.setFeature('optInGenAIFeatures', true);
5350
});
@@ -165,10 +162,7 @@ describe('Collection ai query', function () {
165162
);
166163

167164
await browser.setFeature('enableGenAIFeaturesAtlasProject', true);
168-
await browser.setFeature(
169-
'enableGenAISampleDocumentPassingOnAtlasProject',
170-
true
171-
);
165+
await browser.setFeature('enableGenAISampleDocumentPassing', true);
172166
await browser.setFeature('enableGenAIFeaturesAtlasOrg', false);
173167
await browser.setFeature('optInGenAIFeatures', true);
174168
});

packages/compass-generative-ai/src/components/ai-optin-modal.spec.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,6 @@ describe('AIOptInModal Component', function () {
127127
it('should show warning banner when AI features are disabled', async function () {
128128
await mockPreferences.savePreferences({
129129
enableGenAIFeaturesAtlasProject: false,
130-
enableGenAISampleDocumentPassingOnAtlasProject: false,
131130
});
132131
render(
133132
<PreferencesProvider value={mockPreferences}>
@@ -147,7 +146,7 @@ describe('AIOptInModal Component', function () {
147146
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 () {
148147
await mockPreferences.savePreferences({
149148
enableGenAIFeaturesAtlasProject: true,
150-
enableGenAISampleDocumentPassingOnAtlasProject: false,
149+
enableGenAISampleDocumentPassing: false,
151150
});
152151
render(
153152
<PreferencesProvider value={mockPreferences}>
@@ -169,7 +168,7 @@ describe('AIOptInModal Component', function () {
169168
it('should show info banner with correct copy when both project settings are enabled', async function () {
170169
await mockPreferences.savePreferences({
171170
enableGenAIFeaturesAtlasProject: true,
172-
enableGenAISampleDocumentPassingOnAtlasProject: true,
171+
enableGenAISampleDocumentPassing: true,
173172
});
174173
render(
175174
<PreferencesProvider value={mockPreferences}>

packages/compass-generative-ai/src/components/ai-optin-modal.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ export const AIOptInModal: React.FunctionComponent<OptInModalProps> = ({
174174
}) => {
175175
const isProjectAIEnabled = usePreference('enableGenAIFeaturesAtlasProject');
176176
const isSampleDocumentPassingEnabled = usePreference(
177-
'enableGenAISampleDocumentPassingOnAtlasProject'
177+
'enableGenAISampleDocumentPassing'
178178
);
179179
const track = useTelemetry();
180180
const darkMode = useDarkMode();

packages/compass-preferences-model/src/compass-web-preferences-access.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ const editablePreferences: (keyof UserPreferences)[] = [
1414
'showIndexesGuidanceVariant',
1515

1616
// Exposed for testing purposes.
17-
'enableGenAISampleDocumentPassingOnAtlasProject',
17+
'enableGenAISampleDocumentPassing',
1818
'enableGenAIFeaturesAtlasOrg',
1919
'enableGenAIFeaturesAtlasProject',
2020
'enableDataModeling',

packages/compass-preferences-model/src/preferences-schema.tsx

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,6 @@ export type NonUserPreferences = {
153153

154154
export type AtlasProjectPreferences = {
155155
enableGenAIFeaturesAtlasProject: boolean;
156-
enableGenAISampleDocumentPassingOnAtlasProject: boolean;
157156
};
158157

159158
export type AtlasOrgPreferences = {
@@ -1000,16 +999,6 @@ export const storedUserPreferencesProps: Required<{
1000999
validator: z.boolean().default(true),
10011000
type: 'boolean',
10021001
},
1003-
enableGenAISampleDocumentPassingOnAtlasProject: {
1004-
ui: false,
1005-
cli: true,
1006-
global: true,
1007-
description: {
1008-
short: 'Enable Gen AI Sample Document Passing on Atlas Project Level',
1009-
},
1010-
validator: z.boolean().default(true),
1011-
type: 'boolean',
1012-
},
10131002
enableGenAIFeaturesAtlasOrg: {
10141003
ui: false,
10151004
cli: true,

packages/compass-web/sandbox/index.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ const App = () => {
4646
csrfToken,
4747
csrfTime,
4848
enableGenAIFeaturesAtlasProject,
49-
enableGenAISampleDocumentPassingOnAtlasProject,
49+
enableGenAISampleDocumentPassing,
5050
enableGenAIFeaturesAtlasOrg,
5151
optInGenAIFeatures,
5252
} = projectParams ?? {};
@@ -131,8 +131,8 @@ const App = () => {
131131
showDisabledConnections: true,
132132
enableGenAIFeaturesAtlasProject:
133133
isAtlas && !!enableGenAIFeaturesAtlasProject,
134-
enableGenAISampleDocumentPassingOnAtlasProject:
135-
isAtlas && !!enableGenAISampleDocumentPassingOnAtlasProject,
134+
enableGenAISampleDocumentPassing:
135+
isAtlas && !!enableGenAISampleDocumentPassing,
136136
enableGenAIFeaturesAtlasOrg:
137137
isAtlas && !!enableGenAIFeaturesAtlasOrg,
138138
optInGenAIFeatures: isAtlas && !!optInGenAIFeatures,

packages/compass-web/sandbox/sandbox-atlas-sign-in.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ type ProjectParams = {
1717
csrfToken: string;
1818
csrfTime: string;
1919
enableGenAIFeaturesAtlasProject: boolean;
20-
enableGenAISampleDocumentPassingOnAtlasProject: boolean;
20+
enableGenAISampleDocumentPassing: boolean;
2121
enableGenAIFeaturesAtlasOrg: boolean;
2222
optInGenAIFeatures: boolean;
2323
};
@@ -131,9 +131,9 @@ export function useAtlasProxySignIn(): AtlasLoginReturnValue {
131131
csrfTime,
132132
optInGenAIFeatures: isOptedIntoDataExplorerGenAIFeatures,
133133
enableGenAIFeaturesAtlasOrg: genAIFeaturesEnabled,
134-
enableGenAISampleDocumentPassingOnAtlasProject:
135-
groupEnabledFeatureFlags.includes(
136-
'ENABLE_DATA_EXPLORER_GEN_AI_SAMPLE_DOCUMENT_PASSING'
134+
enableGenAISampleDocumentPassing:
135+
!groupEnabledFeatureFlags.includes(
136+
'DISABLE_DATA_EXPLORER_GEN_AI_SAMPLE_DOCUMENT_PASSING'
137137
),
138138
enableGenAIFeaturesAtlasProject: groupEnabledFeatureFlags.includes(
139139
'ENABLE_DATA_EXPLORER_GEN_AI_FEATURES'

packages/compass-web/src/preferences.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ export function useCompassWebPreferences(
4444
enableImportExport: false,
4545
enableGenAIFeatures: true,
4646
enableGenAIFeaturesAtlasProject: false,
47-
enableGenAISampleDocumentPassingOnAtlasProject: false,
47+
enableGenAISampleDocumentPassing: false,
4848
enableGenAIFeaturesAtlasOrg: false,
4949
enablePerformanceAdvisorBanner: true,
5050
enableMyQueries: false,

0 commit comments

Comments
 (0)