Skip to content
Snippets Groups Projects
Commit 66e9a057 authored by Guillaume Heurtier's avatar Guillaume Heurtier
Browse files

FIX #13507 TIME 1:00 fix resource count in folders list when classing/unclassing resource

parent c34d28c7
No related branches found
No related tags found
No related merge requests found
......@@ -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>
......@@ -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(
......
......@@ -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();
}
......
......@@ -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>
......@@ -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>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment