Commit be6f8a85 authored by Marta Różańska's avatar Marta Różańska
Browse files

Merge branch 'feature-mor-20-dev' into 'morphemic-rc1.5'

Feature mor 20 dev

See merge request !13
parents a6fe74d0 eca0b457
Pipeline #15006 passed with stages
in 7 minutes and 30 seconds
......@@ -23,6 +23,7 @@ build-ui-docker:
- rc3.1
- morphemic-rc1.5
- feature-byon-proactive-support
- feature-mor-20-dev
image: docker:19.03.1
services:
- docker:19.03.1-dind
......
<mat-card>
<mat-tab-group>
<mat-tab label="Cloudiator jobs">
<mat-tab label="ProActive jobs">
<app-job-list></app-job-list>
</mat-tab>
<mat-tab label="Cloudiator schedules">
<app-schedule-list></app-schedule-list>
</mat-tab>
<mat-tab label="Cloudiator nodes">
<mat-tab label="ProActive nodes">
<app-node-list></app-node-list>
</mat-tab>
<mat-tab label="Cloudiator processes">
<app-process-cloudiator-list></app-process-cloudiator-list>
</mat-tab>
<mat-tab label="Cloudiator queue">
<app-queue-list></app-queue-list>
</mat-tab>
<mat-tab label="Cloudiator monitors">
<mat-tab label="ProActive monitors">
<app-monitor-list></app-monitor-list>
</mat-tab>
......
......@@ -26,9 +26,14 @@
<td mat-cell class="field-with-wrapping" *matCellDef="let row">{{row.id}}</td>
</ng-container>
<ng-container matColumnDef="owner">
<th mat-header-cell *matHeaderCellDef mat-sort-header>Owner</th>
<td mat-cell class="field-with-wrapping" *matCellDef="let row">{{row.owner}}</td>
<ng-container matColumnDef="submittedJobType">
<th mat-header-cell *matHeaderCellDef mat-sort-header>Submitted Job Type</th>
<td mat-cell class="field-with-wrapping" *matCellDef="let row">{{row.submittedJobType}}</td>
</ng-container>
<ng-container matColumnDef="submittedJobId">
<th mat-header-cell *matHeaderCellDef mat-sort-header>Submitted Job Id</th>
<td mat-cell class="field-with-wrapping" *matCellDef="let row">{{row.submittedJobId}}</td>
</ng-container>
<ng-container matColumnDef="properties">
......@@ -62,45 +67,6 @@
</mat-accordion>
</mat-expansion-panel>
<!--communications list-->
<mat-expansion-panel (opened)="panelOpenState = true"
(closed)="panelOpenState = false">
<mat-expansion-panel-header>
<mat-panel-title>
<span>communications</span>
</mat-panel-title>
</mat-expansion-panel-header>
<pre>{{ row.communications | json }}</pre>
</mat-expansion-panel>
<!--requirements list-->
<mat-expansion-panel (opened)="panelOpenState = true"
(closed)="panelOpenState = false">
<mat-expansion-panel-header>
<mat-panel-title>
<span>requirements</span>
</mat-panel-title>
</mat-expansion-panel-header>
<pre>{{ row.requirements | json }}</pre>
</mat-expansion-panel>
<!--optimization list-->
<mat-expansion-panel (opened)="panelOpenState = true"
(closed)="panelOpenState = false">
<mat-expansion-panel-header>
<mat-panel-title>
<span>optimization</span>
</mat-panel-title>
</mat-expansion-panel-header>
<pre>{{ row.optimization | json }}</pre>
</mat-expansion-panel>
</mat-accordion>
</td>
</ng-container>
......
import {Component, OnInit, ViewChild} from '@angular/core';
import {DeploymentDetailsService} from '../service/deployment-details.service';
import {JobCloudiator} from '../model/job-cloudiator';
import {JobMelodic} from '../model/job-melodic';
import {MatPaginator, MatSnackBar, MatSort, MatTableDataSource} from '@angular/material';
@Component({
......@@ -12,10 +12,10 @@ export class JobListComponent implements OnInit {
panelOpenState = false;
loadingJobListInProgress = false;
jobList: JobCloudiator[];
jobList: JobMelodic[];
data: MatTableDataSource<JobCloudiator>;
displayedColumns: string[] = ['no', 'name', 'id', 'owner', 'properties'];
data: MatTableDataSource<JobMelodic>;
displayedColumns: string[] = ['no', 'name', 'id', 'submittedJobId', 'submittedJobType', 'properties'];
@ViewChild(MatPaginator) paginator: MatPaginator;
@ViewChild(MatSort) sort: MatSort;
......@@ -35,10 +35,10 @@ export class JobListComponent implements OnInit {
});
}
updateData(jobsData: JobCloudiator[]) {
updateData(jobsData: JobMelodic[]) {
this.loadingJobListInProgress = false;
this.jobList = jobsData;
this.data = new MatTableDataSource<JobCloudiator>(this.jobList);
this.data = new MatTableDataSource<JobMelodic>(this.jobList);
this.data.paginator = this.paginator;
this.data.sort = this.sort;
}
......
export class JobCloudiator {
name: string;
id: string;
owner: string;
tasks: Array<any>;
communications: Array<any>;
requirements: Array<any>;
optimization: any;
}
export class JobMelodic {
name: string;
id: string;
submittedJobId: bigint;
submittedJobType: string
tasks: Array<any>;
}
......@@ -6,7 +6,7 @@ import {ProcessCloudiator} from '../model/process-cloudiator';
import {tap} from 'rxjs/operators';
import {NodeCloudiator} from '../../../../application/model/node-cloudiator';
import {QueueCloudiator} from '../model/queue-cloudiator';
import {JobCloudiator} from '../model/job-cloudiator';
import {JobMelodic} from '../model/job-melodic';
import {ScheduleCloudiator} from '../model/schedule-cloudiator';
import {MonitorCloudiator} from '../model/monitor-cloudiator';
......@@ -48,10 +48,10 @@ export class DeploymentDetailsService {
);
}
getJobCloudiatorList(): Observable<Array<JobCloudiator>> {
getJobCloudiatorList(): Observable<Array<JobMelodic>> {
const requestUrl = `${this.apiUrl}/job`;
return this.http.get(requestUrl, httpOptions).pipe(
tap((response: Array<JobCloudiator>) => console.log(`Response from cloudiator jobs list with ${response.length} elements`),
tap((response: Array<JobMelodic>) => console.log(`Response from cloudiator jobs list with ${response.length} elements`),
e => console.log('Error by getting cloudiator job list', e))
);
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment