Skip to content

Commit edd3327

Browse files
Merge remote-tracking branch 'origin/main' into beta-releases
2 parents e547bb6 + 42daee9 commit edd3327

File tree

112 files changed

+4508
-2491
lines changed

Some content is hidden

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

112 files changed

+4508
-2491
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: 122 additions & 49 deletions
Large diffs are not rendered by default.

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.13",
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 Sun, Sep 14, 2025
9+
Generated on Tue, Sep 16, 2025
1010

1111
## Table of Contents
1212

0 commit comments

Comments
 (0)