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/04/12 11:10:00 UTC
[incubator-dlab] branch DLAB-572 created (now 76c8a67)
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a change to branch DLAB-572
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.
at 76c8a67 [DLAB-572]: linter configuration updates
This branch includes the following new commits:
new 7d37d3c Merge branch 'bugfix-DLAB-570' of github.com:apache/incubator-dlab into DLAB-572
new 4e21daa [DLAB-572]: added handler on edge creation failing; app version added
new 76c8a67 [DLAB-572]: linter configuration updates
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.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 02/03: [DLAB-572]: added handler on edge creation
failing; app version added
Posted by an...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch DLAB-572
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 4e21daad433f65e8afb2665a421b6fc977aebc7f
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Fri Apr 12 14:08:47 2019 +0300
[DLAB-572]: added handler on edge creation failing; app version added
---
.../services/applicationServiceFacade.service.ts | 9 +++++
.../src/app/core/services/healthStatus.service.ts | 8 +++++
.../resources/webapp/src/app/management/index.ts | 6 ++--
.../manage-environment-dilog.component.ts | 4 +--
.../management-grid/management-grid.component.html | 38 +++++++++++-----------
.../management-grid/management-grid.component.scss | 3 ++
.../management-grid/management-grid.component.ts | 8 ++---
.../src/app/management/management.component.ts | 4 +--
.../webapp/src/app/management/management.model.ts | 3 +-
.../webapp/src/app/shared/navbar/index.ts | 5 +--
.../src/app/shared/navbar/navbar.component.html | 10 ++++++
.../src/app/shared/navbar/navbar.component.scss | 17 +++++++++-
.../src/app/shared/navbar/navbar.component.ts | 17 +++++++---
13 files changed, 93 insertions(+), 39 deletions(-)
diff --git a/services/self-service/src/main/resources/webapp/src/app/core/services/applicationServiceFacade.service.ts b/services/self-service/src/main/resources/webapp/src/app/core/services/applicationServiceFacade.service.ts
index b1fd570..79ae239 100644
--- a/services/self-service/src/main/resources/webapp/src/app/core/services/applicationServiceFacade.service.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/core/services/applicationServiceFacade.service.ts
@@ -49,6 +49,7 @@ export class ApplicationServiceFacade {
private static readonly USER_PREFERENCES = 'user_preferences';
private static readonly BUDGET = 'budget';
private static readonly ENVIRONMENT_HEALTH_STATUS = 'environment_health_status';
+ private static readonly META_DATA = 'meta';
private static readonly ROLES = 'roles';
private static readonly GROUPS = 'groups';
private static readonly GROUP_ROLE = 'group_role';
@@ -514,6 +515,12 @@ export class ApplicationServiceFacade {
data);
}
+ public buildGetAppMetaData(): Observable<any> {
+ return this.buildRequest(RequestMethod.Get,
+ this.requestRegistry.Item(ApplicationServiceFacade.META_DATA),
+ null);
+ }
+
private setupRegistry(): void {
this.requestRegistry = new Dictionary<string>();
@@ -559,6 +566,8 @@ export class ApplicationServiceFacade {
// Environment Health Status
this.requestRegistry.Add(ApplicationServiceFacade.ENVIRONMENT_HEALTH_STATUS, '/api/infrastructure/status');
+ this.requestRegistry.Add(ApplicationServiceFacade.ENVIRONMENT_HEALTH_STATUS, '/api/infrastructure/status');
+ this.requestRegistry.Add(ApplicationServiceFacade.META_DATA, '/api/infrastructure/meta');
this.requestRegistry.Add(ApplicationServiceFacade.EDGE_NODE_START, '/api/infrastructure/edge/start');
this.requestRegistry.Add(ApplicationServiceFacade.EDGE_NODE_STOP, '/api/infrastructure/edge/stop');
this.requestRegistry.Add(ApplicationServiceFacade.EDGE_NODE_RECREATE, '/api/user/access_key/recover');
diff --git a/services/self-service/src/main/resources/webapp/src/app/core/services/healthStatus.service.ts b/services/self-service/src/main/resources/webapp/src/app/core/services/healthStatus.service.ts
index f891dfc..545c481 100644
--- a/services/self-service/src/main/resources/webapp/src/app/core/services/healthStatus.service.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/core/services/healthStatus.service.ts
@@ -176,6 +176,14 @@ export class HealthStatusService {
catchError(error => error));
}
+ public getAppMetaData(): Observable<{}> {
+ return this.applicationServiceFacade
+ .buildGetAppMetaData()
+ .pipe(
+ map(response => response),
+ catchError(error => error));
+ }
+
public resetStatusValue() {
this._statusData.next(<GeneralEnvironmentStatus>{});
}
diff --git a/services/self-service/src/main/resources/webapp/src/app/management/index.ts b/services/self-service/src/main/resources/webapp/src/app/management/index.ts
index b46ea96..d49689c 100644
--- a/services/self-service/src/main/resources/webapp/src/app/management/index.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/management/index.ts
@@ -33,7 +33,7 @@ import { MaterialModule } from '../shared/material.module';
import { ManagementComponent } from './management.component';
import {
ManagementGridComponent,
- ConfirmationDialog
+ ConfirmationDialogComponent
} from './management-grid/management-grid.component';
import { ComputationalResourcesModule } from '../resources/computational/computational-resources-list';
@@ -77,13 +77,13 @@ export * from './management.component';
GroupNameValidationDirective,
BackupDilogComponent,
ManageEnvironmentComponent,
- ConfirmationDialog,
+ ConfirmationDialogComponent,
ConfirmActionDialogComponent,
ConfirmDeleteUserAccountDialogComponent,
SsnMonitorComponent,
ManageRolesGroupsComponent
],
- entryComponents: [ConfirmationDialog, ConfirmActionDialogComponent, ConfirmDeleteUserAccountDialogComponent],
+ entryComponents: [ConfirmationDialogComponent, ConfirmActionDialogComponent, ConfirmDeleteUserAccountDialogComponent],
exports: [ManagementComponent]
})
export class ManagenementModule {}
diff --git a/services/self-service/src/main/resources/webapp/src/app/management/manage-environment/manage-environment-dilog.component.ts b/services/self-service/src/main/resources/webapp/src/app/management/manage-environment/manage-environment-dilog.component.ts
index 4e7ec93..6a6d025 100644
--- a/services/self-service/src/main/resources/webapp/src/app/management/manage-environment/manage-environment-dilog.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/management/manage-environment/manage-environment-dilog.component.ts
@@ -43,7 +43,7 @@ export class ManageEnvironmentComponent {
public dialog: MatDialog
) { }
- get usersEnvironments(): FormArray{
+ get usersEnvironments(): FormArray {
return <FormArray>this.manageUsersForm.get('users');
}
@@ -108,7 +108,7 @@ export class ManageEnvironmentComponent {
<button type="button" class="close" (click)="dialogRef.close()">×</button>
</div>
<div mat-dialog-content class="content">
- <p>Environment of <b>{{ data.user }}</b> will be
+ <p>Environment of <b>{{ data.user }}</b> will be
<span *ngIf="data.action === 'terminate'"> terminated.</span>
<span *ngIf="data.action === 'stop'">stopped.</span>
</p>
diff --git a/services/self-service/src/main/resources/webapp/src/app/management/management-grid/management-grid.component.html b/services/self-service/src/main/resources/webapp/src/app/management/management-grid/management-grid.component.html
index c129575..42bae6b 100644
--- a/services/self-service/src/main/resources/webapp/src/app/management/management-grid/management-grid.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/management/management-grid/management-grid.component.html
@@ -23,7 +23,7 @@
<th class="th_name">Name</th>
<th class="th_status">Status</th>
<th class="th_shape">Shape</th>
- <th>Computational resources</th>
+ <th class="th_resources">Computational resources</th>
<th class="th_actions">Action</th>
</tr>
@@ -44,7 +44,7 @@
{{ resource.computational_name }}
</a>
</div>
- <span ngClass="{{resource.status.toLowerCase() || ''}}" class="resource-status">{{ resource.status }}</span>
+ <span ngClass="{{resource.status || ''}}" class="resource-status">{{ resource.status }}</span>
<div class="resource-actions">
<a class="start-stop-action" *ngIf="resource.image === 'docker.dlab-dataengine'">
<i class="material-icons" (click)="toggleResourceAction(env, 'stop', resource)"
@@ -62,18 +62,18 @@
</td>
<td class="settings">
<span #settings class="actions" (click)="actions.toggle($event, settings)"
- [ngClass]="{ 'disabled' : !uploadKey
- || (env.status !== 'running' && env.status !== 'stopped' && env.status !== 'stopping')
- || (env.name === 'edge node' && env.user === currentUser && env.status === 'stopping')
- || env.name === 'edge node' && env.user !== currentUser && env.status.toLowerCase() !== 'running' }"></span>
+ [ngClass]="{ 'disabled' : (!uploadKey && env.type === 'notebook')
+ || (env.status !== 'running' && env.status !== 'stopped' && env.status !== 'stopping' && env.status !== 'failed' )
+ || (env.type === 'edge node' && env.user === currentUser && env.status === 'stopping')
+ || env.type === 'edge node' && env.user !== currentUser && env.status !== 'running' }"></span>
<bubble-up #actions class="list-menu" position="bottom-left" alternative="top-left">
<ul class="list-unstyled">
- <li matTooltip="{{ env.name !== 'edge node' ? 'Unable to stop notebook because at least one computational resource is in progress' : 'Unable to stop edge node because at least one resource of this user is in progress' }}"
+ <li matTooltip="{{ env.type !== 'edge node' ? 'Unable to stop notebook because at least one computational resource is in progress' : 'Unable to stop edge node because at least one resource of this user is in progress' }}"
matTooltipPosition="above"
[matTooltipDisabled]="!isResourcesInProgress(env)"
- [hidden]="env.name === 'edge node' && env.status.toLowerCase() === 'stopped'">
+ [hidden]="env.name === 'edge node' && env.status === 'stopped'">
<div (click)="toggleResourceAction(env, 'stop')"
- [ngClass]="{'not-allowed' : env.status === 'stopped' || env.status === 'stopping' || env.status === 'starting' || env.status === 'creating image' || isResourcesInProgress(env)}">
+ [ngClass]="{'not-allowed' : env.status === 'stopped' || env.status === 'stopping' || env.status === 'starting' || env.status === 'creating image' || env.status === 'failed' || isResourcesInProgress(env)}">
<i class="material-icons">pause_circle_outline</i>
<span>Stop</span>
</div>
@@ -83,18 +83,18 @@
matTooltipPosition="above"
[matTooltipDisabled]="!isResourcesInProgress(env)">
<div (click)="toggleResourceAction(env, 'terminate')"
- [ngClass]="{'not-allowed' : env.status.toLowerCase() !== 'running' && env.status.toLowerCase() !== 'stopped' || isResourcesInProgress(env)}">
+ [ngClass]="{'not-allowed' : env.status !== 'running' && env.status !== 'stopped' || isResourcesInProgress(env)}">
<i class="material-icons">phonelink_off</i>
<span>Terminate</span>
</div>
</li>
<div *ngIf="env.name === 'edge node' && env.user === currentUser">
- <li (click)="toggleResourceAction(env, 'run')" *ngIf="env.status.toLowerCase() === 'stopped'">
+ <li (click)="toggleResourceAction(env, 'run')" *ngIf="env.status === 'stopped'">
<i class="material-icons">play_circle_outline</i>
<span>Start</span>
</li>
- <li (click)="toggleResourceAction(env, 'recreate')" *ngIf="env.status.toLowerCase() === 'terminated'">
+ <li (click)="toggleResourceAction(env, 'recreate')" *ngIf="env.status === 'terminated'">
<i class="material-icons">refresh</i>
<span>Recreate</span>
</li>
@@ -123,24 +123,24 @@
<td class="status" ngClass="{{env.status || ''}}">{{env.status}}</td>
<td class="settings">
<span #settings (click)="actions.toggle($event, settings)" class="actions"
- [ngClass]="{'disabled': env.status.toLowerCase() !== 'running'
- && env.status.toLowerCase() !== 'stopped'
- && env.status.toLowerCase() !== 'terminated'
+ [ngClass]="{'disabled': env.status !== 'running'
+ && env.status !== 'stopped'
+ && env.status !== 'terminated'
|| notebookInProgress
- || !uploadKey }">
+ || !uploadKey && env.status !== 'failed' }">
</span>
<bubble-up #actions class="list-menu" position="bottom-left" alternative="top-left">
<ul class="list-unstyled">
- <li (click)="toggleResourceAction(env, 'stop')" *ngIf="env.status.toLowerCase() === 'running'">
+ <li (click)="toggleResourceAction(env, 'stop')" *ngIf="env.status === 'running'">
<i class="material-icons">pause_circle_outline</i>
<span>Stop</span>
</li>
- <li (click)="toggleResourceAction(env, 'run')" *ngIf="env.status.toLowerCase() === 'stopped'">
+ <li (click)="toggleResourceAction(env, 'run')" *ngIf="env.status === 'stopped'">
<i class="material-icons">play_circle_outline</i>
<span>Start</span>
</li>
- <li (click)="toggleResourceAction(env, 'recreate')" *ngIf="env.status.toLowerCase() === 'terminated'">
+ <li (click)="toggleResourceAction(env, 'recreate')" *ngIf="env.status === 'terminated'">
<i class="material-icons">refresh</i>
<span>Recreate</span>
</li>
diff --git a/services/self-service/src/main/resources/webapp/src/app/management/management-grid/management-grid.component.scss b/services/self-service/src/main/resources/webapp/src/app/management/management-grid/management-grid.component.scss
index 14d324d..6198578 100644
--- a/services/self-service/src/main/resources/webapp/src/app/management/management-grid/management-grid.component.scss
+++ b/services/self-service/src/main/resources/webapp/src/app/management/management-grid/management-grid.component.scss
@@ -26,6 +26,9 @@
.th_status {
width: 12% !important;
}
+ .th_resources {
+ width: 33%;
+ }
.dashboard_table_body {
td:first-child {
cursor: default;
diff --git a/services/self-service/src/main/resources/webapp/src/app/management/management-grid/management-grid.component.ts b/services/self-service/src/main/resources/webapp/src/app/management/management-grid/management-grid.component.ts
index bf7e257..7e69329 100644
--- a/services/self-service/src/main/resources/webapp/src/app/management/management-grid/management-grid.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/management/management-grid/management-grid.component.ts
@@ -70,7 +70,7 @@ export class ManagementGridComponent implements OnInit {
toggleResourceAction(environment, action: string, resource?) {
if (resource) {
const resource_name = resource ? resource.computational_name : environment.name;
- const dialogRef: MatDialogRef<ConfirmationDialog> = this.dialog.open(ConfirmationDialog, {
+ const dialogRef: MatDialogRef<ConfirmationDialogComponent> = this.dialog.open(ConfirmationDialogComponent, {
data: { action, resource_name, user: environment.user },
width: '550px',
panelClass: 'error-modalbox'
@@ -149,7 +149,7 @@ export class ManagementGridComponent implements OnInit {
<button type="button" class="close" (click)="dialogRef.close()">×</button>
</div>
<div mat-dialog-content class="content">
- <p>Resource <strong> {{ data.resource_name }}</strong> of user <strong> {{ data.user }} </strong> will be
+ <p>Resource <strong> {{ data.resource_name }}</strong> of user <strong> {{ data.user }} </strong> will be
<span *ngIf="data.action === 'terminate'"> decommissioned.</span>
<span *ngIf="data.action === 'stop'">stopped.</span>
</p>
@@ -163,9 +163,9 @@ export class ManagementGridComponent implements OnInit {
styles: [
]
})
-export class ConfirmationDialog {
+export class ConfirmationDialogComponent {
constructor(
- public dialogRef: MatDialogRef<ConfirmationDialog>,
+ public dialogRef: MatDialogRef<ConfirmationDialogComponent>,
@Inject(MAT_DIALOG_DATA) public data: any
) {}
}
diff --git a/services/self-service/src/main/resources/webapp/src/app/management/management.component.ts b/services/self-service/src/main/resources/webapp/src/app/management/management.component.ts
index b18eb83..8d21583 100644
--- a/services/self-service/src/main/resources/webapp/src/app/management/management.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/management/management.component.ts
@@ -44,7 +44,6 @@ export class ManagementComponent implements OnInit, OnDestroy {
public healthStatus: GeneralEnvironmentStatus;
public allEnvironmentData: Array<EnvironmentModel>;
public uploadKey: boolean = true;
-
public anyEnvInProgress: boolean = false;
public notebookInProgress: boolean = false;
@@ -253,7 +252,8 @@ export class ManagementComponent implements OnInit, OnDestroy {
value.status,
value.shape,
value.computational_resources,
- value.user
+ value.user,
+ value.resource_type
));
}
diff --git a/services/self-service/src/main/resources/webapp/src/app/management/management.model.ts b/services/self-service/src/main/resources/webapp/src/app/management/management.model.ts
index 25b196f..79d55c8 100644
--- a/services/self-service/src/main/resources/webapp/src/app/management/management.model.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/management/management.model.ts
@@ -23,7 +23,8 @@ export class EnvironmentModel {
public status: string,
public shape: string,
public resources: Array<any>,
- public user: string
+ public user: string,
+ public type?: string
) { }
}
diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/index.ts b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/index.ts
index 3fb6b2f..121e255 100644
--- a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/index.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/index.ts
@@ -21,7 +21,7 @@ import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { RouterModule } from '@angular/router';
import { MaterialModule } from '../material.module';
-import { ModalModule, UploadKeyDialogModule, ProgressDialogModule } from '../index';
+import { ModalModule, UploadKeyDialogModule, ProgressDialogModule, BubbleModule } from '../index';
import { NavbarComponent } from './navbar.component';
import { NotificationDialogModule } from '../modal-dialog/notification-dialog';
@@ -36,7 +36,8 @@ export * from './navbar.component';
NotificationDialogModule,
ModalModule,
UploadKeyDialogModule,
- ProgressDialogModule
+ ProgressDialogModule,
+ BubbleModule
],
declarations: [NavbarComponent],
exports: [NavbarComponent, RouterModule]
diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html
index 597cb0d..938473c 100644
--- a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html
@@ -42,6 +42,16 @@
<a *ngIf="healthStatus.status" [routerLink]="['/environment_management']" class="statusbar">
<span class="material-icons" ngClass="{{healthStatus.status || ''}}">radio_button_checked</span>
</a>
+ <!-- *ngIf="metadata" -->
+ <a class="statusbar" #info (click)="actions.toggle($event, info)">
+ <span class="material-icons info">share</span>
+ </a>
+ <bubble-up #actions class="list-menu" position="bottom-right">
+ <div class="app-info">
+ <p><strong>Version:</strong> {{ metadata?.version | - }}</p>
+ <p><strong>Branch</strong> {{ metadata?.branch | - }}</p>
+ </div>
+ </bubble-up>
<button class="btn btn-logout" (click)="logout_btnClick()">Log out <span class="user-name">{{currentUserName}}</span></button>
</div>
</div>
diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.scss b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.scss
index dcb454e..b6bc96f 100644
--- a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.scss
+++ b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.scss
@@ -50,6 +50,7 @@
text-decoration: none;
justify-content: center;
color: #f9fafb;
+ cursor: pointer;
span {
align-self: center;
font-size: 18px;
@@ -68,6 +69,11 @@
color: #bd4146;
}
}
+ .info {
+ &:hover {
+ color: #c7d4d6;
+ }
+ }
}
.btn-logout {
height: 46px;
@@ -86,7 +92,16 @@
}
}
}
-
+.app-info {
+ padding: 15px;
+ p {
+ strong {
+ color: #455c74;
+ font-size: 16px;
+ font-weight: 600;
+ }
+ }
+}
a.nav-item {
position: relative;
height: 56px;
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 a7a9618..d924fb1 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
@@ -51,6 +51,7 @@ export class NavbarComponent implements OnInit, OnDestroy {
currentUserName: string;
quotesLimit: number = 70;
isLoggedIn: boolean = false;
+ metadata: any;
healthStatus: GeneralEnvironmentStatus;
subscriptions: Subscription = new Subscription();
@@ -87,6 +88,7 @@ export class NavbarComponent implements OnInit, OnDestroy {
}));
this.subscriptions.add(timer(0, this.CHECK_ACTIVE_SCHEDULE_TIMEOUT).subscribe(() => this.refreshSchedulerData()));
this.currentUserName = this.getUserName();
+ this.checkVersionData();
}
});
}
@@ -151,7 +153,8 @@ export class NavbarComponent implements OnInit, OnDestroy {
}
private processAccessKeyStatus(status: number): void {
- if (status === HTTP_STATUS_CODES.NOT_FOUND) {
+ if (status === HTTP_STATUS_CODES.NOT_FOUND || status === HTTP_STATUS_CODES.INTERNAL_SERVER_ERROR) {
+ this.preloaderDialog.bindDialog.isOpened && this.preloaderDialog.close();
this.keyUploadDialog.open({ isFooter: false });
this.alive = false;
} else if (status === HTTP_STATUS_CODES.ACCEPTED) {
@@ -193,23 +196,27 @@ export class NavbarComponent implements OnInit, OnDestroy {
return memo;
}
+ public checkVersionData(): void {
+ this.healthStatusService.getAppMetaData().subscribe(res => this.metadata = res);
+ }
+
private selectQuotesAlert(type: string, user_quota?: number, total_quota?: number): string {
const alerts = {
user_exceed: `Dear <b>${ this.currentUserName }</b>,<br />
DLab cloud infrastructure usage quota associated with your user has been exceeded.
- All your analytical environment will be stopped. To proceed working with environment,
+ All your analytical environment will be stopped. To proceed working with environment,
request increase of user quota from DLab administrator.`,
total_exceed: `Dear <b>${ this.currentUserName }</b>,<br />
DLab cloud infrastructure usage quota has been exceeded.
- All your analytical environment will be stopped. To proceed working with environment,
+ All your analytical environment will be stopped. To proceed working with environment,
request increase application quota from DLab administrator.`,
user_quota: `Dear <b>${ this.currentUserName }</b>,<br />
Cloud infrastructure usage quota associated with your user has been used for <b>${user_quota}%</b>.
- Once quota is depleted all your analytical environment will be stopped.
+ Once quota is depleted all your analytical environment will be stopped.
To proceed working with environment you'll have to request increase of user quota from DLab administrator.`,
total_quota: `Dear <b>${ this.currentUserName }</b>,<br />
DLab cloud infrastructure usage quota has been used for <b>${total_quota}%</b>.
- Once quota is depleted all your analytical environment will be stopped.
+ Once quota is depleted all your analytical environment will be stopped.
To proceed working with environment you'll have to request increase of user quota from DLab administrator. `
};
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 03/03: [DLAB-572]: linter configuration updates
Posted by an...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch DLAB-572
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 76c8a672eaa035331b72ec7de10cfbc98c989a9b
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Fri Apr 12 14:09:49 2019 +0300
[DLAB-572]: linter configuration updates
---
.../src/main/resources/webapp/angular.json | 23 -
.../src/main/resources/webapp/package-lock.json | 527 ++++-----------------
.../src/main/resources/webapp/package.json | 4 +-
.../main/resources/webapp/src/tsconfig.spec.json | 20 +
.../src/main/resources/webapp/tslint.json | 1 -
5 files changed, 107 insertions(+), 468 deletions(-)
diff --git a/services/self-service/src/main/resources/webapp/angular.json b/services/self-service/src/main/resources/webapp/angular.json
index 37eef6d..7969eb8 100644
--- a/services/self-service/src/main/resources/webapp/angular.json
+++ b/services/self-service/src/main/resources/webapp/angular.json
@@ -98,29 +98,6 @@
}
}
}
- },
- "webapp-e2e": {
- "root": "e2e",
- "sourceRoot": "e2e",
- "projectType": "application",
- "architect": {
- "e2e": {
- "builder": "@angular-devkit/build-angular:protractor",
- "options": {
- "protractorConfig": "./protractor.conf.js",
- "devServerTarget": "webapp:serve"
- }
- },
- "lint": {
- "builder": "@angular-devkit/build-angular:tslint",
- "options": {
- "tsConfig": [
- "e2e/tsconfig.e2e.json"
- ],
- "exclude": []
- }
- }
- }
}
},
"defaultProject": "webapp",
diff --git a/services/self-service/src/main/resources/webapp/package-lock.json b/services/self-service/src/main/resources/webapp/package-lock.json
index e2afedc..9e0f215 100644
--- a/services/self-service/src/main/resources/webapp/package-lock.json
+++ b/services/self-service/src/main/resources/webapp/package-lock.json
@@ -1903,37 +1903,6 @@
"integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
"dev": true
},
- "ansi-align": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-1.1.0.tgz",
- "integrity": "sha1-LwwWWIKXOa3V67FeawxuNCPwFro=",
- "dev": true,
- "requires": {
- "string-width": "1.0.2"
- },
- "dependencies": {
- "is-fullwidth-code-point": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
- "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
- "dev": true,
- "requires": {
- "number-is-nan": "1.0.1"
- }
- },
- "string-width": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
- "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
- "dev": true,
- "requires": {
- "code-point-at": "1.1.0",
- "is-fullwidth-code-point": "1.0.0",
- "strip-ansi": "3.0.1"
- }
- }
- }
- },
"ansi-colors": {
"version": "3.2.3",
"resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.3.tgz",
@@ -1981,9 +1950,9 @@
}
},
"app-root-path": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/app-root-path/-/app-root-path-2.0.1.tgz",
- "integrity": "sha1-zWLc+OT9WkF+/GZNLlsQZTxlG0Y=",
+ "version": "2.2.1",
+ "resolved": "https://registry.npmjs.org/app-root-path/-/app-root-path-2.2.1.tgz",
+ "integrity": "sha512-91IFKeKk7FjfmezPKkwtaRvSpnUc4gDwPAjA1YZ9Gn0q0PPeW+vbeUsZuyDwjI7+QTHhcLen2v25fi/AmhvbJA==",
"dev": true
},
"append-transform": {
@@ -2526,45 +2495,6 @@
"hoek": "4.2.0"
}
},
- "boxen": {
- "version": "0.6.0",
- "resolved": "https://registry.npmjs.org/boxen/-/boxen-0.6.0.tgz",
- "integrity": "sha1-g2TUJIrDT/DvGy8r9JpsYM4NgbY=",
- "dev": true,
- "requires": {
- "ansi-align": "1.1.0",
- "camelcase": "2.1.1",
- "chalk": "1.1.3",
- "cli-boxes": "1.0.0",
- "filled-array": "1.1.0",
- "object-assign": "4.1.1",
- "repeating": "2.0.1",
- "string-width": "1.0.2",
- "widest-line": "1.0.0"
- },
- "dependencies": {
- "is-fullwidth-code-point": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
- "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
- "dev": true,
- "requires": {
- "number-is-nan": "1.0.1"
- }
- },
- "string-width": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
- "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
- "dev": true,
- "requires": {
- "code-point-at": "1.1.0",
- "is-fullwidth-code-point": "1.0.0",
- "strip-ansi": "3.0.1"
- }
- }
- }
- },
"brace-expansion": {
"version": "1.1.8",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz",
@@ -2879,12 +2809,6 @@
"integrity": "sha512-feylzsbDxi1gPZ1IjystzIQZagYYLvfKrSuygUCgf7z6x790VEzze5QEkdSV1U58RA7Hi0+v6fv4K54atOzATg==",
"dev": true
},
- "capture-stack-trace": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz",
- "integrity": "sha1-Sm+gc5nCa7pH8LJJa00PtAjFVQ0=",
- "dev": true
- },
"caseless": {
"version": "0.12.0",
"resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
@@ -3023,12 +2947,6 @@
}
}
},
- "cli-boxes": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-1.0.0.tgz",
- "integrity": "sha1-T6kXw+WclKAEzWH47lCdplFocUM=",
- "dev": true
- },
"cli-cursor": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
@@ -3125,13 +3043,13 @@
"dev": true
},
"codelyzer": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/codelyzer/-/codelyzer-2.0.1.tgz",
- "integrity": "sha1-0PcSH2eoQkyS0h07MfNkC4Pe+e0=",
+ "version": "3.2.2",
+ "resolved": "https://registry.npmjs.org/codelyzer/-/codelyzer-3.2.2.tgz",
+ "integrity": "sha512-VNvW9gRThsqRarEnLioiILd0Pdk0yCq/7cVgYvqHpC+3CHqfnrJfmXjoana7vzWfSis+9pODXofjCWX+nlU9Gw==",
"dev": true,
"requires": {
- "app-root-path": "2.0.1",
- "css-selector-tokenizer": "0.7.0",
+ "app-root-path": "2.2.1",
+ "css-selector-tokenizer": "0.7.1",
"cssauron": "1.4.0",
"semver-dsl": "1.0.1",
"source-map": "0.5.7",
@@ -3275,31 +3193,6 @@
"typedarray": "0.0.6"
}
},
- "configstore": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/configstore/-/configstore-2.1.0.tgz",
- "integrity": "sha1-c3o6cDbpiGECqmCZ5HuzOrGroaE=",
- "dev": true,
- "requires": {
- "dot-prop": "3.0.0",
- "graceful-fs": "4.1.11",
- "mkdirp": "0.5.1",
- "object-assign": "4.1.1",
- "os-tmpdir": "1.0.2",
- "osenv": "0.1.4",
- "uuid": "2.0.3",
- "write-file-atomic": "1.3.4",
- "xdg-basedir": "2.0.0"
- },
- "dependencies": {
- "uuid": {
- "version": "2.0.3",
- "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz",
- "integrity": "sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho=",
- "dev": true
- }
- }
- },
"connect": {
"version": "3.6.5",
"resolved": "https://registry.npmjs.org/connect/-/connect-3.6.5.tgz",
@@ -3587,15 +3480,6 @@
"elliptic": "6.4.1"
}
},
- "create-error-class": {
- "version": "3.0.2",
- "resolved": "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz",
- "integrity": "sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=",
- "dev": true,
- "requires": {
- "capture-stack-trace": "1.0.0"
- }
- },
"create-hash": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
@@ -3679,13 +3563,13 @@
"dev": true
},
"css-selector-tokenizer": {
- "version": "0.7.0",
- "resolved": "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.7.0.tgz",
- "integrity": "sha1-5piEdK6MlTR3v15+/s/OzNnPTIY=",
+ "version": "0.7.1",
+ "resolved": "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.7.1.tgz",
+ "integrity": "sha512-xYL0AMZJ4gFzJQsHUKa5jiWWi2vH77WVNg7JYRyewwj6oPh4yb/y6Y9ZCw9dsj/9UauMhtuxR+ogQd//EdEVNA==",
"dev": true,
"requires": {
"cssesc": "0.1.0",
- "fastparse": "1.1.1",
+ "fastparse": "1.1.2",
"regexpu-core": "1.0.0"
}
},
@@ -3772,12 +3656,6 @@
"integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=",
"dev": true
},
- "deep-extend": {
- "version": "0.4.2",
- "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz",
- "integrity": "sha1-SLaZwn4zS/ifEIkr5DL25MfTSn8=",
- "dev": true
- },
"deep-is": {
"version": "0.1.3",
"resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
@@ -4023,24 +3901,6 @@
"resolved": "https://registry.npmjs.org/domino/-/domino-2.1.1.tgz",
"integrity": "sha512-fqoTi6oQ881wYRENIEmz78hKVoc3X9HqVpklo419yxzebys6dtU5c83iVh3UYvvexPFdAuwlDYCsUM9//CrMMg=="
},
- "dot-prop": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-3.0.0.tgz",
- "integrity": "sha1-G3CK8JSknJoOfbyteQq6U52sEXc=",
- "dev": true,
- "requires": {
- "is-obj": "1.0.1"
- }
- },
- "duplexer2": {
- "version": "0.1.4",
- "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
- "integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=",
- "dev": true,
- "requires": {
- "readable-stream": "2.3.3"
- }
- },
"duplexify": {
"version": "3.7.1",
"resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
@@ -4746,9 +4606,9 @@
"dev": true
},
"fastparse": {
- "version": "1.1.1",
- "resolved": "https://registry.npmjs.org/fastparse/-/fastparse-1.1.1.tgz",
- "integrity": "sha1-0eJkOzipTXWDtHkGDmxK/8lAcfg=",
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/fastparse/-/fastparse-1.1.2.tgz",
+ "integrity": "sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ==",
"dev": true
},
"faye-websocket": {
@@ -4814,12 +4674,6 @@
"repeat-string": "1.6.1"
}
},
- "filled-array": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/filled-array/-/filled-array-1.1.0.tgz",
- "integrity": "sha1-w8T2xmO5I0WamqKZEtLQMfFQf4Q=",
- "dev": true
- },
"finalhandler": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz",
@@ -4870,30 +4724,6 @@
"pinkie-promise": "2.0.1"
}
},
- "findup-sync": {
- "version": "0.3.0",
- "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.3.0.tgz",
- "integrity": "sha1-N5MKpdgWt3fANEXhlmzGeQpMCxY=",
- "dev": true,
- "requires": {
- "glob": "5.0.15"
- },
- "dependencies": {
- "glob": {
- "version": "5.0.15",
- "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
- "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
- "dev": true,
- "requires": {
- "inflight": "1.0.6",
- "inherits": "2.0.3",
- "minimatch": "3.0.4",
- "once": "1.4.0",
- "path-is-absolute": "1.0.1"
- }
- }
- }
- },
"flush-write-stream": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.0.tgz",
@@ -6202,29 +6032,6 @@
"minimatch": "3.0.4"
}
},
- "got": {
- "version": "5.7.1",
- "resolved": "https://registry.npmjs.org/got/-/got-5.7.1.tgz",
- "integrity": "sha1-X4FjWmHkplifGAVp6k44FoClHzU=",
- "dev": true,
- "requires": {
- "create-error-class": "3.0.2",
- "duplexer2": "0.1.4",
- "is-redirect": "1.0.0",
- "is-retry-allowed": "1.1.0",
- "is-stream": "1.1.0",
- "lowercase-keys": "1.0.0",
- "node-status-codes": "1.0.0",
- "object-assign": "4.1.1",
- "parse-json": "2.2.0",
- "pinkie-promise": "2.0.1",
- "read-all-stream": "3.1.0",
- "readable-stream": "2.3.3",
- "timed-out": "3.1.3",
- "unzip-response": "1.0.2",
- "url-parse-lax": "1.0.0"
- }
- },
"graceful-fs": {
"version": "4.1.11",
"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
@@ -7331,12 +7138,6 @@
"is-extglob": "1.0.0"
}
},
- "is-npm": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-1.0.0.tgz",
- "integrity": "sha1-8vtjpl5JBbQGyGBydloaTceTufQ=",
- "dev": true
- },
"is-number": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",
@@ -7346,12 +7147,6 @@
"kind-of": "3.2.2"
}
},
- "is-obj": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
- "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=",
- "dev": true
- },
"is-path-cwd": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz",
@@ -7411,18 +7206,6 @@
"integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=",
"dev": true
},
- "is-redirect": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz",
- "integrity": "sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ=",
- "dev": true
- },
- "is-retry-allowed": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz",
- "integrity": "sha1-EaBgVotnM5REAz0BJaYaINVk+zQ=",
- "dev": true
- },
"is-stream": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
@@ -8072,15 +7855,6 @@
"is-buffer": "1.1.5"
}
},
- "latest-version": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-2.0.0.tgz",
- "integrity": "sha1-VvjWE5YghHuAF/jx9NeOIRMkFos=",
- "dev": true,
- "requires": {
- "package-json": "2.4.0"
- }
- },
"lazy-cache": {
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz",
@@ -8088,12 +7862,6 @@
"dev": true,
"optional": true
},
- "lazy-req": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/lazy-req/-/lazy-req-1.1.0.tgz",
- "integrity": "sha1-va6+rTD42CQDnODOFJ1Nqge6H6w=",
- "dev": true
- },
"lcid": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
@@ -8325,12 +8093,6 @@
"signal-exit": "3.0.2"
}
},
- "lowercase-keys": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz",
- "integrity": "sha1-TjNms55/VFfjXxMkvfb4jQv8cwY=",
- "dev": true
- },
"lru-cache": {
"version": "4.1.1",
"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz",
@@ -9162,12 +8924,6 @@
}
}
},
- "node-status-codes": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/node-status-codes/-/node-status-codes-1.0.0.tgz",
- "integrity": "sha1-WuVUHQJGRdMqWPzdyc7s6nrjrC8=",
- "dev": true
- },
"nopt": {
"version": "3.0.6",
"resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
@@ -9604,18 +9360,6 @@
"integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
"dev": true
},
- "package-json": {
- "version": "2.4.0",
- "resolved": "https://registry.npmjs.org/package-json/-/package-json-2.4.0.tgz",
- "integrity": "sha1-DRW9Z9HLvduyyiIv8u24a8sxqLs=",
- "dev": true,
- "requires": {
- "got": "5.7.1",
- "registry-auth-token": "3.3.1",
- "registry-url": "3.1.0",
- "semver": "5.4.1"
- }
- },
"pacote": {
"version": "9.4.0",
"resolved": "https://registry.npmjs.org/pacote/-/pacote-9.4.0.tgz",
@@ -10089,12 +9833,6 @@
"integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
"dev": true
},
- "prepend-http": {
- "version": "1.0.4",
- "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz",
- "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=",
- "dev": true
- },
"preserve": {
"version": "0.2.0",
"resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz",
@@ -10429,28 +10167,6 @@
"schema-utils": "1.0.0"
}
},
- "rc": {
- "version": "1.2.1",
- "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.1.tgz",
- "integrity": "sha1-LgPo5C7kULjLPc5lvhv4l04d/ZU=",
- "dev": true,
- "requires": {
- "deep-extend": "0.4.2",
- "ini": "1.3.4",
- "minimist": "1.2.0",
- "strip-json-comments": "2.0.1"
- }
- },
- "read-all-stream": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/read-all-stream/-/read-all-stream-3.1.0.tgz",
- "integrity": "sha1-NcPhd/IHjveJ7kv6+kNzB06u9Po=",
- "dev": true,
- "requires": {
- "pinkie-promise": "2.0.1",
- "readable-stream": "2.3.3"
- }
- },
"read-cache": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
@@ -10534,9 +10250,9 @@
"dev": true
},
"regenerate": {
- "version": "1.3.3",
- "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.3.3.tgz",
- "integrity": "sha512-jVpo1GadrDAK59t/0jRx5VxYWQEDkkEKi6+HjE3joFVLfDOh9Xrdh0dF1eSq+BI/SwvTQ44gSscJ8N5zYL61sg==",
+ "version": "1.4.0",
+ "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.0.tgz",
+ "integrity": "sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==",
"dev": true
},
"regenerator-runtime": {
@@ -10570,30 +10286,11 @@
"integrity": "sha1-hqdj9Y7k18L2sQLkdkBQ3n7ZDGs=",
"dev": true,
"requires": {
- "regenerate": "1.3.3",
+ "regenerate": "1.4.0",
"regjsgen": "0.2.0",
"regjsparser": "0.1.5"
}
},
- "registry-auth-token": {
- "version": "3.3.1",
- "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.3.1.tgz",
- "integrity": "sha1-+w0yie4Nmtosu1KvXf5mywcNMAY=",
- "dev": true,
- "requires": {
- "rc": "1.2.1",
- "safe-buffer": "5.1.1"
- }
- },
- "registry-url": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-3.1.0.tgz",
- "integrity": "sha1-PU74cPc93h138M+aOBQyRE4XSUI=",
- "dev": true,
- "requires": {
- "rc": "1.2.1"
- }
- },
"regjsgen": {
"version": "0.2.0",
"resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz",
@@ -10954,15 +10651,6 @@
"integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==",
"dev": true
},
- "semver-diff": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-2.1.0.tgz",
- "integrity": "sha1-S7uEN8jTfksM8aaP1ybsbWRdbTY=",
- "dev": true,
- "requires": {
- "semver": "5.4.1"
- }
- },
"semver-dsl": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/semver-dsl/-/semver-dsl-1.0.1.tgz",
@@ -11177,12 +10865,6 @@
"integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=",
"dev": true
},
- "slide": {
- "version": "1.1.6",
- "resolved": "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz",
- "integrity": "sha1-VusCfWW00tzmyy4tMsTUr8nh1wc=",
- "dev": true
- },
"smart-buffer": {
"version": "4.0.2",
"resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.0.2.tgz",
@@ -12244,12 +11926,6 @@
"integrity": "sha512-YwT8pjmNcAXBZqrubu22P4FYsh2D4dxRmnWBOL8Jk8bUcRUtc5326kx32tuTmFDAZtLOGEVNl8POAR8j896Iow==",
"dev": true
},
- "timed-out": {
- "version": "3.1.3",
- "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-3.1.3.tgz",
- "integrity": "sha1-lYYL/MXHbCd/j4Mm/Q9bLiDrohc=",
- "dev": true
- },
"timers-browserify": {
"version": "2.0.10",
"resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.10.tgz",
@@ -12402,39 +12078,88 @@
"integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ=="
},
"tslint": {
- "version": "4.4.2",
- "resolved": "https://registry.npmjs.org/tslint/-/tslint-4.4.2.tgz",
- "integrity": "sha1-sUy3muA5xyRxq0wmJyJrlA3aGcY=",
+ "version": "5.15.0",
+ "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.15.0.tgz",
+ "integrity": "sha512-6bIEujKR21/3nyeoX2uBnE8s+tMXCQXhqMmaIPJpHmXJoBJPTLcI7/VHRtUwMhnLVdwLqqY3zmd8Dxqa5CVdJA==",
"dev": true,
"requires": {
"babel-code-frame": "6.26.0",
- "colors": "1.1.2",
+ "builtin-modules": "1.1.1",
+ "chalk": "2.4.2",
+ "commander": "2.17.1",
"diff": "3.4.0",
- "findup-sync": "0.3.0",
"glob": "7.1.2",
- "optimist": "0.6.1",
+ "js-yaml": "3.13.1",
+ "minimatch": "3.0.4",
+ "mkdirp": "0.5.1",
"resolve": "1.4.0",
- "update-notifier": "1.0.3"
+ "semver": "5.4.1",
+ "tslib": "1.9.3",
+ "tsutils": "2.29.0"
},
"dependencies": {
- "minimist": {
- "version": "0.0.10",
- "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
- "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=",
+ "ansi-styles": {
+ "version": "3.2.1",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+ "dev": true,
+ "requires": {
+ "color-convert": "1.9.3"
+ }
+ },
+ "chalk": {
+ "version": "2.4.2",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+ "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+ "dev": true,
+ "requires": {
+ "ansi-styles": "3.2.1",
+ "escape-string-regexp": "1.0.5",
+ "supports-color": "5.5.0"
+ }
+ },
+ "esprima": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+ "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
"dev": true
},
- "optimist": {
- "version": "0.6.1",
- "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
- "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=",
+ "has-flag": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+ "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+ "dev": true
+ },
+ "js-yaml": {
+ "version": "3.13.1",
+ "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
+ "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
"dev": true,
"requires": {
- "minimist": "0.0.10",
- "wordwrap": "0.0.3"
+ "argparse": "1.0.9",
+ "esprima": "4.0.1"
+ }
+ },
+ "supports-color": {
+ "version": "5.5.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+ "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+ "dev": true,
+ "requires": {
+ "has-flag": "3.0.0"
}
}
}
},
+ "tsutils": {
+ "version": "2.29.0",
+ "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.29.0.tgz",
+ "integrity": "sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==",
+ "dev": true,
+ "requires": {
+ "tslib": "1.9.3"
+ }
+ },
"tty-browserify": {
"version": "0.0.0",
"resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
@@ -12626,34 +12351,12 @@
}
}
},
- "unzip-response": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/unzip-response/-/unzip-response-1.0.2.tgz",
- "integrity": "sha1-uYTwh3/AqJwsdzzB73tbIytbBv4=",
- "dev": true
- },
"upath": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/upath/-/upath-1.1.0.tgz",
"integrity": "sha512-bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw==",
"dev": true
},
- "update-notifier": {
- "version": "1.0.3",
- "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-1.0.3.tgz",
- "integrity": "sha1-j5LFFUgr1oMbfJMBPnD4dVLHz1o=",
- "dev": true,
- "requires": {
- "boxen": "0.6.0",
- "chalk": "1.1.3",
- "configstore": "2.1.0",
- "is-npm": "1.0.0",
- "latest-version": "2.0.0",
- "lazy-req": "1.1.0",
- "semver-diff": "2.1.0",
- "xdg-basedir": "2.0.0"
- }
- },
"uri-js": {
"version": "4.2.2",
"resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
@@ -12705,15 +12408,6 @@
"requires-port": "1.0.0"
}
},
- "url-parse-lax": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz",
- "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=",
- "dev": true,
- "requires": {
- "prepend-http": "1.0.4"
- }
- },
"use": {
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
@@ -15487,37 +15181,6 @@
}
}
},
- "widest-line": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-1.0.0.tgz",
- "integrity": "sha1-DAnIXCqUaD0Nfq+O4JfVZL8OEFw=",
- "dev": true,
- "requires": {
- "string-width": "1.0.2"
- },
- "dependencies": {
- "is-fullwidth-code-point": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
- "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
- "dev": true,
- "requires": {
- "number-is-nan": "1.0.1"
- }
- },
- "string-width": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
- "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
- "dev": true,
- "requires": {
- "code-point-at": "1.1.0",
- "is-fullwidth-code-point": "1.0.0",
- "strip-ansi": "3.0.1"
- }
- }
- }
- },
"window-size": {
"version": "0.1.0",
"resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz",
@@ -15578,17 +15241,6 @@
"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
"dev": true
},
- "write-file-atomic": {
- "version": "1.3.4",
- "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.3.4.tgz",
- "integrity": "sha1-+Aek8LHZ6ROuekgRLmzDrxmRtF8=",
- "dev": true,
- "requires": {
- "graceful-fs": "4.1.11",
- "imurmurhash": "0.1.4",
- "slide": "1.1.6"
- }
- },
"ws": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/ws/-/ws-1.1.1.tgz",
@@ -15605,15 +15257,6 @@
"integrity": "sha1-OS2LotDxw00e4tYw8V0O+2jhBIo=",
"dev": true
},
- "xdg-basedir": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-2.0.0.tgz",
- "integrity": "sha1-7byQPMOF/ARSPZZqM1UEtVBNG9I=",
- "dev": true,
- "requires": {
- "os-homedir": "1.0.2"
- }
- },
"xhr2": {
"version": "0.1.4",
"resolved": "https://registry.npmjs.org/xhr2/-/xhr2-0.1.4.tgz",
diff --git a/services/self-service/src/main/resources/webapp/package.json b/services/self-service/src/main/resources/webapp/package.json
index 2fa444f..740a719 100644
--- a/services/self-service/src/main/resources/webapp/package.json
+++ b/services/self-service/src/main/resources/webapp/package.json
@@ -48,7 +48,7 @@
"@types/jasmine": "2.5.38",
"@types/moment-timezone": "^0.5.4",
"@types/node": "~6.0.60",
- "codelyzer": "~2.0.0",
+ "codelyzer": "^3.0.1",
"jasmine-core": "~2.5.2",
"jasmine-spec-reporter": "~3.2.0",
"karma": "~1.4.1",
@@ -60,7 +60,7 @@
"node-sass": "^4.7.2",
"protractor": "~5.1.0",
"ts-node": "~2.0.0",
- "tslint": "~4.4.2",
+ "tslint": "^5.15.0",
"typescript": "^3.2.4"
}
}
diff --git a/services/self-service/src/main/resources/webapp/src/tsconfig.spec.json b/services/self-service/src/main/resources/webapp/src/tsconfig.spec.json
new file mode 100644
index 0000000..02d6181
--- /dev/null
+++ b/services/self-service/src/main/resources/webapp/src/tsconfig.spec.json
@@ -0,0 +1,20 @@
+{
+ "extends": "../tsconfig.json",
+ "compilerOptions": {
+ "outDir": "../out-tsc/spec",
+ "module": "commonjs",
+ "types": [
+ "jasmine",
+ "node"
+ ]
+ },
+ "files": [
+ "test.ts",
+ "polyfills.ts"
+ ],
+ "include": [
+ "testing/**/*.ts",
+ "**/*.spec.ts",
+ "**/*.d.ts"
+ ]
+}
\ No newline at end of file
diff --git a/services/self-service/src/main/resources/webapp/tslint.json b/services/self-service/src/main/resources/webapp/tslint.json
index 572b1eb..fe99330 100644
--- a/services/self-service/src/main/resources/webapp/tslint.json
+++ b/services/self-service/src/main/resources/webapp/tslint.json
@@ -91,7 +91,6 @@
"variable-declaration": "nospace"
}
],
- "typeof-compare": true,
"unified-signatures": true,
"variable-name": false,
"whitespace": [
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 01/03: Merge branch 'bugfix-DLAB-570' of
github.com:apache/incubator-dlab into DLAB-572
Posted by an...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch DLAB-572
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 7d37d3c5f14298d0e6ef59e77f03ce7bd206e6c0
Merge: 8dae908 e4d5dd4
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Thu Apr 11 17:27:46 2019 +0300
Merge branch 'bugfix-DLAB-570' of github.com:apache/incubator-dlab into DLAB-572
.../dlab/backendapi/resources/callback/base/KeyUploaderCallback.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org