Skip to content

Commit 4fed9a1

Browse files
committed
fixup: update schema-validation data service usage to use cursor
1 parent 604903e commit 4fed9a1

File tree

5 files changed

+16
-13
lines changed

5 files changed

+16
-13
lines changed

package-lock.json

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

packages/compass-data-modeling/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@
6666
"compass-preferences-model": "^2.35.0",
6767
"hadron-app-registry": "^9.4.8",
6868
"lodash": "^4.17.21",
69+
"mongodb": "^6.14.1",
6970
"mongodb-ns": "^2.4.2",
7071
"mongodb-schema": "^12.5.2",
7172
"react": "^17.0.2",

packages/compass-schema-validation/src/index.ts

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import { createLoggerLocator } from '@mongodb-js/compass-logging/provider';
1313
import { telemetryLocator } from '@mongodb-js/compass-telemetry/provider';
1414
import { SchemaValidationTabTitle } from './plugin-title';
1515
import { workspacesServiceLocator } from '@mongodb-js/compass-workspaces/provider';
16+
import type { RequiredDataServiceProps } from './modules';
1617

1718
const CompassSchemaValidationHadronPlugin = registerHadronPlugin(
1819
{
@@ -23,13 +24,8 @@ const CompassSchemaValidationHadronPlugin = registerHadronPlugin(
2324
activate: onActivated,
2425
},
2526
{
26-
dataService: dataServiceLocator as DataServiceLocator<
27-
| 'aggregate'
28-
| 'collectionInfo'
29-
| 'updateCollection'
30-
| 'sample'
31-
| 'isCancelError'
32-
>,
27+
dataService:
28+
dataServiceLocator as DataServiceLocator<RequiredDataServiceProps>,
3329
connectionInfoRef: connectionInfoRefLocator,
3430
instance: mongoDBInstanceLocator,
3531
preferences: preferencesLocator,

packages/compass-schema-validation/src/modules/index.ts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,14 +67,13 @@ export type RootAction =
6767
| EditModeAction
6868
| ResetAction;
6969

70-
export type DataService = Pick<
71-
OriginalDataService,
70+
export type RequiredDataServiceProps =
7271
| 'aggregate'
7372
| 'collectionInfo'
7473
| 'updateCollection'
75-
| 'sample'
76-
| 'isCancelError'
77-
>;
74+
| 'sampleCursor'
75+
| 'isCancelError';
76+
export type DataService = Pick<OriginalDataService, RequiredDataServiceProps>;
7877

7978
export type SchemaValidationExtraArgs = {
8079
dataService: DataService;

packages/compass-schema-validation/src/stores/store.spec.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,12 @@ const fakeDataService = {
4242
/* never resolves */
4343
}),
4444
isCancelError: () => false,
45-
sample: () => [{ prop1: 'abc' }],
45+
sampleCursor: () =>
46+
({
47+
*[Symbol.asyncIterator]() {
48+
yield* [{ prop1: 'abc' }];
49+
},
50+
} as any),
4651
} as any;
4752

4853
const fakeWorkspaces = {

0 commit comments

Comments
 (0)