WIP admin: initial implementation

.travis.yml

@@ -40,8 +40,9 @@ services:
 
 
 env:
-  - REQUIREMENTS=lowest ES_HOST=127.0.0.1 ES_VERSION=2.2.0 SQLALCHEMY_DATABASE_URI="postgresql+psycopg2://postgres@localhost:5432/invenio"
-  - REQUIREMENTS=release ES_HOST=127.0.0.1 ES_VERSION=2.2.0 SQLALCHEMY_DATABASE_URI="postgresql+psycopg2://postgres@localhost:5432/invenio"
+    # TODO: comment in once invenio-accounts-rest is on pypi
+    #  - REQUIREMENTS=lowest ES_HOST=127.0.0.1 ES_VERSION=2.2.0 SQLALCHEMY_DATABASE_URI="postgresql+psycopg2://postgres@localhost:5432/invenio"
+    #- REQUIREMENTS=release ES_HOST=127.0.0.1 ES_VERSION=2.2.0 SQLALCHEMY_DATABASE_URI="postgresql+psycopg2://postgres@localhost:5432/invenio"
   - REQUIREMENTS=devel ES_HOST=127.0.0.1 ES_VERSION=2.2.0 SQLALCHEMY_DATABASE_URI="postgresql+psycopg2://postgres@localhost:5432/invenio"
 
 python:
@@ -57,8 +58,9 @@ before_install:
   - "sleep 30"
   - "travis_retry pip install --upgrade pip setuptools py"
   - "travis_retry pip install twine wheel coveralls requirements-builder"
-  - "requirements-builder -e all --level=min setup.py > .travis-lowest-requirements.txt"
-  - "requirements-builder -e all --level=pypi setup.py > .travis-release-requirements.txt"
+  # TODO: comment in once invenio-accounts-rest is on pypi
+  # - "requirements-builder -e all --level=min setup.py > .travis-lowest-requirements.txt"
+  # - "requirements-builder -e all --level=pypi setup.py > .travis-release-requirements.txt"
   - "requirements-builder -e all --level=dev --req requirements-devel.txt setup.py > .travis-devel-requirements.txt"
   - "travis_retry npm install -g clean-css jsmin"
   - "mysql -e 'CREATE DATABASE IF NOT EXISTS invenio;' -uroot"

examples/app.py

@@ -42,11 +42,13 @@
 from flask_breadcrumbs import Breadcrumbs
 from flask_menu import Menu
 from invenio_accounts import InvenioAccounts
+from invenio_accounts.views import blueprint as accounts_blueprint
+from invenio_accounts_rest import InvenioAccountsREST
 from invenio_assets import InvenioAssets
 from invenio_db import InvenioDB
 from invenio_indexer import InvenioIndexer
 from invenio_jsonschemas import InvenioJSONSchemas
-from invenio_oauth2server import InvenioOAuth2Server
+from invenio_oauth2server import InvenioOAuth2Server, InvenioOAuth2ServerREST
 from invenio_oauth2server.views import server_blueprint, settings_blueprint
 from invenio_pidstore import InvenioPIDStore
 from invenio_records import InvenioRecords
@@ -70,12 +72,14 @@
     OAUTH2SERVER_CLIENT_SECRET_SALT_LEN=60,
     OAUTH2SERVER_TOKEN_PERSONAL_SALT_LEN=60,
     SECRET_KEY='changeme',
+    ASSETS_DEBUG=True,
 )
 
 Babel(app)
 Menu(app)
 Breadcrumbs(app)
 InvenioAccounts(app)
+InvenioAccountsREST(app)
 InvenioAssets(app)
 InvenioDB(app)
 InvenioSearch(app)
@@ -86,9 +90,11 @@
 InvenioRecordsREST(app)
 InvenioWebhooks(app)
 InvenioOAuth2Server(app)
+InvenioOAuth2ServerREST(app)
 InvenioCirculation(app)
 InvenioCirculationREST(app)
 
+app.register_blueprint(accounts_blueprint)
 app.register_blueprint(server_blueprint)
 app.register_blueprint(settings_blueprint)
 app.register_blueprint(webhooks_blueprint)

invenio_circulation/bundles.py

@@ -35,7 +35,18 @@
 
 js = NpmBundle(
     'node_modules/angular/angular.js',
-    'js/circulation/app.js',
+    'js/circulation/circulation.module.js',
+    'js/circulation/circulation.controller.js',
+    'js/circulation/circulationSearch.factory.js',
+    'js/circulation/ItemStore.factory.js',
+    'js/circulation/SettingsStore.factory.js',
+    'js/circulation/circulationSearch.directive.js',
+    'js/circulation/circulationAdminItem.directive.js',
+    'js/circulation/userSearch.directive.js',
+    'js/circulation/userSearch.factory.js',
+    'js/circulation/UserStore.factory.js',
+    'js/circulation/configSetter.directive.js',
+    'js/circulation/Config.factory.js',
     filters='jsmin',
     output='gen/circulation.%(version)s.js',
     npm={

invenio_circulation/config.py

@@ -53,3 +53,13 @@
     }
 }
 """Basic REST circulation configuration."""
+
+CIRCULATION_ITEM_SEARCH_API = '/circulation/items/'
+"""Configure the item search engine endpoint."""
+
+CIRCULATION_USER_SEARCH_API = '/users/'
+"""Configure the user search engine endpoint."""
+
+CIRCULATION_ACTION_LOAN_URL = '/hooks/receivers/circulation_loan/events/'
+CIRCULATION_ACTION_REQUEST_URL = '/hooks/receivers/circulation_request/events/'
+CIRCULATION_ACTION_RETURN_URL = '/hooks/receivers/circulation_return/events/'

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

