Skip to content

Commit d7b15db

Browse files
committed
Merge branch 'main' of github.com:mongodb-js/compass into mock_data_script_generation
2 parents 64b659c + 9c656bb commit d7b15db

File tree

114 files changed

+4395
-2047
lines changed

Some content is hidden

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

114 files changed

+4395
-2047
lines changed

.github/workflows/test-installers.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ jobs:
182182
# Similar to total task timeout, setting these higher than the default
183183
# value to account for very slow windows machines
184184
COMPASS_E2E_MOCHA_TIMEOUT: 720000 # 12min
185-
COMPASS_E2E_WEBDRIVER_WAITFOR_TIMEOUT: 360000 # 6min
185+
COMPASS_E2E_WEBDRIVER_WAITFOR_TIMEOUT: 600000 # 10min
186186
steps:
187187
- name: Checkout
188188
uses: actions/checkout@v2

THIRD-PARTY-NOTICES.md

Lines changed: 74 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
The following third-party software is used by and included in **Mongodb Compass**.
2-
This document was automatically generated on Mon Sep 15 2025.
2+
This document was automatically generated on Wed Sep 17 2025.
33

44
## List of dependencies
55

@@ -88,6 +88,7 @@ This document was automatically generated on Mon Sep 15 2025.
8888
| **[@emotion/use-insertion-effect-with-fallbacks](#a7662316f90ed8cb032ced23bee64ce0574a0b8eb63d56ee8eedb8c56cfc2812)** | 1.2.0 | MIT |
8989
| **[@emotion/utils](#e99b2a20e001e7734cc4f71b8fa6de4d5578c101b034e4571c7b51f86704f663)** | 1.4.2 | MIT |
9090
| **[@emotion/weak-memoize](#87ba3696f63d7274d407f7e4e93881675689944435b0d8af05b1f5bac283250d)** | 0.4.0 | MIT |
91+
| **[@faker-js/faker](#b2b97f3ed423451fa9a0223133b913e814020e54ef9248af059cc4e1075cc5d3)** | 9.0.0 | MIT |
9192
| **[@floating-ui/core](#8d656c6cba1d5d97a1954754b2715d577514d11465f4f662d49f322577471ccc)** | 1.6.9 | MIT |
9293
| **[@floating-ui/dom](#f58701a5fdc51e843e37875cb1dddf57f36fb0b6d458be6c14d30c3227ac6ec0)** | 1.6.13 | MIT |
9394
| **[@floating-ui/react-dom](#5e7f2bf76bf44f75d4a340db3bd81de2907a36d2fc8bc997ba4d1f27eec70324)** | 2.1.2 | MIT |
@@ -6767,6 +6768,78 @@ License files:
67676768
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
67686769
SOFTWARE.
67696770

6771+
<a id="b2b97f3ed423451fa9a0223133b913e814020e54ef9248af059cc4e1075cc5d3"></a>
6772+
6773+
### [@faker-js/faker](https://www.npmjs.com/package/@faker-js/faker) (version 9.0.0)
6774+
6775+
License tags: MIT
6776+
6777+
License files:
6778+
6779+
- LICENSE:
6780+
6781+
Faker - Copyright (c) 2022-2024
6782+
6783+
This software consists of voluntary contributions made by many individuals.
6784+
For exact contribution history, see the revision history
6785+
available at https://github.com/faker-js/faker
6786+
6787+
Permission is hereby granted, free of charge, to any person obtaining
6788+
a copy of this software and associated documentation files (the
6789+
"Software"), to deal in the Software without restriction, including
6790+
without limitation the rights to use, copy, modify, merge, publish,
6791+
distribute, sublicense, and/or sell copies of the Software, and to
6792+
permit persons to whom the Software is furnished to do so, subject to
6793+
the following conditions:
6794+
6795+
The above copyright notice and this permission notice shall be
6796+
included in all copies or substantial portions of the Software.
6797+
6798+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
6799+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
6800+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
6801+
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
6802+
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
6803+
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
6804+
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
6805+
6806+
===
6807+
6808+
From: https://github.com/faker-js/faker/commit/a9f98046c7d5eeaabe12fc587024c06d683800b8
6809+
To: https://github.com/faker-js/faker/commit/29234378807c4141588861f69421bf20b5ac635e
6810+
6811+
Based on faker.js, copyright Marak Squires and contributor, what follows below is the original license.
6812+
6813+
===
6814+
6815+
faker.js - Copyright (c) 2020
6816+
Marak Squires
6817+
http://github.com/marak/faker.js/
6818+
6819+
faker.js was inspired by and has used data definitions from:
6820+
6821+
* https://github.com/stympy/faker/ - Copyright (c) 2007-2010 Benjamin Curtis
6822+
* http://search.cpan.org/~jasonk/Data-Faker-0.07/ - Copyright 2004-2005 by Jason Kohles
6823+
6824+
Permission is hereby granted, free of charge, to any person obtaining
6825+
a copy of this software and associated documentation files (the
6826+
"Software"), to deal in the Software without restriction, including
6827+
without limitation the rights to use, copy, modify, merge, publish,
6828+
distribute, sublicense, and/or sell copies of the Software, and to
6829+
permit persons to whom the Software is furnished to do so, subject to
6830+
the following conditions:
6831+
6832+
The above copyright notice and this permission notice shall be
6833+
included in all copies or substantial portions of the Software.
6834+
6835+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
6836+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
6837+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
6838+
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
6839+
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
6840+
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
6841+
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
6842+
67706843
<a id="8d656c6cba1d5d97a1954754b2715d577514d11465f4f662d49f322577471ccc"></a>
67716844

67726845
### [@floating-ui/core](https://www.npmjs.com/package/@floating-ui/core) (version 1.6.9)

configs/eslint-config-compass/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@mongodb-js/eslint-config-compass",
3-
"version": "1.4.9",
3+
"version": "1.4.10",
44
"description": "Shared Compass eslint configuration",
55
"license": "SSPL",
66
"main": "index.js",
@@ -17,7 +17,7 @@
1717
"@babel/core": "^7.24.3",
1818
"@babel/eslint-parser": "^7.14.3",
1919
"@mongodb-js/eslint-config-devtools": "^0.9.9",
20-
"@mongodb-js/eslint-plugin-compass": "^1.2.15",
20+
"@mongodb-js/eslint-plugin-compass": "^1.2.16",
2121
"@typescript-eslint/eslint-plugin": "^8.43.0",
2222
"@typescript-eslint/parser": "^8.43.0",
2323
"eslint": "^8.57.1",

configs/eslint-plugin-compass/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"email": "[email protected]"
1414
},
1515
"homepage": "https://github.com/mongodb-js/compass",
16-
"version": "1.2.15",
16+
"version": "1.2.16",
1717
"repository": {
1818
"type": "git",
1919
"url": "https://github.com/mongodb-js/compass.git"

configs/testing-library-compass/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"email": "[email protected]"
1212
},
1313
"homepage": "https://github.com/mongodb-js/compass",
14-
"version": "1.3.12",
14+
"version": "1.3.14",
1515
"repository": {
1616
"type": "git",
1717
"url": "https://github.com/mongodb-js/compass.git"
@@ -45,7 +45,7 @@
4545
"reformat": "npm run eslint . -- --fix && npm run prettier -- --write ."
4646
},
4747
"devDependencies": {
48-
"@mongodb-js/eslint-config-compass": "^1.4.9",
48+
"@mongodb-js/eslint-config-compass": "^1.4.10",
4949
"@mongodb-js/mocha-config-compass": "^1.7.1",
5050
"@mongodb-js/prettier-config-compass": "^1.2.8",
5151
"@mongodb-js/tsconfig-compass": "^1.2.10",

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

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,29 @@ function createWrapper(
400400
return { wrapperState, wrapper };
401401
}
402402

403-
export type RenderConnectionsOptions = RenderOptions & TestConnectionsOptions;
403+
/**
404+
* Returns a new {@link RenderResult} with the {@link RenderResult.container} replaced by the container inserted by the context menu provider.
405+
*/
406+
function unwrapContextMenuContainer(result: RenderResult) {
407+
const { container, ...rest } = result;
408+
const { firstChild } = container;
409+
if (
410+
firstChild instanceof HTMLElement &&
411+
firstChild.getAttribute('data-testid') === 'context-menu-children-container'
412+
) {
413+
return { container: firstChild, ...rest };
414+
} else {
415+
return { container, ...rest };
416+
}
417+
}
418+
419+
export type RenderConnectionsOptions = RenderOptions &
420+
TestConnectionsOptions & {
421+
/**
422+
* Whether to include the context menu container and menu in the container of the returned result.
423+
*/
424+
includeContextMenu?: boolean;
425+
};
404426

405427
export type RenderWithConnectionsResult = ReturnType<
406428
typeof createWrapper
@@ -415,6 +437,7 @@ function renderWithConnections(
415437
baseElement,
416438
queries,
417439
hydrate,
440+
includeContextMenu = false,
418441
...connectionsOptions
419442
}: RenderConnectionsOptions = {}
420443
): RenderWithConnectionsResult {
@@ -443,7 +466,10 @@ function renderWithConnections(
443466
true,
444467
'Expected initial connections to load before rendering rest of the tested UI, but it did not happen'
445468
);
446-
return { ...wrapperState, ...result };
469+
return {
470+
...wrapperState,
471+
...(includeContextMenu ? result : unwrapContextMenuContainer(result)),
472+
};
447473
}
448474

449475
export type RenderHookConnectionsOptions<HookProps> = Omit<

configs/webpack-config-compass/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"email": "[email protected]"
1414
},
1515
"homepage": "https://github.com/mongodb-js/compass",
16-
"version": "1.10.2",
16+
"version": "1.10.3",
1717
"repository": {
1818
"type": "git",
1919
"url": "https://github.com/mongodb-js/compass.git"
@@ -45,7 +45,7 @@
4545
"reformat": "npm run eslint . -- --fix && npm run prettier -- --write ."
4646
},
4747
"devDependencies": {
48-
"@mongodb-js/eslint-config-compass": "^1.4.9",
48+
"@mongodb-js/eslint-config-compass": "^1.4.10",
4949
"@mongodb-js/prettier-config-compass": "^1.2.8",
5050
"@mongodb-js/tsconfig-compass": "^1.2.10",
5151
"@types/cli-progress": "^3.9.2",

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 Mon, Sep 15, 2025
9+
Generated on Wed, Sep 17, 2025
1010

1111
## Table of Contents
1212

0 commit comments

Comments
 (0)