Skip to content

Commit 5edf5e2

Browse files
myang1220myang1220
committed
potentital org and group id retrieval
1 parent 5d39eb3 commit 5edf5e2

File tree

11 files changed

+623
-182
lines changed

11 files changed

+623
-182
lines changed

‎package-lock.json‎

Lines changed: 463 additions & 9 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: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,11 @@
2828
],
2929
"license": "SSPL",
3030
"exports": {
31-
"./atlas-service": "./dist/atlas-service.js",
3231
"./main": "./main.js",
3332
"./renderer": "./renderer.js",
3433
"./provider": "./dist/provider.js"
3534
},
3635
"compass:exports": {
37-
"./atlas-service": "./src/atlas-service.ts",
3836
"./main": "./src/main.ts",
3937
"./renderer": "./src/renderer.ts",
4038
"./provider": "./src/provider.tsx"

‎packages/compass-global-writes/src/index.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import { createLoggerLocator } from '@mongodb-js/compass-logging/provider';
88
import { telemetryLocator } from '@mongodb-js/compass-telemetry/provider';
99
import { connectionInfoRefLocator } from '@mongodb-js/compass-connections/provider';
1010
import { atlasServiceLocator } from '@mongodb-js/atlas-service/provider';
11-
export { AtlasGlobalWritesService } from './services/atlas-global-writes-service';
1211

1312
const CompassGlobalWritesPluginProvider = registerCompassPlugin(
1413
{

‎packages/compass-query-bar/src/stores/query-bar-store.ts‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,12 @@ export function activatePlugin(
130130

131131
const favoriteQueryStorage = favoriteQueryStorageAccess?.getStorage();
132132
const recentQueryStorage = recentQueryStorageAccess?.getStorage();
133+
134+
const orgId = connectionInfoRef.current.atlasMetadata.orgId;
135+
const groupId = connectionInfoRef.current.atlasMetadata.projectId;
136+
favoriteQueryStorage.setOrgAndGroupId(orgId, groupId);
137+
recentQueryStorage.setOrgAndGroupId(orgId, groupId);
138+
133139
const store = configureStore(
134140
{
135141
namespace: namespace ?? '',

‎packages/compass-user-data/package.json‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"email": "[email protected]"
1313
},
1414
"homepage": "https://github.com/mongodb-js/compass",
15-
"version": "0.8.0",
15+
"version": "0.7.5",
1616
"repository": {
1717
"type": "git",
1818
"url": "https://github.com/mongodb-js/compass.git"
@@ -51,15 +51,13 @@
5151
"dependencies": {
5252
"@mongodb-js/compass-logging": "^1.7.5",
5353
"@mongodb-js/compass-utils": "^0.9.4",
54-
"@mongodb-js/atlas-service": "^0.49.0",
55-
"@mongodb-js/compass-connections": "^1.64.0",
56-
"compass-preferences-model": "^2.44.0",
54+
"@mongodb-js/compass-connections": "^1.65.0",
5755
"write-file-atomic": "^5.0.1",
5856
"zod": "^3.25.17"
5957
},
6058
"devDependencies": {
61-
"@mongodb-js/eslint-config-compass": "^1.4.2",
62-
"@mongodb-js/mocha-config-compass": "^1.6.10",
59+
"@mongodb-js/eslint-config-compass": "^1.4.1",
60+
"@mongodb-js/mocha-config-compass": "^1.6.9",
6361
"@mongodb-js/prettier-config-compass": "^1.2.8",
6462
"@mongodb-js/tsconfig-compass": "^1.2.9",
6563
"@types/chai": "^4.2.21",

‎packages/compass-user-data/src/index.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
export type { Stats, ReadAllResult, ReadAllWithStatsResult } from './user-data';
2-
export { IUserData, FileUserData, AtlasUserData } from './user-data';
2+
export { IUserData, FileUserData } from './user-data';
33
export { z } from 'zod';

‎packages/compass-user-data/src/user-data.spec.ts‎

Lines changed: 108 additions & 108 deletions
Original file line numberDiff line numberDiff line change
@@ -419,111 +419,111 @@ describe('user-data', function () {
419419
});
420420
});
421421

422-
describe('AtlasUserData', function () {
423-
let AtlasUserData: any;
424-
let atlasServiceMock: any;
425-
let validator: any;
426-
let instance: any;
427-
428-
before(async function () {
429-
// Dynamically import AtlasUserData to avoid circular deps
430-
const module = await import('./user-data');
431-
AtlasUserData = module.AtlasUserData;
432-
validator = getTestSchema();
433-
});
434-
435-
beforeEach(function () {
436-
atlasServiceMock = {
437-
authenticatedFetch: sinon.stub(),
438-
};
439-
instance = new AtlasUserData(validator, atlasServiceMock, {
440-
groupId: 'test-group',
441-
projectId: 'test-project',
442-
endpoint: '/api/user-data',
443-
});
444-
});
445-
446-
it('constructs with dependencies', function () {
447-
expect(instance).to.have.property('atlasService', atlasServiceMock);
448-
expect(instance).to.have.property('groupId', 'test-group');
449-
expect(instance).to.have.property('projectId', 'test-project');
450-
expect(instance).to.have.property('endpoint', '/api/user-data');
451-
});
452-
453-
it('write: calls authenticatedFetch and validates response', async function () {
454-
const item = { name: 'Atlas', hasDarkMode: false };
455-
atlasServiceMock.authenticatedFetch.resolves({
456-
ok: true,
457-
json: async () => await Promise.resolve(item),
458-
});
459-
const result = await instance.write('id1', item);
460-
expect(result).to.be.true;
461-
expect(atlasServiceMock.authenticatedFetch.calledOnce).to.be.true;
462-
});
463-
464-
it('write: handles API error', async function () {
465-
atlasServiceMock.authenticatedFetch.resolves({ ok: false, status: 500 });
466-
const result = await instance.write('id1', { name: 'Atlas' });
467-
expect(result).to.be.false;
468-
});
469-
470-
it('delete: calls authenticatedFetch and returns true on success', async function () {
471-
atlasServiceMock.authenticatedFetch.resolves({ ok: true });
472-
const result = await instance.delete('id1');
473-
expect(result).to.be.true;
474-
});
475-
476-
it('delete: returns false on API failure', async function () {
477-
atlasServiceMock.authenticatedFetch.resolves({ ok: false });
478-
const result = await instance.delete('id1');
479-
expect(result).to.be.false;
480-
});
481-
482-
it('readAll: returns validated items from API', async function () {
483-
const items = [
484-
{ name: 'Atlas', hasDarkMode: true },
485-
{ name: 'Compass', hasDarkMode: false },
486-
];
487-
atlasServiceMock.authenticatedFetch.resolves({
488-
ok: true,
489-
json: async () => await Promise.resolve(items),
490-
});
491-
const result = await instance.readAll();
492-
expect(result.data).to.have.lengthOf(2);
493-
expect(result.errors).to.have.lengthOf(0);
494-
expect(result.data[0]).to.have.property('name');
495-
});
496-
497-
it('readAll: returns errors for invalid items', async function () {
498-
const items = [
499-
{ name: 'Atlas', hasDarkMode: 'not-a-bool' },
500-
{ name: 'Compass', hasDarkMode: false },
501-
];
502-
atlasServiceMock.authenticatedFetch.resolves({
503-
ok: true,
504-
json: async () => await Promise.resolve(items),
505-
});
506-
const result = await instance.readAll();
507-
expect(result.data).to.have.lengthOf(1);
508-
expect(result.errors).to.have.lengthOf(1);
509-
});
510-
511-
it('updateAttributes: calls authenticatedFetch and validates response', async function () {
512-
const attrs = { hasDarkMode: false };
513-
atlasServiceMock.authenticatedFetch.resolves({
514-
ok: true,
515-
json: async () =>
516-
await Promise.resolve({ name: 'Atlas', hasDarkMode: false }),
517-
});
518-
const result = await instance.updateAttributes('id1', attrs);
519-
expect(result).to.deep.equal({ name: 'Atlas', hasDarkMode: false });
520-
});
521-
522-
it('updateAttributes: returns undefined on API error', async function () {
523-
atlasServiceMock.authenticatedFetch.resolves({ ok: false });
524-
const result = await instance.updateAttributes('id1', {
525-
hasDarkMode: true,
526-
});
527-
expect(result).to.be.undefined;
528-
});
529-
});
422+
// describe('AtlasUserData', function () {
423+
// let AtlasUserData: any;
424+
// let atlasServiceMock: any;
425+
// let validator: any;
426+
// let instance: any;
427+
428+
// before(async function () {
429+
// // Dynamically import AtlasUserData to avoid circular deps
430+
// const module = await import('./user-data');
431+
// AtlasUserData = module.AtlasUserData;
432+
// validator = getTestSchema();
433+
// });
434+
435+
// beforeEach(function () {
436+
// atlasServiceMock = {
437+
// authenticatedFetch: sinon.stub(),
438+
// };
439+
// instance = new AtlasUserData(validator, atlasServiceMock, {
440+
// groupId: 'test-group',
441+
// projectId: 'test-project',
442+
// endpoint: '/api/user-data',
443+
// });
444+
// });
445+
446+
// it('constructs with dependencies', function () {
447+
// expect(instance).to.have.property('atlasService', atlasServiceMock);
448+
// expect(instance).to.have.property('groupId', 'test-group');
449+
// expect(instance).to.have.property('projectId', 'test-project');
450+
// expect(instance).to.have.property('endpoint', '/api/user-data');
451+
// });
452+
453+
// it('write: calls authenticatedFetch and validates response', async function () {
454+
// const item = { name: 'Atlas', hasDarkMode: false };
455+
// atlasServiceMock.authenticatedFetch.resolves({
456+
// ok: true,
457+
// json: async () => await Promise.resolve(item),
458+
// });
459+
// const result = await instance.write('id1', item);
460+
// expect(result).to.be.true;
461+
// expect(atlasServiceMock.authenticatedFetch.calledOnce).to.be.true;
462+
// });
463+
464+
// it('write: handles API error', async function () {
465+
// atlasServiceMock.authenticatedFetch.resolves({ ok: false, status: 500 });
466+
// const result = await instance.write('id1', { name: 'Atlas' });
467+
// expect(result).to.be.false;
468+
// });
469+
470+
// it('delete: calls authenticatedFetch and returns true on success', async function () {
471+
// atlasServiceMock.authenticatedFetch.resolves({ ok: true });
472+
// const result = await instance.delete('id1');
473+
// expect(result).to.be.true;
474+
// });
475+
476+
// it('delete: returns false on API failure', async function () {
477+
// atlasServiceMock.authenticatedFetch.resolves({ ok: false });
478+
// const result = await instance.delete('id1');
479+
// expect(result).to.be.false;
480+
// });
481+
482+
// it('readAll: returns validated items from API', async function () {
483+
// const items = [
484+
// { name: 'Atlas', hasDarkMode: true },
485+
// { name: 'Compass', hasDarkMode: false },
486+
// ];
487+
// atlasServiceMock.authenticatedFetch.resolves({
488+
// ok: true,
489+
// json: async () => await Promise.resolve(items),
490+
// });
491+
// const result = await instance.readAll();
492+
// expect(result.data).to.have.lengthOf(2);
493+
// expect(result.errors).to.have.lengthOf(0);
494+
// expect(result.data[0]).to.have.property('name');
495+
// });
496+
497+
// it('readAll: returns errors for invalid items', async function () {
498+
// const items = [
499+
// { name: 'Atlas', hasDarkMode: 'not-a-bool' },
500+
// { name: 'Compass', hasDarkMode: false },
501+
// ];
502+
// atlasServiceMock.authenticatedFetch.resolves({
503+
// ok: true,
504+
// json: async () => await Promise.resolve(items),
505+
// });
506+
// const result = await instance.readAll();
507+
// expect(result.data).to.have.lengthOf(1);
508+
// expect(result.errors).to.have.lengthOf(1);
509+
// });
510+
511+
// it('updateAttributes: calls authenticatedFetch and validates response', async function () {
512+
// const attrs = { hasDarkMode: false };
513+
// atlasServiceMock.authenticatedFetch.resolves({
514+
// ok: true,
515+
// json: async () =>
516+
// await Promise.resolve({ name: 'Atlas', hasDarkMode: false }),
517+
// });
518+
// const result = await instance.updateAttributes('id1', attrs);
519+
// expect(result).to.deep.equal({ name: 'Atlas', hasDarkMode: false });
520+
// });
521+
522+
// it('updateAttributes: returns undefined on API error', async function () {
523+
// atlasServiceMock.authenticatedFetch.resolves({ ok: false });
524+
// const result = await instance.updateAttributes('id1', {
525+
// hasDarkMode: true,
526+
// });
527+
// expect(result).to.be.undefined;
528+
// });
529+
// });

0 commit comments

Comments
 (0)