diff --git a/src/frontend/app/actions/actions-list.component.html b/src/frontend/app/actions/actions-list.component.html index 9b2757be75711705d76a0bd620ae3e9a7e83db08..a196d2be05e478751528f52072b88f3c3d7527bd 100644 --- a/src/frontend/app/actions/actions-list.component.html +++ b/src/frontend/app/actions/actions-list.component.html @@ -14,5 +14,5 @@ <span>{{action.label_action}}</span> </button> <mat-divider></mat-divider> - <folder-menu [resIds]="selectedRes" (refreshList)="refreshList()"></folder-menu> + <folder-menu [resIds]="selectedRes" (refreshList)="refreshList()" (refreshFolders)="refreshFolders()"></folder-menu> </mat-menu> \ No newline at end of file diff --git a/src/frontend/app/actions/actions-list.component.ts b/src/frontend/app/actions/actions-list.component.ts index 37babcc36a19e3351ad483136f8b9be927140c85..72d43f38eb23da1cf7f6f05d73c76884350babd7 100644 --- a/src/frontend/app/actions/actions-list.component.ts +++ b/src/frontend/app/actions/actions-list.component.ts @@ -54,6 +54,7 @@ export class ActionsListComponent implements OnInit { @Input('currentBasketInfo') currentBasketInfo: any; @Output('refreshEvent') refreshEvent = new EventEmitter<string>(); + @Output('refreshPanelFolders') refreshPanelFolders = new EventEmitter<string>(); constructor(public http: HttpClient, private notify: NotificationService, public dialog: MatDialog, private router: Router) { } @@ -500,4 +501,8 @@ export class ActionsListComponent implements OnInit { refreshList() { this.refreshEvent.emit(); } + + refreshFolders() { + this.refreshPanelFolders.emit(); + } } 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 c3b3134eacb0970040b3fa1058c3128bea92c2d5..8baaf595f3bcbee993bc9b01d09488422bd7675f 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 @@ -239,7 +239,6 @@ export class FolderDocumentListComponent implements OnInit { refreshDaoAfterAction() { this.sidenavRight.close(); this.refreshDao(); - this.basketHome.refreshBasketHome(); const e: any = { checked: false }; this.toggleAllRes(e); } 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 1682a30c24fa76ed3631cbe41f5a64ef098483fa..ce56565b6ece1ce9178af51f74749572b2ceb797 100644 --- a/src/frontend/app/folder/folder-menu/folder-menu.component.ts +++ b/src/frontend/app/folder/folder-menu/folder-menu.component.ts @@ -18,6 +18,7 @@ export class FolderMenuComponent implements OnInit { foldersList: any[] = []; @Input('resIds') resIds: number[]; + @Output('refreshFolders') refreshFolders = new EventEmitter<string>(); @Output('refreshList') refreshList = new EventEmitter<string>(); constructor( @@ -40,6 +41,7 @@ export class FolderMenuComponent implements OnInit { this.http.post('../../rest/folders/' + folder.id + '/resources', { resources: this.resIds }).pipe( tap(() => { + this.refreshFolders.emit(); this.refreshList.emit(); this.notify.success('Courrier classé'); }), diff --git a/src/frontend/app/folder/panel/panel-folder.component.ts b/src/frontend/app/folder/panel/panel-folder.component.ts index 43b49a802f54debfad5ad2f6a766d40a37957770..bcccf8699772c2fd12424650c85f04687698e976 100644 --- a/src/frontend/app/folder/panel/panel-folder.component.ts +++ b/src/frontend/app/folder/panel/panel-folder.component.ts @@ -37,4 +37,8 @@ export class PanelFolderComponent implements OnInit { refreshDocList() { this.refreshEvent.emit(); } + + refreshFoldersTree() { + this.folderTree.getFolders(); + } } diff --git a/src/frontend/app/list/basket-list.component.html b/src/frontend/app/list/basket-list.component.html index b32196eeddf8470bab5377367ba86c4aaf991994..d675b4bd0ec9b7153a61dd9373e7d6eec10e1f10 100644 --- a/src/frontend/app/list/basket-list.component.html +++ b/src/frontend/app/list/basket-list.component.html @@ -49,7 +49,7 @@ <span> <app-actions-list #actionsList (refreshEvent)="refreshDao()" [contextMode]="false" [totalRes]="allResInBasket.length" [selectedRes]="selectedRes" - [currentBasketInfo]="currentBasketInfo"></app-actions-list> + [currentBasketInfo]="currentBasketInfo" (refreshPanelFolders)="panelFolder.refreshFoldersTree()"></app-actions-list> </span> <span> <app-tools-list #actionsList [selectedRes]="selectedRes" @@ -200,5 +200,5 @@ </mat-sidenav> </mat-sidenav-container> <app-actions-list (refreshEvent)="refreshDao()" #actionsListContext [contextMode]="true" - [totalRes]="allResInBasket.length" [selectedRes]="selectedRes" [currentBasketInfo]="currentBasketInfo"> + [totalRes]="allResInBasket.length" [selectedRes]="selectedRes" [currentBasketInfo]="currentBasketInfo" (refreshPanelFolders)="panelFolder.refreshFoldersTree()"> </app-actions-list> \ No newline at end of file