Final commit to master merge from

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

2 files changed, 24 insertions, 38 deletions

diff --git a/catalog-ui/src/app/ng2/pipes/filterChildProperties.pipe.ts b/catalog-ui/src/app/ng2/pipes/filterChildProperties.pipe.ts
deleted file mode 100644
index 4520469594..0000000000
--- a/catalog-ui/src/app/ng2/pipes/filterChildProperties.pipe.ts
+++ /dev/null
@@ -1,38 +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 { Pipe, PipeTransform } from '@angular/core';
-import { DerivedFEProperty } from 'app/models';
-
-@Pipe({
-    name: 'filterChildProperties',
-})
-export class FilterChildPropertiesPipe implements PipeTransform {
-    public transform(childProperties: Array<DerivedFEProperty>, parentId: string) {
-        if (!parentId || !childProperties) return childProperties;
-
-        let validParents: Array<string> = [parentId];
-        while (parentId.lastIndexOf('#') > 0) {
-            parentId = parentId.substring(0, parentId.lastIndexOf('#'));
-            validParents.push(parentId);
-        }
-        return childProperties.filter(derivedProp => validParents.indexOf(derivedProp.parentName) > -1);
-    }
-}
diff --git a/catalog-ui/src/app/ng2/pipes/global-pipes.module.ts b/catalog-ui/src/app/ng2/pipes/global-pipes.module.ts
new file mode 100644
index 0000000000..1d81a1a4bf
--- /dev/null
+++ b/catalog-ui/src/app/ng2/pipes/global-pipes.module.ts
@@ -0,0 +1,24 @@
+import {ContentAfterLastDotPipe} from "./contentAfterLastDot.pipe";
+import {SearchFilterPipe} from "./searchFilter.pipe";
+import {KeysPipe} from "./keys.pipe";
+import {GroupByPipe} from "./groupBy.pipe";
+import {NgModule} from "@angular/core";
+
+@NgModule({
+    declarations: [
+        ContentAfterLastDotPipe,
+        GroupByPipe,
+        KeysPipe,
+        SearchFilterPipe
+        
+    ],
+    
+    exports: [
+        ContentAfterLastDotPipe,
+        GroupByPipe,
+        KeysPipe,
+        SearchFilterPipe
+    ]
+})
+
+export class GlobalPipesModule {}