You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datalab.apache.org by yt...@apache.org on 2021/04/20 15:32:52 UTC
[incubator-datalab] branch DATALAB-2366 created (now bf4e735)
This is an automated email from the ASF dual-hosted git repository.
ytykhun pushed a change to branch DATALAB-2366
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git.
at bf4e735 [DATALAB-2366] changed messages for service restarting on confirmation dialog
This branch includes the following new commits:
new bf4e735 [DATALAB-2366] changed messages for service restarting on confirmation dialog
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@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org
[incubator-datalab] 01/01: [DATALAB-2366] changed messages for
service restarting on confirmation dialog
Posted by yt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ytykhun pushed a commit to branch DATALAB-2366
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit bf4e73534613f3ca51f0e4c10fc5d75dfad9197e
Author: Yurii Tykhun <ty...@gmail.com>
AuthorDate: Tue Apr 20 18:32:31 2021 +0300
[DATALAB-2366] changed messages for service restarting on confirmation dialog
---
.../configuration/configuration.component.ts | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/configuration/configuration.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/configuration/configuration.component.ts
index d75aa78..9191ffa 100644
--- a/services/self-service/src/main/resources/webapp/src/app/administration/configuration/configuration.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/administration/configuration/configuration.component.ts
@@ -291,22 +291,22 @@ export class ConfigurationComponent implements OnInit, OnDestroy {
<div mat-dialog-content class="content">
<ng-template [ngIf]="data.action === 'restart' && !data.statuses.length" ]>
- Restarting
- <span class="strong">{{data.services.join(', ')}}</span>
- <span *ngIf="data.services.length > 1 || (data.services.length === 1 && data.services[0] !== 'self-service')"> service</span>
- <span [hidden]="(data.services.length < 2) || data.services.length === 2 && data.services[0] === 'self-service'">s</span> will make DataLab unavailable for some time.
+
+ <span class="strong">{{data.services.join(', ') | titlecase}}</span>
+ <span class="strong" *ngIf="data.services.length > 1 || (data.services.length === 1 && data.services[0] !== 'self-service')"> service</span>
+ <span class="strong" [hidden]="(data.services.length < 2) || data.services.length === 2 && data.services[0] === 'self-service'">s</span>: restarting will make DataLab unavailable for some time.
</ng-template>
<ng-template [ngIf]="data.action === 'restart' && data.statuses.length && filterProvisioning.length" ]>
- Restarting
- <span class="strong" >{{filterProvisioning.join(', ')}}</span>
- <span *ngIf="filterProvisioning.length > 1 || (filterProvisioning.length === 1 && filterProvisioning[0] !== 'self-service')"> service</span>
- <span [hidden]="(filterProvisioning.length < 2) || filterProvisioning.length === 2 && filterProvisioning[0] === 'self-service'">s</span> will make DataLab unavailable for some time.
+
+ <span class="strong" >{{filterProvisioning.join(', ') | titlecase}}</span>
+ <span class="strong" *ngIf="filterProvisioning.length > 1 || (filterProvisioning.length === 1 && filterProvisioning[0] !== 'self-service')"> service</span>
+ <span [hidden]="(filterProvisioning.length < 2) || filterProvisioning.length === 2 && filterProvisioning[0] === 'self-service'">s</span>: restarting will make DataLab unavailable for some time.
</ng-template>
<ng-template [ngIf]="data.action === 'restart' && data.statuses.length && (data.services.includes('provisioning') || !filterProvisioning.length)">
<div class="warning" [ngStyle]="data.services.includes('provisioning') && data.services?.length > 1 && {'margin-top': '10px'}">
- Can not restart <span>provisioning</span> because one of resources is in processing stage.
+ <span>Provisioning service: </span>can not be restarted because one of resources is in processing stage. Please try again later.
</div>
</ng-template>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org