Skip to content

Commit 76a4129

Browse files
committed
Merge branch 'main' of https://github.com/mongodb-js/compass into COMPASS-9847-node-warning-icon
2 parents adfea37 + a678b7a commit 76a4129

File tree

171 files changed

+4361
-2261
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

171 files changed

+4361
-2261
lines changed

.evergreen/buildvariants-and-tasks.in.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -429,10 +429,12 @@ tasks:
429429
vars:
430430
compass_distribution: <%= distribution %>
431431
- func: spawn-signing-server
432+
retry_on_failure: true
432433
- func: package
433434
vars:
434435
debug: 'hadron*,mongo*,compass*,electron*,sign*'
435436
compass_distribution: <%= distribution %>
437+
retry_on_failure: true
436438
- func: verify-artifacts
437439
- func: save-all-artifacts
438440
vars:

.evergreen/buildvariants-and-tasks.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -435,10 +435,12 @@ tasks:
435435
vars:
436436
compass_distribution: compass
437437
- func: spawn-signing-server
438+
retry_on_failure: true
438439
- func: package
439440
vars:
440441
debug: hadron*,mongo*,compass*,electron*,sign*
441442
compass_distribution: compass
443+
retry_on_failure: true
442444
- func: verify-artifacts
443445
- func: save-all-artifacts
444446
vars:
@@ -458,10 +460,12 @@ tasks:
458460
vars:
459461
compass_distribution: compass-isolated
460462
- func: spawn-signing-server
463+
retry_on_failure: true
461464
- func: package
462465
vars:
463466
debug: hadron*,mongo*,compass*,electron*,sign*
464467
compass_distribution: compass-isolated
468+
retry_on_failure: true
465469
- func: verify-artifacts
466470
- func: save-all-artifacts
467471
vars:
@@ -481,10 +485,12 @@ tasks:
481485
vars:
482486
compass_distribution: compass-readonly
483487
- func: spawn-signing-server
488+
retry_on_failure: true
484489
- func: package
485490
vars:
486491
debug: hadron*,mongo*,compass*,electron*,sign*
487492
compass_distribution: compass-readonly
493+
retry_on_failure: true
488494
- func: verify-artifacts
489495
- func: save-all-artifacts
490496
vars:

.evergreen/connectivity-tests/run.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ docker run \
1818
-e E2E_TESTS_ATLAS_HOST="${E2E_TESTS_ATLAS_HOST}" \
1919
-e E2E_TESTS_DATA_LAKE_HOST="${E2E_TESTS_DATA_LAKE_HOST}" \
2020
-e E2E_TESTS_ANALYTICS_NODE_HOST="${E2E_TESTS_ANALYTICS_NODE_HOST}" \
21-
-e E2E_TESTS_SERVERLESS_HOST="${E2E_TESTS_SERVERLESS_HOST}" \
2221
-e E2E_TESTS_FREE_TIER_HOST="${E2E_TESTS_FREE_TIER_HOST}" \
2322
-e E2E_TESTS_ATLAS_USERNAME="${E2E_TESTS_ATLAS_USERNAME}" \
2423
-e E2E_TESTS_ATLAS_PASSWORD="${E2E_TESTS_ATLAS_PASSWORD}" \

.evergreen/functions.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ variables:
5858
E2E_TESTS_METRICS_URI: ${e2e_tests_metrics_string}
5959
E2E_TESTS_ATLAS_HOST: ${e2e_tests_atlas_host}
6060
E2E_TESTS_DATA_LAKE_HOST: ${e2e_tests_data_lake_host}
61-
E2E_TESTS_SERVERLESS_HOST: ${e2e_tests_serverless_host}
6261
E2E_TESTS_ANALYTICS_NODE_HOST: ${e2e_tests_analytics_node_host}
6362
E2E_TESTS_FREE_TIER_HOST: ${e2e_tests_free_tier_host}
6463
E2E_TESTS_ATLAS_USERNAME: ${e2e_tests_atlas_username}

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,34 +9,44 @@
99
NOTE: use `feat`, `fix` and `perf` for user facing changes that will be part of
1010
release notes.
1111
-->
12+
1213
## Description
14+
1315
<!--- Describe your changes in detail -->
1416
<!--- If applicable, describe (or illustrate) architecture flow -->
1517
<!--- If the UI changes in a non-trivial way, consider adding screenshots/video illustrating the new flows -->
1618

