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

Author: github-actions[bot]

THIRD-PARTY-NOTICES.md

@@ -69,7 +69,7 @@
     "@pmmmwh/react-refresh-webpack-plugin": "^0.5.5",
     "babel-loader": "^8.2.5",
     "babel-plugin-istanbul": "^5.2.0",
-    "browserslist": "^4.23.2",
+    "browserslist": "^4.23.3",
     "chalk": "^4.1.2",
     "cli-progress": "^3.9.1",
     "core-js": "^3.17.3",

configs/webpack-config-compass/package.json

@@ -84,7 +84,7 @@
     "hadron-document": "^8.5.6",
     "hadron-type-checker": "^7.2.2",
     "lodash": "^4.17.21",
-    "mongodb": "^6.7.0",
+    "mongodb": "^6.8.0",
     "mongodb-collection-model": "^5.22.2",
     "mongodb-data-service": "^22.22.2",
     "mongodb-database-model": "^2.22.2",

package-lock.json

@@ -89,6 +89,10 @@ export function activatePlugin(
     }
   });
 
+  on(localAppRegistry, 'refresh-collection-stats', () => {
+    void collectionModel.fetch({ dataService, force: true });
+  });
+
   void collectionModel.fetchMetadata({ dataService }).then((metadata) => {
     store.dispatch(collectionMetadataFetched(metadata));
   });

packages/compass-aggregations/package.json

@@ -40,7 +40,7 @@
     "@leafygreen-ui/card": "^10.0.6",
     "@leafygreen-ui/checkbox": "^12.1.1",
     "@leafygreen-ui/code": "^14.3.1",
-    "@leafygreen-ui/confirmation-modal": "^5.0.11",
+    "@leafygreen-ui/confirmation-modal": "^5.2.0",
     "@leafygreen-ui/emotion": "^4.0.7",
     "@leafygreen-ui/guide-cue": "^5.0.6",
     "@leafygreen-ui/hooks": "^8.1.2",

packages/compass-collection/src/stores/collection-tab.ts

@@ -1,7 +1,6 @@
 import React, { useCallback, useState } from 'react';
 
 import { palette } from '@leafygreen-ui/palette';
-import { spacing } from '@leafygreen-ui/tokens';
 import { css, cx } from '@leafygreen-ui/emotion';
 import { useDarkMode } from '../hooks/use-theme';
 import { ResizeDirection, ResizeHandle } from './resize-handle';
@@ -55,7 +54,7 @@ const containerStylesLight = css({
   backgroundColor: 'var(--bg-color)',
 });
 
-export const defaultSidebarWidth = spacing[6] * 4;
+export const defaultSidebarWidth = 300;
 
 const ResizableSidebar = ({
   initialWidth = defaultSidebarWidth,

packages/compass-components/package.json

@@ -1,17 +1,19 @@
 import React, { useContext, useEffect, useRef, useState } from 'react';
 import { Variant as ConfirmationModalVariant } from '@leafygreen-ui/confirmation-modal';
 import ConfirmationModal from '../components/modals/confirmation-modal';
+import { css } from '@leafygreen-ui/emotion';
 
 export { ConfirmationModalVariant };
 
 type ConfirmationModalProps = React.ComponentProps<typeof ConfirmationModal>;
 
 type ConfirmationProperties = Partial<
-  Pick<
-    ConfirmationModalProps,
-    'title' | 'buttonText' | 'variant' | 'requiredInputText'
-  >
+  Pick<ConfirmationModalProps, 'title' | 'variant' | 'requiredInputText'>
 > & {
+  buttonText?: React.ReactNode;
+  cancelButtonText?: React.ReactNode;
+  hideConfirmButton?: boolean;
+  hideCancelButton?: boolean;
   description?: React.ReactNode;
   signal?: AbortSignal;
   'data-testid'?: string;
@@ -85,6 +87,10 @@ type ConfirmationModalAreaProps = Partial<
   ShowConfirmationEventDetail['props']
 > & { open: boolean };
 
+const hideButtonStyles = css({
+  display: 'none !important',
+});
+
 export const ConfirmationModalArea: React.FC = ({ children }) => {
   const hasParentContext = useContext(ConfirmationModalContext).isMounted;
 
@@ -159,10 +165,21 @@ export const ConfirmationModalArea: React.FC = ({ children }) => {
         open={confirmationProps.open}
         title={confirmationProps.title ?? 'Are you sure?'}
         variant={confirmationProps.variant ?? ConfirmationModalVariant.Default}
-        buttonText={confirmationProps.buttonText ?? 'Confirm'}
+        confirmButtonProps={{
+          className: confirmationProps.hideConfirmButton
+            ? hideButtonStyles
+            : undefined,
+          children: confirmationProps.buttonText ?? 'Confirm',
+          onClick: handleConfirm,
+        }}
+        cancelButtonProps={{
+          className: confirmationProps.hideCancelButton
+            ? hideButtonStyles
+            : undefined,
+          children: confirmationProps.cancelButtonText ?? 'Cancel',
+          onClick: handleCancel,
+        }}
         requiredInputText={confirmationProps.requiredInputText ?? undefined}
-        onConfirm={handleConfirm}
-        onCancel={handleCancel}
       >
         {confirmationProps.description}
       </ConfirmationModal>

packages/compass-components/src/components/resizeable-sidebar.tsx

@@ -12,7 +12,7 @@ import { Passphrase } from './passphrase';
 import { SelectTable } from './select-table';
 import type { ImportExportResult } from '../hooks/common';
 import { useOpenModalThroughIpc } from '../hooks/common';
-import { useExportConnections } from '../hooks/use-export';
+import { useExportConnections } from '../hooks/use-export-connections';
 import { usePreference } from 'compass-preferences-model/provider';
 
 const TOAST_TIMEOUT_MS = 5000;

packages/compass-components/src/hooks/use-confirmation.tsx

@@ -13,7 +13,7 @@ import { Passphrase } from './passphrase';
 import { SelectTable } from './select-table';
 import type { ImportExportResult } from '../hooks/common';
 import { useOpenModalThroughIpc } from '../hooks/common';
-import { useImportConnections } from '../hooks/use-import';
+import { useImportConnections } from '../hooks/use-import-connections';
 import { usePreference } from 'compass-preferences-model/provider';
 
 const TOAST_TIMEOUT_MS = 5000;