From 4c8a3fc4c8c2efc2fd97f33145a9f9d7b1dd9520 Mon Sep 17 00:00:00 2001 From: gluafamichl <> Date: Mon, 13 Oct 2025 09:10:21 +0200 Subject: [PATCH 1/3] Fix: duplicate page loading Fix: only reload agent table and agent assignment input when agent assigment changes --- .../tasks/edit-tasks/edit-tasks.component.ts | 21 +++++++------------ 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/src/app/tasks/edit-tasks/edit-tasks.component.ts b/src/app/tasks/edit-tasks/edit-tasks.component.ts index 924a4548..b0785e74 100644 --- a/src/app/tasks/edit-tasks/edit-tasks.component.ts +++ b/src/app/tasks/edit-tasks/edit-tasks.component.ts @@ -80,33 +80,28 @@ export class EditTasksComponent implements OnInit, OnDestroy { private confirmDialog: ConfirmDialogService ) { this.titleService.set(['Edit Task']); - this.onInitialize(); } ngOnInit() { - this.buildForm(); - this.initForm(); - this.assignChunksInit(); - } - - ngOnDestroy(): void { - this.routeSub?.unsubscribe(); - } - - onInitialize() { this.route.params.subscribe((params: Params) => { this.editedTaskIndex = +params['id']; this.editMode = params['id'] != null; - this.ngOnInit(); + this.buildForm(); + this.initForm(); + this.assignChunksInit(); }); } + ngOnDestroy(): void { + this.routeSub?.unsubscribe(); + } + /** * Reload data */ refresh(): void { - this.onInitialize(); + this.assingAgentInit(); this.agentsTable.reload(); } From 34bb7310c0d0a669df32dc904d54d7cfa238674d Mon Sep 17 00:00:00 2001 From: gluafamichl <> Date: Mon, 13 Oct 2025 09:40:28 +0200 Subject: [PATCH 2/3] Fix: duplicate agent reload --- .../edit-tasks/edit-tasks.component.html | 4 +- .../tasks/edit-tasks/edit-tasks.component.ts | 51 +++++++++---------- 2 files changed, 26 insertions(+), 29 deletions(-) diff --git a/src/app/tasks/edit-tasks/edit-tasks.component.html b/src/app/tasks/edit-tasks/edit-tasks.component.html index c35d4f81..d1d3e631 100644 --- a/src/app/tasks/edit-tasks/edit-tasks.component.html +++ b/src/app/tasks/edit-tasks/edit-tasks.component.html @@ -158,13 +158,13 @@

Description

