Catalog alignment

Issue-ID: SDC-2724
Signed-off-by: ys9693 <ys9693@att.com>
Change-Id: I52b4aacb58cbd432ca0e1ff7ff1f7dd52099c6fe

6 files changed, 42 insertions, 50 deletions

diff --git a/catalog-ui/src/app/ng2/pages/automated-upgrade/automated-upgrade-models/ui-component-to-upgrade.ts b/catalog-ui/src/app/ng2/pages/automated-upgrade/automated-upgrade-models/ui-component-to-upgrade.ts
index 97fb71e210..17e5ea7ef1 100644
--- a/catalog-ui/src/app/ng2/pages/automated-upgrade/automated-upgrade-models/ui-component-to-upgrade.ts
+++ b/catalog-ui/src/app/ng2/pages/automated-upgrade/automated-upgrade-models/ui-component-to-upgrade.ts
@@ -21,7 +21,7 @@ export class ServiceContainerToUpgradeUiObject extends UiBaseObject {
         this.icon = componentToUpgrade.icon;
         this.version = componentToUpgrade.version;
         this.isAlreadyUpgrade = true;
-        this.isLock = componentToUpgrade.state === ComponentState.CERTIFICATION_IN_PROGRESS || componentToUpgrade.state === ComponentState.NOT_CERTIFIED_CHECKOUT;
+        this.isLock = componentToUpgrade.state === ComponentState.NOT_CERTIFIED_CHECKOUT;
         this.vspInstances = [];
     }
 
diff --git a/catalog-ui/src/app/ng2/pages/automated-upgrade/automated-upgrade-ui-components/upgrade-list-item-status/upgrade-list-status-item.component.html b/catalog-ui/src/app/ng2/pages/automated-upgrade/automated-upgrade-ui-components/upgrade-list-item-status/upgrade-list-status-item.component.html
index f77c3410a6..c1e9529869 100644
--- a/catalog-ui/src/app/ng2/pages/automated-upgrade/automated-upgrade-ui-components/upgrade-list-item-status/upgrade-list-status-item.component.html
+++ b/catalog-ui/src/app/ng2/pages/automated-upgrade/automated-upgrade-ui-components/upgrade-list-item-status/upgrade-list-status-item.component.html
@@ -13,7 +13,6 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
- 
 <div class="components-to-upgrade-list-item">
     <div class="component-to-upgrade-data">
         <div class="component-to-upgrade-icon small sprite-services-icons {{upgradedComponent.icon}}"></div>
diff --git a/catalog-ui/src/app/ng2/pages/automated-upgrade/automated-upgrade-ui-components/upgrade-list-item/upgrade-list-item.component.html b/catalog-ui/src/app/ng2/pages/automated-upgrade/automated-upgrade-ui-components/upgrade-list-item/upgrade-list-item.component.html
index b97e41444c..5c49735a81 100644
--- a/catalog-ui/src/app/ng2/pages/automated-upgrade/automated-upgrade-ui-components/upgrade-list-item/upgrade-list-item.component.html
+++ b/catalog-ui/src/app/ng2/pages/automated-upgrade/automated-upgrade-ui-components/upgrade-list-item/upgrade-list-item.component.html
@@ -13,8 +13,6 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
- 
- 
 <div class="components-to-upgrade-list-item ">
     <div class="component-to-upgrade-data">
         <sdc-checkbox class="component-to-upgrade-checkbox"
