This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/develop by this push:
new c4f72c4 [DLAB-1967]: Fixed additional packages are not shown (#832)
c4f72c4 is described below
commit c4f72c4bccaca7f7b6e13b581b22ce1dc23092ec
Author: Dmytro Gnatyshyn <[email protected]>
AuthorDate: Tue Jul 28 10:22:13 2020 +0300
[DLAB-1967]: Fixed additional packages are not shown (#832)
---
.../install-libraries/install-libraries.component.html | 10 +++++-----
.../install-libraries/install-libraries.component.ts | 8 ++++----
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.html
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.html
index 54f1d86..53dbd23 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.html
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.html
@@ -72,7 +72,7 @@
<mat-option>
<div class="option"
(click)="selectLibrary(item);$event.stopPropagation()" [ngClass]="{'not-allow':
item.isInSelectedList}">
<a *ngIf="!item.isInSelectedList">
- <span [innerHTML]="item.name |
highlight:lib.name.toLowerCase()"></span>
+ <span [innerHTML]="item.name |
highlight:lib.name"></span>
</a>
<span *ngIf="item.isInSelectedList">{{ item.name
}}</span>
<strong *ngIf="item.isInSelectedList">selected
@@ -134,7 +134,7 @@
<mat-option >
<div class="option"
(click)="selectLibrary(item);$event.stopPropagation()" [ngClass]="{'not-allow':
item.isInSelectedList}">
<a *ngIf="!item.isInSelectedList">
- <span [innerHTML]="item.name + ':' + item.version |
highlight:item.name.toLowerCase()">
+ <span [innerHTML]="item.name + ':' + item.version |
highlight:item.name">
<span>{{ item.version }}</span>
</span>
</a>
@@ -347,12 +347,12 @@
<div class="lib-destination-col">{{ item.resource }}</div>
<div class="lib-resource-type-col">{{ item.resourceType
}}</div>
<div class="lib-status-col" ngClass="{{
item.status.toLowerCase() || 'installation_error' }}">{{
item.status.replace('_', ' ') }}
- <div class="warn-action" *ngIf="(item.status ===
'installation_error' || item.status.toLowerCase() === 'invalid_version') &&
notebook?.status === 'running'">
+ <div class="warn-action" *ngIf="(item.status ===
'installation_error' || item.status.toLowerCase() === 'invalid_version' ||
item.add_pkgs?.length) && notebook?.status === 'running'">
<div *ngIf="!item.available_versions">
- <span *ngIf="!installingInProgress"
(click)="reinstallLibrary(item, lib)" matTooltip="Retry installation"
matTooltipPosition="above">
+ <span *ngIf="!installingInProgress &&
!item.add_pkgs?.length" (click)="reinstallLibrary(item, lib)" matTooltip="Retry
installation" matTooltipPosition="above">
<i class="material-icons">replay</i>
</span>
- <span class="not-allowed" *ngIf="installingInProgress"
matTooltip="You can't reinstall library until previous process will be
completed"
+ <span class="not-allowed" *ngIf="installingInProgress
&& !item.add_pkgs?.length" matTooltip="You can't reinstall library until
previous process will be completed"
matTooltipPosition="above">
<i class="material-icons">replay</i>
</span>
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 3e977f8..e41d4c0 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
@@ -18,7 +18,7 @@
*/
-import {Component, OnInit, ViewChild, ViewEncapsulation, ChangeDetectorRef,
Inject, OnDestroy, AfterViewInit} from '@angular/core';
+import {Component, OnInit, ViewChild, ViewEncapsulation, ChangeDetectorRef,
Inject, OnDestroy} from '@angular/core';
import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from
'@angular/material/dialog';
import { FormControl } from '@angular/forms';
import { ToastrService } from 'ngx-toastr';
@@ -205,11 +205,11 @@ export class InstallLibrariesComponent implements OnInit,
OnDestroy {
public addLibrary(item): void {
if (this.selectedLib && !this.selectedLib.isInSelectedList) {
if (this.group !== 'java') {
- this.model.selectedLibs.push({ group: this.group, name:
item.name.toLowerCase(), version: item.version.toLowerCase() || 'N/A' });
+ this.model.selectedLibs.push({ group: this.group, name: item.name,
version: item.version || 'N/A' });
} else {
this.model.selectedLibs.push({
- group: this.group, name: item.name.substring(0,
item.name.lastIndexOf(':')).toLowerCase(),
- version: item.name.substring(item.name.lastIndexOf(':') +
1).toLowerCase() || 'N/A'
+ group: this.group, name: item.name.substring(0,
item.name.lastIndexOf(':')),
+ version: item.name.substring(item.name.lastIndexOf(':') + 1) || 'N/A'
});
}
this.libSearch.setValue('');
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
