This is an automated email from the ASF dual-hosted git repository. dgnatyshyn pushed a commit to branch DLAB-1853 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit b7c5b78babc6aa3989180a0f994cf51ec05b7946 Author: Dmytro_Gnatyshyn <[email protected]> AuthorDate: Wed Jun 3 18:08:49 2020 +0300 [DLAB-1853]: Fixed filtered data are changes in some seconds and added scrollbar for error message in library page --- .../src/app/resources/bucket-browser/bucket-browser.module.ts | 2 -- .../install-libraries/install-libraries.component.ts | 10 ++++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-browser.module.ts b/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-browser.module.ts index afec96f..2654704 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-browser.module.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-browser.module.ts @@ -22,7 +22,6 @@ import { CommonModule } from '@angular/common'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { MaterialModule } from '../../shared/material.module'; -import { ResourcesComponent } from '../resources.component'; import { ResourcesGridModule } from '../resources-grid'; import { ExploratoryEnvironmentCreateModule } from '../exploratory/create-environment'; @@ -53,6 +52,5 @@ import {ConvertFileSizePipeModule} from '../../core/pipes/convert-file-size'; ], entryComponents: [BucketBrowserComponent, FolderTreeComponent, BucketTreeComponent, BucketConfirmationDialogComponent], providers: [BucketDataService], - // exports: [ResourcesComponent] }) export class BucketBrowserModule { } diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.ts index 2f2d733..0445b4c 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.ts @@ -255,6 +255,7 @@ export class InstallLibrariesComponent implements OnInit, OnDestroy { lib.version = 'v.' + lib.version; } ); + this.filterLibs(); this.changeDetector.markForCheck(); this.filterConfiguration.group = this.createFilterList(this.notebookLibs.map(v => this.groupsListMap[v.group])); this.filterConfiguration.resource = this.createFilterList(this.notebookLibs.map(lib => lib.status.map(status => status.resource))); @@ -363,12 +364,17 @@ export class InstallLibrariesComponent implements OnInit, OnDestroy { <h4 class="modal-title">Library installation error</h4> <button type="button" class="close" (click)="dialogRef.close()">×</button> </div> - <div class="content">{{ data }}</div> + <div class="content lib-error" > + {{ data }} + </div> <div class="text-center"> <button type="button" class="butt" mat-raised-button (click)="dialogRef.close()">Close</button> </div> `, - styles: [] + styles: [ ` + .lib-error { max-height: 200px; overflow-x: auto; word-break: break-all; padding: 20px 30px !important; margin: 20px 0;} + ` + ] }) export class ErrorMessageDialogComponent { constructor( --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
