Skip to content
This repository was archived by the owner on May 3, 2020. It is now read-only.

Commit 40eeb91

Browse files
mvespermvesper
committed
global: admin UI first draft
* Adds the first implementation of the admin user interface
1 parent c387878 commit 40eeb91

17 files changed

+712
-22
lines changed

‎examples/app.py

+5-1
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,12 @@
4242
from flask_breadcrumbs import Breadcrumbs
4343
from flask_menu import Menu
4444
from invenio_accounts import InvenioAccounts
45+
from invenio_accounts.views import blueprint as accounts_blueprint
4546
from invenio_assets import InvenioAssets
4647
from invenio_db import InvenioDB
4748
from invenio_indexer import InvenioIndexer
4849
from invenio_jsonschemas import InvenioJSONSchemas
49-
from invenio_oauth2server import InvenioOAuth2Server
50+
from invenio_oauth2server import InvenioOAuth2Server, InvenioOAuth2ServerREST
5051
from invenio_oauth2server.views import server_blueprint, settings_blueprint
5152
from invenio_pidstore import InvenioPIDStore
5253
from invenio_records import InvenioRecords
@@ -70,6 +71,7 @@
7071
OAUTH2SERVER_CLIENT_SECRET_SALT_LEN=60,
7172
OAUTH2SERVER_TOKEN_PERSONAL_SALT_LEN=60,
7273
SECRET_KEY='changeme',
74+
ASSETS_DEBUG=True,
7375
)
7476

7577
Babel(app)
@@ -86,9 +88,11 @@
8688
InvenioRecordsREST(app)
8789
InvenioWebhooks(app)
8890
InvenioOAuth2Server(app)
91+
InvenioOAuth2ServerREST(app)
8992
InvenioCirculation(app)
9093
InvenioCirculationREST(app)
9194

95+
app.register_blueprint(accounts_blueprint)
9296
app.register_blueprint(server_blueprint)
9397
app.register_blueprint(settings_blueprint)
9498
app.register_blueprint(webhooks_blueprint)

‎invenio_circulation/bundles.py

+10-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,16 @@
3535

