[sdc] update to the current code base

and support http

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

3 files changed, 14 insertions, 9 deletions

diff --git a/catalog-ui/src/app/view-models/workspace/tabs/activity-log/activity-log.ts b/catalog-ui/src/app/view-models/workspace/tabs/activity-log/activity-log.ts
index ed583dc4c0..f41364dbfd 100644
--- a/catalog-ui/src/app/view-models/workspace/tabs/activity-log/activity-log.ts
+++ b/catalog-ui/src/app/view-models/workspace/tabs/activity-log/activity-log.ts
@@ -88,11 +88,11 @@ export class ActivityLogViewModel {
 
     private initSortedTableScope = ():void => {
         this.$scope.tableHeadersList = [
-            {title: 'Date', property: 'logDate'},
-            {title: 'Action', property: 'logAction'},
-            {title: 'Comment', property: 'logComment'},
-            {title: 'Username', property: 'logUsername'},
-            {title: 'Status', property: 'logStatus'}
+            {title: 'Date', property: 'dateFormat'},
+            {title: 'Action', property: 'ACTION'},
+            {title: 'Comment', property: 'COMMENT'},
+            {title: 'Username', property: 'MODIFIER'},
+            {title: 'Status', property: 'STATUS'}
         ];
 
         this.$scope.sort = (sortBy:string):void => {
diff --git a/catalog-ui/src/app/view-models/workspace/tabs/composition/composition-view-model.ts b/catalog-ui/src/app/view-models/workspace/tabs/composition/composition-view-model.ts
index 670655ea4b..d0eefdfd11 100644
--- a/catalog-ui/src/app/view-models/workspace/tabs/composition/composition-view-model.ts
+++ b/catalog-ui/src/app/view-models/workspace/tabs/composition/composition-view-model.ts
@@ -20,7 +20,7 @@
 'use strict';
 import {Component, Product, ComponentInstance, IAppMenu} from "app/models";
 import {SharingService, CacheService, EventListenerService, LeftPaletteLoaderService} from "app/services";
-import {ModalsHandler, GRAPH_EVENTS, ComponentFactory, ChangeLifecycleStateHandler, MenuHandler} from "app/utils";
+import {ModalsHandler, GRAPH_EVENTS, ComponentFactory, ChangeLifecycleStateHandler, MenuHandler, EVENTS} from "app/utils";
 import {IWorkspaceViewModelScope} from "../../workspace-view-model";
 import {ComponentServiceNg2} from "app/ng2/services/component-services/component.service";
 import {ComponentGenericResponse} from "app/ng2/services/responses/component-generic-response";
@@ -240,7 +240,13 @@ export class CompositionViewModel {
             this.$scope.currentComponent = component;
             this.$scope.setComponent(this.$scope.currentComponent);
             this.$scope.updateSelectedComponent();
-        }
+        };
+
+        this.$scope.reload = (component:Component):void => {
+            this.$state.go(this.$state.current.name,{id:component.uniqueId},{reload:true});
+        };
+
+        this.eventListenerService.registerObserverCallback(EVENTS.ON_CHECKOUT, this.$scope.reload);
 
     }
 }
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 507181c98c..4300c33412 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
@@ -424,7 +424,6 @@ export class WorkspaceViewModel {
                             //when checking out a major(certified) version
                             this.components.unshift(component);
                         }
-                        this.EventListenerService.notifyObservers(EVENTS.ON_CHECKOUT, component);
                         // this.$state.go(this.$state.current.name, {
                         //     id: component.uniqueId,
                         //     type: component.componentType.toLowerCase(),
@@ -434,7 +433,7 @@ export class WorkspaceViewModel {
                         this.initChangeLifecycleStateButtons();
                         this.initVersionObject();
                         this.$scope.isLoading = false;
-
+                        this.EventListenerService.notifyObservers(EVENTS.ON_CHECKOUT, component);
                         this.Notification.success({
                             message: this.$filter('translate')("CHECKOUT_SUCCESS_MESSAGE_TEXT"),
                             title: this.$filter('translate')("CHECKOUT_SUCCESS_MESSAGE_TITLE")