scottk/siembol
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/siembol.git synced 2025-11-17 02:14:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Config-editor-ui: Compatible with new backend + httperrorinterceptor start (#152)

Browse Source 
* Compatible with new backend + httperrorinterceptor + global error handler
This commit is contained in:
Celie Valentiny
2020-10-29 09:53:31 +00:00
committed by GitHub Enterprise
parent 34a792dcdb
commit 162314c62c
21 changed files with 235 additions and 332 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
config-editor/config-editor-ui/src/app/components/deploy-dialog/deploy-dialog.component.ts
View File

@@ -11,7 +11,8 @@ import { ConfigData, ConfigWrapper, Deployment } from '@app/model';
import { FormlyFieldConfig, FormlyFormOptions } from '@ngx-formly/core';
import { FormlyJsonschema } from '@ngx-formly/core/json-schema';
import { cloneDeep } from 'lodash';
import { take } from 'rxjs/operators';
import { take, catchError } from 'rxjs/operators';
import { throwError, of } from 'rxjs';
@Component({
selector: 're-deploy-dialog',
@@ -50,16 +51,14 @@ export class DeployDialogComponent {
this.fields = [this.formlyJsonSchema.toFieldConfig(service.configLoader.createDeploymentSchema())];
} else {
this.service.configLoader.validateRelease(data).pipe(take(1))
.subscribe(s => {
if (s !== undefined) {
this.statusCode = s.status_code;
if (s.status_code !== StatusCode.OK) {
this.message = s.attributes.message;
this.exception = s.attributes.exception;
}
this.validating = false;
this.isValid = s.status_code === StatusCode.OK ? true : false;
}
.pipe(
catchError(e => {
this.isValid = false;
return throwError(e);
}))
.subscribe(() => {
this.isValid = true;
this.validating = false;
});
}
@@ -72,16 +71,15 @@ export class DeployDialogComponent {
onValidate() {
this.deployment = {...this.deployment, ...this.extrasData};
this.service.configLoader
.validateRelease(this.deployment).pipe(take(1)).subscribe(s => {
if (s !== undefined) {
this.statusCode = s.status_code;
if (s.status_code !== StatusCode.OK) {
this.message = s.attributes.message;
this.exception = s.attributes.exception;
}
this.validating = false;
this.isValid = s.status_code === StatusCode.OK ? true : false;
}
.validateRelease(this.deployment).pipe(take(1))
.pipe(
catchError(e => {
this.isValid = false;
return throwError(e);
}))
.subscribe(() => {
this.isValid = true;
this.validating = false;
});
}