Ensure both Wiki and Configuration can't be active at the same time

hawtio · Sep 16, 2013 · debb0b6 · debb0b6
1 parent d90ed10
commit debb0b6
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/hawtio-web/src/main/webapp/app/core/js/workspace.ts b/hawtio-web/src/main/webapp/app/core/js/workspace.ts
@@ -375,6 +375,19 @@ class Workspace {
     });
   }
 
+  private getStrippedPathName():String {
+    var pathName = Core.trimLeading((this.$location.path() || '/'), "#");
+    pathName = Core.trimLeading(pathName, "/");
+    return pathName;
+  }
+
+  public linkContains(...words:String[]):bool {
+    var pathName = this.getStrippedPathName();
+    return words.all((word) => {
+      return pathName.has(word);
+    });
+  }
+
   /**
    * Returns true if the given link is active. The link can omit the leading # or / if necessary.
    * The query parameters of the URL are ignored in the comparison.
@@ -384,8 +397,7 @@ class Workspace {
    */
   public isLinkActive(href:string):bool {
     // lets trim the leading slash
-    var pathName = Core.trimLeading((this.$location.path() || '/'), "#");
-    pathName = Core.trimLeading(pathName, "/");
+    var pathName = this.getStrippedPathName();
 
     var link = Core.trimLeading(href, "#");
     link = Core.trimLeading(link, "/");
@@ -401,6 +413,7 @@ class Workspace {
     }
   }
 
+
   /**
    * Returns true if the tab query parameter is active or the URL starts with the given path
    */

diff --git a/hawtio-web/src/main/webapp/app/fabric/js/fabricPlugin.ts b/hawtio-web/src/main/webapp/app/fabric/js/fabricPlugin.ts
@@ -69,7 +69,7 @@ module Fabric {
               href: () => {
                 return "#/wiki/branch/" + Fabric.activeVersion($location) + "/view/fabric/profiles";
               },
-              isActive: (workspace: Workspace) => workspace.isLinkActive("wiki")
+              isActive: (workspace: Workspace) => workspace.isLinkActive("wiki") && workspace.linkContains("fabric", "profiles")
             });
 
             helpRegistry.addDevDoc("fabric", 'app/fabric/doc/developer.md');

diff --git a/hawtio-web/src/main/webapp/app/wiki/js/wikiPlugin.ts b/hawtio-web/src/main/webapp/app/wiki/js/wikiPlugin.ts
@@ -63,7 +63,7 @@ module Wiki {
               title: "View and edit wiki pages",
               isValid: (workspace:Workspace) => Wiki.isWikiEnabled(workspace, jolokia, localStorage),
               href: () => "#/wiki/view",
-              isActive: (workspace:Workspace) => workspace.isLinkActive("/wiki")
+              isActive: (workspace:Workspace) => workspace.isLinkActive("/wiki") && !workspace.linkContains("fabric", "profiles")
             });
           });