Final commit to master merge from

Change-Id: Ib464f9a8828437c86fe6def8af238aaf83473507
Issue-ID: SDC-714
Signed-off-by: Tal Gitelman <tg851x@intl.att.com>

19 files changed, 0 insertions, 641 deletions

diff --git a/catalog-ui/src/app/ng2/components/dynamic-element/dynamic-element.component.less b/catalog-ui/src/app/ng2/components/dynamic-element/dynamic-element.component.less
deleted file mode 100644
index e219d49aa4..0000000000
--- a/catalog-ui/src/app/ng2/components/dynamic-element/dynamic-element.component.less
+++ /dev/null
@@ -1,3 +0,0 @@
-dynamic-element {
-
-}
diff --git a/catalog-ui/src/app/ng2/components/dynamic-element/dynamic-element.component.ts b/catalog-ui/src/app/ng2/components/dynamic-element/dynamic-element.component.ts
deleted file mode 100644
index 246258e44f..0000000000
--- a/catalog-ui/src/app/ng2/components/dynamic-element/dynamic-element.component.ts
+++ /dev/null
@@ -1,145 +0,0 @@
-/*-
- * ============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, Compiler, EventEmitter, ViewContainerRef, ViewChild, Input, Output, ElementRef, ComponentRef, ComponentFactory, ComponentFactoryResolver } from '@angular/core'
-import { UiElementCheckBoxComponent } from './elements-ui/checkbox/ui-element-checkbox.component';
-import { UiElementDropDownComponent, DropdownValue } from './elements-ui/dropdown/ui-element-dropdown.component';
-import { UiElementInputComponent } from './elements-ui/input/ui-element-input.component';
-import {UiElementPopoverInputComponent} from "./elements-ui/popover-input/ui-element-popover-input.component";
-import {ValidationConfiguration} from "app/models";
-import {UiElementIntegerInputComponent} from "./elements-ui/integer-input/ui-element-integer-input.component";
-
-@Component({
-    selector: 'dynamic-element',
-    template: `<div #target></div>`,
-    styleUrls: ['./dynamic-element.component.less'],
-    entryComponents: [
-        UiElementInputComponent,
-        UiElementDropDownComponent,
-        UiElementCheckBoxComponent,
-        UiElementPopoverInputComponent,
-        UiElementIntegerInputComponent
-    ]
-})
-export class DynamicElementComponent {
-
-    @ViewChild('target', { read: ViewContainerRef }) target: any;
-    @Input() type: any;
-    @Input() name: string;
-    @Input() readonly:boolean;
-    @Input() path:string;//optional param. used only for for subnetpoolid type
-    value:any;
-
-    // Two way binding for value (need to write the "Change" word like this)
-    @Output('valueChange') emitter: EventEmitter<string> = new EventEmitter<any>();
-    @Input('value') set setValueValue(value) {
-        this.value = value;
-    }
-
-    cmpRef: ComponentRef<any>;
-    private isViewInitialized: boolean = false;
-    validation = ValidationConfiguration.validation;
-
-    constructor(
-        private componentFactoryResolver: ComponentFactoryResolver,
-        private compiler: Compiler,
-        private el: ElementRef) {
-    }
-
-    updateComponent() {
-        if (!this.isViewInitialized) {
-            return;
-        }
-        if (this.cmpRef) {
-            this.cmpRef.destroy();
-        }
-
-        // Factory to create component based on type or peroperty name.
-        switch(this.type) {
-            case 'list':
-            case 'integer':
-                this.createComponent(UiElementIntegerInputComponent);
-                this.cmpRef.instance.pattern = this.validation.validationPatterns.integer;
-                break;
-            case 'string':
-                if (this.path && this.path.toUpperCase().indexOf("SUBNETPOOLID") !== -1) {
-                    if(this.name.toUpperCase().indexOf("SUBNETPOOLID") == -1){//if it's an item of subnetpoolid list get the parent name
-                        let pathArray = this.path.split("#");
-                        this.name = pathArray[pathArray.length - 2];
-                    }
-                    this.createComponent(UiElementPopoverInputComponent);
-                }
-                else {
-                    this.createComponent(UiElementInputComponent);
-                }
-                break;
-            case 'boolean':
-                //this.createComponent(UiElementCheckBoxComponent);
-
-                this.createComponent(UiElementDropDownComponent);
-
-                // Build drop down values
-                let tmp = [];
-                tmp.push(new DropdownValue('true','TRUE'));
-                tmp.push(new DropdownValue('false','FALSE'));
-                this.cmpRef.instance.values = tmp;
-                break;
-            default:
-                this.createComponent(UiElementInputComponent);
-                console.log("ERROR: No ui component to handle type: " + this.type);
-        }
-
-        // Additional attributes in base element class
-        if (this.cmpRef) {
-            this.cmpRef.instance.name = this.name;
-            this.cmpRef.instance.type = this.type;
-            this.cmpRef.instance.value = this.value;
-            this.cmpRef.instance.readonly = this.readonly;
-        }
-
-        // Subscribe to change event of of ui-element-basic and fire event to change the value
-        this.cmpRef.instance.baseEmitter.subscribe((value):void => {
-            this.emitter.emit(value)
-        });
-
-    }
-
-    createComponent(ComponentToCreate:any):void {
-        let factory = this.componentFactoryResolver.resolveComponentFactory(ComponentToCreate);
-        this.cmpRef = this.target.createComponent(factory);
-    }
-
-    ngOnChanges() {
-        this.updateComponent();
-    }
-
-    ngAfterContentInit() {
-        //console.log("DynamicElementComponent: ngAfterContentInit: type: " + this.type + " value: " + this.value);
-        this.isViewInitialized = true;
-        this.updateComponent();
-    }
-
-    ngOnDestroy() {
-        if (this.cmpRef) {
-            this.cmpRef.destroy();
-        }
-    }
-
-}
diff --git a/catalog-ui/src/app/ng2/components/dynamic-element/dynamic-element.module.ts b/catalog-ui/src/app/ng2/components/dynamic-element/dynamic-element.module.ts
deleted file mode 100644
index b57020a1d0..0000000000
--- a/catalog-ui/src/app/ng2/components/dynamic-element/dynamic-element.module.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-/*-
- * ============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 { NgModule } from "@angular/core";
-import { UiElementCheckBoxComponent } from './elements-ui/checkbox/ui-element-checkbox.component';
-import { UiElementDropDownComponent } from './elements-ui/dropdown/ui-element-dropdown.component';
-import { UiElementInputComponent } from './elements-ui/input/ui-element-input.component';
-import { DynamicElementComponent } from "app/ng2/components/dynamic-element/dynamic-element.component";
-import { BrowserModule } from '@angular/platform-browser'
-import { FormsModule, ReactiveFormsModule } from '@angular/forms'
-import { UiElementPopoverInputComponent } from "./elements-ui/popover-input/ui-element-popover-input.component";
-import {PopoverModule} from "../popover/popover.module";
-import {TooltipModule} from "../tooltip/tooltip.module";
-import {UiElementIntegerInputComponent} from "./elements-ui/integer-input/ui-element-integer-input.component";
-
-@NgModule({
-    declarations: [
-        DynamicElementComponent,
-        UiElementInputComponent,
-        UiElementCheckBoxComponent,
-        UiElementDropDownComponent,
-        UiElementPopoverInputComponent,
-        UiElementIntegerInputComponent
-    ],
-    imports: [
-        BrowserModule,
-        FormsModule,
-        PopoverModule,
-        ReactiveFormsModule,
-        TooltipModule
-    ],
-    exports: [
-        DynamicElementComponent
-    ],
-    providers: []
-})
-export class DynamicElementModule {
-
-}
diff --git a/catalog-ui/src/app/ng2/components/dynamic-element/elements-ui/checkbox/ui-element-checkbox.component.html b/catalog-ui/src/app/ng2/components/dynamic-element/elements-ui/checkbox/ui-element-checkbox.component.html
deleted file mode 100644
index a3e28c5f0b..0000000000
--- a/catalog-ui/src/app/ng2/components/dynamic-element/elements-ui/checkbox/ui-element-checkbox.component.html
+++ /dev/null
@@ -1 +0,0 @@
-<input #{{name}}  [(ngModel)]="value" type="checkbox" (change)="onSave(value)" [ngClass]="{'disabled':readonly}"/>
diff --git a/catalog-ui/src/app/ng2/components/dynamic-element/elements-ui/checkbox/ui-element-checkbox.component.less b/catalog-ui/src/app/ng2/components/dynamic-element/elements-ui/checkbox/ui-element-checkbox.component.less
deleted file mode 100644
index bed097fe5e..0000000000
--- a/catalog-ui/src/app/ng2/components/dynamic-element/elements-ui/checkbox/ui-element-checkbox.component.less
+++ /dev/null
@@ -1,2 +0,0 @@
-/deep/ ui-element-checkbox {
-}
diff --git a/catalog-ui/src/app/ng2/components/dynamic-element/elements-ui/checkbox/ui-element-checkbox.component.ts b/catalog-ui/src/app/ng2/components/dynamic-element/elements-ui/checkbox/ui-element-checkbox.component.ts
deleted file mode 100644
index f73afd42c7..0000000000
--- a/catalog-ui/src/app/ng2/components/dynamic-element/elements-ui/checkbox/ui-element-checkbox.component.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-/*-
- * ============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, ViewChild, ElementRef, ContentChildren, Input } from '@angular/core';
-import { BrowserModule } from '@angular/platform-browser'
-import { UiElementBase, UiElementBaseInterface } from './../ui-element-base.component';
-
-@Component({
-  selector: 'ui-element-checkbox',
-  templateUrl: './ui-element-checkbox.component.html',
-  styleUrls: ['./ui-element-checkbox.component.less'],
-})
-export class UiElementCheckBoxComponent extends UiElementBase implements UiElementBaseInterface {
-
-  constructor() {
-    super();
-  }
-
-  ngAfterContentInit() {
-    // Convert the value to boolean (instanceOf does not work, the type is undefined).
-    if (this.value==='true' || this.value==='false') {
-      this.value = this.value==='true'?true:false;
-    }
-  }
-
-    onSave() {
-        this.baseEmitter.emit(this.value);
-    }
-
-}
diff --git a/catalog-ui/src/app/ng2/components/dynamic-element/elements-ui/dropdown/ui-element-dropdown.component.html b/catalog-ui/src/app/ng2/components/dynamic-element/elements-ui/dropdown/ui-element-dropdown.component.html
deleted file mode 100644
index bfb927af71..0000000000
--- a/catalog-ui/src/app/ng2/components/dynamic-element/elements-ui/dropdown/ui-element-dropdown.component.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<select name='{{name}}' [(ngModel)]="value" #t (change)="onSave()"  [ngClass]="{'disabled':readonly}">
-  <option *ngFor="let ddvalue of values" [value]="ddvalue.value">{{ddvalue.label}}</option>
-</select>
diff --git a/catalog-ui/src/app/ng2/components/dynamic-element/elements-ui/dropdown/ui-element-dropdown.component.less b/catalog-ui/src/app/ng2/components/dynamic-element/elements-ui/dropdown/ui-element-dropdown.component.less
deleted file mode 100644
index ea3e35140e..0000000000
--- a/catalog-ui/src/app/ng2/components/dynamic-element/elements-ui/dropdown/ui-element-dropdown.component.less
+++ /dev/null
@@ -1,11 +0,0 @@
-@import '../../../../../../assets/styles/variables';
-
-/deep/ ui-element-dropdown {
-
-    select {
-        text-indent: 6px;
-        border: solid 1px @main_color_o;
-        width: 100%;
-    }
-
-}
diff --git a/catalog-ui/src/app/ng2/components/dynamic-element/elements-ui/dropdown/ui-element-dropdown.component.ts b/catalog-ui/src/app/ng2/components/dynamic-element/elements-ui/dropdown/ui-element-dropdown.component.ts
deleted file mode 100644
index 970c61531f..0000000000
--- a/catalog-ui/src/app/ng2/components/dynamic-element/elements-ui/dropdown/ui-element-dropdown.component.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-/*-
- * ============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, EventEmitter, Output, Input } from '@angular/core'
-import { BrowserModule } from '@angular/platform-browser'
-import { UiElementBase, UiElementBaseInterface } from './../ui-element-base.component';
-
-export class DropdownValue {
-  value:string;
-  label:string;
-
-  constructor(value:string,label:string) {
-    this.value = value;
-    this.label = label;
-  }
-}
-
-@Component({
-  selector: 'ui-element-dropdown',
-  templateUrl: './ui-element-dropdown.component.html',
-  styleUrls: ['./ui-element-dropdown.component.less'],
-})
-export class UiElementDropDownComponent extends UiElementBase implements UiElementBaseInterface {
-  @Input()
-  values: DropdownValue[];
-
-  constructor() {
-    super();
-  }
-
-    onSave() {
-        this.baseEmitter.emit(JSON.parse(this.value));
-    }
-
-}
diff --git a/catalog-ui/src/app/ng2/components/dynamic-element/elements-ui/input/ui-element-input.component.html b/catalog-ui/src/app/ng2/components/dynamic-element/elements-ui/input/ui-element-input.component.html
deleted file mode 100644
index 814ebfd28b..0000000000
--- a/catalog-ui/src/app/ng2/components/dynamic-element/elements-ui/input/ui-element-input.component.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<input
-    class="value-input"
-    [ngClass]="{'error': control.invalid}"
-    type="text"
-    [name]="name"
-    [(ngModel)]="value"
-    (change)="onSave()"
-    [attr.maxlength]="validation.propertyValue.max"
-    [attr.minlength]="validation.propertyValue.min"
-    [pattern]="pattern"
-    [formControl]="control"
-    tooltip="{{value}}"
-    [readonly]="readonly"
-    [ngClass]="{'disabled':readonly}"
-    />
diff --git a/catalog-ui/src/app/ng2/components/dynamic-element/elements-ui/input/ui-element-input.component.less b/catalog-ui/src/app/ng2/components/dynamic-element/elements-ui/input/ui-element-input.component.less
deleted file mode 100644
index d320c7ff8b..0000000000
--- a/catalog-ui/src/app/ng2/components/dynamic-element/elements-ui/input/ui-element-input.component.less
+++ /dev/null
@@ -1,17 +0,0 @@
-@import '../../../../../../assets/styles/variables';
-
-/deep/ ui-element-input {
-
-    input {
-        text-indent: 6px;
-        border: solid 1px @main_color_o;
-    }
-
-    .error {
-        border: solid 1px @func_color_q;
-        color: @func_color_q;
-        outline: none;
-        box-sizing: border-box;
-    }
-
-}
diff --git a/catalog-ui/src/app/ng2/components/dynamic-element/elements-ui/input/ui-element-input.component.ts b/catalog-ui/src/app/ng2/components/dynamic-element/elements-ui/input/ui-element-input.component.ts
deleted file mode 100644
index fb3b3db859..0000000000
--- a/catalog-ui/src/app/ng2/components/dynamic-element/elements-ui/input/ui-element-input.component.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-/*-
- * ============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, ViewChild, ElementRef, ContentChildren, Input} from '@angular/core';
-import { BrowserModule } from '@angular/platform-browser'
-import { UiElementBase, UiElementBaseInterface } from './../ui-element-base.component';
-
-@Component({
-    selector: 'ui-element-input',
-    templateUrl: './ui-element-input.component.html',
-    styleUrls: ['./ui-element-input.component.less'],
-})
-export class UiElementInputComponent extends UiElementBase implements UiElementBaseInterface {
-    constructor() {
-        super();
-        this.pattern = this.validation.validationPatterns.comment;
-    }
-
-    onSave() {
-        if (!this.control.invalid){
-            this.baseEmitter.emit(this.value);
-        }
-    }
-}
diff --git a/catalog-ui/src/app/ng2/components/dynamic-element/elements-ui/integer-input/ui-element-integer-input.component.html b/catalog-ui/src/app/ng2/components/dynamic-element/elements-ui/integer-input/ui-element-integer-input.component.html
deleted file mode 100644
index e5518d453f..0000000000
--- a/catalog-ui/src/app/ng2/components/dynamic-element/elements-ui/integer-input/ui-element-integer-input.component.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<input
-    class="value-input"
-    [ngClass]="{'error': control.invalid}"
-    type="text"
-    [name]="name"
-    [(ngModel)]="value"
-    (change)="onSave()"
-    [attr.maxlength]="validation.propertyValue.max"
-    [attr.minlength]="validation.propertyValue.min"
-    [pattern]="pattern"
-    [formControl]="control"
-    tooltip="{{value}}"
-    [readonly]="readonly"
-    [ngClass]="{'disabled':readonly}"
-/>
diff --git a/catalog-ui/src/app/ng2/components/dynamic-element/elements-ui/integer-input/ui-element-integer-input.component.less b/catalog-ui/src/app/ng2/components/dynamic-element/elements-ui/integer-input/ui-element-integer-input.component.less
deleted file mode 100644
index 8073c3858e..0000000000
--- a/catalog-ui/src/app/ng2/components/dynamic-element/elements-ui/integer-input/ui-element-integer-input.component.less
+++ /dev/null
@@ -1,17 +0,0 @@
-@import '../../../../../../assets/styles/variables';
-
-/deep/ ui-element-integer-input {
-
-    input {
-        text-indent: 6px;
-        border: solid 1px @main_color_o;
-    }
-
-    .error {
-        border: solid 1px @func_color_q;
-        color: @func_color_q;
-        outline: none;
-        box-sizing: border-box;
-    }
-
-}
diff --git a/catalog-ui/src/app/ng2/components/dynamic-element/elements-ui/integer-input/ui-element-integer-input.component.ts b/catalog-ui/src/app/ng2/components/dynamic-element/elements-ui/integer-input/ui-element-integer-input.component.ts
deleted file mode 100644
index 3339b605ca..0000000000
--- a/catalog-ui/src/app/ng2/components/dynamic-element/elements-ui/integer-input/ui-element-integer-input.component.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-/*-
- * ============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, ViewChild, ElementRef, ContentChildren, Input} from '@angular/core';
-import { BrowserModule } from '@angular/platform-browser'
-import { UiElementBase, UiElementBaseInterface } from './../ui-element-base.component';
-
-@Component({
-    selector: 'ui-element-integer-input',
-    templateUrl: './ui-element-integer-input.component.html',
-    styleUrls: ['./ui-element-integer-input.component.less'],
-})
-export class UiElementIntegerInputComponent extends UiElementBase implements UiElementBaseInterface {
-    constructor() {
-        super();
-        this.pattern = this.validation.validationPatterns.comment;
-    }
-
-    onSave() {
-        if (!this.control.invalid){
-            this.baseEmitter.emit(this.value ? JSON.parse(this.value) : this.value);
-        }
-    }
-}
diff --git a/catalog-ui/src/app/ng2/components/dynamic-element/elements-ui/popover-input/ui-element-popover-input.component.html b/catalog-ui/src/app/ng2/components/dynamic-element/elements-ui/popover-input/ui-element-popover-input.component.html
deleted file mode 100644
index 3bd51b4e36..0000000000
--- a/catalog-ui/src/app/ng2/components/dynamic-element/elements-ui/popover-input/ui-element-popover-input.component.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<div class="popover-input-wrapper" tooltip="{{value}}">
-    <input
-        class="value-input"
-        type="text"
-        [ngClass]="{'error': control.invalid}"
-        [name]="name"
-        [value]="value!=undefined?value:''"
-        disabled
-        />
-    <button [popover]="popoverForm"  [ngClass]="{'disabled':readonly}">Edit</button>
-</div>
-
-<popover-content #popoverForm [title]="name" [buttons]="buttonsArray" [placement]="'top'" [closeOnClickOutside]="true">
-    <div class="edit-subnet-wrapper">
-        <textarea   rows="5"
-                    #textArea
-                    class="subnet-value"
-                    [ngClass]="{'error': control.invalid}"
-                    [(ngModel)]="value"
-                    [attr.maxlength]="validation.propertyValue.max"
-                    [attr.minlength]="validation.propertyValue.min"
-                    [pattern]="pattern"
-                    [formControl]="control"
-                  ></textarea>
-    </div>
-</popover-content>
diff --git a/catalog-ui/src/app/ng2/components/dynamic-element/elements-ui/popover-input/ui-element-popover-input.component.less b/catalog-ui/src/app/ng2/components/dynamic-element/elements-ui/popover-input/ui-element-popover-input.component.less
deleted file mode 100644
index 5be443f7b6..0000000000
--- a/catalog-ui/src/app/ng2/components/dynamic-element/elements-ui/popover-input/ui-element-popover-input.component.less
+++ /dev/null
@@ -1,36 +0,0 @@
-@import '../../../../../../assets/styles/variables';
-
-.popover-input-wrapper {
-    display: flex;
-}
-
-/deep/ ui-element-popover-input {
-
-    .popover {
-        max-width: 350px;
-        width: 350px;
-    }
-
-    .edit-subnet-wrapper {
-        padding: 12px;
-
-        .subnet-value {
-            width: 100%;
-            resize: none;
-        }
-    }
-
-    input {
-        padding-right: 6px;
-        padding-left: 6px;
-        border: solid 1px @main_color_o;
-    }
-
-    .error {
-        border: solid 1px @func_color_q;
-        color: @func_color_q;
-        outline: none;
-        box-sizing: border-box;
-    }
-
-}
diff --git a/catalog-ui/src/app/ng2/components/dynamic-element/elements-ui/popover-input/ui-element-popover-input.component.ts b/catalog-ui/src/app/ng2/components/dynamic-element/elements-ui/popover-input/ui-element-popover-input.component.ts
deleted file mode 100644
index 67eb8822b4..0000000000
--- a/catalog-ui/src/app/ng2/components/dynamic-element/elements-ui/popover-input/ui-element-popover-input.component.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-/*-
- * ============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, ViewChild, ElementRef, Input} from '@angular/core';
-import {UiElementBase, UiElementBaseInterface} from "../ui-element-base.component";
-import {ButtonsModelMap, ButtonModel} from "app/models";
-import { PopoverContentComponent } from "app/ng2/components/popover/popover-content.component"
-import { PopoverComponent } from "app/ng2/components/popover/popover.component"
-
-@Component({
-    selector: 'ui-element-popover-input',
-    templateUrl: './ui-element-popover-input.component.html',
-    styleUrls: ['./ui-element-popover-input.component.less']
-})
-export class UiElementPopoverInputComponent extends UiElementBase implements UiElementBaseInterface {
-    @ViewChild('textArea') textArea: ElementRef;
-    @ViewChild('popoverForm') popoverContentComponent: PopoverContentComponent;
-
-    saveButton: ButtonModel;
-    buttonsArray: ButtonsModelMap;
-
-    onSave = ():void => {
-        if (!this.control.invalid){
-            this.baseEmitter.emit(this.value);
-            this.popoverContentComponent.hide();
-        }
-    }
-
-    constructor() {
-        super();
-        // Create Save button and insert to buttons map
-        this.saveButton = new ButtonModel('save', 'blue', this.onSave);
-        this.buttonsArray = { 'test': this.saveButton };
-
-        // Define the regex pattern for this controller
-        this.pattern = this.validation.validationPatterns.comment;
-
-        // Disable / Enable button according to validation
-        //this.control.valueChanges.subscribe(data => this.saveButton.disabled = this.control.invalid);
-    }
-}
diff --git a/catalog-ui/src/app/ng2/components/dynamic-element/elements-ui/ui-element-base.component.ts b/catalog-ui/src/app/ng2/components/dynamic-element/elements-ui/ui-element-base.component.ts
deleted file mode 100644
index 4bc35e814a..0000000000
--- a/catalog-ui/src/app/ng2/components/dynamic-element/elements-ui/ui-element-base.component.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-/*-
- * ============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, EventEmitter, Input, Output } from '@angular/core'
-import { ValidationConfiguration } from "app/models";
-import { FormControl, Validators } from '@angular/forms';
-
-export interface UiElementBaseInterface {
-    onSave();
-}
-
-@Component({
-    template: ``,
-    styles: []
-})
-export class UiElementBase {
-
-    protected validation = ValidationConfiguration.validation;
-    protected control: FormControl;
-
-    // Two way binding for value (need to write the "Change" word like this)
-    @Output('valueChange') baseEmitter: EventEmitter<string> = new EventEmitter<any>();
-    @Input('value') set setValueValue(value) {
-        this.value = value;
-    }
-
-    protected name: string;
-    protected type: string;
-    protected value: any;
-    protected pattern: any;
-    protected readonly:boolean;
-
-    constructor() {
-        //this.control = new FormControl('', [Validators.required]);
-        this.control = new FormControl('', []);
-    }
-
-}