From 2f8a3bf4712e43a15fe210b9e4cd2d1839507a27 Mon Sep 17 00:00:00 2001
From: Julien Louis <jul.louis@gmail.com>
Date: Thu, 28 Nov 2024 11:38:45 +0100
Subject: [PATCH] refresh tree button + go to study list when deleting study

---
 .../entity/entity.component.abstract.ts       |  2 +-
 .../studies/study/study-tree.component.html   |  6 ++++
 .../src/app/studies/study/tree.service.ts     | 28 +++++++++++++------
 .../studies/tree/study-node.component.html    |  1 +
 .../app/studies/tree/study-node.component.ts  |  8 ++++++
 shanoir-ng-front/src/app/tree/tree.model.ts   |  5 +++-
 6 files changed, 39 insertions(+), 11 deletions(-)

diff --git a/shanoir-ng-front/src/app/shared/components/entity/entity.component.abstract.ts b/shanoir-ng-front/src/app/shared/components/entity/entity.component.abstract.ts
index 9ad482d269..7e3d628b18 100644
--- a/shanoir-ng-front/src/app/shared/components/entity/entity.component.abstract.ts
+++ b/shanoir-ng-front/src/app/shared/components/entity/entity.component.abstract.ts
@@ -404,7 +404,7 @@ export abstract class EntityComponent<T extends Entity> implements OnDestroy, On
     }
 
     delete(): void {
-        this.openDeleteConfirmDialog(this.entity)
+        this.openDeleteConfirmDialog(this.entity);
     }
 
     protected openDeleteConfirmDialog = (entity: T) => {
diff --git a/shanoir-ng-front/src/app/studies/study/study-tree.component.html b/shanoir-ng-front/src/app/studies/study/study-tree.component.html
index eb4d41b05c..28c711fea6 100644
--- a/shanoir-ng-front/src/app/studies/study/study-tree.component.html
+++ b/shanoir-ng-front/src/app/studies/study/study-tree.component.html
@@ -12,6 +12,12 @@
 along with this program. If not, see https://www.gnu.org/licenses/gpl-3.0.html
 -->
 <div class="commands">
+	<button class="dl-button" 
+			type="button" 
+			(click)="treeService.updateTree()" 
+			title="Refresh">
+		<i class="fa-solid fa-arrows-rotate"></i>
+	</button>
     <button class="dl-button" 
 			type="button" 
 			(click)="downloadSelected()" 
diff --git a/shanoir-ng-front/src/app/studies/study/tree.service.ts b/shanoir-ng-front/src/app/studies/study/tree.service.ts
index 0688528c18..e30fb13900 100644
--- a/shanoir-ng-front/src/app/studies/study/tree.service.ts
+++ b/shanoir-ng-front/src/app/studies/study/tree.service.ts
@@ -138,21 +138,29 @@ export class TreeService {
         // update everything
         let studyId: number = this.study?.id;
         this.study = null;
-        this.initStudy(studyId);
+        this.initStudy(studyId).then(() => {
+            this.changeSelection();
+        });
     }
 
     removeCurrentNode() {
-        const route: string = this.selectedNode.route;
-        Object.entries(this.selectedNode.parent).forEach((entry, index) => {
-            if (Array.isArray(entry[1])) {
-                let i: number = entry[1].findIndex(node => node.route == route);
-                entry[1].splice(i, 1);
-            }
-        });
+        if (this.selectedNode?.parent) {
+            const route: string = this.selectedNode.route;
+            Object.entries(this.selectedNode.parent).forEach((entry, index) => {
+                if (Array.isArray(entry[1])) {
+                    let i: number = entry[1].findIndex(node => node.route == route);
+                    entry[1].splice(i, 1);
+                }
+            });
+        }
     }
 
     goToParent() {
-        this.router.navigate([this.selectedNode?.parent?.route]);
+        if (this.selectedNode instanceof StudyNode) {
+            this.router.navigate(['/study/list']);
+        } else {
+            this.router.navigate([this.selectedNode?.parent?.route]);
+        }
     }
 
     activateTree(activatedRoute: ActivatedRoute) {
@@ -163,6 +171,8 @@ export class TreeService {
         if (this.selection?.type == 'study') {
             this.initStudy(this.selection.id).then(() => {
                 this.studyNode.subjectsNode.open();
+                this.selectedNode = this.studyNode;
+                this.treeAvailable = !!this.selectedNode;
             });
         } else {
             let studyLoaded: Promise<void>;
diff --git a/shanoir-ng-front/src/app/studies/tree/study-node.component.html b/shanoir-ng-front/src/app/studies/tree/study-node.component.html
index b7bbb3b669..f1b87fc935 100644
--- a/shanoir-ng-front/src/app/studies/tree/study-node.component.html
+++ b/shanoir-ng-front/src/app/studies/tree/study-node.component.html
@@ -35,6 +35,7 @@
             label="Subjects"
             awesome="fas fa-user-injured"
             [(opened)]="node.subjectsNode.opened"
+            (openedChange)="onOpenedChange($event)"
             (labelClick)="subjectsMenuOpened = !subjectsMenuOpened"
             [hasChildren]="hasDependency(this.node.subjectsNode.subjects)">
 
diff --git a/shanoir-ng-front/src/app/studies/tree/study-node.component.ts b/shanoir-ng-front/src/app/studies/tree/study-node.component.ts
index 9c07e8f741..92230c7ce3 100644
--- a/shanoir-ng-front/src/app/studies/tree/study-node.component.ts
+++ b/shanoir-ng-front/src/app/studies/tree/study-node.component.ts
@@ -89,9 +89,11 @@ export class StudyNodeComponent implements OnChanges {
             this.idPromise.resolve(id);
             if (this.input instanceof StudyNode) {
                 this.subjectsInited = new SuperPromise();
+                this.nbSubjectsInit = 0;
                 this.node = this.input;
             } else if (this.input.study && this.input.rights) {
                 this.subjectsInited = new SuperPromise();
+                this.nbSubjectsInit = 0;
                 this.node = this.treeService.buildStudyNode(this.input.study, this.input.rights);
             } else {
                 throw new Error('Illegal argument type');
@@ -179,4 +181,10 @@ export class StudyNodeComponent implements OnChanges {
             this.subjectsInited.resolve();
         }
     }
+
+    onOpenedChange(state) {
+        if (!state) {
+            this.nbSubjectsInit = 0;
+        }
+    }
 }
diff --git a/shanoir-ng-front/src/app/tree/tree.model.ts b/shanoir-ng-front/src/app/tree/tree.model.ts
index b73ee7cd7f..3d71b151ae 100644
--- a/shanoir-ng-front/src/app/tree/tree.model.ts
+++ b/shanoir-ng-front/src/app/tree/tree.model.ts
@@ -47,7 +47,10 @@ export abstract class ShanoirNode {
             if (this.parent) {
                 this.parent.open();
             }
-            this._opened = true;
+            setTimeout(() => {
+                // removing timeout may cause random bugs in the tree
+                this._opened = true;
+            });
             return (this.openPromise || Promise.resolve()).then(() => SuperPromise.timeoutPromise());
         } else {
             return Promise.resolve();