fix

Author: nvs119

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

@@ -18,6 +18,7 @@ const editablePreferences: (keyof UserPreferences)[] = [
   'enableGenAIFeaturesAtlasOrg',
   'enableGenAIFeaturesAtlasProject',
   'enableDataModeling',
+  'enableMyQueries',
 ];
 
 export class CompassWebPreferencesAccess implements PreferencesAccess {

packages/compass-preferences-model/src/feature-flags.ts

@@ -24,6 +24,7 @@ export type FeatureFlags = {
   showDisabledConnections: boolean;
   enableGlobalWrites: boolean;
   enableDataModeling: boolean;
+  enableMyQueries: boolean;
   enableIndexesGuidanceExp: boolean;
   showIndexesGuidanceVariant: boolean;
   enableContextMenus: boolean;
@@ -126,6 +127,16 @@ export const featureFlags: Required<{
     },
   },
 
+  /**
+   * Enable My Queries feature in Data Explorer
+   */
+  enableMyQueries: {
+    stage: 'development',
+    description: {
+      short: 'Save and manage favorite queries and aggregations',
+    },
+  },
+
   /**
    * Feature flags for Early Journey Indexes Guidance & Awareness  | Jira Epic: CLOUDP-239367
    * These are passed from MMS and not editable by user

packages/compass-web/src/entrypoint.tsx

@@ -56,6 +56,13 @@ import { WebWorkspaceTab as WelcomeWorkspaceTab } from '@mongodb-js/compass-welc
 import { useCompassWebPreferences } from './preferences';
 import { DataModelingWorkspaceTab as DataModelingWorkspace } from '@mongodb-js/compass-data-modeling';
 import { DataModelStorageServiceProviderInMemory } from '@mongodb-js/compass-data-modeling/web';
+import { WorkspaceTab as MyQueriesWorkspace } from '@mongodb-js/compass-saved-aggregations-queries';
+import {
+  FavoriteQueryStorageProvider,
+  RecentQueryStorageProvider,
+  compassFavoriteQueryStorageAccess,
+  compassRecentQueryStorageAccess,
+} from '@mongodb-js/my-queries-storage';
 import {
   CompassAssistantDrawer,
   CompassAssistantProvider,
@@ -173,61 +180,66 @@ function CompassWorkspace({
   onOpenConnectViaModal,
 }: CompassWorkspaceProps) {
   return (
-    <WorkspacesProvider
-      value={[
-        WelcomeWorkspaceTab,
-        DatabasesWorkspaceTab,
-        CollectionsWorkspaceTab,
-        CollectionWorkspace,
-        DataModelingWorkspace,
-      ]}
-    >
-      <CollectionTabsProvider
-        queryBar={CompassQueryBarPlugin}
-        tabs={[
-          CompassDocumentsPlugin,
-          CompassAggregationsPlugin,
-          CompassSchemaPlugin,
-          CompassIndexesPlugin,
-          CompassSchemaValidationPlugin,
-          CompassGlobalWritesPlugin,
-        ]}
-        modals={[
-          ExplainPlanCollectionTabModal,
-          ExportToLanguageCollectionTabModal,
-        ]}
-      >
-        <div
-          data-testid="compass-web-connected"
-          className={connectedContainerStyles}
+    <FavoriteQueryStorageProvider value={compassFavoriteQueryStorageAccess}>
+      <RecentQueryStorageProvider value={compassRecentQueryStorageAccess}>
+        <WorkspacesProvider
+          value={[
+            WelcomeWorkspaceTab,
+            DatabasesWorkspaceTab,
+            CollectionsWorkspaceTab,
+            CollectionWorkspace,
+            DataModelingWorkspace,
+            MyQueriesWorkspace,
+          ]}
         >
-          <WorkspacesPlugin
-            initialWorkspaceTabs={initialWorkspaceTabs}
-            openOnEmptyWorkspace={{ type: 'Welcome' }}
-            onActiveWorkspaceTabChange={onActiveWorkspaceTabChange}
-            renderSidebar={() => {
-              return (
-                <CompassSidebarPlugin
-                  onOpenConnectViaModal={onOpenConnectViaModal}
-                  isCompassWeb={true}
-                ></CompassSidebarPlugin>
-              );
-            }}
-            renderModals={() => {
-              return (
-                <>
-                  <CreateViewPlugin></CreateViewPlugin>
-                  <CreateNamespacePlugin></CreateNamespacePlugin>
-                  <DropNamespacePlugin></DropNamespacePlugin>
-                  <RenameCollectionPlugin></RenameCollectionPlugin>
-                  <CompassAssistantDrawer />
-                </>
-              );
-            }}
-          ></WorkspacesPlugin>
-        </div>
-      </CollectionTabsProvider>
-    </WorkspacesProvider>
+          <CollectionTabsProvider
+            queryBar={CompassQueryBarPlugin}
+            tabs={[
+              CompassDocumentsPlugin,
+              CompassAggregationsPlugin,
+              CompassSchemaPlugin,
+              CompassIndexesPlugin,
+              CompassSchemaValidationPlugin,
+              CompassGlobalWritesPlugin,
+            ]}
+            modals={[
+              ExplainPlanCollectionTabModal,
+              ExportToLanguageCollectionTabModal,
+            ]}
+          >
+            <div
+              data-testid="compass-web-connected"
+              className={connectedContainerStyles}
+            >
+              <WorkspacesPlugin
+                initialWorkspaceTabs={initialWorkspaceTabs}
+                openOnEmptyWorkspace={{ type: 'Welcome' }}
+                onActiveWorkspaceTabChange={onActiveWorkspaceTabChange}
+                renderSidebar={() => {
+                  return (
+                    <CompassSidebarPlugin
+                      onOpenConnectViaModal={onOpenConnectViaModal}
+                      isCompassWeb={true}
+                    ></CompassSidebarPlugin>
+                  );
+                }}
+                renderModals={() => {
+                  return (
+                    <>
+                      <CreateViewPlugin></CreateViewPlugin>
+                      <CreateNamespacePlugin></CreateNamespacePlugin>
+                      <DropNamespacePlugin></DropNamespacePlugin>
+                      <RenameCollectionPlugin></RenameCollectionPlugin>
+                      <CompassAssistantDrawer />
+                    </>
+                  );
+                }}
+              ></WorkspacesPlugin>
+            </div>
+          </CollectionTabsProvider>
+        </WorkspacesProvider>
+      </RecentQueryStorageProvider>
+    </FavoriteQueryStorageProvider>
   );
 }
 

packages/my-queries-storage/src/compass-query-storage.ts

@@ -15,7 +15,8 @@ export abstract class CompassQueryStorage<TSchema extends z.Schema> {
     protected readonly folder: string,
     protected readonly options: QueryStorageOptions
   ) {
-    // TODO: logic for whether we're in compass web or compass desktop
+    // Simple implementation - use FileUserData for now
+    // The use-atlas-user-data branch will add proper Atlas integration
     this.userData = new FileUserData(schemaValidator, folder, {
       basePath: options.basepath,
       serialize: (content) => EJSON.stringify(content, undefined, 2),

packages/my-queries-storage/src/index.ts

@@ -15,6 +15,13 @@ export {
 } from './compass-query-storage';
 export type { RecentQuery, FavoriteQuery } from './query-storage-schema';
 
+// Export providers for use in applications
+export {
+  FavoriteQueryStorageProvider,
+  RecentQueryStorageProvider,
+  PipelineStorageProvider,
+} from './provider';
+
 // These are exported to aid in testing
 export const compassFavoriteQueryStorageAccess: FavoriteQueryStorageAccess = {
   getStorage() {