From 825251278451e38173ebe5674b5e02822c7b3f64 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Thu, 25 Oct 2018 12:19:35 -0400
Subject: [PATCH] nested collections

---
 jslib                                         |  2 +-
 .../vault/groupings.component.ts              |  4 ++++
 src/app/vault/groupings.component.html        | 20 ++++++++++++-------
 src/app/vault/groupings.component.ts          |  3 ++-
 4 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/jslib b/jslib
index 6aba4550a4b..b0eea9d7cef 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit 6aba4550a4b1e643528392d6305df00977046232
+Subproject commit b0eea9d7cefdc5453750f49985689fefa1fa53a5
diff --git a/src/app/organizations/vault/groupings.component.ts b/src/app/organizations/vault/groupings.component.ts
index 3be2e453f6f..60622d8b8f6 100644
--- a/src/app/organizations/vault/groupings.component.ts
+++ b/src/app/organizations/vault/groupings.component.ts
@@ -50,5 +50,9 @@ export class GroupingsComponent extends BaseGroupingsComponent {
         unassignedCollection.organizationId = this.organization.id;
         unassignedCollection.readOnly = true;
         this.collections.push(unassignedCollection);
+
+        if (this.loadNestedCollections) {
+            this.nestedCollections = await this.collectionService.getAllNested(this.collections);
+        }
     }
 }
diff --git a/src/app/vault/groupings.component.html b/src/app/vault/groupings.component.html
index 1f3cb42242a..f4aa2a89b7e 100644
--- a/src/app/vault/groupings.component.html
+++ b/src/app/vault/groupings.component.html
@@ -52,7 +52,7 @@
                     </a>
                 </h3>
                 <ul class="fa-ul card-ul carets">
-                    <ng-template #recursiveList let-folders>
+                    <ng-template #recursiveFolders let-folders>
                         <li *ngFor="let f of folders" [ngClass]="{active: selectedFolder && f.node.id === selectedFolderId}">
                             <div class="d-flex">
                                 <a href="#" appStopClick (click)="selectFolder(f.node)">
@@ -63,20 +63,26 @@
                                 </a>
                             </div>
                             <ul class="fa-ul card-ul carets" *ngIf="f.children.length">
-                                <ng-container *ngTemplateOutlet="recursiveList; context:{ $implicit: f.children }"></ng-container>
+                                <ng-container *ngTemplateOutlet="recursiveFolders; context:{ $implicit: f.children }"></ng-container>
                             </ul>
                         </li>
                     </ng-template>
-                    <ng-container *ngTemplateOutlet="recursiveList; context:{ $implicit: nestedFolders }"></ng-container>
+                    <ng-container *ngTemplateOutlet="recursiveFolders; context:{ $implicit: nestedFolders }"></ng-container>
                 </ul>
             </ng-container>
             <ng-container *ngIf="showCollections && collections && collections.length">
                 <h3>{{'collections' | i18n}}</h3>
                 <ul class="fa-ul card-ul carets">
-                    <li *ngFor="let c of collections" [ngClass]="{active: c.id === selectedCollectionId}">
-                        <a href="#" appStopClick (click)="selectCollection(c)">
-                            <i class="fa-li fa fa-caret-right"></i> {{c.name}}</a>
-                    </li>
+                    <ng-template #recursiveCollections let-collections>
+                        <li *ngFor="let c of collections" [ngClass]="{active: c.node.id === selectedCollectionId}">
+                            <a href="#" appStopClick (click)="selectCollection(c.node)">
+                                <i class="fa-li fa fa-caret-right"></i> {{c.node.name}}</a>
+                            <ul class="fa-ul card-ul carets" *ngIf="c.children.length">
+                                <ng-container *ngTemplateOutlet="recursiveCollections; context:{ $implicit: c.children }"></ng-container>
+                            </ul>
+                        </li>
+                    </ng-template>
+                    <ng-container *ngTemplateOutlet="recursiveCollections; context:{ $implicit: nestedCollections }"></ng-container>
                 </ul>
             </ng-container>
         </ng-container>
diff --git a/src/app/vault/groupings.component.ts b/src/app/vault/groupings.component.ts
index 99cc6e019a6..83f81faf076 100644
--- a/src/app/vault/groupings.component.ts
+++ b/src/app/vault/groupings.component.ts
@@ -21,7 +21,8 @@ export class GroupingsComponent extends BaseGroupingsComponent {
 
     constructor(collectionService: CollectionService, folderService: FolderService) {
         super(collectionService, folderService);
-        this.loadNestedFolder = true;
+        this.loadNestedFolders = true;
+        this.loadNestedCollections = true;
     }
 
     searchTextChanged() {