From 66e9a05738d11ac09d14e0273ae5b9e6fa202447 Mon Sep 17 00:00:00 2001
From: Guillaume Heurtier <guillaume.heurtier@maarch.org>
Date: Wed, 11 Mar 2020 17:33:33 +0100
Subject: [PATCH] FIX #13507 TIME 1:00 fix resource count in folders list when
classing/unclassing resource
---
.../document-list/folder-document-list.component.html | 4 ++--
.../folder/document-list/folder-document-list.component.ts | 6 +-----
.../app/folder/folder-menu/folder-menu.component.ts | 2 ++
.../followed-list/followed-document-list.component.html | 2 +-
src/frontend/app/list/basket-list.component.html | 4 ++--
5 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/src/frontend/app/folder/document-list/folder-document-list.component.html b/src/frontend/app/folder/document-list/folder-document-list.component.html
index 1d0e6621275..b7769b217aa 100644
--- a/src/frontend/app/folder/document-list/folder-document-list.component.html
+++ b/src/frontend/app/folder/document-list/folder-document-list.component.html
@@ -69,7 +69,7 @@
<app-folder-action-list #actionsList [contextMode]="false" [currentFolderInfo]="folderInfo"
[totalRes]="allResInBasket.length" [selectedRes]="selectedRes"
(refreshEvent)="refreshDaoAfterAction()"
- (refreshPanelFolders)="panelFolder.refreshFoldersTree()">
+ (refreshPanelFolders)="foldersService.getFolders()">
</app-folder-action-list>
</span>
</div>
@@ -198,5 +198,5 @@
</mat-sidenav-container>
<app-folder-action-list #actionsListContext [contextMode]="true" [currentFolderInfo]="folderInfo"
[totalRes]="allResInBasket.length" [selectedRes]="selectedRes" (refreshEvent)="refreshDaoAfterAction()"
- (refreshPanelFolders)="panelFolder.refreshFoldersTree()">
+ (refreshPanelFolders)="foldersService.getFolders()">
</app-folder-action-list>
diff --git a/src/frontend/app/folder/document-list/folder-document-list.component.ts b/src/frontend/app/folder/document-list/folder-document-list.component.ts
index b9c1713bd31..ab23ad4f01d 100644
--- a/src/frontend/app/folder/document-list/folder-document-list.component.ts
+++ b/src/frontend/app/folder/document-list/folder-document-list.component.ts
@@ -9,19 +9,16 @@ import { MatSidenav } from '@angular/material/sidenav';
import { MatSort } from '@angular/material/sort';
import { DomSanitizer, SafeHtml } from '@angular/platform-browser';
-import { startWith, switchMap, map, catchError, takeUntil, tap, exhaustMap, filter } from 'rxjs/operators';
+import { startWith, switchMap, map, catchError, takeUntil, tap } from 'rxjs/operators';
import { ActivatedRoute, Router } from '@angular/router';
import { HeaderService } from '../../../service/header.service';
import { Overlay } from '@angular/cdk/overlay';
import { PanelListComponent } from '../../list/panel/panel-list.component';
import { AppService } from '../../../service/app.service';
-import { PanelFolderComponent } from '../panel/panel-folder.component';
import { BasketHomeComponent } from '../../basket/basket-home.component';
-import { ConfirmComponent } from '../../../plugins/modal/confirm.component';
import { FolderActionListComponent } from '../folder-action-list/folder-action-list.component';
import { FiltersListService } from '../../../service/filtersList.service';
-import { trigger, transition, style, animate } from '@angular/animations';
import { FoldersService } from '../folders.service';
import { FunctionsService } from '../../../service/functions.service';
@@ -103,7 +100,6 @@ export class FolderDocumentListComponent implements OnInit {
@ViewChild(MatPaginator, { static: true }) paginator: MatPaginator;
@ViewChild('tableBasketListSort', { static: true }) sort: MatSort;
- @ViewChild('panelFolder', { static: false }) panelFolder: PanelFolderComponent;
@ViewChild('basketHome', { static: true }) basketHome: BasketHomeComponent;
constructor(
diff --git a/src/frontend/app/folder/folder-menu/folder-menu.component.ts b/src/frontend/app/folder/folder-menu/folder-menu.component.ts
index a5ddabb03c3..77be011fc0c 100644
--- a/src/frontend/app/folder/folder-menu/folder-menu.component.ts
+++ b/src/frontend/app/folder/folder-menu/folder-menu.component.ts
@@ -102,6 +102,7 @@ export class FolderMenuComponent implements OnInit {
tap(() => {
this.foldersService.getPinnedFolders();
this.refreshList.emit();
+ this.refreshFolders.emit();
this.notify.success(this.lang.mailClassified);
}),
catchError((err) => {
@@ -121,6 +122,7 @@ export class FolderMenuComponent implements OnInit {
this.notify.success(this.lang.removedFromFolder);
this.foldersService.getPinnedFolders();
this.refreshList.emit();
+ this.refreshFolders.emit();
})
).subscribe();
}
diff --git a/src/frontend/app/home/followed-list/followed-document-list.component.html b/src/frontend/app/home/followed-list/followed-document-list.component.html
index 65488bfbe20..c7772e3c733 100644
--- a/src/frontend/app/home/followed-list/followed-document-list.component.html
+++ b/src/frontend/app/home/followed-list/followed-document-list.component.html
@@ -173,5 +173,5 @@
</mat-sidenav-container>
<app-followed-action-list #actionsListContext [contextMode]="true" [currentFolderInfo]="folderInfo"
[totalRes]="allResInBasket.length" [selectedRes]="selectedRes" (refreshEvent)="refreshDaoAfterAction()"
- [menuShortcut]="menuShortcut">
+ [menuShortcut]="menuShortcut" (refreshPanelFolders)="foldersService.getFolders()">
</app-followed-action-list>
diff --git a/src/frontend/app/list/basket-list.component.html b/src/frontend/app/list/basket-list.component.html
index 35057147bf4..7e55a91985f 100644
--- a/src/frontend/app/list/basket-list.component.html
+++ b/src/frontend/app/list/basket-list.component.html
@@ -46,7 +46,7 @@
<span>
<app-actions-list #actionsList (refreshEvent)="refreshDao()"
[contextMode]="false" [totalRes]="allResInBasket.length" [selectedRes]="selectedRes"
- [currentBasketInfo]="currentBasketInfo" [currentResource]="currentResource"></app-actions-list>
+ [currentBasketInfo]="currentBasketInfo" [currentResource]="currentResource" (refreshPanelFolders)="foldersService.getFolders()"></app-actions-list>
</span>
</div>
</div>
@@ -198,5 +198,5 @@
</mat-sidenav>
</mat-sidenav-container>
<app-actions-list (refreshEvent)="refreshDao()" (refreshEventAfterAction)="refreshDaoAfterAction()" #actionsListContext [contextMode]="true"
- [totalRes]="allResInBasket.length" [selectedRes]="selectedRes" [currentBasketInfo]="currentBasketInfo">
+ [totalRes]="allResInBasket.length" [selectedRes]="selectedRes" [currentBasketInfo]="currentBasketInfo" (refreshPanelFolders)="foldersService.getFolders()">
</app-actions-list>
--
GitLab