diff --git a/ui/src/app/metadata/domain/service/provider.service.ts b/ui/src/app/metadata/domain/service/provider.service.ts index 0e76dbf6d..f17557902 100644 --- a/ui/src/app/metadata/domain/service/provider.service.ts +++ b/ui/src/app/metadata/domain/service/provider.service.ts @@ -24,17 +24,7 @@ export class MetadataProviderService { } find(id: string): Observable { - return this.http.get(`${this.base}${this.endpoint}/${id}`).pipe(map( - provider => { - /*if (provider.reloadableMetadataResolverAttributes) { - if (provider.reloadableMetadataResolverAttributes.refreshDelayFactor) { - provider.reloadableMetadataResolverAttributes.refreshDelayFactor = - provider.reloadableMetadataResolverAttributes.refreshDelayFactor.toString(); - } - }*/ - return provider; - } - )); + return this.http.get(`${this.base}${this.endpoint}/${id}`); } update(provider: MetadataProvider): Observable { diff --git a/ui/src/app/metadata/provider/model/dynamic-http.provider.form.ts b/ui/src/app/metadata/provider/model/dynamic-http.provider.form.ts index 6ebf388d2..be0654dec 100644 --- a/ui/src/app/metadata/provider/model/dynamic-http.provider.form.ts +++ b/ui/src/app/metadata/provider/model/dynamic-http.provider.form.ts @@ -1,17 +1,22 @@ -import { FormProperty } from 'ngx-schema-form/lib/model/formproperty'; -import { ArrayProperty } from 'ngx-schema-form/lib/model/arrayproperty'; -import { ObjectProperty } from 'ngx-schema-form/lib/model/objectproperty'; - import { Wizard } from '../../../wizard/model'; import { DynamicHttpMetadataProvider } from '../../domain/model/providers/dynamic-http-metadata-provider'; import { BaseMetadataProviderEditor } from './base.provider.form'; -import UriValidator from '../../../shared/validation/uri.validator'; export const DynamicHttpMetadataProviderWizard: Wizard = { ...BaseMetadataProviderEditor, label: 'DynamicHttpMetadataProvider', type: 'DynamicHttpMetadataResolver', bindings: {}, + formatter: (changes: DynamicHttpMetadataProvider) => { + let base = BaseMetadataProviderEditor.formatter(changes); + if (base.dynamicMetadataResolverAttributes) { + if (base.dynamicMetadataResolverAttributes.refreshDelayFactor) { + base.dynamicMetadataResolverAttributes.refreshDelayFactor = + base.dynamicMetadataResolverAttributes.refreshDelayFactor.toString(); + } + } + return base; + }, getValidators(namesList: string[] = [], xmlIdList: string[] = []): any { const validators = BaseMetadataProviderEditor.getValidators(namesList); validators['/xmlId'] = (value, property, form) => { diff --git a/ui/src/app/metadata/provider/model/file-backed-http.provider.form.ts b/ui/src/app/metadata/provider/model/file-backed-http.provider.form.ts index f6bd3796f..aad52c679 100644 --- a/ui/src/app/metadata/provider/model/file-backed-http.provider.form.ts +++ b/ui/src/app/metadata/provider/model/file-backed-http.provider.form.ts @@ -7,6 +7,16 @@ export const FileBackedHttpMetadataProviderWizard: Wizard { + let base = BaseMetadataProviderEditor.formatter(changes); + if (base.reloadableMetadataResolverAttributes) { + if (base.reloadableMetadataResolverAttributes.refreshDelayFactor) { + base.reloadableMetadataResolverAttributes.refreshDelayFactor = + base.reloadableMetadataResolverAttributes.refreshDelayFactor.toString(); + } + } + return base; + }, getValidators(namesList: string[] = [], xmlIdList: string[] = []): any { const validators = BaseMetadataProviderEditor.getValidators(namesList); validators['/xmlId'] = (value, property, form) => { diff --git a/ui/src/app/metadata/provider/model/file-system.provider.form.ts b/ui/src/app/metadata/provider/model/file-system.provider.form.ts index c42fed449..a6395c447 100644 --- a/ui/src/app/metadata/provider/model/file-system.provider.form.ts +++ b/ui/src/app/metadata/provider/model/file-system.provider.form.ts @@ -6,6 +6,16 @@ export const FileSystemMetadataProviderWizard: Wizard { + let base = BaseMetadataProviderEditor.formatter(changes); + if (base.reloadableMetadataResolverAttributes) { + if (base.reloadableMetadataResolverAttributes.refreshDelayFactor) { + base.reloadableMetadataResolverAttributes.refreshDelayFactor = + base.reloadableMetadataResolverAttributes.refreshDelayFactor.toString(); + } + } + return base; + }, getValidators(namesList: string[] = [], xmlIdList: string[] = []): any { const validators = BaseMetadataProviderEditor.getValidators(namesList); validators['/xmlId'] = (value, property, form) => { diff --git a/ui/src/app/metadata/provider/model/local-dynamic.provider.form.ts b/ui/src/app/metadata/provider/model/local-dynamic.provider.form.ts index d2c16cb6b..65cdca2f6 100644 --- a/ui/src/app/metadata/provider/model/local-dynamic.provider.form.ts +++ b/ui/src/app/metadata/provider/model/local-dynamic.provider.form.ts @@ -1,11 +1,22 @@ import { Wizard } from '../../../wizard/model'; import { LocalDynamicMetadataProvider } from '../../domain/model/providers/local-dynamic-metadata-provider'; import { BaseMetadataProviderEditor } from './base.provider.form'; +import { MetadataProvider } from '../../domain/model'; export const LocalDynamicMetadataProviderWizard: Wizard = { ...BaseMetadataProviderEditor, label: 'LocalDynamicMetadataProvider', type: 'LocalDynamicMetadataResolver', + formatter: (changes: LocalDynamicMetadataProvider) => { + let base = BaseMetadataProviderEditor.formatter(changes); + if (base.dynamicMetadataResolverAttributes) { + if (base.dynamicMetadataResolverAttributes.refreshDelayFactor) { + base.dynamicMetadataResolverAttributes.refreshDelayFactor = + base.dynamicMetadataResolverAttributes.refreshDelayFactor.toString(); + } + } + return base; + }, getValidators(namesList: string[] = [], xmlIdList: string[] = []): any { const validators = BaseMetadataProviderEditor.getValidators(namesList); validators['/xmlId'] = (value, property, form) => {