From 8e886ddc160f24ba5cd88f33dbaefb266a295a00 Mon Sep 17 00:00:00 2001
From: Westly Wright <westly.wright@gmail.com>
Date: Wed, 6 Sep 2017 10:34:58 -0700
Subject: [PATCH] Fix display issues on service links

also fixed rerender issue for form-network component when transisioning
to a new service from a service via the links
---
 .../consumed-service-link/template.hbs        | 30 +++++--------------
 .../container/form-networking/component.js    |  2 +-
 app/service/controller.js                     | 25 ++++++++++++++--
 app/service/template.hbs                      | 14 ++++-----
 app/services/all-services.js                  | 12 ++++----
 5 files changed, 45 insertions(+), 38 deletions(-)

diff --git a/app/components/consumed-service-link/template.hbs b/app/components/consumed-service-link/template.hbs
index a9eef1ba8..e29156b66 100644
--- a/app/components/consumed-service-link/template.hbs
+++ b/app/components/consumed-service-link/template.hbs
@@ -1,22 +1,8 @@
-{{~#link-to 'service' link.service.stackId link.service.id~}}
-  {{~#if (eq link.service.name link.name)~}}
-    {{t (if (eq link.service.stackId stackId) 'serviceLink.noAlias.sameStack' 'serviceLink.noAlias.differentStack')
-      stack=link.service.displayStack
-      service=link.service.displayName
-      alias=link.name
-    }}
-  {{~else~}}
-    {{~#if link.name~}}
-      {{t (if (eq link.service.stackId stackId) 'serviceLink.withAlias.sameStack' 'serviceLink.withAlias.differentStack')
-        stack=link.service.displayStack
-        service=link.service.displayName
-        alias=link.name
-      }}
-    {{~else~}}
-      {{t (if (eq link.service.stackId stackId) 'serviceLink.noAlias.sameStack' 'serviceLink.noAlias.differentStack')
-        stack=link.service.displayStack
-        service=link.service.displayName
-      }}
-    {{~/if~}}
-  {{~/if~}}
-{{/link-to}}
+{{#if link.service}}
+  {{#link-to 'service' link.service.accountId link.service.id}}{{link.name}}{{/link-to}}
+{{else}}
+  {{link.name}}
+{{/if}}
+{{#if link.alias}}
+  {{t 'generic.as'}} {{link.alias}}
+{{/if}}
\ No newline at end of file
diff --git a/app/components/container/form-networking/component.js b/app/components/container/form-networking/component.js
index 07c6e3c92..dd66c44cf 100644
--- a/app/components/container/form-networking/component.js
+++ b/app/components/container/form-networking/component.js
@@ -165,7 +165,7 @@ export default Ember.Component.extend(ManageLabels, ContainerChoices,{
       this.removeLabel(C.LABEL.HOSTNAME_OVERRIDE);
     }
 
-    if ( val !== 'custom' ) {
+    if ( val !== 'custom' && this.get('instance.hostname')) {
       this.set('instance.hostname', null);
     }
 
diff --git a/app/service/controller.js b/app/service/controller.js
index e2d70f496..90bf646eb 100644
--- a/app/service/controller.js
+++ b/app/service/controller.js
@@ -3,9 +3,10 @@ import Ember from 'ember';
 export default Ember.Controller.extend({
   application:        Ember.inject.controller(),
   projects:           Ember.inject.service(),
+  allServices:        Ember.inject.service(),
 
-  service:            Ember.computed.alias('model.service'),
-  rules:              Ember.computed.alias('service.lbConfig.portRules'),
+  service:            Ember.computed.oneWay('model.service'),
+  rules:              Ember.computed.oneWay('service.lbConfig.portRules'),
 
   sortBy:             'priority',
   fixedLaunchConfig:  null,
@@ -99,4 +100,24 @@ export default Ember.Controller.extend({
       this.transitionToRoute(transitionTo, service.get('id'));
     }
   },
+
+  serviceLinksNamed: Ember.computed('service.serviceLinks.[]', function() {
+    let as = this.get('allServices');
+
+    ( this.get('service.serviceLinks') || []).forEach((link) => {
+      if (link) {
+        let matching = as.matching(link.name, this.get('model.stack'));
+
+        if (matching) {
+          link.setProperties({
+            service: matching
+          })
+        }
+      }
+      return link;
+    });
+
+    return this.get('service.serviceLinks');
+
+  })
 });
diff --git a/app/service/template.hbs b/app/service/template.hbs
index f3c9db8f5..919c2b688 100644
--- a/app/service/template.hbs
+++ b/app/service/template.hbs
@@ -146,13 +146,13 @@
         expandAll=al.expandAll
         expand=(action expandFn)
       }}
-        {{service-log model=model.service}}
+        {{service-log model=service}}
       {{/accordion-list-item}}
 
       {{container/form-scheduling
         initialHostId=activeLaunchConfig.requestedHostId
         initialLabels=activeLaunchConfig.labels
-        isGlobal=model.service.isGlobalScale
+        isGlobal=service.isGlobalScale
         allHosts=model.hosts
         editing=false
         expandAll=al.expandAll
@@ -171,8 +171,8 @@
         expand=(action expandFn)
       }}
         <ul class="list-unstyled list-inline with-room">
-          {{#each service.serviceLinks as |link|}}
-            <li>{{consumed-service-link link=link stackId=service.stackId}}</li>
+          {{#each serviceLinksNamed as |link|}}
+            <li>{{consumed-service-link link=link stackId=service.stackId service=service}}</li>
           {{else}}
             <li class="text-muted text-center">{{t 'servicePage.linksTab.noData'}}</li>
           {{/each}}
@@ -182,7 +182,7 @@
 
     {{#if model.service.canUpgrade}}
       {{container/form-upgrade
-        service=model.service
+        service=service
         editing=false
         errors=upgradeErrors
         isUpgrade=isUpgrade
@@ -310,7 +310,7 @@
     {{#if service.canChangeNetworking}}
       {{container/form-networking
         editing=false
-        instance=model.service
+        instance=service
         initialLabels=activeLaunchConfig.labels
         expandAll=al.expandAll
         expandFn=expandFn
@@ -339,7 +339,7 @@
     {{#if service.isBalancer}}
       {{form-stickiness
         initialLabels=activeLaunchConfig.labels
-        service=model.service
+        service=service
         editing=false
         expandAll=al.expandAll
         expandFn=expandFn
diff --git a/app/services/all-services.js b/app/services/all-services.js
index aac5e61c5..a37a5464a 100644
--- a/app/services/all-services.js
+++ b/app/services/all-services.js
@@ -60,16 +60,16 @@ export default Ember.Service.extend({
     return this.get('_allServices').findBy('id',id);
   },
 
-  matching(serviceOrCombined, defaultStack) {
-    if ( defaultStack && typeof defaultStack === 'object' ) {
-      defaultStack = Ember.get(defaultStack,'name');
+  matching(serviceOrCombinedName, defaultStackObj) {
+    if ( defaultStackObj && typeof defaultStackObj === 'object' ) {
+      defaultStackObj = Ember.get(defaultStackObj,'name');
     }
 
     let combined;
-    if ( defaultStack && !serviceOrCombined.includes('/') ) {
-      combined = defaultStack + '/' + serviceOrCombined;
+    if ( defaultStackObj && !serviceOrCombinedName.includes('/') ) {
+      combined = defaultStackObj + '/' + serviceOrCombinedName;
     } else {
-      combined = serviceOrCombined;
+      combined = serviceOrCombinedName;
     }
 
     let match = this.get('list').findBy('combined', combined);