diff --git a/catalog-ui/src/app/ng2/pages/automated-upgrade/automated-upgrade.component.ts b/catalog-ui/src/app/ng2/pages/automated-upgrade/automated-upgrade.component.ts
index 9ae73497ef..613caa4b8d 100644
--- a/catalog-ui/src/app/ng2/pages/automated-upgrade/automated-upgrade.component.ts
+++ b/catalog-ui/src/app/ng2/pages/automated-upgrade/automated-upgrade.component.ts
@@ -29,8 +29,7 @@ import {AutomatedUpgradeService} from "./automated-upgrade.service";
 @Component({
     selector: 'upgrade-vsp',
     templateUrl: './automated-upgrade.component.html',
-    styleUrls: ['./automated-upgrade.component.less'],
-    providers: [TranslateService]
+    styleUrls: ['./automated-upgrade.component.less']
 })
 export class AutomatedUpgradeComponent {
 
diff --git a/catalog-ui/src/app/ng2/pages/automated-upgrade/automated-upgrade.module.ts b/catalog-ui/src/app/ng2/pages/automated-upgrade/automated-upgrade.module.ts
index 19f6412071..8a4e8fb660 100644
--- a/catalog-ui/src/app/ng2/pages/automated-upgrade/automated-upgrade.module.ts
+++ b/catalog-ui/src/app/ng2/pages/automated-upgrade/automated-upgrade.module.ts
@@ -2,16 +2,15 @@
  * Created by ob0695 on 4/18/2018.
  */
 import { NgModule } from "@angular/core";
-import {SdcUiComponentsModule} from "sdc-ui/lib/angular/index";
-import {CommonModule} from "@angular/common";
-import {AutomatedUpgradeStatusComponent} from "./automated-upgrade-status/automated-upgrade-status.component";
-import {AutomatedUpgradeComponent} from "./automated-upgrade.component";
-import {UpgradeListItemComponent} from "./automated-upgrade-ui-components/upgrade-list-item/upgrade-list-item.component";
-import {UpgradeListItemStatusComponent} from "./automated-upgrade-ui-components/upgrade-list-item-status/upgrade-list-status-item.component";
-import {TranslateService} from "../../shared/translator/translate.service";
-import {UpgradeListItemInnerContent} from "./automated-upgrade-ui-components/list-item-inner-content/list-item-inner-content.component";
-import {UpgradeLineItemComponent} from "./automated-upgrade-ui-components/upgrade-line-item/upgrade-line-item.component";
-import {UpgradeListItemOrderPipe} from "./automated-upgrade-ui-components/list-item-order-pipe/list-item-order-pipe";
+import { SdcUiComponentsModule } from "onap-ui-angular";
+import { CommonModule } from "@angular/common";
+import { AutomatedUpgradeStatusComponent } from "./automated-upgrade-status/automated-upgrade-status.component";
+import { AutomatedUpgradeComponent } from "./automated-upgrade.component";
+import { UpgradeListItemComponent } from "./automated-upgrade-ui-components/upgrade-list-item/upgrade-list-item.component";
+import { UpgradeListItemStatusComponent } from "./automated-upgrade-ui-components/upgrade-list-item-status/upgrade-list-status-item.component";
+import { UpgradeListItemInnerContent } from "./automated-upgrade-ui-components/list-item-inner-content/list-item-inner-content.component";
+import { UpgradeLineItemComponent } from "./automated-upgrade-ui-components/upgrade-line-item/upgrade-line-item.component";
+import { UpgradeListItemOrderPipe } from "./automated-upgrade-ui-components/list-item-order-pipe/list-item-order-pipe";
 
 @NgModule({
     declarations: [
@@ -27,8 +26,7 @@ import {UpgradeListItemOrderPipe} from "./automated-upgrade-ui-components/list-i
     exports: [],
     entryComponents: [
         AutomatedUpgradeComponent, AutomatedUpgradeStatusComponent
-    ],
-    providers: [TranslateService]
+    ]
 })
 export class AutomatedUpgradeModule {
 }   
\ No newline at end of file
diff --git a/catalog-ui/src/app/ng2/pages/automated-upgrade/automated-upgrade.service.ts b/catalog-ui/src/app/ng2/pages/automated-upgrade/automated-upgrade.service.ts
index 0acfececaa..14ca7f0947 100644
--- a/catalog-ui/src/app/ng2/pages/automated-upgrade/automated-upgrade.service.ts
+++ b/catalog-ui/src/app/ng2/pages/automated-upgrade/automated-upgrade.service.ts
@@ -1,19 +1,15 @@
-import {SdcUiComponents} from "sdc-ui/lib/angular";
-import {Injectable, Inject} from "@angular/core";
-import {IModalConfig} from "sdc-ui/lib/angular/modals/models/modal-config";
-import {AutomatedUpgradeComponent} from "./automated-upgrade.component";
-import {Component} from "../../../models/components/component";
-import {ComponentServiceNg2} from "../../services/component-services/component.service";
-import {GeneralStatus, ComponentType} from "../../../utils/constants";
-import {IDependenciesServerResponse} from "../../services/responses/dependencies-server-response";
-import {AutomatedUpgradeStatusComponent} from "./automated-upgrade-status/automated-upgrade-status.component";
-import {AutomatedUpgradeStatusResponse} from "../../services/responses/automated-upgrade-response";
+import { SdcUiComponents, SdcUiCommon, SdcUiServices } from "onap-ui-angular";
+import { Injectable, ComponentRef } from "@angular/core";
+import { AutomatedUpgradeComponent } from "./automated-upgrade.component";
+import { Component } from "../../../models/components/component";
+import { ComponentServiceNg2 } from "../../services/component-services/component.service";
+import { GeneralStatus, ComponentType } from "../../../utils/constants";
+import { IDependenciesServerResponse } from "../../services/responses/dependencies-server-response";
+import { AutomatedUpgradeStatusComponent } from "./automated-upgrade-status/automated-upgrade-status.component";
+import { AutomatedUpgradeStatusResponse } from "../../services/responses/automated-upgrade-response";
+import { TranslateService, ITranslateArgs } from "../../shared/translator/translate.service";
+import { ServiceContainerToUpgradeUiObject, AllottedResourceInstanceUiObject, VspInstanceUiObject } from "./automated-upgrade-models/ui-component-to-upgrade";
 import Dictionary = _.Dictionary;
-import {TranslateService, ITranslateArgs} from "../../shared/translator/translate.service";
-import {
-    ServiceContainerToUpgradeUiObject,
-    AllottedResourceInstanceUiObject, VspInstanceUiObject
-} from "./automated-upgrade-models/ui-component-to-upgrade";
 
 export interface IAutomatedUpgradeRequestObj {
     serviceId:string;
@@ -30,8 +26,9 @@ export class AutomatedUpgradeService {
     private vspComponent:Component;
     private uiComponentsToUpgrade:Array<ServiceContainerToUpgradeUiObject>;
     private componentType:string;
+    private modalInstance: ComponentRef<SdcUiComponents.ModalComponent>;
 
-    constructor(private modalService:SdcUiComponents.ModalService,
+    constructor(private modalService:SdcUiServices.ModalService,
                 private componentService:ComponentServiceNg2,
                 private translateService:TranslateService) {
     }
@@ -69,21 +66,21 @@ export class AutomatedUpgradeService {
     }
 
     private disabledAllModalButtons = ():void => {
-        this.modalService.getCurrentInstance().innerModalContent.instance.disabled = true;
-        this.modalService.getCurrentInstance().buttons[0].show_spinner = true;
-        this.modalService.getCurrentInstance().buttons[1].disabled = true;
+        this.modalInstance.instance.innerModalContent.instance.disabled = true;
+        this.modalInstance.instance.buttons[0].show_spinner = true;
+        this.modalInstance.instance.buttons[1].disabled = true;
     }
 
     public changeUpgradeButtonState = (isDisabled:boolean):void => {
-        if (this.modalService.getCurrentInstance().buttons[0].disabled !== isDisabled) {
-            this.modalService.getCurrentInstance().buttons[0].disabled = isDisabled;
+        if (this.modalInstance.instance.buttons[0].disabled !== isDisabled) {
+            this.modalInstance.instance.buttons[0].disabled = isDisabled;
         }
     }
 
     //TODO We will need to replace this function after sdc-ui modal new design, this is just a workaround
     public automatedUpgrade = ():void => {
 
-        let selectedServices = this.modalService.getCurrentInstance().innerModalContent.instance.selectedComponentsToUpgrade;
+        let selectedServices = this.modalInstance.instance.innerModalContent.instance.selectedComponentsToUpgrade;
         this.disabledAllModalButtons();
         this.componentService.automatedUpgrade(this.vspComponent.componentType, this.vspComponent.uniqueId, this.convertToServerRequest(selectedServices)).subscribe((automatedUpgradeStatus:any) => {
 
@@ -105,11 +102,11 @@ export class AutomatedUpgradeService {
                 });
 
                 let statusModalTitle = this.getTextByComponentType("_UPGRADE_STATUS_TITLE");
-                this.modalService.getCurrentInstance().setTitle(statusModalTitle);
-                this.modalService.getCurrentInstance().getButtons().splice(0, 1); // Remove the upgrade button
-                this.modalService.getCurrentInstance().buttons[0].disabled = false; // enable close again
-                this.modalService.getCurrentInstance().innerModalContent.destroy();
-                this.modalService.createInnnerComponent(AutomatedUpgradeStatusComponent, {
+                this.modalInstance.instance.setTitle(statusModalTitle);
+                this.modalInstance.instance.getButtons().splice(0, 1); // Remove the upgrade button
+                this.modalInstance.instance.buttons[0].disabled = false; // enable close again
+                this.modalInstance.instance.innerModalContent.destroy();
+                this.modalService.createInnnerComponent(this.modalInstance, AutomatedUpgradeStatusComponent, {
                     upgradedComponentsList: upgradedComponent,
                     upgradeStatusMap: statusMap,
                     statusText: this.getStatusText(statusMap)
@@ -250,10 +247,10 @@ export class AutomatedUpgradeService {
         let modalTitle = this.getTextByComponentType("_UPGRADE_TITLE");
         let certificationText = isAfterCertification ? this.getTextByComponentType("_CERTIFICATION_STATUS_TEXT", {resourceName: this.vspComponent.name}) : undefined;
 
-        let upgradeVspModalConfig:IModalConfig = {
+        let upgradeVspModalConfig = {
             title: modalTitle,
             size: "md",
-            type: "custom",
+            type: SdcUiCommon.ModalType.custom,
             testId: "upgradeVspModal",
             buttons: [
                 {
@@ -266,10 +263,11 @@ export class AutomatedUpgradeService {
 
                 },
                 {text: 'CLOSE', size: 'sm', closeModal: true, type: 'secondary'}
-            ]
-        };
+            ] as SdcUiCommon.IModalButtonComponent[]
+        } as SdcUiCommon.IModalConfig;
 
-        this.modalService.openCustomModal(upgradeVspModalConfig, AutomatedUpgradeComponent, {
+        this.modalInstance = this.modalService.openModal(upgradeVspModalConfig);
+        this.modalService.createInnnerComponent(this.modalInstance, AutomatedUpgradeComponent, {
             componentsToUpgrade: this.uiComponentsToUpgrade,
             informationText: informationalText,
             certificationStatusText: certificationText