1719
### Checklist
20+
1821
- [ ] New tests and/or benchmarks are included
1922
- [ ] Documentation is changed or added
2023
- [ ] If this change updates the UI, screenshots/videos are added and a design review is requested
24+
- [ ] If this change could impact the load on the MongoDB cluster, please describe the expected and worst case impact
2125
- [ ] I have signed the MongoDB Contributor License Agreement (https://www.mongodb.com/legal/contributor-agreement)
2226

2327
## Motivation and Context
28+
2429
<!--- Why is this change required? What problem does it solve? -->
25-
<!--- If it's updating a dependancy, link to the Pull Request that originally introduced the fix -->
30+
<!--- If it's updating a dependency, link to the Pull Request that originally introduced the fix -->
31+
2632
- [ ] Bugfix
2733
- [ ] New feature
2834
- [ ] Dependency update
2935
- [ ] Misc
3036

3137
## Open Questions
38+
3239
<!--- Any particular areas you'd like reviewers to pay attention to? -->
3340

3441
## Dependents
42+
3543
<!--- If applicable, link PRs/commits that this PR is dependent on or is a dependency of. -->
3644

3745
## Types of changes
46+
3847
<!--- What types of changes does your code introduce? Put an `x` in all the boxes that apply: -->
39-
- [ ] *Backport Needed*
48+
49+
- [ ] _Backport Needed_
4050
- [ ] Patch (non-breaking change which fixes an issue)
4151
- [ ] Minor (non-breaking change which adds functionality)
4252
- [ ] Major (fix or feature that would cause existing functionality to change)

THIRD-PARTY-NOTICES.md

Lines changed: 298 additions & 19 deletions
Large diffs are not rendered by default.

configs/testing-library-compass/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@
6262
"@testing-library/react": "^12.1.5",
6363
"@testing-library/react-hooks": "^7.0.2",
6464
"@testing-library/user-event": "^13.5.0",
65+
"mongodb-build-info": "^1.8.1",
6566
"mongodb-connection-string-url": "^3.0.1",
6667
"react": "^17.0.2",
6768
"react-redux": "^8.1.3",

configs/testing-library-compass/src/index.tsx

Lines changed: 26 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ import type {
3434
DataService,
3535
InstanceDetails,
3636
} from 'mongodb-data-service';
37+
import { identifyServerName } from 'mongodb-build-info';
3738
import Sinon from 'sinon';
3839
import React from 'react';
3940
import type {
@@ -175,8 +176,22 @@ export class MockDataService
175176
disconnect(): Promise<void> {
176177
return Promise.resolve();
177178
}
178-
instance(): Promise<InstanceDetails> {
179-
return Promise.resolve({
179+
async instance(): Promise<InstanceDetails> {
180+
const { connectionString } = this.connectionOptions;
181+
const serverName = await identifyServerName({
182+
connectionString,
183+
adminCommand: () =>
184+
Promise.reject(
185+
new Error(
186+
'MockDataService adminCommand: this is a mocked environment; no server commands available.'
187+
)
188+
),
189+
});
190+
const genuineMongoDB = {
191+
serverName,
192+
isGenuine: serverName === 'mongodb' || serverName === 'unknown',
193+
};
194+
return {
180195
auth: {
181196
user: null,
182197
roles: [],
@@ -188,10 +203,7 @@ export class MockDataService
188203
version: '100.0.0',
189204
},
190205
host: {},
191-
genuineMongoDB: {
192-
isGenuine: true,
193-
dbType: 'mongodb',
194-
},
206+
genuineMongoDB,
195207
dataLake: {
196208
isDataLake: false,
197209
version: null,
@@ -200,7 +212,7 @@ export class MockDataService
200212
isAtlas: false,
201213
isLocalAtlas: false,
202214
csfleMode: 'unavailable',
203-
});
215+
};
204216
}
205217
}
206218

@@ -410,6 +422,13 @@ function unwrapContextMenuContainer(result: RenderResult) {
410422
firstChild instanceof HTMLElement &&
411423
firstChild.getAttribute('data-testid') === 'context-menu-children-container'
412424
) {
425+
if (
426+
firstChild.firstChild instanceof HTMLElement &&
427+
firstChild.firstChild.getAttribute('data-testid') ===
428+
'copy-paste-context-menu-container'
429+
) {
430+
return { container: firstChild.firstChild, ...rest };
431+
}
413432
return { container: firstChild, ...rest };
414433
} else {
415434
return { container, ...rest };

configs/webpack-config-compass/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
"cli-progress": "^3.9.1",
7171
"core-js": "^3.17.3",
7272
"css-loader": "^4.3.0",
73-
"electron": "^37.7.1",
73+
"electron": "^37.8.0",
7474
"html-webpack-plugin": "^5.6.0",
7575
"less": "^3.13.1",
7676
"less-loader": "^10.0.1",

docs/tracking-plan.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
> the tracking plan for the specific Compass version you can use the following
77
> URL: `https://github.com/mongodb-js/compass/blob/<compass version>/docs/tracking-plan.md`
88
9-
Generated on Thu, Oct 30, 2025
9+
Generated on Tue, Nov 11, 2025
1010

1111
## Table of Contents
1212

0 commit comments

Comments
 (0)