4 files changed, 20 insertions, 16 deletions

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 2911164c4b..92a12c8305 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
@@ -162,7 +162,11 @@ export class TopologyTemplateService {
     }
 
     getComponentProperties(component: Component): Observable<ComponentGenericResponse> {
-        return this.getComponentDataByFieldsName(component.componentType, component.uniqueId, [COMPONENT_FIELDS.COMPONENT_PROPERTIES]);
+        return this.findAllComponentProperties(component.componentType, component.uniqueId);
+    }
+
+    findAllComponentProperties(componentType: string, componentUniqueId: string): Observable<ComponentGenericResponse> {
+        return this.getComponentDataByFieldsName(componentType, componentUniqueId, [COMPONENT_FIELDS.COMPONENT_PROPERTIES]);
     }
 
     getCapabilitiesAndRequirements(componentType: string, componentId: string): Observable<ComponentGenericResponse> {
diff --git a/catalog-ui/src/app/ng2/services/dynamic-component.service.ts b/catalog-ui/src/app/ng2/services/dynamic-component.service.ts
index 29dd1e9e09..d53032435a 100644
--- a/catalog-ui/src/app/ng2/services/dynamic-component.service.ts
+++ b/catalog-ui/src/app/ng2/services/dynamic-component.service.ts
@@ -12,17 +12,15 @@ export class DynamicComponentService {
     //Creates a component dynamically (aka during runtime). If a view container is not specified, it will append the new component to the app root. 
     //To subscribe to an event from invoking component: componentRef.instance.clicked.subscribe((m) => console.log(m.name));
     public createDynamicComponent<T>(componentType: Type<T>, viewContainerRef?:ViewContainerRef): ComponentRef<T> {
-
         viewContainerRef = viewContainerRef || this.getRootViewContainerRef();
         viewContainerRef.clear();
 
-        let factory: ComponentFactory<T> = this.componentFactoryResolver.resolveComponentFactory(componentType); //Ref: https://angular.io/guide/dynamic-component-loader
-        let componentRef: ComponentRef<T> = viewContainerRef.createComponent(factory);
-        return componentRef; 
+        const factory: ComponentFactory<T> = this.componentFactoryResolver.resolveComponentFactory(componentType); //Ref: https://angular.io/guide/dynamic-component-loader
+        return viewContainerRef.createComponent(factory);
     }
 
     
     private getRootViewContainerRef(): ViewContainerRef {
         return this.applicationRef.components[0].instance.viewContainerRef;
     }
-};
\ No newline at end of file
+};
diff --git a/catalog-ui/src/app/ng2/services/modal.service.ts b/catalog-ui/src/app/ng2/services/modal.service.ts
index 897571b5ee..27d679facb 100644
--- a/catalog-ui/src/app/ng2/services/modal.service.ts
+++ b/catalog-ui/src/app/ng2/services/modal.service.ts
@@ -110,6 +110,18 @@ export class ModalService {
         return modalInstance;
     }
 
+    public addDynamicContentToModalAndBindInputs = (modalInstance: ComponentRef<ModalComponent>, dynamicComponentType: Type<any>,
+                                                    dynamicComponentInput?: Object) => {
+
+        const dynamicContent = this.dynamicComponentService
+            .createDynamicComponent(dynamicComponentType, modalInstance.instance.dynamicContentContainer);
+        for (const key of Object.keys(dynamicComponentInput)) {
+            dynamicContent.instance[key] = dynamicComponentInput[key];
+        }
+        modalInstance.instance.dynamicContent = dynamicContent;
+        return modalInstance;
+    }
+
     public addDynamicTemplateToModal = (modalInstance: ComponentRef<ModalComponent>, templateRef: TemplateRef<void>) => {
         modalInstance.instance.dynamicContentContainer.clear();
         modalInstance.instance.dynamicContentContainer.createEmbeddedView(templateRef);
diff --git a/catalog-ui/src/app/ng2/services/properties.service.ts b/catalog-ui/src/app/ng2/services/properties.service.ts
index f6b77320df..c86d207915 100644
--- a/catalog-ui/src/app/ng2/services/properties.service.ts
+++ b/catalog-ui/src/app/ng2/services/properties.service.ts
@@ -25,8 +25,6 @@ import { PropertyFEModel, PropertyBEModel, PropertyDeclareAPIModel, DerivedFEPro
 @Injectable()
 export class PropertiesService {
 
-    checkedPropertyType: string;
-
     constructor() {
     }
 
@@ -83,13 +81,5 @@ export class PropertiesService {
         return selectedProps;
     }
 
-    setCheckedPropertyType(type: string){
-        this.checkedPropertyType = type;
-    }
-
-    getCheckedPropertyType(){
-        return this.checkedPropertyType;
-    }
-
 
 }