Skip to content

Commit 7a8d19b

Browse files
committed
* Fixed middleware ordering
* Added minified module scripts
1 parent 7809c96 commit 7a8d19b

File tree

4 files changed

+157
-1
lines changed

4 files changed

+157
-1
lines changed
Lines changed: 150 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,150 @@
1+
angular
2+
.module('cms.errors', ['ngRoute', 'cms.shared'])
3+
.constant('_', window._)
4+
.constant('errors.modulePath', '/plugins/admin/modules/errors/js/');
5+
angular.module('cms.errors').config([
6+
'$routeProvider',
7+
'shared.routingUtilities',
8+
'errors.modulePath',
9+
function (
10+
$routeProvider,
11+
routingUtilities,
12+
modulePath) {
13+
14+
$routeProvider
15+
.when('/:id', routingUtilities.mapOptions(modulePath, 'ErrorDetails'))
16+
.otherwise(routingUtilities.mapOptions(modulePath, 'ErrorList'));
17+
}]);
18+
angular.module('cms.errors').factory('errors.errorService', [
19+
'$http',
20+
'shared.pluginServiceBase',
21+
function (
22+
$http,
23+
serviceBase) {
24+
25+
var service = {},
26+
errorServiceBase = serviceBase + 'errors';
27+
28+
/* QUERIES */
29+
30+
service.getAll = function (query) {
31+
return $http.get(errorServiceBase, {
32+
params: query
33+
});
34+
}
35+
36+
service.getById = function (userId) {
37+
38+
return $http.get(getIdRoute(userId));
39+
}
40+
41+
/* PRIVATES */
42+
43+
function getIdRoute(id) {
44+
return errorServiceBase + '/' + id;
45+
}
46+
47+
return service;
48+
}]);
49+
angular.module('cms.errors').controller('ErrorDetailsController', [
50+
'$routeParams',
51+
'shared.LoadState',
52+
'errors.errorService',
53+
function (
54+
$routeParams,
55+
LoadState,
56+
errorService
57+
) {
58+
59+
var vm = this;
60+
61+
init();
62+
63+
/* INIT */
64+
65+
function init() {
66+
67+
// Properties
68+
vm.editMode = false;
69+
vm.formLoadState = new LoadState(true);
70+
71+
// Init
72+
initData()
73+
.then(vm.formLoadState.off);
74+
}
75+
76+
/* UI ACTIONS */
77+
78+
function reset() {
79+
vm.command = mapUpdateCommand(vm.error);
80+
vm.mainForm.formStatus.clear();
81+
}
82+
83+
/* PRIVATE FUNCS */
84+
85+
function initData() {
86+
var errorId = $routeParams.id;
87+
88+
return errorService.getById(errorId)
89+
.then(load);
90+
91+
function load(error) {
92+
93+
vm.error = error;
94+
}
95+
}
96+
}]);
97+
angular.module('cms.errors').controller('ErrorListController', [
98+
'_',
99+
'shared.LoadState',
100+
'shared.SearchQuery',
101+
'errors.errorService',
102+
function (
103+
_,
104+
LoadState,
105+
SearchQuery,
106+
errorService) {
107+
108+
var vm = this;
109+
110+
init();
111+
112+
function init() {
113+
114+
vm.gridLoadState = new LoadState();
115+
vm.query = new SearchQuery({
116+
onChanged: onQueryChanged
117+
});
118+
vm.filter = vm.query.getFilters();
119+
vm.toggleFilter = toggleFilter;
120+
121+
toggleFilter(false);
122+
123+
loadGrid();
124+
}
125+
126+
/* ACTIONS */
127+
128+
function toggleFilter(show) {
129+
vm.isFilterVisible = _.isUndefined(show) ? !vm.isFilterVisible : show;
130+
}
131+
132+
/* EVENTS */
133+
134+
function onQueryChanged() {
135+
toggleFilter(false);
136+
loadGrid();
137+
}
138+
139+
/* PRIVATE FUNCS */
140+
141+
function loadGrid() {
142+
vm.gridLoadState.on();
143+
144+
return errorService.getAll(vm.query.getParameters()).then(function (result) {
145+
vm.result = result;
146+
vm.gridLoadState.off();
147+
});
148+
}
149+
150+
}]);

src/Cofoundry.Plugins.ErrorLogging.Admin/Plugins/Admin/Modules/Errors/Content/js/errors_min.js

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Cofoundry.Plugins.ErrorLogging.Admin/Plugins/Admin/Modules/Errors/Content/js/errors_templates.js

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Cofoundry.Plugins.ErrorLogging/Middleware/ErrorLoggingMiddlewareStartupTask.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,15 @@
66

77
namespace Cofoundry.Plugins.ErrorLogging
88
{
9-
public class ErrorLoggingMiddlewareStartupTask : IStartupConfigurationTask
9+
public class ErrorLoggingMiddlewareStartupTask : IRunAfterStartupConfigurationTask
1010
{
1111
public int Ordering
1212
{
1313
get { return (int)StartupTaskOrdering.First; }
1414
}
1515

16+
public Type[] RunAfter => new Type[] { typeof(ErrorHandlingMiddlewareConfigurationTask) };
17+
1618
public void Configure(IApplicationBuilder app)
1719
{
1820
app.UseMiddleware<ErrorLoggingMiddleware>();

0 commit comments

Comments
 (0)