[brooklyn-ui] branch master updated: minor tidies to ui - fix link, use display name if present

[heneveld]

This is an automated email from the ASF dual-hosted git repository.

heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-ui.git


The following commit(s) were added to refs/heads/master by this push:
     new 0a05328e minor tidies to ui - fix link, use display name if present
0a05328e is described below

commit 0a05328ed84fd9801acb7c513815261f3f3e1558
Author: Alex Heneveld <a...@cloudsoft.io>
AuthorDate: Thu Nov 10 09:35:13 2022 +0000

    minor tidies to ui - fix link, use display name if present
---
 ui-modules/catalog/app/views/bundle/type/type.template.html | 2 +-
 ui-modules/utils/quick-launch/quick-launch.js               | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ui-modules/catalog/app/views/bundle/type/type.template.html 
b/ui-modules/catalog/app/views/bundle/type/type.template.html
index e7e6909a..867581d8 100644
--- a/ui-modules/catalog/app/views/bundle/type/type.template.html
+++ b/ui-modules/catalog/app/views/bundle/type/type.template.html
@@ -83,7 +83,7 @@
                             <a ng-href="{{ composerUrl 
}}#!/yaml?{{typeFormat}}bundleSymbolicName={{type.containingBundle.split(':')[0]}}&bundleVersion={{type.containingBundle.split(':')[1]}}&typeSymbolicName={{type.symbolicName}}&typeVersion={{type.version}}">Using
 YAML editor</a>
                         </li>
                         <li role="menuitem" 
ng-if="type.supertypes.includes('org.apache.brooklyn.api.location.Location')">
-                            <a 
ng-href="brooklyn-ui-location-manager/#!/location?symbolicName={{type.symbolicName}}&version={{type.version}}">Using
 location manager</a>
+                            <a 
ng-href="/brooklyn-ui-location-manager/#!/location?symbolicName={{type.symbolicName}}&version={{type.version}}">Using
 location manager</a>
                         </li>
                     </ul>
                 </div>
diff --git a/ui-modules/utils/quick-launch/quick-launch.js 
b/ui-modules/utils/quick-launch/quick-launch.js
index 8f2b7bad..217acfc0 100644
--- a/ui-modules/utils/quick-launch/quick-launch.js
+++ b/ui-modules/utils/quick-launch/quick-launch.js
@@ -112,7 +112,9 @@ export function quickLaunchDirective() {
             
             // should never be null, so the placeholder in UI for model.name 
will never be used;
             // hence autofocus is disabled
-            name: get($scope.app, 'name') || get($scope.app, 'symbolicName', 
null),
+            // get display name if there is a template so we can collapse
+            // (still won't collapse if you change the name; ideally we'd 
overwrite the name of a single first child service in that case)
+            name: get($scope.app, 'displayName') || get($scope.app, 'name') || 
get($scope.app, 'symbolicName', null),
         };
         $scope.args = $scope.args || {};