3636
js = NpmBundle(
3737
'node_modules/angular/angular.js',
38-
'js/circulation/app.js',
38+
'js/circulation/circulation.module.js',
39+
'js/circulation/circulation.controller.js',
40+
'js/circulation/circulationSearch.factory.js',
41+
'js/circulation/ItemStore.factory.js',
42+
'js/circulation/SettingsStore.factory.js',
43+
'js/circulation/circulationSearch.directive.js',
44+
'js/circulation/circulationAdminItem.directive.js',
45+
'js/circulation/userSearch.directive.js',
46+
'js/circulation/userSearch.factory.js',
47+
'js/circulation/UserStore.factory.js',
3948
filters='jsmin',
4049
output='gen/circulation.%(version)s.js',
4150
npm={

‎invenio_circulation/receivers.py

+6-1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
"""Circulation webhooks."""
2727

2828
from invenio_db import db
29+
from invenio_pidstore.resolver import Resolver
2930
from invenio_webhooks.models import Receiver
3031

3132
from .api import Item
@@ -45,7 +46,11 @@ def run(self, event):
4546
This method builds the frame, fetching the item and calling *_run*
4647
in a nested transaction.
4748
"""
48-
item = Item.get_record(event.payload['item_id'])
49+
resolver = Resolver(pid_type='crcitm', object_type='rec',
50+
getter=Item.get_record)
51+
_, item = resolver.resolve(event.payload['item_id'])
52+
53+
# item = Item.get_record(event.payload['item_id'])
4954
self.circulation_event_schema.context['item'] = item
5055

5156
data, errors = self.circulation_event_schema.load(event.payload)

‎invenio_circulation/static/js/circulation/ItemStore.factory.js

+124
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,124 @@
1+
/*
2+
* This file is part of invenio.
3+
* Copyright (C) 2016 CERN.
4+
*
5+
* invenio is free software; you can redistribute it and/or
6+
* modify it under the terms of the GNU General Public License as
7+
* published by the Free Software Foundation; either version 2 of the
8+
* License, or (at your option) any later version.
9+
*
10+
* invenio is distributed in the hope that it will be useful, but
11+
* WITHOUT ANY WARRANTY; without even the implied warranty of
12+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13+
* General Public License for more details.
14+
*
15+
* You should have received a copy of the GNU General Public License
16+
* along with invenio; if not, write to the Free Software Foundation, Inc.,
17+
* 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
18+
*
19+
* In applying this license, CERN does not
20+
* waive the privileges and immunities granted to it by virtue of its status
21+
* as an Intergovernmental Organization or submit itself to any jurisdiction.
22+
*/
23+
24+
(function (angular) {
25+
angular
26+
.module('circulation')
27+
.factory('ItemStore', ItemStore)
28+
29+
ItemStore.$inject = ['$http', 'SettingsStore']
30+
31+
function ItemStore($http, SettingsStore) {
32+
items = [];
33+
itemActions = [];
34+
35+
var service = {
36+
items: items,
37+
itemActions: itemActions,
38+
validateActionsOnItem: validateActionsOnItem,
39+
validateItems: validateItems,
40+
performActionOnItem: performActionOnItem,
41+
extend: extend,
42+
remove: remove,
43+
getItemsActionState: getItemsActionState,
44+
};
45+
46+
return service;
47+
48+
function validateActionsOnItem(index, actions) {
49+
actions.forEach(function(val) {
50+
51+
var data = SettingsStore.getPayload();
52+
data.item_id = items[index].id;
53+
data.dry_run = true;
54+
55+
$http({
56+
method: 'POST',
57+
url: '/hooks/receivers/circulation_' + val[1] + '/events/',
58+
headers: {
59+
'Content-Type': 'application/json'
60+
},
61+
data: data,
62+
}).then(function (response) {
63+
itemActions[index][val[0]] = 1;
64+
}, function (response) {
65+
itemActions[index][val[0]] = -1;
66+
});
67+
})
68+
}
69+
70+
function validateItems(actions) {
71+
for (var i=0; i < items.length; i++) {
72+
validateActionsOnItem(i, actions);
73+
}
74+
}
75+
76+
function performActionOnItem(index, action) {
77+
var data = SettingsStore.getPayload();
78+
data.item_id = items[index].id;
79+
80+
$http({
81+
method: 'POST',
82+
url: '/hooks/receivers/circulation_' + action + '/events/',
83+
headers: {
84+
'Content-Type': 'application/json'
85+
},
86+
data: data,
87+
}).then(function (response) {
88+
console.log('Success');
89+
}, function (response) {
90+
console.log('Failure');
91+
});
92+
93+
}
94+
95+
function getItemsActionState(action) {
96+
if (itemActions.length == 0) {
97+
return 0;
98+
}
99+
100+
var actionState = 1;
101+
102+
itemActions.forEach(function(val) {
103+
if (val[action] == -1) {
104+
actionState = -1;
105+
}
106+
});
107+
108+
return actionState
109+
}
110+
111+
function extend(values) {
112+
values.forEach(function(val) {
113+
items.push(val);
114+
itemActions.push({});
115+
});
116+
}
117+
118+
function remove(index) {
119+
items.splice(index, 1);
120+
itemActions.splice(index, 1);
121+
}
122+
123+
}
124+
})(angular);

‎invenio_circulation/static/js/circulation/SettingsStore.factory.js

+75
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
/*
2+
* This file is part of invenio.
3+
* Copyright (C) 2016 CERN.
4+
*
5+
* invenio is free software; you can redistribute it and/or
6+
* modify it under the terms of the GNU General Public License as
7+
* published by the Free Software Foundation; either version 2 of the
8+
* License, or (at your option) any later version.
9+
*
10+
* invenio is distributed in the hope that it will be useful, but
11+
* WITHOUT ANY WARRANTY; without even the implied warranty of
12+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13+
* General Public License for more details.
14+
*
15+
* You should have received a copy of the GNU General Public License
16+
* along with invenio; if not, write to the Free Software Foundation, Inc.,
17+
* 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
18+
*
19+
* In applying this license, CERN does not
20+
* waive the privileges and immunities granted to it by virtue of its status
21+
* as an Intergovernmental Organization or submit itself to any jurisdiction.
22+
*/
23+
24+
(function (angular) {
25+
angular
26+
.module('circulation')
27+
.factory('SettingsStore', SettingsStore)
28+
29+
SettingsStore.$inject = ['UserStore']
30+
31+
function SettingsStore(UserStore) {
32+
settings = {
33+
startDate: '',
34+
endDate: '',
35+
delivery: ['mail', 'pickup'],
36+
selectedDelivery: 'mail',
37+
getActiveUserId: getActiveUserId,
38+
}
39+
40+
var service = {
41+
settings: settings,
42+
getPayload: getPayload,
43+
};
44+
45+
return service;
46+
47+
function getActiveUserId() {
48+
if (UserStore.users.length > 0) {
49+
return UserStore.users[0].id;
50+
} else {
51+
return null
52+
}
53+
}
54+
55+
function getPayload() {
56+
data = {
57+
'user_id': getActiveUserId(),
58+
'start_date': settings.startDate,
59+
'end_date': settings.endDate,
60+
'delivery': settings.selectedDelivery,
61+
}
62+
63+
for (var property in data) {
64+
if (data.hasOwnProperty(property)) {
65+
if (data[property] == '' || data[property] == null) {
66+
delete data[property];
67+
}
68+
}
69+
}
70+
71+
return data
72+
}
73+
74+
}
75+
})(angular);

‎invenio_circulation/static/js/circulation/UserStore.factory.js

+51
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
/*
2+
* This file is part of invenio.
3+
* Copyright (C) 2016 CERN.
4+
*
5+
* invenio is free software; you can redistribute it and/or
6+
* modify it under the terms of the GNU General Public License as
7+
* published by the Free Software Foundation; either version 2 of the
8+
* License, or (at your option) any later version.
9+
*
10+
* invenio is distributed in the hope that it will be useful, but
11+
* WITHOUT ANY WARRANTY; without even the implied warranty of
12+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13+
* General Public License for more details.
14+
*
15+
* You should have received a copy of the GNU General Public License
16+
* along with invenio; if not, write to the Free Software Foundation, Inc.,
17+
* 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
18+
*
19+
* In applying this license, CERN does not
20+
* waive the privileges and immunities granted to it by virtue of its status
21+
* as an Intergovernmental Organization or submit itself to any jurisdiction.
22+
*/
23+
24+
(function (angular) {
25+
angular
26+
.module('circulation')
27+
.factory('UserStore', UserStore)
28+
29+
function UserStore() {
30+
users = [];
31+
32+
var service = {
33+
users: users,
34+
extend: extend,
35+
remove: remove,
36+
};
37+
38+
return service;
39+
40+
function extend(values) {
41+
values.forEach(function(val) {
42+
users.push(val);
43+
});
44+
}
45+
46+
function remove(index) {
47+
users.splice(index, 1);
48+
}
49+
50+
}
51+
})(angular);

0 commit comments

Comments
 (0)