Skip to content

Commit 251f39b

Browse files
authored
chore(connection-storage): move connection storage from data service COMPASS-6623 (#4642)
1 parent d0f2337 commit 251f39b

Some content is hidden

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

61 files changed

+411
-126
lines changed

package-lock.json

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

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@
6363
"mongodb-data-service": "^22.8.0"
6464
},
6565
"devDependencies": {
66+
"@mongodb-js/connection-storage": "^0.1.0",
6667
"@mongodb-js/eslint-config-compass": "^1.0.6",
6768
"@mongodb-js/mocha-config-compass": "^1.2.0",
6869
"@mongodb-js/prettier-config-compass": "^1.0.0",

packages/compass-connection-import-export/src/components/export-modal.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import { SelectTable } from './select-table';
1313
import type { ImportExportResult } from '../hooks/common';
1414
import { useOpenModalThroughIpc } from '../hooks/common';
1515
import { useExportConnections } from '../hooks/use-export';
16-
import type { ConnectionInfo } from 'mongodb-data-service';
16+
import type { ConnectionInfo } from '@mongodb-js/connection-storage';
1717
import { usePreference } from 'compass-preferences-model';
1818

1919
const TOAST_TIMEOUT_MS = 5000;

packages/compass-connection-import-export/src/components/import-modal.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import { SelectTable } from './select-table';
1414
import type { ImportExportResult } from '../hooks/common';
1515
import { useOpenModalThroughIpc } from '../hooks/common';
1616
import { useImportConnections } from '../hooks/use-import';
17-
import type { ConnectionInfo } from 'mongodb-data-service';
17+
import type { ConnectionInfo } from '@mongodb-js/connection-storage';
1818

1919
const TOAST_TIMEOUT_MS = 5000;
2020

packages/compass-connection-import-export/src/hooks/common.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import type { ConnectionInfo } from 'mongodb-data-service';
1+
import type { ConnectionInfo } from '@mongodb-js/connection-storage';
22
import type { Dispatch, SetStateAction } from 'react';
33
import { useEffect } from 'react';
44
import { useCallback } from 'react';

packages/compass-connection-import-export/src/hooks/use-export.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import {
55
makeConnectionInfoFilter,
66
useImportExportConnectionsCommon,
77
} from './common';
8-
import type { ConnectionInfo } from 'mongodb-data-service';
9-
import { exportConnections as dataServiceExportConnections } from 'mongodb-data-service';
8+
import type { ConnectionInfo } from '@mongodb-js/connection-storage';
9+
import { exportConnections as storageExportConnections } from '@mongodb-js/connection-storage';
1010
import { promises as fs } from 'fs';
1111
import type {
1212
ImportExportResult,
@@ -48,7 +48,7 @@ export function useExportConnections(
4848
open: boolean;
4949
trackingProps?: Record<string, unknown>;
5050
},
51-
exportConnections = dataServiceExportConnections
51+
exportConnections = storageExportConnections
5252
): {
5353
onCancel: () => void;
5454
onSubmit: () => void;

packages/compass-connection-import-export/src/hooks/use-import.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { useCallback, useEffect, useState } from 'react';
2-
import type { ConnectionInfo } from 'mongodb-data-service';
3-
import { importConnections as dataServiceImportConnections } from 'mongodb-data-service';
2+
import type { ConnectionInfo } from '@mongodb-js/connection-storage';
3+
import { importConnections as storageImportConnections } from '@mongodb-js/connection-storage';
44
import { promises as fs } from 'fs';
55
import {
66
COMMON_INITIAL_STATE,
@@ -36,7 +36,7 @@ async function loadFile(
3636
}: Pick<ImportConnectionsState, 'filename' | 'passphrase'> & {
3737
favoriteConnectionIds: string[];
3838
},
39-
importConnections: typeof dataServiceImportConnections
39+
importConnections: typeof storageImportConnections
4040
): Promise<Partial<ImportConnectionsState>> {
4141
if (!filename) {
4242
return INITIAL_STATE;
@@ -90,7 +90,7 @@ export function useImportConnections(
9090
open: boolean;
9191
trackingProps?: Record<string, unknown>;
9292
},
93-
importConnections = dataServiceImportConnections
93+
importConnections = storageImportConnections
9494
): {
9595
onCancel: () => void;
9696
onSubmit: () => void;

packages/compass-connections/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@
6868
"devDependencies": {
6969
"@mongodb-js/compass-components": "^1.10.0",
7070
"@mongodb-js/compass-maybe-protect-connection-string": "^0.8.0",
71+
"@mongodb-js/connection-storage": "^0.1.0",
7172
"@mongodb-js/eslint-config-compass": "^1.0.6",
7273
"@mongodb-js/mocha-config-compass": "^1.2.0",
7374
"@mongodb-js/prettier-config-compass": "^1.0.0",

packages/compass-connections/src/components/connection-list/connection-list.spec.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {
88
} from '@testing-library/react';
99
import { expect } from 'chai';
1010
import sinon from 'sinon';
11-
import type { ConnectionInfo } from 'mongodb-data-service';
11+
import type { ConnectionInfo } from '@mongodb-js/connection-storage';
1212

1313
import ConnectionList from './connection-list';
1414

packages/compass-connections/src/components/connection-list/connection-list.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import {
1313
ItemActionControls,
1414
} from '@mongodb-js/compass-components';
1515
import type { ItemAction } from '@mongodb-js/compass-components';
16-
import type { ConnectionInfo } from 'mongodb-data-service';
16+
import type { ConnectionInfo } from '@mongodb-js/connection-storage';
1717
import type AppRegistry from 'hadron-app-registry';
1818

1919
import Connection from './connection';

0 commit comments

Comments
 (0)