@@ -11,9 +11,9 @@ import {
11
11
import { useState } from 'react' ;
12
12
import { Drive } from './contents' ;
13
13
import { DocumentRegistry } from '@jupyterlab/docregistry' ;
14
- import { SidePanel } from '@jupyterlab/ui-components' ;
15
- import { FileBrowser } from '@jupyterlab/filebrowser' ;
16
- import { ILayoutRestorer , JupyterFrontEnd } from '@jupyterlab/application' ;
14
+ // import { SidePanel } from '@jupyterlab/ui-components';
15
+ // import { FileBrowser } from '@jupyterlab/filebrowser';
16
+ // import { ILayoutRestorer, JupyterFrontEnd } from '@jupyterlab/application';
17
17
18
18
interface IProps {
19
19
model : DriveListModel ;
@@ -157,7 +157,6 @@ export function DriveListManagerComponent(props: IProps) {
157
157
} ;
158
158
159
159
const updateSelectedDrives = ( item : string , isName : boolean ) => {
160
- console . log ( 'you have clicked on add drive button' ) ;
161
160
updatedSelectedDrives = [ ...props . model . selectedDrives ] ;
162
161
let pickedDrive = new Drive ( ) ;
163
162
@@ -174,14 +173,21 @@ export function DriveListManagerComponent(props: IProps) {
174
173
}
175
174
} ) ;
176
175
177
- const checkDrive = isDriveAlreadySelected (
178
- pickedDrive ,
179
- updatedSelectedDrives
180
- ) ;
181
- if ( checkDrive === false ) {
182
- updatedSelectedDrives . push ( pickedDrive ) ;
176
+ if ( pickedDrive . status === 'active' ) {
177
+ if (
178
+ isDriveAlreadySelected ( pickedDrive , updatedSelectedDrives ) === false
179
+ ) {
180
+ updatedSelectedDrives . push ( pickedDrive ) ;
181
+ console . log ( `Drive filebrowser is added for ${ pickedDrive . name } drive` ) ;
182
+ } else {
183
+ console . warn (
184
+ `There is already a drive filebrowser for ${ pickedDrive . name } drive`
185
+ ) ;
186
+ }
183
187
} else {
184
- console . warn ( 'The selected drive is already in the list' ) ;
188
+ console . warn (
189
+ `The selected drive ${ pickedDrive . name } is inactive and cannot be mounted`
190
+ ) ;
185
191
}
186
192
187
193
setSelectedDrives ( updatedSelectedDrives ) ;
@@ -264,53 +270,6 @@ export class DriveListModel extends VDomModel {
264
270
setSelectedDrives ( selectedDrives : Drive [ ] ) {
265
271
this . selectedDrives = selectedDrives ;
266
272
}
267
- async sendConnectionRequest ( selectedDrives : Drive [ ] ) : Promise < boolean > {
268
- const lastAddedDrive = selectedDrives [ selectedDrives . length - 1 ] ;
269
- let response : boolean ;
270
- console . log ( 'Checking the status of selected drive ' , lastAddedDrive . name ) ;
271
- if ( lastAddedDrive . status === 'active' ) {
272
- response = true ;
273
- } else {
274
- console . warn ( 'The selected drive is inactive' ) ;
275
- response = false ;
276
- }
277
- /*requestAPI('send_connectionRequest', {
278
- method: 'POST'
279
- })
280
- .then(data => {
281
- console.log('data:', data);
282
- return data;
283
- })
284
- .catch(reason => {
285
- console.error(
286
- `The jupyter_drive server extension appears to be missing.\n${reason}`
287
- );
288
- return;
289
- });*/
290
- return response ;
291
- }
292
-
293
- async addPanel (
294
- drive : Drive ,
295
- panel : SidePanel ,
296
- filebrowser : FileBrowser ,
297
- app : JupyterFrontEnd ,
298
- restorer : ILayoutRestorer | null
299
- ) : Promise < boolean > {
300
- let response : boolean ;
301
- if ( drive . name === 'active' ) {
302
- response = true ;
303
- panel . addWidget ( filebrowser ) ;
304
- //app.shell.add(panel, 'left', { rank: 102 });
305
- if ( restorer ) {
306
- restorer . add ( panel , drive . name + '-browser' ) ;
307
- }
308
- } else {
309
- response = false ;
310
- console . warn ( 'The selected drive is inactive' ) ;
311
- }
312
- return response ;
313
- }
314
273
}
315
274
316
275
export class DriveListView extends VDomRenderer < DriveListModel > {
0 commit comments