opengnsys
/
oggui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ref 3008. Last selected OU

pull/97/head
Manuel Aranda Rosales 2026-07-14 10:45:01 +02:00
parent 379886134d
commit d739c6b81c
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ogWebconsole/src/app/components/groups/groups.component.ts
View File

@ -168,7 +168,7 @@ export class GroupsComponent implements OnInit, OnDestroy {
ngOnInit(): void {
this.updateGridCols();
this.refreshData();
this.refreshData(localStorage.getItem('lastSelectedOU') ?? undefined);
window.addEventListener('resize', this.updateGridCols);
this.selectedClients.filterPredicate = (client: Client, filter: string): boolean => {
@ -340,12 +340,12 @@ export class GroupsComponent implements OnInit, OnDestroy {
this.treeDataSource.data = [...this.originalTreeData];
if (selectedNodeIdOrUuid) {
this.selectedNode = this.findNodeByIdOrUuid(this.treeDataSource.data, selectedNodeIdOrUuid);
}
if (this.selectedNode) {
this.treeControl.collapseAll();
this.expandPathToNode(this.selectedNode);
this.fetchClientsForNode(this.selectedNode, selectedClientsBeforeEdit);
}
if (selectedNodeIdOrUuid && this.selectedNode) {
this.treeControl.collapseAll();
this.expandPathToNode(this.selectedNode);
this.fetchClientsForNode(this.selectedNode, selectedClientsBeforeEdit);
} else {
this.treeControl.collapseAll();
if (this.treeDataSource.data.length > 0) {
@ -419,8 +419,9 @@ export class GroupsComponent implements OnInit, OnDestroy {
onNodeClick(event: MouseEvent, node: TreeNode): void {
event.stopPropagation();
this.selectedNode = node;
this.persistSelectedNode(node);
const selectedClientsBeforeEdit = this.selection.selected.map(client => client.uuid);
const checkStatusAfterLoad = node.type === NodeType.Classroom || node.type === NodeType.ClientsGroup;
this.fetchClientsForNode(node, selectedClientsBeforeEdit, checkStatusAfterLoad);
}
@ -428,10 +429,17 @@ export class GroupsComponent implements OnInit, OnDestroy {
onMenuClick(event: Event, node: any): void {
event.stopPropagation();
this.selectedNode = node;
this.persistSelectedNode(node);
const selectedClientsBeforeEdit = this.selection.selected.map(client => client.uuid);
this.fetchClientsForNode(node, selectedClientsBeforeEdit);
}
private persistSelectedNode(node: TreeNode): void {
if (node.uuid) {
localStorage.setItem('lastSelectedOU', node.uuid);
}
}

1
ogWebconsole/src/app/services/auth.service.ts
View File

@ -128,6 +128,7 @@ export class AuthService {
localStorage.removeItem('username');
localStorage.removeItem('groupsView');
localStorage.removeItem('language');
localStorage.removeItem('lastSelectedOU');
this.tokenPayload = null;
if (options.redirect && this.router.url !== '/auth/login') {
this.router.navigate(['/auth/login']);