diff --git a/src/app/instances/_instances.html b/src/app/instances/_instances.html index 2d57d7c..7ffeff6 100644 --- a/src/app/instances/_instances.html +++ b/src/app/instances/_instances.html @@ -4,7 +4,7 @@

Applications » {{ appName }} - ... + ...

@@ -21,16 +21,18 @@

- + + + +
No application called {{ appName }} was found.
-
+

No Instance

- No instance has been created so far.
- Or maybe this application does not exist. + No instance has been created so far.

@@ -57,7 +59,7 @@

This root instance has no child.
- +
@@ -66,17 +68,18 @@

-

+

-

+

{{ selectedInstance.name }}

- + Instance Path: {{ selectedInstance.path }}
Instance Status: {{ formatStatus( selectedInstance.status )}}
Component: {{ selectedInstance.component.name }} -
+
+
diff --git a/src/app/instances/includes/exported-variables.html b/src/app/instances/includes/exported-variables.html new file mode 100644 index 0000000..c528470 --- /dev/null +++ b/src/app/instances/includes/exported-variables.html @@ -0,0 +1,8 @@ + +

This instance exports the following variables.

+
    +
  • {{ key }}: {{ value }}
  • +
+ +
+Go back to the life cycle management. diff --git a/src/app/instances/includes/life-cycle.html b/src/app/instances/includes/life-cycle.html new file mode 100644 index 0000000..91639ab --- /dev/null +++ b/src/app/instances/includes/life-cycle.html @@ -0,0 +1,8 @@ + +
+ +
+Additional Information + diff --git a/src/app/instances/instances.controller.listing.js b/src/app/instances/instances.controller.listing.js index 4521a1b..6b07690 100644 --- a/src/app/instances/instances.controller.listing.js +++ b/src/app/instances/instances.controller.listing.js @@ -9,14 +9,14 @@ function instancesListingController(Restangular, $scope, rUtils, $routeParams, rShare, $window) { // Fields - $scope.noError = true; - $scope.invoked = false; + $scope.responseStatus = -1; $scope.appName = $routeParams.appName; $scope.searchFilter = ''; $scope.searchVisible = true; $scope.template = ''; $scope.askToDelete = false; $scope.orderingCriteria = 'instance.name'; + $scope.details = 'LIFECYCLE'; // Menu actions $scope.menuActions = [ @@ -59,6 +59,7 @@ $scope.createChildInstance = createChildInstance; $scope.replicateInstance = replicateInstance; $scope.deleteInstance = deleteInstance; + $scope.showDetailsSection = showDetailsSection; // Initial actions loadInstances(); @@ -67,14 +68,11 @@ function loadInstances() { Restangular.all('app/' + $scope.appName + '/children?all-children=true') .getList().then(function(instances) { + $scope.responseStatus = 0; $scope.rootNodes = rUtils.buildInstancesTree(instances); - $scope.error = false; - }, function() { - $scope.error = true; - }) - .finally(function() { - $scope.invoked = true; + }, function(response) { + $scope.responseStatus = response.status; }); } @@ -92,6 +90,10 @@ $scope.template = findTemplateUrl(instance.status, isRoot, parentNotDeployed); } + function showDetailsSection(section) { + $scope.details = section; + } + function hideInstance() { $scope.selectedInstance = null; rUtils.hideRightBlock();