hide the .profile extension from the breadcrumbs in the wiki too #518

hawtio · Sep 12, 2013 · 4cdad58 · 4cdad58
1 parent 28bcafb
commit 4cdad58
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 8 deletions.
diff --git a/hawtio-web/src/main/webapp/app/wiki/js/helpers.ts b/hawtio-web/src/main/webapp/app/wiki/js/helpers.ts
@@ -218,6 +218,20 @@ module Wiki {
     return "";
   }
 
+  /**
+   * Returns the file name for the given name; we hide some extensions
+   */
+  export function hideFineNameExtensions(name) {
+    if (name) {
+      angular.forEach(Wiki.hideExtentions, (extension) => {
+        if (name.endsWith(extension)) {
+          name = name.substring(0, name.length - extension.length);
+        }
+      });
+    }
+    return name;
+  }
+
   export function fileIconHtml(row) {
     var css = null;
     var icon = null;

diff --git a/hawtio-web/src/main/webapp/app/wiki/js/navbar.ts b/hawtio-web/src/main/webapp/app/wiki/js/navbar.ts
@@ -66,9 +66,12 @@ module Wiki {
         }
       });
       // lets swizzle the last one or two to be formTable views if the last or 2nd to last
-
       var loc = $location.path();
       if ($scope.breadcrumbs.length) {
+        var last = $scope.breadcrumbs[$scope.breadcrumbs.length - 1];
+        // possibly trim any required file extensions
+        last.name = Wiki.hideFineNameExtensions(last.name);
+
         var swizzled = false;
         angular.forEach(Wiki.customViewLinks, (link) => {
           if (!swizzled && loc.startsWith(link)) {

diff --git a/hawtio-web/src/main/webapp/app/wiki/js/view.ts b/hawtio-web/src/main/webapp/app/wiki/js/view.ts
@@ -97,13 +97,7 @@ module Wiki {
     };
 
     $scope.fileName = (entity) => {
-      var name = entity.name;
-      angular.forEach(Wiki.hideExtentions, (extension) => {
-         if (name.endsWith(extension)) {
-           name = name.substring(0, name.length - extension.length);
-         }
-      });
-      return name;
+      return Wiki.hideFineNameExtensions(entity.name);
     };
 
     $scope.fileIconHtml = (entity) => {