Final commit to master merge from

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

3 files changed, 0 insertions, 168 deletions

diff --git a/catalog-ui/src/app/ng2/components/filter-properties-assignment/filter-properties-assignment.component.html b/catalog-ui/src/app/ng2/components/filter-properties-assignment/filter-properties-assignment.component.html
deleted file mode 100644
index 4d2b91f3b4..0000000000
--- a/catalog-ui/src/app/ng2/components/filter-properties-assignment/filter-properties-assignment.component.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<popover-content #filterPopover [title]="'Filters'" [buttons]="footerButtons" placement="bottom-right" [hideArrow]="true">
-    <!--<form [formGroup]="filterForm">-->
-    <form>
-        <div class="field">
-            <label>Resource Type</label>
-            <div>
-                <checkbox [label]="'All'" [(checked)]="allSelected" (checkedChange)="selectAll()"></checkbox>
-            </div>
-            <div *ngFor="let type of typesOptions">
-                <checkbox [label]="type" [(checked)]="selectedTypes[type]" (checkedChange)="onTypeSelected(type)"></checkbox>
-            </div>
-        </div>
-        <div class="field">
-            <label>Property Name</label>
-            <input class="i-sdc-form-input"
-                   name="propertyName"
-                   [(ngModel)]="filterData.propertyName"
-                   placeholder="Type here"
-                   required
-            />
-        </div>
-    </form>
-</popover-content>
-<div class="open-filter-button" [popover]="filterPopover" [ngClass]="{'open':showPopover}" (onShown)="showPopover = true" (onHidden)="showPopover = false">
-    <div class="sprite-new filter-icon"></div>
-</div>
diff --git a/catalog-ui/src/app/ng2/components/filter-properties-assignment/filter-properties-assignment.component.less b/catalog-ui/src/app/ng2/components/filter-properties-assignment/filter-properties-assignment.component.less
deleted file mode 100644
index 07f38d3011..0000000000
--- a/catalog-ui/src/app/ng2/components/filter-properties-assignment/filter-properties-assignment.component.less
+++ /dev/null
@@ -1,45 +0,0 @@
-@import '../../../../assets/styles/variables';
-form{
-    margin: 0 20px;
-    .field{
-        padding:20px 0;
-        &:not(:last-child){
-            border-bottom: solid 1px @main_color_o;
-        }
-        input{
-            &::-webkit-input-placeholder { font-style: italic; } /* Safari, Chrome and Opera */
-            &:-moz-placeholder { font-style: italic; } /* Firefox 18- */
-            &::-moz-placeholder { font-style: italic; } /* Firefox 19+ */
-            &:-ms-input-placeholder { font-style: italic; } /* IE 10+ */
-            &:-ms-input-placeholder { font-style: italic; } /* Edge */
-        }
-    }
-    /deep/ [ng-reflect-checked="true"]{
-        /deep/ .checkbox-label-content{
-            color: @main_color_a;
-        }
-    }
-}
-
-.open-filter-button{
-    cursor: pointer;
-    width: 32px;
-    height: 34px;
-    margin-left:5px;
-
-    &.open{
-        z-index: 1061;
-        background-color: @main_color_p;
-        border: solid 1px @main_color_c;
-        border-bottom: none;
-    }
-    .filter-icon{
-        top: 8px;
-        right: 2px;
-        position: relative;
-    }
-}
-
-/deep/ .popover{
-    border: solid 1px @main_color_c !important;
-}
diff --git a/catalog-ui/src/app/ng2/components/filter-properties-assignment/filter-properties-assignment.component.ts b/catalog-ui/src/app/ng2/components/filter-properties-assignment/filter-properties-assignment.component.ts
deleted file mode 100644
index c43c30db21..0000000000
--- a/catalog-ui/src/app/ng2/components/filter-properties-assignment/filter-properties-assignment.component.ts
+++ /dev/null
@@ -1,97 +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=========================================================
- */
-
-/**
- * Created by rc2122 on 5/16/2017.
- */
-import {Component, Input, Output, EventEmitter, ViewChild} from '@angular/core';
-import {ButtonModel, ButtonsModelMap, FilterPropertiesAssignmentData} from "app/models";
-import {PopoverComponent} from "../popover/popover.component";
-import * as sdcConfig from "../../../../../configurations/dev"
-
-@Component({
-    selector: 'filter-properties-assignment',
-    templateUrl: './filter-properties-assignment.component.html',
-    styleUrls: ['./filter-properties-assignment.component.less']
-})
-
-export class FilterPropertiesAssignmentComponent {
-    @Input() componentType: string;
-    @Output() searchProperties: EventEmitter<FilterPropertiesAssignmentData> = new EventEmitter<FilterPropertiesAssignmentData>();
-    footerButtons:ButtonsModelMap = {};
-    typesOptions:Array<string>;//All optional types
-    selectedTypes:Object = {};
-    allSelected:boolean = false;//if all option selected
-    filterData:FilterPropertiesAssignmentData = new FilterPropertiesAssignmentData();
-    @ViewChild('filterPopover') filterPopover: PopoverComponent;
-
-    ngOnInit() {
-        this.footerButtons['Apply'] = new ButtonModel('Apply', 'blue', this.search, this.someTypesSelectedAndThereIsPropertyName);
-        this.footerButtons['Close'] = new ButtonModel('Close', 'grey', this.close);
-        this.componentType = this.componentType.toLocaleLowerCase();
-        this.typesOptions = sdcConfig.resourceTypesFilter[this.componentType];
-    }
-
-    selectAll = () => {
-        _.forEach(this.typesOptions, (type) => {
-            this.selectedTypes[type] = this.allSelected;
-        });
-    }
-
-    onTypeSelected = (type:string) => {
-        if(!this.selectedTypes[type]){
-            this.allSelected = false;//unselected 'All'
-        }
-    };
-
-    search = () => {
-        console.log('search props');
-        this.filterData.selectedTypes = [];
-        _.forEach(sdcConfig.resourceTypesFilter[this.componentType], (type) => {
-            if(this.selectedTypes[type]){
-                this.filterData.selectedTypes.push(type);
-            }
-        });
-        this.searchProperties.emit(this.filterData);
-        this.filterPopover.hide();
-    }
-
-    close = () => {
-        this.filterPopover.hide();
-    }
-
-    someTypesSelectedAndThereIsPropertyName = ():boolean => {
-        if( _.find(Object.keys(this.selectedTypes),(key) => {
-            return this.selectedTypes[key];
-        }) && this.filterData.propertyName ){
-            return null
-        }
-        return true;
-    }
-
-    clearAll = ():void => {
-        this.filterData.propertyName = "";
-        _.forEach(this.selectedTypes,(value, key) => {
-            this.selectedTypes[key] = false;
-        });
-        this.allSelected = false;
-    }
-
-}