From 3c3c833897dbfc0e85feaf36086a505f990ecb76 Mon Sep 17 00:00:00 2001
From: Michael Lando <ml636r@att.com>
Date: Thu, 20 Jul 2017 01:29:49 +0300
Subject: [SDC] 1710 rebase + pom modifications

Change-Id: I1f9c0a5201576c7a6b124f6a786db12c1a8cd7c0
Signed-off-by: Michael Lando <ml636r@att.com>
---
 .../app/view-models/onboard-vendor/onboard-vendor-view-model.ts    | 7 +++++++
 .../src/app/view-models/onboard-vendor/onboard-vendor-view.html    | 6 +-----
 catalog-ui/src/app/view-models/workspace/workspace-view-model.ts   | 2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'catalog-ui/src/app/view-models')

diff --git a/catalog-ui/src/app/view-models/onboard-vendor/onboard-vendor-view-model.ts b/catalog-ui/src/app/view-models/onboard-vendor/onboard-vendor-view-model.ts
index 6d4e6d3c68..37b9b9db9c 100644
--- a/catalog-ui/src/app/view-models/onboard-vendor/onboard-vendor-view-model.ts
+++ b/catalog-ui/src/app/view-models/onboard-vendor/onboard-vendor-view-model.ts
@@ -48,6 +48,7 @@ export interface IOnboardVendorViewModelScope extends ng.IScope {
     topNavRootMenu:MenuItemGroup;
     user:IUserProperties;
     version:string;
+    isLoading: boolean;
 }
 
 export class OnboardVendorViewModel {
@@ -63,6 +64,12 @@ export class OnboardVendorViewModel {
                 private $q:ng.IQService,
                 private cacheService:CacheService) {
 
+        this.$scope.isLoading = true;
+
+        $.getScript("/onboarding/punch-outs_en.js", () => {
+            this.$scope.isLoading = false;
+        });
+
         this.$scope.vendorData = {
             breadcrumbs: {
                 selectedKeys: []
diff --git a/catalog-ui/src/app/view-models/onboard-vendor/onboard-vendor-view.html b/catalog-ui/src/app/view-models/onboard-vendor/onboard-vendor-view.html
index 734fb93daf..56a36863e1 100644
--- a/catalog-ui/src/app/view-models/onboard-vendor/onboard-vendor-view.html
+++ b/catalog-ui/src/app/view-models/onboard-vendor/onboard-vendor-view.html
@@ -1,10 +1,6 @@
 <div class="sdc-catalog-container">
 
-    <loader data-display="gui.isLoading"></loader>
-<!--
-    <ecomp-header menu-data="menuItems" version="{{version}}"></ecomp-header>
--->
-
+    <loader ng-init="isLoading=true" data-display="isLoading"></loader>
     <div class="w-sdc-main-container">
         <punch-out name="'onboarding/vendor'" data="vendorData"  user="user" on-event="onVendorEvent"></punch-out>
     </div>
diff --git a/catalog-ui/src/app/view-models/workspace/workspace-view-model.ts b/catalog-ui/src/app/view-models/workspace/workspace-view-model.ts
index ec8b04dbdb..f529e79fa7 100644
--- a/catalog-ui/src/app/view-models/workspace/workspace-view-model.ts
+++ b/catalog-ui/src/app/view-models/workspace/workspace-view-model.ts
@@ -636,7 +636,7 @@ export class WorkspaceViewModel {
         this.$scope.reload = (component:Component):void => {
             this.$state.go(this.$state.current.name,{id:component.uniqueId},{reload:true});
         };
-        
+
     };
 
     private initAfterScope = ():void => {
-- 
cgit 1.2.3-korg