Skip to content

Commit d6a9848

Browse files
wstrzelczykpgesek
wstrzelczyk
authored and
pgesek
committed
MOTECH-2054 Replace LoadOnDemand.js (motech#474)
* MOTECH-2054 Replace LoadOnDemand.js * MOTECH-2054 Replace LoadOnDemand.js part 2 * MOTECH-2054 Replace LoadOnDemand.js part 3 * Removed unused code * MOTECH-2054 Updated the MOTECH archetype module for work with ocLazyLoad library. * Removed unused code * MOTECH-2054 Replace LoadOnDemand.js part 4 * Changed deprecated 'unblockUI' to 'LoadingModal.close()'
1 parent f3fd624 commit d6a9848

File tree

42 files changed

+682
-618
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+682
-618
lines changed

‎modules/admin/src/main/resources/webapp/index.html

+16-16
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,60 @@
11
<div id="inner-center" class="admin inner-center ui-layout-center ui-layout-pane ui-layout-pane-center">
22
<div class="header-footer-breadcrumb">
33
<ul class="breadcrumb" role="navigation">
4-
<li><a role="menu" href=".">{{msg('server.home')}}</a></li>
5-
<li><a role="menu" href="#/admin/bundles">{{msg('admin.module')}}</a></li>
4+
<li><a role="menu" ui-sref="home">{{msg('server.home')}}</a></li>
5+
<li><a role="menu" ui-sref="admin.bundles">{{msg('admin.module')}}</a></li>
66
<li ng-show="selectedTabState.selectedTab === 'bundles'"
77
ng-class="{'active': selectedTabState.selectedTab === 'bundles'}">{{msg('admin.manageModules')}}</li>
88
<li ng-show="selectedTabState.selectedTab === 'bundle'"
99
ng-class="{'active': selectedTabState.selectedTab === 'bundles'}">{{msg('admin.bundle.title')}}</li>
1010
<li ng-show="selectedTabState.selectedTab === 'messages' || selectedTabState.selectedTab === 'messagesSettings'">
11-
<a role="menu" href="#/admin/messages">{{msg('admin.messages')}}</a></li>
11+
<a role="menu" ui-sref="admin.messages">{{msg('admin.messages')}}</a></li>
1212
<li ng-show="selectedTabState.selectedTab === 'messages'" ng-class="{'active': selectedTabState.selectedTab === 'messages'}">{{msg('admin.messages')}}</li>
1313
<li ng-show="selectedTabState.selectedTab === 'messagesSettings'" ng-class="{'active': selectedTabState.selectedTab === 'messagesSettings'}">{{msg('admin.messages.notifications.title')}}</li>
1414
<li ng-show="selectedTabState.selectedTab === 'platform-settings'" ng-class="{'active': selectedTabState.selectedTab === 'platform-settings'}">{{msg('admin.settings')}}</li>
1515
<li ng-show="selectedTabState.selectedTab === 'log'" ng-class="{'active': selectedTabState.selectedTab === 'log'}">{{msg('admin.log')}}</li>
1616
<li ng-show="selectedTabState.selectedTab === 'logOptions'" ng-class="{'active': selectedTabState.selectedTab === 'logOptions'}">{{msg('admin.log.options')}}</li>
1717
<li ng-show="selectedTabState.selectedTab === 'topics'" ng-class="{'active': selectedTabState.selectedTab === 'topics'}">{{msg('admin.topics')}}</li>
1818
<li ng-show="selectedTabState.selectedTab === 'queues'" ng-class="{'active': selectedTabState.selectedTab === 'queues'}">{{msg('admin.queues')}}</li>
19-
<li ng-show="selectedTabState.selectedTab === 'browse'"> <a role="menu" href="#/admin/queues">{{msg('admin.queues')}}</a></li>
19+
<li ng-show="selectedTabState.selectedTab === 'browse'"> <a role="menu" ui-sref="admin.browse">{{msg('admin.queues')}}</a></li>
2020
<li ng-show="selectedTabState.selectedTab === 'browse'" ng-class="{'active': selectedTabState.selectedTab === 'browse'}">{{msg('admin.queue.messages.pending')}}</li>
2121
</ul>
2222
</div>
2323
<div class="header-footer">
2424
<ul id="content-tabs" role="tablist" class="nav nav-tabs">
2525
<li ng-class="{'active': selectedTabState.selectedTab === 'bundles' || selectedTabState.selectedTab === 'bundle'}"
2626
ng-show="selectedTabState.selectedTab === 'bundles' || selectedTabState.selectedTab === 'bundle'"
27-
ng-click="selectedTabState.selectedTab = 'bundles'"><a href="#/admin/bundles">{{msg('admin.bundles')}}</a></li>
27+
ng-click="selectedTabState.selectedTab = 'bundles'"><a ui-sref="admin.bundles">{{msg('admin.bundles')}}</a></li>
2828
<li ng-class="{'active': selectedTabState.selectedTab === 'messages'}" ng-show="selectedTabState.selectedTab === 'messages'">
29-
<a href="#/admin/messages">{{msg('admin.messages')}}</a></li>
29+
<a ui-sref="admin.messages">{{msg('admin.messages')}}</a></li>
3030
<li ng-show="selectedTabState.selectedTab === 'messagesSettings'" ng-click="selectedTabState.selectedTab = 'messages'">
31-
<a href="#/admin/messages">{{msg('admin.messages')}}</a></li>
31+
<a ui-sref="admin.messages">{{msg('admin.messages')}}</a></li>
3232
<li ng-class="{'active': selectedTabState.selectedTab === 'messagesSettings'}"
3333
ng-show="selectedTabState.selectedTab === 'messages' || selectedTabState.selectedTab === 'messagesSettings'"
34-
ng-click="selectedTabState.selectedTab = 'messagesSettings'"><a href="#/admin/messagesSettings">{{msg('admin.messages.notifications.title')}}</a></li>
34+
ng-click="selectedTabState.selectedTab = 'messagesSettings'"><a ui-sref="admin.messagesSettings">{{msg('admin.messages.notifications.title')}}</a></li>
3535
<li class="active" ng-show="selectedTabState.selectedTab === 'platform-settings'" ng-click="selectedTabState.selectedTab = 'platform-settings'">
36-
<a href="#/admin/platform-settings">{{msg('admin.settings')}}</a></li>
36+
<a ui-sref="admin.platform-settings">{{msg('admin.settings')}}</a></li>
3737
<li ng-class="{'active': selectedTabState.selectedTab === 'log'}" ng-show="selectedTabState.selectedTab === 'log'">
38-
<a href="#/admin/log">{{msg('admin.log')}}</a></li>
38+
<a ui-sref="admin.log">{{msg('admin.log')}}</a></li>
3939
<li ng-show="selectedTabState.selectedTab === 'logOptions'" ng-click="selectedTabState.selectedTab = 'log'">
40-
<a href="#/admin/log">{{msg('admin.log')}}</a></li>
40+
<a ui-sref="admin.log">{{msg('admin.log')}}</a></li>
4141
<li ng-class="{'active': selectedTabState.selectedTab === 'logOptions'}"
4242
ng-show="selectedTabState.selectedTab === 'logOptions' || selectedTabState.selectedTab === 'log'"
43-
ng-click="selectedTabState.selectedTab = 'logOptions'"><a href="#/admin/logOptions">{{msg('admin.log.options')}}</a></li>
43+
ng-click="selectedTabState.selectedTab = 'logOptions'"><a ui-sref="admin.logOptions">{{msg('admin.log.options')}}</a></li>
4444
<li ng-show="selectedTabState.selectedTab === 'topics'" ng-class="{'active': selectedTabState.selectedTab === 'topics'}"
45-
ng-click="selectedTabState.selectedTab = 'topics'"><a href="#/admin/topics">{{msg('admin.topic.statistics')}}</a></li>
45+
ng-click="selectedTabState.selectedTab = 'topics'"><a ui-sref="admin.topics">{{msg('admin.topic.statistics')}}</a></li>
4646
<li ng-show="selectedTabState.selectedTab === 'queues'" ng-class="{'active': selectedTabState.selectedTab === 'queues'}">
47-
<a href="#/admin/queues">{{msg('admin.queue.statistics')}}</a></li>
47+
<a ui-sref="admin.queues">{{msg('admin.queue.statistics')}}</a></li>
4848
<li ng-show="selectedTabState.selectedTab === 'browse'" ng-class="{'active': selectedTabState.selectedTab === 'browse'}">
49-
<a href="#/admin/queues/browse">{{msg('admin.queue.messages.pending')}}</a></li>
49+
<a ui-sref="admin.browse">{{msg('admin.queue.messages.pending')}}</a></li>
5050
</ul>
5151
<div class="clearfix"></div>
5252
</div>
5353

5454
<div class="ui-layout-content">
5555
<div class="tab-content" id="tab-content">
5656
<div id="main-content" class="tab-pane active">
57-
<div ng-view></div>
57+
<div ui-view="adminView"></div>
5858
</div>
5959
</div>
6060
</div>

‎modules/admin/src/main/resources/webapp/js/app.js

+121-13
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,126 @@
66
var app = angular.module('admin', ['motech-dashboard', 'admin.filters', 'admin.controllers',
77
'admin.directives', 'admin.services', 'ngCookies', 'uiServices']);
88

9-
app.config(['$routeProvider', function($routeProvider) {
10-
$routeProvider.
11-
when('/admin/bundles', {templateUrl: '../admin/partials/bundles.html', controller: 'AdminBundleListCtrl'}).
12-
when('/admin/messages', {templateUrl: '../admin/partials/messages.html', controller: 'AdminStatusMsgCtrl'}).
13-
when('/admin/platform-settings', {templateUrl: '../admin/partials/settings.html', controller: 'AdminSettingsCtrl'}).
14-
when('/admin/bundle/:bundleId', {templateUrl: '../admin/partials/bundle.html', controller: 'AdminModuleCtrl'}).
15-
when('/admin/bundleSettings/:bundleId', {templateUrl: '../admin/partials/bundleSettings.html', controller: 'AdminBundleSettingsCtrl'}).
16-
when('/admin/log', {templateUrl: '../admin/partials/log.html', controller: 'AdminServerLogCtrl'}).
17-
when('/admin/topics', {templateUrl: '../admin/partials/topic_stats.html', controller: 'AdminTopicStatsCtrl'}).
18-
when('/admin/queues', {templateUrl: '../admin/partials/queue_stats.html', controller: 'AdminQueueStatsCtrl'}).
19-
when('/admin/queues/browse', {templateUrl: '../admin/partials/queue_message_stats.html', controller: 'AdminQueueMessageStatsCtrl'}).
20-
when('/admin/logOptions', {templateUrl: '../admin/partials/logOptions.html', controller: 'AdminServerLogOptionsCtrl'}).
21-
when('/admin/messagesSettings', {templateUrl: '../admin/partials/notificationRules.html', controller: 'AdminNotificationRuleCtrl'});
9+
app.config(['$stateProvider', function ($stateProvider) {
10+
$stateProvider
11+
.state('admin', {
12+
url: "/admin",
13+
abstract: true,
14+
views: {
15+
"moduleToLoad": {
16+
templateUrl: "../admin/index.html"
17+
}
18+
}
19+
})
20+
.state('admin.bundles', {
21+
url: '/bundles',
22+
parent: 'admin',
23+
views: {
24+
'adminView': {
25+
templateUrl: '../admin/partials/bundles.html',
26+
controller: 'AdminBundleListCtrl'
27+
}
28+
}
29+
})
30+
.state('admin.messages', {
31+
url: '/messages',
32+
parent: 'admin',
33+
views: {
34+
'adminView': {
35+
templateUrl: '../admin/partials/messages.html',
36+
controller: 'AdminStatusMsgCtrl'
37+
}
38+
}
39+
})
40+
.state('admin.platform-settings', {
41+
url: '/platform-settings',
42+
parent: 'admin',
43+
views: {
44+
'adminView': {
45+
templateUrl: '../admin/partials/settings.html',
46+
controller: 'AdminSettingsCtrl'
47+
}
48+
}
49+
})
50+
.state('admin.bundleId', {
51+
url: '/bundle/:bundleId',
52+
parent: 'admin',
53+
views: {
54+
'adminView': {
55+
templateUrl: '../admin/partials/bundle.html',
56+
controller: 'AdminModuleCtrl'
57+
}
58+
}
59+
})
60+
.state('admin.bundleSettings', {
61+
url: '/bundleSettings/:bundleId',
62+
parent: 'admin',
63+
views: {
64+
'adminView': {
65+
templateUrl: '../admin/partials/bundleSettings.html',
66+
controller: 'AdminBundleSettingsCtrl'
67+
}
68+
}
69+
})
70+
.state('admin.log', {
71+
url: '/log',
72+
parent: 'admin',
73+
views: {
74+
'adminView': {
75+
templateUrl: '../admin/partials/log.html',
76+
controller: 'AdminServerLogCtrl'
77+
}
78+
}
79+
})
80+
.state('admin.logOptions', {
81+
url: '/log/logOptions',
82+
parent: 'admin',
83+
views: {
84+
'adminView': {
85+
templateUrl: '../admin/partials/logOptions.html',
86+
controller: 'AdminServerLogOptionsCtrl'
87+
}
88+
}
89+
})
90+
.state('admin.topics', {
91+
url: '/topics',
92+
parent: 'admin',
93+
views: {
94+
'adminView': {
95+
templateUrl: '../admin/partials/topic_stats.html',
96+
controller: 'AdminTopicStatsCtrl'
97+
}
98+
}
99+
})
100+
.state('admin.queues', {
101+
url: '/queues',
102+
parent: 'admin',
103+
views: {
104+
'adminView': {
105+
templateUrl: '../admin/partials/queue_stats.html',
106+
controller: 'AdminQueueStatsCtrl'
107+
}
108+
}
109+
})
110+
.state('admin.browse', {
111+
url: '/browse',
112+
parent: 'admin',
113+
views: {
114+
'adminView': {
115+
templateUrl: '../admin/partials/queue_message_stats.html',
116+
controller: 'AdminQueueMessageStatsCtrl'
117+
}
118+
}
119+
})
120+
.state('admin.messagesSettings', {
121+
url: '/messagesSettings',
122+
parent: 'admin',
123+
views: {
124+
'adminView': {
125+
templateUrl: '../admin/partials/notificationRules.html',
126+
controller: 'AdminNotificationRuleCtrl'
127+
}
128+
}
129+
});
22130
}]);
23131
}());

‎modules/admin/src/main/resources/webapp/js/controllers.js

+23-18
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
var controllers = angular.module('admin.controllers', []);
88

9-
controllers.controller('AdminBundleListCtrl', function($scope, Bundle, i18nService, $routeParams, $http, $timeout, ModalFactory, LoadingModal) {
9+
controllers.controller('AdminBundleListCtrl', function($scope, Bundle, i18nService, $stateParams, $http, $timeout, ModalFactory, LoadingModal) {
1010

1111
var LOADING_STATE = 'LOADING', MODULE_LIST_REFRESH_TIMEOUT = 6000; // milliseconds
1212

@@ -57,8 +57,8 @@
5757

5858
$scope.bundles = Bundle.query();
5959

60-
if ($routeParams.bundleId !== undefined) {
61-
$scope.bundle = Bundle.get({ bundleId:$routeParams.bundleId });
60+
if ($stateParams.bundleId !== undefined) {
61+
$scope.bundle = Bundle.get({ bundleId:$stateParams.bundleId });
6262
}
6363

6464
$scope.allBundlesCount = function () {
@@ -324,6 +324,12 @@
324324
Bundle.prototype.isResolved = function () {
325325
return this.state === 'RESOLVED';
326326
};
327+
328+
innerLayout({
329+
spacing_closed: 30,
330+
east__minSize: 200,
331+
east__maxSize: 350
332+
});
327333
});
328334

329335
controllers.controller('AdminStatusMsgCtrl', function($scope, $rootScope, $timeout, StatusMessage, i18nService,
@@ -658,8 +664,8 @@
658664
};
659665
});
660666

661-
controllers.controller('AdminModuleCtrl', function($scope, ModuleSettings, Bundle, i18nService, $routeParams) {
662-
$scope.module = Bundle.details({ bundleId:$routeParams.bundleId });
667+
controllers.controller('AdminModuleCtrl', function($scope, ModuleSettings, Bundle, i18nService, $stateParams) {
668+
$scope.module = Bundle.details({ bundleId:$stateParams.bundleId });
663669

664670
innerLayout({
665671
spacing_closed: 30,
@@ -668,14 +674,14 @@
668674
});
669675
});
670676

671-
controllers.controller('AdminBundleSettingsCtrl', function($scope, Bundle, ModuleSettings, $routeParams, $http, ModalFactory, LoadingModal) {
672-
$scope.moduleSettings = ModuleSettings.query({ bundleId:$routeParams.bundleId });
677+
controllers.controller('AdminBundleSettingsCtrl', function($scope, Bundle, ModuleSettings, $stateParams, $http, ModalFactory, LoadingModal) {
678+
$scope.moduleSettings = ModuleSettings.query({ bundleId:$stateParams.bundleId });
673679

674-
$http.get('../admin/api/settings/' + $routeParams.bundleId + '/raw').success(function (data) {
680+
$http.get('../admin/api/settings/' + $stateParams.bundleId + '/raw').success(function (data) {
675681
$scope.rawFiles = data;
676682
});
677683

678-
$scope.module = Bundle.get({ bundleId:$routeParams.bundleId });
684+
$scope.module = Bundle.get({ bundleId:$stateParams.bundleId });
679685

680686
$scope.saveSettings = function (mSettings, doRestart) {
681687
var successHandler;
@@ -742,24 +748,23 @@
742748

743749
});
744750

745-
controllers.controller('AdminServerLogCtrl', function($scope, $http, LoadingModal) {
751+
controllers.controller('AdminServerLogCtrl', function($scope, $http, $rootScope, LoadingModal) {
746752
$scope.refresh = function () {
747753
LoadingModal.open();
748-
$http({method:'GET', url:'../admin/api/log'}).
749-
success(
750-
function (data) {
754+
$http({method:'GET', url:'../admin/api/log'})
755+
.success(function (data) {
751756
if (data === 'server.tomcat.error.logFileNotFound') {
752757
$('#logContent').html($scope.msg(data));
753758
} else {
754759
$('#logContent').html(data);
755760
LoadingModal.close();
756761
}
757-
}).
758-
error(LoadingModal.close());
762+
})
763+
.error(LoadingModal.close());
759764
};
760765

761766
//removing the sidebar from <body> before route change
762-
$scope.$on('$routeChangeStart', function(event, next, current) {
767+
$rootScope.$on('$stateChangeStart', function(event, next, current) {
763768
$('div[id^="jquerySideBar"]').remove();
764769
});
765770

@@ -973,9 +978,9 @@
973978

974979
});
975980

976-
controllers.controller('AdminQueueMessageStatsCtrl', function($scope, $http, $routeParams) {
981+
controllers.controller('AdminQueueMessageStatsCtrl', function($scope, $http, $stateParams) {
977982

978-
var queue = $routeParams.queueName;
983+
var queue = $stateParams.queueName;
979984

980985
$scope.dataAvailable = true;
981986

‎modules/admin/src/main/resources/webapp/partials/queue_stats.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<tbody ng-repeat="queue in queues">
1414
<tr>
1515
<td class="ng-binding">
16-
<a ng-href="#/admin/queues/browse?queueName={{queue.destination}}"
16+
<a ui-sref="admin.browse({queueName: queue.destination})"
1717
ng-click="selectedTabState.selectedTab = 'browse'">{{queue.destination}}</a>
1818
</td>
1919
<td class="ng-binding">{{queue.queueSize}}</td>

‎modules/scheduler/scheduler/src/main/resources/META-INF/spring/blueprint.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<value>viewSchedulerJobs</value>
2626
</list>
2727
</property>
28-
<property name="defaultURL" value="/scheduler"/>
28+
<property name="defaultURL" value="/scheduler/dashboard"/>
2929
</bean>
3030

3131
<osgi:service ref="schedulerService" interface="org.motechproject.scheduler.service.MotechSchedulerService"/>

‎modules/scheduler/scheduler/src/main/resources/webapp/index.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
<div id="inner-center" class="scheduler inner-center ui-layout-center ui-layout-pane ui-layout-pane-center">
22
<div class="header-footer">
33
<ul class="breadcrumb" role="navigation">
4-
<li><a role="menu" href=".">{{msg('server.home')}}</a></li>
4+
<li><a role="menu" ui-sref="home">{{msg('server.home')}}</a></li>
55
<li class="active">{{msg('scheduler')}}</li>
66
</ul>
77
</div>
88
<div class="header-footer">
99
<ul id="content-tabs" class="nav nav-tabs">
10-
<li class="active"><a href="#/scheduler">{{msg('scheduler.jobs')}}</a></li>
10+
<li class="active"><a ui-sref="scheduler.dashboard">{{msg('scheduler.jobs')}}</a></li>
1111
</ul>
1212
</div>
1313
<div class="ui-layout-content">
1414
<div class="tab-content" id="tab-content">
1515
<div id="main-content" class="tab-pane active">
16-
<div ng-view></div>
16+
<div ui-view="schedulerview"></div>
1717
</div>
1818
</div>
1919
</div>

0 commit comments

Comments
 (0)