diff --git a/app/components/service/includes/constraints.html b/app/components/service/includes/constraints.html index 6a880db95..3817f939d 100644 --- a/app/components/service/includes/constraints.html +++ b/app/components/service/includes/constraints.html @@ -1,4 +1,4 @@ -
+
diff --git a/app/components/service/includes/containerlabels.html b/app/components/service/includes/containerlabels.html index f41864357..78607b23d 100644 --- a/app/components/service/includes/containerlabels.html +++ b/app/components/service/includes/containerlabels.html @@ -1,4 +1,4 @@ -
+
diff --git a/app/components/service/includes/environmentvariables.html b/app/components/service/includes/environmentvariables.html index 6b0352e2e..4b594a8fb 100644 --- a/app/components/service/includes/environmentvariables.html +++ b/app/components/service/includes/environmentvariables.html @@ -1,4 +1,4 @@ -
+
diff --git a/app/components/service/includes/mounts.html b/app/components/service/includes/mounts.html index bdfddc8d7..0b3a41743 100644 --- a/app/components/service/includes/mounts.html +++ b/app/components/service/includes/mounts.html @@ -1,4 +1,4 @@ -
+
diff --git a/app/components/service/includes/networks.html b/app/components/service/includes/networks.html index f3c551ac4..309d4b40c 100644 --- a/app/components/service/includes/networks.html +++ b/app/components/service/includes/networks.html @@ -1,4 +1,4 @@ -
+
diff --git a/app/components/service/includes/resources.html b/app/components/service/includes/resources.html index f96b8dac4..12228cb2f 100644 --- a/app/components/service/includes/resources.html +++ b/app/components/service/includes/resources.html @@ -1,4 +1,4 @@ -
+
diff --git a/app/components/service/includes/restart.html b/app/components/service/includes/restart.html index 22fee2774..e25b0e0dc 100644 --- a/app/components/service/includes/restart.html +++ b/app/components/service/includes/restart.html @@ -1,4 +1,4 @@ -
+
diff --git a/app/components/service/includes/secrets.html b/app/components/service/includes/secrets.html index 2ca48e907..4a2d16572 100644 --- a/app/components/service/includes/secrets.html +++ b/app/components/service/includes/secrets.html @@ -1,4 +1,4 @@ -
+
diff --git a/app/components/service/includes/servicelabels.html b/app/components/service/includes/servicelabels.html index e8cd0aa1e..0857dbe30 100644 --- a/app/components/service/includes/servicelabels.html +++ b/app/components/service/includes/servicelabels.html @@ -1,4 +1,4 @@ -
+
diff --git a/app/components/service/includes/tasks.html b/app/components/service/includes/tasks.html index f90df4270..49a2845a8 100644 --- a/app/components/service/includes/tasks.html +++ b/app/components/service/includes/tasks.html @@ -1,4 +1,4 @@ -
+
@@ -57,9 +57,10 @@ -
+
+ diff --git a/app/components/service/includes/updateconfig.html b/app/components/service/includes/updateconfig.html index 2fe2d89d8..0a0b9180d 100644 --- a/app/components/service/includes/updateconfig.html +++ b/app/components/service/includes/updateconfig.html @@ -1,4 +1,4 @@ -
+
diff --git a/app/components/service/service.html b/app/components/service/service.html index e66b4f0b0..c854c8da1 100644 --- a/app/components/service/service.html +++ b/app/components/service/service.html @@ -111,7 +111,7 @@
  • Service labels
  • Secrets
  • Tasks
  • -
      +
    diff --git a/app/components/service/serviceController.js b/app/components/service/serviceController.js index 535c10d60..a69c2fb78 100644 --- a/app/components/service/serviceController.js +++ b/app/components/service/serviceController.js @@ -1,6 +1,6 @@ angular.module('service', []) -.controller('ServiceController', ['$q', '$scope', '$stateParams', '$state', '$location', '$anchorScroll', 'ServiceService', 'Secret', 'SecretHelper', 'Service', 'ServiceHelper', 'TaskService', 'NodeService', 'Notifications', 'Pagination', 'ModalService', 'ControllerDataPipeline', -function ($q, $scope, $stateParams, $state, $location, $anchorScroll, ServiceService, Secret, SecretHelper, Service, ServiceHelper, TaskService, NodeService, Notifications, Pagination, ModalService, ControllerDataPipeline) { +.controller('ServiceController', ['$q', '$scope', '$stateParams', '$state', '$location', '$timeout', '$anchorScroll', 'ServiceService', 'Secret', 'SecretHelper', 'Service', 'ServiceHelper', 'TaskService', 'NodeService', 'Notifications', 'Pagination', 'ModalService', 'ControllerDataPipeline', +function ($q, $scope, $stateParams, $state, $location, $timeout, $anchorScroll, ServiceService, Secret, SecretHelper, Service, ServiceHelper, TaskService, NodeService, Notifications, Pagination, ModalService, ControllerDataPipeline) { $scope.state = {}; $scope.state.pagination_count = Pagination.getPaginationCount('service_tasks'); @@ -37,7 +37,11 @@ function ($q, $scope, $stateParams, $state, $location, $anchorScroll, ServiceSer }; $scope.goToItem = function(hash) { - $anchorScroll(hash); + if ($location.hash() !== hash) { + $location.hash(hash); + } else { + $anchorScroll(); + } }; $scope.addEnvironmentVariable = function addEnvironmentVariable(service) { @@ -291,15 +295,22 @@ function ($q, $scope, $stateParams, $state, $location, $anchorScroll, ServiceSer .then(function success(data) { $scope.tasks = data.tasks; $scope.nodes = data.nodes; + $scope.secrets = data.secrets.map(function (secret) { return new SecretViewModel(secret); }); + + $timeout(function() { + $anchorScroll(); + }); + }) .catch(function error(err) { $scope.secrets = []; Notifications.error('Failure', err, 'Unable to retrieve service details'); }) .finally(function final() { + $('#loadingViewSpinner').hide(); }); }