[SDC] rebase 1710 code

Change-Id: I532ed68979fee7840ea8a5395e7e965b155fb9f9
Signed-off-by: Michael Lando <ml636r@att.com>

5 files changed, 11 insertions, 135 deletions

diff --git a/catalog-ui/src/app/models/components/component.ts b/catalog-ui/src/app/models/components/component.ts
index 0c47cc4cb2..9b2c942483 100644
--- a/catalog-ui/src/app/models/components/component.ts
+++ b/catalog-ui/src/app/models/components/component.ts
@@ -22,7 +22,7 @@
 
 import {AsdcComment, ArtifactModel, ArtifactGroupModel, IFileDownload, PropertyModel, PropertiesGroup, AttributeModel, AttributesGroup, ComponentInstance,
     InputModel, DisplayModule, Module, IValidate, RelationshipModel, IMainCategory, RequirementsGroup, CapabilitiesGroup, AdditionalInformationModel,
-    Resource, IAppMenu, Product, Service} from "../../models";
+    Resource, IAppMenu, Service} from "../../models";
 
 import {IComponentService} from "../../services/components/component-service";
 import {CommonUtils} from "../../utils/common-utils";
@@ -92,7 +92,6 @@ export interface IComponent {
 
     getComponentSubType():string;
     isAlreadyCertified():boolean;
-    isProduct():boolean;
     isService():boolean;
     isResource():boolean;
     isComplex():boolean;
@@ -797,10 +796,6 @@ export abstract class Component implements IComponent {
 
     //------------------------------------------ Help Functions ----------------------------------------------------------------//
 
-    public isProduct = ():boolean => {
-        return this instanceof Product;
-    };
-
     public isService = ():boolean => {
         return this instanceof Service;
     };
diff --git a/catalog-ui/src/app/models/components/displayComponent.ts b/catalog-ui/src/app/models/components/displayComponent.ts
index a5407e6d17..3a9cbfdaf3 100644
--- a/catalog-ui/src/app/models/components/displayComponent.ts
+++ b/catalog-ui/src/app/models/components/displayComponent.ts
@@ -97,9 +97,6 @@ export class LeftPaletteComponent {
             case ComponentType.SERVICE:
                 this.iconClass = "sprite-services-icons " + icon;
                 break;
-            case ComponentType.PRODUCT:
-                this.iconClass = "sprite-product-icons " + icon;
-                break;
             default:
                 this.iconClass = "sprite-resource-icons " + icon;
         }
diff --git a/catalog-ui/src/app/models/components/product.ts b/catalog-ui/src/app/models/components/product.ts
deleted file mode 100644
index dfb429b971..0000000000
--- a/catalog-ui/src/app/models/components/product.ts
+++ /dev/null
@@ -1,125 +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 obarda on 2/4/2016.
- */
-'use strict';
-import {Component} from "./component";
-import {IProductService} from "../../services/components/product-service";
-import {IGroup, ISubCategory, IMainCategory, ICategoryBase} from "../category";
-import {ComponentMetadata} from "../component-metadata";
-
-export class Product extends Component {
-
-    public contacts:Array<string>;
-    public componentService:IProductService;
-    public fullName:string;
-
-    constructor(componentService:IProductService, $q:ng.IQService, component?:Product) {
-        super(componentService, $q, component);
-
-        if (component) {
-            this.fullName = component.fullName;
-            this.filterTerm = this.name + ' ' + this.description + ' ' + (this.tags ? this.tags.toString() : '') + ' ' + this.version;
-            this.contacts = component.contacts;
-        }
-        this.componentService = componentService;
-        this.iconSprite = "sprite-product-icons";
-    }
-
-    public deleteGroup = (uniqueId:string):void => {
-        _.forEach(this.categories, (category:IMainCategory) => {
-            _.forEach(category.subcategories, (subcategory:ISubCategory) => {
-                subcategory.groupings = _.reject(subcategory.groupings, (group:IGroup) => {
-                    return group.uniqueId === uniqueId;
-                });
-                if (subcategory.groupings.length == 0) { // if there is no groups, delete the subcategory
-                    category.subcategories = _.reject(category.subcategories, (subcategoryObj:ISubCategory) => {
-                        return subcategoryObj.uniqueId === subcategory.uniqueId;
-                    });
-                    if (category.subcategories.length == 0) { // if there is no subcategory, delete the category
-                        this.categories = _.reject(this.categories, (categoryObj:IMainCategory) => {
-                            return categoryObj.uniqueId === category.uniqueId;
-                        });
-                    }
-                }
-            });
-        });
-    };
-
-    private getCategoryObjectById = (categoriesArray:Array<ICategoryBase>, categoryUniqueId:string):ICategoryBase => {
-        let categorySelected = _.find(categoriesArray, (category) => {
-            return category.uniqueId === categoryUniqueId;
-        });
-        return categorySelected;
-    };
-
-    public addGroup = (category:IMainCategory, subcategory:ISubCategory, group:IGroup):void => {
-        if (!this.categories) {
-            this.categories = new Array<IMainCategory>();
-        }
-        let existingCategory:IMainCategory = <IMainCategory>this.getCategoryObjectById(this.categories, category.uniqueId);
-        let newGroup = angular.copy(group);
-        newGroup.filterTerms = undefined;
-        newGroup.isDisabled = undefined;
-        if (!existingCategory) {
-            let newCategory:IMainCategory = angular.copy(category);
-            newCategory.filteredGroup = undefined;
-            newCategory.subcategories = [];
-            let newSubcategory:ISubCategory = angular.copy(subcategory);
-            newSubcategory.groupings = [];
-            newSubcategory.groupings.push(newGroup);
-            newCategory.subcategories.push(newSubcategory);
-            this.categories.push(newCategory);
-        }
-        else {
-            let existingSubcategory:ISubCategory = <ISubCategory> this.getCategoryObjectById(existingCategory.subcategories, subcategory.uniqueId);
-            if (!existingSubcategory) {
-                let newSubcategory:ISubCategory = angular.copy(subcategory);
-                newSubcategory.groupings = [];
-                newSubcategory.groupings.push(newGroup);
-                existingCategory.subcategories.push(newSubcategory);
-
-            } else {
-                let existingGroup:IGroup = <IGroup> this.getCategoryObjectById(existingSubcategory.groupings, group.uniqueId);
-                if (!existingGroup) {
-                    existingSubcategory.groupings.push(newGroup);
-                }
-            }
-        }
-    };
-
-    getTypeUrl():string {
-        return 'products/';
-    }
-
-    public setComponentMetadata(componentMetadata:ComponentMetadata) {
-        super.setComponentMetadata(componentMetadata);
-        this.setComponentDisplayData();
-    };
-
-    setComponentDisplayData():void {
-        this.filterTerm = this.name + ' ' + this.description + ' ' + (this.tags ? this.tags.toString() : '') + ' ' + this.version;
-        this.iconSprite = "sprite-product-icons";
-    }
-}
-
-
diff --git a/catalog-ui/src/app/models/components/resource.ts b/catalog-ui/src/app/models/components/resource.ts
index 9f7a123486..138b413028 100644
--- a/catalog-ui/src/app/models/components/resource.ts
+++ b/catalog-ui/src/app/models/components/resource.ts
@@ -41,6 +41,7 @@ export class Resource extends Component {
     public payloadData:string;
     public payloadName:string;
     public importedFile:FileUploadModel;
+    public resourceVendorModelNumber:string;
 
     // Onboarding parameters
     public csarUUID:string;
@@ -59,6 +60,7 @@ export class Resource extends Component {
             this.resourceType = component.resourceType;
             this.csarUUID = component.csarUUID;
             this.csarVersion = component.csarVersion;
+            this.resourceVendorModelNumber = component.resourceVendorModelNumber;
             this.filterTerm = this.name + ' ' + this.description + ' ' + (this.tags ? this.tags.toString() : '') + ' ' + this.version + ' ' + this.resourceType;
             if (component.categories && component.categories[0] && component.categories[0].subcategories && component.categories[0].subcategories[0]) {
                 component.mainCategory = component.categories[0].name;
@@ -80,6 +82,7 @@ export class Resource extends Component {
         this.csarUUID = componentMetadata.csarUUID;
         this.csarVersion = componentMetadata.csarVersion;
         this.derivedFrom = componentMetadata.derivedFrom;
+        this.resourceVendorModelNumber = componentMetadata.resourceVendorModelNumber;
         this.setComponentDisplayData();
     };
 
@@ -88,7 +91,7 @@ export class Resource extends Component {
     };
 
     public isComplex = ():boolean => {
-        return this.resourceType === ResourceType.VF;
+        return this.resourceType === ResourceType.VF || this.resourceType === ResourceType.PNF || this.resourceType === ResourceType.CVFC;
     };
 
     public isVl = ():boolean => {
diff --git a/catalog-ui/src/app/models/components/service.ts b/catalog-ui/src/app/models/components/service.ts
index fbe32519c3..90a38e895b 100644
--- a/catalog-ui/src/app/models/components/service.ts
+++ b/catalog-ui/src/app/models/components/service.ts
@@ -34,6 +34,8 @@ export class Service extends Component {
     public componentService:IServiceService;
     public ecompGeneratedNaming:boolean;
     public namingPolicy:string;
+    public serviceType:string;
+    public serviceRole:string;
 
     constructor(componentService:IServiceService, $q:ng.IQService, component?:Service) {
         super(componentService, $q, component);
@@ -43,6 +45,8 @@ export class Service extends Component {
             this.filterTerm = this.name + ' ' + this.description + ' ' + (this.tags ? this.tags.toString() : '') + ' ' + this.version;
             this.ecompGeneratedNaming = component.ecompGeneratedNaming;
             this.namingPolicy = component.namingPolicy;
+            this.serviceType = component.serviceType;
+            this.serviceRole = component.serviceRole;
             if (component.categories && component.categories[0]) {
                 this.mainCategory = component.categories[0].name;
                 this.selectedCategory = this.mainCategory;
@@ -155,6 +159,8 @@ export class Service extends Component {
         super.setComponentMetadata(componentMetadata);
         this.ecompGeneratedNaming = componentMetadata.ecompGeneratedNaming;
         this.namingPolicy = componentMetadata.namingPolicy;
+        this.serviceType = componentMetadata.serviceType;
+        this.serviceRole = componentMetadata.serviceRole;
         this.setComponentDisplayData();
     }