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/06/07 09:21:44 UTC
[incubator-dlab] branch feature/projects updated: [DLAB-747]:
cleanup status and keys check from management
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
The following commit(s) were added to refs/heads/feature/projects by this push:
new 607850b [DLAB-747]: cleanup status and keys check from management
607850b is described below
commit 607850b58eabd516cbbe88eb4f08681aac8b537b
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Fri Jun 7 12:21:34 2019 +0300
[DLAB-747]: cleanup status and keys check from management
---
.../resources/webapp/src/app/administration/management/index.ts | 3 +--
.../management/management-grid/management-grid.component.html | 8 --------
.../management/management-grid/management-grid.component.ts | 7 +------
.../src/app/administration/management/management.component.ts | 3 ---
.../src/main/resources/webapp/src/app/core/core.module.ts | 2 --
.../resources/webapp/src/app/reporting/reporting.component.ts | 5 +----
.../resources/webapp/src/app/shared/navbar/navbar.component.ts | 9 +--------
7 files changed, 4 insertions(+), 33 deletions(-)
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/index.ts b/services/self-service/src/main/resources/webapp/src/app/administration/management/index.ts
index 58d4b5d..8d03ac0 100644
--- a/services/self-service/src/main/resources/webapp/src/app/administration/management/index.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/index.ts
@@ -21,7 +21,7 @@ import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { UploadKeyDialogModule, BubbleModule, ConfirmationDialogModule } from '../../shared';
+import { BubbleModule, ConfirmationDialogModule } from '../../shared';
import { MaterialModule } from '../../shared/material.module';
import { ManagementComponent } from './management.component';
@@ -46,7 +46,6 @@ export * from './management.component';
FormsModule,
ReactiveFormsModule,
ProjectModule,
- UploadKeyDialogModule,
BubbleModule,
ConfirmationDialogModule,
ComputationalResourcesModule,
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 1241f3a..b6e0f09 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
@@ -105,14 +105,6 @@
<i class="material-icons">play_circle_outline</i>
<span>Start</span>
</li>
- <li (click)="toggleResourceAction(element, 'recreate')" *ngIf="element.status === 'terminated'">
- <i class="material-icons">refresh</i>
- <span>Recreate</span>
- </li>
- <li *ngIf="!isResourcesInProgress(element)" (click)="showReuploaKeydDialog()">
- <i class="material-icons">sync_problem</i>
- <span>Reupload key</span>
- </li>
</div>
</ul>
</bubble-up>
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.ts
index bc865b5..d2c9349 100644
--- a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.ts
@@ -21,7 +21,7 @@ import { Component, OnInit, ViewChild, Input, Output, EventEmitter, Inject } fro
import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material';
import { ToastrService } from 'ngx-toastr';
-import { HealthStatusService, UserAccessKeyService } from '../../../core/services';
+import { HealthStatusService } from '../../../core/services';
import { ConfirmationDialogType } from '../../../shared';
import { ConfirmationDialogComponent } from '../../../shared/modal-dialog/confirmation-dialog';
@@ -50,7 +50,6 @@ export class ManagementGridComponent implements OnInit {
@Output() actionToggle: EventEmitter<ManageAction> = new EventEmitter();
displayedColumns: string[] = ['user', 'type', 'shape', 'status', 'resources', 'actions'];
- @ViewChild('keyReuploadDialog') keyReuploadDialog;
constructor(
private healthStatusService: HealthStatusService,
@@ -120,10 +119,6 @@ export class ManagementGridComponent implements OnInit {
&& resource.status !== 'running'
&& resource.status !== 'stopped')).length > 0;
}
-
- showReuploaKeydDialog() {
- this.keyReuploadDialog.open({ isFooter: false });
- }
}
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 a891d85..0db2a3c 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
@@ -24,7 +24,6 @@ import { ToastrService } from 'ngx-toastr';
import {
HealthStatusService,
ManageEnvironmentsService,
- UserAccessKeyService,
BackupService,
UserResourceService,
StorageService
@@ -55,7 +54,6 @@ export class ManagementComponent implements OnInit {
private healthStatusService: HealthStatusService,
private backupService: BackupService,
private manageEnvironmentsService: ManageEnvironmentsService,
- private userAccessKeyService: UserAccessKeyService,
private userResourceService: UserResourceService,
private storageService: StorageService
) { }
@@ -176,7 +174,6 @@ export class ManagementComponent implements OnInit {
.subscribe((status: GeneralEnvironmentStatus) => {
this.healthStatus = status;
this.healthStatus.admin && this.getAllEnvironmentData();
- this.userAccessKeyService.initialUserAccessKeyCheck();
this.getExploratoryList();
});
}
diff --git a/services/self-service/src/main/resources/webapp/src/app/core/core.module.ts b/services/self-service/src/main/resources/webapp/src/app/core/core.module.ts
index 4b308c3..e182467 100644
--- a/services/self-service/src/main/resources/webapp/src/app/core/core.module.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/core/core.module.ts
@@ -23,7 +23,6 @@ import { ApplicationServiceFacade } from './services/applicationServiceFacade.se
import { AppRoutingService } from './services/appRouting.service';
import { ApplicationSecurityService } from './services/applicationSecurity.service';
import { HealthStatusService } from './services/healthStatus.service';
-import { UserAccessKeyService } from './services/userAccessKey.service';
import { UserResourceService } from './services/userResource.service';
import { AuthorizationGuard } from './services/authorization.guard';
import { CloudProviderGuard } from './services/cloudProvider.guard';
@@ -61,7 +60,6 @@ export class CoreModule {
AdminGuard,
CloudProviderGuard,
CheckParamsGuard,
- UserAccessKeyService,
AppRoutingService,
UserResourceService,
HealthStatusService,
diff --git a/services/self-service/src/main/resources/webapp/src/app/reporting/reporting.component.ts b/services/self-service/src/main/resources/webapp/src/app/reporting/reporting.component.ts
index 94368e0..720b470 100644
--- a/services/self-service/src/main/resources/webapp/src/app/reporting/reporting.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/reporting/reporting.component.ts
@@ -21,7 +21,7 @@
import { Component, OnInit, OnDestroy, ViewChild } from '@angular/core';
import { ToastrService } from 'ngx-toastr';
-import { BillingReportService, HealthStatusService, UserAccessKeyService } from '../core/services';
+import { BillingReportService, HealthStatusService } from '../core/services';
import { ReportingGridComponent } from './reporting-grid/reporting-grid.component';
import { ToolbarComponent } from './toolbar/toolbar.component';
@@ -71,7 +71,6 @@ export class ReportingComponent implements OnInit, OnDestroy {
constructor(
private billingReportService: BillingReportService,
private healthStatusService: HealthStatusService,
- private userAccessKeyService: UserAccessKeyService,
public toastr: ToastrService
) {}
@@ -192,8 +191,6 @@ export class ReportingComponent implements OnInit, OnDestroy {
.subscribe((result: any) => {
this.billingEnabled = result.billingEnabled;
this.admin = result.admin;
-
- this.userAccessKeyService.initialUserAccessKeyCheck();
});
}
}
diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.ts b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.ts
index 7da5ad9..18b8f0d 100644
--- a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.ts
@@ -22,12 +22,7 @@ import { MatDialog, MatDialogRef } from '@angular/material';
import { Subscription, timer, interval } from 'rxjs';
import { ToastrService } from 'ngx-toastr';
-import { ApplicationSecurityService,
- HealthStatusService,
- AppRoutingService,
- UserAccessKeyService,
- SchedulerService,
- StorageService} from '../../core/services';
+import { ApplicationSecurityService, HealthStatusService, AppRoutingService, SchedulerService, StorageService } from '../../core/services';
import { GeneralEnvironmentStatus } from '../../administration/management/management.model';
import { DICTIONARY } from '../../../dictionary/global.dictionary';
import { FileUtils } from '../../core/util';
@@ -59,7 +54,6 @@ export class NavbarComponent implements OnInit, OnDestroy {
private applicationSecurityService: ApplicationSecurityService,
private appRoutingService: AppRoutingService,
private healthStatusService: HealthStatusService,
- private userAccessKeyService: UserAccessKeyService,
private schedulerService: SchedulerService,
private storage: StorageService,
private dialog: MatDialog
@@ -94,7 +88,6 @@ export class NavbarComponent implements OnInit, OnDestroy {
logout_btnClick(): void {
this.healthStatusService.resetStatusValue();
- this.userAccessKeyService.resetUserAccessKey();
this.applicationSecurityService.logout().subscribe(
() => {
this.appRoutingService.redirectToLoginPage();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org