Merge pull request #92 from maciaszczykm/replicaset-refactor

Refactored replica set list view to align it with deploy view

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<!backendApi.NamespaceList>} */
-    let resource = $resource('/api/namespaces');
+/**
+ * @param {!angular.$resource} $resource
+ * @return {!angular.$q.Promise}
+ * @ngInject
+ */
+export function resolveNamespaces($resource) {
+  /** @type {!angular.Resource<!backendApi.NamespaceList>} */
+  let resource = $resource('/api/namespaces');
 
-    return resource.get().$promise;
-  }
+  return resource.get().$promise;
 }

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<!backendApi.ReplicaSetDetail>} */
   let resource = $resource('/api/replicasets/:namespace/:replicaSet', $stateParams);
 

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<backendApi.ReplicaSet>} */
-    this.replicaSets = [];
+    this.replicaSets = replicaSets.replicaSets;
 
     /** @private {!ui.router.$state} */
     this.state_ = $state;

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<!backendApi.ReplicaSetList>} */
+  let resource = $resource('/api/replicasets');
+
+  return resource.get().$promise;
+}