- Refactored service injection in base datasource so that not all chi…

src/app/core/_components/tables/access-groups-agents-table/access-groups-agents-table.component.ts

@@ -36,7 +36,7 @@ export class AccessGroupsAgentsTableComponent extends BaseTableComponent impleme
   ngOnInit(): void {
     this.setColumnLabels(AccessGroupsAgentsTableColumnLabel);
     this.tableColumns = this.getColumns();
-    this.dataSource = new AccessGroupsExpandDataSource(this.cdr, this.gs, this.uiService);
+    this.dataSource = new AccessGroupsExpandDataSource(this.injector);
     this.dataSource.setColumns(this.tableColumns);
     if (this.accessgroupId) {
       this.dataSource.setAccessGroupId(this.accessgroupId);

src/app/core/_components/tables/access-groups-table/access-groups-table.component.ts

@@ -34,7 +34,7 @@ export class AccessGroupsTableComponent extends BaseTableComponent implements On
   ngOnInit(): void {
     this.setColumnLabels(AccessGroupsTableColumnLabel);
     this.tableColumns = this.getColumns();
-    this.dataSource = new AccessGroupsDataSource(this.cdr, this.gs, this.uiService);
+    this.dataSource = new AccessGroupsDataSource(this.injector);
     this.dataSource.setColumns(this.tableColumns);
     this.contextMenuService = new AccessGroupsContextMenuService(this.permissionService).addContextMenu();
     this.dataSource.loadAll();

src/app/core/_components/tables/access-groups-users-table/access-groups-users-table.component.ts

@@ -40,7 +40,7 @@ export class AccessGroupsUserTableComponent extends BaseTableComponent implement
   ngOnInit(): void {
     this.setColumnLabels(AccessGroupsUsersTableColumnLabel);
     this.tableColumns = this.getColumns();
-    this.dataSource = new AccessGroupsExpandDataSource(this.cdr, this.gs, this.uiService);
+    this.dataSource = new AccessGroupsExpandDataSource(this.injector);
     this.dataSource.setColumns(this.tableColumns);
     if (this.accessgroupId) {
       this.dataSource.setAccessGroupId(this.accessgroupId);

src/app/core/_components/tables/access-permission-groups-user-table/access-permission-groups-user-table.component.ts

@@ -34,7 +34,7 @@ export class AccessPermissionGroupsUserTableComponent extends BaseTableComponent
   ngOnInit(): void {
     this.setColumnLabels(AccessPermissionGroupsUserTableColumnLabel);
     this.tableColumns = this.getColumns();
-    this.dataSource = new AccessPermissionGroupsExpandDataSource(this.cdr, this.gs, this.uiService);
+    this.dataSource = new AccessPermissionGroupsExpandDataSource(this.injector);
     this.dataSource.setColumns(this.tableColumns);
     if (this.accesspermgroupId) {
       this.dataSource.setAccessPermGroupId(this.accesspermgroupId);

src/app/core/_components/tables/access-permission-groups-users-table/access-permission-groups-users-table.component.ts

@@ -32,7 +32,7 @@ export class AccessPermissionGroupsUsersTableComponent extends BaseTableComponen
   ngOnInit(): void {
     this.setColumnLabels(AccessPermissionGroupsUsersTableColumnLabel);
     this.tableColumns = this.getColumns();
-    this.dataSource = new AccessPermissionGroupsExpandDataSource(this.cdr, this.gs, this.uiService);
+    this.dataSource = new AccessPermissionGroupsExpandDataSource(this.injector);
     this.dataSource.setColumns(this.tableColumns);
     if (this.accesspermgroupId) {
       this.dataSource.setAccessPermGroupId(this.accesspermgroupId);

src/app/core/_components/tables/agent-binaries-table/agent-binaries-table.component.ts

@@ -37,7 +37,7 @@ export class AgentBinariesTableComponent extends BaseTableComponent implements O
   ngOnInit(): void {
     this.setColumnLabels(AgentBinariesTableColumnLabel);
     this.tableColumns = this.getColumns();
-    this.dataSource = new AgentBinariesDataSource(this.cdr, this.gs, this.uiService);
+    this.dataSource = new AgentBinariesDataSource(this.injector);
     this.dataSource.setColumns(this.tableColumns);
     this.contextMenuService = new AgentBinariesMenuServiceContextMenuService(this.permissionService).addContextMenu();
     this.dataSource.loadAll();

src/app/core/_components/tables/agent-error-table/agent-error-table.component.ts

@@ -40,7 +40,7 @@ export class AgentErrorTableComponent extends BaseTableComponent implements OnIn
   ngOnInit(): void {
     this.setColumnLabels(AgentErrorTableColumnLabel);
     this.tableColumns = this.getColumns();
-    this.dataSource = new AgentErrorDatasource(this.cdr, this.gs, this.uiService);
+    this.dataSource = new AgentErrorDatasource(this.injector);
     this.dataSource.setColumns(this.tableColumns);
 
     if (this.agentId) {

src/app/core/_components/tables/agents-status-table/agents-status-table.component.ts

@@ -52,7 +52,7 @@ export class AgentsStatusTableComponent extends BaseTableComponent implements On
   ngOnInit(): void {
     this.setColumnLabels(AgentsStatusTableColumnLabel);
     this.tableColumns = this.getColumns();
-    this.dataSource = new AgentsDataSource(this.cdr, this.gs, this.uiService);
+    this.dataSource = new AgentsDataSource(this.injector);
     this.dataSource.setColumns(this.tableColumns);
     this.contextMenuService = new AgentMenuService(this.permissionService).addContextMenu();
     this.dataSource.reload();

src/app/core/_components/tables/agents-table/agents-table.component.ts

@@ -56,7 +56,7 @@ export class AgentsTableComponent extends BaseTableComponent implements OnInit,
   ngOnInit(): void {
     this.setColumnLabels(AgentsTableColumnLabel);
     this.tableColumns = this.getColumns();
-    this.dataSource = new AgentsDataSource(this.cdr, this.gs, this.uiService);
+    this.dataSource = new AgentsDataSource(this.injector);
     this.dataSource.setColumns(this.tableColumns);
     if (this.taskId) {
       this.dataSource.setTaskId(this.taskId);

src/app/core/_components/tables/base-table/base-table.component.ts

@@ -2,7 +2,7 @@ import { faKey, faShieldHalved } from '@fortawesome/free-solid-svg-icons';
 import { Observable, Subscription, of } from 'rxjs';
 
 import { Clipboard } from '@angular/cdk/clipboard';
-import { ChangeDetectorRef, Component, Input, ViewChild } from '@angular/core';
+import { ChangeDetectorRef, Component, Injector, Input, ViewChild } from '@angular/core';
 import { MatDialog } from '@angular/material/dialog';
 import { DomSanitizer, SafeHtml } from '@angular/platform-browser';
 import { Router } from '@angular/router';
@@ -57,6 +57,7 @@ export class BaseTableComponent {
   protected contextMenuService: ContextMenuService;
 
   constructor(
+    protected injector: Injector,
     protected gs: GlobalService,
     protected cs: ConfigService,
     public clipboard: Clipboard,

src/app/core/_components/tables/chunks-table/chunks-table.component.ts

@@ -32,7 +32,7 @@ export class ChunksTableComponent extends BaseTableComponent implements OnInit {
   ngOnInit(): void {
     this.setColumnLabels(ChunksTableColumnLabel);
     this.tableColumns = this.getColumns();
-    this.dataSource = new ChunksDataSource(this.cdr, this.gs, this.uiService);
+    this.dataSource = new ChunksDataSource(this.injector);
     this.dataSource.setColumns(this.tableColumns);
     if (this.agentId) {
       this.dataSource.setAgentId(this.agentId);

src/app/core/_components/tables/crackers-table/crackers-table.component.ts

@@ -31,7 +31,7 @@ export class CrackersTableComponent extends BaseTableComponent implements OnInit
   ngOnInit(): void {
     this.setColumnLabels(CrackersTableColumnLabel);
     this.tableColumns = this.getColumns();
-    this.dataSource = new CrackersDataSource(this.cdr, this.gs, this.uiService);
+    this.dataSource = new CrackersDataSource(this.injector);
     this.dataSource.setColumns(this.tableColumns);
     this.contextMenuService = new CrackersContextMenuService(this.permissionService).addContextMenu();
     this.dataSource.loadAll();

src/app/core/_components/tables/cracks-table/cracks-table.component.ts

@@ -28,7 +28,7 @@ export class CracksTableComponent extends BaseTableComponent implements OnInit,
   ngOnInit(): void {
     this.setColumnLabels(CracksTableColumnLabel);
     this.tableColumns = this.getColumns();
-    this.dataSource = new CracksDataSource(this.cdr, this.gs, this.uiService);
+    this.dataSource = new CracksDataSource(this.injector);
     this.dataSource.setColumns(this.tableColumns);
     this.dataSource.loadAll().then(() => {});
   }

src/app/core/_components/tables/files-attack-table/files-attack-table.component.ts

@@ -36,7 +36,7 @@ export class FilesAttackTableComponent extends BaseTableComponent implements OnI
   ngOnInit(): void {
     this.setColumnLabels(FilesAttackTableColumnLabel);
     this.tableColumns = this.getColumns();
-    this.dataSource = new FilesDataSource(this.cdr, this.gs, this.uiService);
+    this.dataSource = new FilesDataSource(this.injector);
     this.dataSource.setColumns(this.tableColumns);
     this.dataSource.setFileType(this.fileType);
     this.dataSource.loadAll();

src/app/core/_components/tables/files-table/files-table.component.ts

@@ -61,7 +61,7 @@ export class FilesTableComponent extends BaseTableComponent implements OnInit, O
     if (this.name !== 'filesTableInPreTasks') {
       this.contextMenuService = new FilesContextMenuService(this.permissionService).addContextMenu();
     }
-    this.dataSource = new FilesDataSource(this.cdr, this.gs, this.uiService);
+    this.dataSource = new FilesDataSource(this.injector);
     this.dataSource.setColumns(this.tableColumns);
     this.dataSource.setFileType(this.fileType);
     if (this.editIndex) {

src/app/core/_components/tables/hashes-table/hashes-table.component.ts

@@ -28,7 +28,7 @@ export class HashesTableComponent extends BaseTableComponent implements OnInit,
   ngOnInit(): void {
     this.setColumnLabels(HashesTableColColumnLabel);
     this.tableColumns = this.getColumns();
-    this.dataSource = new HashesDataSource(this.cdr, this.gs, this.uiService);
+    this.dataSource = new HashesDataSource(this.injector);
     this.dataSource.setColumns(this.tableColumns);
     if (this.id) {
       this.dataSource.setId(this.id);

src/app/core/_components/tables/hashlists-table/hashlists-table.component.ts

@@ -37,7 +37,7 @@ export class HashlistsTableComponent extends BaseTableComponent implements OnIni
   ngOnInit(): void {
     this.setColumnLabels(HashlistsTableColumnLabel);
     this.tableColumns = this.getColumns();
-    this.dataSource = new HashlistsDataSource(this.cdr, this.gs, this.uiService);
+    this.dataSource = new HashlistsDataSource(this.injector);
     this.dataSource.setColumns(this.tableColumns);
     this.dataSource.setIsArchived(this.isArchived);
     this.contextMenuService = new HashListContextMenuService(this.permissionService).addContextMenu();

src/app/core/_components/tables/hashtypes-table/hashtypes-table.component.ts

@@ -34,7 +34,7 @@ export class HashtypesTableComponent extends BaseTableComponent implements OnIni
   ngOnInit(): void {
     this.setColumnLabels(HashtypesTableColumnLabel);
     this.tableColumns = this.getColumns();
-    this.dataSource = new HashtypesDataSource(this.cdr, this.gs, this.uiService);
+    this.dataSource = new HashtypesDataSource(this.injector);
     this.contextMenuService = new HashTypesContextMenuService(this.permissionService).addContextMenu();
     this.dataSource.setColumns(this.tableColumns);
   }

src/app/core/_components/tables/health-check-agents-table/health-check-agents-table.component.ts

@@ -31,7 +31,7 @@ export class HealthCheckAgentsTableComponent extends BaseTableComponent implemen
   ngOnInit(): void {
     this.setColumnLabels(HealthCheckAgentsTableColColumnLabel);
     this.tableColumns = this.getColumns();
-    this.dataSource = new HealthCheckAgentsDataSource(this.cdr, this.gs, this.uiService);
+    this.dataSource = new HealthCheckAgentsDataSource(this.injector);
     if (this.healthCheckId) {
       this.dataSource.setHealthCheckId(this.healthCheckId);
     }

src/app/core/_components/tables/health-checks-table/health-checks-table.component.ts

@@ -38,7 +38,7 @@ export class HealthChecksTableComponent extends BaseTableComponent implements On
   ngOnInit(): void {
     this.setColumnLabels(HealthChecksTableColumnLabel);
     this.tableColumns = this.getColumns();
-    this.dataSource = new HealthChecksDataSource(this.cdr, this.gs, this.uiService);
+    this.dataSource = new HealthChecksDataSource(this.injector);
     this.dataSource.setColumns(this.tableColumns);
     this.contextMenuService = new HealthCheckContextMenuService(this.permissionService).addContextMenu();
     this.dataSource.loadAll();

src/app/core/_components/tables/logs-table/logs-table.component.ts

@@ -23,7 +23,7 @@ export class LogsTableComponent extends BaseTableComponent implements OnInit, On
   ngOnInit(): void {
     this.setColumnLabels(LogsTableColumnLabel);
     this.tableColumns = this.getColumns();
-    this.dataSource = new LogsDataSource(this.cdr, this.gs, this.uiService);
+    this.dataSource = new LogsDataSource(this.injector);
     this.dataSource.setColumns(this.tableColumns);
     this.dataSource.loadAll();
   }

src/app/core/_components/tables/notifications-table/notifications-table.component.ts

@@ -36,7 +36,7 @@ export class NotificationsTableComponent extends BaseTableComponent implements O
   ngOnInit(): void {
     this.setColumnLabels(NotificationsTableColumnLabel);
     this.tableColumns = this.getColumns();
-    this.dataSource = new NotificationsDataSource(this.cdr, this.gs, this.uiService);
+    this.dataSource = new NotificationsDataSource(this.injector);
     this.dataSource.setColumns(this.tableColumns);
     this.contextMenuService = new NotificationsContextMenuService(this.permissionService).addContextMenu();
     this.dataSource.loadAll();

src/app/core/_components/tables/permissions-table/permissions-table.component.ts

@@ -34,7 +34,7 @@ export class PermissionsTableComponent extends BaseTableComponent implements OnI
   ngOnInit(): void {
     this.setColumnLabels(PermissionsTableColumnLabel);
     this.tableColumns = this.getColumns();
-    this.dataSource = new PermissionsDataSource(this.cdr, this.gs, this.uiService);
+    this.dataSource = new PermissionsDataSource(this.injector);
     this.dataSource.setColumns(this.tableColumns);
     this.contextMenuService = new PermissionsContextMenuService(this.permissionService).addContextMenu();
     this.dataSource.loadAll();

src/app/core/_components/tables/preprocessors-table/preprocessors-table.component.ts

@@ -33,7 +33,7 @@ export class PreprocessorsTableComponent extends BaseTableComponent implements O
   ngOnInit(): void {
     this.setColumnLabels(PreprocessorsTableColumnLabel);
     this.tableColumns = this.getColumns();
-    this.dataSource = new PreprocessorsDataSource(this.cdr, this.gs, this.uiService);
+    this.dataSource = new PreprocessorsDataSource(this.injector);
     this.dataSource.setColumns(this.tableColumns);
     this.contextMenuService = new PreProContextMenuService(this.permissionService).addContextMenu();
     this.dataSource.loadAll();

src/app/core/_components/tables/pretasks-table/pretasks-table.component.ts

@@ -62,7 +62,7 @@ export class PretasksTableComponent extends BaseTableComponent implements OnInit
   ngOnInit(): void {
     this.setColumnLabels(PretasksTableColumnLabel);
     this.tableColumns = this.getColumns();
-    this.dataSource = new PreTasksDataSource(this.cdr, this.gs, this.uiService);
+    this.dataSource = new PreTasksDataSource(this.injector);
     this.dataSource.setColumns(this.tableColumns);
     if (this.supertTaskId) {
       this.dataSource.setSuperTaskId(this.supertTaskId);

src/app/core/_components/tables/search-hash-table/search-hash-table.component.ts

@@ -29,7 +29,7 @@ export class SearchHashTableComponent extends BaseTableComponent implements OnIn
   ngOnInit(): void {
     this.setColumnLabels(SearchHashTableColumnLabel);
     this.tableColumns = this.getColumns();
-    this.dataSource = new SearchHashDataSource(this.cdr, this.gs, this.uiService);
+    this.dataSource = new SearchHashDataSource(this.injector);
     if (this.search) {
       this.dataSource.setSearch(this.search);
     }

src/app/core/_components/tables/super-hashlists-table/super-hashlists-table.component.ts

@@ -35,7 +35,7 @@ export class SuperHashlistsTableComponent extends BaseTableComponent implements
   ngOnInit(): void {
     this.setColumnLabels(SuperHashlistsTableColumnLabel);
     this.tableColumns = this.getColumns();
-    this.dataSource = new SuperHashlistsDataSource(this.cdr, this.gs, this.uiService);
+    this.dataSource = new SuperHashlistsDataSource(this.injector);
     this.dataSource.setColumns(this.tableColumns);
     this.dataSource.setIsArchived(this.isArchived);
     this.contextMenuService = new SuperHashListContextMenuService(this.permissionService).addContextMenu();

src/app/core/_components/tables/supertasks-pretasks-table/supertasks-pretasks-table.component.ts

@@ -36,7 +36,7 @@ export class SuperTasksPretasksTableComponent extends BaseTableComponent impleme
   ngOnInit(): void {
     this.setColumnLabels(SupertasksPretasksTableColumnLabel);
     this.tableColumns = this.getColumns();
-    this.dataSource = new SuperTasksPretasksDataSource(this.cdr, this.gs, this.uiService);
+    this.dataSource = new SuperTasksPretasksDataSource(this.injector);
     this.dataSource.setColumns(this.tableColumns);
     if (this.supertaskId) {
       this.dataSource.setSuperTaskId(this.supertaskId);

src/app/core/_components/tables/supertasks-table/supertasks-table.component.ts

@@ -36,7 +36,7 @@ export class SuperTasksTableComponent extends BaseTableComponent implements OnIn
   ngOnInit(): void {
     this.setColumnLabels(SupertasksTableColumnLabel);
     this.tableColumns = this.getColumns();
-    this.dataSource = new SuperTasksDataSource(this.cdr, this.gs, this.uiService);
+    this.dataSource = new SuperTasksDataSource(this.injector);
     this.dataSource.setColumns(this.tableColumns);
     this.contextMenuService = new SuperTaskContextMenuService(this.permissionService).addContextMenu();
     this.dataSource.loadAll();

src/app/core/_components/tables/tasks-chunks-table/tasks-chunks-table.component.ts

@@ -45,7 +45,7 @@ export class TasksChunksTableComponent extends BaseTableComponent implements OnI
   ngOnInit(): void {
     this.setColumnLabels(TasksChunksTableColumnLabel);
     this.tableColumns = this.getColumns();
-    this.dataSource = new TasksChunksDataSource(this.cdr, this.gs, this.uiService);
+    this.dataSource = new TasksChunksDataSource(this.injector);
     this.dataSource.setColumns(this.tableColumns);
     this.contextMenuService = new ChunkContextMenuService(this.permissionService).addContextMenu();
     // Do NOT load yet

src/app/core/_components/tables/tasks-supertasks-table/tasks-supertasks-table.component.ts

@@ -40,7 +40,7 @@ export class TasksSupertasksTableComponent extends BaseTableComponent implements
   ngOnInit(): void {
     this.setColumnLabels(TasksSupertasksDataSourceTableColumnLabel);
     this.tableColumns = this.getColumns();
-    this.dataSource = new TasksSupertasksDataSource(this.cdr, this.gs, this.uiService);
+    this.dataSource = new TasksSupertasksDataSource(this.injector);
     this.dataSource.setColumns(this.tableColumns);
     if (this.supertaskId) {
       this.dataSource.setSuperTaskId(this.supertaskId);

src/app/core/_components/tables/tasks-table/tasks-table.component.ts

@@ -64,7 +64,7 @@ export class TasksTableComponent extends BaseTableComponent implements OnInit, O
   ngOnInit(): void {
     this.setColumnLabels(TaskTableColumnLabel);
     this.tableColumns = this.getColumns();
-    this.dataSource = new TasksDataSource(this.cdr, this.gs, this.uiService);
+    this.dataSource = new TasksDataSource(this.injector);
     this.dataSource.setColumns(this.tableColumns);
     this.dataSource.setIsArchived(this.isArchived);
     this.contextMenuService = new TaskContextMenuService(this.permissionService).addContextMenu();

src/app/core/_components/tables/users-table/users-table.component.ts

@@ -37,7 +37,7 @@ export class UsersTableComponent extends BaseTableComponent implements OnInit, O
   ngOnInit(): void {
     this.setColumnLabels(UsersTableColumnLabel);
     this.tableColumns = this.getColumns();
-    this.dataSource = new UsersDataSource(this.cdr, this.gs, this.uiService);
+    this.dataSource = new UsersDataSource(this.injector);
     this.dataSource.setColumns(this.tableColumns);
     this.contextMenuService = new UsersContextMenuService(this.permissionService).addContextMenu();
     this.dataSource.loadAll();

src/app/core/_components/tables/vouchers-table/vouchers-table.component.ts

@@ -32,7 +32,7 @@ export class VouchersTableComponent extends BaseTableComponent implements OnInit
   ngOnInit(): void {
     this.setColumnLabels(VouchersTableColumnLabel);
     this.tableColumns = this.getColumns();
-    this.dataSource = new VouchersDataSource(this.cdr, this.gs, this.uiService);
+    this.dataSource = new VouchersDataSource(this.injector);
     this.dataSource.setColumns(this.tableColumns);
     this.contextMenuService = new VoucherContextMenuService(this.permissionService).addContextMenu();
     this.dataSource.loadAll();