Add ShowGitImages component and refactor show-images for show-monolitic-images
testing/ogGui-multibranch/pipeline/head There was a failure building this commit
Details
testing/ogGui-multibranch/pipeline/head There was a failure building this commit
Details
parent
7659c09cd6
commit
390bc54213
|
@ -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,
|
||||
|
|
|
@ -42,7 +42,7 @@
|
|||
</ng-container>
|
||||
|
||||
<ng-container *ngIf="column.columnDef === 'images'">
|
||||
<button class="action-button" (click)="openShowImagesDialog(repository)">Gestionar Imágenes</button>
|
||||
<button class="action-button" (click)="openShowMonoliticImagesDialog(repository)">Gestionar Imágenes</button>
|
||||
</ng-container>
|
||||
</td>
|
||||
</ng-container>
|
||||
|
|
|
@ -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',
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
<p>show-git-images works!</p>
|
|
@ -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<ShowGitImagesComponent>;
|
||||
|
||||
beforeEach(async () => {
|
||||
await TestBed.configureTestingModule({
|
||||
declarations: [ShowGitImagesComponent]
|
||||
})
|
||||
.compileComponents();
|
||||
|
||||
fixture = TestBed.createComponent(ShowGitImagesComponent);
|
||||
component = fixture.componentInstance;
|
||||
fixture.detectChanges();
|
||||
});
|
||||
|
||||
it('should create', () => {
|
||||
expect(component).toBeTruthy();
|
||||
});
|
||||
});
|
|
@ -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 {
|
||||
|
||||
}
|
|
@ -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<ShowImagesComponent>;
|
||||
|
|
@ -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<any>();
|
||||
|
@ -80,7 +80,7 @@ export class ShowImagesComponent implements OnInit {
|
|||
private joyrideService: JoyrideService,
|
||||
private configService: ConfigService,
|
||||
private router: Router,
|
||||
public dialogRef: MatDialogRef<ShowImagesComponent>,
|
||||
public dialogRef: MatDialogRef<ShowMonoliticImagesComponent>,
|
||||
@Inject(MAT_DIALOG_DATA) public data: any
|
||||
) {
|
||||
this.baseUrl = this.configService.apiUrl;
|
Loading…
Reference in New Issue