- + [assignAgents]="true" (assignedAgentsChanged)="reloadAgentAssignment()"> diff --git a/src/app/tasks/edit-tasks/edit-tasks.component.ts b/src/app/tasks/edit-tasks/edit-tasks.component.ts index b0785e74..19230608 100644 --- a/src/app/tasks/edit-tasks/edit-tasks.component.ts +++ b/src/app/tasks/edit-tasks/edit-tasks.component.ts @@ -97,14 +97,6 @@ export class EditTasksComponent implements OnInit, OnDestroy { this.routeSub?.unsubscribe(); } - /** - * Reload data - */ - refresh(): void { - this.assingAgentInit(); - this.agentsTable.reload(); - } - buildForm() { this.updateForm = new FormGroup({ taskId: new FormControl({ value: '', disabled: true }), @@ -180,7 +172,8 @@ export class EditTasksComponent implements OnInit, OnDestroy { this.crackerinfo = task.crackerBinary; this.taskWrapperId = task.taskWrapperId; - this.assingAgentInit(); + const assignedAgentIds: Array = task.assignedAgents.map((entry) => entry.id); + this.assingAgentInit(assignedAgentIds); this.getTaskSpeeds(task.assignedAgents.length); // Hashlist Description and Type @@ -230,27 +223,31 @@ export class EditTasksComponent implements OnInit, OnDestroy { * The below functions are related with assign, manage and delete agents * **/ - assingAgentInit() { - // TODO possibly we could turn this in a single helper request to the backend if we create a helper endpoint - // That retrieves available agents. Or even better, we might be able to use the agents, in the datasource of - // the assigned agents table. And use those IDs to filter for available agents. + assingAgentInit(assignedAgentIds: Array) { + const params = new RequestParamBuilder(); + if (assignedAgentIds.length > 0) { + params.addFilter({ field: 'agentId', operator: FilterType.NOTIN, value: assignedAgentIds }); + } + + this.gs.getAll(SERV.AGENTS, params.create()).subscribe((responseAgents: ResponseWrapper) => { + const responseBodyAgents = { data: responseAgents.data, included: responseAgents.included }; + this.availAgents = this.serializer.deserialize(responseBodyAgents); + }); + } + + reloadAgentAssignment() { const paramsAgentAssign = new RequestParamBuilder(); paramsAgentAssign.addFilter({ field: 'taskId', operator: FilterType.EQUAL, value: this.editedTaskIndex }); this.gs.getAll(SERV.AGENT_ASSIGN, paramsAgentAssign.create()).subscribe((responseAssignments: ResponseWrapper) => { - const responseBodyAssignments = { data: responseAssignments.data, included: responseAssignments.included }; + const responseBodyAssignments = { + data: responseAssignments.data, + included: responseAssignments.included + }; const agentAssignments = this.serializer.deserialize(responseBodyAssignments); - - const agentAssignmentsAgentIds = agentAssignments.map((agentAssignment) => agentAssignment.agentId); - - const params = new RequestParamBuilder(); - if (agentAssignmentsAgentIds.length > 0) { - params.addFilter({ field: 'agentId', operator: FilterType.NOTIN, value: agentAssignmentsAgentIds }); - } - - this.gs.getAll(SERV.AGENTS, params.create()).subscribe((responseAgents: ResponseWrapper) => { - const responseBodyAgents = { data: responseAgents.data, included: responseAgents.included }; - this.availAgents = this.serializer.deserialize(responseBodyAgents); - }); + const agentAssignmentsAgentIds: Array = agentAssignments.map( + (agentAssignment) => agentAssignment.agentId + ); + this.assingAgentInit(agentAssignmentsAgentIds); }); } @@ -264,7 +261,7 @@ export class EditTasksComponent implements OnInit, OnDestroy { .create(SERV.AGENT_ASSIGN, payload) .pipe( finalize(() => { - this.assingAgentInit(); + this.reloadAgentAssignment(); this.agentsTable.reload(); }) ) From 71cd2ac7ceb55fc4cc474cbf1d6c54ee999007ee Mon Sep 17 00:00:00 2001 From: gluafamichl <> Date: Mon, 13 Oct 2025 10:38:05 +0200 Subject: [PATCH 3/3] Fix: unused code removed --- src/app/tasks/edit-tasks/edit-tasks.component.ts | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/app/tasks/edit-tasks/edit-tasks.component.ts b/src/app/tasks/edit-tasks/edit-tasks.component.ts index 19230608..3a68c4bb 100644 --- a/src/app/tasks/edit-tasks/edit-tasks.component.ts +++ b/src/app/tasks/edit-tasks/edit-tasks.component.ts @@ -66,7 +66,6 @@ export class EditTasksComponent implements OnInit, OnDestroy { chunkview: number; isactive = 0; currenspeed = 0; - chunkresults: number; private routeSub: Subscription; @@ -159,7 +158,6 @@ export class EditTasksComponent implements OnInit, OnDestroy { .addInclude('hashlist') .addInclude('crackerBinary') .addInclude('crackerBinaryType') - .addInclude('files') .addInclude('assignedAgents') .create(); @@ -172,8 +170,7 @@ export class EditTasksComponent implements OnInit, OnDestroy { this.crackerinfo = task.crackerBinary; this.taskWrapperId = task.taskWrapperId; - const assignedAgentIds: Array = task.assignedAgents.map((entry) => entry.id); - this.assingAgentInit(assignedAgentIds); + this.assingAgentInit(task.assignedAgents.map((entry) => entry.id)); this.getTaskSpeeds(task.assignedAgents.length); // Hashlist Description and Type @@ -277,13 +274,9 @@ export class EditTasksComponent implements OnInit, OnDestroy { switch (data['kind']) { case 'edit-task': this.chunkview = 0; - this.chunkresults = 60000; - // this.slideToggle.checked = false; break; case 'edit-task-cAll': this.chunkview = 1; - this.chunkresults = 60000; - // this.slideToggle.checked = true; break; } });