From 063951cffa132a714c263692fdc16efbd8e691a4 Mon Sep 17 00:00:00 2001
From: Jesse Lucas <jesse@jesselucas.com>
Date: Wed, 18 Mar 2020 19:39:25 -0400
Subject: [PATCH] Synchronously get the status of each folder

---
 .../donut-chart/donut-chart.component.ts      |  2 -
 .../folder-chart/folder-chart.component.ts    |  6 +--
 src/app/folder.service.ts                     | 38 ++++++++++++++++---
 3 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/src/app/chart/donut-chart/donut-chart.component.ts b/src/app/chart/donut-chart/donut-chart.component.ts
index fd29c4577..5555ea7e8 100644
--- a/src/app/chart/donut-chart/donut-chart.component.ts
+++ b/src/app/chart/donut-chart/donut-chart.component.ts
@@ -1,6 +1,5 @@
 import { Component, Input } from '@angular/core';
 import { Chart } from 'chart.js'
-import { SystemConfigService } from 'src/app/system-config.service';
 
 @Component({
   selector: 'app-donut-chart',
@@ -32,7 +31,6 @@ export class DonutChartComponent {
     this.chart.update();
   }
 
-
   ngAfterViewInit(): void {
     this.canvas = document.getElementById(this.elementID);
     this.ctx = this.canvas.getContext('2d');
diff --git a/src/app/chart/folder-chart/folder-chart.component.ts b/src/app/chart/folder-chart/folder-chart.component.ts
index 33cfe3b6f..a0df360c6 100644
--- a/src/app/chart/folder-chart/folder-chart.component.ts
+++ b/src/app/chart/folder-chart/folder-chart.component.ts
@@ -14,9 +14,9 @@ import { DonutChartComponent } from '../donut-chart/donut-chart.component';
 })
 export class FolderChartComponent implements OnInit {
   @ViewChild(DonutChartComponent) donutChart: DonutChartComponent;
-
   chartID: string = 'foldersChart';
   elevation: string = cardElevation;
+
   constructor(
     private systemConfigService: SystemConfigService,
     private folderService: FolderService,
@@ -30,9 +30,9 @@ export class FolderChartComponent implements OnInit {
     // TODO: Find total number of folders
     this.folderService.getAll().subscribe(
       folder => {
-
         // TODO: Clear existing data
-        this.donutChart.data([0, 30, 32, 40]);
+        this.donutChart.data([40]);
+
         console.log("folder?", folder)
       }
     );
diff --git a/src/app/folder.service.ts b/src/app/folder.service.ts
index da4f5c2c7..f6650e3d2 100644
--- a/src/app/folder.service.ts
+++ b/src/app/folder.service.ts
@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
 import { SystemConfigService } from './system-config.service';
-import { Observable } from 'rxjs';
+import { Observable, Subscriber } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { Folder } from './folder';
 import { DbStatusService } from './db-status.service';
@@ -9,33 +9,58 @@ import { DbStatusService } from './db-status.service';
   providedIn: 'root'
 })
 export class FolderService {
+  private folders: Folder[];
 
   constructor(
     private systemConfigService: SystemConfigService,
     private dbStatusService: DbStatusService
   ) { }
 
+  getFolderStatusInOrder(observer: Subscriber<Folder>, startIndex: number) {
+    // Return if there aren't any folders at the index
+    if (startIndex >= (this.folders.length - 1)) {
+      return
+    }
+
+    const folder: Folder = this.folders[startIndex];
+    startIndex = startIndex + 1;
+    this.dbStatusService.getFolderStatus(folder.id).subscribe(
+      status => {
+        folder["status"] = status;
+        observer.next(folder);
+
+        // recursively get the status of the next folder
+        this.getFolderStatusInOrder(observer, startIndex);
+      }
+    );
+  }
+
   /**
    * getAll() finds all folders and uses db status service to 
    * set all their statuses
    */
   getAll(): Observable<Folder> {
-    const dbs = this.dbStatusService;
+    const _this = this;
     const folderObservable: Observable<Folder> = new Observable((observer) => {
       this.systemConfigService.getFolders().subscribe({
         next(folders) {
-          let folder: Folder;
-          for (folder of folders) {
+          _this.folders = folders;
+
+          // Synchronously get the status of each folder
+          _this.getFolderStatusInOrder(observer, 0);
+
+          /*
+          for (let folder of folders) {
             // Get the status of each folder
             dbs.getFolderStatus(folder.id).subscribe(
               status => {
-                console.log(status)
                 folder["status"] = status;
-
+  
                 observer.next(folder);
               }
             );
           }
+          */
         },
         error(err) { console.log("getAll error!", err) }
       });
@@ -43,3 +68,4 @@ export class FolderService {
     return folderObservable
   }
 }
+