diff --git a/reforis-{{cookiecutter.plugin_name_kebab}}/Makefile b/reforis-{{cookiecutter.plugin_name_kebab}}/Makefile index 14060b1480a4869043dd2d4eefc68f237ca38cc5..78b079b0dd566c315de8bfa4cb2990855eb52e35 100644 --- a/reforis-{{cookiecutter.plugin_name_kebab}}/Makefile +++ b/reforis-{{cookiecutter.plugin_name_kebab}}/Makefile @@ -55,7 +55,8 @@ prepare-dev: install: $(ROUTER_PYTHON) -m pip install -e . - ln -sf /tmp/reforis_{{cookiecutter.plugin_name_snake}}/reforis_static/reforis_{{cookiecutter.plugin_name_snake}} /tmp/reforis/reforis_static/ + ln -sf /tmp/reforis-{{cookiecutter.plugin_name_kebab}}/reforis_static/reforis_{{cookiecutter.plugin_name_snake}} /tmp/reforis/reforis_static/ + /etc/init.d/lighttpd restart install-js: js/package.json cd $(JS_DIR); npm install --save-dev install-local-reforis: diff --git a/reforis-{{cookiecutter.plugin_name_kebab}}/js/webpack.config.js b/reforis-{{cookiecutter.plugin_name_kebab}}/js/webpack.config.js index 82f86a0071c17ec28caf0e85c9666b430f52b69e..d4026f7dc5cca16966c4094c2a52ec11e886e2cf 100644 --- a/reforis-{{cookiecutter.plugin_name_kebab}}/js/webpack.config.js +++ b/reforis-{{cookiecutter.plugin_name_kebab}}/js/webpack.config.js @@ -11,7 +11,7 @@ module.exports = () => ({ mode: "development", entry: "./src/app.js", output: { - // Build js app to ../reforis_static{python_module_name}/js/app.min.js + // Build js app to ../reforis_static{python_module_name}/app.min.js // See https://gitlab.labs.nic.cz/turris/reforis/reforis-distutils/blob/master/reforis_distutils/__init__.py#L11 filename: "app.min.js", path: path.join(__dirname, "../reforis_static/reforis_{{cookiecutter.plugin_name_snake}}/"), diff --git a/reforis-{{cookiecutter.plugin_name_kebab}}/reforis_{{cookiecutter.plugin_name_snake}}/__init__.py b/reforis-{{cookiecutter.plugin_name_kebab}}/reforis_{{cookiecutter.plugin_name_snake}}/__init__.py index 49ae9fa95887ce4ed26e26903cde8f01604293d7..445d0ea33139ceb53889efbd284bc9f574922c28 100644 --- a/reforis-{{cookiecutter.plugin_name_kebab}}/reforis_{{cookiecutter.plugin_name_snake}}/__init__.py +++ b/reforis-{{cookiecutter.plugin_name_kebab}}/reforis_{{cookiecutter.plugin_name_snake}}/__init__.py @@ -9,8 +9,7 @@ from http import HTTPStatus from flask import Blueprint, current_app, jsonify, request from flask_babel import gettext as _ -from reforis.foris_controller_api import APIError -from reforis.foris_controller_api.utils import log_error, validate_json +from reforis.foris_controller_api.utils import log_error, validate_json, APIError # pylint: disable=invalid-name blueprint = Blueprint( @@ -26,7 +25,7 @@ BASE_DIR = Path(__file__).parent 'blueprint': blueprint, # Define {python_module_name}/js/app.min.js # See https://gitlab.labs.nic.cz/turris/reforis/reforis-distutils/blob/master/reforis_distutils/__init__.py#L11 - 'js_app_path': 'reforis_{{cookiecutter.plugin_name_snake}}/js/app.min.js', + 'js_app_path': 'reforis_{{cookiecutter.plugin_name_snake}}/app.min.js', 'translations_path': BASE_DIR / 'translations', } @@ -38,14 +37,10 @@ def get_example(): @blueprint.route('/example', methods=['POST']) def post_example(): - try: - validate_json(request.json, {'modules': list}) - except APIError as error: - return jsonify(error.data), error.status_code + validate_json(request.json, {'modules': list}) response = current_app.backend.perform('example_module', 'example_action', request.json) if response.get('result') is not True: - log_error(current_app, f'Invalid backend response: {response}', request) - return jsonify(_('Cannot create entity')), HTTPStatus.INTERNAL_SERVER_ERROR + raise APIError(_('Cannot create entity'), HTTPStatus.INTERNAL_SERVER_ERROR) return jsonify(response), HTTPStatus.CREATED diff --git a/reforis-{{cookiecutter.plugin_name_kebab}}/setup.py b/reforis-{{cookiecutter.plugin_name_kebab}}/setup.py index c1216a3213f8cd1aadbd6d14c5eba2e2572be126..38903fde455f0ae40925691f86c03c1d5683f924 100644 --- a/reforis-{{cookiecutter.plugin_name_kebab}}/setup.py +++ b/reforis-{{cookiecutter.plugin_name_kebab}}/setup.py @@ -61,7 +61,7 @@ setuptools.setup( 'git+https://gitlab.labs.nic.cz/turris/reforis/reforis-distutils.git#egg=reforis-distutils', ], entry_points={ - 'foris.plugins': f'{NAME} = {NAME}:diagnostics' + 'foris.plugins': f'{NAME} = {NAME}:{{cookiecutter.plugin_name_snake}}' }, classifiers=[ 'Framework :: Flask',