You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datalab.apache.org by dg...@apache.org on 2021/02/18 14:14:47 UTC
[incubator-datalab] 01/03: Fixed get request
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch DATALAB-2229
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit 950e4d08e19b3a17f4e59fd2c9d226299f432457
Author: Dmytro_Gnatyshyn <di...@ukr.net>
AuthorDate: Tue Feb 16 13:22:12 2021 +0200
Fixed get request
---
.../configuration/configuration.component.ts | 14 ++++++++------
.../app/core/services/applicationServiceFacade.service.ts | 5 +----
.../src/app/core/services/configutration.service.ts | 15 +++++++--------
3 files changed, 16 insertions(+), 18 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 8442fbd..ed760c6 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
@@ -119,8 +119,10 @@ export class ConfigurationComponent implements OnInit, OnDestroy {
takeUntil(this.unsubscribe$)
)
.subscribe(config => {
- this.services[service].config = config;
- this.services[service].serverConfig = config;
+ console.log(config);
+ if (!this.activeEndpoint) this.activeEndpoint = Object.keys(config)[0];
+ this.services[service].config = config[this.activeEndpoint];
+ this.services[service].serverConfig = config[this.activeEndpoint];
this.configUpdate(service);
}
);
@@ -128,8 +130,8 @@ export class ConfigurationComponent implements OnInit, OnDestroy {
this.clearSelectedServices();
}
- private setServiceConfig(service, config): void {
- this.configurationService.setServiceConfig(service, config)
+ private setServiceConfig(service: string, config: string): void {
+ this.configurationService.setServiceConfig(service, config, this.activeEndpoint)
.pipe(
takeUntil(this.unsubscribe$)
)
@@ -193,11 +195,11 @@ export class ConfigurationComponent implements OnInit, OnDestroy {
if (result) {
this.configurationService.restartServices(this.services['self-service'].selected,
this.services['provisioning'].selected,
- this.services['billing'].selected
+ this.services['billing'].selected,
+ this.activeEndpoint
)
.pipe(
takeUntil(this.unsubscribe$),
-
)
.subscribe(res => {
this.clearSelectedServices();
diff --git a/services/self-service/src/main/resources/webapp/src/app/core/services/applicationServiceFacade.service.ts b/services/self-service/src/main/resources/webapp/src/app/core/services/applicationServiceFacade.service.ts
index 251fcdb..9c6fd45 100644
--- a/services/self-service/src/main/resources/webapp/src/app/core/services/applicationServiceFacade.service.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/core/services/applicationServiceFacade.service.ts
@@ -683,10 +683,7 @@ export class ApplicationServiceFacade {
public buildSetServiceConfig(data, body): Observable<any> {
return this.buildRequest(HTTPMethod.POST,
this.requestRegistry.Item(ApplicationServiceFacade.CONFIG) + data,
- body, {
- // responseType: 'text',
- // headers: { 'Content-Type': 'text/plain' }
- });
+ body);
}
public buildRestartServices(data): Observable<any> {
diff --git a/services/self-service/src/main/resources/webapp/src/app/core/services/configutration.service.ts b/services/self-service/src/main/resources/webapp/src/app/core/services/configutration.service.ts
index eda1a65..aba7cc7 100644
--- a/services/self-service/src/main/resources/webapp/src/app/core/services/configutration.service.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/core/services/configutration.service.ts
@@ -20,7 +20,6 @@
import { Injectable } from '@angular/core';
import {Observable, of} from 'rxjs';
import { map, catchError } from 'rxjs/operators';
-
import { ApplicationServiceFacade } from './applicationServiceFacade.service';
import { ErrorUtils } from '../util';
@@ -29,7 +28,7 @@ export class ConfigurationService {
constructor(private applicationServiceFacade: ApplicationServiceFacade) { }
public getServiceSettings(service): Observable<{}> {
- service = this.convertProvisioning(service);
+ service = ConfigurationService.convertProvisioning(service);
return this.applicationServiceFacade
.buildGetServiceConfig(service)
.pipe(
@@ -37,11 +36,11 @@ export class ConfigurationService {
catchError(ErrorUtils.handleServiceError));
}
- public setServiceConfig(service: string, config: string): Observable<{}> {
+ public setServiceConfig(service: string, config: string, endpoint: string): Observable<{}> {
const settings = {
- local: config
+ [endpoint]: config
};
- service = this.convertProvisioning(service);
+ service = ConfigurationService.convertProvisioning(service);
return this.applicationServiceFacade
.buildSetServiceConfig(service, settings)
@@ -50,8 +49,8 @@ export class ConfigurationService {
catchError(ErrorUtils.handleServiceError));
}
- public restartServices(self: boolean, prov: boolean, billing: boolean): Observable<{}> {
- const queryString = `?billing=${billing}&provserv=${prov}&ui=${self}&endpoints=${'local'}`;
+ public restartServices(self: boolean, prov: boolean, billing: boolean, endpoint: string): Observable<{}> {
+ const queryString = `?billing=${billing}&provserv=${prov}&ui=${self}&endpoints=${endpoint}`;
return this.applicationServiceFacade
.buildRestartServices(queryString)
.pipe(
@@ -59,7 +58,7 @@ export class ConfigurationService {
catchError(ErrorUtils.handleServiceError));
}
- private convertProvisioning(service: string): string {
+ private static convertProvisioning(service: string): string {
return (service === 'provisioning') ? 'provisioning-service' : service;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org