view: change the view routes

docs/conf.py

@@ -21,8 +21,6 @@
 
 import os
 
-import sphinx.environment
-
 # -- General configuration ------------------------------------------------
 
 # If your documentation needs a minimal Sphinx version, state it here.

pyproject.toml

@@ -55,6 +55,7 @@ mock = ">=2.0.0"
 pytest-invenio = ">=1.4.1,<1.5.0"
 safety = ">=1.8"
 appnope = { version = "*", optional = true }
+autoflake = "^1.4"
 
 [build-system]
 requires = ["poetry>=0.12"]

scripts/test

@@ -32,5 +32,6 @@ fi
 safety check -i 39462 && \
 pydocstyle sonar tests docs && \
 isort --check-only --diff "${SCRIPT_PATH}/.." && \
+autoflake  -rc --remove-all-unused-imports --ignore-init-module-imports . && \
 sphinx-build -qnNW docs docs/_build/html && \
 pytest

sonar/config.py

@@ -259,17 +259,27 @@ def _(x):
 SECURITY_REGISTER_USER_TEMPLATE = 'sonar/accounts/signup.html'
 
 RECORDS_UI_ENDPOINTS = {
+    'doc': {
+        'pid_type': 'doc',
+        'route': '/<org_code:view>/documents/<pid_value>',
+        'view_imp': 'sonar.modules.documents.views:detail',
+        'record_class': 'sonar.modules.documents.api:DocumentRecord',
+        'template': 'documents/record.html',
+        'permission_factory_imp': 'sonar.modules.documents.permissions:only_public'
+    },
     'doc_previewer': {
         'pid_type': 'doc',
         'route': '/documents/<pid_value>/preview/<filename>',
         'view_imp': 'invenio_previewer.views:preview',
-        'record_class': 'sonar.modules.documents.api:DocumentRecord'
+        'record_class': 'sonar.modules.documents.api:DocumentRecord',
+        'permission_factory_imp': 'sonar.modules.documents.permissions:only_public'
     },
     'doc_files': {
         'pid_type': 'doc',
         'route': '/documents/<pid_value>/files/<filename>',
         'view_imp': 'invenio_records_files.utils:file_download_ui',
-        'record_class': 'invenio_records_files.api:Record'
+        'record_class': 'invenio_records_files.api:Record',
+        'permission_factory_imp': 'sonar.modules.documents.permissions:only_public'
     },
     'depo_previewer': {
         'pid_type': 'depo',
@@ -295,6 +305,13 @@ def _(x):
         'view_imp': 'invenio_records_files.utils:file_download_ui',
         'record_class': 'invenio_records_files.api:Record'
     },
+    'proj': {
+        'pid_type': 'proj',
+        'route': '/<org_code:view>/projects/<pid_value>',
+        'view_imp': 'sonar.resources.projects.views:detail',
+        'record_class': 'sonar.resources.projects.api:Record',
+        'template': 'sonar/projects/detail.html'
+    }
 }
 """Records UI for sonar."""
 

sonar/ext.py

@@ -20,7 +20,7 @@
 from __future__ import absolute_import, print_function
 
 import jinja2
-from flask import current_app
+from flask import current_app, render_template
 from flask_bootstrap import Bootstrap
 from flask_security import user_registered
 from flask_wiki import Wiki
@@ -41,6 +41,7 @@
     RecordService as ProjectRecordService
 
 from . import config_sonar
+from .route_converters import OrganisationCodeConverter
 
 
 def utility_processor():
@@ -77,6 +78,7 @@ def init_app(self, app):
         """Flask application initialization."""
         self.init_config(app)
         self.create_resources()
+        self.init_views(app)
 
         app.extensions['sonar'] = self
 
@@ -105,6 +107,20 @@ def init_config(self, app):
             if k.startswith('SONAR_APP_'):
                 app.config.setdefault(k, getattr(config_sonar, k))
 
+    def init_views(self, app):
+        """Initialize the main flask views."""
+        app.url_map.converters['org_code'] = OrganisationCodeConverter
+
+        @app.route('/<org_code:view>')
+        def index(view):
+            """Homepage."""
+            return render_template('sonar/frontpage.html')
+
+        @app.template_filter()
+        def nl2br(string):
+            r"""Replace \n to <br>."""
+            return string.replace('\n', '<br>')
+
     def create_resources(self):
         """Create resources."""
         # Initialize the project resource with the corresponding service.

sonar/modules/documents/cli/oaiharvester.py

@@ -21,10 +21,9 @@
 
 import click
 from click.exceptions import ClickException
-from flask import current_app
 from flask.cli import with_appcontext
 from invenio_db import db
-from invenio_oaiharvester.cli import harvest, oaiharvester
+from invenio_oaiharvester.cli import oaiharvester
 from invenio_oaiharvester.models import OAIHarvestConfig
 
 

sonar/modules/documents/dojson/rerodoc/model.py

@@ -22,7 +22,6 @@
 from dojson import utils
 from flask import current_app
 
-from sonar.modules.documents.api import DocumentRecord
 from sonar.modules.documents.dojson.rerodoc.overdo import Overdo
 from sonar.modules.organisations.api import OrganisationRecord
 from sonar.modules.utils import remove_trailing_punctuation