{{ editing ? ('editTask' | translate) : ('createTask' | translate) }}
++ {{ editing ? ('editTask' | translate) : ('createTask' | translate) }} +
Seleccionar particion para arrancar SO
+ +
+
+
+ Clientes
+
+ Listado de clientes para arrancar un SO
+ desktop_windows
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ![Client Icon]()
+
+
+
+ Modelo
+
+
+
+
+ {{ client.name | slice:0:20 }}
+ {{ client.ip }}
+ {{ client.mac }}
+
+
+
+
+
+| Seleccionar partición | +
+ |
+ {{ column.header }} | +
+
+ {{ image.size }} MB
+ {{ image.size / 1024 }} GB
+
+ |
+
|---|
+
+
+
diff --git a/ogWebconsole/src/app/components/commands/main-commands/execute-command/boot-so-partition/boot-so-partition.component.spec.ts b/ogWebconsole/src/app/components/commands/main-commands/execute-command/boot-so-partition/boot-so-partition.component.spec.ts
new file mode 100644
index 0000000..ccd7bfe
--- /dev/null
+++ b/ogWebconsole/src/app/components/commands/main-commands/execute-command/boot-so-partition/boot-so-partition.component.spec.ts
@@ -0,0 +1,82 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { BootSoPartitionComponent } from './boot-so-partition.component';
+import { FormBuilder, FormsModule, ReactiveFormsModule } from "@angular/forms";
+import { MAT_DIALOG_DATA, MatDialogModule, MatDialogRef } from "@angular/material/dialog";
+import { MatFormFieldModule } from "@angular/material/form-field";
+import { MatInputModule } from "@angular/material/input";
+import { MatCheckboxModule } from "@angular/material/checkbox";
+import { MatButtonModule } from "@angular/material/button";
+import { MatMenuModule } from "@angular/material/menu";
+import { BrowserAnimationsModule } from "@angular/platform-browser/animations";
+import { MatTableModule } from "@angular/material/table";
+import { MatSelectModule } from "@angular/material/select";
+import { MatIconModule } from "@angular/material/icon";
+import { ToastrModule, ToastrService } from "ngx-toastr";
+import { TranslateModule } from "@ngx-translate/core";
+import { DataService } from "../../data.service";
+import { provideHttpClient } from "@angular/common/http";
+import { provideHttpClientTesting } from "@angular/common/http/testing";
+import { ConfigService } from "@services/config.service";
+import { MatExpansionModule } from '@angular/material/expansion';
+import { MatDividerModule } from '@angular/material/divider';
+
+describe('BootSoPartitionComponent', () => {
+ let component: BootSoPartitionComponent;
+ let fixture: ComponentFixtureSeleccionar imagen para eliminar de la cache
+ +
+
+
+ Clientes
+
+ Listado de clientes para arrancar un SO
+ desktop_windows
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ![Client Icon]()
+
+
+
+ Modelo
+
+
+
+
+ {{ client.name | slice:0:20 }}
+ {{ client.ip }}
+ {{ client.mac }}
+
+
+
+
+
+| Seleccionar imagen | +
+ |
+ {{ column.header }} | +
+
+ {{ image.size }} MB
+ {{ image.size / 1024 }} GB
+
+
+ {{ image.operativeSystem?.name }}
+ {{ image.image?.name}}
+
+ |
+
|---|
+
+
+
diff --git a/ogWebconsole/src/app/components/commands/main-commands/execute-command/remove-cache-image/remove-cache-image.component.spec.ts b/ogWebconsole/src/app/components/commands/main-commands/execute-command/remove-cache-image/remove-cache-image.component.spec.ts
new file mode 100644
index 0000000..801a02a
--- /dev/null
+++ b/ogWebconsole/src/app/components/commands/main-commands/execute-command/remove-cache-image/remove-cache-image.component.spec.ts
@@ -0,0 +1,92 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { RemoveCacheImageComponent } from './remove-cache-image.component';
+import { FormBuilder, FormsModule, ReactiveFormsModule } from "@angular/forms";
+import { MAT_DIALOG_DATA, MatDialogModule, MatDialogRef } from "@angular/material/dialog";
+import { MatFormFieldModule } from "@angular/material/form-field";
+import { MatInputModule } from "@angular/material/input";
+import { MatCheckboxModule } from "@angular/material/checkbox";
+import { MatButtonModule } from "@angular/material/button";
+import { MatMenuModule } from "@angular/material/menu";
+import { BrowserAnimationsModule } from "@angular/platform-browser/animations";
+import { MatTableModule } from "@angular/material/table";
+import { MatSelectModule } from "@angular/material/select";
+import { MatIconModule } from "@angular/material/icon";
+import { ToastrModule, ToastrService } from "ngx-toastr";
+import { TranslateModule } from "@ngx-translate/core";
+import { DataService } from "../../data.service";
+import { provideHttpClient } from "@angular/common/http";
+import { provideHttpClientTesting } from "@angular/common/http/testing";
+import { ConfigService } from "@services/config.service";
+import { MatExpansionModule } from '@angular/material/expansion';
+import { MatDividerModule } from '@angular/material/divider';
+import { MatRadioModule } from '@angular/material/radio';
+
+describe('RemoveCacheImageComponent', () => {
+ let component: RemoveCacheImageComponent;
+ let fixture: ComponentFixturedashboard works!
\ No newline at end of file diff --git a/ogWebconsole/src/app/components/dashboard/dashboard.component.spec.ts b/ogWebconsole/src/app/components/dashboard/dashboard.component.spec.ts deleted file mode 100644 index 5e8286f..0000000 --- a/ogWebconsole/src/app/components/dashboard/dashboard.component.spec.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { DashboardComponent } from './dashboard.component'; - -describe('DashboardComponent', () => { - let component: DashboardComponent; - let fixture: ComponentFixture
-
@@ -144,18 +148,21 @@
+
+
+
+ Seleccione aula
+
+ {{ unit.name }}
+
+
+
+
+;
+
+ beforeEach(async () => {
+ const mockConfigService = { apiUrl: 'http://mock-api-url' };
+
+ await TestBed.configureTestingModule({
+ declarations: [ChangeParentComponent],
+ imports: [
+ HttpClientTestingModule,
+ MatDialogModule,
+ MatFormFieldModule,
+ MatSelectModule,
+ FormsModule,
+ BrowserAnimationsModule
+ ],
+ providers: [
+ { provide: MatDialogRef, useValue: {} },
+ { provide: MAT_DIALOG_DATA, useValue: { clients: [] } },
+ { provide: ToastrService, useValue: { success: () => { }, error: () => { } } },
+ { provide: ConfigService, useValue: mockConfigService }
+ ]
+ })
+ .compileComponents();
+
+ fixture = TestBed.createComponent(ChangeParentComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/ogWebconsole/src/app/components/groups/shared/change-parent/change-parent.component.ts b/ogWebconsole/src/app/components/groups/shared/change-parent/change-parent.component.ts
new file mode 100644
index 0000000..95a3256
--- /dev/null
+++ b/ogWebconsole/src/app/components/groups/shared/change-parent/change-parent.component.ts
@@ -0,0 +1,63 @@
+import {Component, Inject, OnInit} from '@angular/core';
+import {HttpClient} from "@angular/common/http";
+import {MAT_DIALOG_DATA, MatDialogRef} from "@angular/material/dialog";
+import {ToastrService} from "ngx-toastr";
+import {Router} from "@angular/router";
+import {ConfigService} from "@services/config.service";
+
+@Component({
+ selector: 'app-change-parent',
+ templateUrl: './change-parent.component.html',
+ styleUrl: './change-parent.component.css'
+})
+export class ChangeParentComponent implements OnInit {
+ baseUrl: string;
+ loading: boolean = true;
+ units: any[] = [];
+ newOU: any;
+
+ constructor(
+ private http: HttpClient,
+ public dialogRef: MatDialogRef,
+ private toastService: ToastrService,
+ private router: Router,
+ private configService: ConfigService,
+ @Inject(MAT_DIALOG_DATA) public data: { clients: any}
+ ) {
+ this.baseUrl = this.configService.apiUrl;
+ }
+
+ ngOnInit(): void {
+ this.loading = true;
+ this.loadUnits();
+ }
+
+ loadUnits() {
+ this.http.get(`${this.baseUrl}/organizational-units?page=1&itemsPerPage=500`).subscribe(
+ response => {
+ this.units = response['hydra:member'];
+ this.loading = false;
+ },
+ error => console.error('Error fetching organizational units:', error)
+ );
+ }
+
+ save() {
+ this.http.post(`${this.baseUrl}/clients/change-organizational-unit`, {
+ clients: this.data.clients.map((client: any) => client['@id']),
+ organizationalUnit: this.newOU['@id']
+ }).subscribe({
+ next: (response) => {
+ this.toastService.success('Parent changed successfully');
+ this.dialogRef.close(true);
+ },
+ error: error => {
+ this.toastService.error(error.error['hydra:description']);
+ }
+ })
+ }
+
+ close() {
+ this.dialogRef.close();
+ }
+}
diff --git a/ogWebconsole/src/app/components/login/login.component.ts b/ogWebconsole/src/app/components/login/login.component.ts
index 2a55593..4a58364 100644
--- a/ogWebconsole/src/app/components/login/login.component.ts
+++ b/ogWebconsole/src/app/components/login/login.component.ts
@@ -3,10 +3,10 @@ import { Component, signal } from '@angular/core';
import { Router } from '@angular/router';
import { TranslateService } from '@ngx-translate/core';
import { ToastrService } from "ngx-toastr";
-import { jwtDecode } from "jwt-decode";
import { ConfigService } from '@services/config.service';
import { MatDialog } from '@angular/material/dialog';
import { GlobalStatusComponent } from '../global-status/global-status.component'
+import { AuthService } from '@services/auth.service';
@Component({
selector: 'app-login',
@@ -20,8 +20,6 @@ export class LoginComponent {
};
errorMessage: string = '';
isLoading: boolean = false;
- decodedToken: any;
-
baseUrl: string;
constructor(
@@ -29,6 +27,7 @@ export class LoginComponent {
private router: Router,
private configService: ConfigService,
private toastService: ToastrService,
+ private auth: AuthService,
private translateService: TranslateService,
private dialog: MatDialog
) {
@@ -62,13 +61,8 @@ export class LoginComponent {
next: (res: any) => {
if (res.token) {
localStorage.setItem('loginToken', res.token);
- localStorage.setItem('refreshToken', res.refreshToken);
- localStorage.setItem('username', this.loginObj.username);
-
- this.decodedToken = jwtDecode(res.token);
- localStorage.setItem('groupsView', this.decodedToken.groupsView);
-
- this.openSnackBar(false, 'Bienvenido ' + this.loginObj.username);
+ this.auth.refresh();
+ this.openSnackBar(false, 'Bienvenido ' + this.auth.username);
this.router.navigateByUrl('/groups');
this.dialog.open(GlobalStatusComponent, {
width: '45vw',
diff --git a/ogWebconsole/src/app/components/repositories/manage-repository/manage-repository.component.ts b/ogWebconsole/src/app/components/repositories/manage-repository/manage-repository.component.ts
index 4e2b71d..581e656 100644
--- a/ogWebconsole/src/app/components/repositories/manage-repository/manage-repository.component.ts
+++ b/ogWebconsole/src/app/components/repositories/manage-repository/manage-repository.component.ts
@@ -30,8 +30,8 @@ export class ManageRepositoryComponent implements OnInit {
this.imageForm = this.fb.group({
name: [null, Validators.required],
ip: [null],
- sshPort: [null],
- user: [null],
+ sshPort: ['22'],
+ user: ['opengnsys'],
comments: [null],
});
}
diff --git a/ogWebconsole/src/app/components/task-logs/client-task-logs/client-task-logs.component.css b/ogWebconsole/src/app/components/task-logs/client-task-logs/client-task-logs.component.css
index fa2c0ba..4a3ab81 100644
--- a/ogWebconsole/src/app/components/task-logs/client-task-logs/client-task-logs.component.css
+++ b/ogWebconsole/src/app/components/task-logs/client-task-logs/client-task-logs.component.css
@@ -44,15 +44,10 @@ table {
display: flex;
justify-content: space-between;
align-items: center;
- margin: 1.5rem 0rem 1.5rem 0rem;
+ margin: 1.5rem 0rem 0.5rem 0rem;
box-sizing: border-box;
}
-.search-string {
- flex: 1;
- padding: 5px;
-}
-
.search-boolean {
flex: 1;
padding: 5px;
@@ -63,6 +58,11 @@ table {
padding: 5px;
}
+.search-date {
+ flex: 1;
+ padding: 5px;
+}
+
.mat-elevation-z8 {
box-shadow: 0px 0px 0px rgba(0, 0, 0, 0.2);
}
diff --git a/ogWebconsole/src/app/components/task-logs/client-task-logs/client-task-logs.component.html b/ogWebconsole/src/app/components/task-logs/client-task-logs/client-task-logs.component.html
index 57e84ba..843bd76 100644
--- a/ogWebconsole/src/app/components/task-logs/client-task-logs/client-task-logs.component.html
+++ b/ogWebconsole/src/app/components/task-logs/client-task-logs/client-task-logs.component.html
@@ -47,13 +47,29 @@
close
+
+
+ Desde
+
+
+
+
+ Hasta
+
+
+
+
+
+
+
+
diff --git a/ogWebconsole/src/app/components/groups/groups.component.ts b/ogWebconsole/src/app/components/groups/groups.component.ts
index c75f2fd..ade27dd 100644
--- a/ogWebconsole/src/app/components/groups/groups.component.ts
+++ b/ogWebconsole/src/app/components/groups/groups.component.ts
@@ -29,6 +29,8 @@ import { MatMenuTrigger } from '@angular/material/menu';
import { ClientDetailsComponent } from './shared/client-details/client-details.component';
import { PartitionTypeOrganizatorComponent } from './shared/partition-type-organizator/partition-type-organizator.component';
import { ClientTaskLogsComponent } from '../task-logs/client-task-logs/client-task-logs.component';
+import {ChangeParentComponent} from "./shared/change-parent/change-parent.component";
+import { AuthService } from '@services/auth.service';
enum NodeType {
OrganizationalUnit = 'organizational-unit',
@@ -114,6 +116,7 @@ export class GroupsComponent implements OnInit, OnDestroy {
private joyrideService: JoyrideService,
private breakpointObserver: BreakpointObserver,
private toastr: ToastrService,
+ public auth: AuthService,
private configService: ConfigService,
private cd: ChangeDetectorRef,
) {
@@ -132,7 +135,7 @@ export class GroupsComponent implements OnInit, OnDestroy {
);
this.treeDataSource = new MatTreeFlatDataSource(this.treeControl, this.treeFlattener);
- this.currentView = localStorage.getItem('groupsView') || 'list';
+ this.currentView = this.auth.groupsView || 'list';
}
@@ -864,12 +867,27 @@ export class GroupsComponent implements OnInit, OnDestroy {
});
}
+ changeParent(event: MouseEvent, ): void {
+ event.stopPropagation();
+
+ const dialogRef = this.dialog.open(ChangeParentComponent, {
+ data: { clients: this.selection.selected },
+ width: '700px',
+ });
+
+ dialogRef.afterClosed().subscribe((result) => {
+ if (result) {
+ this.refreshData();
+ }
+ });
+ }
+
openClientTaskLogs(event: MouseEvent, client: Client): void {
event.stopPropagation();
this.dialog.open(ClientTaskLogsComponent, {
width: '1200px',
- data: {client}
+ data: { client }
})
}
}
diff --git a/ogWebconsole/src/app/components/groups/shared/change-parent/change-parent.component.css b/ogWebconsole/src/app/components/groups/shared/change-parent/change-parent.component.css
new file mode 100644
index 0000000..6e0686f
--- /dev/null
+++ b/ogWebconsole/src/app/components/groups/shared/change-parent/change-parent.component.css
@@ -0,0 +1,39 @@
+.loading-container {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+ height: 100px;
+}
+
+mat-form-field {
+ width: 100%;
+}
+
+mat-dialog-actions {
+ display: flex;
+ justify-content: flex-end;
+}
+
+.checkbox-group {
+ display: flex;
+ flex-direction: column;
+ gap: 10px;
+}
+
+.selected-list ul {
+ list-style: none;
+ padding: 0;
+}
+
+.selected-item {
+ display: flex;
+ justify-content: space-between; /* Alinea texto a la izquierda y botón a la derecha */
+ align-items: center; /* Centra verticalmente */
+ padding: 8px;
+ border-bottom: 1px solid #ccc;
+}
+
+.selected-item button {
+ margin-left: 10px;
+}
diff --git a/ogWebconsole/src/app/components/groups/shared/change-parent/change-parent.component.html b/ogWebconsole/src/app/components/groups/shared/change-parent/change-parent.component.html
new file mode 100644
index 0000000..a8d0f48
--- /dev/null
+++ b/ogWebconsole/src/app/components/groups/shared/change-parent/change-parent.component.html
@@ -0,0 +1,15 @@
+Mover clientes a:
+ +
+
+
+
diff --git a/ogWebconsole/src/app/components/groups/shared/change-parent/change-parent.component.spec.ts b/ogWebconsole/src/app/components/groups/shared/change-parent/change-parent.component.spec.ts
new file mode 100644
index 0000000..e9e4e25
--- /dev/null
+++ b/ogWebconsole/src/app/components/groups/shared/change-parent/change-parent.component.spec.ts
@@ -0,0 +1,46 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { ChangeParentComponent } from './change-parent.component';
+import { HttpClientTestingModule } from '@angular/common/http/testing';
+import { MAT_DIALOG_DATA, MatDialogModule, MatDialogRef } from '@angular/material/dialog';
+import { ToastrService } from 'ngx-toastr';
+import { ConfigService } from '@services/config.service';
+import { MatFormFieldModule } from '@angular/material/form-field';
+import { MatSelectModule } from '@angular/material/select';
+import { FormsModule } from '@angular/forms';
+import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
+
+describe('ChangeParentComponent', () => {
+ let component: ChangeParentComponent;
+ let fixture: ComponentFixture
-
+
| {{ column.header }} |
@@ -69,7 +85,8 @@
+ {{ 'informationLabel' | translate }} |
-
+ |
| |
|---|