Tidy up fabric:create page and related page transitions

hawtio · Aug 14, 2013 · 663063e · 663063e
1 parent 225d191
commit 663063e
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 14 deletions.
diff --git a/hawtio-web/src/main/webapp/app/fabric/js/createFabric.ts b/hawtio-web/src/main/webapp/app/fabric/js/createFabric.ts
@@ -1,6 +1,12 @@
 module Fabric {
 
-  export function CreateFabricController($scope, jolokia, $location) {
+  export function CreateFabricController($scope, jolokia, $location, workspace:Workspace) {
+
+    $scope.$on('$routeChangeSuccess', () => {
+      if (workspace.treeContainsDomainAndProperties(Fabric.jmxDomain, {type: "Fabric"})) {
+        $location.url("/fabric/view");
+      }
+    });
 
     $scope.schema = Fabric.createEnsembleOptions;
 
@@ -23,7 +29,7 @@ module Fabric {
         method: 'post',
         success: (response) => {
           notification('success', "Created fabric!");
-          $location.url("/fabric/overview");
+          $location.url("/fabric/view");
           Core.$apply($scope);
         },
         error: (response) => {

diff --git a/hawtio-web/src/main/webapp/app/fabric/js/navbar.ts b/hawtio-web/src/main/webapp/app/fabric/js/navbar.ts
@@ -10,29 +10,26 @@ module Fabric {
       return Core.createHref($location, "#/fabric/clusters/fabric/registry/clusters", ["cv", "cp", "pv"]);
     };
 
-    $scope.$on('jmxTreeUpdated', function () {
-      reloadData();
-    });
-
-    reloadData();
-
     function reloadData() {
       var containerId = null;
       Fabric.containerWebAppURL(jolokia, "org.fusesource.insight.insight-kibana3", containerId, onKibanaUrl, onKibanaUrl);
       Fabric.containerWebAppURL(jolokia, "drools-wb-distribution-wars", containerId, onDroolsUrl, onDroolsUrl);
       $scope.hasMetrics = workspace.treeContainsDomainAndProperties('org.elasticsearch', {service: 'restjmx'});
       $scope.canUpload = workspace.treeContainsDomainAndProperties('io.hawt.jmx', {type: 'UploadManager'});
-      var ensembleContainers = jolokia.getAttribute(Fabric.clusterManagerMBean, "EnsembleContainers");
-      if (!ensembleContainers || ensembleContainers.length == 0) {
-        $scope.hasFabric = false;
-      } else {
+      var ensembleContainers = jolokia.getAttribute(Fabric.clusterManagerMBean, "EnsembleContainers", {method: "GET"});
+      if (workspace.treeContainsDomainAndProperties(Fabric.jmxDomain, {type: "Fabric"})) {
         $scope.hasFabric = true;
+      } else {
+        $scope.hasFabric = false;
       }
       if (!$scope.hasFabric) {
         $location.url("/fabric/create");
       }
+
     }
 
+    reloadData();
+
     function onKibanaUrl(response) {
       var url = response ? response.value : null;
       console.log("========== onKibanaUrl: " + url);

diff --git a/hawtio-web/src/main/webapp/app/fabric/js/schemaConfigure.ts b/hawtio-web/src/main/webapp/app/fabric/js/schemaConfigure.ts
@@ -97,8 +97,10 @@ module Fabric {
     });
 
     configureResolverSchema();
-
-    Core.pathSet(Fabric.createEnsembleOptions, ['properties', 'password', 'password'], true);
+
+    Core.pathSet(Fabric.createEnsembleOptions, ["properties", "profiles", "type"], "hidden");
+    Core.pathSet(Fabric.createEnsembleOptions, ['properties', 'password', 'type'], "password");
+    Core.pathSet(Fabric.createEnsembleOptions, ['properties', 'zookeeperPassword', 'type'], "password");
     delete Fabric.createEnsembleOptions['properties']['users'];
 
     Fabric.createEnsembleOptions['tabs'] = {