This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch DLAB-1748
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-1748 by this push:
new 4cf9e1b [DLAB-1750] Added lib igo message for other group, status
version invalid
new 3b8ac2b Merge branch 'DLAB-1748' of github.com:apache/incubator-dlab
into DLAB-1748
4cf9e1b is described below
commit 4cf9e1bad1e865f9952d60804b1b48817e798c84
Author: Dmytro_Gnatyshyn <di1...@ukr.net>
AuthorDate: Wed Jul 15 15:17:00 2020 +0300
[DLAB-1750] Added lib igo message for other group, status version invalid
---
.../install-libraries/install-libraries.component.html | 7 +++++--
.../install-libraries/install-libraries.component.scss | 17 ++++++++++++++---
.../resources/webapp/src/assets/styles/_variables.scss | 1 +
3 files changed, 20 insertions(+), 5 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 9f4cac9..4cdc9f1 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
@@ -52,6 +52,9 @@
</div>
</div>
</div>
+ <p class="other-message">
+ <span *ngIf="group === 'others'">Other group can include libs from
Python 2 and Python 3 groups</span>
+ </p>
<div class="search">
<mat-form-field class="chip-list">
<input
@@ -226,7 +229,7 @@
<div class="wrap-col">
<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() || '' }}">{{ item.status }}
+ <div class="lib-status-col" ngClass="{{
item.status.toLowerCase() || 'failed' }}">{{ item.status }}
<div class="warn-action" *ngIf="item.status === 'failed'
&& notebook?.status === 'running'">
<div *ngIf="!item.available_versions">
<span *ngIf="!installingInProgress"
(click)="reinstallLibrary(item, lib)" matTooltip="Retry installation"
matTooltipPosition="above">
@@ -241,7 +244,7 @@
<i class="material-icons">error_outline</i>
</div>
<div class="lib-error"
- *ngIf="item.status === 'failed' &&
item.available_versions?.length" class="lib-error"
+ *ngIf="(item.status === 'failed' ||
item.status?.toLowerCase() === 'invalid version') &&
item.available_versions?.length" class="lib-error"
(click)="openLibInfo(item,
'available');$event.stopPropagation()"
matTooltip="Show available version"
matTooltipPosition="above"
>
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.scss
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.scss
index 55b68d8..fd769f0 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.scss
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.scss
@@ -17,6 +17,8 @@
* under the License.
*/
+@import '_variables.scss';
+
.aligner {
height: 100%;
display: flex;
@@ -85,9 +87,6 @@
.mat-list-item {
height: auto !important;
- &.table-item{
- cursor: pointer;
- }
.mat-list-item-content {
height: auto !important;
@@ -183,12 +182,24 @@ ul.resources{
.control-group {
width: 50%;
+ padding-bottom: 0;
.label {
width: 20%;
}
}
+ .other-message{
+ height: 22px;
+ display: flex;
+ align-items: center;
+
+ span{
+ font-size: 12px;
+ color: $link-color;
+ }
+ }
+
.search {
flex-grow: 1;
padding-bottom: 0;
diff --git
a/services/self-service/src/main/resources/webapp/src/assets/styles/_variables.scss
b/services/self-service/src/main/resources/webapp/src/assets/styles/_variables.scss
index 63d8202..ed038e7 100644
---
a/services/self-service/src/main/resources/webapp/src/assets/styles/_variables.scss
+++
b/services/self-service/src/main/resources/webapp/src/assets/styles/_variables.scss
@@ -23,5 +23,6 @@ $modal-header-color: #f6fafe;
$brand-color: #4ab8dc;
$blue-grey-color: #718ba6;
$dark-grey-color: #455c74;
+$link-color: #00bcd4;
$default-font-size: 14px;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
