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/21 12:10:37 UTC
[incubator-datalab] branch DATALAB-2367 created (now 8d6ed67)
This is an automated email from the ASF dual-hosted git repository.
ytykhun pushed a change to branch DATALAB-2367
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git.
at 8d6ed67 [DATALAB-2367] fixed bug with discarding changes for external endpoint
This branch includes the following new commits:
new 8d6ed67 [DATALAB-2367] fixed bug with discarding changes for external endpoint
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-2367] fixed bug with discarding
changes for external endpoint
Posted by yt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ytykhun pushed a commit to branch DATALAB-2367
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit 8d6ed6751274cebd88ea5a3017cfdc838ccd5aad
Author: Yurii Tykhun <ty...@gmail.com>
AuthorDate: Wed Apr 21 15:10:07 2021 +0300
[DATALAB-2367] fixed bug with discarding changes for external endpoint
---
.../administration/configuration/configuration.component.ts | 11 ++++++-----
1 file changed, 6 insertions(+), 5 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 9191ffa..90384d4 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
@@ -174,11 +174,14 @@ export class ConfigurationComponent implements OnInit, OnDestroy {
public tabChanged(tabChangeEvent: MatTabChangeEvent): void {
this.activeTab = tabChangeEvent;
- if (this.activeTab.index === 1) {
+
+ if (this.activeTab.index === 1 && this.activeEndpoint === 'local') {
this.activeService = 'self-service';
- } else if (this.activeTab.index === 2) {
+ } else if ((this.activeEndpoint !== 'local' && this.activeTab.index === 1) ||
+ (this.activeTab.index === 2 && this.activeEndpoint === 'local')) {
this.activeService = 'provisioning';
- } else if (this.activeTab.index === 3) {
+ } else if ((this.activeEndpoint !== 'local' && this.activeTab.index === 2) ||
+ (this.activeTab.index === 3 && this.activeEndpoint === 'local')) {
this.activeService = 'billing';
} else {
this.activeService = '';
@@ -291,14 +294,12 @@ export class ConfigurationComponent implements OnInit, OnDestroy {
<div mat-dialog-content class="content">
<ng-template [ngIf]="data.action === 'restart' && !data.statuses.length" ]>
-
<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" ]>
-
<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.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org