update the wiki so that it can be used to view / edit branches such a…

…s if working with the fabric profile git repo
hawtio · May 17, 2013 · 428fd59 · 428fd59
1 parent 170c387
commit 428fd59
Show file tree

Hide file tree

Showing 9 changed files with 44 additions and 30 deletions.
diff --git a/hawtio-web/src/main/webapp/app/dashboard/js/dashboardRepository.ts b/hawtio-web/src/main/webapp/app/dashboard/js/dashboardRepository.ts
@@ -123,11 +123,13 @@ module Dashboard {
     constructor(public git:Git.GitRepository) {
     }
 
+    public branch: string = null;
+
     public putDashboards(array:Dashboard[], commitMessage:string, fn) {
       angular.forEach(array, (dash) => {
         var path = this.getDashboardPath(dash);
         var contents = JSON.stringify(dash, null, "  ");
-        this.git.write(path, commitMessage, contents, fn);
+        this.git.write(this.branch, path, commitMessage, contents, fn);
       });
     }
 
@@ -153,13 +155,13 @@ module Dashboard {
       // TODO lets look in each team directory as well and combine the results...
       var path = this.getUserDashboardDirectory();
       var dashboards = [];
-      this.git.read(path, (details) => {
+      this.git.read(this.branch, path, (details) => {
         var files = details.children;
         // we now have all the files we need; lets read all their contents
         angular.forEach(files, (file, idx) => {
           var path = file.path;
           if (!file.directory && path.endsWith(".json")) {
-            this.git.read(path, (details) => {
+            this.git.read(this.branch, path, (details) => {
               // lets parse the contents
               var content = details.text;
               if (content) {
@@ -183,7 +185,7 @@ module Dashboard {
 
     public getDashboard(id:string, fn) {
       var path = this.getUserDashboardPath(id);
-      this.git.read(path, (details) => {
+      this.git.read(this.branch, path, (details) => {
         var dashboard = null;
         var content = details.text;
         if (content) {

diff --git a/hawtio-web/src/main/webapp/app/git/js/git.ts b/hawtio-web/src/main/webapp/app/git/js/git.ts
@@ -9,12 +9,12 @@ module Git {
      * Read the contents of a file or directory
      * with text or children being returned and a directory flag
      */
-    read(path:string, fn): void;
+    read(branch:string, path:string, fn): void;
 
     /**
      * Write the content of a file
      */
-    write(path:string, commitMessage:string, contents:string, fn): void;
+    write(branch:string, path:string, commitMessage:string, contents:string, fn): void;
 
     /**
      * Reverts to a specific version of the file
@@ -66,11 +66,11 @@ module Git {
     constructor(public mbean:string, public jolokia, public localStorage, public branch = "master") {
     }
 
-    public read(path:string, fn) {
-      this.jolokia.execute(this.mbean, "read", this.branch, path, onSuccess(fn));
+    public read(branch:string, path:string, fn) {
+      this.jolokia.execute(this.mbean, "read", branch, path, onSuccess(fn));
     }
 
-    public write(path:string, commitMessage:string, contents:string, fn) {
+    public write(branch:string, path:string, commitMessage:string, contents:string, fn) {
       var authorName = this.getUserName();
       var authorEmail = this.getUserEmail();
 

diff --git a/hawtio-web/src/main/webapp/app/wiki/js/camel.ts b/hawtio-web/src/main/webapp/app/wiki/js/camel.ts
@@ -3,6 +3,8 @@ module Wiki {
   export function CamelController($scope, $location, $routeParams, workspace:Workspace, wikiRepository:GitWikiRepository) {
     $scope.schema = _apacheCamelModel;
 
+    Wiki.initScope($scope, $routeParams, $location);
+
     var routeModel = _apacheCamelModel.definitions.route;
     routeModel["_id"] = "route";
 
@@ -102,7 +104,7 @@ module Wiki {
           if (text) {
             // lets save the file...
             var commitMessage = $scope.commitMessage || "Updated page " + $scope.pageId;
-            wikiRepository.putPage($scope.pageId, text, commitMessage, (status) => {
+            wikiRepository.putPage($scope.branch, $scope.pageId, text, commitMessage, (status) => {
               Wiki.onComplete(status);
               goToView();
               Core.$apply($scope);
@@ -285,7 +287,7 @@ module Wiki {
       ];
 
       if (Git.getGitMBean(workspace)) {
-        $scope.git = wikiRepository.getPage($scope.pageId, $scope.objectId, onResults);
+        $scope.git = wikiRepository.getPage($scope.branch, $scope.pageId, $scope.objectId, onResults);
       }
     }
 

diff --git a/hawtio-web/src/main/webapp/app/wiki/js/edit.ts b/hawtio-web/src/main/webapp/app/wiki/js/edit.ts
@@ -1,8 +1,7 @@
 module Wiki {
   export function EditController($scope, $location, $routeParams, fileExtensionTypeRegistry, wikiRepository:GitWikiRepository) {
 
-    $scope.pageId = Wiki.pageId($routeParams, $location);
-    $scope.objectId = $routeParams["objectId"];
+    Wiki.initScope($scope, $routeParams, $location);
     $scope.entity = {
       source: null
     };
@@ -30,7 +29,7 @@ module Wiki {
     };
 
     $scope.save = () => {
-      saveTo($scope.pageId);
+      saveTo($scope["pageId"]);
     };
 
     $scope.create = () => {
@@ -67,7 +66,7 @@ module Wiki {
       if (isCreate()) {
         updateSourceView();
       } else {
-        wikiRepository.getPage($scope.pageId, $scope.objectId, onFileContents);
+        wikiRepository.getPage($scope.branch, $scope.pageId, $scope.objectId, onFileContents);
       }
     }
 
@@ -91,7 +90,7 @@ module Wiki {
         if (form === "/") {
           onFormSchema(_jsonSchema);
         } else {
-          $scope.git = wikiRepository.getPage(form, $scope.objectId, (details) => {
+          $scope.git = wikiRepository.getPage($scope.branch, form, $scope.objectId, (details) => {
             onFormSchema(Wiki.parseJson(details.text));
           });
         }
@@ -123,7 +122,7 @@ module Wiki {
         contents = JSON.stringify($scope.formEntity, null, "  ");
       }
       //console.log("About to write contents '" + contents + "'");
-      wikiRepository.putPage(path, contents, commitMessage, (status) => {
+      wikiRepository.putPage($scope.branch, path, contents, commitMessage, (status) => {
         Wiki.onComplete(status);
         goToView();
         Core.$apply($scope);

diff --git a/hawtio-web/src/main/webapp/app/wiki/js/formTable.ts b/hawtio-web/src/main/webapp/app/wiki/js/formTable.ts
@@ -1,7 +1,7 @@
 module Wiki {
 
   export function FormTableController($scope, $location, $routeParams, workspace:Workspace, wikiRepository:GitWikiRepository) {
-    $scope.pageId = Wiki.pageId($routeParams, $location);
+    Wiki.initScope($scope, $routeParams, $location);
     $scope.columnDefs = [];
 
     $scope.viewLink = (row) => {
@@ -37,7 +37,7 @@ module Wiki {
 
     var form = $location.search()["form"];
     if (form) {
-      wikiRepository.getPage(form, $scope.objectId, onFormData);
+      wikiRepository.getPage($scope.branch, form, $scope.objectId, onFormData);
     }
 
     updateView();

diff --git a/hawtio-web/src/main/webapp/app/wiki/js/helpers.ts b/hawtio-web/src/main/webapp/app/wiki/js/helpers.ts
@@ -81,6 +81,16 @@ module Wiki {
   }
 
 
+  /**
+   * Extracts the pageId, branch, objectId from the route parameters
+   */
+  export function initScope($scope, $routeParams, $location) {
+    $scope.pageId = Wiki.pageId($routeParams, $location);
+    $scope.branch = $routeParams["branch"] || $location.search()["branch"];
+    $scope.objectId = $routeParams["objectId"];
+  }
+
+
   /**
    * Extracts the pageId from the route parameters
    */
@@ -98,6 +108,7 @@ module Wiki {
           }
         } else break;
       }
+      return pageId || "/";
     }
 
     // if no $routeParams variables lets figure it out from the $location

diff --git a/hawtio-web/src/main/webapp/app/wiki/js/view.ts b/hawtio-web/src/main/webapp/app/wiki/js/view.ts
@@ -1,9 +1,7 @@
 module Wiki {
 
   export function ViewController($scope, $location, $routeParams, workspace:Workspace, marked, fileExtensionTypeRegistry, wikiRepository:GitWikiRepository, $compile) {
-
-    $scope.pageId = Wiki.pageId($routeParams, $location);
-    $scope.objectId = $routeParams["objectId"];
+    Wiki.initScope($scope, $routeParams, $location);
 
     $scope.gridOptions = {
       data: 'children',
@@ -112,7 +110,7 @@ module Wiki {
         var baseObjectId = $routeParams["baseObjectId"];
         $scope.git = wikiRepository.diff($scope.objectId, baseObjectId, $scope.pageId, onFileDetails);
       } else {
-        $scope.git = wikiRepository.getPage($scope.pageId, $scope.objectId, onFileDetails);
+        $scope.git = wikiRepository.getPage($scope.branch, $scope.pageId, $scope.objectId, onFileDetails);
       }
     }
 
@@ -138,7 +136,7 @@ module Wiki {
           if (form === "/") {
             onFormSchema(_jsonSchema);
           } else {
-            $scope.git = wikiRepository.getPage(form, $scope.objectId, (details) => {
+            $scope.git = wikiRepository.getPage($scope.branch, form, $scope.objectId, (details) => {
               onFormSchema(Wiki.parseJson(details.text));
             });
           }
@@ -189,7 +187,7 @@ module Wiki {
         if (item) {
           var pageName = item.path;
           $scope.readMePath = pageName;
-          wikiRepository.getPage(pageName, $scope.objectId, (readmeDetails) => {
+          wikiRepository.getPage($scope.branch, pageName, $scope.objectId, (readmeDetails) => {
             viewContents(pageName, readmeDetails.text);
           });
         }

diff --git a/hawtio-web/src/main/webapp/app/wiki/js/wikiPlugin.ts b/hawtio-web/src/main/webapp/app/wiki/js/wikiPlugin.ts
@@ -11,6 +11,8 @@ module Wiki {
                     when('/wiki/diff/*page/:objectId/:baseObjectId', {templateUrl: 'app/wiki/html/viewPage.html'}).
                     when('/wiki/create/*page', {templateUrl: 'app/wiki/html/createPage.html'}).
                     when('/wiki/edit/*page', {templateUrl: 'app/wiki/html/editPage.html'}).
+                    when('/wiki/branch/:branch/view/*page', {templateUrl: 'app/wiki/html/viewPage.html'}).
+                    when('/wiki/branch/:branch/edit/*page', {templateUrl: 'app/wiki/html/editPage.html'}).
                     when('/wiki/history/*page', {templateUrl: 'app/wiki/html/history.html'});
           }).
           factory('wikiRepository',function (workspace:Workspace, jolokia, localStorage) {

diff --git a/hawtio-web/src/main/webapp/app/wiki/js/wikiRepository.ts b/hawtio-web/src/main/webapp/app/wiki/js/wikiRepository.ts
@@ -1,7 +1,7 @@
 module Wiki {
 
   export interface WikiRepository {
-    putPage(path:string, contents:string, commitMessage:string, fn): void;
+    putPage(branch:string, path:string, contents:string, commitMessage:string, fn): void;
 
     deletePage(path:string, fn): void;
   }
@@ -12,7 +12,7 @@ module Wiki {
     constructor(public factoryMethod:() => Git.GitRepository) {
     }
 
-    public getPage(path:string, objectId:string, fn) {
+    public getPage(branch:string, path:string, objectId:string, fn) {
       var git = this.git();
       path = path || "/";
       if (git) {
@@ -28,7 +28,7 @@ module Wiki {
           });
         } else {
           var fullPath = this.getPath(path);
-          git.read(fullPath, (details) => {
+          git.read(branch, fullPath, (details) => {
 
             // lets fix up any paths to be relative to the wiki
             var children = details.children;
@@ -68,9 +68,9 @@ module Wiki {
       return git;
     }
 
-    public putPage(path:string, contents:string, commitMessage:string, fn) {
+    public putPage(branch:string, path:string, contents:string, commitMessage:string, fn) {
       var fullPath = this.getPath(path);
-      this.git().write(fullPath, commitMessage, contents, fn);
+      this.git().write(branch, fullPath, commitMessage, contents, fn);
     }
 
     public revertTo(objectId:string, blobPath:string, commitMessage:string, fn) {