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 Sun Apr 27 2025.
+This document was automatically generated on Sun May 04 2025.
 
 ## List of dependencies
 

docs/tracking-plan.md

@@ -6,7 +6,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 Sun, Apr 27, 2025
+Generated on Sun, May 4, 2025
 
 ## Table of Contents
 

package-lock.json

@@ -13,7 +13,7 @@
     "email": "[email protected]"
   },
   "homepage": "https://github.com/mongodb-js/compass",
-  "version": "0.37.0",
+  "version": "0.38.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/mongodb-js/compass.git"
@@ -71,17 +71,17 @@
     "typescript": "^5.0.4"
   },
   "dependencies": {
-    "@mongodb-js/compass-components": "^1.35.1",
+    "@mongodb-js/compass-components": "^1.35.2",
     "@mongodb-js/compass-logging": "^1.6.8",
-    "@mongodb-js/compass-telemetry": "^1.5.0",
+    "@mongodb-js/compass-telemetry": "^1.6.0",
     "@mongodb-js/compass-user-data": "^0.5.8",
     "@mongodb-js/compass-utils": "^0.8.8",
     "@mongodb-js/connection-info": "^0.11.9",
     "@mongodb-js/devtools-connect": "^3.4.1",
     "@mongodb-js/devtools-proxy-support": "^0.4.2",
     "@mongodb-js/oidc-plugin": "^1.1.6",
     "hadron-app-registry": "^9.4.8",
-    "compass-preferences-model": "^2.34.0",
+    "compass-preferences-model": "^2.35.0",
     "electron": "^32.3.3",
     "hadron-ipc": "^3.4.8",
     "lodash": "^4.17.21",

packages/atlas-service/package.json

@@ -64,18 +64,18 @@ interface CollectionProps {
   specialish: boolean;
   normal: boolean;
   readonly: boolean;
-  view_on: string;
+  view_on: string | null;
   collation: unknown;
   pipeline: unknown[];
   validation: unknown;
-  is_capped: boolean;
-  document_count: number;
-  document_size: number;
-  avg_document_size: number;
-  storage_size: number;
-  free_storage_size: number;
-  index_count: number;
-  index_size: number;
+  is_capped: boolean | undefined;
+  document_count: number | undefined;
+  document_size: number | undefined;
+  avg_document_size: number | undefined;
+  storage_size: number | undefined;
+  free_storage_size: number | undefined;
+  index_count: number | undefined;
+  index_size: number | undefined;
   isTimeSeries: boolean;
   isView: boolean;
   /** Only relevant for a view and identifies collection/view from which this view was created. */
@@ -85,7 +85,13 @@ interface CollectionProps {
   is_non_existent: boolean;
 }
 
-type CollectionDataService = Pick<DataService, 'collectionStats' | 'collectionInfo' | 'listCollections' | 'isListSearchIndexesSupported'>;
+type CollectionDataService = Pick<
+  DataService,
+  | 'collectionStats'
+  | 'collectionInfo'
+  | 'listCollections'
+  | 'isListSearchIndexesSupported'
+>;
 
 interface Collection extends CollectionProps {
   fetch(opts: {
@@ -106,7 +112,10 @@ interface Collection extends CollectionProps {
 }
 
 interface CollectionCollection extends Array<Collection> {
-  fetch(opts: { dataService: CollectionDataService; fetchInfo?: boolean }): Promise<void>;
+  fetch(opts: {
+    dataService: CollectionDataService;
+    fetchInfo?: boolean;
+  }): Promise<void>;
   toJSON(opts?: { derived: boolean }): Array<CollectionProps>;
   at(index: number): Collection | undefined;
   get(id: string, key?: '_id' | 'name'): Collection | undefined;

packages/collection-model/index.d.ts

@@ -104,7 +104,17 @@ function pickCollectionInfo({
   fle2,
   is_non_existent,
 }) {
-  return { type, readonly, view_on, collation, pipeline, validation, clustered, fle2, is_non_existent };
+  return {
+    type,
+    readonly,
+    view_on,
+    collation,
+    pipeline,
+    validation,
+    clustered,
+    fle2,
+    is_non_existent,
+  };
 }
 
 /**
@@ -232,18 +242,30 @@ const CollectionModel = AmpersandModel.extend(debounceActions(['fetch']), {
   },
 
   /**
-   * @param {{ dataService: import('mongodb-data-service').DataService }} dataService
+   * @param {{
+   *    dataService: import('mongodb-data-service').DataService,
+   *    fetchInfo: boolean,
+   *    force: boolean
+   * }} options
    * @returns
    */
   async fetch({ dataService, fetchInfo = true, force = false }) {
     if (!shouldFetch(this.status, force)) {
       return;
     }
+
+    const shouldFetchDbAndCollStats = getParentByType(
+      this,
+      'Instance'
+    ).shouldFetchDbAndCollStats;
+
     try {
       const newStatus = this.status === 'initial' ? 'fetching' : 'refreshing';
       this.set({ status: newStatus });
       const [collStats, collectionInfo] = await Promise.all([
-        dataService.collectionStats(this.database, this.name),
+        shouldFetchDbAndCollStats
+          ? dataService.collectionStats(this.database, this.name)
+          : null,
         fetchInfo ? dataService.collectionInfo(this.database, this.name) : null,
       ]);
       this.set({
@@ -255,7 +277,7 @@ const CollectionModel = AmpersandModel.extend(debounceActions(['fetch']), {
       // If the collection is not unprovisioned `is_non_existent` anymore,
       // let's update the parent database model to reflect the change.
       // This happens when a user tries to insert first document into a
-      // collection that doesn't exist yet or creates a new collection 
+      // collection that doesn't exist yet or creates a new collection
       // for an unprovisioned database.
       if (!this.is_non_existent) {
         getParentByType(this, 'Database').set({
@@ -271,7 +293,9 @@ const CollectionModel = AmpersandModel.extend(debounceActions(['fetch']), {
   /**
    * Fetches collection info and returns a special format of collection metadata
    * that events like open-in-new-tab, select-namespace, edit-view require
-   * @param {{ dataService: import('mongodb-data-service').DataService }} dataService
+   * @param {{
+   *    dataService: import('mongodb-data-service').DataService,
+   * }} options
    */
   async fetchMetadata({ dataService }) {
     try {

packages/collection-model/lib/model.js

@@ -2,7 +2,7 @@
   "name": "mongodb-collection-model",
   "description": "MongoDB collection model",
   "author": "Lucas Hrabovsky <[email protected]>",
-  "version": "5.25.8",
+  "version": "5.26.0",
   "bugs": {
     "url": "https://jira.mongodb.org/projects/COMPASS/issues",
     "email": "[email protected]"

packages/collection-model/package.json

@@ -2,7 +2,7 @@
   "name": "@mongodb-js/compass-aggregations",
   "description": "Compass Aggregation Pipeline Builder",
   "private": true,
-  "version": "9.54.0",
+  "version": "9.55.0",
   "main": "dist/index.js",
   "compass:main": "src/index.ts",
   "types": "dist/index.d.ts",
@@ -59,34 +59,34 @@
     "@dnd-kit/core": "^6.0.7",
     "@dnd-kit/sortable": "^7.0.2",
     "@dnd-kit/utilities": "^3.2.1",
-    "@mongodb-js/atlas-service": "^0.37.0",
-    "@mongodb-js/compass-app-stores": "^7.38.0",
-    "@mongodb-js/compass-collection": "^4.51.0",
-    "@mongodb-js/compass-components": "^1.35.1",
-    "@mongodb-js/compass-connections": "^1.52.0",
-    "@mongodb-js/compass-crud": "^13.52.0",
-    "@mongodb-js/compass-editor": "^0.37.1",
-    "@mongodb-js/compass-field-store": "^9.27.0",
-    "@mongodb-js/compass-generative-ai": "^0.32.0",
+    "@mongodb-js/atlas-service": "^0.38.0",
+    "@mongodb-js/compass-app-stores": "^7.39.0",
+    "@mongodb-js/compass-collection": "^4.52.0",
+    "@mongodb-js/compass-components": "^1.35.2",
+    "@mongodb-js/compass-connections": "^1.53.0",
+    "@mongodb-js/compass-crud": "^13.53.0",
+    "@mongodb-js/compass-editor": "^0.37.2",
+    "@mongodb-js/compass-field-store": "^9.28.0",
+    "@mongodb-js/compass-generative-ai": "^0.33.0",
     "@mongodb-js/compass-logging": "^1.6.8",
-    "@mongodb-js/compass-telemetry": "^1.5.0",
+    "@mongodb-js/compass-telemetry": "^1.6.0",
     "@mongodb-js/compass-utils": "^0.8.8",
-    "@mongodb-js/compass-workspaces": "^0.33.0",
+    "@mongodb-js/compass-workspaces": "^0.34.0",
     "@mongodb-js/explain-plan-helper": "^1.4.8",
     "@mongodb-js/mongodb-constants": "^0.11.0",
-    "@mongodb-js/my-queries-storage": "^0.23.1",
+    "@mongodb-js/my-queries-storage": "^0.23.2",
     "@mongodb-js/shell-bson-parser": "^1.2.0",
     "bson": "^6.10.3",
-    "compass-preferences-model": "^2.34.0",
+    "compass-preferences-model": "^2.35.0",
     "hadron-app-registry": "^9.4.8",
     "hadron-document": "^8.8.8",
     "hadron-type-checker": "^7.4.8",
     "lodash": "^4.17.21",
     "mongodb": "^6.14.1",
-    "mongodb-collection-model": "^5.25.8",
+    "mongodb-collection-model": "^5.26.0",
     "mongodb-data-service": "^22.25.8",
-    "mongodb-database-model": "^2.25.8",
-    "mongodb-instance-model": "^12.26.8",
+    "mongodb-database-model": "^2.26.0",
+    "mongodb-instance-model": "^12.27.0",
     "mongodb-ns": "^2.4.2",
     "mongodb-query-parser": "^4.3.0",
     "mongodb-schema": "^12.5.2",

packages/compass-aggregations/package.json

@@ -72,11 +72,11 @@ describe('PipelineResultsWorkspace', function () {
     const onRetry = spy();
     await renderPipelineResultsWorkspace({
       isError: true,
-      error: 'Something bad happened',
+      error: { message: 'Something bad happened' },
       onRetry,
     });
     expect(screen.getByText('Something bad happened')).to.exist;
-    userEvent.click(screen.getByText('Retry'), undefined, {
+    userEvent.click(screen.getByText('RETRY'), undefined, {
       skipPointerEventsCheck: true,
     });
     expect(onRetry).to.be.calledOnce;

packages/compass-aggregations/src/components/pipeline-results-workspace/index.spec.tsx

@@ -6,13 +6,19 @@ import {
   cx,
   spacing,
   CancelLoader,
-  ErrorSummary,
   Subtitle,
   Button,
   palette,
+  Banner,
+  BannerVariant,
+  showErrorDetails,
 } from '@mongodb-js/compass-components';
 import type { RootState } from '../../modules';
-import { cancelAggregation, retryAggregation } from '../../modules/aggregation';
+import {
+  type AggregationError,
+  cancelAggregation,
+  retryAggregation,
+} from '../../modules/aggregation';
 import PipelineResultsList from './pipeline-results-list';
 import PipelineEmptyResults from './pipeline-empty-results';
 import {
@@ -52,6 +58,23 @@ const centered = css({
   justifyContent: 'center',
 });
 
+const errorBannerStyles = css({
+  width: '100%',
+});
+
+const errorBannerContentStyles = css({
+  display: 'flex',
+  justifyContent: 'space-between',
+});
+
+const errorBannerTextStyles = css({
+  flex: 1,
+});
+
+const errorDetailsBtnStyles = css({
+  marginLeft: spacing[100],
+});
+
 const ResultsContainer: React.FunctionComponent<{ center?: boolean }> = ({
   children,
   center,
@@ -102,7 +125,7 @@ type PipelineResultsWorkspaceProps = {
   documents: HadronDocument[];
   isLoading?: boolean;
   isError?: boolean;
-  error?: string | null;
+  error?: AggregationError;
   isEmpty?: boolean;
   isMergeOrOutPipeline?: boolean;
   mergeOrOutDestination?: string | null;
@@ -133,12 +156,38 @@ export const PipelineResultsWorkspace: React.FunctionComponent<
   if (isError && error) {
     results = (
       <ResultsContainer>
-        <ErrorSummary
+        <Banner
           data-testid="pipeline-results-error"
-          errors={error}
-          onAction={onRetry}
-          actionText="Retry"
-        />
+          variant={BannerVariant.Danger}
+          className={errorBannerStyles}
+        >
+          <div className={errorBannerContentStyles}>
+            <div className={errorBannerTextStyles}>{error?.message}</div>
+            <Button
+              size="xsmall"
+              onClick={onRetry}
+              data-testid="pipeline-results-error-retry-button"
+              className={errorDetailsBtnStyles}
+            >
+              RETRY
+            </Button>
+            {error?.info && (
+              <Button
+                size="xsmall"
+                onClick={() =>
+                  showErrorDetails({
+                    details: error.info!,
+                    closeAction: 'close',
+                  })
+                }
+                data-testid="pipeline-results-error-details-button"
+                className={errorDetailsBtnStyles}
+              >
+                VIEW ERROR DETAILS
+              </Button>
+            )}
+          </div>
+        </Banner>
       </ResultsContainer>
     );
   } else if (isLoading) {