Merge remote-tracking branch 'origin/main' into beta-releases

Author: github-actions[bot]

THIRD-PARTY-NOTICES.md

@@ -1,5 +1,5 @@
 The following third-party software is used by and included in **Mongodb Compass**.
-This document was automatically generated on Fri Feb 28 2025.
+This document was automatically generated on Sun Mar 02 2025.
 
 ## List of dependencies
 

docs/tracking-plan.md

@@ -7,7 +7,7 @@
 > the tracking plan for the specific Compass version you can use the following
 > URL: `https://github.com/mongodb-js/compass/blob/<compass version>/docs/tracking-plan.md`
 
-Generated on Fri, Feb 28, 2025
+Generated on Sun, Mar 2, 2025
 
 ## Table of Contents
 
@@ -1927,7 +1927,7 @@ This event is fired when user shares the schema.
 
 - **has_schema** (required): `boolean`
   - Indicates whether the schema was analyzed before sharing.
-- **format** (required): `"standardJSON" | "mongoDBJSON" | "extendedJSON" | "legacyJSON"`
+- **format** (required): `"standardJSON" | "mongoDBJSON" | "expandedJSON" | "legacyJSON"`
 - **source** (required): `"app_menu" | "schema_tab"`
 - **schema_width** (required): `number`
   - The number of fields at the top level.
@@ -1950,7 +1950,7 @@ This event is fired when user shares the schema.
 - **has_schema** (required): `boolean`
   - Indicates whether the schema was analyzed before sharing.
 - **schema_length** (required): `number`
-- **format** (required): `"standardJSON" | "mongoDBJSON" | "extendedJSON" | "legacyJSON"`
+- **format** (required): `"standardJSON" | "mongoDBJSON" | "expandedJSON" | "legacyJSON"`
 - **stage** (required): `string`
 - **is_compass_web** (optional): `true | undefined`
 - **connection_id** (optional): `string | undefined`

packages/atlas-service/src/atlas-service.ts

@@ -36,6 +36,21 @@ function shouldAddCSRFHeaders(method = 'get') {
   return !/^(get|head|options|trace)$/.test(method.toLowerCase());
 }
 
