Skip to content
This repository was archived by the owner on Apr 22, 2022. It is now read-only.

Commit f589e03

Browse files
alegrmalegrm
committed
refactoring config
1 parent 3262582 commit f589e03

File tree

4 files changed

+162
-152
lines changed

4 files changed

+162
-152
lines changed

‎src/main/resources/log4j.properties‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,3 @@ log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1
99

1010
log4j.logger.setup=DEBUG
1111
log4j.logger.rdf=DEBUG
12-
log4j.logger.authentication=DEBUG

‎src/main/webapp/js/app.js‎

Lines changed: 46 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -65,52 +65,38 @@ app.config(function($routeSegmentProvider, $routeProvider)
6565
.segment('popup-limes', {
6666
templateUrl: 'js/workbench/linking-and-fusing/limes-result.html',
6767
resolve: {
68-
settings: function (Config) {
69-
return Config.read();
68+
settings: function (ConfigurationService) {
69+
return ConfigurationService.getSettings();
7070
}
7171
}
7272
})
7373

7474
.segment('popup-triplegeo', {
7575
templateUrl: 'js/workbench/extraction-and-loading/triplegeo-result.html',
7676
resolve: {
77-
settings: function (Config) {
78-
return Config.read();
77+
settings: function (ConfigurationService) {
78+
return ConfigurationService.getSettings();
7979
}
8080
}
8181
})
8282

8383
.segment('popup-geolift', {
8484
templateUrl: 'js/workbench/classification-and-enrichment/geolift-result.html',
8585
resolve: {
86-
settings: function (Config) {
87-
return Config.read();
86+
settings: function (ConfigurationService) {
87+
return ConfigurationService.getSettings();
8888
}
8989
}
9090
})
9191

9292
.segment('default', {
9393
templateUrl :'js/workbench/default.html',
9494
resolve: {
95-
init: function($q, Config, UsersService){
95+
settings : function (ConfigurationService){
9696
console.log("init default");
97-
var defer = $q.defer();
98-
Config.initialize(defer);
99-
var promise = defer.promise;
100-
promise
101-
.then(function(){
102-
Config.read().then(function(){
103-
//why this function is required at this level?
104-
// UsersService.readUserNamesEmails();
105-
UsersService.readRoles();
106-
});
107-
});
108-
return promise;
97+
return ConfigurationService.getSettings();
10998
}
110-
// },
111-
// settings: function (Config) {
112-
// return Config.read();
113-
// },
99+
// }
114100
// userInfo : function(UsersService) {
115101
// return UsersService.readUserNamesEmails();
116102
// }
@@ -134,8 +120,8 @@ app.config(function($routeSegmentProvider, $routeProvider)
134120
mappingGroups: function(D2RQService) {
135121
return D2RQService.readMappingGroups();
136122
},
137-
settings: function (Config) {
138-
return Config.read();
123+
settings: function (ConfigurationService) {
124+
return ConfigurationService.getSettings();
139125
}
140126
}
141127
})
@@ -145,8 +131,8 @@ app.config(function($routeSegmentProvider, $routeProvider)
145131
tasks: function(D2RQService) {
146132
return D2RQService.readTasks();
147133
},
148-
settings: function (Config) {
149-
return Config.read();
134+
settings: function (ConfigurationService) {
135+
return ConfigurationService.getSettings();
150136
}
151137
}
152138
})
@@ -169,8 +155,8 @@ app.config(function($routeSegmentProvider, $routeProvider)
169155
ontologies: function (OntologyService) {
170156
return OntologyService.readOntologies();
171157
},
172-
settings: function (Config) {
173-
return Config.read();
158+
settings: function (ConfigurationService) {
159+
return ConfigurationService.getSettings();
174160
}
175161
}
176162
})
@@ -184,22 +170,25 @@ app.config(function($routeSegmentProvider, $routeProvider)
184170
{
185171
templateUrl: 'js/settings/settings.html',
186172
resolve: {
187-
init: function($q, Config, UsersService){
188-
console.log("init settings");
189-
var defer = $q.defer();
190-
var promise = defer.promise;
191-
Config.initialize(defer);
192-
promise
193-
.then(function(){
194-
Config.read().then(function(){
195-
//why this function is required at this level?
196-
// UsersService.readRoles();
197-
// UsersService.readUserNamesEmails();
198-
});
199-
});
200-
201-
return promise;
173+
settings: function (ConfigurationService) {
174+
return ConfigurationService.getSettings();
202175
}
176+
// init: function($q, Config, UsersService){
177+
// console.log("init settings");
178+
// var defer = $q.defer();
179+
// var promise = defer.promise;
180+
// Config.initialize(defer);
181+
// promise
182+
// .then(function(){
183+
// Config.read().then(function(){
184+
// //why this function is required at this level?
185+
// // UsersService.readRoles();
186+
// // UsersService.readUserNamesEmails();
187+
// });
188+
// });
189+
190+
// return promise;
191+
// }
203192
}
204193
})
205194
.within()
@@ -216,29 +205,15 @@ app.config(function($routeSegmentProvider, $routeProvider)
216205
.segment('roles', {
217206
templateUrl: 'js/admin/roles.html',
218207
resolve: {
219-
init: function($q, Config, UsersService){
220-
console.log("init roles");
221-
var defer = $q.defer();
222-
var promise = defer.promise;
223-
Config.initialize(defer);
224-
promise
225-
.then(function(){
226-
Config.read().then(function(){
227-
UsersService.readRoles();
228-
});
229-
});
230-
return promise;
231-
}
232-
233-
// users: function(UsersService) {
234-
// return UsersService.readUsers();
235-
// },
236-
// roles: function(UsersService) {
237-
// return UsersService.readRoles();
238-
// },
239-
// settings: function (Config) {
240-
// return Config.read();
241-
// }
208+
settings: function (ConfigurationService) {
209+
return ConfigurationService.getSettings();
210+
},
211+
users: function(UsersService) {
212+
return UsersService.readUsers();
213+
},
214+
roles: function(UsersService) {
215+
return UsersService.readRoles();
216+
}
242217
}
243218
})
244219
.up()
@@ -252,17 +227,10 @@ app.config(function($routeSegmentProvider, $routeProvider)
252227
.segment('system-setup', {
253228
templateUrl: 'system-setup.html',
254229
resolve: {
255-
init: function($q, Config){
256-
console.log("init system-setup");
257-
var defer = $q.defer();
258-
var promise = defer.promise;
259-
Config.initialize(defer);
260-
promise
261-
.then(function(){
262-
console.log("config system-setup");
263-
Config.read();
264-
});
265-
return promise;
230+
roles: function (ConfigurationService, UsersService) {
231+
ConfigurationService.getSettings().then(function(settings){
232+
return UsersService.readRoles();
233+
});
266234
}
267235
// settings: function ($q, Config) {
268236

0 commit comments

Comments
 (0)