From 390bc54213ef58b426dba6b6e07331dd6378e83e Mon Sep 17 00:00:00 2001 From: Lucas Lara Date: Wed, 9 Apr 2025 12:27:55 +0200 Subject: [PATCH] Add ShowGitImages component and refactor show-images for show-monolitic-images --- ogWebconsole/src/app/app.module.ts | 8 ++++--- .../repositories/repositories.component.html | 2 +- .../repositories/repositories.component.ts | 6 ++--- .../show-git-images.component.css | 0 .../show-git-images.component.html | 1 + .../show-git-images.component.spec.ts | 23 +++++++++++++++++++ .../show-git-images.component.ts | 10 ++++++++ .../show-monolitic-images.component.css} | 0 .../show-monolitic-images.component.html} | 0 .../show-monolitic-images.component.spec.ts} | 4 ++-- .../show-monolitic-images.component.ts} | 10 ++++---- 11 files changed, 50 insertions(+), 14 deletions(-) create mode 100644 ogWebconsole/src/app/components/repositories/show-git-images/show-git-images.component.css create mode 100644 ogWebconsole/src/app/components/repositories/show-git-images/show-git-images.component.html create mode 100644 ogWebconsole/src/app/components/repositories/show-git-images/show-git-images.component.spec.ts create mode 100644 ogWebconsole/src/app/components/repositories/show-git-images/show-git-images.component.ts rename ogWebconsole/src/app/components/repositories/{show-images/show-images.component.css => show-monolitic-images/show-monolitic-images.component.css} (100%) rename ogWebconsole/src/app/components/repositories/{show-images/show-images.component.html => show-monolitic-images/show-monolitic-images.component.html} (100%) rename ogWebconsole/src/app/components/repositories/{show-images/show-images.component.spec.ts => show-monolitic-images/show-monolitic-images.component.spec.ts} (94%) rename ogWebconsole/src/app/components/repositories/{show-images/show-images.component.ts => show-monolitic-images/show-monolitic-images.component.ts} (97%) diff --git a/ogWebconsole/src/app/app.module.ts b/ogWebconsole/src/app/app.module.ts index db02f85..1c2e6bf 100644 --- a/ogWebconsole/src/app/app.module.ts +++ b/ogWebconsole/src/app/app.module.ts @@ -133,7 +133,7 @@ import { ConvertImageComponent } from './components/repositories/convert-image/c import { registerLocaleData } from '@angular/common'; import localeEs from '@angular/common/locales/es'; import { GlobalStatusComponent } from './components/global-status/global-status.component'; -import { ShowImagesComponent } from './components/repositories/show-images/show-images.component'; +import { ShowMonoliticImagesComponent } from './components/repositories/show-monolitic-images/show-monolitic-images.component'; import { StatusTabComponent } from './components/global-status/status-tab/status-tab.component'; import { ConvertImageToVirtualComponent } from './components/repositories/convert-image-to-virtual/convert-image-to-virtual.component'; import { RunScriptAssistantComponent } from './components/groups/components/client-main-view/run-script-assistant/run-script-assistant.component'; @@ -141,6 +141,7 @@ import { SaveScriptComponent } from "./components/groups/components/client-main-view/run-script-assistant/save-script/save-script.component"; import { EditImageComponent } from './components/repositories/edit-image/edit-image.component'; +import { ShowGitImagesComponent } from './components/repositories/show-git-images/show-git-images.component'; export function HttpLoaderFactory(http: HttpClient) { return new TranslateHttpLoader(http, './locale/', '.json'); @@ -234,12 +235,13 @@ registerLocaleData(localeEs, 'es-ES'); OperationResultDialogComponent, ConvertImageComponent, GlobalStatusComponent, - ShowImagesComponent, + ShowMonoliticImagesComponent, StatusTabComponent, ConvertImageToVirtualComponent, RunScriptAssistantComponent, SaveScriptComponent, - EditImageComponent + EditImageComponent, + ShowGitImagesComponent ], bootstrap: [AppComponent], imports: [BrowserModule, diff --git a/ogWebconsole/src/app/components/repositories/repositories.component.html b/ogWebconsole/src/app/components/repositories/repositories.component.html index 2f33a45..8694f07 100644 --- a/ogWebconsole/src/app/components/repositories/repositories.component.html +++ b/ogWebconsole/src/app/components/repositories/repositories.component.html @@ -42,7 +42,7 @@ - + diff --git a/ogWebconsole/src/app/components/repositories/repositories.component.ts b/ogWebconsole/src/app/components/repositories/repositories.component.ts index 6443e59..234ceeb 100644 --- a/ogWebconsole/src/app/components/repositories/repositories.component.ts +++ b/ogWebconsole/src/app/components/repositories/repositories.component.ts @@ -9,7 +9,7 @@ import { JoyrideService } from 'ngx-joyride'; import { Router } from '@angular/router'; import { ConfigService } from '@services/config.service'; import {Subnet} from "../ogdhcp/og-dhcp-subnets.component"; -import {ShowImagesComponent} from "./show-images/show-images.component"; +import {ShowMonoliticImagesComponent} from "./show-monolitic-images/show-monolitic-images.component"; import {ManageRepositoryComponent} from "./manage-repository/manage-repository.component"; @Component({ @@ -125,8 +125,8 @@ export class RepositoriesComponent implements OnInit { }); } - openShowImagesDialog(repository: Subnet) { - const dialogRef = this.dialog.open(ShowImagesComponent, { + openShowMonoliticImagesDialog(repository: Subnet) { + const dialogRef = this.dialog.open(ShowMonoliticImagesComponent, { width: '100vw', height: '100vh', maxWidth: '100vw', diff --git a/ogWebconsole/src/app/components/repositories/show-git-images/show-git-images.component.css b/ogWebconsole/src/app/components/repositories/show-git-images/show-git-images.component.css new file mode 100644 index 0000000..e69de29 diff --git a/ogWebconsole/src/app/components/repositories/show-git-images/show-git-images.component.html b/ogWebconsole/src/app/components/repositories/show-git-images/show-git-images.component.html new file mode 100644 index 0000000..a55de12 --- /dev/null +++ b/ogWebconsole/src/app/components/repositories/show-git-images/show-git-images.component.html @@ -0,0 +1 @@ +

