diff options
2 files changed, 11 insertions, 3 deletions
diff --git a/vid-app-common/src/main/java/org/onap/vid/job/command/MsoRequestBuilder.kt b/vid-app-common/src/main/java/org/onap/vid/job/command/MsoRequestBuilder.kt index b69f76dfe..6146fec39 100644 --- a/vid-app-common/src/main/java/org/onap/vid/job/command/MsoRequestBuilder.kt +++ b/vid-app-common/src/main/java/org/onap/vid/job/command/MsoRequestBuilder.kt @@ -250,9 +250,10 @@ class MsoRequestBuilder } } - val result: MutableMap<String, String> = instanceParams[0].entries.stream() + val result: MutableMap<String, String> = mutableMapOf(); + instanceParams[0].entries.stream() .filter { entry -> !keysToRemove.contains(entry.key) } - .collect(Collectors.toMap({ it.key }, { it.value })) + .forEach { t -> result.put(t.key, t.value) } return if (result.isEmpty()) emptyList() else listOf(result) } diff --git a/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/control.generator.util.service.ts b/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/control.generator.util.service.ts index bcbcefa8d..fce6c6ec8 100644 --- a/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/control.generator.util.service.ts +++ b/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/control.generator.util.service.ts @@ -147,7 +147,7 @@ export class ControlGeneratorUtil { case 'select' : case 'boolean' : { data.value = data.value || input.optionList.filter((option) => option.isDefault ? option.id || option.name : null); - data.onInit = this.getSubscribeInitResult.bind(null, this.getInputsOptions.bind(this, input.optionList)); + data.onInit = this.getSubscribeInitResult.bind(null, input.optionList == null ? this.getBooleanOptions : this.getInputsOptions.bind(this, input.optionList)); result.push(new DropdownFormControl(data)); break; } @@ -250,4 +250,11 @@ export class ControlGeneratorUtil { ]); }; + getBooleanOptions = (): Observable<SelectOption[]> => { + return of([ + new SelectOption({id: 'true', name: 'true'}), + new SelectOption({id: 'false', name: 'false'}) + ]); + }; + } |