resolve merge conflicts

Author: rubydong

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 Mon Apr 14 2025.
+This document was automatically generated on Wed Apr 16 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 Mon, Apr 14, 2025
+Generated on Wed, Apr 16, 2025
 
 ## Table of Contents
 

package-lock.json

@@ -1554,10 +1554,7 @@ const connectWithOptions = (
                 cloneDeep(connectionOptions),
                 SecretsForConnection.get(connectionInfo.id) ?? {}
               ),
-              connectionInfo: {
-                id: connectionInfo.id,
-                isAtlas: !!connectionInfo.atlasMetadata,
-              },
+              connectionId: connectionInfo.id,
               defaultAppName: appName,
               preferences: {
                 forceConnectionOptions: forceConnectionOptions ?? [],

packages/compass-connections/src/stores/connections-store-redux.ts

@@ -33,7 +33,7 @@ const crudToolbarStyles = css({
   flexDirection: 'column',
   alignItems: 'center',
   gap: spacing[300],
-  padding: spacing[300],
+  padding: spacing[400],
 });
 
 const crudBarStyles = css({

packages/compass-crud/src/components/crud-toolbar.tsx

@@ -0,0 +1,11 @@
+ignores:
+ - '@mongodb-js/prettier-config-compass'
+ - '@mongodb-js/tsconfig-compass'
+ - '@types/chai'
+ - '@types/sinon-chai'
+ - 'sinon'
+ - '@types/chai-dom'
+ - '@types/react'
+ - '@types/react-dom'
+ignore-patterns:
+ - 'dist'

packages/compass-data-modeling/.depcheckrc

@@ -0,0 +1,2 @@
+.nyc-output
+dist

packages/compass-data-modeling/.eslintignore

@@ -0,0 +1,8 @@
+module.exports = {
+  root: true,
+  extends: ['@mongodb-js/eslint-config-compass/plugin'],
+  parserOptions: {
+    tsconfigRootDir: __dirname,
+    project: ['./tsconfig-lint.json'],
+  },
+};

packages/compass-data-modeling/.eslintrc.js

@@ -0,0 +1 @@
+module.exports = require('@mongodb-js/mocha-config-compass/compass-plugin');