You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by dg...@apache.org on 2019/12/13 11:03:12 UTC
[incubator-dlab] branch DLAB-1386 created (now 57d92d6)
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a change to branch DLAB-1386
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.
at 57d92d6 [DLAB-1386]: Fixed issues with libraries filter
This branch includes the following new commits:
new 57d92d6 [DLAB-1386]: Fixed issues with libraries filter
The 1 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] 01/01: [DLAB-1386]: Fixed issues with libraries
filter
Posted by dg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch DLAB-1386
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 57d92d6b5859c3c07fa852d30a0b176b986404b3
Author: Dmytro Gnatyshyn <di...@ukr.net>
AuthorDate: Fri Dec 13 13:02:34 2019 +0200
[DLAB-1386]: Fixed issues with libraries filter
---
.../install-libraries/install-libraries.component.html | 10 ++++++++--
.../install-libraries/install-libraries.component.ts | 11 +++++++----
.../multi-select-dropdown.component.html | 2 +-
3 files changed, 16 insertions(+), 7 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 1cbd2c4..29101a2 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
@@ -128,7 +128,13 @@
</i>
</button>
</div>
- <div class="lib-status">Status</div>
+ <div class="lib-status"><span>Status</span>
+ <button mat-icon-button aria-label="More" class="ar" (click)="toggleFilterRow()">
+ <i class="material-icons">
+ <span>more_vert</span>
+ </i>
+ </button>
+ </div>
</mat-list-item>
<ng-container *ngIf="filtered" >
@@ -194,7 +200,7 @@
<mat-list-item *ngFor="let lib of filtredNotebookLibs">
<div class="lib-name ellipsis">
<strong>{{ lib.name }}</strong>
- <span *ngIf="lib.version && lib.version !== 'N/A'">v.{{ lib.version }}</span>
+ <span *ngIf="lib.version && lib.version !== 'N/A'">{{ lib.version }}</span>
</div>
<div class="lib-group-col">{{ groupsListMap[lib.group] }}</div>
<div class="st-group">
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 3e54f03..2741812 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
@@ -220,7 +220,7 @@ export class InstallLibrariesComponent implements OnInit {
this.notebookFailedLibs = data.filter(lib => lib.status.some(inner => inner.status === 'failed'));
this.installingInProgress = data.filter(lib => lib.status.some(inner => inner.status === 'installing')).length > 0;
- if (this.installingInProgress || this.notebookFailedLibs.length) {
+ if (this.installingInProgress) {
if (this.clearCheckInstalling === undefined)
this.clearCheckInstalling = window.setInterval(() => this.getInstalledLibrariesList(), 10000);
} else {
@@ -246,7 +246,12 @@ export class InstallLibrariesComponent implements OnInit {
this.filtredNotebookLibs = [...data];
}
this.notebookLibs = data ? data : [];
- this.notebookLibs.forEach(v => v.filteredStatus = v.status);
+ this.notebookLibs.forEach(lib => {
+ lib.filteredStatus = lib.status;
+ if(lib.version && lib.version !== 'N/A')
+ lib.version = 'v.' + lib.version
+ }
+ );
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)));
@@ -346,8 +351,6 @@ export class InstallLibrariesComponent implements OnInit {
this.filtredNotebookLibs = [...this.notebookLibs];
this.filterModel.resetFilterLibs();
}
-
-
}
@Component({
diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/form-controls/multi-select-dropdown/multi-select-dropdown.component.html b/services/self-service/src/main/resources/webapp/src/app/shared/form-controls/multi-select-dropdown/multi-select-dropdown.component.html
index 4ce2029..7f58adf 100644
--- a/services/self-service/src/main/resources/webapp/src/app/shared/form-controls/multi-select-dropdown/multi-select-dropdown.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/shared/form-controls/multi-select-dropdown/multi-select-dropdown.component.html
@@ -45,7 +45,7 @@
</li>
</ng-template>
<li *ngIf="items?.length == 0">
- <a role="menuitem">
+ <a role="menuitem" class="list-item">
<span class="material-icons">visibility_off</span>
No {{type}}
</a>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org