fix(apis): api lists are slow to display

fix gravitee-io/issues#976
gravitee-io · Jan 5, 2018 · df2adb8 · df2adb8
1 parent bc9059e
commit df2adb8
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 12 deletions.
diff --git a/constants.json b/constants.json
@@ -20,7 +20,7 @@
     "enabled": false
   },
   "rating": {
-    "enabled": false
+    "enabled": true
   },
   "analytics": {
     "enabled": false,

diff --git a/src/management/api/apis.controller.ts b/src/management/api/apis.controller.ts
@@ -53,8 +53,10 @@ export class ApisController {
     this.isAPIsHome = this.$state.includes('apis');
 
     this.createMode = !Constants.devMode; // && Object.keys($rootScope.graviteeUser).length > 0;
-
-    this.reloadSyncState();
+    let that = this;
+    $scope.$on("$viewContentLoaded", function() {
+      that.reloadSyncState();
+    });
 
     this.selectedApis = [];
 

diff --git a/src/portal/api/apis.controller.ts b/src/portal/api/apis.controller.ts
@@ -15,6 +15,7 @@
  */
 import {IScope} from 'angular';
 import * as _ from 'lodash';
+import ApiService from "../../services/api.service";
 import ViewService from "../../services/view.service";
 
 export class PortalApisController {
@@ -31,11 +32,12 @@ export class PortalApisController {
                private $state,
                private $stateParams,
                private Constants,
-               private ViewService) {
+               private ViewService: ViewService,
+               private ApiService: ApiService) {
     'ngInject';
     this.apis = resolvedApis.data;
     this.views = resolvedViews;
-    this.ratingEnabled = Constants.rating && Constants.rating.enabled;
+    this.ratingEnabled = this.ApiService.isRatingEnabled();
     let that = this;
     if($stateParams.view) {
       this.selectedView = $stateParams.view;

diff --git a/src/portal/api/header/api-header.component.ts b/src/portal/api/header/api-header.component.ts
@@ -23,7 +23,7 @@ const ApiHeaderComponent: ng.IComponentOptions = {
   template: require('./api-header.html'),
   controller: function(Constants, ApiService: ApiService, $stateParams, $rootScope) {
     'ngInject';
-    this.ratingEnabled = Constants.rating && Constants.rating.enabled;
+    this.ratingEnabled = ApiService.isRatingEnabled();
 
     this.getEndpoint = function () {
       return Constants.portal.entrypoint + this.api.context_path;

diff --git a/src/portal/api/rating/apiRating.controller.ts b/src/portal/api/rating/apiRating.controller.ts
@@ -16,6 +16,7 @@
 import ApiService from '../../../services/api.service';
 import NotificationService from '../../../services/notification.service';
 import _ = require('lodash');
+import UserService from "../../../services/user.service";
 
 class ApiPortalRatingController {
   private api: any;
@@ -31,10 +32,10 @@ class ApiPortalRatingController {
               private $mdDialog,
               private $state,
               private Constants,
-              private UserService) {
+              private UserService: UserService) {
     'ngInject';
 
-    if (!(Constants.rating && Constants.rating.enabled)) {
+    if (!this.ApiService.isRatingEnabled()) {
       $state.go('portal.home');
     }
   }

diff --git a/src/portal/home/home.controller.ts b/src/portal/home/home.controller.ts
@@ -14,18 +14,23 @@
  * limitations under the License.
  */
 import angular = require('angular');
+import ApiService from "../../services/api.service";
 
 export class HomeController {
   private apis: any[];
   private homepage: any;
   private ratingEnabled: boolean;
 
-  constructor (private resolvedApis, private $state, private resolvedHomepage, private Constants) {
+  constructor ( private resolvedApis,
+                private $state,
+                private resolvedHomepage,
+                private Constants,
+                private ApiService: ApiService) {
     'ngInject';
     this.apis = resolvedApis.data;
     this.homepage = resolvedHomepage;
     this.$state = $state;
-    this.ratingEnabled = Constants.rating && Constants.rating.enabled;
+    this.ratingEnabled = ApiService.isRatingEnabled();
   }
 
   querySearch(query) {

diff --git a/src/portal/portal.route.ts b/src/portal/portal.route.ts
@@ -94,8 +94,11 @@ function portalRouterConfig($stateProvider: ng.ui.IStateProvider) {
       resolve: {
         api: ($stateParams: ng.ui.IStateParamsService, ApiService: ApiService) =>
           ApiService.get($stateParams['apiId']).then(response => response.data),
-        apiRatingSummary: ($stateParams: ng.ui.IStateParamsService, ApiService: ApiService) =>
-          ApiService.getApiRatingSummaryByApi($stateParams['apiId']).then(response => response.data),
+        apiRatingSummary: ($stateParams: ng.ui.IStateParamsService, ApiService: ApiService, Constants) => {
+          return ApiService.isRatingEnabled()
+            ? ApiService.getApiRatingSummaryByApi($stateParams['apiId']).then(response => response.data)
+            : null;
+        },
         resolvedApiPermissions: (ApiService, $stateParams) => ApiService.getPermissions($stateParams.apiId),
         onEnter: function (UserService, resolvedApiPermissions) {
           if (!UserService.currentUser.userApiPermissions) {

diff --git a/src/services/api.service.ts b/src/services/api.service.ts
@@ -25,10 +25,12 @@ export class LogsQuery {
 
 class ApiService {
   private apisURL: string;
+  private Constants: any;
 
   constructor(private $http, Constants) {
     'ngInject';
     this.apisURL = `${Constants.baseURL}apis/`;
+    this.Constants = Constants;
   }
 
   get(name) {
@@ -351,6 +353,11 @@ class ApiService {
   /*
    * API ratings
    */
+
+  isRatingEnabled() {
+    return this.Constants.rating && this.Constants.rating.enabled;
+  }
+
   getApiRatings(api, pageNumber) {
     return this.$http.get(this.apisURL + api + '/ratings?pageSize=10&pageNumber=' + pageNumber);
   }