Fix a few small bugs (#1588)

UnchartedBull · Mar 22, 2021 · c26a901 · c26a901
1 parent bdc8fce
commit c26a901
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 17 deletions.
diff --git a/src/app/files/files.component.html b/src/app/files/files.component.html
@@ -23,9 +23,11 @@
   </span>
 </div>
 
-<div class="files">
-  <ng-lottie [hidden]="loading === 0" id="loadingAnimation" [options]="loadingOptions"></ng-lottie>
+<div class="files" *ngIf="loading !== 0">
+  <ng-lottie id="loadingAnimation" [options]="loadingOptions"></ng-lottie>
+</div>
 
+<div class="files" *ngIf="loading === 0">
   <div *ngIf="!directory" class="files__error">can't load files ...</div>
 
   <div *ngIf="directory">
@@ -50,7 +52,7 @@
       <img src="assets/folder.svg" class="files__icon" />
       <div class="files__info">
         <span class="files__info-value">
-          {{ folder.size }} <span class="files__info-unit" *ngIf="folder.size > 0">mb</span>
+          {{ folder.size }} <span class="files__info-unit" *ngIf="folder.size !== undefined">mb</span>
         </span>
       </div>
       <span class="files__name">

diff --git a/src/app/files/files.component.ts b/src/app/files/files.component.ts
@@ -46,6 +46,7 @@ export class FilesComponent {
   }
 
   public openFolder(folderPath: string): void {
+    folderPath = folderPath === '' ? '/' : folderPath;
     setTimeout((): void => {
       this.showLoader();
       this.directory = { files: [], folders: [] };

diff --git a/src/app/services/files/files.octoprint.service.ts b/src/app/services/files/files.octoprint.service.ts
@@ -56,7 +56,7 @@ export class FilesOctoprintService implements FilesService {
                 origin: fileOrFolder.origin,
                 path: '/' + fileOrFolder.origin + '/' + fileOrFolder.path,
                 name: fileOrFolder.name,
-                date: this.conversionService.convertDateToString(new Date(fileOrFolder.date * 1000)),
+                date: this.conversionService.convertDateToString(new Date(fileOrFolder.date)),
                 size: this.conversionService.convertByteToMegabyte(fileOrFolder.size),
                 ...(fileOrFolder.gcodeAnalysis
                   ? {
@@ -84,18 +84,21 @@ export class FilesOctoprintService implements FilesService {
             );
 
             if (localCount > 0 && sdCardCount > 0) {
-              directory.folders.push({
-                origin: 'local',
-                path: '/local',
-                name: 'local',
-                size: `${localCount} files`,
-              } as Folder);
-              directory.folders.push({
-                origin: 'sdcard',
-                path: '/sdcard',
-                name: 'sdcard',
-                size: `${localCount} files`,
-              } as Folder);
+              directory.folders = [
+                {
+                  origin: 'local',
+                  path: '/local',
+                  name: 'local',
+                  size: undefined,
+                },
+                {
+                  origin: 'sdcard',
+                  path: '/sdcard',
+                  name: 'sdcard',
+                  size: undefined,
+                },
+              ];
+              directory.files = [];
             }
           }
 

diff --git a/src/app/services/socket/socket.octoprint.service.ts b/src/app/services/socket/socket.octoprint.service.ts
@@ -38,7 +38,7 @@ export class OctoPrintSocketService implements SocketService {
     private http: HttpClient,
   ) {
     this.printerStatusSubject = new ReplaySubject<PrinterStatus>();
-    this.jobStatusSubject = new ReplaySubject<JobStatus>();
+    this.jobStatusSubject = new Subject<JobStatus>();
     this.eventSubject = new ReplaySubject<PrinterEvent>();
   }