update to IDriveInfo interface

Author: DenisaCG

src/contents.ts

@@ -4,7 +4,7 @@
 import { Signal, ISignal } from '@lumino/signaling';
 import { Contents, ServerConnection } from '@jupyterlab/services';
 import { PathExt } from '@jupyterlab/coreutils';
-import { IDrivesList } from './token';
+import { IDriveInfo } from './token';
 
 let data: Contents.IModel = {
   name: '',
@@ -28,21 +28,21 @@ export class Drive implements Contents.IDrive {
   constructor(options: Drive.IOptions = {}) {
     this._serverSettings = ServerConnection.makeSettings();
     this._name = options.name ?? '';
-    this._drivesList = options.drivesList ?? { names: [] };
+    this._drivesList = options.drivesList ?? [];
     //this._apiEndpoint = options.apiEndpoint ?? SERVICE_DRIVE_URL;
   }
 
   /**
    * The drives list getter.
    */
-  get drivesList(): IDrivesList {
+  get drivesList(): IDriveInfo[] {
     return this._drivesList;
   }
 
   /**
    * The drives list setter.
    * */
-  set drivesList(list: IDrivesList) {
+  set drivesList(list: IDriveInfo[]) {
     this._drivesList = list;
   }
 
@@ -204,12 +204,12 @@ export class Drive implements Contents.IDrive {
       };
     } else {
       const drivesList: Contents.IModel[] = [];
-      for (const drive of this._drivesList.names) {
+      for (const drive of this._drivesList) {
         drivesList.push({
-          name: drive,
-          path: drive,
+          name: drive.name,
+          path: drive.name,
           last_modified: '',
-          created: '',
+          created: drive.creationDate,
           content: [],
           format: 'json',
           mimetype: '',
@@ -593,7 +593,7 @@ export class Drive implements Contents.IDrive {
   }*/
 
   // private _apiEndpoint: string;
-  private _drivesList: IDrivesList = { names: [] };
+  private _drivesList: IDriveInfo[] = [];
   private _serverSettings: ServerConnection.ISettings;
   private _name: string = '';
   private _provider: string = '';
@@ -613,7 +613,7 @@ export namespace Drive {
     /**
      * List of available drives.
      */
-    drivesList?: IDrivesList;
+    drivesList?: IDriveInfo[];
 
     /**
      * The name for the `Drive`, which is used in file

src/index.ts

@@ -27,7 +27,7 @@ import { DriveListModel, DriveListView, IDrive } from './drivelistmanager';
 import { DriveIcon, driveBrowserIcon } from './icons';
 import { Drive } from './contents';
 import { getDrivesList } from './requests';
-import { IDrivesList } from './token';
+import { IDriveInfo, IDrivesList } from './token';
 
 /**
  * The command IDs used by the driveBrowser plugin.
@@ -155,20 +155,25 @@ const openDriveDialogPlugin: JupyterFrontEndPlugin<void> = {
 /**
  * The drives list provider.
  */
-const drivesListProvider: JupyterFrontEndPlugin<IDrivesList> = {
+const drivesListProvider: JupyterFrontEndPlugin<IDriveInfo[]> = {
   id: '@jupyter/drives:drives-list',
   description: 'The drives list provider.',
   provides: IDrivesList,
-  activate: async (_: JupyterFrontEnd): Promise<IDrivesList> => {
-    const driveNames: string[] = [];
+  activate: async (_: JupyterFrontEnd): Promise<IDriveInfo[]> => {
+    const drives: IDriveInfo[] = [];
 
     const response = await getDrivesList();
     if (response.code === 200) {
       for (const d of response.data) {
-        driveNames.push(d.name);
+        drives.push({
+          name: d.name,
+          region: d.region,
+          provider: d.provider,
+          creationDate: d.creation_date
+        });
       }
     }
-    return { names: driveNames };
+    return drives;
   }
 };
 
@@ -198,7 +203,7 @@ const driveFileBrowser: JupyterFrontEndPlugin<void> = {
     toolbarRegistry: IToolbarWidgetRegistry,
     settingsRegistry: ISettingRegistry,
     translator: ITranslator,
-    drivesList: IDrivesList,
+    drivesList: IDriveInfo[],
     router: IRouter | null,
     tree: JupyterFrontEnd.ITreeResolver | null,
     labShell: ILabShell | null,

src/token.ts

@@ -1,9 +1,12 @@
 import { Token } from '@lumino/coreutils';
 
-export const IDrivesList = new Token<IDrivesList>(
+export const IDrivesList = new Token<IDriveInfo[]>(
   '@jupyter/drives:drives-list-provider'
 );
 
-export interface IDrivesList {
-  names: string[];
+export interface IDriveInfo {
+  name: string;
+  region: string;
+  provider: string;
+  creationDate: string;
 }