Skip to content

Commit 4dccafe

Browse files
Merge branch 'main' into COMPASS-9667
2 parents 6c47264 + 1162b73 commit 4dccafe

39 files changed

+2615
-202
lines changed

THIRD-PARTY-NOTICES.md

Lines changed: 490 additions & 4 deletions
Large diffs are not rendered by default.

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 Wed, Aug 13, 2025
9+
Generated on Thu, Aug 14, 2025
1010

1111
## Table of Contents
1212

package-lock.json

Lines changed: 540 additions & 145 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
@@ -78,9 +78,9 @@
7878
"@mongodb-js/compass-user-data": "^0.8.4",
7979
"@mongodb-js/compass-utils": "^0.9.9",
8080
"@mongodb-js/connection-info": "^0.17.0",
81-
"@mongodb-js/devtools-connect": "^3.9.2",
82-
"@mongodb-js/devtools-proxy-support": "^0.5.1",
83-
"@mongodb-js/oidc-plugin": "^2.0.2",
81+
"@mongodb-js/devtools-connect": "^3.9.3",
82+
"@mongodb-js/devtools-proxy-support": "^0.5.2",
83+
"@mongodb-js/oidc-plugin": "^2.0.3",
8484
"compass-preferences-model": "^2.49.0",
8585
"electron": "^37.2.6",
8686
"hadron-ipc": "^3.5.9",

packages/atlas-service/src/atlas-service.spec.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ const ATLAS_CONFIG = {
1515
issuer: 'http://example.com/oauth2/default',
1616
},
1717
authPortalUrl: 'http://example.com/account/login',
18+
assistantApiBaseUrl: 'http://example.com/assistant',
1819
};
1920

2021
function getAtlasService(

packages/atlas-service/src/atlas-service.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,9 @@ export class AtlasService {
6767
cloudEndpoint(path?: string): string {
6868
return `${this.config.cloudBaseUrl}${normalizePath(path)}`;
6969
}
70+
assistantApiEndpoint(path?: string): string {
71+
return `${this.config.assistantApiBaseUrl}${normalizePath(path)}`;
72+
}
7073
regionalizedCloudEndpoint(
7174
_atlasMetadata: Pick<AtlasClusterMetadata, 'regionalBaseUrl'>,
7275
path?: string

packages/atlas-service/src/main.spec.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ describe('CompassAuthServiceMain', function () {
5656
clientId: '1234abcd',
5757
},
5858
authPortalUrl: 'http://example.com',
59+
assistantApiBaseUrl: 'http://example.com/assistant',
5960
};
6061

6162
const fetch = CompassAuthService['fetch'];

packages/atlas-service/src/util.ts

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,10 @@ export type AtlasServiceConfig = {
116116
* Atlas Account Portal UI base url
117117
*/
118118
authPortalUrl: string;
119+
/**
120+
* Assistant API base url
121+
*/
122+
assistantApiBaseUrl: string;
119123
};
120124

121125
/**
@@ -139,6 +143,7 @@ const config = {
139143
issuer: 'https://auth-qa.mongodb.com/oauth2/default',
140144
},
141145
authPortalUrl: 'https://account-dev.mongodb.com/account/login',
146+
assistantApiBaseUrl: 'https://knowledge.staging.corp.mongodb.com/api/v1',
142147
},
143148
'atlas-dev': {
144149
wsBaseUrl: '',
@@ -149,6 +154,7 @@ const config = {
149154
issuer: 'https://auth-qa.mongodb.com/oauth2/default',
150155
},
151156
authPortalUrl: 'https://account-dev.mongodb.com/account/login',
157+
assistantApiBaseUrl: 'https://knowledge.staging.corp.mongodb.com/api/v1',
152158
},
153159
'atlas-qa': {
154160
wsBaseUrl: '',
@@ -159,6 +165,7 @@ const config = {
159165
issuer: 'https://auth-qa.mongodb.com/oauth2/default',
160166
},
161167
authPortalUrl: 'https://account-qa.mongodb.com/account/login',
168+
assistantApiBaseUrl: 'https://knowledge.staging.corp.mongodb.com/api/v1',
162169
},
163170
atlas: {
164171
wsBaseUrl: '',
@@ -169,6 +176,7 @@ const config = {
169176
issuer: 'https://auth.mongodb.com/oauth2/default',
170177
},
171178
authPortalUrl: 'https://account.mongodb.com/account/login',
179+
assistantApiBaseUrl: 'https://knowledge.staging.corp.mongodb.com/api/v1',
172180
},
173181
'web-sandbox-atlas-local': {
174182
wsBaseUrl: '/ccs',
@@ -179,6 +187,7 @@ const config = {
179187
issuer: 'https://auth-qa.mongodb.com/oauth2/default',
180188
},
181189
authPortalUrl: 'https://account-dev.mongodb.com/account/login',
190+
assistantApiBaseUrl: 'https://knowledge.staging.corp.mongodb.com/api/v1',
182191
},
183192
'web-sandbox-atlas-dev': {
184193
wsBaseUrl: '/ccs',
@@ -189,6 +198,7 @@ const config = {
189198
issuer: 'https://auth-qa.mongodb.com/oauth2/default',
190199
},
191200
authPortalUrl: 'https://account-dev.mongodb.com/account/login',
201+
assistantApiBaseUrl: 'https://knowledge.staging.corp.mongodb.com/api/v1',
192202
},
193203
'web-sandbox-atlas-qa': {
194204
wsBaseUrl: '/ccs',
@@ -199,6 +209,7 @@ const config = {
199209
issuer: 'https://auth-qa.mongodb.com/oauth2/default',
200210
},
201211
authPortalUrl: 'https://account-dev.mongodb.com/account/login',
212+
assistantApiBaseUrl: 'https://knowledge.staging.corp.mongodb.com/api/v1',
202213
},
203214
'web-sandbox-atlas': {
204215
wsBaseUrl: '/ccs',
@@ -209,6 +220,7 @@ const config = {
209220
issuer: 'https://auth.mongodb.com/oauth2/default',
210221
},
211222
authPortalUrl: 'https://account.mongodb.com/account/login',
223+
assistantApiBaseUrl: 'https://knowledge.staging.corp.mongodb.com/api/v1',
212224
},
213225
} as const;
214226

@@ -223,6 +235,7 @@ export function getAtlasConfig(
223235
issuer: process.env.COMPASS_OIDC_ISSUER_OVERRIDE,
224236
},
225237
authPortalUrl: process.env.COMPASS_ATLAS_AUTH_PORTAL_URL_OVERRIDE,
238+
assistantApiBaseUrl: process.env.COMPASS_ASSISTANT_BASE_URL_OVERRIDE,
226239
};
227240
return defaultsDeep(
228241
envConfig,
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
ignores:
2+
- '@mongodb-js/prettier-config-compass'
3+
- '@mongodb-js/tsconfig-compass'
4+
- '@types/chai'
5+
- '@types/sinon-chai'
6+
- 'sinon'
7+
- '@types/chai-dom'
8+
- '@types/react'
9+
- '@types/react-dom'
10+
ignore-patterns:
11+
- 'dist'
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
.nyc-output
2+
dist

0 commit comments

Comments
 (0)