chore(import-export): refactor import store to use service injection

Author: gribnoysup

packages/compass-home/src/components/home.tsx

@@ -355,6 +355,7 @@ function Home({
         // AppRegistry scope for a connected application
         <AppRegistryProvider>
           <DataServiceProvider value={connectedDataService.current}>
+            <ImportPlugin></ImportPlugin>
             <ExportPlugin></ExportPlugin>
             <Workspace namespace={namespace} />
           </DataServiceProvider>
@@ -386,7 +387,6 @@ function Home({
       <DropDatabasePlugin></DropDatabasePlugin>
       <CreateCollectionPlugin></CreateCollectionPlugin>
       <DropCollectionPlugin></DropCollectionPlugin>
-      <ImportPlugin></ImportPlugin>
       <AtlasSignIn></AtlasSignIn>
     </SignalHooksProvider>
   );

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

@@ -168,12 +168,16 @@ function ImportModal({
   if (isOpen && !fileName && errors.length === 0) {
     // Show the file input when we don't have a file to import yet.
     return (
-      <ImportFileInput
-        autoOpen
-        onCancel={handleClose}
-        fileName={fileName}
-        selectImportFileName={selectImportFileName}
-      />
+      // Don't actually show it on the screen, just render it to trigger
+      // autoOpen
+      <div style={{ display: 'none' }}>
+        <ImportFileInput
+          autoOpen
+          onCancel={handleClose}
+          fileName={fileName}
+          selectImportFileName={selectImportFileName}
+        />
+      </div>
     );
   }
 
@@ -266,7 +270,7 @@ function ImportModal({
  * Map the state of the store to component properties.
  */
 const mapStateToProps = (state: RootImportState) => ({
-  ns: state.ns,
+  ns: state.import.namespace,
   isOpen: state.import.isOpen,
   errors: state.import.errors,
   fileType: state.import.fileType,

packages/compass-import-export/src/import/import-csv.ts

@@ -28,7 +28,7 @@ import { ByteCounter } from '../utils/byte-counter';
 const debug = createDebug('import-csv');
 
 type ImportCSVOptions = {
-  dataService: DataService;
+  dataService: Pick<DataService, 'bulkWrite' | 'insertOne'>;
   ns: string;
   input: Readable;
   output?: Writable;

packages/compass-import-export/src/import/import-json.ts

@@ -26,7 +26,7 @@ const debug = createDebug('import-json');
 type JSONVariant = 'json' | 'jsonl';
 
 type ImportJSONOptions = {
-  dataService: DataService;
+  dataService: Pick<DataService, 'bulkWrite' | 'insertOne'>;
   ns: string;
   input: Readable;
   output?: Writable;

packages/compass-import-export/src/index.ts

@@ -8,11 +8,18 @@ import { activatePlugin as activateExportPlugin } from './stores/export-store';
 /**
  * The import plugin.
  */
-export const ImportPlugin = registerHadronPlugin({
-  name: 'Import',
-  component: ImportPluginComponent,
-  activate: activateImportPlugin,
-});
+export const ImportPlugin = registerHadronPlugin(
+  {
+    name: 'Import',
+    component: ImportPluginComponent,
+    activate: activateImportPlugin,
+  },
+  {
+    dataService: dataServiceLocator as typeof dataServiceLocator<
+      'isConnected' | 'bulkWrite' | 'insertOne'
+    >,
+  }
+);
 
 /**
  * The export plugin.