@@ -0,0 +1,41 @@
+/*
+ * This file is part of invenio.
+ * Copyright (C) 2016 CERN.
+ *
+ * invenio is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * invenio is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with invenio; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * In applying this license, CERN does not
+ * waive the privileges and immunities granted to it by virtue of its status
+ * as an Intergovernmental Organization or submit itself to any jurisdiction.
+ */
+
+(function (angular) {
+  angular
+    .module('circulation')
+    .factory('Config', Config)
+
+  Config.$inject = []
+
+  function Config(UserStore) {
+    config = {};
+
+    var service = {
+      config: config,
+    };
+
+    return service;
+
+  }
+})(angular);

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

@@ -0,0 +1,123 @@
+/*
+ * This file is part of invenio.
+ * Copyright (C) 2016 CERN.
+ *
+ * invenio is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * invenio is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with invenio; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * In applying this license, CERN does not
+ * waive the privileges and immunities granted to it by virtue of its status
+ * as an Intergovernmental Organization or submit itself to any jurisdiction.
+ */
+
+(function (angular) {
+  angular
+    .module('circulation')
+    .factory('ItemStore', ItemStore)
+
+  ItemStore.$inject = ['$http', 'SettingsStore']
+
+  function ItemStore($http, SettingsStore) {
+    items = [];
+    itemActions = [];
+
+    var service = {
+      items: items,
+      itemActions: itemActions,
+      validateActionsOnItem: validateActionsOnItem,
+      validateItems: validateItems,
+      performActionOnItem: performActionOnItem,
+      extend: extend,
+      remove: remove,
+      getItemsActionState: getItemsActionState,
+    };
+
+    return service;
+
+    function validateActionsOnItem(index, actionEndpoints) {
+      angular.forEach(actionEndpoints, function(url, action) {
+        var data = SettingsStore.getPayload();
+        data.item_id = items[index].id;
+        data.dry_run = true;
+
+        $http({
+          method: 'POST',
+          url: url,
+          headers: {
+            'Content-Type': 'application/json'
+          },
+          data: data,
+        }).then(function (response) {
+          itemActions[index][action] = 1;
+        }, function (response) {
+          itemActions[index][action] = -1;
+        });
+       })
+    }
+
+    function validateItems(actionEndpoints) {
+      for (var i=0; i < items.length; i++) {
+        validateActionsOnItem(i, actionEndpoints);
+      }
+    }
+
+    function performActionOnItem(index, actionEndpoint) {
+      var data = SettingsStore.getPayload();
+      data.item_id = items[index].id;
+
+      $http({
+        method: 'POST',
+        url: actionEndpoint,
+        headers: {
+          'Content-Type': 'application/json'
+        },
+        data: data,
+      }).then(function (response) {
+        console.log('Success');
+      }, function (response) {
+        console.log('Failure');
+      });
+
+    }
+
+    function getItemsActionState(action) {
+      if (itemActions.length == 0) {
+        return 0;
+      }
+
+      var actionState = 1;
+
+      itemActions.forEach(function(val) {
+        if (val[action] == -1) {
+          actionState = -1;
+        }
+      });
+
+      return actionState
+    }
+
+    function extend(values) {
+      values.forEach(function(val) {
+        items.push(val);
+        itemActions.push({});
+      });
+    }
+
+    function remove(index) {
+      items.splice(index, 1);
+      itemActions.splice(index, 1);
+    }
+
+  }
+})(angular);

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

@@ -0,0 +1,75 @@
+/*
+ * This file is part of invenio.
+ * Copyright (C) 2016 CERN.
+ *
+ * invenio is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * invenio is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with invenio; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * In applying this license, CERN does not
+ * waive the privileges and immunities granted to it by virtue of its status
+ * as an Intergovernmental Organization or submit itself to any jurisdiction.
+ */
+
+(function (angular) {
+  angular
+    .module('circulation')
+    .factory('SettingsStore', SettingsStore)
+
+  SettingsStore.$inject = ['UserStore']
+
+  function SettingsStore(UserStore) {
+    settings = {
+      startDate: '',
+      endDate: '',
+      delivery: ['mail', 'pickup'],
+      selectedDelivery: 'mail',
+      getActiveUserId: getActiveUserId,
+    }
+
+    var service = {
+      settings: settings,
+      getPayload: getPayload,
+    };
+
+    return service;
+
+    function getActiveUserId() {
+      if (UserStore.users.length > 0) {
+        return UserStore.users[0].id;
+      } else {
+        return null
+      }
+    }
+
+    function getPayload() {
+      data = {
+        'user_id': getActiveUserId(),
+        'start_date': settings.startDate,
+        'end_date': settings.endDate,
+        'delivery': settings.selectedDelivery,
+      }
+
+      for (var property in data) {
+        if (data.hasOwnProperty(property)) {
+          if (data[property] == '' || data[property] == null) {
+            delete data[property];
+          }
+        }
+      }
+
+      return data
+    }
+
+  }
+})(angular);

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

@@ -0,0 +1,51 @@
+/*
+ * This file is part of invenio.
+ * Copyright (C) 2016 CERN.
+ *
+ * invenio is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * invenio is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with invenio; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * In applying this license, CERN does not
+ * waive the privileges and immunities granted to it by virtue of its status
+ * as an Intergovernmental Organization or submit itself to any jurisdiction.
+ */
+
+(function (angular) {
+  angular
+    .module('circulation')
+    .factory('UserStore', UserStore)
+
+  function UserStore() {
+    users = [];
+
+    var service = {
+      users: users,
+      extend: extend,
+      remove: remove,
+    };
+
+    return service;
+
+    function extend(values) {
+      values.forEach(function(val) {
+        users.push(val);
+      });
+    }
+
+    function remove(index) {
+      users.splice(index, 1);
+    }
+
+  }
+})(angular);