Skip to content

Commit f8125e8

Browse files
mabaasitmabaasit
authored
Merge branch 'main' into COMPASS-9507-fix-smoketests
2 parents 2758375 + b7caa2e commit f8125e8

File tree

57 files changed

+985
-849
lines changed

Some content is hidden

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

57 files changed

+985
-849
lines changed

‎package-lock.json‎

Lines changed: 519 additions & 517 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/atlas-service/package.json‎

Lines changed: 3 additions & 3 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": "0.47.1",
16+
"version": "0.48.0",
1717
"repository": {
1818
"type": "git",
1919
"url": "https://github.com/mongodb-js/compass.git"
@@ -72,7 +72,7 @@
7272
},
7373
"dependencies": {
7474
"@mongodb-js/compass-app-registry": "^9.4.13",
75-
"@mongodb-js/compass-components": "^1.40.0",
75+
"@mongodb-js/compass-components": "^1.41.0",
7676
"@mongodb-js/compass-logging": "^1.7.4",
7777
"@mongodb-js/compass-telemetry": "^1.10.2",
7878
"@mongodb-js/compass-user-data": "^0.7.4",
@@ -81,7 +81,7 @@
8181
"@mongodb-js/devtools-connect": "^3.7.2",
8282
"@mongodb-js/devtools-proxy-support": "^0.4.4",
8383
"@mongodb-js/oidc-plugin": "^1.1.8",
84-
"compass-preferences-model": "^2.42.1",
84+
"compass-preferences-model": "^2.43.0",
8585
"electron": "^36.5.0",
8686
"hadron-ipc": "^3.5.3",
8787
"lodash": "^4.17.21",

‎packages/compass-aggregations/package.json‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "@mongodb-js/compass-aggregations",
33
"description": "Compass Aggregation Pipeline Builder",
44
"private": true,
5-
"version": "9.64.1",
5+
"version": "9.65.0",
66
"main": "dist/index.js",
77
"compass:main": "src/index.ts",
88
"types": "dist/index.d.ts",
@@ -57,25 +57,25 @@
5757
"@dnd-kit/core": "^6.0.7",
5858
"@dnd-kit/sortable": "^7.0.2",
5959
"@dnd-kit/utilities": "^3.2.1",
60-
"@mongodb-js/atlas-service": "^0.47.1",
61-
"@mongodb-js/compass-app-stores": "^7.48.1",
62-
"@mongodb-js/compass-collection": "^4.61.1",
63-
"@mongodb-js/compass-components": "^1.40.0",
64-
"@mongodb-js/compass-connections": "^1.62.1",
65-
"@mongodb-js/compass-crud": "^13.62.1",
66-
"@mongodb-js/compass-editor": "^0.42.0",
67-
"@mongodb-js/compass-field-store": "^9.37.1",
68-
"@mongodb-js/compass-generative-ai": "^0.42.1",
60+
"@mongodb-js/atlas-service": "^0.48.0",
61+
"@mongodb-js/compass-app-stores": "^7.49.0",
62+
"@mongodb-js/compass-collection": "^4.62.0",
63+
"@mongodb-js/compass-components": "^1.41.0",
64+
"@mongodb-js/compass-connections": "^1.63.0",
65+
"@mongodb-js/compass-crud": "^13.63.0",
66+
"@mongodb-js/compass-editor": "^0.43.0",
67+
"@mongodb-js/compass-field-store": "^9.38.0",
68+
"@mongodb-js/compass-generative-ai": "^0.43.0",
6969
"@mongodb-js/compass-logging": "^1.7.4",
7070
"@mongodb-js/compass-telemetry": "^1.10.2",
7171
"@mongodb-js/compass-utils": "^0.9.3",
72-
"@mongodb-js/compass-workspaces": "^0.43.1",
72+
"@mongodb-js/compass-workspaces": "^0.44.0",
7373
"@mongodb-js/explain-plan-helper": "^1.4.11",
7474
"@mongodb-js/mongodb-constants": "^0.12.0",
75-
"@mongodb-js/my-queries-storage": "^0.29.1",
75+
"@mongodb-js/my-queries-storage": "^0.30.0",
7676
"@mongodb-js/shell-bson-parser": "^1.2.0",
7777
"bson": "^6.10.3",
78-
"compass-preferences-model": "^2.42.1",
78+
"compass-preferences-model": "^2.43.0",
7979
"@mongodb-js/compass-app-registry": "^9.4.13",
8080
"hadron-document": "^8.8.13",
8181
"hadron-type-checker": "^7.4.11",
@@ -84,7 +84,7 @@
8484
"mongodb-collection-model": "^5.29.4",
8585
"mongodb-data-service": "^22.28.4",
8686
"mongodb-database-model": "^2.29.4",
87-
"mongodb-instance-model": "^12.34.1",
87+
"mongodb-instance-model": "^12.35.0",
8888
"mongodb-ns": "^2.4.2",
8989
"mongodb-query-parser": "^4.3.0",
9090
"mongodb-schema": "^12.6.2",

‎packages/compass-app-stores/package.json‎

Lines changed: 5 additions & 5 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": "7.48.1",
14+
"version": "7.49.0",
1515
"repository": {
1616
"type": "git",
1717
"url": "https://github.com/mongodb-js/compass.git"
@@ -71,15 +71,15 @@
7171
"xvfb-maybe": "^0.2.1"
7272
},
7373
"dependencies": {
74-
"@mongodb-js/compass-components": "^1.40.0",
75-
"@mongodb-js/compass-connections": "^1.62.1",
74+
"@mongodb-js/compass-components": "^1.41.0",
75+
"@mongodb-js/compass-connections": "^1.63.0",
7676
"@mongodb-js/compass-logging": "^1.7.4",
7777
"@mongodb-js/connection-info": "^0.15.4",
7878
"@mongodb-js/compass-app-registry": "^9.4.13",
7979
"mongodb-collection-model": "^5.29.4",
8080
"mongodb-database-model": "^2.29.4",
81-
"mongodb-instance-model": "^12.34.1",
82-
"compass-preferences-model": "^2.42.1",
81+
"mongodb-instance-model": "^12.35.0",
82+
"compass-preferences-model": "^2.43.0",
8383
"mongodb-ns": "^2.4.2",
8484
"react": "^17.0.2"
8585
},

‎packages/compass-collection/package.json‎

Lines changed: 6 additions & 6 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": "4.61.1",
14+
"version": "4.62.0",
1515
"repository": {
1616
"type": "git",
1717
"url": "https://github.com/mongodb-js/compass.git"
@@ -48,15 +48,15 @@
4848
"reformat": "npm run eslint . -- --fix && npm run prettier -- --write ."
4949
},
5050
"dependencies": {
51-
"@mongodb-js/compass-app-stores": "^7.48.1",
52-
"@mongodb-js/compass-components": "^1.40.0",
53-
"@mongodb-js/compass-connections": "^1.62.1",
51+
"@mongodb-js/compass-app-stores": "^7.49.0",
52+
"@mongodb-js/compass-components": "^1.41.0",
53+
"@mongodb-js/compass-connections": "^1.63.0",
5454
"@mongodb-js/compass-logging": "^1.7.4",
5555
"@mongodb-js/compass-telemetry": "^1.10.2",
56-
"@mongodb-js/compass-workspaces": "^0.43.1",
56+
"@mongodb-js/compass-workspaces": "^0.44.0",
5757
"@mongodb-js/connection-info": "^0.15.4",
5858
"@mongodb-js/mongodb-constants": "^0.12.0",
59-
"compass-preferences-model": "^2.42.1",
59+
"compass-preferences-model": "^2.43.0",
6060
"@mongodb-js/compass-app-registry": "^9.4.13",
6161
"mongodb-collection-model": "^5.29.4",
6262
"mongodb-ns": "^2.4.2",

‎packages/compass-components/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/compass-components",
3-
"version": "1.40.0",
3+
"version": "1.41.0",
44
"description": "React Components used in Compass",
55
"license": "SSPL",
66
"main": "lib/index.js",
@@ -75,7 +75,7 @@
7575
"@leafygreen-ui/tokens": "^2.11.3",
7676
"@leafygreen-ui/tooltip": "^13.0.13",
7777
"@leafygreen-ui/typography": "^20.0.2",
78-
"@mongodb-js/compass-context-menu": "^0.1.0",
78+
"@mongodb-js/compass-context-menu": "^0.1.1",
7979
"@react-aria/interactions": "^3.9.1",
8080
"@react-aria/utils": "^3.13.1",
8181
"@react-aria/visually-hidden": "^3.3.1",

‎packages/compass-connection-import-export/package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"email": "[email protected]"
1515
},
1616
"homepage": "https://github.com/mongodb-js/compass",
17-
"version": "0.58.1",
17+
"version": "0.59.0",
1818
"repository": {
1919
"type": "git",
2020
"url": "https://github.com/mongodb-js/compass.git"
@@ -51,10 +51,10 @@
5151
"reformat": "npm run eslint . -- --fix && npm run prettier -- --write ."
5252
},
5353
"dependencies": {
54-
"@mongodb-js/compass-components": "^1.40.0",
55-
"@mongodb-js/compass-connections": "^1.62.1",
56-
"@mongodb-js/connection-storage": "^0.37.1",
57-
"compass-preferences-model": "^2.42.1",
54+
"@mongodb-js/compass-components": "^1.41.0",
55+
"@mongodb-js/compass-connections": "^1.63.0",
56+
"@mongodb-js/connection-storage": "^0.38.0",
57+
"compass-preferences-model": "^2.43.0",
5858
"hadron-ipc": "^3.5.3",
5959
"react": "^17.0.2"
6060
},

‎packages/compass-connections-navigation/package.json‎

Lines changed: 6 additions & 6 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.61.1",
16+
"version": "1.62.0",
1717
"repository": {
1818
"type": "git",
1919
"url": "https://github.com/mongodb-js/compass.git"
@@ -49,12 +49,12 @@
4949
"reformat": "npm run eslint . -- --fix && npm run prettier -- --write ."
5050
},
5151
"dependencies": {
52-
"@mongodb-js/compass-connections": "^1.62.1",
53-
"@mongodb-js/compass-components": "^1.40.0",
52+
"@mongodb-js/compass-connections": "^1.63.0",
53+
"@mongodb-js/compass-components": "^1.41.0",
5454
"@mongodb-js/connection-info": "^0.15.4",
55-
"@mongodb-js/connection-form": "^1.54.1",
56-
"@mongodb-js/compass-workspaces": "^0.43.1",
57-
"compass-preferences-model": "^2.42.1",
55+
"@mongodb-js/connection-form": "^1.55.0",
56+
"@mongodb-js/compass-workspaces": "^0.44.0",
57+
"compass-preferences-model": "^2.43.0",
5858
"mongodb-build-info": "^1.7.2",
5959
"react": "^17.0.2",
6060
"react-virtualized-auto-sizer": "^1.0.6",

‎packages/compass-connections-navigation/src/connections-navigation-tree.tsx‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ const ConnectionsNavigationTree: React.FunctionComponent<
114114

115115
const getCollapseAfterForConnectedItem = useCallback(
116116
(actions: NavigationItemActions) => {
117-
const [firstAction, secondAction] = actions;
117+
const [, secondAction, thirdAction] = actions;
118118

119119
const actionCanBeShownInline = (
120120
action: NavigationItemActions[number]
@@ -123,31 +123,32 @@ const ConnectionsNavigationTree: React.FunctionComponent<
123123
return false;
124124
}
125125

126-
return ['create-database', 'open-shell'].includes(
126+
return ['refresh-databases', 'create-database', 'open-shell'].includes(
127127
(action as ItemAction<Actions>).action
128128
);
129129
};
130130

131131
// this is the normal case for a connection that is writable and when we
132132
// also have shell enabled
133133
if (
134-
actionCanBeShownInline(firstAction) &&
135-
actionCanBeShownInline(secondAction)
134+
actionCanBeShownInline(secondAction) &&
135+
actionCanBeShownInline(thirdAction)
136136
) {
137-
return 2;
137+
return 3;
138138
}
139139

140140
// this will happen when the either the connection is not writable or the
141141
// preference is readonly, or shell is not enabled in which case we either
142142
// do not show create-database action or open-shell action
143143
if (
144-
actionCanBeShownInline(firstAction) ||
145-
actionCanBeShownInline(secondAction)
144+
actionCanBeShownInline(secondAction) ||
145+
actionCanBeShownInline(thirdAction)
146146
) {
147-
return 1;
147+
return 2;
148148
}
149149

150-
return 0;
150+
// Always display the refresh action (firstAction).
151+
return 1;
151152
},
152153
[]
153154
);

‎packages/compass-connections-navigation/src/item-actions.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,11 @@ export const connectedConnectionItemActions = ({
9393
connectionInfo,
9494
});
9595
return stripNullActions([
96+
{
97+
action: 'refresh-databases',
98+
label: 'Refresh databases',
99+
icon: 'Refresh',
100+
},
96101
hasWriteActionsDisabled
97102
? null
98103
: {
@@ -123,11 +128,6 @@ export const connectedConnectionItemActions = ({
123128
icon: 'InfoWithCircle',
124129
label: 'Show connection info',
125130
},
126-
{
127-
action: 'refresh-databases',
128-
label: 'Refresh databases',
129-
icon: 'Refresh',
130-
},
131131
{
132132
action: 'connection-disconnect',
133133
icon: 'Disconnect',

0 commit comments

Comments
 (0)