diff options
Diffstat (limited to 'catalog-ui/src/app/ng2/pages')
4 files changed, 9 insertions, 4 deletions
diff --git a/catalog-ui/src/app/ng2/pages/interface-operation/interface-operation.page.component.ts b/catalog-ui/src/app/ng2/pages/interface-operation/interface-operation.page.component.ts index 9035b3ff50..97c7b4d959 100644 --- a/catalog-ui/src/app/ng2/pages/interface-operation/interface-operation.page.component.ts +++ b/catalog-ui/src/app/ng2/pages/interface-operation/interface-operation.page.component.ts @@ -136,7 +136,7 @@ export class InterfaceOperationComponent { ngOnInit(): void { this.isLoading = true; - this.workflowIsOnline = !_.isUndefined(this.PluginsService.getPluginByStateUrl('workflowDesigner')); + this.workflowIsOnline = false;//!_.isUndefined(this.PluginsService.getPluginByStateUrl('workflowDesigner')); const workflowSubscription = this.enableWorkflowAssociation && this.workflowIsOnline ? this.WorkflowServiceNg2.getWorkflows() : Promise.resolve(); Observable.forkJoin( this.ComponentServiceNg2.getInterfaces(this.component), diff --git a/catalog-ui/src/app/ng2/pages/properties-assignment/properties-assignment.page.component.ts b/catalog-ui/src/app/ng2/pages/properties-assignment/properties-assignment.page.component.ts index 953c973d1a..615325559e 100644 --- a/catalog-ui/src/app/ng2/pages/properties-assignment/properties-assignment.page.component.ts +++ b/catalog-ui/src/app/ng2/pages/properties-assignment/properties-assignment.page.component.ts @@ -126,7 +126,7 @@ export class PropertiesAssignmentComponent { this.loadingInstances = true; this.loadingProperties = true; this.componentServiceNg2 - .getComponentInputs(this.component) + .getComponentInputsWithProperties(this.component) .subscribe(response => { _.forEach(response.inputs, (input: InputBEModel) => { const newInput: InputFEModel = new InputFEModel(input); @@ -468,7 +468,10 @@ export class PropertiesAssignmentComponent { }; } else { if (this.isSelf()) { - request = this.componentServiceNg2.updateServiceProperties(this.component, changedProperties); + request = this.componentServiceNg2.updateServiceProperties(this.component, _.map(changedProperties, cp => { + delete cp.constraints; + return cp; + })); } else { request = this.componentInstanceServiceNg2 .updateInstanceProperties(this.component, this.selectedInstanceData.uniqueId, changedProperties); diff --git a/catalog-ui/src/app/ng2/pages/properties-assignment/property-creator/property-creator.component.ts b/catalog-ui/src/app/ng2/pages/properties-assignment/property-creator/property-creator.component.ts index d5946d2e4a..7d76904539 100644 --- a/catalog-ui/src/app/ng2/pages/properties-assignment/property-creator/property-creator.component.ts +++ b/catalog-ui/src/app/ng2/pages/properties-assignment/property-creator/property-creator.component.ts @@ -46,7 +46,8 @@ export class PropertyCreatorComponent { let nonPrimitiveTypesValues = _.map(nonPrimitiveTypes, (type: string) => new DropdownValue(type, type.replace("org.openecomp.datatypes.heat.","")) - ); + ) + .sort((a, b) => a.label.localeCompare(b.label)); this.typesProperties = _.concat(this.typesProperties,nonPrimitiveTypesValues); this.typesSchemaProperties = _.concat(typesSimpleProperties,nonPrimitiveTypesValues); this.typesProperties.unshift(new DropdownValue('','Select Type...')); diff --git a/catalog-ui/src/app/ng2/pages/service-consumption-editor/service-consumption-editor.component.html b/catalog-ui/src/app/ng2/pages/service-consumption-editor/service-consumption-editor.component.html index 5d42fa7694..e77d880176 100644 --- a/catalog-ui/src/app/ng2/pages/service-consumption-editor/service-consumption-editor.component.html +++ b/catalog-ui/src/app/ng2/pages/service-consumption-editor/service-consumption-editor.component.html @@ -52,6 +52,7 @@ *ngIf="consumptionInput.isSimpleType && (consumptionInput.source === SOURCE_TYPES.STATIC || consumptionInput.source === '')" data-tests-id="inputValue" [(value)]="consumptionInput.value" + [constraints]="consumptionInput.constraints" (elementChanged)="onChange($event.value, $event.isValid, consumptionInput)" [type]="consumptionInput.type"> </dynamic-element> |