diff options
Diffstat (limited to 'catalog-ui/src/app/ng2')
5 files changed, 23 insertions, 24 deletions
diff --git a/catalog-ui/src/app/ng2/components/logic/service-dependencies/directive-option.ts b/catalog-ui/src/app/ng2/components/logic/service-dependencies/directive-option.ts deleted file mode 100644 index f2c4b1f895..0000000000 --- a/catalog-ui/src/app/ng2/components/logic/service-dependencies/directive-option.ts +++ /dev/null @@ -1,15 +0,0 @@ -export enum DirectivesEnum { - SELECT = 'select', - SELECTABLE = 'selectable', - SUBSTITUTE = 'substitute', - SUBSTITUTABLE = 'substitutable', -} - -export namespace DirectiveValue { - - export function values() { - return Object.keys(DirectivesEnum).filter( - (type) => isNaN(<any>type) && type !== 'values' - ); - } -} diff --git a/catalog-ui/src/app/ng2/components/logic/service-dependencies/service-dependencies.component.html b/catalog-ui/src/app/ng2/components/logic/service-dependencies/service-dependencies.component.html index c3d4817a39..ef5e29b049 100644 --- a/catalog-ui/src/app/ng2/components/logic/service-dependencies/service-dependencies.component.html +++ b/catalog-ui/src/app/ng2/components/logic/service-dependencies/service-dependencies.component.html @@ -4,7 +4,7 @@ <select name="singleSelect" id="singleSelect" ng-model="data.singleSelect" (change)='onOptionsSelected($event)'> <option>Select Directive</option> - <option *ngFor="let item of directiveValues.values()">{{item}}</option> + <option class="directives-options" *ngFor="let item of directiveOptions">{{item}}</option> </select> </div> diff --git a/catalog-ui/src/app/ng2/components/logic/service-dependencies/service-dependencies.component.less b/catalog-ui/src/app/ng2/components/logic/service-dependencies/service-dependencies.component.less index 00be76c8ca..9b1535864e 100644 --- a/catalog-ui/src/app/ng2/components/logic/service-dependencies/service-dependencies.component.less +++ b/catalog-ui/src/app/ng2/components/logic/service-dependencies/service-dependencies.component.less @@ -113,3 +113,8 @@ } } } + + +.directives-options { + text-transform: uppercase; +} diff --git a/catalog-ui/src/app/ng2/components/logic/service-dependencies/service-dependencies.component.ts b/catalog-ui/src/app/ng2/components/logic/service-dependencies/service-dependencies.component.ts index 90f82f8983..ff5207bb2c 100644 --- a/catalog-ui/src/app/ng2/components/logic/service-dependencies/service-dependencies.component.ts +++ b/catalog-ui/src/app/ng2/components/logic/service-dependencies/service-dependencies.component.ts @@ -29,7 +29,6 @@ import { TranslateService } from 'app/ng2/shared/translator/translate.service'; import { ComponentMetadata } from '../../../../models/component-metadata'; import { ServiceInstanceObject } from '../../../../models/service-instance-properties-and-interfaces'; import { TopologyTemplateService } from '../../../services/component-services/topology-template.service'; -import {DirectivesEnum, DirectiveValue} from "./directive-option"; export class ConstraintObject { servicePropertyName: string; @@ -129,6 +128,7 @@ export class ServiceDependenciesComponent { capabilities: string = 'capabilities'; properties: string = 'properties'; private componentInstancesConstraints: ConstraintObject[] = []; + directiveOptions: string[]; @Input() readonly: boolean; @Input() compositeService: ComponentMetadata; @@ -136,7 +136,7 @@ export class ServiceDependenciesComponent { @Input() selectedInstanceSiblings: ServiceInstanceObject[]; @Input() selectedInstanceConstraints: ConstraintObject[] = []; @Input() selectedInstanceProperties: PropertyBEModel[] = []; - @Input() directiveValues: any = DirectiveValue; + @Output() updateRulesListEvent: EventEmitter<ConstraintObject[]> = new EventEmitter<ConstraintObject[]>(); @Output() updateNodeFilterProperties: EventEmitter<ConstraintObject[]> = new EventEmitter<ConstraintObject[]>(); @Output() updateNodeFilterCapabilities: EventEmitter<ConstraintObject[]> = new EventEmitter<ConstraintObject[]>(); @Output() loadRulesListEvent:EventEmitter<any> = new EventEmitter(); @@ -146,6 +146,7 @@ export class ServiceDependenciesComponent { } ngOnInit() { + this.loadDirectives(); this.isLoading = false; this.operatorTypes = [ {label: '>', value: OPERATOR_TYPES.GREATER_THAN}, @@ -161,6 +162,12 @@ export class ServiceDependenciesComponent { }); } + loadDirectives() { + this.topologyTemplateService.getDirectiveList().subscribe((data: string[]) => { + this.directiveOptions = data; + }) + } + ngOnChanges(changes) { if (changes.currentServiceInstance) { this.currentServiceInstance = changes.currentServiceInstance.currentValue; @@ -239,12 +246,7 @@ export class ServiceDependenciesComponent { if (this.isDependent) { this.openUpdateDependencyModal().instance.open(); } - if (DirectivesEnum.SELECT == newDirectiveValue.toLowerCase() || - DirectivesEnum.SELECTABLE == newDirectiveValue.toLowerCase()) { - this.currentServiceInstance.markAsSelect(); - } else { - this.currentServiceInstance.markAsSubstitute(); - } + this.currentServiceInstance.setDirectiveValue(newDirectiveValue); } updateComponentInstance(isDependentOrigVal: boolean, rulesListOrig: ConstraintObject[]) { diff --git a/catalog-ui/src/app/ng2/services/component-services/topology-template.service.ts b/catalog-ui/src/app/ng2/services/component-services/topology-template.service.ts index a7c8022239..01b8ead595 100644 --- a/catalog-ui/src/app/ng2/services/component-services/topology-template.service.ts +++ b/catalog-ui/src/app/ng2/services/component-services/topology-template.service.ts @@ -63,6 +63,7 @@ import { ConstraintObject } from "../../components/logic/service-dependencies/se import { ComponentMetadata } from "../../../models/component-metadata"; import { PolicyInstance } from "../../../models/graph/zones/policy-instance"; import { PropertyBEModel } from "../../../models/properties-inputs/property-be-model"; +import {map} from "rxjs/operators"; /* we need to use this service from now, we will remove component.service when we finish remove the angular1. The service is duplicated since we can not use downgrades service with NGXS*/ @@ -529,4 +530,10 @@ export class TopologyTemplateService { deleteRequirement(component: Component, reqId: string): Observable<Requirement> { return this.http.delete<Requirement>(this.baseUrl + component.getTypeUrl() + component.uniqueId + '/requirements/' + reqId); } + + getDirectiveList(): Observable<string[]> { + return this.http.get<ListDirectiveResponse>(this.baseUrl + "directives") + .pipe(map(response => response.directives)); + } + } |