This is an automated email from the ASF dual-hosted git repository. dgnatyshyn pushed a commit to branch DLAB-1727 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit e98e1f0992fe08252e99159976f8a6d049a7bc6f Author: Dmytro Gnatyshyn <[email protected]> AuthorDate: Wed Apr 22 13:34:20 2020 +0300 Fix bug --- .../administration/project/project.component.ts | 1 - .../resources/webapp/src/app/app.routing.module.ts | 10 +++---- .../src/app/core/services/appRouting.service.ts | 1 + .../src/app/reporting/reporting.component.ts | 1 - .../cluster-details/cluster-details.component.ts | 6 ++-- .../detail-dialog/detail-dialog.component.html | 2 ++ .../src/app/resources/resources.component.ts | 1 - .../app/resources/scheduler/scheduler.component.ts | 8 +++-- .../src/app/shared/navbar/navbar.component.html | 34 +++++++++++----------- 9 files changed, 33 insertions(+), 31 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts index d7442de..d1b172e 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts @@ -96,7 +96,6 @@ export class ProjectComponent implements OnInit, OnDestroy { if (this.projectList.length) this.dialog.open(EditProjectComponent, { data: { action: 'create', item: null }, panelClass: 'modal-xl-s' }) .afterClosed().subscribe(() => { - console.log('Create project'); this.getEnvironmentHealthStatus(); }); } diff --git a/services/self-service/src/main/resources/webapp/src/app/app.routing.module.ts b/services/self-service/src/main/resources/webapp/src/app/app.routing.module.ts index 3c8ae3f..f2649fb 100644 --- a/services/self-service/src/main/resources/webapp/src/app/app.routing.module.ts +++ b/services/self-service/src/main/resources/webapp/src/app/app.routing.module.ts @@ -21,7 +21,7 @@ import { ModuleWithProviders } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; import { LoginComponent } from './login/login.module'; -import { LayoutComponent } from './layout/layout.component' +import { LayoutComponent } from './layout/layout.component'; import { ResourcesComponent } from './resources/resources.component'; import { AccessNotebookGuideComponent, PublicKeyGuideComponent } from './help'; import { NotFoundComponent } from './service-pages/not-found/not-found.component'; @@ -68,10 +68,10 @@ const routes: Routes = [{ component: ManagementComponent, canActivate: [AuthorizationGuard, AdminGuard] }, { - path: 'swagger', - component: SwaggerComponent, - canActivate: [AuthorizationGuard] - }, { + // path: 'swagger', + // component: SwaggerComponent, + // canActivate: [AuthorizationGuard] + // }, { path: 'help/publickeyguide', component: PublicKeyGuideComponent, canActivate: [AuthorizationGuard] diff --git a/services/self-service/src/main/resources/webapp/src/app/core/services/appRouting.service.ts b/services/self-service/src/main/resources/webapp/src/app/core/services/appRouting.service.ts index 1a80759..0f05bcb 100644 --- a/services/self-service/src/main/resources/webapp/src/app/core/services/appRouting.service.ts +++ b/services/self-service/src/main/resources/webapp/src/app/core/services/appRouting.service.ts @@ -34,6 +34,7 @@ export class AppRoutingService { } redirectToHomePage(): void { + console.log('redirect'); this.router.navigate(['/resources_list']); } 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 03f7ca9..1692ef1 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 @@ -156,7 +156,6 @@ export class ReportingComponent implements OnInit, OnDestroy { types.push(item['resource_type']); if (item.shape && types.indexOf(item.shape)) { - console.log(item); if (item.shape.indexOf('Master') > -1) { for (let shape of item.shape.split(/(?=Slave)/g)) { shape = shape.replace('Master: ', ''); diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.ts index 11002e1..16fb1ae 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.ts @@ -57,8 +57,6 @@ export class DetailComputationalResourcesComponent implements OnInit { ngOnInit() { this.open(this.data.environment, this.data.resource); - - console.log(this.PROVIDER); } public open(environment, resource): void { @@ -98,7 +96,9 @@ export class DetailComputationalResourcesComponent implements OnInit { public editClusterConfiguration(data): void { this.dataengineConfigurationService - .editClusterConfiguration(data.configuration_parameters, this.environment.project, this.environment.name, this.resource.computational_name, this.PROVIDER) + .editClusterConfiguration( + data.configuration_parameters, this.environment.project, this.environment.name, this.resource.computational_name, this.PROVIDER + ) .subscribe(result => { this.dialogRef.close(); }, diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.html index 4977b22..d41f69a 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.html @@ -47,11 +47,13 @@ <p>Open following URL(s) in your browser to access this box:</p> <div class="links_block"> <p *ngFor="let item of notebook.url"> + <ng-container *ngIf="!(item.description === 'Ungit' && notebook.template_name.indexOf('Apache Zeppelin') !== -1)"> <span class="description">{{item.description}}: </span> <a class="ellipsis" matTooltip="{{item.url}}" matTooltipPosition="above" href="{{item.url}}" target="_blank"> {{item.url}} </a> + </ng-container> </p> </div> <p class="flex" *ngIf="notebook.username">Node User: <span diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/resources.component.ts index 2587a62..7eb6ff6 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/resources.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources.component.ts @@ -82,7 +82,6 @@ export class ResourcesComponent implements OnInit { } public getActiveProject() { - console.log('activeProject: ', this.resourcesGrid.activeProject); return this.resourcesGrid.activeProject; } diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/scheduler/scheduler.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/scheduler/scheduler.component.ts index 0df2a59..8b31445 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/scheduler/scheduler.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/scheduler/scheduler.component.ts @@ -88,7 +88,6 @@ export class SchedulerComponent implements OnInit { public open(notebook, type, resource?): void { this.notebook = notebook; - console.log(this.notebook) this.zones = _moment.tz.names() .map(item => [_moment.tz(item).format('Z'), item]) .sort() @@ -256,8 +255,11 @@ export class SchedulerComponent implements OnInit { } private setScheduleByInactivity() { - console.log(this.notebook) - const data = { sync_start_required: this.parentInherit, check_inactivity_required: this.enableIdleTime, max_inactivity: this.schedulerForm.controls.inactivityTime.value }; + const data = { + sync_start_required: this.parentInherit, + check_inactivity_required: this.enableIdleTime, + max_inactivity: this.schedulerForm.controls.inactivityTime.value + }; (this.destination.type === 'СOMPUTATIONAL') ? this.setInactivity(this.notebook.project, this.notebook.name, data, this.destination.computational_name) : this.setInactivity(this.notebook.project, this.notebook.name, { ...data, consider_inactivity: this.considerInactivity }); 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 f2d715f..d8b2322 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 @@ -101,23 +101,23 @@ <ng-template #billing><i class="material-icons">account_balance_wallet</i></ng-template> </a> </div> - <div> - <a class="nav-item" [routerLink]="['/swagger']" [routerLinkActive]="['active']" - [routerLinkActiveOptions]="{exact:true}"> - <span *ngIf="isExpanded; else endpoint">Cloud Endpoint API</span> - <ng-template #endpoint> - <span> - <svg width="30px" height="27px" viewBox="0 0 256 256" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" preserveAspectRatio="xMidYMid"> - <g> - <path d="M127.059657,255.996921 C58.8506544,255.526472 -0.457073619,198.918442 0.00265506057,126.998303 C0.444649399,57.7958628 57.9516598,-0.468967577 129.11002,0.00284555012 C198.267128,0.462386081 256.613109,57.8667711 255.995136,128.194199 C256.568091,197.883453 197.934268,256.489189 127.059657,255.996921 Z M127.059657,255.996921 C58.8506544,255.526472 -0.457073619,198.918442 0.00265506057,126.998303 C0.444649399,57.7958628 57.9516598,-0.468967577 129.11002,0.0028 [...] - <path id="swager-bgr" d="M127.184644,238.997327 C68.0323765,238.589271 16.6036091,189.498744 17.0023028,127.131428 C17.3860285,67.1185953 67.2554,16.5917106 128.963117,17.0024872 C188.934544,17.4010221 239.531905,67.1825241 238.995778,128.169251 C239.492444,188.602381 188.64743,239.424426 127.184644,238.997327 Z M127.184644,238.997327 C68.0323765,238.589271 16.6036091,189.498744 17.0023028,127.131428 C17.3860285,67.1185953 67.2554,16.5917106 128.963117,17.0024872 C188 [...] - <path d="M169.327319,127.956161 C169.042723,133.246373 164.421106,137.639224 159.866213,136.872586 C159.844426,136.872586 159.821277,136.872586 159.798128,136.872586 C154.753021,136.879395 150.658383,132.794288 150.652936,127.749182 C150.824511,122.690458 155.019915,118.703395 160.08,118.789182 C165.125106,118.813692 169.59966,123.077182 169.327319,127.956161 Z M88.2011915,179.220161 C90.1034894,179.27599 92.0071489,179.235139 94.2008511,179.235139 L94.2008511,193.021 [...] - </g> - </svg> - </span> - </ng-template> - </a> - </div> +<!-- <div>--> +<!-- <a class="nav-item" [routerLink]="['/swagger']" [routerLinkActive]="['active']"--> +<!-- [routerLinkActiveOptions]="{exact:true}">--> +<!-- <span *ngIf="isExpanded; else endpoint">Cloud Endpoint API</span>--> +<!-- <ng-template #endpoint>--> +<!-- <span>--> +<!-- <svg width="30px" height="27px" viewBox="0 0 256 256" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" preserveAspectRatio="xMidYMid">--> +<!-- <g>--> +<!-- <path d="M127.059657,255.996921 C58.8506544,255.526472 -0.457073619,198.918442 0.00265506057,126.998303 C0.444649399,57.7958628 57.9516598,-0.468967577 129.11002,0.00284555012 C198.267128,0.462386081 256.613109,57.8667711 255.995136,128.194199 C256.568091,197.883453 197.934268,256.489189 127.059657,255.996921 Z M127.059657,255.996921 C58.8506544,255.526472 -0.457073619,198.918442 0.00265506057,126.998303 C0.444649399,57.7958628 57.9516598,-0.468967577 129.11002,0. [...] +<!-- <path id="swager-bgr" d="M127.184644,238.997327 C68.0323765,238.589271 16.6036091,189.498744 17.0023028,127.131428 C17.3860285,67.1185953 67.2554,16.5917106 128.963117,17.0024872 C188.934544,17.4010221 239.531905,67.1825241 238.995778,128.169251 C239.492444,188.602381 188.64743,239.424426 127.184644,238.997327 Z M127.184644,238.997327 C68.0323765,238.589271 16.6036091,189.498744 17.0023028,127.131428 C17.3860285,67.1185953 67.2554,16.5917106 128.963117,17.0024872 [...] +<!-- <path d="M169.327319,127.956161 C169.042723,133.246373 164.421106,137.639224 159.866213,136.872586 C159.844426,136.872586 159.821277,136.872586 159.798128,136.872586 C154.753021,136.879395 150.658383,132.794288 150.652936,127.749182 C150.824511,122.690458 155.019915,118.703395 160.08,118.789182 C165.125106,118.813692 169.59966,123.077182 169.327319,127.956161 Z M88.2011915,179.220161 C90.1034894,179.27599 92.0071489,179.235139 94.2008511,179.235139 L94.2008511,193 [...] +<!-- </g>--> +<!-- </svg>--> +<!-- </span>--> +<!-- </ng-template>--> +<!-- </a>--> +<!-- </div>--> </nav> </mat-nav-list> </mat-sidenav> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
