diff --git a/ui/src/app/metadata/provider/container/provider-edit.component.html b/ui/src/app/metadata/provider/container/provider-edit.component.html index 3778fe440..98c8b0f64 100644 --- a/ui/src/app/metadata/provider/container/provider-edit.component.html +++ b/ui/src/app/metadata/provider/container/provider-edit.component.html @@ -78,7 +78,6 @@ -
{{ status$ | async | json }}
diff --git a/ui/src/app/metadata/provider/container/provider-wizard.component.ts b/ui/src/app/metadata/provider/container/provider-wizard.component.ts index 4a599f33e..014061305 100644 --- a/ui/src/app/metadata/provider/container/provider-wizard.component.ts +++ b/ui/src/app/metadata/provider/container/provider-wizard.component.ts @@ -43,7 +43,9 @@ export class ProviderWizardComponent implements OnDestroy { this.store .select(fromWizard.getCurrentWizardSchema) .subscribe(s => { - this.store.dispatch(new LoadSchemaRequest(s)); + if (s) { + this.store.dispatch(new LoadSchemaRequest(s)); + } }); this.valid$ = this.store.select(fromProvider.getEditorIsValid); this.changes$ = this.store.select(fromProvider.getEntityChanges); diff --git a/ui/src/app/metadata/provider/effect/editor.effect.ts b/ui/src/app/metadata/provider/effect/editor.effect.ts index bbf1bcc48..3146ff91d 100644 --- a/ui/src/app/metadata/provider/effect/editor.effect.ts +++ b/ui/src/app/metadata/provider/effect/editor.effect.ts @@ -8,7 +8,7 @@ import { LoadSchemaFail, EditorActionTypes } from '../action/editor.action'; -import { map, switchMap, catchError, withLatestFrom } from 'rxjs/operators'; +import { map, switchMap, catchError, withLatestFrom, debounceTime } from 'rxjs/operators'; import { of } from 'rxjs'; import { SetDefinition, WizardActionTypes, AddSchema } from '../../../wizard/action/wizard.action'; import { ResetChanges } from '../action/entity.action'; @@ -23,6 +23,7 @@ export class EditorEffects { $loadSchemaRequest = this.actions$.pipe( ofType(EditorActionTypes.LOAD_SCHEMA_REQUEST), map(action => action.payload), + debounceTime(100), switchMap((schemaPath: string) => this.schemaService .get(schemaPath) diff --git a/ui/src/assets/schema/provider/filebacked-http-common.editor.schema.json b/ui/src/assets/schema/provider/filebacked-http-common.editor.schema.json index 77590af65..ce53531bf 100644 --- a/ui/src/assets/schema/provider/filebacked-http-common.editor.schema.json +++ b/ui/src/assets/schema/provider/filebacked-http-common.editor.schema.json @@ -3,7 +3,7 @@ "order": [ "name", "@type", - "id", + "xmlId", "metadataURL", "initializeFromBackupFile", "backingFile", @@ -14,7 +14,7 @@ "satisfyAnyPredicates" ], "required": [ - "id", + "xmlId", "metadataURL" ], "anyOf": [ @@ -50,7 +50,7 @@ }, { "fields": [ - "id", + "xmlId", "metadataURL", "initializeFromBackupFile", "backingFile", @@ -90,7 +90,7 @@ } ] }, - "id": { + "xmlId": { "title": "ID", "description": "Identifier for logging, identification for command line reload, etc.", "type": "string", diff --git a/ui/src/assets/schema/provider/filebacked-http-common.schema.json b/ui/src/assets/schema/provider/filebacked-http-common.schema.json index 65c919add..73414de00 100644 --- a/ui/src/assets/schema/provider/filebacked-http-common.schema.json +++ b/ui/src/assets/schema/provider/filebacked-http-common.schema.json @@ -1,7 +1,7 @@ { "type": "object", "order": [ - "id", + "xmlId", "metadataURL", "initializeFromBackupFile", "backingFile", @@ -11,7 +11,7 @@ "useDefaultPredicateRegistry", "satisfyAnyPredicates" ], - "required": ["id", "metadataURL"], + "required": ["xmlId", "metadataURL"], "dependencies": { "initializeFromBackupFile": {"required": ["backingFile", "backupFileInitNextRefreshDelay"]} }, @@ -40,7 +40,7 @@ } ], "properties": { - "id": { + "xmlId": { "title": "ID", "description": "Identifier for logging, identification for command line reload, etc.", "type": "string",