Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions packages/atlas-service/src/atlas-service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@ export class AtlasService {
const authHeaders = await this.authService.getAuthHeaders();
return this.fetch(url, {
...init,
credentials: 'include', // Include cookies for cross-origin requests (needed for local dev)
headers: {
...init?.headers,
...authHeaders,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ export type InternalUserPreferences = {
id: string;
cloudFeatureRolloutAccess?: {
GEN_AI_COMPASS?: boolean;
MY_QUERIES_DATA_EXPLORER?: boolean;
};
lastKnownVersion: string;
highestInstalledVersion?: string;
Expand Down Expand Up @@ -470,6 +471,7 @@ export const storedUserPreferencesProps: Required<{
validator: z
.object({
GEN_AI_COMPASS: z.boolean().optional(),
MY_QUERIES_DATA_EXPLORER: z.boolean().optional(),
})
.optional(),
type: 'object',
Expand Down
12 changes: 10 additions & 2 deletions packages/compass-query-bar/src/components/query-bar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,10 @@ import {
createAIPlaceholderHTMLPlaceholder,
} from '@mongodb-js/compass-generative-ai';
import { connect } from '../stores/context';
import { useIsAIFeatureEnabled } from 'compass-preferences-model/provider';
import {
useIsAIFeatureEnabled,
usePreference,
} from 'compass-preferences-model/provider';
import { useTelemetry } from '@mongodb-js/compass-telemetry/provider';

import {
Expand Down Expand Up @@ -202,8 +205,13 @@ export const QueryBar: React.FunctionComponent<QueryBarProps> = ({

const favoriteQueryStorageAvailable = !!useFavoriteQueryStorageAccess();
const recentQueryStorageAvailable = !!useRecentQueryStorageAccess();
const cloudFeatureRolloutAccess = usePreference('cloudFeatureRolloutAccess');
const isMyQueriesEnabled =
cloudFeatureRolloutAccess?.MY_QUERIES_DATA_EXPLORER ?? false;
const enableSavedAggregationsQueries =
favoriteQueryStorageAvailable && recentQueryStorageAvailable;
favoriteQueryStorageAvailable &&
recentQueryStorageAvailable &&
isMyQueriesEnabled;

return (
<form
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,9 +102,12 @@ export function Navigation({
const { openMyQueriesWorkspace, openDataModelingWorkspace } =
useOpenWorkspace();
const isDataModelingEnabled = usePreference('enableDataModeling');
const cloudFeatureRolloutAccess = usePreference('cloudFeatureRolloutAccess');
const isMyQueriesEnabled =
cloudFeatureRolloutAccess?.MY_QUERIES_DATA_EXPLORER ?? false;
return (
<div>
{hasWorkspacePlugin('My Queries') && (
{hasWorkspacePlugin('My Queries') && isMyQueriesEnabled && (
<NavigationItem
onClick={openMyQueriesWorkspace}
glyph="CurlyBraces"
Expand Down
Loading