From 892195880a2ec3aaa98c6a7f91e2500c1ec4ed52 Mon Sep 17 00:00:00 2001 From: Alexander Mohr Date: Thu, 25 Oct 2018 18:54:51 -0700 Subject: [PATCH] greatly speed up admin events page thanks for tips by @msuozzo --- .../admin_ui/components/events/events.js | 2 - .../eventpage/eventpage-controller.js | 42 +------------------ .../frontend/admin_ui/eventpage/events.html | 32 +++++++------- .../components/events/event-resource.js | 1 + 4 files changed, 19 insertions(+), 58 deletions(-) diff --git a/upvote/gae/modules/upvote_app/frontend/admin_ui/components/events/events.js b/upvote/gae/modules/upvote_app/frontend/admin_ui/components/events/events.js index fb5c0c5..cfaf9ee 100644 --- a/upvote/gae/modules/upvote_app/frontend/admin_ui/components/events/events.js +++ b/upvote/gae/modules/upvote_app/frontend/admin_ui/components/events/events.js @@ -13,7 +13,6 @@ // limitations under the License. goog.provide('upvote.admin.events.module'); -goog.require('upvote.admin.blockables.BlockableResource'); goog.require('upvote.admin.events.EventQueryResource'); goog.require('upvote.admin.events.EventResource'); goog.require('upvote.admin.events.uvEventCard'); @@ -24,5 +23,4 @@ upvote.admin.events.module = angular.module('upvote.admin.events', ['ngResource']) .factory('eventResource', upvote.admin.events.EventResource) .factory('eventQueryResource', upvote.admin.events.EventQueryResource) - .factory('blockableResource', upvote.admin.blockables.BlockableResource) .directive('uvEventCard', upvote.admin.events.uvEventCard); diff --git a/upvote/gae/modules/upvote_app/frontend/admin_ui/eventpage/eventpage-controller.js b/upvote/gae/modules/upvote_app/frontend/admin_ui/eventpage/eventpage-controller.js index ed109d3..cdc6759 100644 --- a/upvote/gae/modules/upvote_app/frontend/admin_ui/eventpage/eventpage-controller.js +++ b/upvote/gae/modules/upvote_app/frontend/admin_ui/eventpage/eventpage-controller.js @@ -27,7 +27,6 @@ upvote.admin.eventpage.EventController = class extends ModelController { /** * @param {!angular.Resource} eventResource * @param {!angular.Resource} eventQueryResource - * @param {!angular.Resource} blockableResource * @param {!angular.$routeParams} $routeParams * @param {!angular.Scope} $scope * @param {!angular.$location} $location @@ -35,7 +34,7 @@ upvote.admin.eventpage.EventController = class extends ModelController { * @ngInject */ constructor( - eventResource, eventQueryResource, blockableResource, $routeParams, $scope, $location, + eventResource, eventQueryResource, $routeParams, $scope, $location, page) { super(eventResource, eventQueryResource, $routeParams, $scope, $location); @@ -46,8 +45,7 @@ upvote.admin.eventpage.EventController = class extends ModelController { // Add the hostId param to the request before loadData is called by init. this.requestData['hostId'] = this.hostId; - - this.blockableResource = blockableResource; + this.requestData['withContext'] = true; page.title = this.pageTitle; @@ -55,42 +53,6 @@ upvote.admin.eventpage.EventController = class extends ModelController { this.init(); } - /** @override */ - loadData(opt_more) { - let dataPromise = super.loadData(opt_more); - let blockableResource = this.blockableResource; - - return (!dataPromise) ? dataPromise : dataPromise.then((results) => { - if(!results) { - return null; - } - - results.forEach(function(item) { - if (!!item['blockableId']) { - blockableResource - .get({'id': item['blockableId']})['$promise'] - .then((blockable) => { - item.blockable = blockable; - - if (!!blockable['certId']) { - blockableResource - .get({'id': blockable['certId']})['$promise'] - .then((cert) => { - item.cert = cert; - }) - .catch((response) => { - this.errorService_.createToastFromError(response); - }); - } - }) - .catch((response) => { - this.errorService_.createToastFromError(response); - }); - } - }); - }); - } - /** * Navigate to the Blockable page associated with the selected Event. * @export diff --git a/upvote/gae/modules/upvote_app/frontend/admin_ui/eventpage/events.html b/upvote/gae/modules/upvote_app/frontend/admin_ui/eventpage/events.html index 28a12dd..54797e4 100644 --- a/upvote/gae/modules/upvote_app/frontend/admin_ui/eventpage/events.html +++ b/upvote/gae/modules/upvote_app/frontend/admin_ui/eventpage/events.html @@ -75,26 +75,26 @@ Count - - {{item.fileName}} - {{item.recordedDt | date:'medium'}} - {{item.eventType}} + + {{item.event.fileName}} + {{item.event.recordedDt | date:'medium'}} + {{item.event.eventType}} - {{item.executingUser}} - {{item.publisher}} - {{item.count}} + {{item.event.executingUser}} + {{item.event.publisher}} + {{item.event.count}} - Filename: {{item.fileName}}, - Recorded: {{item.recordedDt | date:'medium'}}, - {{item.recordedDt | timeSince}}, - Type: {{item.eventType}}, - Host ID: {{item.hostId | prettifyUuid}}, - Path: {{item.filePath}}, - Publisher: {{item.publisher}}, - Version: {{item.version}}, - Executing User: {{item.executingUser}} + Filename: {{item.event.fileName}}, + Recorded: {{item.event.recordedDt | date:'medium'}}, + {{item.event.recordedDt | timeSince}}, + Type: {{item.event.eventType}}, + Host ID: {{item.event.hostId | prettifyUuid}}, + Path: {{item.event.filePath}}, + Publisher: {{item.event.publisher}}, + Version: {{item.event.version}}, + Executing User: {{item.event.executingUser}} diff --git a/upvote/gae/modules/upvote_app/frontend/web_ui/components/events/event-resource.js b/upvote/gae/modules/upvote_app/frontend/web_ui/components/events/event-resource.js index 82590d7..fd3488b 100644 --- a/upvote/gae/modules/upvote_app/frontend/web_ui/components/events/event-resource.js +++ b/upvote/gae/modules/upvote_app/frontend/web_ui/components/events/event-resource.js @@ -45,6 +45,7 @@ upvote.events.EventQueryResource = 'cursor': '@cursor', 'perPage': '@perPage', 'asAdmin': '@asAdmin', + 'withContext': '@withContext' } } });