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

Commit 96dc87a

Browse files
mvespermvesper
committed
global: admin UI first draft
* Adds the first implementation of the admin user interface.
1 parent cbaa4ca commit 96dc87a

22 files changed

+758
-21
lines changed

‎.travis.yml

+6-4
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,9 @@ services:
4040

4141

4242
env:
43-
- REQUIREMENTS=lowest ES_HOST=127.0.0.1 ES_VERSION=2.2.0 SQLALCHEMY_DATABASE_URI="postgresql+psycopg2://postgres@localhost:5432/invenio"
44-
- REQUIREMENTS=release ES_HOST=127.0.0.1 ES_VERSION=2.2.0 SQLALCHEMY_DATABASE_URI="postgresql+psycopg2://postgres@localhost:5432/invenio"
43+
# TODO: comment in once invenio-accounts-rest is on pypi
44+
# - REQUIREMENTS=lowest ES_HOST=127.0.0.1 ES_VERSION=2.2.0 SQLALCHEMY_DATABASE_URI="postgresql+psycopg2://postgres@localhost:5432/invenio"
45+
#- REQUIREMENTS=release ES_HOST=127.0.0.1 ES_VERSION=2.2.0 SQLALCHEMY_DATABASE_URI="postgresql+psycopg2://postgres@localhost:5432/invenio"
4546
- REQUIREMENTS=devel ES_HOST=127.0.0.1 ES_VERSION=2.2.0 SQLALCHEMY_DATABASE_URI="postgresql+psycopg2://postgres@localhost:5432/invenio"
4647

4748
python:
@@ -57,8 +58,9 @@ before_install:
5758
- "sleep 30"
5859
- "travis_retry pip install --upgrade pip setuptools py"
5960
- "travis_retry pip install twine wheel coveralls requirements-builder"
60-
- "requirements-builder -e all --level=min setup.py > .travis-lowest-requirements.txt"
61-
- "requirements-builder -e all --level=pypi setup.py > .travis-release-requirements.txt"
61+
# TODO: comment in once invenio-accounts-rest is on pypi
62+
# - "requirements-builder -e all --level=min setup.py > .travis-lowest-requirements.txt"
63+
# - "requirements-builder -e all --level=pypi setup.py > .travis-release-requirements.txt"
6264
- "requirements-builder -e all --level=dev --req requirements-devel.txt setup.py > .travis-devel-requirements.txt"
6365
- "travis_retry npm install -g clean-css jsmin"
6466
- "mysql -e 'CREATE DATABASE IF NOT EXISTS invenio;' -uroot"

‎examples/app.py

+7-1
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,13 @@
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
46+
from invenio_accounts_rest import InvenioAccountsREST
4547
from invenio_assets import InvenioAssets
4648
from invenio_db import InvenioDB
4749
from invenio_indexer import InvenioIndexer
4850
from invenio_jsonschemas import InvenioJSONSchemas
49-
from invenio_oauth2server import InvenioOAuth2Server
51+
from invenio_oauth2server import InvenioOAuth2Server, InvenioOAuth2ServerREST
5052
from invenio_oauth2server.views import server_blueprint, settings_blueprint
5153
from invenio_pidstore import InvenioPIDStore
5254
from invenio_records import InvenioRecords
@@ -70,12 +72,14 @@
7072
OAUTH2SERVER_CLIENT_SECRET_SALT_LEN=60,
7173
OAUTH2SERVER_TOKEN_PERSONAL_SALT_LEN=60,
7274
SECRET_KEY='changeme',
75+
ASSETS_DEBUG=True,
7376
)
7477

7578
Babel(app)
7679
Menu(app)
7780
Breadcrumbs(app)
7881
InvenioAccounts(app)
82+
InvenioAccountsREST(app)
7983
InvenioAssets(app)
8084
InvenioDB(app)
8185
InvenioSearch(app)
@@ -86,9 +90,11 @@
8690
InvenioRecordsREST(app)
8791
InvenioWebhooks(app)
8892
InvenioOAuth2Server(app)
93+
InvenioOAuth2ServerREST(app)
8994
InvenioCirculation(app)
9095
InvenioCirculationREST(app)
9196

97+
app.register_blueprint(accounts_blueprint)
9298
app.register_blueprint(server_blueprint)
9399
app.register_blueprint(settings_blueprint)
94100
app.register_blueprint(webhooks_blueprint)

‎invenio_circulation/bundles.py

+12-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,18 @@
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',
48+
'js/circulation/configSetter.directive.js',
49+
'js/circulation/Config.factory.js',
3950
filters='jsmin',
4051
output='gen/circulation.%(version)s.js',
4152
npm={

‎invenio_circulation/config.py

+10
Original file line numberDiff line numberDiff line change
@@ -53,3 +53,13 @@
5353
}
5454
}
5555
"""Basic REST circulation configuration."""
56+
57+
CIRCULATION_ITEM_SEARCH_API = '/circulation/items/'
58+
"""Configure the item search engine endpoint."""
59+
60+
CIRCULATION_USER_SEARCH_API = '/users/'
61+
"""Configure the user search engine endpoint."""
62+
63+
CIRCULATION_ACTION_LOAN_URL = '/hooks/receivers/circulation_loan/events/'
64+
CIRCULATION_ACTION_REQUEST_URL = '/hooks/receivers/circulation_request/events/'
65+
CIRCULATION_ACTION_RETURN_URL = '/hooks/receivers/circulation_return/events/'

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

+41
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
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('Config', Config)
28+
29+
Config.$inject = []
30+
31+
function Config(UserStore) {
32+
config = {};
33+
34+
var service = {
35+
config: config,
36+
};
37+
38+
return service;
39+
40+
}
41+
})(angular);

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

+123
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,123 @@
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, actionEndpoints) {
49+
angular.forEach(actionEndpoints, function(url, action) {
50+
var data = SettingsStore.getPayload();
51+
data.item_id = items[index].id;
52+
data.dry_run = true;
53+
54+
$http({
55+
method: 'POST',
56+
url: url,
57+
headers: {
58+
'Content-Type': 'application/json'
59+
},
60+
data: data,
61+
}).then(function (response) {
62+
itemActions[index][action] = 1;
63+
}, function (response) {
64+
itemActions[index][action] = -1;
65+
});
66+
})
67+
}
68+
69+
function validateItems(actionEndpoints) {
70+
for (var i=0; i < items.length; i++) {
71+
validateActionsOnItem(i, actionEndpoints);
72+
}
73+
}
74+
75+
function performActionOnItem(index, actionEndpoint) {
76+
var data = SettingsStore.getPayload();
77+
data.item_id = items[index].id;
78+
79+
$http({
80+
method: 'POST',
81+
url: actionEndpoint,
82+
headers: {
83+
'Content-Type': 'application/json'
84+
},
85+
data: data,
86+
}).then(function (response) {
87+
console.log('Success');
88+
}, function (response) {
89+
console.log('Failure');
90+
});
91+
92+
}
93+
94+
function getItemsActionState(action) {
95+
if (itemActions.length == 0) {
96+
return 0;
97+
}
98+
99+
var actionState = 1;
100+
101+
itemActions.forEach(function(val) {
102+
if (val[action] == -1) {
103+
actionState = -1;
104+
}
105+
});
106+
107+
return actionState
108+
}
109+
110+
function extend(values) {
111+
values.forEach(function(val) {
112+
items.push(val);
113+
itemActions.push({});
114+
});
115+
}
116+
117+
function remove(index) {
118+
items.splice(index, 1);
119+
itemActions.splice(index, 1);
120+
}
121+
122+
}
123+
})(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)