You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by an...@apache.org on 2019/07/15 11:58:50 UTC
[incubator-dlab] branch feature/projects updated (1fa4b76 ->
6ff647b)
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a change to branch feature/projects
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.
from 1fa4b76 DLAB-000 fixed issue with docker container name
new 5280bca [DLAB-854]: resource type fix to stop/terminate smb environment
new 8710eff [DLAB-854]: prevent actions for edge nodes in management page
new 6ff647b Merge branch 'feature/projects' of github.com:apache/incubator-dlab into feature/projects
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../management-grid/management-grid.component.html | 8 ++++----
.../administration/management/management.component.ts | 18 ++++++------------
2 files changed, 10 insertions(+), 16 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 01/03: [DLAB-854]: resource type fix to
stop/terminate smb environment
Posted by an...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch feature/projects
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 5280bcaf175cad749200349d4183e6fad3908397
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Mon Jul 15 14:46:50 2019 +0300
[DLAB-854]: resource type fix to stop/terminate smb environment
---
.../administration/management/management.component.ts | 18 ++++++------------
1 file changed, 6 insertions(+), 12 deletions(-)
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.ts
index 246c19b..15dd8c3 100644
--- a/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.ts
@@ -35,6 +35,7 @@ import { BackupDilogComponent } from './backup-dilog/backup-dilog.component';
import { SsnMonitorComponent } from './ssn-monitor/ssn-monitor.component';
import { ManageEnvironmentComponent } from './manage-environment/manage-environment-dilog.component';
import { EndpointsComponent } from './endpoints/endpoints.component';
+import { ExploratoryModel } from '../../resources/resources-grid/resources-grid.model';
import { EnvironmentsDataService } from './management-data.service';
@@ -48,7 +49,6 @@ export class ManagementComponent implements OnInit {
public healthStatus: GeneralEnvironmentStatus;
public allEnvironmentData: Array<EnvironmentModel>;
public anyEnvInProgress: boolean = false;
- public notebookInProgress: boolean = false;
constructor(
public toastr: ToastrService,
@@ -76,7 +76,7 @@ export class ManagementComponent implements OnInit {
.environmentManagement(
$event.environment.user,
$event.action,
- $event.environment.resource_type === 'edge node' ? 'edge' : $event.environment.resource_name,
+ $event.environment.type === 'edge node' ? 'edge' : $event.environment.resource_name,
$event.resources ? $event.resources.computational_name : null
).subscribe(
() => this.buildGrid(),
@@ -107,17 +107,13 @@ export class ManagementComponent implements OnInit {
this.dialog.open(SsnMonitorComponent, { panelClass: 'modal-lg' });
}
- isEnvironmentsInProgress(data): boolean {
- return data.some(item => {
+ isEnvironmentsInProgress(exploratory): boolean {
+ return exploratory.some(item => {
return item.exploratory.some(el => el.status === 'creating' || el.status === 'starting' ||
el.resources.some(elem => elem.status === 'creating' || elem.status === 'starting' || elem.status === 'configuring'));
});
}
- isNotebookInProgress(data): boolean {
- return data.some(el => el.status === 'creating');
- }
-
setBudgetLimits($event) {
this.healthStatusService.updateUsersBudget($event.users).subscribe((result: any) => {
this.healthStatusService.updateTotalBudgetData($event.total).subscribe((res: any) => {
@@ -147,10 +143,8 @@ export class ManagementComponent implements OnInit {
private getExploratoryList() {
this.userResourceService.getUserProvisionedResources()
- .subscribe((result) => {
- this.anyEnvInProgress = this.isEnvironmentsInProgress(result);
- this.notebookInProgress = this.isNotebookInProgress(result);
- });
+ .subscribe((result) => this.anyEnvInProgress = this.isEnvironmentsInProgress(
+ ExploratoryModel.loadEnvironments(result)));
}
private getEnvironmentHealthStatus() {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 02/03: [DLAB-854]: prevent actions for edge nodes
in management page
Posted by an...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch feature/projects
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 8710effb2c2c5e85a99b9012488dc7787f80e404
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Mon Jul 15 14:57:59 2019 +0300
[DLAB-854]: prevent actions for edge nodes in management page
---
.../management/management-grid/management-grid.component.html | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html
index ff15225..14c3b89 100644
--- a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html
@@ -25,18 +25,18 @@
</ng-container>
<ng-container matColumnDef="project">
- <th mat-header-cell *matHeaderCellDef class="project"> Type </th>
+ <th mat-header-cell *matHeaderCellDef class="project"> Project </th>
<td mat-cell *matCellDef="let element">{{ element.project }}</td>
</ng-container>
<ng-container matColumnDef="type">
<th mat-header-cell *matHeaderCellDef class="type"> Type </th>
- <td mat-cell *matCellDef="let element">{{ element.resource_name || element.resource_type }}</td>
+ <td mat-cell *matCellDef="let element">{{ element.name || element.type }}</td>
</ng-container>
<ng-container matColumnDef="shape">
<th mat-header-cell *matHeaderCellDef class="shape"> Shape / Resource id </th>
- <td mat-cell *matCellDef="let element" class="shape">{{ element.shape || element.public_ip }}</td>
+ <td mat-cell *matCellDef="let element" class="shape">{{ element.shape || element.ip }}</td>
</ng-container>
<ng-container matColumnDef="status">
@@ -80,7 +80,7 @@
<ng-container matColumnDef="actions">
<th mat-header-cell *matHeaderCellDef class="actions"></th>
<td mat-cell *matCellDef="let element" class="actions settings">
- <span #settings class="actions" (click)="actions.toggle($event, settings)"
+ <span #settings class="actions" (click)="actions.toggle($event, settings)" *ngIf="element.type !== 'edge node'"
[ngClass]="{ 'disabled'
: element.status !== 'running' && element.status !== 'stopped' && element.status !== 'stopping' && element.status !== 'failed' }"></span>
<bubble-up #actions class="list-menu" position="bottom-left" alternative="top-left">
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 03/03: Merge branch 'feature/projects' of
github.com:apache/incubator-dlab into feature/projects
Posted by an...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch feature/projects
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 6ff647b7129d77e77fbc3c8b09610ffdb2345b35
Merge: 8710eff 1fa4b76
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Mon Jul 15 14:58:19 2019 +0300
Merge branch 'feature/projects' of github.com:apache/incubator-dlab into feature/projects
.../java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org