show-git-images works!

diff --git a/ogWebconsole/src/app/components/repositories/show-git-images/show-git-images.component.spec.ts b/ogWebconsole/src/app/components/repositories/show-git-images/show-git-images.component.spec.ts new file mode 100644 index 0000000..e574c30 --- /dev/null +++ b/ogWebconsole/src/app/components/repositories/show-git-images/show-git-images.component.spec.ts @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { ShowGitImagesComponent } from './show-git-images.component'; + +describe('ShowGitImagesComponent', () => { + let component: ShowGitImagesComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ShowGitImagesComponent] + }) + .compileComponents(); + + fixture = TestBed.createComponent(ShowGitImagesComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/ogWebconsole/src/app/components/repositories/show-git-images/show-git-images.component.ts b/ogWebconsole/src/app/components/repositories/show-git-images/show-git-images.component.ts new file mode 100644 index 0000000..d07f997 --- /dev/null +++ b/ogWebconsole/src/app/components/repositories/show-git-images/show-git-images.component.ts @@ -0,0 +1,10 @@ +import { Component } from '@angular/core'; + +@Component({ + selector: 'app-show-git-images', + templateUrl: './show-git-images.component.html', + styleUrl: './show-git-images.component.css' +}) +export class ShowGitImagesComponent { + +} diff --git a/ogWebconsole/src/app/components/repositories/show-images/show-images.component.css b/ogWebconsole/src/app/components/repositories/show-monolitic-images/show-monolitic-images.component.css similarity index 100% rename from ogWebconsole/src/app/components/repositories/show-images/show-images.component.css rename to ogWebconsole/src/app/components/repositories/show-monolitic-images/show-monolitic-images.component.css diff --git a/ogWebconsole/src/app/components/repositories/show-images/show-images.component.html b/ogWebconsole/src/app/components/repositories/show-monolitic-images/show-monolitic-images.component.html similarity index 100% rename from ogWebconsole/src/app/components/repositories/show-images/show-images.component.html rename to ogWebconsole/src/app/components/repositories/show-monolitic-images/show-monolitic-images.component.html diff --git a/ogWebconsole/src/app/components/repositories/show-images/show-images.component.spec.ts b/ogWebconsole/src/app/components/repositories/show-monolitic-images/show-monolitic-images.component.spec.ts similarity index 94% rename from ogWebconsole/src/app/components/repositories/show-images/show-images.component.spec.ts rename to ogWebconsole/src/app/components/repositories/show-monolitic-images/show-monolitic-images.component.spec.ts index c7cc4a1..0a248ba 100644 --- a/ogWebconsole/src/app/components/repositories/show-images/show-images.component.spec.ts +++ b/ogWebconsole/src/app/components/repositories/show-monolitic-images/show-monolitic-images.component.spec.ts @@ -1,6 +1,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { HttpClientTestingModule } from '@angular/common/http/testing'; -import { ShowImagesComponent } from './show-images.component'; +import { ShowMonoliticImagesComponent } from './show-images.component'; import { ToastrModule } from 'ngx-toastr'; import { MatDialogModule, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { TranslateModule } from '@ngx-translate/core'; @@ -17,7 +17,7 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { MatInputModule } from '@angular/material/input'; import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; -describe('ShowImagesComponent', () => { +describe('ShowMonoliticImagesComponent', () => { let component: ShowImagesComponent; let fixture: ComponentFixture; diff --git a/ogWebconsole/src/app/components/repositories/show-images/show-images.component.ts b/ogWebconsole/src/app/components/repositories/show-monolitic-images/show-monolitic-images.component.ts similarity index 97% rename from ogWebconsole/src/app/components/repositories/show-images/show-images.component.ts rename to ogWebconsole/src/app/components/repositories/show-monolitic-images/show-monolitic-images.component.ts index 669e0d4..dbbc643 100644 --- a/ogWebconsole/src/app/components/repositories/show-images/show-images.component.ts +++ b/ogWebconsole/src/app/components/repositories/show-monolitic-images/show-monolitic-images.component.ts @@ -18,11 +18,11 @@ import {ConvertImageToVirtualComponent} from "../convert-image-to-virtual/conver import {EditImageComponent} from "../edit-image/edit-image.component"; @Component({ - selector: 'app-show-images', - templateUrl: './show-images.component.html', - styleUrl: './show-images.component.css' + selector: 'app-show-monolitic-images', + templateUrl: './show-monolitic-images.component.html', + styleUrl: './show-monolitic-images.component.css' }) -export class ShowImagesComponent implements OnInit { +export class ShowMonoliticImagesComponent implements OnInit { baseUrl: string; private apiUrl: string; dataSource = new MatTableDataSource(); @@ -80,7 +80,7 @@ export class ShowImagesComponent implements OnInit { private joyrideService: JoyrideService, private configService: ConfigService, private router: Router, - public dialogRef: MatDialogRef, + public dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) public data: any ) { this.baseUrl = this.configService.apiUrl;