+function getAutomationAgentClusterId(
+  atlasMetadata: Pick<
+    AtlasClusterMetadata,
+    'clusterUniqueId' | 'metricsId' | 'metricsType'
+  >
+): { clusterId: string } | { serverlessId: string } | { flexId: string } {
+  if (atlasMetadata.metricsType === 'flex') {
+    return { flexId: atlasMetadata.clusterUniqueId };
+  }
+  if (atlasMetadata.metricsType === 'serverless') {
+    return { serverlessId: atlasMetadata.clusterUniqueId };
+  }
+  return { clusterId: atlasMetadata.metricsId };
+}
+
 export class AtlasService {
   private config: AtlasServiceConfig;
   constructor(
@@ -121,10 +136,7 @@ export class AtlasService {
     opType: string,
     opBody: Record<string, unknown>
   ): Promise<{ _id: string; requestType: string } | undefined> {
-    const opBodyClusterId =
-      atlasMetadata.metricsType === 'serverless'
-        ? { serverlessId: atlasMetadata.clusterUniqueId }
-        : { clusterId: atlasMetadata.metricsId };
+    const opBodyClusterId = getAutomationAgentClusterId(atlasMetadata);
     const requestUrl = this.regionalizedCloudEndpoint(
       atlasMetadata,
       `/explorer/v1/groups/${atlasMetadata.projectId}/requests/${opType}`

packages/compass-connections/src/utils/connection-supports.spec.ts

@@ -145,7 +145,7 @@ const mockConnections = [
       clusterName: 'clusterName',
       regionalBaseUrl: 'https://example.com',
       metricsId: 'metricsId',
-      metricsType: 'replicaSet',
+      metricsType: 'flex',
       instanceSize: 'FLEX',
       clusterType: 'REPLICASET',
       clusterUniqueId: 'clusterUniqueId',

packages/compass-connections/src/utils/connection-supports.ts

@@ -9,14 +9,6 @@ function isFreeOrSharedTierCluster(instanceSize: string | undefined): boolean {
   return ['M0', 'M2', 'M5'].includes(instanceSize);
 }
 
-function isFlexTier(instanceSize: string | undefined): boolean {
-  if (!instanceSize) {
-    return false;
-  }
-
-  return instanceSize === 'FLEX';
-}
-
 function supportsRollingIndexCreation(connectionInfo: ConnectionInfo) {
   const atlasMetadata = connectionInfo.atlasMetadata;
 
@@ -26,9 +18,8 @@ function supportsRollingIndexCreation(connectionInfo: ConnectionInfo) {
 
   const { metricsType, instanceSize } = atlasMetadata;
   return (
-    !isFreeOrSharedTierCluster(instanceSize) &&
-    !isFlexTier(instanceSize) &&
-    (metricsType === 'cluster' || metricsType === 'replicaSet')
+    (metricsType === 'cluster' || metricsType === 'replicaSet') &&
+    !isFreeOrSharedTierCluster(instanceSize)
   );
 }
 

packages/compass-e2e-tests/helpers/selectors.ts

@@ -1026,7 +1026,7 @@ export const ExportSchemaButton = '[data-testid="open-schema-export-button"]';
 export const ExportSchemaFormatOptions =
   '[data-testid="export-schema-format-type-box-group"]';
 export const exportSchemaFormatOption = (
-  option: 'standardJSON' | 'mongoDBJSON' | 'extendedJSON'
+  option: 'standardJSON' | 'mongoDBJSON' | 'expandedJSON'
 ) => `label[for="export-schema-format-${option}-button"]`;
 export const ExportSchemaOutput = '[data-testid="export-schema-content"]';
 export const ExportSchemaDownloadButton =

packages/compass-e2e-tests/tests/collection-schema-tab.test.ts

@@ -208,17 +208,19 @@ describe('Collection schema tab', function () {
 
       const content = readFileSync(filePath, 'utf-8');
       expect(JSON.parse(content)).to.deep.equal({
-        bsonType: 'object',
-        required: ['_id', 'i', 'j'],
-        properties: {
-          _id: {
-            bsonType: 'objectId',
-          },
-          i: {
-            bsonType: 'int',
-          },
-          j: {
-            bsonType: 'int',
+        $jsonSchema: {
+          bsonType: 'object',
+          required: ['_id', 'i', 'j'],
+          properties: {
+            _id: {
+              bsonType: 'objectId',
+            },
+            i: {
+              bsonType: 'int',
+            },
+            j: {
+              bsonType: 'int',
+            },
           },
         },
       });

packages/compass-indexes/src/modules/rolling-indexes-service.ts

@@ -67,9 +67,12 @@ export class RollingIndexesService {
 
     // Not possible to do through UI, doing a pre-check here to avoid dealing
     // with payload variations based on metricsType later
-    if (atlasMetadata.metricsType === 'serverless') {
+    if (
+      atlasMetadata.metricsType === 'serverless' ||
+      atlasMetadata.metricsType === 'flex'
+    ) {
       throw new Error(
-        "Serverless clusters don't support rolling index build creation"
+        'Flex clusters do not support rolling index build creation'
       );
     }
 

packages/compass-schema/src/components/compass-schema.tsx

@@ -1,4 +1,4 @@
-import React, { useCallback } from 'react';
+import React, { useCallback, useState } from 'react';
 import type { Schema as MongodbSchema } from 'mongodb-schema';
 import { connect } from 'react-redux';
 import type { AnalysisState } from '../constants/analysis-states';
@@ -7,11 +7,9 @@ import {
   ANALYSIS_STATE_ANALYZING,
   ANALYSIS_STATE_COMPLETE,
 } from '../constants/analysis-states';
-
-import { SchemaToolbar } from './schema-toolbar/schema-toolbar';
+import SchemaToolbar from './schema-toolbar';
 import Field from './field';
 import { ZeroGraphic } from './zero-graphic';
-
 import {
   Button,
   CancelLoader,
@@ -36,15 +34,10 @@ import { getAtlasPerformanceAdvisorLink } from '../utils';
 import { useIsLastAppliedQueryOutdated } from '@mongodb-js/compass-query-bar';
 import { useTelemetry } from '@mongodb-js/compass-telemetry/provider';
 import type { RootState } from '../stores/store';
-import {
-  analysisErrorDismissed,
-  type SchemaAnalysisError,
-  startAnalysis,
-  stopAnalysis,
-} from '../stores/schema-analysis-reducer';
+import { startAnalysis, stopAnalysis } from '../stores/schema-analysis-reducer';
 import { openExportSchema } from '../stores/schema-export-reducer';
 import ExportSchemaModal from './export-schema-modal';
-import ExportSchemaLegacyBanner from './export-schema-legacy-banner';
+import ExportSchemaLegacyModal from './export-schema-legacy-modal';
 
 const rootStyles = css({
   width: '100%',
@@ -376,29 +369,23 @@ const PerformanceAdvisorBanner = () => {
 
 const Schema: React.FunctionComponent<{
   analysisState: AnalysisState;
-  error?: SchemaAnalysisError;
-  maxTimeMS?: number;
+  isExportSchemaModalOpen: boolean;
   schema: MongodbSchema | null;
-  count?: number;
-  resultId?: string;
-  onExportSchemaClicked: () => void;
   onStartAnalysis: () => Promise<void>;
   onStopAnalysis: () => void;
-  onDismissError: () => void;
 }> = ({
   analysisState,
-  error,
+  isExportSchemaModalOpen,
   schema,
-  resultId,
-  onExportSchemaClicked,
   onStartAnalysis,
   onStopAnalysis,
-  onDismissError,
 }) => {
   const onApplyClicked = useCallback(() => {
     void onStartAnalysis();
   }, [onStartAnalysis]);
 
+  const [showLegacyExportTooltip, setShowLegacyExportTooltip] = useState(false);
+
   const outdated = useIsLastAppliedQueryOutdated('schema');
 
   const enablePerformanceAdvisorBanner = usePreference(
@@ -414,14 +401,14 @@ const Schema: React.FunctionComponent<{
           toolbar={
             <SchemaToolbar
               onAnalyzeSchemaClicked={onApplyClicked}
-              onExportSchemaClicked={onExportSchemaClicked}
               onResetClicked={onApplyClicked}
-              analysisState={analysisState}
-              error={error}
-              onDismissError={onDismissError}
+              // Show the tooltip to indicate the new export button when
+              // the export modal is closed.
+              showLegacyExportTooltip={
+                showLegacyExportTooltip && !isExportSchemaModalOpen
+              }
+              setShowLegacyExportTooltip={setShowLegacyExportTooltip}
               isOutdated={!!outdated}
-              sampleSize={schema ? schema.count : 0}
-              schemaResultId={resultId || ''}
             />
           }
         >
@@ -440,22 +427,24 @@ const Schema: React.FunctionComponent<{
         </WorkspaceContainer>
       </div>
       {enableExportSchema && <ExportSchemaModal />}
-      {enableExportSchema && <ExportSchemaLegacyBanner />}
+      {enableExportSchema && (
+        <ExportSchemaLegacyModal
+          setShowLegacyExportTooltip={setShowLegacyExportTooltip}
+        />
+      )}
     </>
   );
 };
 
 export default connect(
   (state: RootState) => ({
     analysisState: state.schemaAnalysis.analysisState,
-    error: state.schemaAnalysis.error,
+    isExportSchemaModalOpen: state.schemaExport.isOpen,
     schema: state.schemaAnalysis.schema,
-    resultId: state.schemaAnalysis.resultId,
   }),
   {
     onStartAnalysis: startAnalysis,
     onStopAnalysis: () => stopAnalysis(),
     onExportSchemaClicked: openExportSchema,
-    onDismissError: analysisErrorDismissed,
   }
 )(Schema);

packages/compass-schema/src/components/export-schema-legacy-banner.tsx renamed to packages/compass-schema/src/components/export-schema-legacy-modal.tsx

@@ -16,7 +16,7 @@ import {
   confirmedExportLegacySchemaToClipboard,
   switchToSchemaExport,
   SchemaExportActions,
-  stopShowingLegacyBanner,
+  stopShowingLegacyModal,
 } from '../stores/schema-export-reducer';
 
 const SchemaExportSVG = () => (
@@ -463,28 +463,42 @@ const optionHeaderStyles = css({
   margin: '0px',
 });
 
-const ExportSchemaLegacyBanner: React.FunctionComponent<{
+const ExportSchemaLegacyModal: React.FunctionComponent<{
   isOpen: boolean;
   onClose: () => void;
   onLegacyShare: () => void;
   onSwitchToSchemaExport: () => void;
-  stopShowingLegacyBanner: (choice: 'legacy' | 'export') => void;
+  setShowLegacyExportTooltip: (show: boolean) => void;
+  stopShowingLegacyModal: (choice: 'legacy' | 'export') => void;
 }> = ({
   isOpen,
   onClose,
   onLegacyShare,
   onSwitchToSchemaExport,
-  stopShowingLegacyBanner,
+  setShowLegacyExportTooltip,
+  stopShowingLegacyModal,
 }) => {
   const [dontShowAgainChecked, setDontShowAgainChecked] = useState(false);
   const handleLegacyShare = useCallback(() => {
-    if (dontShowAgainChecked) stopShowingLegacyBanner('legacy');
+    if (dontShowAgainChecked) stopShowingLegacyModal('legacy');
     onLegacyShare();
-  }, [onLegacyShare, dontShowAgainChecked, stopShowingLegacyBanner]);
+    setShowLegacyExportTooltip(true);
+  }, [
+    onLegacyShare,
+    dontShowAgainChecked,
+    stopShowingLegacyModal,
+    setShowLegacyExportTooltip,
+  ]);
   const handleSwitchToNew = useCallback(() => {
-    if (dontShowAgainChecked) stopShowingLegacyBanner('export');
+    if (dontShowAgainChecked) stopShowingLegacyModal('export');
+    setShowLegacyExportTooltip(true);
     onSwitchToSchemaExport();
-  }, [onSwitchToSchemaExport, dontShowAgainChecked, stopShowingLegacyBanner]);
+  }, [
+    onSwitchToSchemaExport,
+    dontShowAgainChecked,
+    stopShowingLegacyModal,
+    setShowLegacyExportTooltip,
+  ]);
   return (
     <Modal open={isOpen} setOpen={onClose} contentClassName={containerStyles}>
       <ModalHeader
@@ -535,13 +549,13 @@ const ExportSchemaLegacyBanner: React.FunctionComponent<{
 
 export default connect(
   (state: RootState) => ({
-    isOpen: state.schemaExport.isLegacyBannerOpen,
+    isOpen: state.schemaExport.isLegacyModalOpen,
   }),
   (dispatch: SchemaThunkDispatch) => ({
-    onClose: () => dispatch({ type: SchemaExportActions.closeLegacyBanner }),
+    onClose: () => dispatch({ type: SchemaExportActions.closeLegacyModal }),
     onLegacyShare: () => dispatch(confirmedExportLegacySchemaToClipboard()),
     onSwitchToSchemaExport: () => dispatch(switchToSchemaExport()),
-    stopShowingLegacyBanner: (choice: 'legacy' | 'export') =>
-      dispatch(stopShowingLegacyBanner(choice)),
+    stopShowingLegacyModal: (choice: 'legacy' | 'export') =>
+      dispatch(stopShowingLegacyModal(choice)),
   })
-)(ExportSchemaLegacyBanner);
+)(ExportSchemaLegacyModal);