1 files changed, 22 insertions, 17 deletions

diff --git a/catalog-ui/src/app/ng2/components/properties-table/properties-table.component.ts b/catalog-ui/src/app/ng2/components/properties-table/properties-table.component.ts
index 58214ca16b..afb7189348 100644
--- a/catalog-ui/src/app/ng2/components/properties-table/properties-table.component.ts
+++ b/catalog-ui/src/app/ng2/components/properties-table/properties-table.component.ts
@@ -1,5 +1,24 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
 import { Component, Input, Output, EventEmitter, SimpleChanges, ViewChild, ElementRef } from "@angular/core";
-import { trigger, state, style, transition, animate} from '@angular/core';
 import {PropertyFEModel, DerivedFEProperty, DerivedPropertyType, InstanceFePropertiesMap} from "app/models";
 import {PropertiesService} from "../../services/properties.service";
 import { DynamicElementComponent } from 'app/ng2/components/dynamic-element/dynamic-element.component';
@@ -8,12 +27,12 @@ import { KeysPipe } from 'app/ng2/pipes/keys.pipe';
 @Component({
     selector: 'properties-table',
     templateUrl: './properties-table.component.html',
-    styleUrls: ['./properties-table.component.less'],
-    animations: [trigger('fadeIn', [transition(':enter', [style({ opacity: '0' }), animate('.3s ease-out', style({ opacity: '1' }))]) ])]
+    styleUrls: ['./properties-table.component.less']
 })
 export class PropertiesTableComponent {
 
     @Input() fePropertiesMap: InstanceFePropertiesMap;
+    @Input() feInstanceNamesMap: Map<string, string>;
     @Input() selectedPropertyId: string;
     @Input() displayDeleteButton: boolean;
     @Input() propertyNameSearchText:string;
@@ -26,23 +45,10 @@ export class PropertiesTableComponent {
     @Output() updateCheckedPropertyCount: EventEmitter<boolean> = new EventEmitter<boolean>();
     //@Output() selectInstanceRow: EventEmitter<string> = new EventEmitter<string>();
 
-    feInstancesNames: Array<string>;
 
     constructor ( private propertiesService:PropertiesService ){
     }
 
-    /**
-     * Update feInstancesNames when fePropertiesMap: InstanceFePropertiesMap change (after getting response from server)
-     */
-    ngOnChanges(changes: SimpleChanges) {
-        if (changes['fePropertiesMap']) {
-            if (changes['fePropertiesMap'].currentValue) {
-                let keysPipe = new KeysPipe();
-                let fiteredArr = keysPipe.transform(changes['fePropertiesMap'].currentValue,[]);
-                this.feInstancesNames = fiteredArr;
-            }
-        }
-    }
 
     propValueChanged = (property) => {
         !property.isDeclared && this.valueChanged.emit(property);
@@ -65,7 +71,6 @@ export class PropertiesTableComponent {
     propertyChecked = (prop: PropertyFEModel, childPropName?: string) => {
         let isChecked: boolean = (!childPropName)? prop.isSelected : prop.flattenedChildren.find(prop => prop.propertiesName == childPropName).isSelected;
 
-        console.log(isChecked, childPropName, prop);
         if (!isChecked) {
             this.propertiesService.undoDisableRelatedProperties(prop, childPropName);
         } else {