From 271dd3e12d81ce743bd8477479cf5d34dd17ef55 Mon Sep 17 00:00:00 2001
From: Aaron Greenspan <afg419@gmail.com>
Date: Wed, 13 Jan 2021 13:30:43 -0700
Subject: [PATCH] ui: external drives omits fully mounted drives

---
 .../external-drives/external-drives.page.html              | 6 +-----
 .../server-routes/external-drives/external-drives.page.ts  | 7 +++++--
 ui/src/app/services/api/mock-api.service.ts                | 4 ++--
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/ui/src/app/pages/server-routes/external-drives/external-drives.page.html b/ui/src/app/pages/server-routes/external-drives/external-drives.page.html
index 332d8f531..8190ed9c7 100644
--- a/ui/src/app/pages/server-routes/external-drives/external-drives.page.html
+++ b/ui/src/app/pages/server-routes/external-drives/external-drives.page.html
@@ -15,15 +15,11 @@
     <ion-refresher-content pullingIcon="lines" refreshingSpinner="lines"></ion-refresher-content>
   </ion-refresher>
 
-  <ion-item-divider>
-    Storage
-  </ion-item-divider>
-
   <ion-item-group>
     <!-- <ion-list> -->
       <ion-item *ngFor="let d of disks; let i = index">
         <ion-icon slot="start" name="save-outline"></ion-icon>
-        <ion-label>{{d.logicalname}}</ion-label>
+        <ion-label>{{d.logicalname}} ({{ d.size }})</ion-label>
         <ion-button *ngIf="!(d.$ejecting$ | async)" slot="end" fill="clear" color="medium" (click)="ejectDisk(i)">
           <ion-icon color="primary" class="icon" src="/assets/icon/eject.svg"></ion-icon>
         </ion-button>
diff --git a/ui/src/app/pages/server-routes/external-drives/external-drives.page.ts b/ui/src/app/pages/server-routes/external-drives/external-drives.page.ts
index 88890b1b0..1cbbcbfcb 100644
--- a/ui/src/app/pages/server-routes/external-drives/external-drives.page.ts
+++ b/ui/src/app/pages/server-routes/external-drives/external-drives.page.ts
@@ -2,7 +2,7 @@ import { Component } from '@angular/core'
 import { pauseFor } from 'src/app/util/misc.util'
 import { ApiService } from 'src/app/services/api/api.service'
 import { DiskInfo } from 'src/app/models/server-model'
-import { markAsLoadingDuring$, markAsLoadingDuringAsync, markAsLoadingDuringP } from 'src/app/services/loader.service'
+import { markAsLoadingDuringP } from 'src/app/services/loader.service'
 import { BehaviorSubject } from 'rxjs'
 import { AlertController } from '@ionic/angular'
 
@@ -36,7 +36,10 @@ export class ExternalDrivesPage {
 
   async fetchDisks () {
     return this.apiService.getExternalDisks().then(ds => {
-      this.disks = ds.map(d => ({ ...d, $ejecting$: new BehaviorSubject(false)})).sort( (a, b) => a.logicalname < b.logicalname ? -1 : 1 )
+      this.disks = ds
+        .filter(d => !!d.partitions.find(p => !p.isMounted))
+        .map(d => ({ ...d, $ejecting$: new BehaviorSubject(false)}))
+        .sort( (a, b) => a.logicalname < b.logicalname ? -1 : 1 )
     })
   }
 
diff --git a/ui/src/app/services/api/mock-api.service.ts b/ui/src/app/services/api/mock-api.service.ts
index 2cd23a1b6..fbd070445 100644
--- a/ui/src/app/services/api/mock-api.service.ts
+++ b/ui/src/app/services/api/mock-api.service.ts
@@ -488,13 +488,13 @@ const mockApiExternalDisks: DiskInfo[] = [
   },
   {
     logicalname: '/dev/sbd',
-    size: '128GBGB',
+    size: '128GB',
     description: 'large USB stick',
     partitions: [
       {
         logicalname: 'sdba1',
         size: '32GB',
-        isMounted: true,
+        isMounted: false,
         label: 'Partition 1',
       },
       {