diff --git a/src/app/frontend/deploy/deploy_state.js b/src/app/frontend/deploy/deploy_state.js index ca5defc3c8cb899d4734f79a80a8fa2437f3ee51..7ca55e5a625bbd971b2e63acc7bf22f59bb60a8a 100644 --- a/src/app/frontend/deploy/deploy_state.js +++ b/src/app/frontend/deploy/deploy_state.js @@ -33,18 +33,16 @@ export default function stateConfig($stateProvider) { }, templateUrl: 'deploy/deploy.html', }); +} - /** - * Resolves namespaces for the deploy view. - * - * @param {!angular.$resource} $resource - * @return {!angular.$q.Promise} - * @ngInject - */ - function resolveNamespaces($resource) { - /** @type {!angular.Resource} */ - let resource = $resource('/api/namespaces'); +/** + * @param {!angular.$resource} $resource + * @return {!angular.$q.Promise} + * @ngInject + */ +export function resolveNamespaces($resource) { + /** @type {!angular.Resource} */ + let resource = $resource('/api/namespaces'); - return resource.get().$promise; - } + return resource.get().$promise; } diff --git a/src/app/frontend/replicasetdetail/replicasetdetail_state.js b/src/app/frontend/replicasetdetail/replicasetdetail_state.js index 803fbf75c8d05080ac42ece74e2cf55a69492e4d..1e9182821651ed4d0e21e49f184b3c53b8838589 100644 --- a/src/app/frontend/replicasetdetail/replicasetdetail_state.js +++ b/src/app/frontend/replicasetdetail/replicasetdetail_state.js @@ -50,7 +50,7 @@ export default function stateConfig($stateProvider) { url: '/replicasets/:namespace/:replicaSet', templateUrl: 'replicasetdetail/replicasetdetail.html', resolve: { - replicaSetDetail: resolveDetails, + replicaSetDetail: resolveReplicaSetDetails, }, }); } @@ -61,7 +61,7 @@ export default function stateConfig($stateProvider) { * @return {!angular.$q.Promise} * @ngInject */ -function resolveDetails($stateParams, $resource) { +export function resolveReplicaSetDetails($stateParams, $resource) { /** @type {!angular.Resource} */ let resource = $resource('/api/replicasets/:namespace/:replicaSet', $stateParams); diff --git a/src/app/frontend/replicasetlist/replicasetlist_controller.js b/src/app/frontend/replicasetlist/replicasetlist_controller.js index 66de17bf8d92e55bd170f5c97b20ce8360792aa8..77f2091186eac0b707d483a809ea42335ef60b87 100644 --- a/src/app/frontend/replicasetlist/replicasetlist_controller.js +++ b/src/app/frontend/replicasetlist/replicasetlist_controller.js @@ -25,11 +25,12 @@ export default class ReplicaSetListController { * @param {!angular.$log} $log * @param {!angular.$resource} $resource * @param {!ui.router.$state} $state + * @param {!backendApi.ReplicaSetList} replicaSets * @ngInject */ - constructor($log, $resource, $state) { + constructor($log, $resource, $state, replicaSets) { /** @export {!Array} */ - this.replicaSets = []; + this.replicaSets = replicaSets.replicaSets; /** @private {!ui.router.$state} */ this.state_ = $state; diff --git a/src/app/frontend/replicasetlist/replicasetlist_state.js b/src/app/frontend/replicasetlist/replicasetlist_state.js index e9bb6b791d9aa473cdf3c7634bb8a646911bb11e..6aa6c635205a128d30a769b16e739bead94b0f66 100644 --- a/src/app/frontend/replicasetlist/replicasetlist_state.js +++ b/src/app/frontend/replicasetlist/replicasetlist_state.js @@ -28,6 +28,21 @@ export default function stateConfig($stateProvider) { controller: ReplicaSetListController, controllerAs: 'ctrl', url: '/replicasets', + resolve: { + replicaSets: resolveReplicaSets, + }, templateUrl: 'replicasetlist/replicasetlist.html', }); } + +/** + * @param {!angular.$resource} $resource + * @return {!angular.$q.Promise} + * @ngInject + */ +export function resolveReplicaSets($resource) { + /** @type {!angular.Resource} */ + let resource = $resource('/api/replicasets'); + + return resource.get().$promise; +}