From 5837e0502410bad5734d569f0f2b5df72ea063e8 Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Wed, 15 Feb 2023 16:17:25 +0100 Subject: [PATCH 001/177] Add routes for CorpusFollower permission management --- app/corpora/routes.py | 99 +++++++++++++++++++++--------------------- app/static/js/Utils.js | 38 ++++++++++++++++ 2 files changed, 87 insertions(+), 50 deletions(-) diff --git a/app/corpora/routes.py b/app/corpora/routes.py index 4b10fa2c..8d2dd45f 100644 --- a/app/corpora/routes.py +++ b/app/corpora/routes.py @@ -7,15 +7,21 @@ from flask import ( redirect, render_template, request, - send_from_directory, - url_for + send_from_directory ) from flask_login import current_user, login_required from threading import Thread import jwt import os from app import db, hashids -from app.models import Corpus, CorpusFile, CorpusStatus, User +from app.models import ( + Corpus, + CorpusFile, + CorpusFollowerAssociation, + CorpusFollowPermission, + CorpusStatus, + User +) from . import bp from .forms import ( CreateCorpusFileForm, @@ -24,23 +30,6 @@ from .forms import ( ) -# @bp.route('/share/', methods=['GET', 'POST']) -# def share_corpus(token): -# try: -# payload = jwt.decode( -# token, -# current_app.config['SECRET_KEY'], -# algorithms=['HS256'], -# issuer=current_app.config['SERVER_NAME'], -# options={'require': ['iat', 'iss', 'sub']} -# ) -# except jwt.PyJWTError: -# return False -# corpus_hashid = payload.get('sub') -# corpus_id = hashids.decode(corpus_hashid) -# return redirect(url_for('.corpus', corpus_id=corpus_id)) - - @bp.route('//enable_is_public', methods=['POST']) @login_required def enable_corpus_is_public(corpus_id): @@ -63,24 +52,22 @@ def disable_corpus_is_public(corpus_id): return '', 204 -# @bp.route('//follow', methods=['GET', 'POST']) +# @bp.route('//follow/') # @login_required -# def follow_corpus(corpus_id): -# corpus = Corpus.query.get_or_404(corpus_id) -# user_hashid = request.args.get('user_id') -# if user_hashid is None: -# user = current_user -# else: -# if not current_user.is_administrator(): -# abort(403) -# else: -# user_id = hashids.decode(user_hashid) -# user = User.query.get_or_404(user_id) -# if not user.is_following_corpus(corpus): -# user.follow_corpus(corpus) -# db.session.commit() -# flash(f'You are following {corpus.title} now', category='corpus') -# return {}, 202 +# def follow_corpus(corpus_id, token): +# try: +# payload = jwt.decode( +# token, +# current_app.config['SECRET_KEY'], +# algorithms=['HS256'], +# issuer=current_app.config['SERVER_NAME'], +# options={'require': ['iat', 'iss', 'sub']} +# ) +# except jwt.PyJWTError: +# return False +# corpus_hashid = payload.get('sub') +# corpus_id = hashids.decode(corpus_hashid) +# return redirect(url_for('.corpus', corpus_id=corpus_id)) @bp.route('//unfollow', methods=['GET', 'POST']) @@ -99,23 +86,35 @@ def unfollow_corpus(corpus_id): user.unfollow_corpus(corpus) db.session.commit() flash(f'You are not following {corpus.title} anymore', category='corpus') - return {}, 202 + return '', 204 -# @bp.route('/add_permission///') -# def add_permission(corpus_id, user_id, permission): -# a = CorpusFollowerAssociation.query.filter_by(followed_corpus_id=corpus_id, following_user_id=user_id).first_or_404() -# a.add_permission(permission) -# db.session.commit() -# return 'ok' +@bp.route('//followers//permissions/add', methods=['POST']) +def add_permission(corpus_id, user_id, permission): + corpus_follow_association = CorpusFollowerAssociation.query.filter_by(followed_corpus_id=corpus_id, following_user_id=user_id).first_or_404() + permission = request.args.get('permission', type=int) + corpus = corpus_follow_association.followed_corpus + if not (corpus.user == current_user or current_user.is_administrator()): + abort(403) + if permission is None or permission not in iter(CorpusFollowPermission): + abort(400) + corpus_follow_association.add_permission(permission) + db.session.commit() + return '', 204 -# @bp.route('/remove_permission///') -# def remove_permission(corpus_id, user_id, permission): -# a = CorpusFollowerAssociation.query.filter_by(followed_corpus_id=corpus_id, following_user_id=user_id).first_or_404() -# a.remove_permission(permission) -# db.session.commit() -# return 'ok' +@bp.route('//followers//permissions/remove', methods=['POST']) +def remove_permission(corpus_id, user_id, permission): + corpus_follow_association = CorpusFollowerAssociation.query.filter_by(followed_corpus_id=corpus_id, following_user_id=user_id).first_or_404() + permission = request.args.get('permission') + corpus = corpus_follow_association.followed_corpus + if not (corpus.user == current_user or current_user.is_administrator()): + abort(403) + if permission is None or permission not in iter(CorpusFollowPermission): + abort(400) + corpus_follow_association.remove_permission(permission) + db.session.commit() + return '', 204 @bp.route('/public') diff --git a/app/static/js/Utils.js b/app/static/js/Utils.js index aee382a0..e2ac84ab 100644 --- a/app/static/js/Utils.js +++ b/app/static/js/Utils.js @@ -69,6 +69,44 @@ class Utils { return Utils.mergeObjectsDeep(mergedObject, ...objects.slice(2)); } + static addCorpusFollowerPermissionRequest(corpusId, followerId, permission) { + return new Promise((resolve, reject) => { + fetch(`/corpora/${corpusId}/followers/${followerId}/add_permission?permission=${permission}`, {method: 'POST', headers: {Accept: 'application/json'}}) + .then( + (response) => { + if (response.status === 400) {app.flash('Bad Request', 'error'); reject(response);} + if (response.status === 403) {app.flash('Forbidden', 'error'); reject(response);} + if (response.status === 404) {app.flash('Not Found', 'error'); reject(response);} + app.flash(`Permission added`, 'corpus'); + resolve(response); + }, + (response) => { + app.flash('Something went wrong', 'error'); + reject(response); + } + ); + }); + } + + static removeCorpusFollowerPermissionRequest(corpusId, followerId, permission) { + return new Promise((resolve, reject) => { + fetch(`/corpora/${corpusId}/followers/${followerId}/remove_permission?permission=${permission}`, {method: 'POST', headers: {Accept: 'application/json'}}) + .then( + (response) => { + if (response.status === 400) {app.flash('Bad Request', 'error'); reject(response);} + if (response.status === 403) {app.flash('Forbidden', 'error'); reject(response);} + if (response.status === 404) {app.flash('Not Found', 'error'); reject(response);} + app.flash(`Permission removed`, 'corpus'); + resolve(response); + }, + (response) => { + app.flash('Something went wrong', 'error'); + reject(response); + } + ); + }); + } + static enableCorpusIsPublicRequest(userId, corpusId) { return new Promise((resolve, reject) => { let corpus; From 2dc41fd3871a3624362c9a19e8e16b06390fe09c Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Mon, 20 Feb 2023 10:40:33 +0100 Subject: [PATCH 002/177] Add CorpusFollowerList and functions --- app/corpora/routes.py | 38 ++--- app/models.py | 34 +++- .../js/ResourceLists/CorpusFollowerList.js | 158 ++++++++++++++++++ app/static/js/ResourceLists/ResourceList.js | 1 + app/static/js/Utils.js | 14 +- app/static/js_new/App.js | 10 ++ app/templates/_scripts.html.j2 | 1 + app/templates/corpora/corpus.html.j2 | 16 +- 8 files changed, 234 insertions(+), 38 deletions(-) create mode 100644 app/static/js/ResourceLists/CorpusFollowerList.js create mode 100644 app/static/js_new/App.js diff --git a/app/corpora/routes.py b/app/corpora/routes.py index 8d2dd45f..a3aca488 100644 --- a/app/corpora/routes.py +++ b/app/corpora/routes.py @@ -18,7 +18,7 @@ from app.models import ( Corpus, CorpusFile, CorpusFollowerAssociation, - CorpusFollowPermission, + CorpusFollowerPermission, CorpusStatus, User ) @@ -30,7 +30,7 @@ from .forms import ( ) -@bp.route('//enable_is_public', methods=['POST']) +@bp.route('//is_public/enable', methods=['POST']) @login_required def enable_corpus_is_public(corpus_id): corpus = Corpus.query.get_or_404(corpus_id) @@ -41,7 +41,7 @@ def enable_corpus_is_public(corpus_id): return '', 204 -@bp.route('//disable_is_public', methods=['POST']) +@bp.route('//is_public/disable', methods=['POST']) @login_required def disable_corpus_is_public(corpus_id): corpus = Corpus.query.get_or_404(corpus_id) @@ -89,30 +89,30 @@ def unfollow_corpus(corpus_id): return '', 204 -@bp.route('//followers//permissions/add', methods=['POST']) -def add_permission(corpus_id, user_id, permission): - corpus_follow_association = CorpusFollowerAssociation.query.filter_by(followed_corpus_id=corpus_id, following_user_id=user_id).first_or_404() - permission = request.args.get('permission', type=int) - corpus = corpus_follow_association.followed_corpus +@bp.route('//followers//permissions//add', methods=['POST']) +def add_permission(corpus_id, corpus_follower_id, permission_name): + if permission_name not in [x.name for x in CorpusFollowerPermission]: + abort(400) + corpus_follower_association = CorpusFollowerAssociation.query.filter_by(followed_corpus_id=corpus_id, id=corpus_follower_id).first_or_404() + corpus = corpus_follower_association.followed_corpus if not (corpus.user == current_user or current_user.is_administrator()): abort(403) - if permission is None or permission not in iter(CorpusFollowPermission): - abort(400) - corpus_follow_association.add_permission(permission) + permission_value = CorpusFollowerPermission[permission_name].value + corpus_follower_association.add_permission(permission_value) db.session.commit() return '', 204 -@bp.route('//followers//permissions/remove', methods=['POST']) -def remove_permission(corpus_id, user_id, permission): - corpus_follow_association = CorpusFollowerAssociation.query.filter_by(followed_corpus_id=corpus_id, following_user_id=user_id).first_or_404() - permission = request.args.get('permission') - corpus = corpus_follow_association.followed_corpus +@bp.route('//followers//permissions//remove', methods=['POST']) +def remove_permission(corpus_id, corpus_follower_id, permission_name): + if permission_name not in [x.name for x in CorpusFollowerPermission]: + abort(400) + corpus_follower_association = CorpusFollowerAssociation.query.filter_by(followed_corpus_id=corpus_id, id=corpus_follower_id).first_or_404() + corpus = corpus_follower_association.followed_corpus if not (corpus.user == current_user or current_user.is_administrator()): abort(403) - if permission is None or permission not in iter(CorpusFollowPermission): - abort(400) - corpus_follow_association.remove_permission(permission) + permission_value = CorpusFollowerPermission[permission_name].value + corpus_follower_association.remove_permission(permission_value) db.session.commit() return '', 204 diff --git a/app/models.py b/app/models.py index 4c7a1362..314ebf2a 100644 --- a/app/models.py +++ b/app/models.py @@ -69,7 +69,8 @@ class ProfilePrivacySettings(IntEnum): SHOW_LAST_SEEN = 2 SHOW_MEMBER_SINCE = 4 -class CorpusFollowPermission(IntEnum): + +class CorpusFollowerPermission(IntEnum): VIEW = 1 CONTRIBUTE = 2 ADMINISTRATE = 4 @@ -199,7 +200,10 @@ class Role(HashidMixin, db.Model): 'id': self.hashid, 'default': self.default, 'name': self.name, - 'permissions': self.permissions + 'permissions': [ + x.name for x in Permission + if self.has_permission(x.value) + ] } if relationships: json_serializeable['users'] = { @@ -287,7 +291,7 @@ class Avatar(HashidMixin, FileMixin, db.Model): return json_serializeable -class CorpusFollowerAssociation(db.Model): +class CorpusFollowerAssociation(HashidMixin, db.Model): __tablename__ = 'corpus_follower_associations' # Primary key id = db.Column(db.Integer, primary_key=True) @@ -314,6 +318,19 @@ class CorpusFollowerAssociation(db.Model): if self.has_permission(permission): self.permissions -= permission + def to_json_serializeable(self, backrefs=False, relationships=False): + json_serializeable = { + 'id': self.hashid, + 'permissions': [ + x.name for x in CorpusFollowerPermission + if self.has_permission(x.value) + ], + 'followed_corpus': self.followed_corpus.to_json_serializeable(), + 'following_user': self.following_user.to_json_serializeable() + } + return json_serializeable + + class User(HashidMixin, UserMixin, db.Model): __tablename__ = 'users' # Primary key @@ -634,6 +651,10 @@ class User(HashidMixin, UserMixin, db.Model): json_serializeable['role'] = \ self.role.to_json_serializeable(backrefs=True) if relationships: + json_serializeable['followed_corpus_associations'] = { + x.hashid: x.to_json_serializeable() + for x in self.followed_corpus_associations + } json_serializeable['corpora'] = { x.hashid: x.to_json_serializeable(relationships=True) for x in self.corpora @@ -1403,8 +1424,13 @@ class Corpus(HashidMixin, db.Model): 'is_public': self.is_public } if backrefs: - json_serializeable['user'] = self.user.to_json_serializeable(backrefs=True) + json_serializeable['user'] = \ + self.user.to_json_serializeable(backrefs=True) if relationships: + json_serializeable['following_user_associations'] = { + x.hashid: x.to_json_serializeable() + for x in self.following_user_associations + } json_serializeable['files'] = { x.hashid: x.to_json_serializeable(relationships=True) for x in self.files diff --git a/app/static/js/ResourceLists/CorpusFollowerList.js b/app/static/js/ResourceLists/CorpusFollowerList.js new file mode 100644 index 00000000..cc7471d0 --- /dev/null +++ b/app/static/js/ResourceLists/CorpusFollowerList.js @@ -0,0 +1,158 @@ +class CorpusFollowerList extends ResourceList { + static autoInit() { + for (let corpusFollowerListElement of document.querySelectorAll('.corpus-follower-list:not(.no-autoinit)')) { + new CorpusFollowerList(corpusFollowerListElement); + } + } + + constructor(listContainerElement, options = {}) { + super(listContainerElement, options); + this.listjs.list.addEventListener('change', (event) => {this.onChange(event)}); + this.listjs.list.addEventListener('click', (event) => {this.onClick(event)}); + this.isInitialized = false; + this.userId = listContainerElement.dataset.userId; + this.corpusId = listContainerElement.dataset.corpusId; + if (this.userId === undefined || this.corpusId === undefined) {return;} + app.subscribeUser(this.userId).then((response) => { + app.socket.on('PATCH', (patch) => { + if (this.isInitialized) {this.onPatch(patch);} + }); + }); + app.getUser(this.userId).then((user) => { + this.add(Object.values(user.corpora[this.corpusId].following_user_associations)); + this.isInitialized = true; + }); + } + + get item() { + return (values) => { + return ` + + user-image + +
+ + +
+ +
+ + + + delete + send + + + `.trim(); + } + } + + get valueNames() { + return [ + {data: ['id']}, + {name: 'avatar', attr: 'src'}, + 'username', + 'about-me', + 'full-name' + ]; + } + + initListContainerElement() { + if (!this.listContainerElement.hasAttribute('id')) { + this.listContainerElement.id = Utils.generateElementId('corpus-follower-list-'); + } + let listSearchElementId = Utils.generateElementId(`${this.listContainerElement.id}-search-`); + this.listContainerElement.innerHTML = ` +
+ search + + +
+ + + + + + + + + + + +
UsernameUser detailsPermissions
+
    + `.trim(); + } + + mapResourceToValue(corpusFollowerAssociation) { + let user = corpusFollowerAssociation.following_user; + return { + 'id': corpusFollowerAssociation.id, + 'avatar': user.avatar ? `/users/${user.id}/avatar` : '/static/images/user_avatar.png', + 'username': user.username, + 'full-name': user.full_name ? user.full_name : '', + 'about-me': user.about_me ? user.about_me : '', + 'permissions-can-VIEW': corpusFollowerAssociation.permissions.includes('VIEW'), + 'permissions-can-CONTRIBUTE': corpusFollowerAssociation.permissions.includes('CONTRIBUTE'), + 'permissions-can-ADMINISTRATE': corpusFollowerAssociation.permissions.includes('ADMINISTRATE') + }; + } + + sort() { + this.listjs.sort('username', {order: 'desc'}); + } + + onChange(event) { + if (event.target.tagName !== 'INPUT') {return;} + let listItemElement = event.target.closest('.list-item[data-id]'); + if (listItemElement === null) {return;} + let itemId = listItemElement.dataset.id; + let listActionElement = event.target.closest('.list-action-trigger[data-list-action]'); + if (listActionElement === null) {return;} + let listAction = listActionElement.dataset.listAction; + switch (listAction) { + case 'toggle-permission-view': { + if (event.target.checked) { + Utils.addCorpusFollowerPermissionRequest(this.userId, this.corpusId, itemId, 'VIEW'); + } else { + Utils.removeCorpusFollowerPermissionRequest(this.userId, this.corpusId, itemId, 'VIEW'); + } + break; + } + case 'toggle-permission-contribute': { + if (event.target.checked) { + Utils.addCorpusFollowerPermissionRequest(this.userId, this.corpusId, itemId, 'CONTRIBUTE'); + } else { + Utils.removeCorpusFollowerPermissionRequest(this.userId, this.corpusId, itemId, 'CONTRIBUTE'); + } + break; + } + case 'toggle-permission-administrate': { + if (event.target.checked) { + Utils.addCorpusFollowerPermissionRequest(this.userId, this.corpusId, itemId, 'ADMINISTRATE'); + } else { + Utils.removeCorpusFollowerPermissionRequest(this.userId, this.corpusId, itemId, 'ADMINISTRATE'); + } + break; + } + default: { + break; + } + } + } + + onClick(event) { + + } + + onPatch(patch) {} +} diff --git a/app/static/js/ResourceLists/ResourceList.js b/app/static/js/ResourceLists/ResourceList.js index 7fe7dec6..b7445553 100644 --- a/app/static/js/ResourceLists/ResourceList.js +++ b/app/static/js/ResourceLists/ResourceList.js @@ -14,6 +14,7 @@ class ResourceList { TesseractOCRPipelineModelList.autoInit(); UserList.autoInit(); AdminUserList.autoInit(); + CorpusFollowerList.autoInit(); } static defaultOptions = { diff --git a/app/static/js/Utils.js b/app/static/js/Utils.js index e2ac84ab..af72bbe0 100644 --- a/app/static/js/Utils.js +++ b/app/static/js/Utils.js @@ -69,9 +69,9 @@ class Utils { return Utils.mergeObjectsDeep(mergedObject, ...objects.slice(2)); } - static addCorpusFollowerPermissionRequest(corpusId, followerId, permission) { + static addCorpusFollowerPermissionRequest(userId, corpusId, corpusFollowerAssociationId, permission) { return new Promise((resolve, reject) => { - fetch(`/corpora/${corpusId}/followers/${followerId}/add_permission?permission=${permission}`, {method: 'POST', headers: {Accept: 'application/json'}}) + fetch(`/corpora/${corpusId}/followers/${corpusFollowerAssociationId}/permissions/${permission}/add`, {method: 'POST', headers: {Accept: 'application/json'}}) .then( (response) => { if (response.status === 400) {app.flash('Bad Request', 'error'); reject(response);} @@ -88,9 +88,9 @@ class Utils { }); } - static removeCorpusFollowerPermissionRequest(corpusId, followerId, permission) { + static removeCorpusFollowerPermissionRequest(userId, corpusId, corpusFollowerAssociationId, permission) { return new Promise((resolve, reject) => { - fetch(`/corpora/${corpusId}/followers/${followerId}/remove_permission?permission=${permission}`, {method: 'POST', headers: {Accept: 'application/json'}}) + fetch(`/corpora/${corpusId}/followers/${corpusFollowerAssociationId}/permissions/${permission}/remove`, {method: 'POST', headers: {Accept: 'application/json'}}) .then( (response) => { if (response.status === 400) {app.flash('Bad Request', 'error'); reject(response);} @@ -104,7 +104,7 @@ class Utils { reject(response); } ); - }); + }); } static enableCorpusIsPublicRequest(userId, corpusId) { @@ -145,7 +145,7 @@ class Utils { let confirmElement = modalElement.querySelector('.action-button[data-action="confirm"]'); confirmElement.addEventListener('click', (event) => { let corpusTitle = corpus?.title; - fetch(`/corpora/${corpusId}/enable_is_public`, {method: 'POST', headers: {Accept: 'application/json'}}) + fetch(`/corpora/${corpusId}/is_public/enable`, {method: 'POST', headers: {Accept: 'application/json'}}) .then( (response) => { if (response.status === 403) {app.flash('Forbidden', 'error'); reject(response);} @@ -173,7 +173,7 @@ class Utils { } let corpusTitle = corpus?.title; - fetch(`/corpora/${corpusId}/disable_is_public`, {method: 'POST', headers: {Accept: 'application/json'}}) + fetch(`/corpora/${corpusId}/is_public/disable`, {method: 'POST', headers: {Accept: 'application/json'}}) .then( (response) => { if (response.status === 403) {app.flash('Forbidden', 'error'); reject(response);} diff --git a/app/static/js_new/App.js b/app/static/js_new/App.js new file mode 100644 index 00000000..8356642d --- /dev/null +++ b/app/static/js_new/App.js @@ -0,0 +1,10 @@ +import DataStore from './DataStore'; +import EventBroker from './EventBroker'; + + +const dataStore = new DataStore(); +const eventBroker = new EventBroker(); +const socket = io({transports: ['websocket'], upgrade: false}); + + +export {eventBroker, socket}; diff --git a/app/templates/_scripts.html.j2 b/app/templates/_scripts.html.j2 index 53a0469c..2a3626ab 100644 --- a/app/templates/_scripts.html.j2 +++ b/app/templates/_scripts.html.j2 @@ -30,6 +30,7 @@ 'js/ResourceLists/TesseractOCRPipelineModelList.js', 'js/ResourceLists/UserList.js', 'js/ResourceLists/AdminUserList.js', + 'js/ResourceLists/CorpusFollowerList.js', 'js/XMLtoObject.js' %} diff --git a/app/templates/corpora/corpus.html.j2 b/app/templates/corpora/corpus.html.j2 index 34228347..30e40e89 100644 --- a/app/templates/corpora/corpus.html.j2 +++ b/app/templates/corpora/corpus.html.j2 @@ -6,8 +6,8 @@ {% block page_content %}
    -
    -
    +
    +

    @@ -80,21 +80,21 @@
    - {#
    +
    - Generate Share Link + {# Generate Share Link - Copy + Copy #}
    @@ -103,10 +103,10 @@
    Corpus followers -
    +
    -
    #} +
    {% endblock page_content %} From 8168a2384f937919faf6fbb5331e869dd691e35b Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Mon, 20 Feb 2023 16:15:17 +0100 Subject: [PATCH 003/177] Add unfollow and view function to corpusfollowerlist --- .gitignore | 2 + app/corpora/routes.py | 71 +++++++++++-------- app/models.py | 20 +++--- .../js/ResourceLists/CorpusFollowerList.js | 63 +++++++++------- app/static/js/Utils.js | 54 ++++++++++---- app/static/js_new/App.js | 10 --- 6 files changed, 130 insertions(+), 90 deletions(-) delete mode 100644 app/static/js_new/App.js diff --git a/.gitignore b/.gitignore index 59ada396..b7a84431 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,8 @@ logs/ !logs/dummy *.env +*.pjentsch-testing + # Byte-compiled / optimized / DLL files __pycache__/ *.py[cod] diff --git a/app/corpora/routes.py b/app/corpora/routes.py index a3aca488..8d321c6f 100644 --- a/app/corpora/routes.py +++ b/app/corpora/routes.py @@ -3,6 +3,7 @@ from flask import ( abort, current_app, flash, + make_response, Markup, redirect, render_template, @@ -70,49 +71,59 @@ def disable_corpus_is_public(corpus_id): # return redirect(url_for('.corpus', corpus_id=corpus_id)) -@bp.route('//unfollow', methods=['GET', 'POST']) +@bp.route('//followers//unfollow', methods=['POST']) @login_required -def unfollow_corpus(corpus_id): - corpus = Corpus.query.get_or_404(corpus_id) - user_hashid = request.args.get('user_id') - if user_hashid is None: - user = current_user - elif current_user.is_administrator(): - user_id = hashids.decode(user_hashid) - user = User.query.get_or_404(user_id) - else: +def unfollow_corpus(corpus_id, follower_id): + corpus_follower_association = CorpusFollowerAssociation.query.filter_by(followed_corpus_id=corpus_id, following_user_id=follower_id).first_or_404() + if not (corpus_follower_association.followed_corpus.user == current_user + or corpus_follower_association.following_user == current_user + or current_user.is_administrator()): abort(403) - if user.is_following_corpus(corpus): - user.unfollow_corpus(corpus) + if not corpus_follower_association.following_user.is_following_corpus(corpus_follower_association.followed_corpus): + abort(409) # 'User is not following the corpus' + corpus_follower_association.following_user.unfollow_corpus(corpus_follower_association.followed_corpus) + db.session.commit() + return '', 204 + + +@bp.route('//unfollow', methods=['POST']) +@login_required +def current_user_unfollow_corpus(corpus_id): + corpus = Corpus.query.get_or_404(corpus_id) + if not current_user.is_following_corpus(corpus): + abort(409) # 'You are not following the corpus' + current_user.unfollow_corpus(corpus) db.session.commit() flash(f'You are not following {corpus.title} anymore', category='corpus') return '', 204 -@bp.route('//followers//permissions//add', methods=['POST']) -def add_permission(corpus_id, corpus_follower_id, permission_name): - if permission_name not in [x.name for x in CorpusFollowerPermission]: - abort(400) - corpus_follower_association = CorpusFollowerAssociation.query.filter_by(followed_corpus_id=corpus_id, id=corpus_follower_id).first_or_404() - corpus = corpus_follower_association.followed_corpus - if not (corpus.user == current_user or current_user.is_administrator()): +@bp.route('//followers//permissions//add', methods=['POST']) +def add_permission(corpus_id, follower_id, permission_name): + try: + permission = CorpusFollowerPermission[permission_name] + except KeyError: + abort(409) # 'Permission "{permission_name}" does not exist' + corpus_follower_association = CorpusFollowerAssociation.query.filter_by(followed_corpus_id=corpus_id, following_user_id=follower_id).first_or_404() + if not (corpus_follower_association.followed_corpus.user == current_user + or current_user.is_administrator()): abort(403) - permission_value = CorpusFollowerPermission[permission_name].value - corpus_follower_association.add_permission(permission_value) + corpus_follower_association.add_permission(permission) db.session.commit() return '', 204 -@bp.route('//followers//permissions//remove', methods=['POST']) -def remove_permission(corpus_id, corpus_follower_id, permission_name): - if permission_name not in [x.name for x in CorpusFollowerPermission]: - abort(400) - corpus_follower_association = CorpusFollowerAssociation.query.filter_by(followed_corpus_id=corpus_id, id=corpus_follower_id).first_or_404() - corpus = corpus_follower_association.followed_corpus - if not (corpus.user == current_user or current_user.is_administrator()): +@bp.route('//followers//permissions//remove', methods=['POST']) +def remove_permission(corpus_id, follower_id, permission_name): + try: + permission = CorpusFollowerPermission[permission_name] + except KeyError: + return make_response(f'Permission "{permission_name}" does not exist', 409) + corpus_follower_association = CorpusFollowerAssociation.query.filter_by(followed_corpus_id=corpus_id, following_user_id=follower_id).first_or_404() + if not (corpus_follower_association.followed_corpus.user == current_user + or current_user.is_administrator()): abort(403) - permission_value = CorpusFollowerPermission[permission_name].value - corpus_follower_association.remove_permission(permission_value) + corpus_follower_association.remove_permission(permission) db.session.commit() return '', 204 diff --git a/app/models.py b/app/models.py index 314ebf2a..81da0eb3 100644 --- a/app/models.py +++ b/app/models.py @@ -307,23 +307,23 @@ class CorpusFollowerAssociation(HashidMixin, db.Model): def __repr__(self): return f'' - def has_permission(self, permission): - return self.permissions & permission == permission + def has_permission(self, permission: CorpusFollowerPermission): + return self.permissions & permission.value == permission.value - def add_permission(self, permission): + def add_permission(self, permission: CorpusFollowerPermission): if not self.has_permission(permission): - self.permissions += permission + self.permissions += permission.value - def remove_permission(self, permission): + def remove_permission(self, permission: CorpusFollowerPermission): if self.has_permission(permission): - self.permissions -= permission + self.permissions -= permission.value def to_json_serializeable(self, backrefs=False, relationships=False): json_serializeable = { 'id': self.hashid, 'permissions': [ x.name for x in CorpusFollowerPermission - if self.has_permission(x.value) + if self.has_permission(x) ], 'followed_corpus': self.followed_corpus.to_json_serializeable(), 'following_user': self.following_user.to_json_serializeable() @@ -370,7 +370,8 @@ class User(HashidMixin, UserMixin, db.Model): ) followed_corpus_associations = db.relationship( 'CorpusFollowerAssociation', - back_populates='following_user' + back_populates='following_user', + cascade='all, delete-orphan' ) followed_corpora = association_proxy( 'followed_corpus_associations', @@ -1320,7 +1321,8 @@ class Corpus(HashidMixin, db.Model): ) following_user_associations = db.relationship( 'CorpusFollowerAssociation', - back_populates='followed_corpus' + back_populates='followed_corpus', + cascade='all, delete-orphan' ) following_users = association_proxy( 'following_user_associations', diff --git a/app/static/js/ResourceLists/CorpusFollowerList.js b/app/static/js/ResourceLists/CorpusFollowerList.js index cc7471d0..711d5111 100644 --- a/app/static/js/ResourceLists/CorpusFollowerList.js +++ b/app/static/js/ResourceLists/CorpusFollowerList.js @@ -33,22 +33,22 @@ class CorpusFollowerList extends ResourceList {


    - delete + delete send @@ -59,6 +59,7 @@ class CorpusFollowerList extends ResourceList { get valueNames() { return [ {data: ['id']}, + {data: ['follower-id']}, {name: 'avatar', attr: 'src'}, 'username', 'about-me', @@ -97,13 +98,14 @@ class CorpusFollowerList extends ResourceList { let user = corpusFollowerAssociation.following_user; return { 'id': corpusFollowerAssociation.id, + 'follower-id': user.id, 'avatar': user.avatar ? `/users/${user.id}/avatar` : '/static/images/user_avatar.png', 'username': user.username, 'full-name': user.full_name ? user.full_name : '', 'about-me': user.about_me ? user.about_me : '', - 'permissions-can-VIEW': corpusFollowerAssociation.permissions.includes('VIEW'), - 'permissions-can-CONTRIBUTE': corpusFollowerAssociation.permissions.includes('CONTRIBUTE'), - 'permissions-can-ADMINISTRATE': corpusFollowerAssociation.permissions.includes('ADMINISTRATE') + 'permission-can-VIEW': corpusFollowerAssociation.permissions.includes('VIEW'), + 'permission-can-CONTRIBUTE': corpusFollowerAssociation.permissions.includes('CONTRIBUTE'), + 'permission-can-ADMINISTRATE': corpusFollowerAssociation.permissions.includes('ADMINISTRATE') }; } @@ -120,27 +122,15 @@ class CorpusFollowerList extends ResourceList { if (listActionElement === null) {return;} let listAction = listActionElement.dataset.listAction; switch (listAction) { - case 'toggle-permission-view': { + case 'toggle-permission': { + let followerId = listItemElement.dataset.followerId; + let permission = listActionElement.dataset.permission; if (event.target.checked) { - Utils.addCorpusFollowerPermissionRequest(this.userId, this.corpusId, itemId, 'VIEW'); + Utils.addCorpusFollowerPermissionRequest(this.corpusId, followerId, permission) + .catch((error) => {event.target.checked = !event.target.checked;}); } else { - Utils.removeCorpusFollowerPermissionRequest(this.userId, this.corpusId, itemId, 'VIEW'); - } - break; - } - case 'toggle-permission-contribute': { - if (event.target.checked) { - Utils.addCorpusFollowerPermissionRequest(this.userId, this.corpusId, itemId, 'CONTRIBUTE'); - } else { - Utils.removeCorpusFollowerPermissionRequest(this.userId, this.corpusId, itemId, 'CONTRIBUTE'); - } - break; - } - case 'toggle-permission-administrate': { - if (event.target.checked) { - Utils.addCorpusFollowerPermissionRequest(this.userId, this.corpusId, itemId, 'ADMINISTRATE'); - } else { - Utils.removeCorpusFollowerPermissionRequest(this.userId, this.corpusId, itemId, 'ADMINISTRATE'); + Utils.removeCorpusFollowerPermissionRequest(this.corpusId, followerId, permission) + .catch((error) => {event.target.checked = !event.target.checked;}); } break; } @@ -151,7 +141,26 @@ class CorpusFollowerList extends ResourceList { } onClick(event) { - + let listItemElement = event.target.closest('.list-item[data-id]'); + if (listItemElement === null) {return;} + let itemId = listItemElement.dataset.id; + let listActionElement = event.target.closest('.list-action-trigger[data-list-action]'); + let listAction = listActionElement === null ? 'view' : listActionElement.dataset.listAction; + switch (listAction) { + case 'unfollow-request': { + let followerId = listItemElement.dataset.followerId; + Utils.unfollowCorpusRequest(this.corpusId, followerId); + break; + } + case 'view': { + let followerId = listItemElement.dataset.followerId; + window.location.href = `/users/${followerId}`; + break; + } + default: { + break; + } + } } onPatch(patch) {} diff --git a/app/static/js/Utils.js b/app/static/js/Utils.js index af72bbe0..547f29b5 100644 --- a/app/static/js/Utils.js +++ b/app/static/js/Utils.js @@ -69,16 +69,19 @@ class Utils { return Utils.mergeObjectsDeep(mergedObject, ...objects.slice(2)); } - static addCorpusFollowerPermissionRequest(userId, corpusId, corpusFollowerAssociationId, permission) { + static addCorpusFollowerPermissionRequest(corpusId, followerId, permission) { return new Promise((resolve, reject) => { - fetch(`/corpora/${corpusId}/followers/${corpusFollowerAssociationId}/permissions/${permission}/add`, {method: 'POST', headers: {Accept: 'application/json'}}) + fetch(`/corpora/${corpusId}/followers/${followerId}/permissions/${permission}/add`, {method: 'POST', headers: {Accept: 'application/json'}}) .then( (response) => { - if (response.status === 400) {app.flash('Bad Request', 'error'); reject(response);} - if (response.status === 403) {app.flash('Forbidden', 'error'); reject(response);} - if (response.status === 404) {app.flash('Not Found', 'error'); reject(response);} - app.flash(`Permission added`, 'corpus'); - resolve(response); + if (response.ok) { + app.flash(`Permission added`, 'corpus'); + resolve(response); + return; + } else { + app.flash(`${response.statusText}`, 'error'); + reject(response); + } }, (response) => { app.flash('Something went wrong', 'error'); @@ -88,16 +91,18 @@ class Utils { }); } - static removeCorpusFollowerPermissionRequest(userId, corpusId, corpusFollowerAssociationId, permission) { + static removeCorpusFollowerPermissionRequest(corpusId, followerId, permission) { return new Promise((resolve, reject) => { - fetch(`/corpora/${corpusId}/followers/${corpusFollowerAssociationId}/permissions/${permission}/remove`, {method: 'POST', headers: {Accept: 'application/json'}}) + fetch(`/corpora/${corpusId}/followers/${followerId}/permissions/${permission}/remove`, {method: 'POST', headers: {Accept: 'application/json'}}) .then( (response) => { - if (response.status === 400) {app.flash('Bad Request', 'error'); reject(response);} - if (response.status === 403) {app.flash('Forbidden', 'error'); reject(response);} - if (response.status === 404) {app.flash('Not Found', 'error'); reject(response);} - app.flash(`Permission removed`, 'corpus'); - resolve(response); + if (response.ok) { + app.flash(`Permission removed`, 'corpus'); + resolve(response); + } else { + app.flash(`${response.statusText}`, 'error'); + reject(response); + } }, (response) => { app.flash('Something went wrong', 'error'); @@ -215,6 +220,27 @@ class Utils { }); } + static unfollowCorpusRequest(corpusId, followerId) { + return new Promise((resolve, reject) => { + fetch(`/corpora/${corpusId}/followers/${followerId}/unfollow`, {method: 'POST', headers: {Accept: 'application/json'}}) + .then( + (response) => { + if (response.ok) { + app.flash(`User unfollowed from Corpus`, 'corpus'); + resolve(response); + } else { + app.flash(`${response.statusText}`, 'error'); + reject(response); + } + }, + (response) => { + app.flash('Something went wrong', 'error'); + reject(response); + } + ); + }); + } + static deleteCorpusRequest(userId, corpusId) { return new Promise((resolve, reject) => { let corpus; diff --git a/app/static/js_new/App.js b/app/static/js_new/App.js deleted file mode 100644 index 8356642d..00000000 --- a/app/static/js_new/App.js +++ /dev/null @@ -1,10 +0,0 @@ -import DataStore from './DataStore'; -import EventBroker from './EventBroker'; - - -const dataStore = new DataStore(); -const eventBroker = new EventBroker(); -const socket = io({transports: ['websocket'], upgrade: false}); - - -export {eventBroker, socket}; From 8d70e9385664a101b2d6e390440183fde02a8b29 Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Tue, 21 Feb 2023 11:05:09 +0100 Subject: [PATCH 004/177] Update CorpusFollowerAssociation table --- app/corpora/routes.py | 24 +++++----- app/models.py | 44 +++++++++---------- .../js/ResourceLists/CorpusFollowerList.js | 44 +++++++++++-------- migrations/versions/03c7211f089d_.py | 42 ++++++++++++++++++ 4 files changed, 100 insertions(+), 54 deletions(-) create mode 100644 migrations/versions/03c7211f089d_.py diff --git a/app/corpora/routes.py b/app/corpora/routes.py index 8d321c6f..17d203f1 100644 --- a/app/corpora/routes.py +++ b/app/corpora/routes.py @@ -74,15 +74,15 @@ def disable_corpus_is_public(corpus_id): @bp.route('//followers//unfollow', methods=['POST']) @login_required def unfollow_corpus(corpus_id, follower_id): - corpus_follower_association = CorpusFollowerAssociation.query.filter_by(followed_corpus_id=corpus_id, following_user_id=follower_id).first_or_404() - if not (corpus_follower_association.followed_corpus.user == current_user - or corpus_follower_association.following_user == current_user - or current_user.is_administrator()): + corpus = Corpus.query.get_or_404(corpus_id) + follower = User.query.get_or_404(follower_id) + if not (corpus.user == current_user or follower == current_user or current_user.is_administrator()): abort(403) - if not corpus_follower_association.following_user.is_following_corpus(corpus_follower_association.followed_corpus): + if not follower.is_following_corpus(corpus): abort(409) # 'User is not following the corpus' - corpus_follower_association.following_user.unfollow_corpus(corpus_follower_association.followed_corpus) + follower.unfollow_corpus(corpus) db.session.commit() + flash(f'{follower.username} is not following {corpus.title} anymore', category='corpus') return '', 204 @@ -103,10 +103,9 @@ def add_permission(corpus_id, follower_id, permission_name): try: permission = CorpusFollowerPermission[permission_name] except KeyError: - abort(409) # 'Permission "{permission_name}" does not exist' - corpus_follower_association = CorpusFollowerAssociation.query.filter_by(followed_corpus_id=corpus_id, following_user_id=follower_id).first_or_404() - if not (corpus_follower_association.followed_corpus.user == current_user - or current_user.is_administrator()): + abort(409) # f'Permission "{permission_name}" does not exist' + corpus_follower_association = CorpusFollowerAssociation.query.filter_by(corpus_id=corpus_id, follower_id=follower_id).first_or_404() + if not (corpus_follower_association.corpus.user == current_user or current_user.is_administrator()): abort(403) corpus_follower_association.add_permission(permission) db.session.commit() @@ -119,9 +118,8 @@ def remove_permission(corpus_id, follower_id, permission_name): permission = CorpusFollowerPermission[permission_name] except KeyError: return make_response(f'Permission "{permission_name}" does not exist', 409) - corpus_follower_association = CorpusFollowerAssociation.query.filter_by(followed_corpus_id=corpus_id, following_user_id=follower_id).first_or_404() - if not (corpus_follower_association.followed_corpus.user == current_user - or current_user.is_administrator()): + corpus_follower_association = CorpusFollowerAssociation.query.filter_by(corpus_id=corpus_id, follower_id=follower_id).first_or_404() + if not (corpus_follower_association.corpus.user == current_user or current_user.is_administrator()): abort(403) corpus_follower_association.remove_permission(permission) db.session.commit() diff --git a/app/models.py b/app/models.py index 81da0eb3..5e2bdcdf 100644 --- a/app/models.py +++ b/app/models.py @@ -296,16 +296,16 @@ class CorpusFollowerAssociation(HashidMixin, db.Model): # Primary key id = db.Column(db.Integer, primary_key=True) # Foreign keys - following_user_id = db.Column(db.Integer, db.ForeignKey('users.id')) - followed_corpus_id = db.Column(db.Integer, db.ForeignKey('corpora.id')) + corpus_id = db.Column(db.Integer, db.ForeignKey('corpora.id')) + follower_id = db.Column(db.Integer, db.ForeignKey('users.id')) # Fields permissions = db.Column(db.Integer, default=0, nullable=False) # Relationships - followed_corpus = db.relationship('Corpus', back_populates='following_user_associations') - following_user = db.relationship('User', back_populates='followed_corpus_associations') + corpus = db.relationship('Corpus', back_populates='corpus_follower_associations') + follower = db.relationship('User', back_populates='corpus_follower_associations') def __repr__(self): - return f'' + return f'' def has_permission(self, permission: CorpusFollowerPermission): return self.permissions & permission.value == permission.value @@ -325,8 +325,8 @@ class CorpusFollowerAssociation(HashidMixin, db.Model): x.name for x in CorpusFollowerPermission if self.has_permission(x) ], - 'followed_corpus': self.followed_corpus.to_json_serializeable(), - 'following_user': self.following_user.to_json_serializeable() + 'corpus': self.corpus.to_json_serializeable(), + 'follower': self.follower.to_json_serializeable() } return json_serializeable @@ -368,15 +368,15 @@ class User(HashidMixin, UserMixin, db.Model): cascade='all, delete-orphan', lazy='dynamic' ) - followed_corpus_associations = db.relationship( + corpus_follower_associations = db.relationship( 'CorpusFollowerAssociation', - back_populates='following_user', + back_populates='follower', cascade='all, delete-orphan' ) followed_corpora = association_proxy( - 'followed_corpus_associations', - 'followed_corpus', - creator=lambda c: CorpusFollowerAssociation(followed_corpus=c) + 'corpus_follower_associations', + 'corpus', + creator=lambda c: CorpusFollowerAssociation(corpus=c) ) jobs = db.relationship( 'Job', @@ -652,9 +652,9 @@ class User(HashidMixin, UserMixin, db.Model): json_serializeable['role'] = \ self.role.to_json_serializeable(backrefs=True) if relationships: - json_serializeable['followed_corpus_associations'] = { + json_serializeable['corpus_follower_associations'] = { x.hashid: x.to_json_serializeable() - for x in self.followed_corpus_associations + for x in self.corpus_follower_associations } json_serializeable['corpora'] = { x.hashid: x.to_json_serializeable(relationships=True) @@ -1319,15 +1319,15 @@ class Corpus(HashidMixin, db.Model): lazy='dynamic', cascade='all, delete-orphan' ) - following_user_associations = db.relationship( + corpus_follower_associations = db.relationship( 'CorpusFollowerAssociation', - back_populates='followed_corpus', + back_populates='corpus', cascade='all, delete-orphan' ) - following_users = association_proxy( - 'following_user_associations', - 'following_user', - creator=lambda u: CorpusFollowerAssociation(following_user=u) + followers = association_proxy( + 'corpus_follower_associations', + 'follower', + creator=lambda u: CorpusFollowerAssociation(followers=u) ) user = db.relationship('User', back_populates='corpora') # "static" attributes @@ -1429,9 +1429,9 @@ class Corpus(HashidMixin, db.Model): json_serializeable['user'] = \ self.user.to_json_serializeable(backrefs=True) if relationships: - json_serializeable['following_user_associations'] = { + json_serializeable['corpus_follower_associations'] = { x.hashid: x.to_json_serializeable() - for x in self.following_user_associations + for x in self.corpus_follower_associations } json_serializeable['files'] = { x.hashid: x.to_json_serializeable(relationships=True) diff --git a/app/static/js/ResourceLists/CorpusFollowerList.js b/app/static/js/ResourceLists/CorpusFollowerList.js index 711d5111..d83e4a39 100644 --- a/app/static/js/ResourceLists/CorpusFollowerList.js +++ b/app/static/js/ResourceLists/CorpusFollowerList.js @@ -19,7 +19,7 @@ class CorpusFollowerList extends ResourceList { }); }); app.getUser(this.userId).then((user) => { - this.add(Object.values(user.corpora[this.corpusId].following_user_associations)); + this.add(Object.values(user.corpora[this.corpusId].corpus_follower_associations)); this.isInitialized = true; }); } @@ -32,20 +32,26 @@ class CorpusFollowerList extends ResourceList {
    - + + +
    - + + +
    - + + + delete @@ -95,14 +101,13 @@ class CorpusFollowerList extends ResourceList { } mapResourceToValue(corpusFollowerAssociation) { - let user = corpusFollowerAssociation.following_user; return { 'id': corpusFollowerAssociation.id, - 'follower-id': user.id, - 'avatar': user.avatar ? `/users/${user.id}/avatar` : '/static/images/user_avatar.png', - 'username': user.username, - 'full-name': user.full_name ? user.full_name : '', - 'about-me': user.about_me ? user.about_me : '', + 'follower-id': corpusFollowerAssociation.follower.id, + 'avatar': corpusFollowerAssociation.follower.avatar ? `/users/${corpusFollowerAssociation.follower.id}/avatar` : '/static/images/user_avatar.png', + 'username': corpusFollowerAssociation.follower.username, + 'full-name': corpusFollowerAssociation.follower.full_name ? corpusFollowerAssociation.follower.full_name : '', + 'about-me': corpusFollowerAssociation.follower.about_me ? corpusFollowerAssociation.follower.about_me : '', 'permission-can-VIEW': corpusFollowerAssociation.permissions.includes('VIEW'), 'permission-can-CONTRIBUTE': corpusFollowerAssociation.permissions.includes('CONTRIBUTE'), 'permission-can-ADMINISTRATE': corpusFollowerAssociation.permissions.includes('ADMINISTRATE') @@ -141,6 +146,7 @@ class CorpusFollowerList extends ResourceList { } onClick(event) { + if (event.target.closest('.disable-on-click') !== null) {return;} let listItemElement = event.target.closest('.list-item[data-id]'); if (listItemElement === null) {return;} let itemId = listItemElement.dataset.id; diff --git a/migrations/versions/03c7211f089d_.py b/migrations/versions/03c7211f089d_.py new file mode 100644 index 00000000..2f73e3aa --- /dev/null +++ b/migrations/versions/03c7211f089d_.py @@ -0,0 +1,42 @@ +"""empty message + +Revision ID: 03c7211f089d +Revises: 5fe6a6c7870c +Create Date: 2023-02-21 09:57:22.005883 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '03c7211f089d' +down_revision = '5fe6a6c7870c' +branch_labels = None +depends_on = None + + +def upgrade(): + op.alter_column( + 'corpus_follower_associations', + 'followed_corpus_id', + new_column_name='corpus_id' + ) + op.alter_column( + 'corpus_follower_associations', + 'following_user_id', + new_column_name='follower_id' + ) + + +def downgrade(): + op.alter_column( + 'corpus_follower_associations', + 'corpus_id', + new_column_name='followed_corpus_id' + ) + op.alter_column( + 'corpus_follower_associations', + 'follower_id', + new_column_name='following_user_id' + ) From ff238cd823f559cc246e63364913057a31cf3e6a Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Tue, 21 Feb 2023 11:05:23 +0100 Subject: [PATCH 005/177] Change style of contributionlists --- .../SpacyNLPPipelineModelList.js | 20 ++++++++----------- .../TesseractOCRPipelineModelList.js | 15 +++++++------- 2 files changed, 16 insertions(+), 19 deletions(-) diff --git a/app/static/js/ResourceLists/SpacyNLPPipelineModelList.js b/app/static/js/ResourceLists/SpacyNLPPipelineModelList.js index b90fb06b..f7901528 100644 --- a/app/static/js/ResourceLists/SpacyNLPPipelineModelList.js +++ b/app/static/js/ResourceLists/SpacyNLPPipelineModelList.js @@ -30,14 +30,12 @@ class SpaCyNLPPipelineModelList extends ResourceList {
    ()
    -
    - + -
    + delete @@ -80,6 +78,7 @@ class SpaCyNLPPipelineModelList extends ResourceList { Title and Description Publisher + Availability @@ -111,6 +110,7 @@ class SpaCyNLPPipelineModelList extends ResourceList { } onChange(event) { + if (event.target.tagName !== 'INPUT') {return;} let listItemElement = event.target.closest('.list-item[data-id]'); if (listItemElement === null) {return;} let itemId = listItemElement.dataset.id; @@ -118,7 +118,7 @@ class SpaCyNLPPipelineModelList extends ResourceList { if (listActionElement === null) {return;} let listAction = listActionElement.dataset.listAction; switch (listAction) { - case 'share-request': { + case 'toggle-is-public': { Utils.spaCyNLPPipelineModelToggleIsPublicRequest(this.userId, itemId); break; } @@ -129,15 +129,11 @@ class SpaCyNLPPipelineModelList extends ResourceList { } onClick(event) { + if (event.target.closest('.disable-on-click') !== null) {return;} let listItemElement = event.target.closest('.list-item[data-id]'); if (listItemElement === null) {return;} let itemId = listItemElement.dataset.id; let listActionElement = event.target.closest('.list-action-trigger[data-list-action]'); - // ignore switch clicks, handle them by the onChange method instead - if (listActionElement.classList.contains('switch')) { - event.preventDefault(); - this.onChange(event); - } let listAction = listActionElement === null ? 'view' : listActionElement.dataset.listAction; switch (listAction) { case 'delete-request': { diff --git a/app/static/js/ResourceLists/TesseractOCRPipelineModelList.js b/app/static/js/ResourceLists/TesseractOCRPipelineModelList.js index 4ad3f5b1..c5e08b1d 100644 --- a/app/static/js/ResourceLists/TesseractOCRPipelineModelList.js +++ b/app/static/js/ResourceLists/TesseractOCRPipelineModelList.js @@ -38,14 +38,12 @@ class TesseractOCRPipelineModelList extends ResourceList {
    ()
    -
    - + -
    + delete @@ -89,6 +87,7 @@ class TesseractOCRPipelineModelList extends ResourceList { Title and Description Publisher + Availability @@ -120,6 +119,7 @@ class TesseractOCRPipelineModelList extends ResourceList { } onChange(event) { + if (event.target.tagName !== 'INPUT') {return;} let listItemElement = event.target.closest('.list-item[data-id]'); if (listItemElement === null) {return;} let itemId = listItemElement.dataset.id; @@ -127,7 +127,7 @@ class TesseractOCRPipelineModelList extends ResourceList { if (listActionElement === null) {return;} let listAction = listActionElement.dataset.listAction; switch (listAction) { - case 'share-request': { + case 'toggle-is-public': { Utils.tesseractOCRPipelineModelToggleIsPublicRequest(this.userId, itemId); break; } @@ -138,6 +138,7 @@ class TesseractOCRPipelineModelList extends ResourceList { } onClick(event) { + if (event.target.closest('.disable-on-click') !== null) {return;} let listItemElement = event.target.closest('.list-item[data-id]'); if (listItemElement === null) {return;} let itemId = listItemElement.dataset.id; From d699fd09e59023eec7d09bc064e332a396aaca99 Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Tue, 21 Feb 2023 13:59:11 +0100 Subject: [PATCH 006/177] Add live data updates for corpus follower lists --- app/models.py | 45 +++++++++++++++---- .../js/ResourceLists/CorpusFollowerList.js | 33 +++++++++++++- 2 files changed, 69 insertions(+), 9 deletions(-) diff --git a/app/models.py b/app/models.py index 5e2bdcdf..4e40793b 100644 --- a/app/models.py +++ b/app/models.py @@ -653,7 +653,7 @@ class User(HashidMixin, UserMixin, db.Model): self.role.to_json_serializeable(backrefs=True) if relationships: json_serializeable['corpus_follower_associations'] = { - x.hashid: x.to_json_serializeable() + x.hashid: x.to_json_serializeable(relationships=True) for x in self.corpus_follower_associations } json_serializeable['corpora'] = { @@ -672,10 +672,6 @@ class User(HashidMixin, UserMixin, db.Model): x.hashid: x.to_json_serializeable(relationships=True) for x in self.spacy_nlp_pipeline_models } - json_serializeable['followed_corpora'] = { - x.hashid: x.to_json_serializeable(relationships=True) - for x in self.followed_corpora - } if filter_by_privacy_settings: if not self.has_profile_privacy_setting(ProfilePrivacySettings.SHOW_EMAIL): @@ -1430,7 +1426,7 @@ class Corpus(HashidMixin, db.Model): self.user.to_json_serializeable(backrefs=True) if relationships: json_serializeable['corpus_follower_associations'] = { - x.hashid: x.to_json_serializeable() + x.hashid: x.to_json_serializeable(relationships=True) for x in self.corpus_follower_associations } json_serializeable['files'] = { @@ -1454,12 +1450,27 @@ class Corpus(HashidMixin, db.Model): @db.event.listens_for(TesseractOCRPipelineModel, 'after_delete') def ressource_after_delete(mapper, connection, ressource): jsonpatch = [{'op': 'remove', 'path': ressource.jsonpatch_path}] - room = f'users.{ressource.user_hashid}' - socketio.emit('users.patch', jsonpatch, room=room) room = f'/users/{ressource.user_hashid}' socketio.emit('PATCH', jsonpatch, room=room) +@db.event.listens_for(CorpusFollowerAssociation, 'after_delete') +def corpus_follower_association_after_delete_handler(mapper, connection, ressource): + corpus_owner_hashid = ressource.corpus.user.hashid + corpus_hashid = hashids.encode(ressource.corpus_id) + follower_hashid = hashids.encode(ressource.follower_id) + # Send a PATCH to the corpus owner + jsonpatch_path = f'/users/{corpus_owner_hashid}/corpora/{corpus_hashid}/corpus_follower_associations/{ressource.hashid}' + jsonpatch = [{'op': 'remove', 'path': jsonpatch_path}] + room = f'/users/{corpus_owner_hashid}' + socketio.emit('PATCH', jsonpatch, room=room) + # Send a PATCH to the follower + jsonpatch_path = f'/users/{follower_hashid}/corpus_follower_associations/{ressource.hashid}' + jsonpatch = [{'op': 'remove', 'path': jsonpatch_path}] + room = f'/users/{follower_hashid}' + socketio.emit('PATCH', jsonpatch, room=room) + + @db.event.listens_for(Corpus, 'after_insert') @db.event.listens_for(CorpusFile, 'after_insert') @db.event.listens_for(Job, 'after_insert') @@ -1478,6 +1489,24 @@ def ressource_after_insert_handler(mapper, connection, ressource): socketio.emit('PATCH', jsonpatch, room=room) +# @db.event.listens_for(CorpusFollowerAssociation, 'after_insert') +# def corpus_follower_association_after_insert_handler(mapper, connection, ressource): +# corpus_owner_hashid = ressource.corpus.user.hashid +# corpus_hashid = hashids.encode(ressource.corpus_id) +# follower_hashid = hashids.encode(ressource.follower_id) +# value = ressource.to_json_serializeable() +# # Send a PATCH to the corpus owner +# jsonpatch_path = f'/users/{corpus_owner_hashid}/corpora/{corpus_hashid}/corpus_follower_associations/{ressource.hashid}' +# jsonpatch = [{'op': 'add', 'path': jsonpatch_path, 'value': value}] +# room = f'/users/{corpus_owner_hashid}' +# socketio.emit('PATCH', jsonpatch, room=room) +# # Send a PATCH to the follower +# jsonpatch_path = f'/users/{follower_hashid}/corpus_follower_associations/{ressource.hashid}' +# jsonpatch = [{'op': 'add', 'path': jsonpatch_path, 'value': value}] +# room = f'/users/{follower_hashid}' +# socketio.emit('PATCH', jsonpatch, room=room) + + @db.event.listens_for(Corpus, 'after_update') @db.event.listens_for(CorpusFile, 'after_update') @db.event.listens_for(Job, 'after_update') diff --git a/app/static/js/ResourceLists/CorpusFollowerList.js b/app/static/js/ResourceLists/CorpusFollowerList.js index d83e4a39..616f3793 100644 --- a/app/static/js/ResourceLists/CorpusFollowerList.js +++ b/app/static/js/ResourceLists/CorpusFollowerList.js @@ -169,5 +169,36 @@ class CorpusFollowerList extends ResourceList { } } - onPatch(patch) {} + onPatch(patch) { + let re = new RegExp(`^/users/${this.userId}/corpora/${this.corpusId}/corpus_follower_associations/([A-Za-z0-9]*)`); + let filteredPatch = patch.filter(operation => re.test(operation.path)); + for (let operation of filteredPatch) { + switch(operation.op) { + case 'add': { + // let re = new RegExp(`^/users/${this.userId}/corpora/${this.corpusId}/corpus_follower_associations/([A-Za-z0-9]*)$`); + // if (re.test(operation.path)) {this.add(operation.value);} + break; + } + case 'remove': { + let re = new RegExp(`^/users/${this.userId}/corpora/${this.corpusId}/corpus_follower_associations/([A-Za-z0-9]*)$`); + if (re.test(operation.path)) { + let [match, jobId] = operation.path.match(re); + this.remove(jobId); + } + break; + } + case 'replace': { + // let re = new RegExp(`^/users/${this.userId}/corpora/${this.corpusId}/corpus_follower_associations/([A-Za-z0-9]*)/(service|status|description|title)$`); + // if (re.test(operation.path)) { + // let [match, jobId, valueName] = operation.path.match(re); + // this.replace(jobId, valueName, operation.value); + // } + break; + } + default: { + break; + } + } + } + } } From 726e781692f5971e65ed460e6e8d070326c19e9f Mon Sep 17 00:00:00 2001 From: Inga Kirschnick Date: Tue, 21 Feb 2023 16:18:04 +0100 Subject: [PATCH 007/177] share link generator update --- app/corpora/routes.py | 74 ++++++++++++++++------------ app/static/js/Utils.js | 30 +++++++++++ app/templates/corpora/corpus.html.j2 | 65 +++++++++++++++++------- 3 files changed, 120 insertions(+), 49 deletions(-) diff --git a/app/corpora/routes.py b/app/corpora/routes.py index 8d2dd45f..55de99f3 100644 --- a/app/corpora/routes.py +++ b/app/corpora/routes.py @@ -1,4 +1,4 @@ -from datetime import datetime +from datetime import datetime, timedelta from flask import ( abort, current_app, @@ -7,7 +7,8 @@ from flask import ( redirect, render_template, request, - send_from_directory + send_from_directory, + url_for ) from flask_login import current_user, login_required from threading import Thread @@ -52,22 +53,20 @@ def disable_corpus_is_public(corpus_id): return '', 204 -# @bp.route('//follow/') -# @login_required -# def follow_corpus(corpus_id, token): -# try: -# payload = jwt.decode( -# token, -# current_app.config['SECRET_KEY'], -# algorithms=['HS256'], -# issuer=current_app.config['SERVER_NAME'], -# options={'require': ['iat', 'iss', 'sub']} -# ) -# except jwt.PyJWTError: -# return False -# corpus_hashid = payload.get('sub') -# corpus_id = hashids.decode(corpus_hashid) -# return redirect(url_for('.corpus', corpus_id=corpus_id)) +@bp.route('//follow/') +@login_required +def follow_corpus(corpus_id, token): + try: + payload = jwt.decode( + token, + current_app.config['SECRET_KEY'], + algorithms=['HS256'], + issuer=current_app.config['SERVER_NAME'], + options={'require': ['iat', 'iss', 'sub']} + ) + except jwt.PyJWTError: + return False + return redirect(url_for('.corpus', corpus_id=corpus_id)) @bp.route('//unfollow', methods=['GET', 'POST']) @@ -157,27 +156,16 @@ def create_corpus(): ) -@bp.route('/', methods=['GET', 'POST']) +@bp.route('/') @login_required def corpus(corpus_id): corpus = Corpus.query.get_or_404(corpus_id) + exp_date = (datetime.utcnow() + timedelta(days=7)).strftime('%b %d, %Y') if corpus.user == current_user or current_user.is_administrator(): - # now = datetime.utcnow() - # payload = { - # 'exp': now + timedelta(weeks=1), - # 'iat': now, - # 'iss': current_app.config['SERVER_NAME'], - # 'sub': corpus.hashid - # } - # token = jwt.encode( - # payload, - # current_app.config['SECRET_KEY'], - # algorithm='HS256' - # ) return render_template( 'corpora/corpus.html.j2', corpus=corpus, - # token=token, + exp_date=exp_date, title='Corpus' ) if current_user.is_following_corpus(corpus) or corpus.is_public: @@ -190,6 +178,28 @@ def corpus(corpus_id): ) abort(403) +@bp.route('//generate-corpus-share-link', methods=['GET', 'POST']) +@login_required +def generate_corpus_share_link(corpus_id): + data = request.get_json('data') + permission = data['permission'] + expiration = data['expiration'] + corpus = Corpus.query.get_or_404(corpus_id) + now = datetime.utcnow() + payload = { + 'exp': expiration, + 'iat': now, + 'iss': current_app.config['SERVER_NAME'], + 'sub': permission + } + token = jwt.encode( + payload, + current_app.config['SECRET_KEY'], + algorithm='HS256' + ) + link = url_for('corpora.follow_corpus', corpus_id=corpus_id, token=token, _external=True) + return link + @bp.route('/', methods=['DELETE']) @login_required diff --git a/app/static/js/Utils.js b/app/static/js/Utils.js index e2ac84ab..b3da4ca1 100644 --- a/app/static/js/Utils.js +++ b/app/static/js/Utils.js @@ -751,4 +751,34 @@ class Utils { ); }); } + + static generateCorpusShareLinkRequest(corpusId, permission, expiration) { + return new Promise((resolve, reject) => { + const data = {permission: permission, expiration: expiration}; + fetch(`/corpora/${corpusId}/generate-corpus-share-link`, {method: 'POST', headers: {Accept: 'text/plain'}, body: JSON.stringify(data)}) + .then( + (response) => { + if (!response.ok) { + app.flash(`Something went wrong: ${response.status} ${response.statusText}`, 'error'); + reject(response); + return; + } + return response.text(); + }, + (response) => { + // Something went wrong during the HTTP request + app.flash('Something went wrong', 'error'); + reject(response); + } + ) + .then( + (corpusShareLink) => {resolve(corpusShareLink);}, + (error) => { + // Something went wrong during ReadableStream processing + app.flash('Something went wrong', 'error'); + reject(error); + } + ); + }); + } } diff --git a/app/templates/corpora/corpus.html.j2 b/app/templates/corpora/corpus.html.j2 index 34228347..c84d6c0e 100644 --- a/app/templates/corpora/corpus.html.j2 +++ b/app/templates/corpora/corpus.html.j2 @@ -80,10 +80,13 @@
    - {#
    +
    -
    + Share your Corpus +
    +

    +
    - - Generate Share Link - - Copy +
    +

    +
    +
    +
    + + +
    +
    +
    +
    +
    +
    + + +
    +
    +
    +
    +
    + Generate Share Link + + Copy +
    +
    -
    @@ -106,7 +133,7 @@
    -
    #} +
    {% endblock page_content %} @@ -115,19 +142,23 @@ {{ super() }} -{# #} + {% endblock scripts %} From 68dc8de476446cc6f66c6ce26fb85d6be8f410ab Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Tue, 21 Feb 2023 16:23:10 +0100 Subject: [PATCH 008/177] Add function to dynamically add followers to CorpusFollowerList --- app/corpora/routes.py | 10 ++++++ app/models.py | 32 +++++++++---------- .../js/ResourceLists/CorpusFollowerList.js | 4 +-- app/static/js/ResourceLists/ResourceList.js | 3 +- 4 files changed, 30 insertions(+), 19 deletions(-) diff --git a/app/corpora/routes.py b/app/corpora/routes.py index 17d203f1..0b2c788e 100644 --- a/app/corpora/routes.py +++ b/app/corpora/routes.py @@ -31,6 +31,16 @@ from .forms import ( ) +@bp.route('/fake-add') +@login_required +def fake_add(): + pjentsch = User.query.filter_by(username='pjentsch').first() + alice = Corpus.query.filter_by(title='Alice in Wonderland').first() + pjentsch.follow_corpus(alice) + db.session.commit() + return '' + + @bp.route('//is_public/enable', methods=['POST']) @login_required def enable_corpus_is_public(corpus_id): diff --git a/app/models.py b/app/models.py index 4e40793b..e2706eb5 100644 --- a/app/models.py +++ b/app/models.py @@ -1489,22 +1489,22 @@ def ressource_after_insert_handler(mapper, connection, ressource): socketio.emit('PATCH', jsonpatch, room=room) -# @db.event.listens_for(CorpusFollowerAssociation, 'after_insert') -# def corpus_follower_association_after_insert_handler(mapper, connection, ressource): -# corpus_owner_hashid = ressource.corpus.user.hashid -# corpus_hashid = hashids.encode(ressource.corpus_id) -# follower_hashid = hashids.encode(ressource.follower_id) -# value = ressource.to_json_serializeable() -# # Send a PATCH to the corpus owner -# jsonpatch_path = f'/users/{corpus_owner_hashid}/corpora/{corpus_hashid}/corpus_follower_associations/{ressource.hashid}' -# jsonpatch = [{'op': 'add', 'path': jsonpatch_path, 'value': value}] -# room = f'/users/{corpus_owner_hashid}' -# socketio.emit('PATCH', jsonpatch, room=room) -# # Send a PATCH to the follower -# jsonpatch_path = f'/users/{follower_hashid}/corpus_follower_associations/{ressource.hashid}' -# jsonpatch = [{'op': 'add', 'path': jsonpatch_path, 'value': value}] -# room = f'/users/{follower_hashid}' -# socketio.emit('PATCH', jsonpatch, room=room) +@db.event.listens_for(CorpusFollowerAssociation, 'after_insert') +def corpus_follower_association_after_insert_handler(mapper, connection, ressource): + corpus_owner_hashid = ressource.corpus.user.hashid + corpus_hashid = hashids.encode(ressource.corpus_id) + follower_hashid = hashids.encode(ressource.follower_id) + value = ressource.to_json_serializeable() + # Send a PATCH to the corpus owner + jsonpatch_path = f'/users/{corpus_owner_hashid}/corpora/{corpus_hashid}/corpus_follower_associations/{ressource.hashid}' + jsonpatch = [{'op': 'add', 'path': jsonpatch_path, 'value': value}] + room = f'/users/{corpus_owner_hashid}' + socketio.emit('PATCH', jsonpatch, room=room) + # Send a PATCH to the follower + jsonpatch_path = f'/users/{follower_hashid}/corpus_follower_associations/{ressource.hashid}' + jsonpatch = [{'op': 'add', 'path': jsonpatch_path, 'value': value}] + room = f'/users/{follower_hashid}' + socketio.emit('PATCH', jsonpatch, room=room) @db.event.listens_for(Corpus, 'after_update') diff --git a/app/static/js/ResourceLists/CorpusFollowerList.js b/app/static/js/ResourceLists/CorpusFollowerList.js index 616f3793..be7e46d9 100644 --- a/app/static/js/ResourceLists/CorpusFollowerList.js +++ b/app/static/js/ResourceLists/CorpusFollowerList.js @@ -175,8 +175,8 @@ class CorpusFollowerList extends ResourceList { for (let operation of filteredPatch) { switch(operation.op) { case 'add': { - // let re = new RegExp(`^/users/${this.userId}/corpora/${this.corpusId}/corpus_follower_associations/([A-Za-z0-9]*)$`); - // if (re.test(operation.path)) {this.add(operation.value);} + let re = new RegExp(`^/users/${this.userId}/corpora/${this.corpusId}/corpus_follower_associations/([A-Za-z0-9]*)$`); + if (re.test(operation.path)) {this.add(operation.value);} break; } case 'remove': { diff --git a/app/static/js/ResourceLists/ResourceList.js b/app/static/js/ResourceLists/ResourceList.js index b7445553..3251ef2b 100644 --- a/app/static/js/ResourceLists/ResourceList.js +++ b/app/static/js/ResourceLists/ResourceList.js @@ -43,7 +43,8 @@ class ResourceList { } add(resources, callback) { - let values = resources.map((resource) => { + let tmp = Array.isArray(resources) ? resources : [resources]; + let values = tmp.map((resource) => { return this.mapResourceToValue(resource); }); this.listjs.add(values, (items) => { From 1be8a449fea660f7a3a5bd8b4d000f384e32724a Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Wed, 22 Feb 2023 09:35:19 +0100 Subject: [PATCH 009/177] cleanup in models file --- app/models.py | 59 ++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 51 insertions(+), 8 deletions(-) diff --git a/app/models.py b/app/models.py index e2706eb5..79ee0ac7 100644 --- a/app/models.py +++ b/app/models.py @@ -205,6 +205,8 @@ class Role(HashidMixin, db.Model): if self.has_permission(x.value) ] } + if backrefs: + pass if relationships: json_serializeable['users'] = { x.hashid: x.to_json_serializeable(relationships=True) @@ -256,6 +258,27 @@ class Token(db.Model): self.access_expiration = datetime.utcnow() self.refresh_expiration = datetime.utcnow() + def to_json_serializeable(self, backrefs=False, relationships=False): + json_serializeable = { + 'id': self.hashid, + 'access_token': self.access_token, + 'access_expiration': ( + None if self.access_expiration is None + else f'{self.access_expiration.isoformat()}Z' + ), + 'refresh_token': self.refresh_token, + 'refresh_expiration': ( + None if self.refresh_expiration is None + else f'{self.refresh_expiration.isoformat()}Z' + ) + } + if backrefs: + json_serializeable['user'] = \ + self.user.to_json_serializeable(backrefs=True) + if relationships: + pass + return json_serializeable + @staticmethod def clean(): """Remove any tokens that have been expired for more than a day.""" @@ -288,6 +311,11 @@ class Avatar(HashidMixin, FileMixin, db.Model): 'id': self.hashid, **self.file_mixin_to_json_serializeable() } + if backrefs: + json_serializeable['user'] = \ + self.user.to_json_serializeable(backrefs=True) + if relationships: + pass return json_serializeable @@ -328,6 +356,13 @@ class CorpusFollowerAssociation(HashidMixin, db.Model): 'corpus': self.corpus.to_json_serializeable(), 'follower': self.follower.to_json_serializeable() } + if backrefs: + json_serializeable['corpus'] = \ + self.corpus.to_json_serializeable(backrefs=True) + json_serializeable['follower'] = \ + self.follower.to_json_serializeable(backrefs=True) + if relationships: + pass return json_serializeable @@ -620,7 +655,6 @@ class User(HashidMixin, UserMixin, db.Model): def is_following_corpus(self, corpus): return corpus in self.followed_corpora - def to_json_serializeable(self, backrefs=False, relationships=False, filter_by_privacy_settings=False): json_serializeable = { 'id': self.hashid, @@ -628,9 +662,9 @@ class User(HashidMixin, UserMixin, db.Model): 'email': self.email, 'last_seen': ( None if self.last_seen is None - else self.last_seen.strftime('%Y-%m-%d %H:%M') + else f'{self.last_seen.isoformat()}Z' ), - 'member_since': self.member_since.strftime('%Y-%m-%d'), + 'member_since': f'{self.member_since.isoformat()}Z', 'username': self.username, 'full_name': self.full_name, 'about_me': self.about_me, @@ -804,6 +838,8 @@ class TesseractOCRPipelineModel(FileMixin, HashidMixin, db.Model): if backrefs: json_serializeable['user'] = \ self.user.to_json_serializeable(backrefs=True) + if relationships: + pass return json_serializeable @@ -930,7 +966,10 @@ class SpaCyNLPPipelineModel(FileMixin, HashidMixin, db.Model): **self.file_mixin_to_json_serializeable() } if backrefs: - json_serializeable['user'] = self.user.to_json_serializeable(backrefs=True) + json_serializeable['user'] = \ + self.user.to_json_serializeable(backrefs=True) + if relationships: + pass return json_serializeable @@ -989,6 +1028,8 @@ class JobInput(FileMixin, HashidMixin, db.Model): if backrefs: json_serializeable['job'] = \ self.job.to_json_serializeable(backrefs=True) + if relationships: + pass return json_serializeable @@ -1053,6 +1094,8 @@ class JobResult(FileMixin, HashidMixin, db.Model): if backrefs: json_serializeable['job'] = \ self.job.to_json_serializeable(backrefs=True) + if relationships: + pass return json_serializeable @@ -1132,7 +1175,6 @@ class Job(HashidMixin, db.Model): raise e return job - def delete(self): ''' Delete the job and its inputs and results from the database. ''' if self.status not in [JobStatus.COMPLETED, JobStatus.FAILED]: # noqa @@ -1177,8 +1219,7 @@ class Job(HashidMixin, db.Model): 'service_args': self.service_args, 'service_version': self.service_version, 'status': self.status.name, - 'title': self.title, - 'url': self.url + 'title': self.title } if backrefs: json_serializeable['user'] = \ @@ -1264,9 +1305,9 @@ class CorpusFile(FileMixin, HashidMixin, db.Model): def to_json_serializeable(self, backrefs=False, relationships=False): json_serializeable = { 'id': self.hashid, - 'url': self.url, 'address': self.address, 'author': self.author, + 'description': self.description, 'booktitle': self.booktitle, 'chapter': self.chapter, 'editor': self.editor, @@ -1285,6 +1326,8 @@ class CorpusFile(FileMixin, HashidMixin, db.Model): if backrefs: json_serializeable['corpus'] = \ self.corpus.to_json_serializeable(backrefs=True) + if relationships: + pass return json_serializeable From 3ad942f17b5625a087586f6cb57bd37de1d83b27 Mon Sep 17 00:00:00 2001 From: Inga Kirschnick Date: Wed, 22 Feb 2023 16:00:04 +0100 Subject: [PATCH 010/177] Share link implementation for followers --- app/corpora/routes.py | 41 ++++++++++++------- .../js/RessourceDisplays/CorpusDisplay.js | 25 +++++++++++ app/static/js/Utils.js | 6 ++- app/templates/corpora/corpus.html.j2 | 35 +++------------- app/templates/corpora/public_corpus.html.j2 | 4 +- 5 files changed, 64 insertions(+), 47 deletions(-) diff --git a/app/corpora/routes.py b/app/corpora/routes.py index be3e7814..b6bedc24 100644 --- a/app/corpora/routes.py +++ b/app/corpora/routes.py @@ -57,17 +57,27 @@ def disable_corpus_is_public(corpus_id): @bp.route('//follow/') @login_required def follow_corpus(corpus_id, token): - try: + corpus = Corpus.query.get_or_404(corpus_id) + try: payload = jwt.decode( - token, - current_app.config['SECRET_KEY'], - algorithms=['HS256'], - issuer=current_app.config['SERVER_NAME'], - options={'require': ['iat', 'iss', 'sub']} - ) + token, + current_app.config['SECRET_KEY'], + algorithms=['HS256'], + issuer=current_app.config['SERVER_NAME'], + # options={'require': ['exp', 'iat', 'iss', 'sub']} + options={'require': ['exp', 'iat', 'iss']} + ) except jwt.PyJWTError: - return False - return redirect(url_for('.corpus', corpus_id=corpus_id)) + abort(403) + # permission = payload.get('sub') + expiration = payload.get('exp') + if expiration < int(datetime.utcnow().timestamp()): + abort(403) + if not current_user.is_following_corpus(corpus): + current_user.follow_corpus(corpus) + db.session.commit() + flash(f'You are following {corpus.title} now', category='corpus') + return redirect(url_for('corpora.corpus', corpus_id=corpus_id)) @bp.route('//followers//unfollow', methods=['POST']) @@ -170,6 +180,9 @@ def create_corpus(): def corpus(corpus_id): corpus = Corpus.query.get_or_404(corpus_id) exp_date = (datetime.utcnow() + timedelta(days=7)).strftime('%b %d, %Y') + print(corpus.user) + print(current_user) + print(current_user.is_following_corpus(corpus)) if corpus.user == current_user or current_user.is_administrator(): return render_template( 'corpora/corpus.html.j2', @@ -191,15 +204,15 @@ def corpus(corpus_id): @login_required def generate_corpus_share_link(corpus_id): data = request.get_json('data') - permission = data['permission'] - expiration = data['expiration'] - corpus = Corpus.query.get_or_404(corpus_id) + # permission = data['permission'] + exp_data = data['expiration'] + expiration = datetime.strptime(exp_data, '%b %d, %Y') now = datetime.utcnow() payload = { 'exp': expiration, 'iat': now, - 'iss': current_app.config['SERVER_NAME'], - 'sub': permission + 'iss': current_app.config['SERVER_NAME'] + # 'sub': permission } token = jwt.encode( payload, diff --git a/app/static/js/RessourceDisplays/CorpusDisplay.js b/app/static/js/RessourceDisplays/CorpusDisplay.js index fd342dd4..aab9e470 100644 --- a/app/static/js/RessourceDisplays/CorpusDisplay.js +++ b/app/static/js/RessourceDisplays/CorpusDisplay.js @@ -31,6 +31,7 @@ class CorpusDisplay extends RessourceDisplay { this.setStatus(corpus.status); this.setTitle(corpus.title); this.setNumTokens(corpus.num_tokens); + this.setShareLink(); } onPatch(patch) { @@ -117,4 +118,28 @@ class CorpusDisplay extends RessourceDisplay { new Date(creationDate).toLocaleString("en-US") ); } + + setShareLink() { + let generateShareLinkButton = this.displayElement.querySelector('#generate-share-link-button'); + let copyShareLinkButton = this.displayElement.querySelector('#copy-share-link-button'); + let shareLinkInput = this.displayElement.querySelector('#share-link-input'); + // let permissionSelect = this.displayElement.querySelector('#permission-select'); + let expirationDate = this.displayElement.querySelector('#expiration'); + + + generateShareLinkButton.addEventListener('click', () => { + // Utils.generateCorpusShareLinkRequest(`${this.corpusId}`, permissionSelect.value, expirationDate.value) + Utils.generateCorpusShareLinkRequest(`${this.corpusId}`, expirationDate.value) + .then((shareLink) => { + shareLinkInput.parentElement.classList.remove('hide'); + shareLinkInput.value = shareLink; + }); + }); + + copyShareLinkButton.addEventListener('click', () => { + shareLinkInput.select(); + navigator.clipboard.writeText(shareLinkInput.value); + app.flash(`Copied!`, 'success'); + }); + } } diff --git a/app/static/js/Utils.js b/app/static/js/Utils.js index 80340d6c..354f0f63 100644 --- a/app/static/js/Utils.js +++ b/app/static/js/Utils.js @@ -778,9 +778,11 @@ class Utils { }); } - static generateCorpusShareLinkRequest(corpusId, permission, expiration) { + // static generateCorpusShareLinkRequest(corpusId, permission, expiration) { + static generateCorpusShareLinkRequest(corpusId, expiration) { return new Promise((resolve, reject) => { - const data = {permission: permission, expiration: expiration}; + // const data = {permission: permission, expiration: expiration}; + const data = {expiration: expiration}; fetch(`/corpora/${corpusId}/generate-corpus-share-link`, {method: 'POST', headers: {Accept: 'text/plain'}, body: JSON.stringify(data)}) .then( (response) => { diff --git a/app/templates/corpora/corpus.html.j2 b/app/templates/corpora/corpus.html.j2 index 0e982d70..8a4976e2 100644 --- a/app/templates/corpora/corpus.html.j2 +++ b/app/templates/corpora/corpus.html.j2 @@ -96,7 +96,7 @@

    -
    + {#
    + Copy +
    @@ -142,30 +144,5 @@ {{ super() }} {% endblock scripts %} diff --git a/app/templates/corpora/public_corpus.html.j2 b/app/templates/corpora/public_corpus.html.j2 index 94b3524c..63744441 100644 --- a/app/templates/corpora/public_corpus.html.j2 +++ b/app/templates/corpora/public_corpus.html.j2 @@ -61,13 +61,13 @@ let unfollowRequestElement = document.querySelector('.action-button[data-action="unfollow-request"]'); unfollowRequestElement.addEventListener('click', () => { return new Promise((resolve, reject) => { - fetch('{{ url_for("corpora.unfollow_corpus", corpus_id=corpus.id) }}', {method: 'POST', headers: {Accept: 'application/json'}}) + fetch('{{ url_for("corpora.current_user_unfollow_corpus", corpus_id=corpus.id) }}', {method: 'POST', headers: {Accept: 'application/json'}}) .then( (response) => { if (response.status === 403) {app.flash('Forbidden', 'error'); reject(response);} if (response.status === 404) {app.flash('Not Found', 'error'); reject(response);} resolve(response); - window.location.href = '{{ url_for("corpora.corpus", corpus_id=corpus.id) }}'; + window.location.href = '{{ url_for("main.dashboard") }}'; }, (response) => { app.flash('Something went wrong', 'error'); From a459d6607a4f41db0fe29a6617f60b148bdce36a Mon Sep 17 00:00:00 2001 From: Inga Kirschnick Date: Thu, 23 Feb 2023 09:50:09 +0100 Subject: [PATCH 011/177] Update Share Link --- app/corpora/routes.py | 5 +---- app/static/js/RessourceDisplays/CorpusDisplay.js | 3 ++- app/templates/corpora/corpus.html.j2 | 14 +++++++++++--- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/app/corpora/routes.py b/app/corpora/routes.py index ab07ca92..9341938a 100644 --- a/app/corpora/routes.py +++ b/app/corpora/routes.py @@ -78,11 +78,8 @@ def follow_corpus(corpus_id, token): options={'require': ['exp', 'iat', 'iss']} ) except jwt.PyJWTError: - abort(403) + abort(410) # permission = payload.get('sub') - expiration = payload.get('exp') - if expiration < int(datetime.utcnow().timestamp()): - abort(403) if not current_user.is_following_corpus(corpus): current_user.follow_corpus(corpus) db.session.commit() diff --git a/app/static/js/RessourceDisplays/CorpusDisplay.js b/app/static/js/RessourceDisplays/CorpusDisplay.js index aab9e470..d42fa20c 100644 --- a/app/static/js/RessourceDisplays/CorpusDisplay.js +++ b/app/static/js/RessourceDisplays/CorpusDisplay.js @@ -123,6 +123,7 @@ class CorpusDisplay extends RessourceDisplay { let generateShareLinkButton = this.displayElement.querySelector('#generate-share-link-button'); let copyShareLinkButton = this.displayElement.querySelector('#copy-share-link-button'); let shareLinkInput = this.displayElement.querySelector('#share-link-input'); + let shareLinkContainer = this.displayElement.querySelector('#share-link-container'); // let permissionSelect = this.displayElement.querySelector('#permission-select'); let expirationDate = this.displayElement.querySelector('#expiration'); @@ -131,7 +132,7 @@ class CorpusDisplay extends RessourceDisplay { // Utils.generateCorpusShareLinkRequest(`${this.corpusId}`, permissionSelect.value, expirationDate.value) Utils.generateCorpusShareLinkRequest(`${this.corpusId}`, expirationDate.value) .then((shareLink) => { - shareLinkInput.parentElement.classList.remove('hide'); + shareLinkContainer.classList.remove('hide'); shareLinkInput.value = shareLink; }); }); diff --git a/app/templates/corpora/corpus.html.j2 b/app/templates/corpora/corpus.html.j2 index 8a4976e2..196faef2 100644 --- a/app/templates/corpora/corpus.html.j2 +++ b/app/templates/corpora/corpus.html.j2 @@ -119,9 +119,17 @@
    Generate Share Link -
    - - Copy +
    +
    From 38d09a34904f1b323ecb4f5c9ded23674f448ad4 Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Thu, 23 Feb 2023 13:05:04 +0100 Subject: [PATCH 012/177] Integrate CorpusFollowerRoles --- app/cli.py | 17 +- app/corpora/routes.py | 29 +-- app/models.py | 191 ++++++++++++++---- .../js/ResourceLists/CorpusFollowerList.js | 84 ++++---- app/templates/_sidenav.html.j2 | 6 +- migrations/versions/1f77ce4346c6_.py | 72 +++++++ nopaque.py | 11 +- 7 files changed, 284 insertions(+), 126 deletions(-) create mode 100644 migrations/versions/1f77ce4346c6_.py diff --git a/app/cli.py b/app/cli.py index 826aa790..e59a080d 100644 --- a/app/cli.py +++ b/app/cli.py @@ -3,10 +3,11 @@ from flask_migrate import upgrade import click import os from app.models import ( + CorpusFollowerRole, Role, - User, + SpaCyNLPPipelineModel, TesseractOCRPipelineModel, - SpaCyNLPPipelineModel + User ) @@ -30,19 +31,23 @@ def register(app): def deploy(): ''' Run deployment tasks. ''' # Make default directories + print('Make default directories') _make_default_dirs() # migrate database to latest revision + print('Migrate database to latest revision') upgrade() # Insert/Update default database values - current_app.logger.info('Insert/Update default roles') + print('Insert/Update default Roles') Role.insert_defaults() - current_app.logger.info('Insert/Update default users') + print('Insert/Update default Users') User.insert_defaults() - current_app.logger.info('Insert/Update default SpaCyNLPPipelineModels') + print('Insert/Update default CorpusFollowerRoles') + CorpusFollowerRole.insert_defaults() + print('Insert/Update default SpaCyNLPPipelineModels') SpaCyNLPPipelineModel.insert_defaults() - current_app.logger.info('Insert/Update default TesseractOCRPipelineModels') + print('Insert/Update default TesseractOCRPipelineModels') TesseractOCRPipelineModel.insert_defaults() @app.cli.group() diff --git a/app/corpora/routes.py b/app/corpora/routes.py index 2d59426b..ecfc1e84 100644 --- a/app/corpora/routes.py +++ b/app/corpora/routes.py @@ -21,6 +21,7 @@ from app.models import ( CorpusFile, CorpusFollowerAssociation, CorpusFollowerPermission, + CorpusFollowerRole, CorpusStatus, User ) @@ -107,30 +108,16 @@ def current_user_unfollow_corpus(corpus_id): return '', 204 -@bp.route('//followers//permissions//add', methods=['POST']) -def add_permission(corpus_id, follower_id, permission_name): - try: - permission = CorpusFollowerPermission[permission_name] - except KeyError: - abort(409) # f'Permission "{permission_name}" does not exist' +@bp.route('//followers//role', methods=['POST']) +def add_permission(corpus_id, follower_id): corpus_follower_association = CorpusFollowerAssociation.query.filter_by(corpus_id=corpus_id, follower_id=follower_id).first_or_404() if not (corpus_follower_association.corpus.user == current_user or current_user.is_administrator()): abort(403) - corpus_follower_association.add_permission(permission) - db.session.commit() - return '', 204 - - -@bp.route('//followers//permissions//remove', methods=['POST']) -def remove_permission(corpus_id, follower_id, permission_name): - try: - permission = CorpusFollowerPermission[permission_name] - except KeyError: - return make_response(f'Permission "{permission_name}" does not exist', 409) - corpus_follower_association = CorpusFollowerAssociation.query.filter_by(corpus_id=corpus_id, follower_id=follower_id).first_or_404() - if not (corpus_follower_association.corpus.user == current_user or current_user.is_administrator()): - abort(403) - corpus_follower_association.remove_permission(permission) + role_name = request.json.get('role') + if role_name is None: + abort(400) + corpus_follower_role = CorpusFollowerRole.query.filter_by(name=role_name).first_or_404() + corpus_follower_association.role = corpus_follower_role db.session.commit() return '', 204 diff --git a/app/models.py b/app/models.py index 79ee0ac7..2444589c 100644 --- a/app/models.py +++ b/app/models.py @@ -6,6 +6,7 @@ from flask_login import UserMixin from sqlalchemy.ext.associationproxy import association_proxy from time import sleep from tqdm import tqdm +from typing import Union from werkzeug.security import generate_password_hash, check_password_hash from werkzeug.utils import secure_filename import json @@ -57,6 +58,15 @@ class Permission(IntEnum): CONTRIBUTE = 2 USE_API = 4 + @staticmethod + def get(permission: Union['Permission', int, str]) -> 'Permission': + if isinstance(permission, Permission): + return permission + if isinstance(permission, int): + return Permission(permission) + if isinstance(permission, str): + return Permission[permission] + raise TypeError('permission must be Permission, int, or str') class UserSettingJobStatusMailNotificationLevel(IntEnum): NONE = 1 @@ -72,8 +82,22 @@ class ProfilePrivacySettings(IntEnum): class CorpusFollowerPermission(IntEnum): VIEW = 1 - CONTRIBUTE = 2 - ADMINISTRATE = 4 + ADD_CORPUS_FILE = 2 + UPDATE_CORPUS_FILE = 4 + REMOVE_CORPUS_FILE = 8 + GENERATE_SHARE_LINK = 16 + REMOVE_FOLLOWER = 32 + UPDATE_FOLLOWER = 64 + + @staticmethod + def get(permission: Union['CorpusFollowerPermission', int, str]) -> 'CorpusFollowerPermission': + if isinstance(permission, CorpusFollowerPermission): + return permission + if isinstance(permission, int): + return CorpusFollowerPermission(permission) + if isinstance(permission, str): + return CorpusFollowerPermission[permission] + raise TypeError('permission must be CorpusFollowerPermission, int, or str') # endregion enums @@ -181,16 +205,19 @@ class Role(HashidMixin, db.Model): def __repr__(self): return f'' - def add_permission(self, permission): - if not self.has_permission(permission): - self.permissions += permission - - def has_permission(self, permission): - return self.permissions & permission == permission - - def remove_permission(self, permission): - if self.has_permission(permission): - self.permissions -= permission + def has_permission(self, permission: Union[Permission, int, str]): + perm = Permission.get(permission) + return self.permissions & perm.value == perm.value + + def add_permission(self, permission: Union[Permission, int, str]): + perm = Permission.get(permission) + if not self.has_permission(perm): + self.permissions += perm.value + + def remove_permission(self, permission: Union[Permission, int, str]): + perm = Permission.get(permission) + if self.has_permission(perm): + self.permissions -= perm.value def reset_permissions(self): self.permissions = 0 @@ -319,6 +346,96 @@ class Avatar(HashidMixin, FileMixin, db.Model): return json_serializeable +class CorpusFollowerRole(HashidMixin, db.Model): + __tablename__ = 'corpus_follower_roles' + # Primary key + id = db.Column(db.Integer, primary_key=True) + # Fields + name = db.Column(db.String(64), unique=True) + default = db.Column(db.Boolean, default=False, index=True) + permissions = db.Column(db.Integer, default=0) + # Relationships + corpus_follower_associations = db.relationship( + 'CorpusFollowerAssociation', + back_populates='role', + lazy='dynamic' + ) + + def __repr__(self): + return f'' + + def has_permission(self, permission: Union[CorpusFollowerPermission, int, str]): + perm = CorpusFollowerPermission.get(permission) + return self.permissions & perm.value == perm.value + + def add_permission(self, permission: Union[CorpusFollowerPermission, int, str]): + perm = CorpusFollowerPermission.get(permission) + if not self.has_permission(perm): + self.permissions += perm.value + + def remove_permission(self, permission: Union[CorpusFollowerPermission, int, str]): + perm = CorpusFollowerPermission.get(permission) + if self.has_permission(perm): + self.permissions -= perm.value + + def reset_permissions(self): + self.permissions = 0 + + def to_json_serializeable(self, backrefs=False, relationships=False): + json_serializeable = { + 'id': self.hashid, + 'default': self.default, + 'name': self.name, + 'permissions': [ + x.name + for x in CorpusFollowerPermission + if self.has_permission(x) + ] + } + if backrefs: + pass + if relationships: + json_serializeable['corpus_follower_association'] = { + x.hashid: x.to_json_serializeable(relationships=True) + for x in self.corpus_follower_association + } + return json_serializeable + + @staticmethod + def insert_defaults(): + roles = { + 'Viewer': [ + CorpusFollowerPermission.VIEW + ], + 'Contributor': [ + CorpusFollowerPermission.VIEW, + CorpusFollowerPermission.ADD_CORPUS_FILE, + CorpusFollowerPermission.UPDATE_CORPUS_FILE, + CorpusFollowerPermission.REMOVE_CORPUS_FILE + ], + 'Administrator': [ + CorpusFollowerPermission.VIEW, + CorpusFollowerPermission.ADD_CORPUS_FILE, + CorpusFollowerPermission.UPDATE_CORPUS_FILE, + CorpusFollowerPermission.REMOVE_CORPUS_FILE, + CorpusFollowerPermission.GENERATE_SHARE_LINK, + CorpusFollowerPermission.REMOVE_FOLLOWER, + CorpusFollowerPermission.UPDATE_FOLLOWER + ] + } + default_role_name = 'Viewer' + for role_name, permissions in roles.items(): + role = CorpusFollowerRole.query.filter_by(name=role_name).first() + if role is None: + role = CorpusFollowerRole(name=role_name) + role.reset_permissions() + for permission in permissions: + role.add_permission(permission) + role.default = role.name == default_role_name + db.session.add(role) + db.session.commit() + + class CorpusFollowerAssociation(HashidMixin, db.Model): __tablename__ = 'corpus_follower_associations' # Primary key @@ -326,41 +443,38 @@ class CorpusFollowerAssociation(HashidMixin, db.Model): # Foreign keys corpus_id = db.Column(db.Integer, db.ForeignKey('corpora.id')) follower_id = db.Column(db.Integer, db.ForeignKey('users.id')) - # Fields - permissions = db.Column(db.Integer, default=0, nullable=False) + role_id = db.Column(db.Integer, db.ForeignKey('corpus_follower_roles.id')) # Relationships - corpus = db.relationship('Corpus', back_populates='corpus_follower_associations') - follower = db.relationship('User', back_populates='corpus_follower_associations') + corpus = db.relationship( + 'Corpus', + back_populates='corpus_follower_associations' + ) + follower = db.relationship( + 'User', + back_populates='corpus_follower_associations' + ) + role = db.relationship( + 'CorpusFollowerRole', + back_populates='corpus_follower_associations' + ) + + def __init__(self, **kwargs): + super().__init__(**kwargs) + if self.role is None: + self.role = CorpusFollowerRole.query.filter_by(default=True).first() def __repr__(self): return f'' - def has_permission(self, permission: CorpusFollowerPermission): - return self.permissions & permission.value == permission.value - - def add_permission(self, permission: CorpusFollowerPermission): - if not self.has_permission(permission): - self.permissions += permission.value - - def remove_permission(self, permission: CorpusFollowerPermission): - if self.has_permission(permission): - self.permissions -= permission.value - def to_json_serializeable(self, backrefs=False, relationships=False): json_serializeable = { 'id': self.hashid, - 'permissions': [ - x.name for x in CorpusFollowerPermission - if self.has_permission(x) - ], 'corpus': self.corpus.to_json_serializeable(), - 'follower': self.follower.to_json_serializeable() + 'follower': self.follower.to_json_serializeable(), + 'role': self.role.to_json_serializeable() } if backrefs: - json_serializeable['corpus'] = \ - self.corpus.to_json_serializeable(backrefs=True) - json_serializeable['follower'] = \ - self.follower.to_json_serializeable(backrefs=True) + pass if relationships: pass return json_serializeable @@ -559,7 +673,6 @@ class User(HashidMixin, UserMixin, db.Model): issuer=current_app.config['SERVER_NAME'], options={'require': ['exp', 'iat', 'iss', 'purpose', 'sub']} ) - current_app.logger.warning(payload) except jwt.PyJWTError: return False if payload.get('purpose') != 'user.confirm': @@ -687,7 +800,7 @@ class User(HashidMixin, UserMixin, db.Model): self.role.to_json_serializeable(backrefs=True) if relationships: json_serializeable['corpus_follower_associations'] = { - x.hashid: x.to_json_serializeable(relationships=True) + x.hashid: x.to_json_serializeable() for x in self.corpus_follower_associations } json_serializeable['corpora'] = { @@ -1469,7 +1582,7 @@ class Corpus(HashidMixin, db.Model): self.user.to_json_serializeable(backrefs=True) if relationships: json_serializeable['corpus_follower_associations'] = { - x.hashid: x.to_json_serializeable(relationships=True) + x.hashid: x.to_json_serializeable() for x in self.corpus_follower_associations } json_serializeable['files'] = { diff --git a/app/static/js/ResourceLists/CorpusFollowerList.js b/app/static/js/ResourceLists/CorpusFollowerList.js index be7e46d9..cc94c568 100644 --- a/app/static/js/ResourceLists/CorpusFollowerList.js +++ b/app/static/js/ResourceLists/CorpusFollowerList.js @@ -7,6 +7,9 @@ class CorpusFollowerList extends ResourceList { constructor(listContainerElement, options = {}) { super(listContainerElement, options); + this.listjs.on('updated', () => { + M.FormSelect.init(this.listjs.list.querySelectorAll('.list-item select')); + }); this.listjs.list.addEventListener('change', (event) => {this.onChange(event)}); this.listjs.list.addEventListener('click', (event) => {this.onClick(event)}); this.isInitialized = false; @@ -28,30 +31,21 @@ class CorpusFollowerList extends ResourceList { return (values) => { return ` - user-image - -
    + follower-avatar + - - - +
    - - - -
    - - - + + + +
    + +
    delete @@ -66,10 +60,10 @@ class CorpusFollowerList extends ResourceList { return [ {data: ['id']}, {data: ['follower-id']}, - {name: 'avatar', attr: 'src'}, - 'username', - 'about-me', - 'full-name' + {name: 'follower-avatar', attr: 'src'}, + 'follower-username', + 'follower-about-me', + 'follower-full-name' ]; } @@ -90,7 +84,7 @@ class CorpusFollowerList extends ResourceList { Username User details - Permissions + Role @@ -104,13 +98,11 @@ class CorpusFollowerList extends ResourceList { return { 'id': corpusFollowerAssociation.id, 'follower-id': corpusFollowerAssociation.follower.id, - 'avatar': corpusFollowerAssociation.follower.avatar ? `/users/${corpusFollowerAssociation.follower.id}/avatar` : '/static/images/user_avatar.png', - 'username': corpusFollowerAssociation.follower.username, - 'full-name': corpusFollowerAssociation.follower.full_name ? corpusFollowerAssociation.follower.full_name : '', - 'about-me': corpusFollowerAssociation.follower.about_me ? corpusFollowerAssociation.follower.about_me : '', - 'permission-can-VIEW': corpusFollowerAssociation.permissions.includes('VIEW'), - 'permission-can-CONTRIBUTE': corpusFollowerAssociation.permissions.includes('CONTRIBUTE'), - 'permission-can-ADMINISTRATE': corpusFollowerAssociation.permissions.includes('ADMINISTRATE') + 'follower-avatar': corpusFollowerAssociation.follower.avatar ? `/users/${corpusFollowerAssociation.follower.id}/avatar` : '/static/images/user_avatar.png', + 'follower-username': corpusFollowerAssociation.follower.username, + 'follower-full-name': corpusFollowerAssociation.follower.full_name ? corpusFollowerAssociation.follower.full_name : '', + 'follower-about-me': corpusFollowerAssociation.follower.about_me ? corpusFollowerAssociation.follower.about_me : '', + 'role-name': corpusFollowerAssociation.role.name }; } @@ -119,7 +111,7 @@ class CorpusFollowerList extends ResourceList { } onChange(event) { - if (event.target.tagName !== 'INPUT') {return;} + console.log(event.target.tagName); let listItemElement = event.target.closest('.list-item[data-id]'); if (listItemElement === null) {return;} let itemId = listItemElement.dataset.id; @@ -127,16 +119,10 @@ class CorpusFollowerList extends ResourceList { if (listActionElement === null) {return;} let listAction = listActionElement.dataset.listAction; switch (listAction) { - case 'toggle-permission': { + case 'update-role': { let followerId = listItemElement.dataset.followerId; - let permission = listActionElement.dataset.permission; - if (event.target.checked) { - Utils.addCorpusFollowerPermissionRequest(this.corpusId, followerId, permission) - .catch((error) => {event.target.checked = !event.target.checked;}); - } else { - Utils.removeCorpusFollowerPermissionRequest(this.corpusId, followerId, permission) - .catch((error) => {event.target.checked = !event.target.checked;}); - } + let roleName = event.target.value; + Utils.updateCorpusFollowerRole(this.corpusId, followerId, roleName); break; } default: { @@ -188,11 +174,11 @@ class CorpusFollowerList extends ResourceList { break; } case 'replace': { - // let re = new RegExp(`^/users/${this.userId}/corpora/${this.corpusId}/corpus_follower_associations/([A-Za-z0-9]*)/(service|status|description|title)$`); - // if (re.test(operation.path)) { - // let [match, jobId, valueName] = operation.path.match(re); - // this.replace(jobId, valueName, operation.value); - // } + let re = new RegExp(`^/users/${this.userId}/corpora/${this.corpusId}/corpus_follower_associations/([A-Za-z0-9]*)/role$`); + if (re.test(operation.path)) { + let [match, jobId, valueName] = operation.path.match(re); + this.replace(jobId, valueName, operation.value); + } break; } default: { diff --git a/app/templates/_sidenav.html.j2 b/app/templates/_sidenav.html.j2 index 676b7069..7fa34623 100644 --- a/app/templates/_sidenav.html.j2 +++ b/app/templates/_sidenav.html.j2 @@ -36,13 +36,13 @@
  • settingsGeneral Settings
  • contact_pageProfile settings
  • Log out
    • - {% if current_user.can(Permission.ADMINISTRATE) or current_user.can(Permission.USE_API) %} + {% if current_user.can('ADMINISTRATE') or current_user.can('USE_API') %}
    • {% endif %} - {% if current_user.can(Permission.ADMINISTRATE) %} + {% if current_user.can('ADMINISTRATE') %}
  • admin_panel_settingsAdministration
    • {% endif %} - {% if current_user.can(Permission.USE_API) %} + {% if current_user.can('USE_API') %}
  • apiAPI
    • {% endif %} diff --git a/migrations/versions/1f77ce4346c6_.py b/migrations/versions/1f77ce4346c6_.py new file mode 100644 index 00000000..1d7e2160 --- /dev/null +++ b/migrations/versions/1f77ce4346c6_.py @@ -0,0 +1,72 @@ +"""empty message + +Revision ID: 1f77ce4346c6 +Revises: 03c7211f089d +Create Date: 2023-02-22 12:56:30.176665 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '1f77ce4346c6' +down_revision = '03c7211f089d' +branch_labels = None +depends_on = None + + +def upgrade(): + op.create_table( + 'corpus_follower_roles', + sa.Column('id', sa.Integer(), nullable=False), + sa.Column('name', sa.String(length=64), nullable=True), + sa.Column('default', sa.Boolean(), nullable=True), + sa.Column('permissions', sa.Integer(), nullable=True), + sa.PrimaryKeyConstraint('id'), + sa.UniqueConstraint('name') + ) + op.create_index( + op.f('ix_corpus_follower_roles_default'), + 'corpus_follower_roles', + ['default'], + unique=False + ) + + op.add_column( + 'corpus_follower_associations', + sa.Column('role_id', sa.Integer(), nullable=True) + ) + op.create_foreign_key( + 'fk_corpus_follower_associations_role_id_corpus_follower_roles', + 'corpus_follower_associations', + 'corpus_follower_roles', + ['role_id'], + ['id'] + ) + op.drop_column('corpus_follower_associations', 'permissions') + + +def downgrade(): + op.add_column( + 'corpus_follower_associations', + sa.Column('permissions', sa.Integer(), nullable=True) + ) + op.execute('UPDATE corpus_follower_associations SET permissions = 0;') + op.alter_column( + 'corpus_follower_associations', + 'permissions', + nullable=False + ) + op.drop_constraint( + 'fk_corpus_follower_associations_role_id_corpus_follower_roles', + 'corpus_follower_associations', + type_='foreignkey' + ) + op.drop_column('corpus_follower_associations', 'role_id') + + op.drop_index( + op.f('ix_corpus_follower_roles_default'), + table_name='corpus_follower_roles' + ) + op.drop_table('corpus_follower_roles') diff --git a/nopaque.py b/nopaque.py index 602954cc..bbcf799d 100644 --- a/nopaque.py +++ b/nopaque.py @@ -9,6 +9,7 @@ from app.models import ( Corpus, CorpusFile, CorpusFollowerAssociation, + CorpusFollowerRole, Job, JobInput, JobResult, @@ -26,25 +27,19 @@ app: Flask = create_app() cli.register(app) -@app.context_processor -def make_context() -> Dict[str, Any]: - ''' Adds variables to the template context. ''' - return {'Permission': Permission} - - @app.shell_context_processor def make_shell_context() -> Dict[str, Any]: ''' Adds variables to the shell context. ''' return { + 'db': db, 'Avatar': Avatar, 'Corpus': Corpus, 'CorpusFile': CorpusFile, 'CorpusFollowerAssociation': CorpusFollowerAssociation, - 'db': db, + 'CorpusFollowerRole': CorpusFollowerRole, 'Job': Job, 'JobInput': JobInput, 'JobResult': JobResult, - 'Permission': Permission, 'Role': Role, 'TesseractOCRPipelineModel': TesseractOCRPipelineModel, 'SpaCyNLPPipelineModel': SpaCyNLPPipelineModel, From 132875bb34868850428c1832a7bcd0b0315aeda2 Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Thu, 23 Feb 2023 13:06:06 +0100 Subject: [PATCH 013/177] Remove unused import --- nopaque.py | 1 - 1 file changed, 1 deletion(-) diff --git a/nopaque.py b/nopaque.py index bbcf799d..b369556a 100644 --- a/nopaque.py +++ b/nopaque.py @@ -13,7 +13,6 @@ from app.models import ( Job, JobInput, JobResult, - Permission, Role, TesseractOCRPipelineModel, SpaCyNLPPipelineModel, From 1d85e96d3afbcbcaa8c33667fd96011523ee0bf4 Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Thu, 23 Feb 2023 15:18:53 +0100 Subject: [PATCH 014/177] Let the Corpus owner change Roles of followers --- app/models.py | 39 ++++++++++++++----- .../js/ResourceLists/CorpusFollowerList.js | 7 ++-- app/static/js/Utils.js | 27 ++----------- 3 files changed, 37 insertions(+), 36 deletions(-) diff --git a/app/models.py b/app/models.py index 2444589c..01e7c09a 100644 --- a/app/models.py +++ b/app/models.py @@ -37,6 +37,16 @@ class CorpusStatus(IntEnum): RUNNING_ANALYSIS_SESSION = 8 CANCELING_ANALYSIS_SESSION = 9 + @staticmethod + def get(corpus_status: Union['CorpusStatus', int, str]) -> 'CorpusStatus': + if isinstance(corpus_status, CorpusStatus): + return corpus_status + if isinstance(corpus_status, int): + return CorpusStatus(corpus_status) + if isinstance(corpus_status, str): + return CorpusStatus[corpus_status] + raise TypeError('corpus_status must be CorpusStatus, int, or str') + class JobStatus(IntEnum): INITIALIZING = 1 @@ -48,6 +58,16 @@ class JobStatus(IntEnum): COMPLETED = 7 FAILED = 8 + @staticmethod + def get(job_status: Union['JobStatus', int, str]) -> 'JobStatus': + if isinstance(job_status, JobStatus): + return job_status + if isinstance(job_status, int): + return JobStatus(job_status) + if isinstance(job_status, str): + return JobStatus[job_status] + raise TypeError('job_status must be JobStatus, int, or str') + class Permission(IntEnum): ''' @@ -68,6 +88,7 @@ class Permission(IntEnum): return Permission[permission] raise TypeError('permission must be Permission, int, or str') + class UserSettingJobStatusMailNotificationLevel(IntEnum): NONE = 1 END = 2 @@ -90,14 +111,14 @@ class CorpusFollowerPermission(IntEnum): UPDATE_FOLLOWER = 64 @staticmethod - def get(permission: Union['CorpusFollowerPermission', int, str]) -> 'CorpusFollowerPermission': - if isinstance(permission, CorpusFollowerPermission): - return permission - if isinstance(permission, int): - return CorpusFollowerPermission(permission) - if isinstance(permission, str): - return CorpusFollowerPermission[permission] - raise TypeError('permission must be CorpusFollowerPermission, int, or str') + def get(corpus_follower_permission: Union['CorpusFollowerPermission', int, str]) -> 'CorpusFollowerPermission': + if isinstance(corpus_follower_permission, CorpusFollowerPermission): + return corpus_follower_permission + if isinstance(corpus_follower_permission, int): + return CorpusFollowerPermission(corpus_follower_permission) + if isinstance(corpus_follower_permission, str): + return CorpusFollowerPermission[corpus_follower_permission] + raise TypeError('corpus_follower_permission must be CorpusFollowerPermission, int, or str') # endregion enums @@ -555,7 +576,7 @@ class User(HashidMixin, UserMixin, db.Model): cascade='all, delete-orphan', lazy='dynamic' ) - + def __init__(self, **kwargs): super().__init__(**kwargs) if self.role is not None: diff --git a/app/static/js/ResourceLists/CorpusFollowerList.js b/app/static/js/ResourceLists/CorpusFollowerList.js index cc94c568..b0b621d2 100644 --- a/app/static/js/ResourceLists/CorpusFollowerList.js +++ b/app/static/js/ResourceLists/CorpusFollowerList.js @@ -41,9 +41,9 @@ class CorpusFollowerList extends ResourceList {
    @@ -176,6 +176,7 @@ class CorpusFollowerList extends ResourceList { case 'replace': { let re = new RegExp(`^/users/${this.userId}/corpora/${this.corpusId}/corpus_follower_associations/([A-Za-z0-9]*)/role$`); if (re.test(operation.path)) { + console.log('role updated'); let [match, jobId, valueName] = operation.path.match(re); this.replace(jobId, valueName, operation.value); } diff --git a/app/static/js/Utils.js b/app/static/js/Utils.js index 354f0f63..f8dbf2d0 100644 --- a/app/static/js/Utils.js +++ b/app/static/js/Utils.js @@ -69,13 +69,13 @@ class Utils { return Utils.mergeObjectsDeep(mergedObject, ...objects.slice(2)); } - static addCorpusFollowerPermissionRequest(corpusId, followerId, permission) { + static updateCorpusFollowerRole(corpusId, followerId, roleName) { return new Promise((resolve, reject) => { - fetch(`/corpora/${corpusId}/followers/${followerId}/permissions/${permission}/add`, {method: 'POST', headers: {Accept: 'application/json'}}) + fetch(`/corpora/${corpusId}/followers/${followerId}/role`, {method: 'POST', headers: {Accept: 'application/json', 'Content-Type': 'application/json'}, body: JSON.stringify({role: roleName})}) .then( (response) => { if (response.ok) { - app.flash(`Permission added`, 'corpus'); + app.flash('Role updated', 'corpus'); resolve(response); return; } else { @@ -91,27 +91,6 @@ class Utils { }); } - static removeCorpusFollowerPermissionRequest(corpusId, followerId, permission) { - return new Promise((resolve, reject) => { - fetch(`/corpora/${corpusId}/followers/${followerId}/permissions/${permission}/remove`, {method: 'POST', headers: {Accept: 'application/json'}}) - .then( - (response) => { - if (response.ok) { - app.flash(`Permission removed`, 'corpus'); - resolve(response); - } else { - app.flash(`${response.statusText}`, 'error'); - reject(response); - } - }, - (response) => { - app.flash('Something went wrong', 'error'); - reject(response); - } - ); - }); - } - static enableCorpusIsPublicRequest(userId, corpusId) { return new Promise((resolve, reject) => { let corpus; From 0609e2cd7239c74e1ffb9a7c2c15294e6797cb65 Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Fri, 24 Feb 2023 09:27:20 +0100 Subject: [PATCH 015/177] Fix follow corpus mechanics --- app/models.py | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/app/models.py b/app/models.py index 01e7c09a..ed36a8ff 100644 --- a/app/models.py +++ b/app/models.py @@ -378,8 +378,7 @@ class CorpusFollowerRole(HashidMixin, db.Model): # Relationships corpus_follower_associations = db.relationship( 'CorpusFollowerAssociation', - back_populates='role', - lazy='dynamic' + back_populates='role' ) def __repr__(self): @@ -481,11 +480,9 @@ class CorpusFollowerAssociation(HashidMixin, db.Model): def __init__(self, **kwargs): super().__init__(**kwargs) - if self.role is None: - self.role = CorpusFollowerRole.query.filter_by(default=True).first() def __repr__(self): - return f'' + return f'' def to_json_serializeable(self, backrefs=False, relationships=False): json_serializeable = { @@ -545,8 +542,7 @@ class User(HashidMixin, UserMixin, db.Model): ) followed_corpora = association_proxy( 'corpus_follower_associations', - 'corpus', - creator=lambda c: CorpusFollowerAssociation(corpus=c) + 'corpus' ) jobs = db.relationship( 'Job', @@ -778,9 +774,11 @@ class User(HashidMixin, UserMixin, db.Model): self.profile_privacy_settings = 0 #endregion Profile Privacy settings - def follow_corpus(self, corpus): - if not self.is_following_corpus(corpus): - self.followed_corpora.append(corpus) + def follow_corpus(self, corpus, role=None): + if role is None: + r = CorpusFollowerRole.query.filter_by(default=True).first() + cfa = CorpusFollowerAssociation(corpus=corpus, role=r, follower=self) + db.session.add(cfa) def unfollow_corpus(self, corpus): if self.is_following_corpus(corpus): @@ -1499,8 +1497,7 @@ class Corpus(HashidMixin, db.Model): ) followers = association_proxy( 'corpus_follower_associations', - 'follower', - creator=lambda u: CorpusFollowerAssociation(followers=u) + 'follower' ) user = db.relationship('User', back_populates='corpora') # "static" attributes From b27a1051af79e0362ab20c6663e7e9950c20273b Mon Sep 17 00:00:00 2001 From: Inga Kirschnick Date: Fri, 24 Feb 2023 09:30:29 +0100 Subject: [PATCH 016/177] import share link token generation to models.py --- app/corpora/routes.py | 32 ++++---------------------------- app/models.py | 33 ++++++++++++++++++++++++++++++++- 2 files changed, 36 insertions(+), 29 deletions(-) diff --git a/app/corpora/routes.py b/app/corpora/routes.py index 1c669f61..fd718145 100644 --- a/app/corpora/routes.py +++ b/app/corpora/routes.py @@ -69,19 +69,9 @@ def disable_corpus_is_public(corpus_id): @login_required def follow_corpus(corpus_id, token): corpus = Corpus.query.get_or_404(corpus_id) - try: - payload = jwt.decode( - token, - current_app.config['SECRET_KEY'], - algorithms=['HS256'], - issuer=current_app.config['SERVER_NAME'], - # options={'require': ['exp', 'iat', 'iss', 'sub']} - options={'require': ['exp', 'iat', 'iss']} - ) - except jwt.PyJWTError: - abort(410) - # permission = payload.get('sub') - if not current_user.is_following_corpus(corpus): + if not (current_user.is_authenticated and current_user.verify_follow_corpus_token(token)): + abort(403) + if not current_user.is_following_corpus(corpus) and current_user != corpus.user: current_user.follow_corpus(corpus) db.session.commit() flash(f'You are following {corpus.title} now', category='corpus') @@ -174,9 +164,6 @@ def create_corpus(): def corpus(corpus_id): corpus = Corpus.query.get_or_404(corpus_id) exp_date = (datetime.utcnow() + timedelta(days=7)).strftime('%b %d, %Y') - print(corpus.user) - print(current_user) - print(current_user.is_following_corpus(corpus)) if corpus.user == current_user or current_user.is_administrator(): return render_template( 'corpora/corpus.html.j2', @@ -201,18 +188,7 @@ def generate_corpus_share_link(corpus_id): # permission = data['permission'] exp_data = data['expiration'] expiration = datetime.strptime(exp_data, '%b %d, %Y') - now = datetime.utcnow() - payload = { - 'exp': expiration, - 'iat': now, - 'iss': current_app.config['SERVER_NAME'] - # 'sub': permission - } - token = jwt.encode( - payload, - current_app.config['SECRET_KEY'], - algorithm='HS256' - ) + token = current_user.generate_follow_corpus_token(corpus_id, expiration) link = url_for('corpora.follow_corpus', corpus_id=corpus_id, token=token, _external=True) return link diff --git a/app/models.py b/app/models.py index 2444589c..7dc6b0c3 100644 --- a/app/models.py +++ b/app/models.py @@ -1,6 +1,6 @@ from datetime import datetime, timedelta from enum import Enum, IntEnum -from flask import current_app, url_for +from flask import abort, current_app, url_for from flask_hashids import HashidMixin from flask_login import UserMixin from sqlalchemy.ext.associationproxy import association_proxy @@ -767,6 +767,37 @@ class User(HashidMixin, UserMixin, db.Model): def is_following_corpus(self, corpus): return corpus in self.followed_corpora + + def generate_follow_corpus_token(self, corpus_id, expiration=7): + now = datetime.utcnow() + payload = { + 'exp': expiration, + 'iat': now, + 'iss': current_app.config['SERVER_NAME'], + 'sub': corpus_id + } + return jwt.encode( + payload, + current_app.config['SECRET_KEY'], + algorithm='HS256' + ) + + def verify_follow_corpus_token(self, token): + try: + payload = jwt.decode( + token, + current_app.config['SECRET_KEY'], + algorithms=['HS256'], + issuer=current_app.config['SERVER_NAME'], + options={'require': ['exp', 'iat', 'iss', 'sub']} + ) + except jwt.PyJWTError: + return False + corpus_id = payload.get('sub') + corpus = Corpus.query.get_or_404(corpus_id) + if corpus is None: + return False + return True def to_json_serializeable(self, backrefs=False, relationships=False, filter_by_privacy_settings=False): json_serializeable = { From cb31afe7236fdf37a43db8b14fa3ecbebac91fac Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Fri, 24 Feb 2023 09:44:09 +0100 Subject: [PATCH 017/177] small fix --- app/models.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/models.py b/app/models.py index ed36a8ff..4f31c570 100644 --- a/app/models.py +++ b/app/models.py @@ -775,14 +775,17 @@ class User(HashidMixin, UserMixin, db.Model): #endregion Profile Privacy settings def follow_corpus(self, corpus, role=None): + if self.is_following_corpus(corpus): + return if role is None: r = CorpusFollowerRole.query.filter_by(default=True).first() cfa = CorpusFollowerAssociation(corpus=corpus, role=r, follower=self) db.session.add(cfa) def unfollow_corpus(self, corpus): - if self.is_following_corpus(corpus): - self.followed_corpora.remove(corpus) + if not self.is_following_corpus(corpus): + return + self.followed_corpora.remove(corpus) def is_following_corpus(self, corpus): return corpus in self.followed_corpora From 122cce98a160bf4432fa012eada338a61c58f769 Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Fri, 24 Feb 2023 09:46:35 +0100 Subject: [PATCH 018/177] another small fix --- app/models.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/models.py b/app/models.py index 4f31c570..c71445f9 100644 --- a/app/models.py +++ b/app/models.py @@ -777,8 +777,7 @@ class User(HashidMixin, UserMixin, db.Model): def follow_corpus(self, corpus, role=None): if self.is_following_corpus(corpus): return - if role is None: - r = CorpusFollowerRole.query.filter_by(default=True).first() + r = CorpusFollowerRole.query.filter_by(default=True).first() if role is None else role cfa = CorpusFollowerAssociation(corpus=corpus, role=r, follower=self) db.session.add(cfa) From ff3ac3658fd22c3b27da0c9c8843944f14728d5e Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Fri, 24 Feb 2023 10:02:28 +0100 Subject: [PATCH 019/177] Yet another small fix --- app/models.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/models.py b/app/models.py index c71445f9..d73b01b6 100644 --- a/app/models.py +++ b/app/models.py @@ -542,7 +542,8 @@ class User(HashidMixin, UserMixin, db.Model): ) followed_corpora = association_proxy( 'corpus_follower_associations', - 'corpus' + 'corpus', + creator=lambda c: CorpusFollowerAssociation(corpus=c) ) jobs = db.relationship( 'Job', @@ -1499,7 +1500,8 @@ class Corpus(HashidMixin, db.Model): ) followers = association_proxy( 'corpus_follower_associations', - 'follower' + 'follower', + creator=lambda u: CorpusFollowerAssociation(follower=u) ) user = db.relationship('User', back_populates='corpora') # "static" attributes From c565b08f9c9aecfc384fce1a0a58189890aafb66 Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Fri, 24 Feb 2023 10:30:42 +0100 Subject: [PATCH 020/177] Found a better solution for default role assignments --- app/models.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/app/models.py b/app/models.py index d73b01b6..df992ccb 100644 --- a/app/models.py +++ b/app/models.py @@ -479,6 +479,8 @@ class CorpusFollowerAssociation(HashidMixin, db.Model): ) def __init__(self, **kwargs): + if 'role' not in kwargs: + kwargs['role'] = CorpusFollowerRole.query.filter_by(default=True).first() super().__init__(**kwargs) def __repr__(self): @@ -575,13 +577,12 @@ class User(HashidMixin, UserMixin, db.Model): ) def __init__(self, **kwargs): + if 'role' not in kwargs: + if kwargs['email'] == current_app.config['NOPAQUE_ADMIN']: + kwargs['role'] = Role.query.filter_by(name='Administrator').first() + else: + kwargs['role'] = Role.query.filter_by(default=True).first() super().__init__(**kwargs) - if self.role is not None: - return - if self.email == current_app.config['NOPAQUE_ADMIN']: - self.role = Role.query.filter_by(name='Administrator').first() - else: - self.role = Role.query.filter_by(default=True).first() def __repr__(self): return f'' From 3147bed90acdd9a7321479274352a3b6d589760d Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Fri, 24 Feb 2023 10:34:42 +0100 Subject: [PATCH 021/177] codestyle enhancements --- app/models.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/app/models.py b/app/models.py index df992ccb..2800e767 100644 --- a/app/models.py +++ b/app/models.py @@ -578,10 +578,11 @@ class User(HashidMixin, UserMixin, db.Model): def __init__(self, **kwargs): if 'role' not in kwargs: - if kwargs['email'] == current_app.config['NOPAQUE_ADMIN']: - kwargs['role'] = Role.query.filter_by(name='Administrator').first() - else: - kwargs['role'] = Role.query.filter_by(default=True).first() + kwargs['role'] = ( + Role.query.filter_by(name='Administrator').first() + if kwargs['email'] == current_app.config['NOPAQUE_ADMIN'] + else Role.query.filter_by(default=True).first() + ) super().__init__(**kwargs) def __repr__(self): From e2ddbf26f1faf6d9b3adcdfa48bd8279514160fa Mon Sep 17 00:00:00 2001 From: Inga Kirschnick Date: Fri, 24 Feb 2023 15:22:26 +0100 Subject: [PATCH 022/177] Update User Card and Share link with specific role --- app/corpora/routes.py | 15 ++++-- app/models.py | 8 ++-- .../js/RessourceDisplays/CorpusDisplay.js | 5 +- app/static/js/Utils.js | 6 +-- app/templates/corpora/corpus.html.j2 | 14 +++--- app/templates/corpora/public_corpus.html.j2 | 46 +++++++++++++++++-- 6 files changed, 69 insertions(+), 25 deletions(-) diff --git a/app/corpora/routes.py b/app/corpora/routes.py index fd718145..ecb74cae 100644 --- a/app/corpora/routes.py +++ b/app/corpora/routes.py @@ -68,11 +68,12 @@ def disable_corpus_is_public(corpus_id): @bp.route('//follow/') @login_required def follow_corpus(corpus_id, token): - corpus = Corpus.query.get_or_404(corpus_id) + corpus = current_user.verify_follow_corpus_token(token)['corpus'] + role = current_user.verify_follow_corpus_token(token)['role'] if not (current_user.is_authenticated and current_user.verify_follow_corpus_token(token)): abort(403) if not current_user.is_following_corpus(corpus) and current_user != corpus.user: - current_user.follow_corpus(corpus) + current_user.follow_corpus(corpus, role) db.session.commit() flash(f'You are following {corpus.title} now', category='corpus') return redirect(url_for('corpora.corpus', corpus_id=corpus_id)) @@ -164,20 +165,24 @@ def create_corpus(): def corpus(corpus_id): corpus = Corpus.query.get_or_404(corpus_id) exp_date = (datetime.utcnow() + timedelta(days=7)).strftime('%b %d, %Y') + roles = [x.name for x in CorpusFollowerRole.query.all()] if corpus.user == current_user or current_user.is_administrator(): return render_template( 'corpora/corpus.html.j2', corpus=corpus, exp_date=exp_date, + roles=roles, title='Corpus' ) if current_user.is_following_corpus(corpus) or corpus.is_public: corpus_files = [x.to_json_serializeable() for x in corpus.files] + owner = corpus.user.to_json_serializeable() return render_template( 'corpora/public_corpus.html.j2', corpus=corpus, corpus_files=corpus_files, - title='Corpus' + owner=owner, + title='Corpus', ) abort(403) @@ -185,10 +190,10 @@ def corpus(corpus_id): @login_required def generate_corpus_share_link(corpus_id): data = request.get_json('data') - # permission = data['permission'] + role = data['role'] exp_data = data['expiration'] expiration = datetime.strptime(exp_data, '%b %d, %Y') - token = current_user.generate_follow_corpus_token(corpus_id, expiration) + token = current_user.generate_follow_corpus_token(corpus_id, role, expiration) link = url_for('corpora.follow_corpus', corpus_id=corpus_id, token=token, _external=True) return link diff --git a/app/models.py b/app/models.py index 74d82410..8fc08c18 100644 --- a/app/models.py +++ b/app/models.py @@ -789,13 +789,14 @@ class User(HashidMixin, UserMixin, db.Model): def is_following_corpus(self, corpus): return corpus in self.followed_corpora - def generate_follow_corpus_token(self, corpus_id, expiration=7): + def generate_follow_corpus_token(self, corpus_id, role, expiration=7): now = datetime.utcnow() payload = { 'exp': expiration, 'iat': now, 'iss': current_app.config['SERVER_NAME'], - 'sub': corpus_id + 'sub': corpus_id, + 'role': role } return jwt.encode( payload, @@ -816,9 +817,10 @@ class User(HashidMixin, UserMixin, db.Model): return False corpus_id = payload.get('sub') corpus = Corpus.query.get_or_404(corpus_id) + role = CorpusFollowerRole.query.filter_by(name=payload.get('role')).first() if corpus is None: return False - return True + return {'corpus': corpus, 'role': role} def to_json_serializeable(self, backrefs=False, relationships=False, filter_by_privacy_settings=False): json_serializeable = { diff --git a/app/static/js/RessourceDisplays/CorpusDisplay.js b/app/static/js/RessourceDisplays/CorpusDisplay.js index d42fa20c..4e8e8a9a 100644 --- a/app/static/js/RessourceDisplays/CorpusDisplay.js +++ b/app/static/js/RessourceDisplays/CorpusDisplay.js @@ -124,13 +124,12 @@ class CorpusDisplay extends RessourceDisplay { let copyShareLinkButton = this.displayElement.querySelector('#copy-share-link-button'); let shareLinkInput = this.displayElement.querySelector('#share-link-input'); let shareLinkContainer = this.displayElement.querySelector('#share-link-container'); - // let permissionSelect = this.displayElement.querySelector('#permission-select'); + let roleSelect = this.displayElement.querySelector('#role-select'); let expirationDate = this.displayElement.querySelector('#expiration'); generateShareLinkButton.addEventListener('click', () => { - // Utils.generateCorpusShareLinkRequest(`${this.corpusId}`, permissionSelect.value, expirationDate.value) - Utils.generateCorpusShareLinkRequest(`${this.corpusId}`, expirationDate.value) + Utils.generateCorpusShareLinkRequest(`${this.corpusId}`, roleSelect.value, expirationDate.value) .then((shareLink) => { shareLinkContainer.classList.remove('hide'); shareLinkInput.value = shareLink; diff --git a/app/static/js/Utils.js b/app/static/js/Utils.js index f8dbf2d0..865ea0d4 100644 --- a/app/static/js/Utils.js +++ b/app/static/js/Utils.js @@ -757,11 +757,9 @@ class Utils { }); } - // static generateCorpusShareLinkRequest(corpusId, permission, expiration) { - static generateCorpusShareLinkRequest(corpusId, expiration) { + static generateCorpusShareLinkRequest(corpusId, role, expiration) { return new Promise((resolve, reject) => { - // const data = {permission: permission, expiration: expiration}; - const data = {expiration: expiration}; + const data = {role: role, expiration: expiration}; fetch(`/corpora/${corpusId}/generate-corpus-share-link`, {method: 'POST', headers: {Accept: 'text/plain'}, body: JSON.stringify(data)}) .then( (response) => { diff --git a/app/templates/corpora/corpus.html.j2 b/app/templates/corpora/corpus.html.j2 index 196faef2..84950403 100644 --- a/app/templates/corpora/corpus.html.j2 +++ b/app/templates/corpora/corpus.html.j2 @@ -96,18 +96,18 @@

    - {#
    +
    - + {% for role in roles%} + + {% endfor %} - +
    -
    #} +
    diff --git a/app/templates/corpora/public_corpus.html.j2 b/app/templates/corpora/public_corpus.html.j2 index 63744441..17a7ae07 100644 --- a/app/templates/corpora/public_corpus.html.j2 +++ b/app/templates/corpora/public_corpus.html.j2 @@ -11,7 +11,7 @@
    {% if current_user.is_following_corpus(corpus) %} - addUnfollow Corpus + closeUnfollow Corpus {% endif %} {% if corpus.status.name in ['BUILT', 'STARTING_ANALYSIS_SESSION', 'RUNNING_ANALYSIS_SESSION', 'CANCELING_ANALYSIS_SESSION'] and current_user.is_following_corpus(corpus) %} Analyze @@ -42,10 +42,50 @@
    - Corpus files -
    + Corpus Owner +
    +
    + + + + + + +
    + {% if corpus.user.avatar %} + user-image + {% else %} + user-image + {% endif %} + +
      +
    • {{ owner.username }}
      • + {% if owner.full_name %} +
    • {{ owner.full_name }}
      • + {% endif %} + {% if owner.show_email %} +
    • {{ owner.email }} + {% endif %} +
    +
    + {% if not current_user.is_following_corpus(corpus) %} +
    +

    + Request Corpus + {% endif %} +
    +
    + + {% if current_user.is_following_corpus(corpus)%} +
    +
    + Corpus files +
    +
    +
    + {% endif %}
    From d2828cabbe6d1f7a14bf859d474a5106e90e41a7 Mon Sep 17 00:00:00 2001 From: Inga Kirschnick Date: Fri, 24 Feb 2023 15:46:44 +0100 Subject: [PATCH 023/177] Explanation update and profile link button --- app/templates/corpora/corpus.html.j2 | 11 +++++++++++ app/templates/corpora/public_corpus.html.j2 | 3 ++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/app/templates/corpora/corpus.html.j2 b/app/templates/corpora/corpus.html.j2 index 84950403..790d4fac 100644 --- a/app/templates/corpora/corpus.html.j2 +++ b/app/templates/corpora/corpus.html.j2 @@ -86,6 +86,9 @@ Share your Corpus

    +

    Change your Corpus Status to Public

    +

    Other users can only see the meta data of your corpus. The files of the corpus remain private and can only be viewed via a share link.

    +

    +
    +
    +

    +

    Create a link to share your corpus files with your team

    +

    With the link other users follow your corpus directly, if it has not expired. + You can set different roles via the link, you can also edit them later in the menu below. + It is recommended not to set the expiration date of the link too far.

    +
    diff --git a/app/templates/corpora/public_corpus.html.j2 b/app/templates/corpora/public_corpus.html.j2 index 17a7ae07..edf6ed74 100644 --- a/app/templates/corpora/public_corpus.html.j2 +++ b/app/templates/corpora/public_corpus.html.j2 @@ -68,11 +68,12 @@ - {% if not current_user.is_following_corpus(corpus) %}

    + {% if not current_user.is_following_corpus(corpus) %} Request Corpus {% endif %} + View profile
    From ec6d0a6477763c5bec3c1c5d82a14cc51816ecdf Mon Sep 17 00:00:00 2001 From: Inga Kirschnick Date: Tue, 28 Feb 2023 10:27:10 +0100 Subject: [PATCH 024/177] corpus permission decorator + sidenav update --- app/corpora/decorators.py | 37 ++++++++++++++++++++++++++++++++++ app/corpora/routes.py | 14 +++++++++---- app/templates/_sidenav.html.j2 | 17 ++++++++++------ 3 files changed, 58 insertions(+), 10 deletions(-) create mode 100644 app/corpora/decorators.py diff --git a/app/corpora/decorators.py b/app/corpora/decorators.py new file mode 100644 index 00000000..3d841e9b --- /dev/null +++ b/app/corpora/decorators.py @@ -0,0 +1,37 @@ +from flask import abort, current_app +from flask_login import current_user +from functools import wraps +from app.models import Corpus, CorpusFollowerAssociation + +def corpus_follower_permission_required(permissions): + def decorator(f): + @wraps(f) + def decorated_function(*args, **kwargs): + corpus_id = kwargs.get('corpus_id') + corpus = Corpus.query.get_or_404(corpus_id) + if current_user == corpus.user or current_user.is_administrator(): + print('user or admin') + return f(*args, **kwargs) + if not current_user.is_following_corpus(corpus): + print('not following corpus') + abort(403) + corpus_follower_association = CorpusFollowerAssociation.query.filter_by(corpus_id=corpus_id, follower_id=current_user.id).first_or_404() + for permission in permissions: + if not corpus_follower_association.role.has_permission(permission): + abort(403) + return f(*args, **kwargs) + return decorated_function + return decorator + +def owner_or_admin_required(): + def decorator(f): + @wraps(f) + def decorated_function(*args, **kwargs): + corpus_id = kwargs.get('corpus_id') + corpus = Corpus.query.get_or_404(corpus_id) + if current_user == corpus.user or current_user.is_administrator(): + return f(*args, **kwargs) + abort(403) + return decorated_function + return decorator + diff --git a/app/corpora/routes.py b/app/corpora/routes.py index ecb74cae..9a69ebd8 100644 --- a/app/corpora/routes.py +++ b/app/corpora/routes.py @@ -15,6 +15,7 @@ from flask_login import current_user, login_required from threading import Thread import jwt import os +from .decorators import corpus_follower_permission_required, owner_or_admin_required from app import db, hashids from app.models import ( Corpus, @@ -32,6 +33,11 @@ from .forms import ( UpdateCorpusFileForm ) +@bp.route('//test') +@login_required +@corpus_follower_permission_required(['VIEW', 'ADD_CORPUS_FILE']) +def test(corpus_id): + return 'ok' @bp.route('/fake-add') @login_required @@ -45,10 +51,9 @@ def fake_add(): @bp.route('//is_public/enable', methods=['POST']) @login_required +@owner_or_admin_required() def enable_corpus_is_public(corpus_id): corpus = Corpus.query.get_or_404(corpus_id) - if not (corpus.user == current_user or current_user.is_administrator()): - abort(403) corpus.is_public = True db.session.commit() return '', 204 @@ -56,10 +61,9 @@ def enable_corpus_is_public(corpus_id): @bp.route('//is_public/disable', methods=['POST']) @login_required +@owner_or_admin_required() def disable_corpus_is_public(corpus_id): corpus = Corpus.query.get_or_404(corpus_id) - if not (corpus.user == current_user or current_user.is_administrator()): - abort(403) corpus.is_public = False db.session.commit() return '', 204 @@ -107,6 +111,7 @@ def current_user_unfollow_corpus(corpus_id): @bp.route('//followers//role', methods=['POST']) +@corpus_follower_permission_required(['REMOVE_FOLLOWER', 'UPDATE_FOLLOWER']) def add_permission(corpus_id, follower_id): corpus_follower_association = CorpusFollowerAssociation.query.filter_by(corpus_id=corpus_id, follower_id=follower_id).first_or_404() if not (corpus_follower_association.corpus.user == current_user or current_user.is_administrator()): @@ -188,6 +193,7 @@ def corpus(corpus_id): @bp.route('//generate-corpus-share-link', methods=['GET', 'POST']) @login_required +@corpus_follower_permission_required('GENERATE_SHARE_LINK') def generate_corpus_share_link(corpus_id): data = request.get_json('data') role = data['role'] diff --git a/app/templates/_sidenav.html.j2 b/app/templates/_sidenav.html.j2 index 7fa34623..18b902af 100644 --- a/app/templates/_sidenav.html.j2 +++ b/app/templates/_sidenav.html.j2 @@ -3,11 +3,17 @@
    -
    - - account_circle
    - -
    +
    + + {% if current_user.avatar %} + user-image + {% else %} + user-image + {% endif %} + {# account_circle
    #} + +
    +
    {{ current_user.username }}
    @@ -20,7 +26,6 @@
  • dashboardDashboard
  • IMy Corpora
  • JMy Jobs
    • -
  • groupsSocial
  • new_labelContribute
  • Processes & Services
    • From b1586b3679fd8c1c3089739433eb302de3218fac Mon Sep 17 00:00:00 2001 From: Inga Kirschnick Date: Wed, 1 Mar 2023 14:09:15 +0100 Subject: [PATCH 025/177] social-area page and profile page update --- app/corpora/decorators.py | 11 ++- app/corpora/routes.py | 17 ++--- app/main/routes.py | 32 +++++---- .../js/ResourceLists/FollowedCorpusList.js | 14 ++++ app/static/js/ResourceLists/UserList.js | 6 +- app/templates/_scripts.html.j2 | 1 + app/templates/_sidenav.html.j2 | 6 +- app/templates/main/social_area.html.j2 | 70 +++++++++++++++++++ app/templates/users/profile.html.j2 | 14 ++-- app/users/routes.py | 31 ++++---- 10 files changed, 144 insertions(+), 58 deletions(-) create mode 100644 app/static/js/ResourceLists/FollowedCorpusList.js create mode 100644 app/templates/main/social_area.html.j2 diff --git a/app/corpora/decorators.py b/app/corpora/decorators.py index 3d841e9b..b3499258 100644 --- a/app/corpora/decorators.py +++ b/app/corpora/decorators.py @@ -3,27 +3,24 @@ from flask_login import current_user from functools import wraps from app.models import Corpus, CorpusFollowerAssociation -def corpus_follower_permission_required(permissions): +def corpus_follower_permission_required(*permissions): def decorator(f): @wraps(f) def decorated_function(*args, **kwargs): corpus_id = kwargs.get('corpus_id') corpus = Corpus.query.get_or_404(corpus_id) if current_user == corpus.user or current_user.is_administrator(): - print('user or admin') return f(*args, **kwargs) if not current_user.is_following_corpus(corpus): - print('not following corpus') abort(403) corpus_follower_association = CorpusFollowerAssociation.query.filter_by(corpus_id=corpus_id, follower_id=current_user.id).first_or_404() - for permission in permissions: - if not corpus_follower_association.role.has_permission(permission): - abort(403) + if not all([corpus_follower_association.role.has_permission(p) for p in permissions]): + abort(403) return f(*args, **kwargs) return decorated_function return decorator -def owner_or_admin_required(): +def corpus_owner_or_admin_required(): def decorator(f): @wraps(f) def decorated_function(*args, **kwargs): diff --git a/app/corpora/routes.py b/app/corpora/routes.py index 9a69ebd8..c2af713a 100644 --- a/app/corpora/routes.py +++ b/app/corpora/routes.py @@ -15,7 +15,7 @@ from flask_login import current_user, login_required from threading import Thread import jwt import os -from .decorators import corpus_follower_permission_required, owner_or_admin_required +from .decorators import corpus_follower_permission_required, corpus_owner_or_admin_required from app import db, hashids from app.models import ( Corpus, @@ -33,12 +33,6 @@ from .forms import ( UpdateCorpusFileForm ) -@bp.route('//test') -@login_required -@corpus_follower_permission_required(['VIEW', 'ADD_CORPUS_FILE']) -def test(corpus_id): - return 'ok' - @bp.route('/fake-add') @login_required def fake_add(): @@ -51,7 +45,7 @@ def fake_add(): @bp.route('//is_public/enable', methods=['POST']) @login_required -@owner_or_admin_required() +@corpus_owner_or_admin_required() def enable_corpus_is_public(corpus_id): corpus = Corpus.query.get_or_404(corpus_id) corpus.is_public = True @@ -61,7 +55,7 @@ def enable_corpus_is_public(corpus_id): @bp.route('//is_public/disable', methods=['POST']) @login_required -@owner_or_admin_required() +@corpus_owner_or_admin_required() def disable_corpus_is_public(corpus_id): corpus = Corpus.query.get_or_404(corpus_id) corpus.is_public = False @@ -111,7 +105,7 @@ def current_user_unfollow_corpus(corpus_id): @bp.route('//followers//role', methods=['POST']) -@corpus_follower_permission_required(['REMOVE_FOLLOWER', 'UPDATE_FOLLOWER']) +@corpus_follower_permission_required('REMOVE_FOLLOWER', 'UPDATE_FOLLOWER') def add_permission(corpus_id, follower_id): corpus_follower_association = CorpusFollowerAssociation.query.filter_by(corpus_id=corpus_id, follower_id=follower_id).first_or_404() if not (corpus_follower_association.corpus.user == current_user or current_user.is_administrator()): @@ -206,6 +200,7 @@ def generate_corpus_share_link(corpus_id): @bp.route('/', methods=['DELETE']) @login_required +@corpus_owner_or_admin_required() def delete_corpus(corpus_id): def _delete_corpus(app, corpus_id): with app.app_context(): @@ -214,8 +209,6 @@ def delete_corpus(corpus_id): db.session.commit() corpus = Corpus.query.get_or_404(corpus_id) - if not (corpus.user == current_user or current_user.is_administrator()): - abort(403) thread = Thread( target=_delete_corpus, args=(current_app._get_current_object(), corpus_id) diff --git a/app/main/routes.py b/app/main/routes.py index eff0dadd..287a04f5 100644 --- a/app/main/routes.py +++ b/app/main/routes.py @@ -27,20 +27,7 @@ def faq(): @bp.route('/dashboard') @login_required def dashboard(): - # users = [ - # u.to_json_serializeable(filter_by_privacy_settings=True) for u - # in User.query.filter(User.is_public == True, User.id != current_user.id).all() - # ] - # corpora = [ - # c.to_json_serializeable() for c - # in Corpus.query.filter(Corpus.is_public == True, Corpus.user != current_user).all() - # ] - return render_template( - 'main/dashboard.html.j2', - title='Dashboard', - # users=users, - # corpora=corpora - ) + return render_template('main/dashboard.html.j2', title='Dashboard') @bp.route('/dashboard2') @@ -67,3 +54,20 @@ def privacy_policy(): @bp.route('/terms_of_use') def terms_of_use(): return render_template('main/terms_of_use.html.j2', title='Terms of Use') + +@bp.route('/social-area') +def social_area(): + users = [ + u.to_json_serializeable(relationships=True, filter_by_privacy_settings=True,) for u + in User.query.filter(User.is_public == True, User.id != current_user.id).all() + ] + corpora = [ + c.to_json_serializeable() for c + in Corpus.query.filter(Corpus.is_public == True, Corpus.user != current_user).all() + ] + return render_template( + 'main/social_area.html.j2', + users=users, + corpora=corpora, + title='Social Area' + ) diff --git a/app/static/js/ResourceLists/FollowedCorpusList.js b/app/static/js/ResourceLists/FollowedCorpusList.js new file mode 100644 index 00000000..b48bfd76 --- /dev/null +++ b/app/static/js/ResourceLists/FollowedCorpusList.js @@ -0,0 +1,14 @@ +class FollowedCorpusList extends CorpusList { + get item() { + return ` + + book +
    + + + send + + + `.trim(); + } +} diff --git a/app/static/js/ResourceLists/UserList.js b/app/static/js/ResourceLists/UserList.js index 03fabd73..65542de0 100644 --- a/app/static/js/ResourceLists/UserList.js +++ b/app/static/js/ResourceLists/UserList.js @@ -13,14 +13,14 @@ class UserList extends ResourceList { get item() { return ` - user-image + user-image - send + send `.trim(); @@ -77,7 +77,7 @@ class UserList extends ResourceList { 'full-name': user.full_name ? user.full_name : '', 'location': user.location ? user.location : '', 'organization': user.organization ? user.organization : '', - 'corpora-online': '-' + 'corpora-online': Object.values(user.corpora).filter((corpus) => corpus.is_public).length }; }; diff --git a/app/templates/_scripts.html.j2 b/app/templates/_scripts.html.j2 index 2a3626ab..18cde5b8 100644 --- a/app/templates/_scripts.html.j2 +++ b/app/templates/_scripts.html.j2 @@ -22,6 +22,7 @@ 'js/ResourceLists/CorpusFileList.js', 'js/ResourceLists/PublicCorpusFileList.js', 'js/ResourceLists/CorpusList.js', + 'js/ResourceLists/FollowedCorpusList.js', 'js/ResourceLists/PublicCorpusList.js', 'js/ResourceLists/JobList.js', 'js/ResourceLists/JobInputList.js', diff --git a/app/templates/_sidenav.html.j2 b/app/templates/_sidenav.html.j2 index 18b902af..62dcc604 100644 --- a/app/templates/_sidenav.html.j2 +++ b/app/templates/_sidenav.html.j2 @@ -6,11 +6,10 @@
    {% if current_user.avatar %} - user-image + user-image {% else %} - user-image + user-image {% endif %} - {# account_circle
    #}
    @@ -27,6 +26,7 @@
  • IMy Corpora
  • JMy Jobs
  • new_labelContribute
    • +
  • groupSocial Area
  • Processes & Services
  • File setup
    • diff --git a/app/templates/main/social_area.html.j2 b/app/templates/main/social_area.html.j2 new file mode 100644 index 00000000..fbe6974e --- /dev/null +++ b/app/templates/main/social_area.html.j2 @@ -0,0 +1,70 @@ +{% extends "base.html.j2" %} +{% import "materialize/wtf.html.j2" as wtf %} + +{% block main_attribs %} style="background-color:#d8c9ba86" {% endblock main_attribs %} + +{% block page_content %} +
    +
    +
    +

    {{ title }}

    +
    + +
    +
    +

     

    +

     

    + + group + +
    +
    + +
    +
    +
    +
    +
    +
    + layersYour social area +

    Here you can network with your team and other users. You can find corpora that are public and request them or just see what other users are working on.

    +
    +
    +
    +
    +
    +
    + +
    +

    Other Users

    +

    Find other users and see what corpora they have made public.

    +
    +
    +
    +
    +
    +
    + +
    +

    Public Corpora

    +

    Find public corpora.

    +
    +
    + Public Corpora +
    +
    +
    +
    +
    +
    +{% endblock page_content %} + +{% block scripts %} +{{ super() }} + +{% endblock scripts %} diff --git a/app/templates/users/profile.html.j2 b/app/templates/users/profile.html.j2 index a6ad5b30..4a9a4c13 100644 --- a/app/templates/users/profile.html.j2 +++ b/app/templates/users/profile.html.j2 @@ -26,7 +26,7 @@
    {% if user.show_last_seen %} -
    Last seen: {{ user.last_seen }}
    +
    Last seen: {{ last_seen }}
    {% endif %} {% if user.location %}

    location_on{{ user.location }}

    @@ -76,7 +76,7 @@
    {% if user.show_member_since %} -

    Member since: {{ user.member_since }}

    +

    Member since: {{ member_since }}

    {% endif %}


    @@ -93,7 +93,8 @@
    -

    Groups

    +

    Followed corpora

    +
    @@ -101,7 +102,7 @@

    Public corpora

    -
    +
    @@ -127,6 +128,11 @@ if ("{{ user.id }}" == "{{ current_user.hashid }}") { } else { publicInformationBadge.remove(); } + +let followedCorpusList = new FollowedCorpusList(document.querySelector('.followed-corpus-list')); +followedCorpusList.add({{ followed_corpora|tojson }}); +let publicCorpusList = new PublicCorpusList(document.querySelector('.public-corpus-list')); +publicCorpusList.add({{ own_public_corpora|tojson }}); {% endblock scripts %} diff --git a/app/users/routes.py b/app/users/routes.py index 48a8d7b5..d573da34 100644 --- a/app/users/routes.py +++ b/app/users/routes.py @@ -1,3 +1,4 @@ +from datetime import datetime from flask import ( abort, current_app, @@ -12,7 +13,7 @@ from flask_login import current_user, login_required from threading import Thread import os from app import db -from app.models import Avatar, ProfilePrivacySettings, User +from app.models import Avatar, Corpus, ProfilePrivacySettings, User from . import bp from .forms import ( EditPrivacySettingsForm, @@ -29,10 +30,23 @@ def before_request(): @login_required def user(user_id): user = User.query.get_or_404(user_id) + last_seen = user.last_seen.strftime('%Y-%m-%d %H:%M') + member_since = user.member_since.strftime('%Y-%m-%d') + followed_corpora = [ + c.to_json_serializeable() for c in user.followed_corpora + ] + own_public_corpora = [ + c.to_json_serializeable() for c + in Corpus.query.filter_by(is_public = True, user = user).all() + ] if not user.is_public and user != current_user: abort(403) return render_template( - 'users/profile.html.j2', + 'users/profile.html.j2', + followed_corpora=followed_corpora, + last_seen=last_seen, + member_since=member_since, + own_public_corpora=own_public_corpora, user=user.to_json_serializeable(), user_id=user_id ) @@ -56,18 +70,6 @@ def delete_user(user_id): thread.start() return {}, 202 -@bp.route('/') -def profile(user_id): - user = User.query.get_or_404(user_id) - if not user.is_public and user != current_user: - abort(403) - return render_template( - 'users/profile.html.j2', - user=user.to_json_serializeable(), - user_id=user_id - ) - - @bp.route('//avatar') def profile_avatar(user_id): user = User.query.get_or_404(user_id) @@ -91,7 +93,6 @@ def delete_profile_avatar(user_id): avatar = Avatar.query.get(avatar_id) avatar.delete() db.session.commit() - user = User.query.get_or_404(user_id) if user.avatar is None: abort(404) From ed195af6a2b778ea58673e8876b1b38ccf147c10 Mon Sep 17 00:00:00 2001 From: Inga Kirschnick Date: Wed, 1 Mar 2023 15:14:51 +0100 Subject: [PATCH 026/177] corpus follower permission decorator update --- app/corpora/routes.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/corpora/routes.py b/app/corpora/routes.py index c2af713a..5446f144 100644 --- a/app/corpora/routes.py +++ b/app/corpora/routes.py @@ -219,12 +219,9 @@ def delete_corpus(corpus_id): @bp.route('//analyse') @login_required +@corpus_follower_permission_required('VIEW') def analyse_corpus(corpus_id): corpus = Corpus.query.get_or_404(corpus_id) - if not (corpus.user == current_user - or current_user.is_administrator() - or current_user.is_following_corpus(corpus)): - abort(403) return render_template( 'corpora/analyse_corpus.html.j2', corpus=corpus, @@ -234,6 +231,7 @@ def analyse_corpus(corpus_id): @bp.route('//build', methods=['POST']) @login_required +@corpus_owner_or_admin_required() def build_corpus(corpus_id): def _build_corpus(app, corpus_id): with app.app_context(): @@ -258,6 +256,7 @@ def build_corpus(corpus_id): @bp.route('//files/create', methods=['GET', 'POST']) @login_required +@corpus_follower_permission_required('ADD_CORPUS_FILE') def create_corpus_file(corpus_id): corpus = Corpus.query.get_or_404(corpus_id) if not (corpus.user == current_user or current_user.is_administrator()): @@ -305,10 +304,9 @@ def create_corpus_file(corpus_id): @bp.route('//files/', methods=['GET', 'POST']) @login_required +@corpus_follower_permission_required('ADD_CORPUS_FILE', 'UPDATE_CORPUS_FILE', 'REMOVE_CORPUS_FILE') def corpus_file(corpus_id, corpus_file_id): corpus_file = CorpusFile.query.filter_by(corpus_id = corpus_id, id=corpus_file_id).first_or_404() - if not (corpus_file.corpus.user == current_user or current_user.is_administrator()): - abort(403) form = UpdateCorpusFileForm(data=corpus_file.to_json_serializeable()) if form.validate_on_submit(): form.populate_obj(corpus_file) @@ -329,6 +327,7 @@ def corpus_file(corpus_id, corpus_file_id): @bp.route('//files/', methods=['DELETE']) @login_required +@corpus_follower_permission_required('REMOVE_CORPUS_FILE') def delete_corpus_file(corpus_id, corpus_file_id): def _delete_corpus_file(app, corpus_file_id): with app.app_context(): @@ -349,6 +348,7 @@ def delete_corpus_file(corpus_id, corpus_file_id): @bp.route('//files//download') @login_required +@corpus_follower_permission_required('VIEW') def download_corpus_file(corpus_id, corpus_file_id): corpus_file = CorpusFile.query.filter_by(corpus_id = corpus_id, id=corpus_file_id).first_or_404() if not (corpus_file.corpus.user == current_user or current_user.is_administrator()): From 145b80356d6809a3885681d5df2391d2e25bcab8 Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Wed, 1 Mar 2023 16:31:41 +0100 Subject: [PATCH 027/177] Redesign corpus page and add possibility to add followers by username for owner --- app/corpora/routes.py | 32 +- .../js/RessourceDisplays/CorpusDisplay.js | 37 +- app/static/js/Utils.js | 118 +++---- app/templates/corpora/corpus.html.j2 | 327 +++++++++++++----- 4 files changed, 313 insertions(+), 201 deletions(-) diff --git a/app/corpora/routes.py b/app/corpora/routes.py index 9a69ebd8..1ea34a4d 100644 --- a/app/corpora/routes.py +++ b/app/corpora/routes.py @@ -3,6 +3,7 @@ from flask import ( abort, current_app, flash, + jsonify, make_response, Markup, redirect, @@ -49,22 +50,34 @@ def fake_add(): return '' -@bp.route('//is_public/enable', methods=['POST']) +@bp.route('//is_public', methods=['POST']) @login_required @owner_or_admin_required() -def enable_corpus_is_public(corpus_id): +def update_corpus_is_public(corpus_id): + is_public = request.json + if not isinstance(is_public, bool): + response = jsonify('The request body must be a boolean') + response.status_code = 400 + abort(response) corpus = Corpus.query.get_or_404(corpus_id) - corpus.is_public = True + corpus.is_public = is_public db.session.commit() return '', 204 -@bp.route('//is_public/disable', methods=['POST']) +@bp.route('//followers/add', methods=['POST']) @login_required @owner_or_admin_required() -def disable_corpus_is_public(corpus_id): +def add_corpus_followers(corpus_id): + usernames = request.json + if not (isinstance(usernames, list) or all(isinstance(u, str) for u in usernames)): + response = jsonify('The request body must be a list of strings') + response.status_code = 400 + abort(response) corpus = Corpus.query.get_or_404(corpus_id) - corpus.is_public = False + for username in usernames: + user = User.query.filter_by(username=username, is_public=True).first_or_404() + user.follow_corpus(corpus) db.session.commit() return '', 204 @@ -169,14 +182,12 @@ def create_corpus(): @login_required def corpus(corpus_id): corpus = Corpus.query.get_or_404(corpus_id) - exp_date = (datetime.utcnow() + timedelta(days=7)).strftime('%b %d, %Y') - roles = [x.name for x in CorpusFollowerRole.query.all()] + corpus_follower_roles = CorpusFollowerRole.query.all() if corpus.user == current_user or current_user.is_administrator(): return render_template( 'corpora/corpus.html.j2', corpus=corpus, - exp_date=exp_date, - roles=roles, + corpus_follower_roles=corpus_follower_roles, title='Corpus' ) if current_user.is_following_corpus(corpus) or corpus.is_public: @@ -191,6 +202,7 @@ def corpus(corpus_id): ) abort(403) + @bp.route('//generate-corpus-share-link', methods=['GET', 'POST']) @login_required @corpus_follower_permission_required('GENERATE_SHARE_LINK') diff --git a/app/static/js/RessourceDisplays/CorpusDisplay.js b/app/static/js/RessourceDisplays/CorpusDisplay.js index 4e8e8a9a..ab462e9b 100644 --- a/app/static/js/RessourceDisplays/CorpusDisplay.js +++ b/app/static/js/RessourceDisplays/CorpusDisplay.js @@ -12,16 +12,6 @@ class CorpusDisplay extends RessourceDisplay { .addEventListener('click', (event) => { Utils.deleteCorpusRequest(this.userId, this.corpusId); }); - this.displayElement - .querySelector('.action-switch[data-action="toggle-is-public"]') - .addEventListener('click', (event) => { - if (event.target.tagName !== 'INPUT') {return;} - if (event.target.checked) { - Utils.enableCorpusIsPublicRequest(this.userId, this.corpusId); - } else { - Utils.disableCorpusIsPublicRequest(this.userId, this.corpusId); - } - }); } init(user) { @@ -31,7 +21,6 @@ class CorpusDisplay extends RessourceDisplay { this.setStatus(corpus.status); this.setTitle(corpus.title); this.setNumTokens(corpus.num_tokens); - this.setShareLink(); } onPatch(patch) { @@ -82,7 +71,7 @@ class CorpusDisplay extends RessourceDisplay { } setStatus(status) { - let elements = this.displayElement.querySelectorAll('.corpus-analyse-trigger') + let elements = this.displayElement.querySelectorAll('.action-button[data-action="analyze"]'); for (let element of elements) { if (['BUILT', 'STARTING_ANALYSIS_SESSION', 'RUNNING_ANALYSIS_SESSION', 'CANCELING_ANALYSIS_SESSION'].includes(status)) { element.classList.remove('disabled'); @@ -118,28 +107,4 @@ class CorpusDisplay extends RessourceDisplay { new Date(creationDate).toLocaleString("en-US") ); } - - setShareLink() { - let generateShareLinkButton = this.displayElement.querySelector('#generate-share-link-button'); - let copyShareLinkButton = this.displayElement.querySelector('#copy-share-link-button'); - let shareLinkInput = this.displayElement.querySelector('#share-link-input'); - let shareLinkContainer = this.displayElement.querySelector('#share-link-container'); - let roleSelect = this.displayElement.querySelector('#role-select'); - let expirationDate = this.displayElement.querySelector('#expiration'); - - - generateShareLinkButton.addEventListener('click', () => { - Utils.generateCorpusShareLinkRequest(`${this.corpusId}`, roleSelect.value, expirationDate.value) - .then((shareLink) => { - shareLinkContainer.classList.remove('hide'); - shareLinkInput.value = shareLink; - }); - }); - - copyShareLinkButton.addEventListener('click', () => { - shareLinkInput.select(); - navigator.clipboard.writeText(shareLinkInput.value); - app.flash(`Copied!`, 'success'); - }); - } } diff --git a/app/static/js/Utils.js b/app/static/js/Utils.js index 865ea0d4..c5a55e89 100644 --- a/app/static/js/Utils.js +++ b/app/static/js/Utils.js @@ -69,6 +69,36 @@ class Utils { return Utils.mergeObjectsDeep(mergedObject, ...objects.slice(2)); } + static updateCorpusIsPublicRequest(corpusId, isPublic) { + return new Promise((resolve, reject) => { + let fetchRessource = `/corpora/${corpusId}/is_public`; + let fetchOptions = { + method: 'POST', + headers: { + 'Accept': 'application/json', + 'Content-Type': 'application/json' + }, + body: JSON.stringify(isPublic) + }; + fetch(fetchRessource, fetchOptions) + .then( + (response) => { + if (response.ok) { + app.flash(`Corpus is now ${isPublic ? 'public' : 'private'}`, 'corpus'); + resolve(response); + } else { + app.flash(`${response.statusText}`, 'error'); + reject(response); + } + }, + (response) => { + app.flash('Something went wrong', 'error'); + reject(response); + } + ); + }); + } + static updateCorpusFollowerRole(corpusId, followerId, roleName) { return new Promise((resolve, reject) => { fetch(`/corpora/${corpusId}/followers/${followerId}/role`, {method: 'POST', headers: {Accept: 'application/json', 'Content-Type': 'application/json'}, body: JSON.stringify({role: roleName})}) @@ -91,79 +121,27 @@ class Utils { }); } - static enableCorpusIsPublicRequest(userId, corpusId) { + static addCorpusFollowersRequest(corpusId, usernames) { return new Promise((resolve, reject) => { - let corpus; - try { - corpus = app.data.users[userId].corpora[corpusId]; - } catch (error) { - corpus = {}; - } - - let modalElement = Utils.HTMLToElement( - ` -
    -
    -

    Hier könnte eine Warnung stehen

    -

    -
    -
    - Cancel - Confirm -
    -
    - ` - ); - document.querySelector('#modals').appendChild(modalElement); - let modal = M.Modal.init( - modalElement, - { - dismissible: false, - onCloseEnd: () => { - modal.destroy(); - modalElement.remove(); - } - } - ); - - let confirmElement = modalElement.querySelector('.action-button[data-action="confirm"]'); - confirmElement.addEventListener('click', (event) => { - let corpusTitle = corpus?.title; - fetch(`/corpora/${corpusId}/is_public/enable`, {method: 'POST', headers: {Accept: 'application/json'}}) - .then( - (response) => { - if (response.status === 403) {app.flash('Forbidden', 'error'); reject(response);} - if (response.status === 404) {app.flash('Not Found', 'error'); reject(response);} - app.flash(`Corpus "${corpusTitle}" is public now`, 'corpus'); - resolve(response); - }, - (response) => { - app.flash('Something went wrong', 'error'); - reject(response); - } - ); - }); - modal.open(); - }); - } - - static disableCorpusIsPublicRequest(userId, corpusId) { - return new Promise((resolve, reject) => { - let corpus; - try { - corpus = app.data.users[userId].corpora[corpusId]; - } catch (error) { - corpus = {}; - } - - let corpusTitle = corpus?.title; - fetch(`/corpora/${corpusId}/is_public/disable`, {method: 'POST', headers: {Accept: 'application/json'}}) + let fetchRessource = `/corpora/${corpusId}/followers/add`; + let fetchOptions = { + method: 'POST', + headers: { + 'Accept': 'application/json', + 'Content-Type': 'application/json' + }, + body: JSON.stringify(usernames) + }; + fetch(fetchRessource, fetchOptions) .then( (response) => { - if (response.status === 403) {app.flash('Forbidden', 'error'); reject(response);} - if (response.status === 404) {app.flash('Not Found', 'error'); reject(response);} - app.flash(`Corpus "${corpusTitle}" is private now`, 'corpus'); - resolve(response); + if (response.ok) { + app.flash(`${usernames.length > 1 ? 'Users are' : 'User is'} following now`, 'corpus'); + resolve(response); + } else { + app.flash(`${response.statusText}`, 'error'); + reject(response); + } }, (response) => { app.flash('Something went wrong', 'error'); diff --git a/app/templates/corpora/corpus.html.j2 b/app/templates/corpora/corpus.html.j2 index 790d4fac..299c86f8 100644 --- a/app/templates/corpora/corpus.html.j2 +++ b/app/templates/corpora/corpus.html.j2 @@ -8,13 +8,11 @@
    -
    -
    -

    -
    -
    -

     

    -

     

    +

    +
    +
    +
    +
    -
    -
    - -
    -
    @@ -57,12 +50,35 @@
    -
    -
    - searchAnalyze - KBuild - import_exportExport - deleteDelete +
    +
    + +
    +
    +
    + Actions +
    +
    + KBuild +
    +
    + searchAnalyze +
    +
    + publishPublishing +
    +
    + deleteDelete +
    +
    + Social +
    +
    + person_addinvite user +
    +
    + linkShare link +
    @@ -80,73 +96,8 @@
    -
    -
    -
    - Share your Corpus -
    -

    -

    Change your Corpus Status to Public

    -

    Other users can only see the meta data of your corpus. The files of the corpus remain private and can only be viewed via a share link.

    -
    -
    - - -
    -
    -

    -
    -
    -

    -

    Create a link to share your corpus files with your team

    -

    With the link other users follow your corpus directly, if it has not expired. - You can set different roles via the link, you can also edit them later in the menu below. - It is recommended not to set the expiration date of the link too far.

    -
    -
    -
    -
    - - -
    -
    -
    -
    -
    -
    - - -
    -
    -
    -
    -
    - Generate Share Link -
    - -
    -
    -
    -
    +
    +
    @@ -159,9 +110,215 @@
    {% endblock page_content %} +{% block modals %} +{{ super() }} + + + + + +{% endblock modals %} + {% block scripts %} {{ super() }} {% endblock scripts %} From c01068e96b8b0ff5c48dc8f65953fd3a0bc991e5 Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Wed, 1 Mar 2023 16:33:29 +0100 Subject: [PATCH 028/177] cleanup imports --- app/corpora/routes.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/app/corpora/routes.py b/app/corpora/routes.py index 69a90767..a959da77 100644 --- a/app/corpora/routes.py +++ b/app/corpora/routes.py @@ -1,10 +1,9 @@ -from datetime import datetime, timedelta +from datetime import datetime from flask import ( abort, current_app, flash, jsonify, - make_response, Markup, redirect, render_template, @@ -14,15 +13,13 @@ from flask import ( ) from flask_login import current_user, login_required from threading import Thread -import jwt import os from .decorators import corpus_follower_permission_required, corpus_owner_or_admin_required -from app import db, hashids +from app import db from app.models import ( Corpus, CorpusFile, CorpusFollowerAssociation, - CorpusFollowerPermission, CorpusFollowerRole, CorpusStatus, User From 2dc7efbc8d89b8927d4ab9bea13641f86adabdda Mon Sep 17 00:00:00 2001 From: Inga Kirschnick Date: Thu, 2 Mar 2023 09:57:43 +0100 Subject: [PATCH 029/177] Update follow corpus by token method --- app/corpora/routes.py | 12 +++++------- app/models.py | 25 +++++++++++++++++-------- 2 files changed, 22 insertions(+), 15 deletions(-) diff --git a/app/corpora/routes.py b/app/corpora/routes.py index 5446f144..92664d43 100644 --- a/app/corpora/routes.py +++ b/app/corpora/routes.py @@ -66,15 +66,11 @@ def disable_corpus_is_public(corpus_id): @bp.route('//follow/') @login_required def follow_corpus(corpus_id, token): - corpus = current_user.verify_follow_corpus_token(token)['corpus'] - role = current_user.verify_follow_corpus_token(token)['role'] - if not (current_user.is_authenticated and current_user.verify_follow_corpus_token(token)): - abort(403) - if not current_user.is_following_corpus(corpus) and current_user != corpus.user: - current_user.follow_corpus(corpus, role) + if current_user.follow_corpus_by_token(token): db.session.commit() flash(f'You are following {corpus.title} now', category='corpus') - return redirect(url_for('corpora.corpus', corpus_id=corpus_id)) + return redirect(url_for('corpora.corpus', corpus_id=corpus_id)) + abort(403) @bp.route('//followers//unfollow', methods=['POST']) @@ -174,12 +170,14 @@ def corpus(corpus_id): title='Corpus' ) if current_user.is_following_corpus(corpus) or corpus.is_public: + cfa = CorpusFollowerAssociation.query.filter_by(corpus_id=corpus_id, follower_id=current_user.id).first_or_404() corpus_files = [x.to_json_serializeable() for x in corpus.files] owner = corpus.user.to_json_serializeable() return render_template( 'corpora/public_corpus.html.j2', corpus=corpus, corpus_files=corpus_files, + cfa=cfa, owner=owner, title='Corpus', ) diff --git a/app/models.py b/app/models.py index d363c0bb..de995a5c 100644 --- a/app/models.py +++ b/app/models.py @@ -792,14 +792,15 @@ class User(HashidMixin, UserMixin, db.Model): def is_following_corpus(self, corpus): return corpus in self.followed_corpora - def generate_follow_corpus_token(self, corpus_id, role, expiration=7): + def generate_follow_corpus_token(self, corpus_hashid, role_name, expiration=7): now = datetime.utcnow() payload = { 'exp': expiration, 'iat': now, 'iss': current_app.config['SERVER_NAME'], - 'sub': corpus_id, - 'role': role + 'purpose': 'User.follow_corpus', + 'role_name': role_name, + 'sub': corpus_hashid } return jwt.encode( payload, @@ -807,23 +808,31 @@ class User(HashidMixin, UserMixin, db.Model): algorithm='HS256' ) - def verify_follow_corpus_token(self, token): + def follow_corpus_by_token(self, token): try: payload = jwt.decode( token, current_app.config['SECRET_KEY'], algorithms=['HS256'], issuer=current_app.config['SERVER_NAME'], - options={'require': ['exp', 'iat', 'iss', 'sub']} + options={'require': ['exp', 'iat', 'iss', 'purpose', 'role_name', 'sub']} ) except jwt.PyJWTError: return False - corpus_id = payload.get('sub') + if payload.get('purpose') != 'User.follow_corpus': + return False + corpus_hashid = payload.get('sub') + corpus_id = hashids.decode(corpus_hashid) corpus = Corpus.query.get_or_404(corpus_id) - role = CorpusFollowerRole.query.filter_by(name=payload.get('role')).first() if corpus is None: return False - return {'corpus': corpus, 'role': role} + role_name = payload.get('role_name') + role = CorpusFollowerRole.query.filter_by(name=role_name).first() + if role is None: + return False + self.follow_corpus(corpus, role) + db.session.add(self) + return True def to_json_serializeable(self, backrefs=False, relationships=False, filter_by_privacy_settings=False): json_serializeable = { From b364480de6c19e5b0106a5db9a018b4ad1633bae Mon Sep 17 00:00:00 2001 From: Inga Kirschnick Date: Thu, 2 Mar 2023 09:59:47 +0100 Subject: [PATCH 030/177] Public Page update --- app/templates/corpora/public_corpus.html.j2 | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/app/templates/corpora/public_corpus.html.j2 b/app/templates/corpora/public_corpus.html.j2 index edf6ed74..1f73cf9d 100644 --- a/app/templates/corpora/public_corpus.html.j2 +++ b/app/templates/corpora/public_corpus.html.j2 @@ -79,7 +79,7 @@
    - {% if current_user.is_following_corpus(corpus)%} + {% if cfa.role.has_permission('VIEW') %}
    Corpus files @@ -87,7 +87,16 @@
    {% endif %} -
    + + {% if cfa.role.has_permission('UPDATE_FOLLOWER') %} +
    +
    + Corpus followers +
    +
    +
    + {% endif %} +
    From 8a55ce902e0805e1351a6f3e6a69317fbd9c971a Mon Sep 17 00:00:00 2001 From: Inga Kirschnick Date: Thu, 2 Mar 2023 15:08:50 +0100 Subject: [PATCH 031/177] color SCSS update social area+ decorator fix --- app/corpora/decorators.py | 24 ++++++++++++------------ app/corpora/routes.py | 8 ++++---- app/static/css/colors.scss | 15 +++++++++++++++ app/static/js/ResourceLists/UserList.js | 2 +- app/templates/_sidenav.html.j2 | 4 ++-- app/templates/main/social_area.html.j2 | 6 +++--- 6 files changed, 37 insertions(+), 22 deletions(-) diff --git a/app/corpora/decorators.py b/app/corpora/decorators.py index b3499258..96d4ac69 100644 --- a/app/corpora/decorators.py +++ b/app/corpora/decorators.py @@ -1,8 +1,9 @@ -from flask import abort, current_app +from flask import abort from flask_login import current_user from functools import wraps from app.models import Corpus, CorpusFollowerAssociation + def corpus_follower_permission_required(*permissions): def decorator(f): @wraps(f) @@ -20,15 +21,14 @@ def corpus_follower_permission_required(*permissions): return decorated_function return decorator -def corpus_owner_or_admin_required(): - def decorator(f): - @wraps(f) - def decorated_function(*args, **kwargs): - corpus_id = kwargs.get('corpus_id') - corpus = Corpus.query.get_or_404(corpus_id) - if current_user == corpus.user or current_user.is_administrator(): - return f(*args, **kwargs) - abort(403) - return decorated_function - return decorator + +def corpus_owner_or_admin_required(f): + @wraps(f) + def decorated_function(*args, **kwargs): + corpus_id = kwargs.get('corpus_id') + corpus = Corpus.query.get_or_404(corpus_id) + if current_user == corpus.user or current_user.is_administrator(): + return f(*args, **kwargs) + abort(403) + return decorated_function diff --git a/app/corpora/routes.py b/app/corpora/routes.py index 27057407..a487e834 100644 --- a/app/corpora/routes.py +++ b/app/corpora/routes.py @@ -43,7 +43,7 @@ def fake_add(): @bp.route('//is_public', methods=['POST']) @login_required -@corpus_owner_or_admin_required() +@corpus_owner_or_admin_required def update_corpus_is_public(corpus_id): is_public = request.json if not isinstance(is_public, bool): @@ -58,7 +58,7 @@ def update_corpus_is_public(corpus_id): @bp.route('//followers/add', methods=['POST']) @login_required -@corpus_owner_or_admin_required() +@corpus_owner_or_admin_required def add_corpus_followers(corpus_id): usernames = request.json if not (isinstance(usernames, list) or all(isinstance(u, str) for u in usernames)): @@ -207,7 +207,7 @@ def generate_corpus_share_link(corpus_id): @bp.route('/', methods=['DELETE']) @login_required -@corpus_owner_or_admin_required() +@corpus_owner_or_admin_required def delete_corpus(corpus_id): def _delete_corpus(app, corpus_id): with app.app_context(): @@ -238,7 +238,7 @@ def analyse_corpus(corpus_id): @bp.route('//build', methods=['POST']) @login_required -@corpus_owner_or_admin_required() +@corpus_owner_or_admin_required def build_corpus(corpus_id): def _build_corpus(app, corpus_id): with app.app_context(): diff --git a/app/static/css/colors.scss b/app/static/css/colors.scss index f8f04228..0e43916a 100644 --- a/app/static/css/colors.scss +++ b/app/static/css/colors.scss @@ -22,6 +22,11 @@ $color: ( "surface": #ffffff, "error": #b00020 ), + "social-area": ( + "base": #d6ae86, + "darken": #C98536, + "lighten": #EAE2DB + ), "service": ( "corpus-analysis": ( "base": #aa9cc9, @@ -108,6 +113,16 @@ $color: ( } } +@each $key, $color-code in map-get($color, "social-area") { + .social-area-color-#{$key} { + background-color: $color-code !important; + } + + .social-area-color-border-#{$key} { + border-color: $color-code !important; + } +} + @each $service-name, $color-palette in map-get($color, "service") { .service-color[data-service="#{$service-name}"] { background-color: map-get($color-palette, "base") !important; diff --git a/app/static/js/ResourceLists/UserList.js b/app/static/js/ResourceLists/UserList.js index 65542de0..8d0e590f 100644 --- a/app/static/js/ResourceLists/UserList.js +++ b/app/static/js/ResourceLists/UserList.js @@ -20,7 +20,7 @@ class UserList extends ResourceList { - send + `.trim(); diff --git a/app/templates/_sidenav.html.j2 b/app/templates/_sidenav.html.j2 index 62dcc604..0027772e 100644 --- a/app/templates/_sidenav.html.j2 +++ b/app/templates/_sidenav.html.j2 @@ -1,6 +1,6 @@
    • -
      +
      @@ -26,7 +26,7 @@
    • IMy Corpora
    • JMy Jobs
    • new_labelContribute
      • -
    • groupSocial Area
      • +
    • Processes & Services
    • File setup
      • diff --git a/app/templates/main/social_area.html.j2 b/app/templates/main/social_area.html.j2 index fbe6974e..8aaeecfa 100644 --- a/app/templates/main/social_area.html.j2 +++ b/app/templates/main/social_area.html.j2 @@ -1,7 +1,7 @@ {% extends "base.html.j2" %} {% import "materialize/wtf.html.j2" as wtf %} -{% block main_attribs %} style="background-color:#d8c9ba86" {% endblock main_attribs %} +{% block main_attribs %} class="social-area-color-lighten" {% endblock main_attribs %} {% block page_content %}
      @@ -14,14 +14,14 @@

       

       

      - +
      -
      +
      - closeCancel + closeCancel {{ wtf.render_field(form.submit, material_icon='send') }}
      diff --git a/app/templates/corpora/public_corpora.html.j2 b/app/templates/corpora/public_corpora.html.j2 deleted file mode 100644 index 9be377f3..00000000 --- a/app/templates/corpora/public_corpora.html.j2 +++ /dev/null @@ -1,72 +0,0 @@ -{% extends "base.html.j2" %} - -{% block main_attribs %} class="service-scheme" data-service="corpus-analysis"{% endblock main_attribs %} - -{% block page_content %} -
      -
      -
      -
      -
      -
      -

      ICorpora

      -
      -
      -
      - search - - -
      -
      -
      -
      -
      - - -
      -
      -
      -
      -
      - - - - - - - - - - -
      Title and DescriptionStatus
      -
        -
        -
        -
        -
        -
        -
        -{% endblock page_content %} - - -{% block scripts %} -{{ super() }} - -{% endblock scripts %} diff --git a/app/templates/corpora/public_corpus.html.j2 b/app/templates/corpora/public_corpus.html.j2 index 41f5798b..ff445e38 100644 --- a/app/templates/corpora/public_corpus.html.j2 +++ b/app/templates/corpora/public_corpus.html.j2 @@ -101,30 +101,3 @@
      {% endblock page_content %} - -{% block scripts %} -{{ super() }} - -{% endblock scripts %} diff --git a/app/templates/corpora/public_corpus.js.j2 b/app/templates/corpora/public_corpus.js.j2 new file mode 100644 index 00000000..0b8205f4 --- /dev/null +++ b/app/templates/corpora/public_corpus.js.j2 @@ -0,0 +1,11 @@ +let corpusId = {{ corpus.hashid|tojson }}; +let corpusFileList = new PublicCorpusFileList(document.querySelector('.corpus-file-list')); +corpusFileList.add({{ corpus_files|tojson }}); + +let unfollowRequestElement = document.querySelector('.action-button[data-action="unfollow-request"]'); +unfollowRequestElement.addEventListener('click', () => { + Requests.corpora.entity.followers.entity.delete(corpusId, currentUserId) + .then((response) => { + window.location.href = {{ url_for('main.dashboard')|tojson }}; + }); +}); diff --git a/app/templates/services/spacy_nlp_pipeline.html.j2 b/app/templates/services/spacy_nlp_pipeline.html.j2 index 030ea163..8f466e3d 100644 --- a/app/templates/services/spacy_nlp_pipeline.html.j2 +++ b/app/templates/services/spacy_nlp_pipeline.html.j2 @@ -77,7 +77,7 @@ {{ form.model.label }} help_outline - new_label + new_label
      diff --git a/app/templates/services/tesseract_ocr_pipeline.html.j2 b/app/templates/services/tesseract_ocr_pipeline.html.j2 index ff4fd38b..11d65c64 100644 --- a/app/templates/services/tesseract_ocr_pipeline.html.j2 +++ b/app/templates/services/tesseract_ocr_pipeline.html.j2 @@ -59,7 +59,7 @@ {{ form.model.label }} help_outline - new_label + new_label {% for error in form.model.errors %} {{ error }} From c589fd1f781309caa7fc51ba07ac3313160e1825 Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Fri, 10 Mar 2023 10:34:46 +0100 Subject: [PATCH 050/177] Remove unused function in utils --- app/static/js/Utils.js | 56 ------------------------------------------ 1 file changed, 56 deletions(-) diff --git a/app/static/js/Utils.js b/app/static/js/Utils.js index 12bdea0d..822ab775 100644 --- a/app/static/js/Utils.js +++ b/app/static/js/Utils.js @@ -69,62 +69,6 @@ class Utils { return Utils.mergeObjectsDeep(mergedObject, ...objects.slice(2)); } - static deleteCorpusFileRequest(userId, corpusId, corpusFileId) { - return new Promise((resolve, reject) => { - let corpusFile; - try { - corpusFile = app.data.users[userId].corpora[corpusId].files[corpusFileId]; - } catch (error) { - corpusFile = {}; - } - - let modalElement = Utils.HTMLToElement( - ` -
      -
      -

      Confirm Corpus File deletion

      -

      Do you really want to delete the Corpus File ${corpusFile?.title}? All files will be permanently deleted!

      -
      -
      - Cancel - Delete -
      -
      - ` - ); - document.querySelector('#modals').appendChild(modalElement); - let modal = M.Modal.init( - modalElement, - { - dismissible: false, - onCloseEnd: () => { - modal.destroy(); - modalElement.remove(); - } - } - ); - - let confirmElement = modalElement.querySelector('.action-button[data-action="confirm"]'); - confirmElement.addEventListener('click', (event) => { - let corpusFileTitle = corpusFile?.title; - fetch(`/corpora/${corpusId}/files/${corpusFileId}`, {method: 'DELETE', headers: {Accept: 'application/json'}}) - .then( - (response) => { - if (response.status === 403) {app.flash('Forbidden', 'error'); reject(response);} - if (response.status === 404) {app.flash('Not Found', 'error'); reject(response);} - app.flash(`Corpus File "${corpusFileTitle}" deleted`, 'corpus'); - resolve(response); - }, - (response) => { - app.flash('Something went wrong', 'error'); - reject(response); - } - ); - }); - modal.open(); - }); - } - static deleteProfileAvatarRequest(userId) { return new Promise((resolve, reject) => { let modalElement = Utils.HTMLToElement( From 2529dfeb6264172860f20fd78ee6dd2067a19237 Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Fri, 10 Mar 2023 12:07:18 +0100 Subject: [PATCH 051/177] remove testroute --- app/main/routes.py | 7 +- app/templates/main/dashboard2.html.j2 | 274 -------------------------- 2 files changed, 1 insertion(+), 280 deletions(-) delete mode 100644 app/templates/main/dashboard2.html.j2 diff --git a/app/main/routes.py b/app/main/routes.py index 287a04f5..918f7414 100644 --- a/app/main/routes.py +++ b/app/main/routes.py @@ -30,12 +30,6 @@ def dashboard(): return render_template('main/dashboard.html.j2', title='Dashboard') -@bp.route('/dashboard2') -@login_required -def dashboard2(): - return render_template('main/dashboard2.html.j2', title='Dashboard') - - @bp.route('/user_manual') def user_manual(): return render_template('main/user_manual.html.j2', title='User manual') @@ -55,6 +49,7 @@ def privacy_policy(): def terms_of_use(): return render_template('main/terms_of_use.html.j2', title='Terms of Use') + @bp.route('/social-area') def social_area(): users = [ diff --git a/app/templates/main/dashboard2.html.j2 b/app/templates/main/dashboard2.html.j2 deleted file mode 100644 index d45aaa04..00000000 --- a/app/templates/main/dashboard2.html.j2 +++ /dev/null @@ -1,274 +0,0 @@ -{% extends "base.html.j2" %} -{% from "main/_breadcrumbs.html.j2" import breadcrumbs with context %} - -{% block page_content %} -
      -
      -
      -
      -

      Dashboard

      -
      -
      -
      -

      Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.

      -
      -
      - IMy Corpora - JMy Jobs - groupsMy Groups -
      -
      -
      - - -
      -
      -
      -
      -
      -
      -
      - search - - -
      -
      -
      -
      -
      - -
      -
      -
      -
      -

      My Corpora

      -

      Create a corpus to interactively perform linguistic analysis.

      -

      Or browse our users public corpora.

      -
      -
      -
      -
      -
      - - - - - - - - - - -
      Title and DescriptionStatus
      -
        -
        -
        -
        - Import Corpusimport_export - Create corpusadd -
        -
        -
        -
        -
        - -
        -
        -
        -
        - -
        -
        -
        -
        -
        -
        -
        - search - - -
        -
        -
        -
        -
        - -
        -
        -
        -
        -

        My Jobs

        -

        - A job is the execution of a service provided by nopaque. You can - create any number of jobs and let them be processed simultaneously. We - strongly recommend that you create a folder on your computer where you - save the various files that nopaque provides you with after each - pre-processing step. You will need the result of each step for the - next step. -

        -

        Where is my Job data? Don't worry, please read this news entry

        -
        -
        -
        -
        -
        - - - - - - - - - - -
        Title and DescriptionStatus
        -
          -
          -
          -
          - addCreate job -
          -
          -
          -
          -
          - -
          -
          -
          -
          - -
          -
          -
          -
          -
          -
          -
          - search - - -
          -
          -
          -
          -
          - -
          -
          -
          -
          -

          My Groups

          -

          Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.

          -
          -
          -
          -
          -
          - - - - - - - - - - -
          Title and DescriptionStatus
          -
            -
            -
            -
            - addCreate group -
            -
            -
            -
            -
            - -
            -
            -
            -
            -{% endblock page_content %} - -{% block modals %} -{{ super() }} - -{% endblock modals %} - - -{% block scripts %} -{{ super() }} - -{% endblock scripts %} From 6ba3f9c849e997ce14fa7ce88975a00181fcf9a5 Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Fri, 10 Mar 2023 12:56:09 +0100 Subject: [PATCH 052/177] Add settings to project vscode settings.yml --- .vscode/settings.json | 23 ++++++++++++++++++++++- app/static/js/Requests/Corpora.js | 0 2 files changed, 22 insertions(+), 1 deletion(-) delete mode 100644 app/static/js/Requests/Corpora.js diff --git a/.vscode/settings.json b/.vscode/settings.json index 0967ef42..c2a8567e 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1 +1,22 @@ -{} +{ + "editor.rulers": [79], + "files.insertFinalNewline": true, + "[css]": { + "editor.tabSize": 2 + }, + "[scss]": { + "editor.tabSize": 2 + }, + "[html]": { + "editor.tabSize": 2 + }, + "[javascript]": { + "editor.tabSize": 2 + }, + "[jinja-html]": { + "editor.tabSize": 2 + }, + "[jinja-js]": { + "editor.tabSize": 2 + }, +} diff --git a/app/static/js/Requests/Corpora.js b/app/static/js/Requests/Corpora.js deleted file mode 100644 index e69de29b..00000000 From ecb577628be53a21b72269304cc6547859091cf3 Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Fri, 10 Mar 2023 14:55:10 +0100 Subject: [PATCH 053/177] Remove debug comments --- app/contributions/tesseract_ocr_pipeline_models/json_routes.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/contributions/tesseract_ocr_pipeline_models/json_routes.py b/app/contributions/tesseract_ocr_pipeline_models/json_routes.py index 705fbdb4..f4c4ca79 100644 --- a/app/contributions/tesseract_ocr_pipeline_models/json_routes.py +++ b/app/contributions/tesseract_ocr_pipeline_models/json_routes.py @@ -39,8 +39,6 @@ def delete_tesseract_model(tesseract_ocr_pipeline_model_id): @permission_required('CONTRIBUTE') @content_negotiation(consumes='application/json', produces='application/json') def update_tesseract_ocr_pipeline_model_is_public(tesseract_ocr_pipeline_model_id): - # body: jsonify({'is_public': True}) - # body: jsonify(False) is_public = request.json if not isinstance(is_public, bool): abort(400) From b6f155a06ba8d0914138fe27f7f5fde60d42adcd Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Fri, 10 Mar 2023 15:17:24 +0100 Subject: [PATCH 054/177] Fix error_handler --- app/__init__.py | 6 +++--- app/errors/__init__.py | 7 ++++--- app/errors/handlers.py | 9 ++------- 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index cc747a89..dcb58e47 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -54,6 +54,9 @@ def create_app(config: Config = Config) -> Flask: scheduler.init_app(app) socketio.init_app(app, message_queue=app.config['NOPAQUE_SOCKETIO_MESSAGE_QUEUE_URI']) # noqa + from .errors import init_app as init_error_handlers + init_error_handlers(app) + from .admin import bp as admin_blueprint app.register_blueprint(admin_blueprint, url_prefix='/admin') @@ -69,9 +72,6 @@ def create_app(config: Config = Config) -> Flask: from .corpora import bp as corpora_blueprint app.register_blueprint(corpora_blueprint, url_prefix='/corpora') - from .errors import bp as errors_blueprint - app.register_blueprint(errors_blueprint) - from .jobs import bp as jobs_blueprint app.register_blueprint(jobs_blueprint, url_prefix='/jobs') diff --git a/app/errors/__init__.py b/app/errors/__init__.py index 0d79af48..1f0480b4 100644 --- a/app/errors/__init__.py +++ b/app/errors/__init__.py @@ -1,5 +1,6 @@ -from flask import Blueprint +from werkzeug.exceptions import HTTPException +from .handlers import generic_error_handler -bp = Blueprint('errors', __name__) -from . import handlers +def init_app(app): + app.register_error_handler(HTTPException, generic_error_handler) diff --git a/app/errors/handlers.py b/app/errors/handlers.py index cc6c9268..5a6c413d 100644 --- a/app/errors/handlers.py +++ b/app/errors/handlers.py @@ -1,11 +1,6 @@ -from flask import render_template, request -from werkzeug.exceptions import HTTPException -from . import bp +from flask import render_template -@bp.errorhandler(HTTPException) def generic_error_handler(e): - if (request.accept_mimetypes.accept_json - and not request.accept_mimetypes.accept_html): - return {'errors': {'message': e.description}}, e.code + print('test') return render_template('errors/error.html.j2', error=e), e.code From bda18e64c85f12624327daa03851ffad61c03410 Mon Sep 17 00:00:00 2001 From: Inga Kirschnick Date: Fri, 10 Mar 2023 17:03:37 +0100 Subject: [PATCH 055/177] Small Dashboard Job List fix --- app/static/js/ResourceLists/JobList.js | 2 +- app/templates/main/dashboard.html.j2 | 28 -------------------------- 2 files changed, 1 insertion(+), 29 deletions(-) diff --git a/app/static/js/ResourceLists/JobList.js b/app/static/js/ResourceLists/JobList.js index ff7f82b2..2c48996e 100644 --- a/app/static/js/ResourceLists/JobList.js +++ b/app/static/js/ResourceLists/JobList.js @@ -96,7 +96,7 @@ class JobList extends ResourceList { let listAction = listActionElement === null ? 'view' : listActionElement.dataset.listAction; switch (listAction) { case 'delete-request': { - Utils.deleteJobRequest(this.userId, itemId); + Requests.jobs.entity.delete(itemId); break; } case 'view': { diff --git a/app/templates/main/dashboard.html.j2 b/app/templates/main/dashboard.html.j2 index ca5422df..5474db97 100644 --- a/app/templates/main/dashboard.html.j2 +++ b/app/templates/main/dashboard.html.j2 @@ -42,23 +42,6 @@ - {#
            -

            Social

            -
            -
            - Other users -

            Find other users and follow them to see their corpora.

            -
            -
            -
            -
            -
            - Public corpora -

            Find public corpora

            -
            -
            -
            -
            #} {% endblock page_content %} @@ -113,14 +96,3 @@ {% endblock modals %} - -{% block scripts %} -{{ super() }} -{# #} -{% endblock scripts %} - From a1af3e34d26fc12351f3297746cd62f42e82b333 Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Mon, 13 Mar 2023 07:58:33 +0100 Subject: [PATCH 056/177] Remove unused print statement --- app/errors/handlers.py | 1 - 1 file changed, 1 deletion(-) diff --git a/app/errors/handlers.py b/app/errors/handlers.py index 5a6c413d..8c2e4fcf 100644 --- a/app/errors/handlers.py +++ b/app/errors/handlers.py @@ -2,5 +2,4 @@ from flask import render_template def generic_error_handler(e): - print('test') return render_template('errors/error.html.j2', error=e), e.code From 5c2225c43eda3b94f611e97664f0c6508b910363 Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Mon, 13 Mar 2023 08:20:09 +0100 Subject: [PATCH 057/177] Let the generic error handler generate json again --- app/errors/handlers.py | 13 ++++++++++--- app/templates/errors/error.html.j2 | 2 +- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/app/errors/handlers.py b/app/errors/handlers.py index 8c2e4fcf..bf2fef09 100644 --- a/app/errors/handlers.py +++ b/app/errors/handlers.py @@ -1,5 +1,12 @@ -from flask import render_template +from flask import jsonify, render_template, request, Response +from werkzeug.exceptions import HTTPException -def generic_error_handler(e): - return render_template('errors/error.html.j2', error=e), e.code +def generic_error_handler(error: HTTPException): + accent_json: bool = request.accept_mimetypes.accept_json + accept_html: bool = request.accept_mimetypes.accept_html + if accent_json and not accept_html: + response: Response = jsonify(str(error)) + response.status_code = error.code + return response + return render_template('errors/error.html.j2', error=error), error.code diff --git a/app/templates/errors/error.html.j2 b/app/templates/errors/error.html.j2 index ef19de5f..8db723d2 100644 --- a/app/templates/errors/error.html.j2 +++ b/app/templates/errors/error.html.j2 @@ -4,7 +4,7 @@ {% block page_content %}
            -

            {{ error.name }}

            +

            {{ error.code }} {{ error.name }}

            {{ error.description }}

            {% endblock page_content %} From ca53974e504680f59a19a90b14fcb338a7772b12 Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Mon, 13 Mar 2023 08:36:51 +0100 Subject: [PATCH 058/177] Update the generic error handling again. Added type hints --- app/errors/__init__.py | 4 ++-- app/errors/handlers.py | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/errors/__init__.py b/app/errors/__init__.py index 1f0480b4..847658fb 100644 --- a/app/errors/__init__.py +++ b/app/errors/__init__.py @@ -1,6 +1,6 @@ from werkzeug.exceptions import HTTPException -from .handlers import generic_error_handler +from .handlers import generic def init_app(app): - app.register_error_handler(HTTPException, generic_error_handler) + app.register_error_handler(HTTPException, generic) diff --git a/app/errors/handlers.py b/app/errors/handlers.py index bf2fef09..fe7aaf4f 100644 --- a/app/errors/handlers.py +++ b/app/errors/handlers.py @@ -1,12 +1,13 @@ from flask import jsonify, render_template, request, Response from werkzeug.exceptions import HTTPException +from typing import Tuple, Union -def generic_error_handler(error: HTTPException): +def generic(error: HTTPException) -> Tuple[Union[str, Response], int]: + ''' Generic error handler ''' accent_json: bool = request.accept_mimetypes.accept_json accept_html: bool = request.accept_mimetypes.accept_html if accent_json and not accept_html: response: Response = jsonify(str(error)) - response.status_code = error.code - return response + return response, error.code return render_template('errors/error.html.j2', error=error), error.code From e03b5258efddef3aae370798a258e24478cae60e Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Mon, 13 Mar 2023 09:49:59 +0100 Subject: [PATCH 059/177] Codestyle enhancements --- .../spacy_nlp_pipeline_models/__init__.py | 2 +- .../spacy_nlp_pipeline_models/json_routes.py | 10 +--- .../spacy_nlp_pipeline_models/routes.py | 55 ++++++++----------- .../tesseract_ocr_pipeline_models/__init__.py | 2 +- .../json_routes.py | 10 +--- .../tesseract_ocr_pipeline_models/routes.py | 45 +++++++-------- app/static/js/Forms/Form.js | 4 +- 7 files changed, 52 insertions(+), 76 deletions(-) diff --git a/app/contributions/spacy_nlp_pipeline_models/__init__.py b/app/contributions/spacy_nlp_pipeline_models/__init__.py index 6b73681a..8ff119d0 100644 --- a/app/contributions/spacy_nlp_pipeline_models/__init__.py +++ b/app/contributions/spacy_nlp_pipeline_models/__init__.py @@ -1,7 +1,7 @@ from flask import Blueprint -TEMPLATE_FOLDER = 'contributions/spacy_nlp_pipeline_models' +template_base_dir = 'contributions/spacy_nlp_pipeline_models' bp = Blueprint('spacy_nlp_pipeline_models', __name__) diff --git a/app/contributions/spacy_nlp_pipeline_models/json_routes.py b/app/contributions/spacy_nlp_pipeline_models/json_routes.py index 9247f85b..f7a9a254 100644 --- a/app/contributions/spacy_nlp_pipeline_models/json_routes.py +++ b/app/contributions/spacy_nlp_pipeline_models/json_routes.py @@ -1,4 +1,4 @@ -from flask import abort, current_app, jsonify, request +from flask import abort, current_app, request from flask_login import login_required, current_user from threading import Thread from app import db @@ -29,9 +29,7 @@ def delete_spacy_model(spacy_nlp_pipeline_model_id): 'message': \ f'SpaCy NLP Pipeline Model "{snpm.title}" marked for deletion' } - response = jsonify(resonse_data) - response.status_code = 202 - return response + return resonse_data, 202 @bp.route('//is_public', methods=['PUT']) @@ -53,6 +51,4 @@ def update_spacy_nlp_pipeline_model_is_public(spacy_nlp_pipeline_model_id): f' is now {"public" if is_public else "private"}' ) } - response = jsonify(response_data) - response.status_code = 200 - return response + return response_data, 200 diff --git a/app/contributions/spacy_nlp_pipeline_models/routes.py b/app/contributions/spacy_nlp_pipeline_models/routes.py index 2e416c47..609941fc 100644 --- a/app/contributions/spacy_nlp_pipeline_models/routes.py +++ b/app/contributions/spacy_nlp_pipeline_models/routes.py @@ -1,8 +1,8 @@ -from flask import abort, flash, Markup, redirect, render_template, url_for -from flask_login import login_required, current_user +from flask import abort, flash, redirect, render_template, url_for +from flask_login import current_user, login_required from app import db from app.models import SpaCyNLPPipelineModel -from . import bp, TEMPLATE_FOLDER +from . import bp, template_base_dir from .forms import ( CreateSpaCyNLPPipelineModelForm, EditSpaCyNLPPipelineModelForm @@ -13,21 +13,21 @@ from .forms import ( @login_required def spacy_nlp_pipeline_models(): return render_template( - f'{TEMPLATE_FOLDER}/spacy_nlp_pipeline_models.html.j2', + f'{template_base_dir}/spacy_nlp_pipeline_models.html.j2', title='SpaCy NLP Pipeline Models' ) -@bp.route('/create', methods=['GET', 'POST']) +@bp.route('/create') @login_required def create_spacy_nlp_pipeline_model(): - form = CreateSpaCyNLPPipelineModelForm(prefix='create-spacy-nlp-pipeline-model-form') + form_prefix = 'create-spacy-nlp-pipeline-model-form' + form = CreateSpaCyNLPPipelineModelForm(prefix=form_prefix) if form.is_submitted(): if not form.validate(): - response = {'errors': form.errors} - return response, 400 + return {'errors': form.errors}, 400 try: - spacy_nlp_pipeline_model = SpaCyNLPPipelineModel.create( + snpm = SpaCyNLPPipelineModel.create( form.spacy_model_file.data, compatible_service_versions=form.compatible_service_versions.data, description=form.description.data, @@ -44,18 +44,10 @@ def create_spacy_nlp_pipeline_model(): except OSError: abort(500) db.session.commit() - spacy_nlp_pipeline_model_url = url_for( - '.spacy_nlp_pipeline_model', - spacy_nlp_pipeline_model_id=spacy_nlp_pipeline_model.id - ) - message = Markup( - f'SpaCy NLP Pipeline model "{spacy_nlp_pipeline_model.title}" ' - 'created' - ) - flash(message) - return '', 201, {'Location': spacy_nlp_pipeline_model_url} + flash(f'SpaCy NLP Pipeline model "{snpm.title}" created') + return {}, 201, {'Location': url_for('.spacy_nlp_pipeline_models')} return render_template( - f'{TEMPLATE_FOLDER}/create_spacy_nlp_pipeline_model.html.j2', + f'{template_base_dir}/create_spacy_nlp_pipeline_model.html.j2', form=form, title='Create SpaCy NLP Pipeline Model' ) @@ -64,24 +56,21 @@ def create_spacy_nlp_pipeline_model(): @bp.route('/', methods=['GET', 'POST']) @login_required def spacy_nlp_pipeline_model(spacy_nlp_pipeline_model_id): - spacy_nlp_pipeline_model = SpaCyNLPPipelineModel.query.get_or_404(spacy_nlp_pipeline_model_id) + snpm = SpaCyNLPPipelineModel.query.get_or_404(spacy_nlp_pipeline_model_id) + form_prefix = 'edit-spacy-nlp-pipeline-model-form' form = EditSpaCyNLPPipelineModelForm( - data=spacy_nlp_pipeline_model.to_json_serializeable(), - prefix='edit-spacy-nlp-pipeline-model-form' + data=snpm.to_json_serializeable(), + prefix=form_prefix ) if form.validate_on_submit(): - form.populate_obj(spacy_nlp_pipeline_model) - if db.session.is_modified(spacy_nlp_pipeline_model): - message = Markup( - f'SpaCy NLP Pipeline model "{spacy_nlp_pipeline_model.title}" ' - 'updated' - ) - flash(message) + form.populate_obj(snpm) + if db.session.is_modified(snpm): + flash(f'SpaCy NLP Pipeline model "{snpm.title}" updated') db.session.commit() return redirect(url_for('.spacy_nlp_pipeline_models')) return render_template( - f'{TEMPLATE_FOLDER}/spacy_nlp_pipeline_model.html.j2', + f'{template_base_dir}/spacy_nlp_pipeline_model.html.j2', form=form, - spacy_nlp_pipeline_model=spacy_nlp_pipeline_model, - title=f'{spacy_nlp_pipeline_model.title} {spacy_nlp_pipeline_model.version}' + spacy_nlp_pipeline_model=snpm, + title=f'{snpm.title} {snpm.version}' ) diff --git a/app/contributions/tesseract_ocr_pipeline_models/__init__.py b/app/contributions/tesseract_ocr_pipeline_models/__init__.py index c60e0915..cf44126d 100644 --- a/app/contributions/tesseract_ocr_pipeline_models/__init__.py +++ b/app/contributions/tesseract_ocr_pipeline_models/__init__.py @@ -1,7 +1,7 @@ from flask import Blueprint -TEMPLATE_FOLDER = 'contributions/tesseract_ocr_pipeline_models' +template_base_dir = 'contributions/tesseract_ocr_pipeline_models' bp = Blueprint('tesseract_ocr_pipeline_models', __name__) diff --git a/app/contributions/tesseract_ocr_pipeline_models/json_routes.py b/app/contributions/tesseract_ocr_pipeline_models/json_routes.py index f4c4ca79..81aa6598 100644 --- a/app/contributions/tesseract_ocr_pipeline_models/json_routes.py +++ b/app/contributions/tesseract_ocr_pipeline_models/json_routes.py @@ -1,4 +1,4 @@ -from flask import abort, current_app, jsonify, request +from flask import abort, current_app, request from flask_login import login_required, current_user from threading import Thread from app import db @@ -29,9 +29,7 @@ def delete_tesseract_model(tesseract_ocr_pipeline_model_id): 'message': \ f'Tesseract OCR Pipeline Model "{topm.title}" marked for deletion' } - response = jsonify(response_data) - response.status_code = 202 - return response + return response_data, 202 @bp.route('//is_public', methods=['PUT']) @@ -53,6 +51,4 @@ def update_tesseract_ocr_pipeline_model_is_public(tesseract_ocr_pipeline_model_i f' is now {"public" if is_public else "private"}' ) } - response = jsonify(response_data) - response.status_code = 200 - return response + return response_data, 200 diff --git a/app/contributions/tesseract_ocr_pipeline_models/routes.py b/app/contributions/tesseract_ocr_pipeline_models/routes.py index 823e54d9..b888cef7 100644 --- a/app/contributions/tesseract_ocr_pipeline_models/routes.py +++ b/app/contributions/tesseract_ocr_pipeline_models/routes.py @@ -1,8 +1,8 @@ -from flask import abort, flash, Markup, redirect, render_template, url_for +from flask import abort, flash, redirect, render_template, url_for from flask_login import login_required, current_user from app import db from app.models import TesseractOCRPipelineModel -from . import bp, TEMPLATE_FOLDER +from . import bp, template_base_dir from .forms import ( CreateTesseractOCRPipelineModelForm, EditTesseractOCRPipelineModelForm @@ -13,7 +13,7 @@ from .forms import ( @login_required def tesseract_ocr_pipeline_models(): return render_template( - f'{TEMPLATE_FOLDER}/tesseract_ocr_pipeline_models.html.j2', + f'{template_base_dir}/tesseract_ocr_pipeline_models.html.j2', title='Tesseract OCR Pipeline Models' ) @@ -21,13 +21,13 @@ def tesseract_ocr_pipeline_models(): @bp.route('/create', methods=['GET', 'POST']) @login_required def create_tesseract_ocr_pipeline_model(): - form = CreateTesseractOCRPipelineModelForm(prefix='create-tesseract-ocr-pipeline-model-form') + form_prefix = 'create-tesseract-ocr-pipeline-model-form' + form = CreateTesseractOCRPipelineModelForm(prefix=form_prefix) if form.is_submitted(): if not form.validate(): - response = {'errors': form.errors} - return response, 400 + return {'errors': form.errors}, 400 try: - tesseract_ocr_pipeline_model = TesseractOCRPipelineModel.create( + topm = TesseractOCRPipelineModel.create( form.tesseract_model_file.data, compatible_service_versions=form.compatible_service_versions.data, description=form.description.data, @@ -43,15 +43,10 @@ def create_tesseract_ocr_pipeline_model(): except OSError: abort(500) db.session.commit() - tesseract_ocr_pipeline_model_url = url_for( - '.tesseract_ocr_pipeline_model', - tesseract_ocr_pipeline_model_id=tesseract_ocr_pipeline_model.id - ) - message = Markup(f'Tesseract OCR Pipeline model "{tesseract_ocr_pipeline_model.title}" created') - flash(message) - return {}, 201, {'Location': tesseract_ocr_pipeline_model_url} + flash(f'Tesseract OCR Pipeline model "{topm.title}" created') + return {}, 201, {'Location': url_for('.tesseract_ocr_pipeline_models')} return render_template( - f'{TEMPLATE_FOLDER}/create_tesseract_ocr_pipeline_model.html.j2', + f'{template_base_dir}/create_tesseract_ocr_pipeline_model.html.j2', form=form, title='Create Tesseract OCR Pipeline Model' ) @@ -60,21 +55,21 @@ def create_tesseract_ocr_pipeline_model(): @bp.route('/', methods=['GET', 'POST']) @login_required def tesseract_ocr_pipeline_model(tesseract_ocr_pipeline_model_id): - tesseract_ocr_pipeline_model = TesseractOCRPipelineModel.query.get_or_404(tesseract_ocr_pipeline_model_id) + topm = TesseractOCRPipelineModel.query.get_or_404(tesseract_ocr_pipeline_model_id) + form_prefix = 'edit-tesseract-ocr-pipeline-model-form' form = EditTesseractOCRPipelineModelForm( - data=tesseract_ocr_pipeline_model.to_json_serializeable(), - prefix='edit-tesseract-ocr-pipeline-model-form' + data=topm.to_json_serializeable(), + prefix=form_prefix ) if form.validate_on_submit(): - form.populate_obj(tesseract_ocr_pipeline_model) - if db.session.is_modified(tesseract_ocr_pipeline_model): - message = Markup(f'Tesseract OCR Pipeline model "{tesseract_ocr_pipeline_model.title}" updated') - flash(message) + form.populate_obj(topm) + if db.session.is_modified(topm): + flash(f'Tesseract OCR Pipeline model "{topm.title}" updated') db.session.commit() return redirect(url_for('.tesseract_ocr_pipeline_models')) return render_template( - f'{TEMPLATE_FOLDER}/tesseract_ocr_pipeline_model.html.j2', + f'{template_base_dir}/tesseract_ocr_pipeline_model.html.j2', form=form, - tesseract_ocr_pipeline_model=tesseract_ocr_pipeline_model, - title=f'{tesseract_ocr_pipeline_model.title} {tesseract_ocr_pipeline_model.version}' + tesseract_ocr_pipeline_model=topm, + title=f'{topm.title} {topm.version}' ) diff --git a/app/static/js/Forms/Form.js b/app/static/js/Forms/Form.js index a9604c69..c3496e18 100644 --- a/app/static/js/Forms/Form.js +++ b/app/static/js/Forms/Form.js @@ -92,7 +92,6 @@ class Form { } if (request.status === 400) { let responseJson = JSON.parse(request.responseText); - console.log(responseJson); for (let [inputName, inputErrors] of Object.entries(responseJson.errors)) { let inputFieldElement = this.formElement .querySelector(`input[name$="${inputName}"], select[name$="${inputName}"]`) @@ -122,10 +121,11 @@ class Form { request.setRequestHeader('Accept', 'application/json'); let formData = new FormData(this.formElement); switch (this.formElement.enctype) { - case 'application/x-www-form-urlencoded': + case 'application/x-www-form-urlencoded': { let urlSearchParams = new URLSearchParams(formData); request.send(urlSearchParams); break; + } case 'multipart/form-data': { request.send(formData); break; From f348d1ed237ce2989bda6d54dc22e839b012aeca Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Mon, 13 Mar 2023 11:24:01 +0100 Subject: [PATCH 060/177] Add missing method to route --- app/contributions/spacy_nlp_pipeline_models/routes.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/contributions/spacy_nlp_pipeline_models/routes.py b/app/contributions/spacy_nlp_pipeline_models/routes.py index 609941fc..fd972902 100644 --- a/app/contributions/spacy_nlp_pipeline_models/routes.py +++ b/app/contributions/spacy_nlp_pipeline_models/routes.py @@ -18,7 +18,7 @@ def spacy_nlp_pipeline_models(): ) -@bp.route('/create') +@bp.route('/create', methods=['GET', 'POST']) @login_required def create_spacy_nlp_pipeline_model(): form_prefix = 'create-spacy-nlp-pipeline-model-form' From eec056e0102e4f4ae8644828a383dc8bc5ec4eee Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Mon, 13 Mar 2023 12:05:35 +0100 Subject: [PATCH 061/177] Change template base variable name --- app/corpora/files/__init__.py | 2 +- app/corpora/files/routes.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/corpora/files/__init__.py b/app/corpora/files/__init__.py index 2f47a450..a52ff995 100644 --- a/app/corpora/files/__init__.py +++ b/app/corpora/files/__init__.py @@ -1,7 +1,7 @@ from flask import Blueprint -TEMPLATE_FOLDER = 'corpora/files' +template_base_dir = 'corpora/files' bp = Blueprint('files', __name__) diff --git a/app/corpora/files/routes.py b/app/corpora/files/routes.py index 7715f417..5ef4e0d0 100644 --- a/app/corpora/files/routes.py +++ b/app/corpora/files/routes.py @@ -11,7 +11,7 @@ import os from app import db from app.models import Corpus, CorpusFile, CorpusStatus from ..decorators import corpus_follower_permission_required -from . import bp, TEMPLATE_FOLDER +from . import bp, template_base_dir from .forms import CreateCorpusFileForm, UpdateCorpusFileForm @@ -58,7 +58,7 @@ def create_corpus_file(corpus_id): flash(f'Corpus File "{corpus_file.filename}" added', category='corpus') return '', 201, {'Location': corpus.url} return render_template( - f'{TEMPLATE_FOLDER}/create_corpus_file.html.j2', + f'{template_base_dir}/create_corpus_file.html.j2', corpus=corpus, form=form, title='Add corpus file' @@ -79,7 +79,7 @@ def corpus_file(corpus_id, corpus_file_id): flash(f'Corpus file "{corpus_file.filename}" updated', category='corpus') return redirect(corpus_file.corpus.url) return render_template( - f'{TEMPLATE_FOLDER}/corpus_file.html.j2', + f'{template_base_dir}/corpus_file.html.j2', corpus=corpus_file.corpus, corpus_file=corpus_file, form=form, From 646f735ab23653557f985b9d676ea8c6f382326a Mon Sep 17 00:00:00 2001 From: Inga Kirschnick Date: Mon, 13 Mar 2023 13:29:01 +0100 Subject: [PATCH 062/177] Reviewed User package and invite user optical fix --- app/corpora/routes.py | 3 + app/jobs/json_routes.py | 22 +-- app/static/css/materialize/fixes.css | 5 + app/static/js/Requests/users/users.js | 23 +++ app/static/js/Utils.js | 236 ----------------------- app/templates/_scripts.html.j2 | 3 +- app/templates/_sidenav.html.j2 | 2 +- app/templates/corpora/corpus.js.j2 | 13 +- app/templates/settings/settings.html.j2 | 20 +- app/templates/users/edit_profile.html.j2 | 55 ++---- app/templates/users/edit_profile.js.j2 | 36 ++++ app/templates/users/profile.html.j2 | 25 --- app/templates/users/profile.js.j2 | 19 ++ app/users/__init__.py | 3 +- app/users/json_routes.py | 54 ++++++ app/users/routes.py | 35 ---- 16 files changed, 190 insertions(+), 364 deletions(-) create mode 100644 app/static/js/Requests/users/users.js create mode 100644 app/templates/users/edit_profile.js.j2 create mode 100644 app/templates/users/profile.js.j2 create mode 100644 app/users/json_routes.py diff --git a/app/corpora/routes.py b/app/corpora/routes.py index 5484fb50..322c3657 100644 --- a/app/corpora/routes.py +++ b/app/corpora/routes.py @@ -13,6 +13,7 @@ from app.models import ( Corpus, CorpusFollowerAssociation, CorpusFollowerRole, + User ) from . import bp from .forms import CreateCorpusForm @@ -46,12 +47,14 @@ def create_corpus(): def corpus(corpus_id): corpus = Corpus.query.get_or_404(corpus_id) corpus_follower_roles = CorpusFollowerRole.query.all() + users = [u.to_json_serializeable() for u in User.query.filter(User.is_public == True, User.id != current_user.id).all()] # TODO: Add URL query option to toggle view if corpus.user == current_user or current_user.is_administrator(): return render_template( 'corpora/corpus.html.j2', corpus=corpus, corpus_follower_roles=corpus_follower_roles, + users = users, title='Corpus' ) if current_user.is_following_corpus(corpus) or corpus.is_public: diff --git a/app/jobs/json_routes.py b/app/jobs/json_routes.py index 50846bae..3562470f 100644 --- a/app/jobs/json_routes.py +++ b/app/jobs/json_routes.py @@ -1,4 +1,4 @@ -from flask import abort, current_app, jsonify +from flask import abort, current_app from flask_login import current_user, login_required from threading import Thread import os @@ -7,6 +7,7 @@ from app.decorators import admin_required, content_negotiation from app.models import Job, JobStatus from . import bp + @bp.route('/', methods=['DELETE']) @login_required @content_negotiation(produces='application/json') @@ -26,12 +27,10 @@ def delete_job(job_id): ) thread.start() response_data = { - 'message': \ - f'Job "{job.title}" marked for deletion' + 'message': f'Job "{job.title}" marked for deletion' } - response = jsonify(response_data) - response.status_code = 202 - return response + return response_data, 202 + @bp.route('//log') @login_required @@ -48,9 +47,7 @@ def job_log(job_id): 'message': '', 'jobLog': log } - response = jsonify(response_data) - response.status_code = 200 - return response + return response_data, 200 @bp.route('//restart', methods=['POST']) @@ -75,9 +72,6 @@ def restart_job(job_id): ) thread.start() response_data = { - 'message': \ - f'Job "{job.title}" marked for restarting' + 'message': f'Job "{job.title}" marked for restarting' } - response = jsonify(response_data) - response.status_code = 202 - return response + return response_data, 202 diff --git a/app/static/css/materialize/fixes.css b/app/static/css/materialize/fixes.css index b44af75f..75003a1f 100644 --- a/app/static/css/materialize/fixes.css +++ b/app/static/css/materialize/fixes.css @@ -1,3 +1,8 @@ .parallax-container .parallax { z-index: 0; } + +.autocomplete-content { + width: 100% !important; + left: 0 !important; +} diff --git a/app/static/js/Requests/users/users.js b/app/static/js/Requests/users/users.js new file mode 100644 index 00000000..0ae1434e --- /dev/null +++ b/app/static/js/Requests/users/users.js @@ -0,0 +1,23 @@ +/***************************************************************************** +* Users * +* Fetch requests for /users routes * +*****************************************************************************/ +Requests.users = {}; + +Requests.users.entity = {}; + +Requests.users.entity.delete = (userId) => { + let input = `/users/${userId}`; + let init = { + method: 'DELETE' + }; + return Requests.JSONfetch(input, init); +} + +Requests.users.entity.deleteAvatar = (userId) => { + let input = `/users/${userId}/avatar`; + let init = { + method: 'DELETE' + }; + return Requests.JSONfetch(input, init); +} diff --git a/app/static/js/Utils.js b/app/static/js/Utils.js index 822ab775..79879c75 100644 --- a/app/static/js/Utils.js +++ b/app/static/js/Utils.js @@ -69,240 +69,4 @@ class Utils { return Utils.mergeObjectsDeep(mergedObject, ...objects.slice(2)); } - static deleteProfileAvatarRequest(userId) { - return new Promise((resolve, reject) => { - let modalElement = Utils.HTMLToElement( - ` -
            -
            -

            Confirm Avatar deletion

            -

            Do you really want to delete your Avatar?

            -
            -
            - Cancel - Delete -
            -
            - ` - ); - document.querySelector('#modals').appendChild(modalElement); - let modal = M.Modal.init( - modalElement, - { - dismissible: false, - onCloseEnd: () => { - modal.destroy(); - modalElement.remove(); - } - } - ); - - let confirmElement = modalElement.querySelector('.action-button[data-action="confirm"]'); - confirmElement.addEventListener('click', (event) => { - fetch(`/users/${userId}/avatar`, {method: 'DELETE', headers: {Accept: 'application/json'}}) - .then( - (response) => { - if (response.status === 403) {app.flash('Forbidden', 'error'); reject(response);} - if (response.status === 404) {app.flash('Not Found', 'error'); reject(response);} - app.flash(`Avatar marked for deletion`); - resolve(response); - }, - (response) => { - app.flash('Something went wrong', 'error'); - reject(response); - } - ); - }); - modal.open(); - }); - } - - // static deleteJobRequest(userId, jobId) { - // return new Promise((resolve, reject) => { - // let job; - // try { - // job = app.data.users[userId].jobs[jobId]; - // } catch (error) { - // job = {}; - // } - - // let confirmElement = modalElement.querySelector('.action-button[data-action="confirm"]'); - // confirmElement.addEventListener('click', (event) => { - // let jobTitle = job?.title; - // fetch(`/jobs/${jobId}`, {method: 'DELETE', headers: {Accept: 'application/json'}}) - // .then( - // (response) => { - // if (response.status === 403) {app.flash('Forbidden', 'error'); reject(response);} - // if (response.status === 404) {app.flash('Not Found', 'error'); reject(response);} - // app.flash(`Job "${jobTitle}" marked for deletion`, 'job'); - // resolve(response); - // }, - // (response) => { - // app.flash('Something went wrong', 'error'); - // reject(response); - // } - // ); - // }); - // modal.open(); - // }); - // } - - // static getJobLogRequest(userId, jobId) { - // return new Promise((resolve, reject) => { - // fetch(`/jobs/${jobId}/log`, {method: 'GET', headers: {Accept: 'application/json, text/plain'}}) - // .then( - // (response) => { - // if (response.status === 403) {app.flash('Forbidden', 'error'); reject(response);} - // if (response.status === 404) {app.flash('Not Found', 'error'); reject(response);} - // return response.text(); - // }, - // (response) => { - // app.flash('Something went wrong', 'error'); - // reject(response); - // } - // ) - // .then( - // (text) => { - // let modalElement = Utils.HTMLToElement( - // ` - //
            - //
            - //

            Job logs

            - // 
            ${text}
            - //
            - //
            - // Close - //
            - //
            - // ` - // ); - // document.querySelector('#modals').appendChild(modalElement); - // let modal = M.Modal.init( - // modalElement, - // { - // onCloseEnd: () => { - // modal.destroy(); - // modalElement.remove(); - // } - // } - // ); - // modal.open(); - // resolve(text); - // } - // ); - // }); - // } - - // static restartJobRequest(userId, jobId) { - // return new Promise((resolve, reject) => { - // let job; - // try { - // job = app.data.users[userId].jobs[jobId]; - // } catch (error) { - // job = {}; - // } - - // let modalElement = Utils.HTMLToElement( - // ` - //
            - //
            - //

            Confirm Job restart

            - //

            Do you really want to restart the Job ${job?.title}? All Job Results will be permanently deleted.

            - //
            - //
            - // Cancel - // Restart - //
            - //
            - // ` - // ); - // document.querySelector('#modals').appendChild(modalElement); - // let modal = M.Modal.init( - // modalElement, - // { - // dismissible: false, - // onCloseEnd: () => { - // modal.destroy(); - // modalElement.remove(); - // } - // } - // ); - - // let confirmElement = modalElement.querySelector('.action-button[data-action="confirm"]'); - // confirmElement.addEventListener('click', (event) => { - // let jobTitle = job?.title; - // fetch(`/jobs/${jobId}/restart`, {method: 'POST', headers: {Accept: 'application/json'}}) - // .then( - // (response) => { - // if (response.status === 403) {app.flash('Forbidden', 'error'); reject(response);} - // if (response.status === 404) {app.flash('Not Found', 'error'); reject(response);} - // if (response.status === 409) {app.flash('Conflict', 'error'); reject(response);} - // app.flash(`Job "${jobTitle}" restarted.`, 'job'); - // resolve(response); - // }, - // (response) => { - // app.flash('Something went wrong', 'error'); - // reject(response); - // } - // ); - // }); - // modal.open(); - // }); - // } - - static deleteUserRequest(userId) { - return new Promise((resolve, reject) => { - let user; - try { - user = app.data.users[userId]; - } catch (error) { - user = {}; - } - - let modalElement = Utils.HTMLToElement( - ` -
            -
            -

            Confirm User deletion

            -

            Do you really want to delete the User ${user?.username}? All files will be permanently deleted!

            -
            -
            - Cancel - Delete -
            -
            - ` - ); - document.querySelector('#modals').appendChild(modalElement); - let modal = M.Modal.init( - modalElement, - { - dismissible: false, - onCloseEnd: () => { - modal.destroy(); - modalElement.remove(); - } - } - ); - - let confirmElement = modalElement.querySelector('.action-button[data-action="confirm"]'); - confirmElement.addEventListener('click', (event) => { - let userName = user?.username; - fetch(`/users/${userId}`, {method: 'DELETE', headers: {Accept: 'application/json'}}) - .then( - (response) => { - if (response.status === 403) {app.flash('Forbidden', 'error'); reject(response);} - if (response.status === 404) {app.flash('Not Found', 'error'); reject(response);} - app.flash(`User "${userName}" marked for deletion`); - resolve(response); - }, - (response) => { - app.flash('Something went wrong', 'error'); - reject(response); - } - ); - }); - modal.open(); - }); - } } diff --git a/app/templates/_scripts.html.j2 b/app/templates/_scripts.html.j2 index 6dc253b4..11398cb9 100644 --- a/app/templates/_scripts.html.j2 +++ b/app/templates/_scripts.html.j2 @@ -64,7 +64,8 @@ 'js/Requests/corpora/corpora.js', 'js/Requests/corpora/files.js', 'js/Requests/corpora/followers.js', - 'js/Requests/jobs/jobs.js' + 'js/Requests/jobs/jobs.js', + 'js/Requests/users/users.js' %} {%- endassets %} diff --git a/app/templates/_sidenav.html.j2 b/app/templates/_sidenav.html.j2 index 0027772e..2d55999a 100644 --- a/app/templates/_sidenav.html.j2 +++ b/app/templates/_sidenav.html.j2 @@ -39,7 +39,7 @@
          • Account
          • settingsGeneral Settings
            • -
          • contact_pageProfile settings
            • +
          • contact_pageProfile Settings
          • Log out
            • {% if current_user.can('ADMINISTRATE') or current_user.can('USE_API') %}
            • diff --git a/app/templates/corpora/corpus.js.j2 b/app/templates/corpora/corpus.js.j2 index 7e815cf3..016b0b6a 100644 --- a/app/templates/corpora/corpus.js.j2 +++ b/app/templates/corpora/corpus.js.j2 @@ -26,16 +26,17 @@ deleteModalDeleteButtonElement.addEventListener('click', (event) => { let inviteUserModalElement = document.querySelector('#invite-user-modal'); let inviteUserModalSearchElement = document.querySelector('#invite-user-modal-search'); let inviteUserModalInviteButtonElement = document.querySelector('#invite-user-modal-invite-button'); +const users = {}; + +for (let user of {{ users|tojson }}) { + users[user.username] = user.avatar ? `/users/${user.id}/avatar` : '/static/images/user_avatar.png'; +} let inviteUserModalSearch = M.Chips.init( inviteUserModalSearchElement, { autocompleteOptions: { - data: { - 'nopaque': '/users/3V8Aqpg74JvxOd9o/avatar', - 'pjentsch': '/users/3V8Aqpg74JvxOd9o/avatar', - 'pjentsch2': '/users/3V8Aqpg74JvxOd9o/avatar' - } + data: users }, limit: 3, onChipAdd: (a, chipElement) => { @@ -43,7 +44,7 @@ let inviteUserModalSearch = M.Chips.init( chipElement.firstElementChild.click(); } }, - placeholder: 'Enter a username', + placeholder: 'Enter username', secondaryPlaceholder: 'Add more users' } ); diff --git a/app/templates/settings/settings.html.j2 b/app/templates/settings/settings.html.j2 index e9cfb97b..9210d36f 100644 --- a/app/templates/settings/settings.html.j2 +++ b/app/templates/settings/settings.html.j2 @@ -51,7 +51,7 @@
            - deleteDelete + deleteDelete
            @@ -59,12 +59,26 @@ {% endblock page_content %} +{% block modals%} + +{% endblock modals %} + {% block scripts %} {{ super() }} {% endblock scripts %} diff --git a/app/templates/users/edit_profile.html.j2 b/app/templates/users/edit_profile.html.j2 index 11b4b4d2..1b2ef3f9 100644 --- a/app/templates/users/edit_profile.html.j2 +++ b/app/templates/users/edit_profile.html.j2 @@ -79,7 +79,7 @@
            - delete + delete
            @@ -111,44 +111,15 @@
            {% endblock page_content %} -{% block scripts %} -{{ super() }} - -{% endblock scripts %} +{% block modals %} + +{% endblock modals %} diff --git a/app/templates/users/edit_profile.js.j2 b/app/templates/users/edit_profile.js.j2 new file mode 100644 index 00000000..a5058d85 --- /dev/null +++ b/app/templates/users/edit_profile.js.j2 @@ -0,0 +1,36 @@ +let publicProfile = document.querySelector('#public-profile'); +let disableButtons = document.querySelectorAll('[data-action="disable"]'); +let deleteButton = document.querySelector('#delete-avatar'); +let avatar = document.querySelector('#avatar'); +let avatarUpload = document.querySelector('#avatar-upload'); + +for (let disableButton of disableButtons) { + disableButton.disabled = !publicProfile.checked; +} + +publicProfile.addEventListener('change', () => { + if (publicProfile.checked) { + for (let disableButton of disableButtons) { + disableButton.disabled = false; + } + } else { + for (let disableButton of disableButtons) { + disableButton.checked = false; + disableButton.disabled = true; + } + } +}); + +avatarUpload.addEventListener('change', function() { + let file = this.files[0]; + avatar.src = URL.createObjectURL(file); +}); + +deleteButton.addEventListener('click', () => { + Requests.users.entity.deleteAvatar({{ user.hashid|tojson }}) + .then( + (response) => { + avatar.src = "{{ url_for('static', filename='images/user_avatar.png') }}"; + } + ); +}); diff --git a/app/templates/users/profile.html.j2 b/app/templates/users/profile.html.j2 index 4a9a4c13..e73a3b7a 100644 --- a/app/templates/users/profile.html.j2 +++ b/app/templates/users/profile.html.j2 @@ -111,28 +111,3 @@
            {% endblock page_content %} -{% block scripts %} -{{ super() }} - -{% endblock scripts %} - diff --git a/app/templates/users/profile.js.j2 b/app/templates/users/profile.js.j2 new file mode 100644 index 00000000..5f729f18 --- /dev/null +++ b/app/templates/users/profile.js.j2 @@ -0,0 +1,19 @@ +let publicInformationBadge = document.querySelector('#public-information-badge'); +if ("{{ user.id }}" == "{{ current_user.hashid }}") { + if ("{{ user.is_public }}" == "True") { + publicInformationBadge.dataset.badgeCaption = 'Your profile is public'; + publicInformationBadge.classList.add('green'); + publicInformationBadge.classList.remove('red'); + } else { + publicInformationBadge.dataset.badgeCaption = 'Your profile is private'; + publicInformationBadge.classList.add('red'); + publicInformationBadge.classList.remove('green'); + } +} else { + publicInformationBadge.remove(); +} + +let followedCorpusList = new FollowedCorpusList(document.querySelector('.followed-corpus-list')); +followedCorpusList.add({{ followed_corpora|tojson }}); +let publicCorpusList = new PublicCorpusList(document.querySelector('.public-corpus-list')); +publicCorpusList.add({{ own_public_corpora|tojson }}); diff --git a/app/users/__init__.py b/app/users/__init__.py index 885cdbe2..705b3afa 100644 --- a/app/users/__init__.py +++ b/app/users/__init__.py @@ -2,4 +2,5 @@ from flask import Blueprint bp = Blueprint('users', __name__) -from . import events, routes +from . import events, routes, json_routes + diff --git a/app/users/json_routes.py b/app/users/json_routes.py new file mode 100644 index 00000000..0e421078 --- /dev/null +++ b/app/users/json_routes.py @@ -0,0 +1,54 @@ +from flask import abort, current_app +from flask_login import current_user, login_required, logout_user +from threading import Thread +import os +from app import db +from app.decorators import content_negotiation +from app.models import Avatar, User +from . import bp + +@bp.route('/', methods=['DELETE']) +@login_required +@content_negotiation(produces='application/json') +def delete_user(user_id): + def _delete_user(app, user_id): + with app.app_context(): + user = User.query.get(user_id) + user.delete() + db.session.commit() + + user = User.query.get_or_404(user_id) + if not (user == current_user or current_user.is_administrator()): + abort(403) + thread = Thread( + target=_delete_user, + args=(current_app._get_current_object(), user_id) + ) + if user == current_user: + logout_user() + thread.start() + response_data = { + 'message': f'User "{user.username}" marked for deletion' + } + return response_data, 202 + +@bp.route('//avatar', methods=['DELETE']) +@content_negotiation(produces='application/json') +def delete_profile_avatar(user_id): + def _delete_avatar(app, avatar_id): + with app.app_context(): + avatar = Avatar.query.get(avatar_id) + avatar.delete() + db.session.commit() + user = User.query.get_or_404(user_id) + if user.avatar is None: + abort(404) + thread = Thread( + target=_delete_avatar, + args=(current_app._get_current_object(), user.avatar.id) + ) + thread.start() + response_data = { + 'message': f'Avatar marked for deletion' + } + return response_data, 202 diff --git a/app/users/routes.py b/app/users/routes.py index d573da34..5d8ff266 100644 --- a/app/users/routes.py +++ b/app/users/routes.py @@ -51,24 +51,7 @@ def user(user_id): user_id=user_id ) -@bp.route('/', methods=['DELETE']) -@login_required -def delete_user(user_id): - def _delete_user(app, user_id): - with app.app_context(): - user = User.query.get(user_id) - user.delete() - db.session.commit() - user = User.query.get_or_404(user_id) - if not (user == current_user or current_user.is_administrator()): - abort(403) - thread = Thread( - target=_delete_user, - args=(current_app._get_current_object(), user_id) - ) - thread.start() - return {}, 202 @bp.route('//avatar') def profile_avatar(user_id): @@ -86,24 +69,6 @@ def profile_avatar(user_id): ) -@bp.route('//avatar', methods=['DELETE']) -def delete_profile_avatar(user_id): - def _delete_avatar(app, avatar_id): - with app.app_context(): - avatar = Avatar.query.get(avatar_id) - avatar.delete() - db.session.commit() - user = User.query.get_or_404(user_id) - if user.avatar is None: - abort(404) - thread = Thread( - target=_delete_avatar, - args=(current_app._get_current_object(), user.avatar.id) - ) - thread.start() - return {}, 202 - - @bp.route('//edit', methods=['GET', 'POST']) def edit_profile(user_id): user = User.query.get_or_404(user_id) From 4c05c6cc18b4973bb158f978517eccb179fa7f75 Mon Sep 17 00:00:00 2001 From: Inga Kirschnick Date: Mon, 13 Mar 2023 15:04:44 +0100 Subject: [PATCH 063/177] merge settings into users route --- app/__init__.py | 3 - app/admin/routes.py | 2 +- app/settings/__init__.py | 5 -- app/settings/forms.py | 43 ----------- app/settings/routes.py | 39 ---------- app/templates/_navbar.html.j2 | 3 +- app/templates/_sidenav.html.j2 | 3 +- app/templates/settings/_breadcrumbs.html.j2 | 6 -- app/templates/settings/settings.html.j2 | 84 --------------------- app/templates/users/edit_profile.html.j2 | 77 +++++++++++++++++-- app/templates/users/edit_profile.js.j2 | 5 ++ app/users/forms.py | 43 ++++++++++- app/users/routes.py | 36 ++++++++- 13 files changed, 157 insertions(+), 192 deletions(-) delete mode 100644 app/settings/__init__.py delete mode 100644 app/settings/forms.py delete mode 100644 app/settings/routes.py delete mode 100644 app/templates/settings/_breadcrumbs.html.j2 delete mode 100644 app/templates/settings/settings.html.j2 diff --git a/app/__init__.py b/app/__init__.py index dcb58e47..09e479a8 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -81,9 +81,6 @@ def create_app(config: Config = Config) -> Flask: from .services import bp as services_blueprint app.register_blueprint(services_blueprint, url_prefix='/services') - from .settings import bp as settings_blueprint - app.register_blueprint(settings_blueprint, url_prefix='/settings') - from .users import bp as users_blueprint app.register_blueprint(users_blueprint, url_prefix='/users') diff --git a/app/admin/routes.py b/app/admin/routes.py index 08f219ab..95ce7730 100644 --- a/app/admin/routes.py +++ b/app/admin/routes.py @@ -4,7 +4,7 @@ from threading import Thread from app import db, hashids from app.decorators import admin_required from app.models import Role, User, UserSettingJobStatusMailNotificationLevel -from app.settings.forms import ( +from app.users.forms import ( EditNotificationSettingsForm ) from app.users.forms import EditProfileSettingsForm diff --git a/app/settings/__init__.py b/app/settings/__init__.py deleted file mode 100644 index 1dab5142..00000000 --- a/app/settings/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -from flask import Blueprint - - -bp = Blueprint('settings', __name__) -from . import routes # noqa diff --git a/app/settings/forms.py b/app/settings/forms.py deleted file mode 100644 index e90d9dda..00000000 --- a/app/settings/forms.py +++ /dev/null @@ -1,43 +0,0 @@ -from flask_wtf import FlaskForm -from wtforms import PasswordField, SelectField, SubmitField, ValidationError -from wtforms.validators import DataRequired, EqualTo -from app.models import UserSettingJobStatusMailNotificationLevel - - -class ChangePasswordForm(FlaskForm): - password = PasswordField('Old password', validators=[DataRequired()]) - new_password = PasswordField( - 'New password', - validators=[ - DataRequired(), - EqualTo('new_password_2', message='Passwords must match') - ] - ) - new_password_2 = PasswordField( - 'New password confirmation', - validators=[ - DataRequired(), - EqualTo('new_password', message='Passwords must match') - ] - ) - submit = SubmitField() - - def __init__(self, user, *args, **kwargs): - super().__init__(*args, **kwargs) - self.user = user - - def validate_current_password(self, field): - if not self.user.verify_password(field.data): - raise ValidationError('Invalid password') - - -class EditNotificationSettingsForm(FlaskForm): - job_status_mail_notification_level = SelectField( - 'Job status mail notification level', - choices=[ - (x.name, x.name.capitalize()) - for x in UserSettingJobStatusMailNotificationLevel - ], - validators=[DataRequired()] - ) - submit = SubmitField() diff --git a/app/settings/routes.py b/app/settings/routes.py deleted file mode 100644 index a07869b8..00000000 --- a/app/settings/routes.py +++ /dev/null @@ -1,39 +0,0 @@ -from flask import flash, redirect, render_template, url_for -from flask_login import current_user, login_required -from app import db -from app.models import UserSettingJobStatusMailNotificationLevel -from . import bp -from .forms import ChangePasswordForm, EditNotificationSettingsForm - - -@bp.route('', methods=['GET', 'POST']) -@login_required -def settings(): - change_password_form = ChangePasswordForm( - current_user, - prefix='change-password-form' - ) - edit_notification_settings_form = EditNotificationSettingsForm( - data=current_user.to_json_serializeable(), - prefix='edit-notification-settings-form' - ) - # region handle change_password_form POST - if change_password_form.submit.data and change_password_form.validate(): - current_user.password = change_password_form.new_password.data - db.session.commit() - flash('Your changes have been saved') - return redirect(url_for('.settings')) - # endregion handle change_password_form POST - # region handle edit_notification_settings_form POST - if edit_notification_settings_form.submit and edit_notification_settings_form.validate(): - current_user.setting_job_status_mail_notification_level = edit_notification_settings_form.job_status_mail_notification_level.data - db.session.commit() - flash('Your changes have been saved') - return redirect(url_for('.settings')) - # endregion handle edit_notification_settings_form POST - return render_template( - 'settings/settings.html.j2', - change_password_form=change_password_form, - edit_notification_settings_form=edit_notification_settings_form, - title='Settings' - ) diff --git a/app/templates/_navbar.html.j2 b/app/templates/_navbar.html.j2 index d943c0e4..c4c4d3b7 100644 --- a/app/templates/_navbar.html.j2 +++ b/app/templates/_navbar.html.j2 @@ -29,8 +29,7 @@
            • helpManual
              • {% if current_user.is_authenticated %} -
            • settingsGeneral settings
              • -
            • contact_pageProfile settings
              • +
            • settingsUser settings
            • Log out
              • {% else %} diff --git a/app/templates/_sidenav.html.j2 b/app/templates/_sidenav.html.j2 index 2d55999a..0d955fe5 100644 --- a/app/templates/_sidenav.html.j2 +++ b/app/templates/_sidenav.html.j2 @@ -38,8 +38,7 @@
            • Corpus analysis
            • Account
              • -
            • settingsGeneral Settings
              • -
            • contact_pageProfile Settings
              • +
            • settingsUser Settings
            • Log out
              • {% if current_user.can('ADMINISTRATE') or current_user.can('USE_API') %}
              • diff --git a/app/templates/settings/_breadcrumbs.html.j2 b/app/templates/settings/_breadcrumbs.html.j2 deleted file mode 100644 index 3b5077bf..00000000 --- a/app/templates/settings/_breadcrumbs.html.j2 +++ /dev/null @@ -1,6 +0,0 @@ -{% set breadcrumbs %} -
            • navigate_next
              • -{% if request.path == url_for('settings.settings') %} -
            • Settings
              • -{% endif %} -{% endset %} diff --git a/app/templates/settings/settings.html.j2 b/app/templates/settings/settings.html.j2 deleted file mode 100644 index 9210d36f..00000000 --- a/app/templates/settings/settings.html.j2 +++ /dev/null @@ -1,84 +0,0 @@ -{% extends "base.html.j2" %} -{% from "settings/_breadcrumbs.html.j2" import breadcrumbs with context %} -{% import "materialize/wtf.html.j2" as wtf %} - -{% block page_content %} -
              -
              -
              -

              {{ title }}

              -
              -
              -
              - {{ edit_notification_settings_form.hidden_tag() }} -
              -
              - Notification settings - {{ wtf.render_field(edit_notification_settings_form.job_status_mail_notification_level, material_icon='notifications') }} -
              -
              -
              - {{ wtf.render_field(edit_notification_settings_form.submit, material_icon='send') }} -
              -
              -
              -
              - -
              - {{ change_password_form.hidden_tag() }} -
              -
              - Change Password - {{ wtf.render_field(change_password_form.password, material_icon='vpn_key') }} - {{ wtf.render_field(change_password_form.new_password, material_icon='vpn_key') }} - {{ wtf.render_field(change_password_form.new_password_2, material_icon='vpn_key') }} -
              -
              -
              - {{ wtf.render_field(change_password_form.submit, material_icon='send') }} -
              -
              -
              -
              - -
              -
              - Delete account -

              Deleting an account has the following effects:

              -
                -
              • All data associated with your corpora and jobs will be permanently deleted.
                • -
              • All settings will be permanently deleted.
                • -
              -
              -
              - deleteDelete -
              -
              -
              -
              -
              -{% endblock page_content %} - -{% block modals%} - -{% endblock modals %} - -{% block scripts %} -{{ super() }} - -{% endblock scripts %} diff --git a/app/templates/users/edit_profile.html.j2 b/app/templates/users/edit_profile.html.j2 index 1b2ef3f9..5861a969 100644 --- a/app/templates/users/edit_profile.html.j2 +++ b/app/templates/users/edit_profile.html.j2 @@ -7,10 +7,11 @@

              {{ title }}

              - -
              +
              +
              +
              -
              +
              @@ -31,7 +32,7 @@ {{ edit_privacy_settings_form.hidden_tag() }} -
              +
              Privacy settings
              @@ -54,7 +55,7 @@
              -
              +
              {{ edit_public_profile_information_form.hidden_tag() }} @@ -106,6 +107,62 @@
              +
              + {{ edit_notification_settings_form.hidden_tag() }} +
              +
              + Notification settings + {{ wtf.render_field(edit_notification_settings_form.job_status_mail_notification_level, material_icon='notifications') }} +
              +
              +
              + {{ wtf.render_field(edit_notification_settings_form.submit, material_icon='send') }} +
              +
              +
              +
              + +
              + {{ change_password_form.hidden_tag() }} +
              +
              + Change Password + {{ wtf.render_field(change_password_form.password, material_icon='vpn_key') }} + {{ wtf.render_field(change_password_form.new_password, material_icon='vpn_key') }} + {{ wtf.render_field(change_password_form.new_password_2, material_icon='vpn_key') }} +
              +
              +
              + {{ wtf.render_field(change_password_form.submit, material_icon='send') }} +
              +
              +
              +
              + +
              +
              + Delete account +

              Deleting an account has the following effects:

              +
                +
              • All data associated with your corpora and jobs will be permanently deleted.
                • +
              • All settings will be permanently deleted.
                • +
              +
              +
              + deleteDelete +
              +
              + +
              +
              +
              @@ -122,4 +179,14 @@ Delete
              + {% endblock modals %} diff --git a/app/templates/users/edit_profile.js.j2 b/app/templates/users/edit_profile.js.j2 index a5058d85..a56effae 100644 --- a/app/templates/users/edit_profile.js.j2 +++ b/app/templates/users/edit_profile.js.j2 @@ -34,3 +34,8 @@ deleteButton.addEventListener('click', () => { } ); }); + +document.querySelector('#delete-user-button').addEventListener('click', (event) => { + Requests.users.entity.delete(currentUserId) + .then((response) => {window.location.href = '/';}); +}); diff --git a/app/users/forms.py b/app/users/forms.py index 5fd5d81e..af0e1984 100644 --- a/app/users/forms.py +++ b/app/users/forms.py @@ -2,6 +2,8 @@ from flask_wtf import FlaskForm from wtforms import ( BooleanField, FileField, + PasswordField, + SelectField, StringField, SubmitField, TextAreaField, @@ -10,10 +12,11 @@ from wtforms import ( from wtforms.validators import ( DataRequired, Email, + EqualTo, Length, Regexp ) -from app.models import User +from app.models import User, UserSettingJobStatusMailNotificationLevel from app.auth import USERNAME_REGEX from app.wtf_validators import FileSizeLimit @@ -98,3 +101,41 @@ class EditPrivacySettingsForm(FlaskForm): show_last_seen = BooleanField('Show last seen') show_member_since = BooleanField('Show member since') submit = SubmitField() + +class ChangePasswordForm(FlaskForm): + password = PasswordField('Old password', validators=[DataRequired()]) + new_password = PasswordField( + 'New password', + validators=[ + DataRequired(), + EqualTo('new_password_2', message='Passwords must match') + ] + ) + new_password_2 = PasswordField( + 'New password confirmation', + validators=[ + DataRequired(), + EqualTo('new_password', message='Passwords must match') + ] + ) + submit = SubmitField() + + def __init__(self, user, *args, **kwargs): + super().__init__(*args, **kwargs) + self.user = user + + def validate_current_password(self, field): + if not self.user.verify_password(field.data): + raise ValidationError('Invalid password') + + +class EditNotificationSettingsForm(FlaskForm): + job_status_mail_notification_level = SelectField( + 'Job status mail notification level', + choices=[ + (x.name, x.name.capitalize()) + for x in UserSettingJobStatusMailNotificationLevel + ], + validators=[DataRequired()] + ) + submit = SubmitField() diff --git a/app/users/routes.py b/app/users/routes.py index 5d8ff266..82d37247 100644 --- a/app/users/routes.py +++ b/app/users/routes.py @@ -16,6 +16,8 @@ from app import db from app.models import Avatar, Corpus, ProfilePrivacySettings, User from . import bp from .forms import ( + ChangePasswordForm, + EditNotificationSettingsForm, EditPrivacySettingsForm, EditProfileSettingsForm, EditPublicProfileInformationForm @@ -74,6 +76,7 @@ def edit_profile(user_id): user = User.query.get_or_404(user_id) if not (user == current_user or current_user.is_administrator()): abort(403) + # region forms edit_profile_settings_form = EditProfileSettingsForm( current_user, data=current_user.to_json_serializeable(), @@ -87,12 +90,24 @@ def edit_profile(user_id): data=current_user.to_json_serializeable(), prefix='edit-public-profile-information-form' ) + change_password_form = ChangePasswordForm( + current_user, + prefix='change-password-form' + ) + edit_notification_settings_form = EditNotificationSettingsForm( + data=current_user.to_json_serializeable(), + prefix='edit-notification-settings-form' + ) + # endregion forms + # region handle edit profile settings form if edit_profile_settings_form.validate_on_submit(): current_user.email = edit_profile_settings_form.email.data current_user.username = edit_profile_settings_form.username.data db.session.commit() flash('Profile settings updated') return redirect(url_for('.user', user_id=user.id)) + # endregion handle edit profile settings form + # region handle edit privacy settings form if edit_privacy_settings_form.submit.data and edit_privacy_settings_form.validate(): current_user.is_public = edit_privacy_settings_form.is_public.data if edit_privacy_settings_form.show_email.data: @@ -110,7 +125,9 @@ def edit_profile(user_id): db.session.commit() flash('Your changes have been saved') return redirect(url_for('.user', user_id=user.id)) - if edit_public_profile_information_form.validate_on_submit(): + # endregion handle edit privacy settings form + # region handle edit public profile information form + if edit_public_profile_information_form.submit.data and edit_public_profile_information_form.validate(): if edit_public_profile_information_form.avatar.data: try: Avatar.create(edit_public_profile_information_form.avatar.data, user=current_user) @@ -124,11 +141,28 @@ def edit_profile(user_id): db.session.commit() flash('Profile settings updated') return redirect(url_for('.user', user_id=user.id)) + # endregion handle edit public profile information form + # region handle change_password_form POST + if change_password_form.submit.data and change_password_form.validate(): + current_user.password = change_password_form.new_password.data + db.session.commit() + flash('Your changes have been saved') + return redirect(url_for('.edit_profile', user_id=user.id)) + # endregion handle change_password_form POST + # region handle edit_notification_settings_form POST + if edit_notification_settings_form.submit and edit_notification_settings_form.validate(): + current_user.setting_job_status_mail_notification_level = edit_notification_settings_form.job_status_mail_notification_level.data + db.session.commit() + flash('Your changes have been saved') + return redirect(url_for('.edit_profile', user_id=user.id)) + # endregion handle edit_notification_settings_form POST return render_template( 'users/edit_profile.html.j2', edit_profile_settings_form=edit_profile_settings_form, edit_privacy_settings_form=edit_privacy_settings_form, edit_public_profile_information_form=edit_public_profile_information_form, + change_password_form=change_password_form, + edit_notification_settings_form=edit_notification_settings_form, user=user, title='Edit Profile' ) From 90ac30bba3ce7c751244aa308bb8d5b843818250 Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Mon, 13 Mar 2023 16:22:42 +0100 Subject: [PATCH 064/177] Implement Flask-Breadcrumbs --- app/__init__.py | 7 + app/auth/routes.py | 15 +- app/contributions/__init__.py | 14 +- app/contributions/forms.py | 81 +++++++- app/contributions/json_routes.py | 107 ++++++++++ app/contributions/routes.py | 183 +++++++++++++++++- .../spacy_nlp_pipeline_models/__init__.py | 8 - .../spacy_nlp_pipeline_models/forms.py | 44 ----- .../spacy_nlp_pipeline_models/json_routes.py | 54 ------ .../spacy_nlp_pipeline_models/routes.py | 76 -------- .../tesseract_ocr_pipeline_models/__init__.py | 8 - .../tesseract_ocr_pipeline_models/forms.py | 35 ---- .../json_routes.py | 54 ------ .../tesseract_ocr_pipeline_models/routes.py | 75 ------- app/corpora/routes.py | 21 +- app/main/routes.py | 9 + app/services/routes.py | 17 +- app/templates/_navbar.html.j2 | 8 +- app/templates/_sidenav.html.j2 | 2 +- app/templates/admin/_breadcrumbs.html.j2 | 18 -- app/templates/admin/edit_user.html.j2 | 1 - app/templates/admin/user.html.j2 | 1 - app/templates/admin/users.html.j2 | 1 - app/templates/auth/_breadcrumbs.html.j2 | 14 -- app/templates/auth/login.html.j2 | 1 - app/templates/auth/register.html.j2 | 1 - app/templates/auth/reset_password.html.j2 | 1 - .../auth/reset_password_request.html.j2 | 1 - app/templates/auth/unconfirmed.html.j2 | 1 - .../contributions/_breadcrumbs.html.j2 | 46 ----- .../contributions/contributions.html.j2 | 4 +- .../create_spacy_nlp_pipeline_model.html.j2 | 0 ...reate_tesseract_ocr_pipeline_model.html.j2 | 0 .../spacy_nlp_pipeline_model.html.j2 | 0 .../spacy_nlp_pipeline_models.html.j2 | 0 .../tesseract_ocr_pipeline_model.html.j2 | 0 .../tesseract_ocr_pipeline_models.html.j2 | 0 app/templates/corpora/_breadcrumbs.html.j2 | 28 --- app/templates/corpora/corpus.html.j2 | 1 - app/templates/corpora/create_corpus.html.j2 | 1 - .../corpora/files/corpus_file.html.j2 | 1 - .../corpora/files/create_corpus_file.html.j2 | 1 - app/templates/corpora/import_corpus.html.j2 | 1 - app/templates/jobs/_breadcrumbs.html.j2 | 8 - app/templates/jobs/job.html.j2 | 1 - app/templates/main/_breadcrumbs.html.j2 | 14 -- app/templates/main/dashboard.html.j2 | 1 - app/templates/main/faq.html.j2 | 1 - app/templates/main/index.html.j2 | 1 - app/templates/main/news.html.j2 | 1 - app/templates/main/news_new.html.j2 | 1 - app/templates/main/privacy_policy.html.j2 | 1 - app/templates/main/terms_of_use.html.j2 | 1 - app/templates/main/user_manual.html.j2 | 1 - app/templates/services/_breadcrumbs.html.j2 | 16 -- .../services/corpus_analysis.html.j2 | 1 - .../services/file_setup_pipeline.html.j2 | 1 - .../services/spacy_nlp_pipeline.html.j2 | 3 +- .../services/tesseract_ocr_pipeline.html.j2 | 3 +- .../services/transkribus_htr_pipeline.html.j2 | 1 - app/templates/settings/_breadcrumbs.html.j2 | 6 - app/templates/settings/settings.html.j2 | 1 - requirements.txt | 1 + 63 files changed, 425 insertions(+), 580 deletions(-) create mode 100644 app/contributions/json_routes.py delete mode 100644 app/contributions/spacy_nlp_pipeline_models/__init__.py delete mode 100644 app/contributions/spacy_nlp_pipeline_models/forms.py delete mode 100644 app/contributions/spacy_nlp_pipeline_models/json_routes.py delete mode 100644 app/contributions/spacy_nlp_pipeline_models/routes.py delete mode 100644 app/contributions/tesseract_ocr_pipeline_models/__init__.py delete mode 100644 app/contributions/tesseract_ocr_pipeline_models/forms.py delete mode 100644 app/contributions/tesseract_ocr_pipeline_models/json_routes.py delete mode 100644 app/contributions/tesseract_ocr_pipeline_models/routes.py delete mode 100644 app/templates/admin/_breadcrumbs.html.j2 delete mode 100644 app/templates/auth/_breadcrumbs.html.j2 delete mode 100644 app/templates/contributions/_breadcrumbs.html.j2 rename app/templates/contributions/{spacy_nlp_pipeline_models => }/create_spacy_nlp_pipeline_model.html.j2 (100%) rename app/templates/contributions/{tesseract_ocr_pipeline_models => }/create_tesseract_ocr_pipeline_model.html.j2 (100%) rename app/templates/contributions/{spacy_nlp_pipeline_models => }/spacy_nlp_pipeline_model.html.j2 (100%) rename app/templates/contributions/{spacy_nlp_pipeline_models => }/spacy_nlp_pipeline_models.html.j2 (100%) rename app/templates/contributions/{tesseract_ocr_pipeline_models => }/tesseract_ocr_pipeline_model.html.j2 (100%) rename app/templates/contributions/{tesseract_ocr_pipeline_models => }/tesseract_ocr_pipeline_models.html.j2 (100%) delete mode 100644 app/templates/corpora/_breadcrumbs.html.j2 delete mode 100644 app/templates/jobs/_breadcrumbs.html.j2 delete mode 100644 app/templates/main/_breadcrumbs.html.j2 delete mode 100644 app/templates/services/_breadcrumbs.html.j2 delete mode 100644 app/templates/settings/_breadcrumbs.html.j2 diff --git a/app/__init__.py b/app/__init__.py index dcb58e47..59d6d5c9 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -4,6 +4,7 @@ from docker import DockerClient from flask import Flask from flask_apscheduler import APScheduler from flask_assets import Environment +from flask_breadcrumbs import Breadcrumbs, default_breadcrumb_root from flask_login import LoginManager from flask_mail import Mail from flask_marshmallow import Marshmallow @@ -16,6 +17,7 @@ from flask_hashids import Hashids apifairy = APIFairy() assets = Environment() +breadcrumbs = Breadcrumbs() db = SQLAlchemy() docker_client = DockerClient() hashids = Hashids() @@ -44,6 +46,7 @@ def create_app(config: Config = Config) -> Flask: apifairy.init_app(app) assets.init_app(app) + breadcrumbs.init_app(app) db.init_app(app) hashids.init_app(app) login.init_app(app) @@ -64,9 +67,11 @@ def create_app(config: Config = Config) -> Flask: app.register_blueprint(api_blueprint, url_prefix='/api') from .auth import bp as auth_blueprint + default_breadcrumb_root(auth_blueprint, '.') app.register_blueprint(auth_blueprint, url_prefix='/auth') from .contributions import bp as contributions_blueprint + default_breadcrumb_root(contributions_blueprint, '.contributions') app.register_blueprint(contributions_blueprint, url_prefix='/contributions') from .corpora import bp as corpora_blueprint @@ -76,9 +81,11 @@ def create_app(config: Config = Config) -> Flask: app.register_blueprint(jobs_blueprint, url_prefix='/jobs') from .main import bp as main_blueprint + default_breadcrumb_root(main_blueprint, '.') app.register_blueprint(main_blueprint, url_prefix='/') from .services import bp as services_blueprint + default_breadcrumb_root(services_blueprint, '.services') app.register_blueprint(services_blueprint, url_prefix='/services') from .settings import bp as settings_blueprint diff --git a/app/auth/routes.py b/app/auth/routes.py index 5655d0dc..6e11a140 100644 --- a/app/auth/routes.py +++ b/app/auth/routes.py @@ -1,11 +1,5 @@ -from flask import ( - abort, - flash, - redirect, - render_template, - request, - url_for -) +from flask import abort, flash, redirect, render_template, request, url_for +from flask_breadcrumbs import register_breadcrumb from flask_login import current_user, login_user, login_required, logout_user from app import db from app.email import create_message, send @@ -36,6 +30,7 @@ def before_request(): @bp.route('/register', methods=['GET', 'POST']) +@register_breadcrumb(bp, '.register', 'Register') def register(): if current_user.is_authenticated: return redirect(url_for('main.dashboard')) @@ -71,6 +66,7 @@ def register(): @bp.route('/login', methods=['GET', 'POST']) +@register_breadcrumb(bp, '.login', 'Login') def login(): if current_user.is_authenticated: return redirect(url_for('main.dashboard')) @@ -97,6 +93,7 @@ def logout(): @bp.route('/unconfirmed') +@register_breadcrumb(bp, '.unconfirmed', 'Unconfirmed') @login_required def unconfirmed(): if current_user.confirmed: @@ -136,6 +133,7 @@ def confirm(token): @bp.route('/reset_password', methods=['GET', 'POST']) +@register_breadcrumb(bp, '.reset_password_request', 'Password Reset') def reset_password_request(): if current_user.is_authenticated: return redirect(url_for('main.dashboard')) @@ -165,6 +163,7 @@ def reset_password_request(): @bp.route('/reset_password/', methods=['GET', 'POST']) +@register_breadcrumb(bp, '.reset_password', 'Password Reset') def reset_password(token): if current_user.is_authenticated: return redirect(url_for('main.dashboard')) diff --git a/app/contributions/__init__.py b/app/contributions/__init__.py index 5175c0ce..7749a278 100644 --- a/app/contributions/__init__.py +++ b/app/contributions/__init__.py @@ -2,16 +2,4 @@ from flask import Blueprint bp = Blueprint('contributions', __name__) -from . import routes - -from .spacy_nlp_pipeline_models import bp as spacy_nlp_pipeline_models_bp -bp.register_blueprint( - spacy_nlp_pipeline_models_bp, - url_prefix='/spacy-nlp-pipeline-models' -) - -from .tesseract_ocr_pipeline_models import bp as tesseract_ocr_pipeline_models_bp -bp.register_blueprint( - tesseract_ocr_pipeline_models_bp, - url_prefix='/tesseract-ocr-pipeline-models' -) +from . import json_routes, routes diff --git a/app/contributions/forms.py b/app/contributions/forms.py index acec307f..1ef4fdc7 100644 --- a/app/contributions/forms.py +++ b/app/contributions/forms.py @@ -1,11 +1,14 @@ from flask_wtf import FlaskForm +from flask_wtf.file import FileField, FileRequired from wtforms import ( StringField, SubmitField, SelectMultipleField, - IntegerField + IntegerField, + ValidationError ) from wtforms.validators import InputRequired, Length +from app.services import SERVICES class ContributionBaseForm(FlaskForm): @@ -45,3 +48,79 @@ class ContributionBaseForm(FlaskForm): class EditContributionBaseForm(ContributionBaseForm): pass + + +############################################################################## +# /spacy-nlp-pipeline-models # +############################################################################## +class CreateSpaCyNLPPipelineModelForm(ContributionBaseForm): + spacy_model_file = FileField( + 'File', + validators=[FileRequired()] + ) + pipeline_name = StringField( + 'Pipeline name', + validators=[InputRequired(), Length(max=64)] + ) + + def validate_spacy_model_file(self, field): + if not field.data.filename.lower().endswith('.tar.gz'): + raise ValidationError('.tar.gz files only!') + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + service_manifest = SERVICES['spacy-nlp-pipeline'] + self.compatible_service_versions.choices = [('', 'Choose your option')] + self.compatible_service_versions.choices += [ + (x, x) for x in service_manifest['versions'].keys() + ] + self.compatible_service_versions.default = '' + + +class EditSpaCyNLPPipelineModelForm(EditContributionBaseForm): + pipeline_name = StringField( + 'Pipeline name', + validators=[InputRequired(), Length(max=64)] + ) + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + service_manifest = SERVICES['spacy-nlp-pipeline'] + self.compatible_service_versions.choices = [('', 'Choose your option')] + self.compatible_service_versions.choices += [ + (x, x) for x in service_manifest['versions'].keys() + ] + self.compatible_service_versions.default = '' + + +############################################################################## +# /tesseract-ocr-pipeline-models # +############################################################################## +class CreateTesseractOCRPipelineModelForm(ContributionBaseForm): + tesseract_model_file = FileField( + 'File', + validators=[FileRequired()] + ) + + def validate_tesseract_model_file(self, field): + if not field.data.filename.lower().endswith('.traineddata'): + raise ValidationError('traineddata files only!') + + def __init__(self, *args, **kwargs): + service_manifest = SERVICES['tesseract-ocr-pipeline'] + super().__init__(*args, **kwargs) + self.compatible_service_versions.choices = [('', 'Choose your option')] + self.compatible_service_versions.choices += [ + (x, x) for x in service_manifest['versions'].keys() + ] + self.compatible_service_versions.default = '' + + +class EditTesseractOCRPipelineModelForm(EditContributionBaseForm): + def __init__(self, *args, **kwargs): + service_manifest = SERVICES['tesseract-ocr-pipeline'] + super().__init__(*args, **kwargs) + self.compatible_service_versions.choices = [('', 'Choose your option')] + self.compatible_service_versions.choices += [ + (x, x) for x in service_manifest['versions'].keys() + ] + self.compatible_service_versions.default = '' diff --git a/app/contributions/json_routes.py b/app/contributions/json_routes.py new file mode 100644 index 00000000..c44a4c9c --- /dev/null +++ b/app/contributions/json_routes.py @@ -0,0 +1,107 @@ +from flask import abort, current_app, request +from flask_login import login_required, current_user +from threading import Thread +from app import db +from app.decorators import content_negotiation, permission_required +from app.models import SpaCyNLPPipelineModel, TesseractOCRPipelineModel +from . import bp + + +############################################################################## +# /spacy-nlp-pipeline-models # +############################################################################## +@bp.route('/spacy-nlp-pipeline-models', methods=['DELETE']) +@login_required +@content_negotiation(produces='application/json') +def delete_spacy_model(spacy_nlp_pipeline_model_id): + def _delete_spacy_model(app, spacy_nlp_pipeline_model_id): + with app.app_context(): + snpm = SpaCyNLPPipelineModel.query.get(spacy_nlp_pipeline_model_id) + snpm.delete() + db.session.commit() + + snpm = SpaCyNLPPipelineModel.query.get_or_404(spacy_nlp_pipeline_model_id) + if not (snpm.user == current_user or current_user.is_administrator()): + abort(403) + thread = Thread( + target=_delete_spacy_model, + args=(current_app._get_current_object(), snpm.id) + ) + thread.start() + resonse_data = { + 'message': \ + f'SpaCy NLP Pipeline Model "{snpm.title}" marked for deletion' + } + return resonse_data, 202 + + +@bp.route('/spacy-nlp-pipeline-models/is_public', methods=['PUT']) +@login_required +@permission_required('CONTRIBUTE') +@content_negotiation(consumes='application/json', produces='application/json') +def update_spacy_nlp_pipeline_model_is_public(spacy_nlp_pipeline_model_id): + is_public = request.json + if not isinstance(is_public, bool): + abort(400) + snpm = SpaCyNLPPipelineModel.query.get_or_404(spacy_nlp_pipeline_model_id) + if not (snpm.user == current_user or current_user.is_administrator()): + abort(403) + snpm.is_public = is_public + db.session.commit() + response_data = { + 'message': ( + f'SpaCy NLP Pipeline Model "{snpm.title}"' + f' is now {"public" if is_public else "private"}' + ) + } + return response_data, 200 + + +############################################################################## +# /tesseract-ocr-pipeline-models # +############################################################################## +@bp.route('/tesseract-ocr-pipeline-models/', methods=['DELETE']) +@login_required +@content_negotiation(produces='application/json') +def delete_tesseract_model(tesseract_ocr_pipeline_model_id): + def _delete_tesseract_ocr_pipeline_model(app, tesseract_ocr_pipeline_model_id): + with app.app_context(): + topm = TesseractOCRPipelineModel.query.get(tesseract_ocr_pipeline_model_id) + topm.delete() + db.session.commit() + + topm = TesseractOCRPipelineModel.query.get_or_404(tesseract_ocr_pipeline_model_id) + if not (topm.user == current_user or current_user.is_administrator()): + abort(403) + thread = Thread( + target=_delete_tesseract_ocr_pipeline_model, + args=(current_app._get_current_object(), topm.id) + ) + thread.start() + response_data = { + 'message': \ + f'Tesseract OCR Pipeline Model "{topm.title}" marked for deletion' + } + return response_data, 202 + + +@bp.route('/tesseract-ocr-pipeline-models//is_public', methods=['PUT']) +@login_required +@permission_required('CONTRIBUTE') +@content_negotiation(consumes='application/json', produces='application/json') +def update_tesseract_ocr_pipeline_model_is_public(tesseract_ocr_pipeline_model_id): + is_public = request.json + if not isinstance(is_public, bool): + abort(400) + topm = TesseractOCRPipelineModel.query.get_or_404(tesseract_ocr_pipeline_model_id) + if not (topm.user == current_user or current_user.is_administrator()): + abort(403) + topm.is_public = is_public + db.session.commit() + response_data = { + 'message': ( + f'Tesseract OCR Pipeline Model "{topm.title}"' + f' is now {"public" if is_public else "private"}' + ) + } + return response_data, 200 diff --git a/app/contributions/routes.py b/app/contributions/routes.py index 6d8b9cc3..6da7dc12 100644 --- a/app/contributions/routes.py +++ b/app/contributions/routes.py @@ -1,12 +1,189 @@ -from flask import render_template -from flask_login import login_required +from flask import abort, flash, redirect, render_template, request, url_for +from flask_breadcrumbs import register_breadcrumb +from flask_login import current_user, login_required +from app import db +from app.models import SpaCyNLPPipelineModel, TesseractOCRPipelineModel from . import bp +from .forms import ( + CreateSpaCyNLPPipelineModelForm, + EditSpaCyNLPPipelineModelForm, + CreateTesseractOCRPipelineModelForm, + EditTesseractOCRPipelineModelForm +) -@bp.route('/') +@bp.route('') +@register_breadcrumb(bp, '.', 'Contributions') @login_required def contributions(): return render_template( 'contributions/contributions.html.j2', title='Contributions' ) + + +############################################################################## +# /spacy-nlp-pipeline-models # +############################################################################## +@bp.route('/spacy-nlp-pipeline-models') +@register_breadcrumb(bp, '.spacy_nlp_pipeline_models', 'SpaCy NLP Pipeline Models') +@login_required +def spacy_nlp_pipeline_models(): + return render_template( + 'contributions/spacy_nlp_pipeline_models.html.j2', + title='SpaCy NLP Pipeline Models' + ) + + +@bp.route('/spacy-nlp-pipeline-models/create', methods=['GET', 'POST']) +@register_breadcrumb(bp, '.spacy_nlp_pipeline_models.create', 'Create') +@login_required +def create_spacy_nlp_pipeline_model(): + form_prefix = 'create-spacy-nlp-pipeline-model-form' + form = CreateSpaCyNLPPipelineModelForm(prefix=form_prefix) + if form.is_submitted(): + if not form.validate(): + return {'errors': form.errors}, 400 + try: + snpm = SpaCyNLPPipelineModel.create( + form.spacy_model_file.data, + compatible_service_versions=form.compatible_service_versions.data, + description=form.description.data, + pipeline_name=form.pipeline_name.data, + publisher=form.publisher.data, + publisher_url=form.publisher_url.data, + publishing_url=form.publishing_url.data, + publishing_year=form.publishing_year.data, + is_public=False, + title=form.title.data, + version=form.version.data, + user=current_user + ) + except OSError: + abort(500) + db.session.commit() + flash(f'SpaCy NLP Pipeline model "{snpm.title}" created') + return {}, 201, {'Location': url_for('.spacy_nlp_pipeline_models')} + return render_template( + 'contributions/create_spacy_nlp_pipeline_model.html.j2', + form=form, + title='Create SpaCy NLP Pipeline Model' + ) + + +def spacy_nlp_pipeline_model_dlc(*args, **kwargs): + snpm_id = request.view_args['spacy_nlp_pipeline_model_id'] + snpm = SpaCyNLPPipelineModel.query.get(snpm_id) + return [ + { + 'text': f'{snpm.title} {snpm.version}', + 'url': url_for('.spacy_nlp_pipeline_model', spacy_nlp_pipeline_model_id=snpm_id) + } + ] + + +@bp.route('/spacy-nlp-pipeline-models/', methods=['GET', 'POST']) +@register_breadcrumb(bp, '.spacy_nlp_pipeline_models.entity', '', dynamic_list_constructor=spacy_nlp_pipeline_model_dlc) +@login_required +def spacy_nlp_pipeline_model(spacy_nlp_pipeline_model_id): + snpm = SpaCyNLPPipelineModel.query.get_or_404(spacy_nlp_pipeline_model_id) + form_prefix = 'edit-spacy-nlp-pipeline-model-form' + form = EditSpaCyNLPPipelineModelForm( + data=snpm.to_json_serializeable(), + prefix=form_prefix + ) + if form.validate_on_submit(): + form.populate_obj(snpm) + if db.session.is_modified(snpm): + flash(f'SpaCy NLP Pipeline model "{snpm.title}" updated') + db.session.commit() + return redirect(url_for('.spacy_nlp_pipeline_models')) + return render_template( + 'contributions/spacy_nlp_pipeline_model.html.j2', + form=form, + spacy_nlp_pipeline_model=snpm, + title=f'{snpm.title} {snpm.version}' + ) + + +############################################################################## +# /tesseract-ocr-pipeline-models # +############################################################################## +@bp.route('/tesseract-ocr-pipeline-models') +@register_breadcrumb(bp, '.tesseract_ocr_pipeline_models', 'Tesseract OCR Pipeline Models') +@login_required +def tesseract_ocr_pipeline_models(): + return render_template( + 'contributions/tesseract_ocr_pipeline_models.html.j2', + title='Tesseract OCR Pipeline Models' + ) + + +@bp.route('/tesseract-ocr-pipeline-models/create', methods=['GET', 'POST']) +@register_breadcrumb(bp, '.tesseract_ocr_pipeline_models.create', 'Create') +@login_required +def create_tesseract_ocr_pipeline_model(): + form_prefix = 'create-tesseract-ocr-pipeline-model-form' + form = CreateTesseractOCRPipelineModelForm(prefix=form_prefix) + if form.is_submitted(): + if not form.validate(): + return {'errors': form.errors}, 400 + try: + topm = TesseractOCRPipelineModel.create( + form.tesseract_model_file.data, + compatible_service_versions=form.compatible_service_versions.data, + description=form.description.data, + publisher=form.publisher.data, + publisher_url=form.publisher_url.data, + publishing_url=form.publishing_url.data, + publishing_year=form.publishing_year.data, + is_public=False, + title=form.title.data, + version=form.version.data, + user=current_user + ) + except OSError: + abort(500) + db.session.commit() + flash(f'Tesseract OCR Pipeline model "{topm.title}" created') + return {}, 201, {'Location': url_for('.tesseract_ocr_pipeline_models')} + return render_template( + 'contributions/create_tesseract_ocr_pipeline_model.html.j2', + form=form, + title='Create Tesseract OCR Pipeline Model' + ) + + +def tesseract_ocr_pipeline_model_dlc(*args, **kwargs): + topm_id = request.view_args['tesseract_ocr_pipeline_model_id'] + topm = TesseractOCRPipelineModel.query.get(topm_id) + return [ + { + 'text': f'{topm.title} {topm.version}', + 'url': url_for('.tesseract_ocr_pipeline_model', tesseract_ocr_pipeline_model_id=topm_id) + } + ] + + +@bp.route('/tesseract-ocr-pipeline-models/', methods=['GET', 'POST']) +@register_breadcrumb(bp, '.tesseract_ocr_pipeline_models.entity', '', dynamic_list_constructor=tesseract_ocr_pipeline_model_dlc) +@login_required +def tesseract_ocr_pipeline_model(tesseract_ocr_pipeline_model_id): + topm = TesseractOCRPipelineModel.query.get_or_404(tesseract_ocr_pipeline_model_id) + form_prefix = 'edit-tesseract-ocr-pipeline-model-form' + form = EditTesseractOCRPipelineModelForm( + data=topm.to_json_serializeable(), + prefix=form_prefix + ) + if form.validate_on_submit(): + form.populate_obj(topm) + if db.session.is_modified(topm): + flash(f'Tesseract OCR Pipeline model "{topm.title}" updated') + db.session.commit() + return redirect(url_for('.tesseract_ocr_pipeline_models')) + return render_template( + 'contributions/tesseract_ocr_pipeline_model.html.j2', + form=form, + tesseract_ocr_pipeline_model=topm, + title=f'{topm.title} {topm.version}' + ) diff --git a/app/contributions/spacy_nlp_pipeline_models/__init__.py b/app/contributions/spacy_nlp_pipeline_models/__init__.py deleted file mode 100644 index 8ff119d0..00000000 --- a/app/contributions/spacy_nlp_pipeline_models/__init__.py +++ /dev/null @@ -1,8 +0,0 @@ -from flask import Blueprint - - -template_base_dir = 'contributions/spacy_nlp_pipeline_models' - - -bp = Blueprint('spacy_nlp_pipeline_models', __name__) -from . import routes, json_routes diff --git a/app/contributions/spacy_nlp_pipeline_models/forms.py b/app/contributions/spacy_nlp_pipeline_models/forms.py deleted file mode 100644 index 2670c1d1..00000000 --- a/app/contributions/spacy_nlp_pipeline_models/forms.py +++ /dev/null @@ -1,44 +0,0 @@ -from flask_wtf.file import FileField, FileRequired -from wtforms import StringField, ValidationError -from wtforms.validators import InputRequired, Length -from app.services import SERVICES -from ..forms import ContributionBaseForm, EditContributionBaseForm - - -class CreateSpaCyNLPPipelineModelForm(ContributionBaseForm): - spacy_model_file = FileField( - 'File', - validators=[FileRequired()] - ) - pipeline_name = StringField( - 'Pipeline name', - validators=[InputRequired(), Length(max=64)] - ) - - def validate_spacy_model_file(self, field): - if not field.data.filename.lower().endswith('.tar.gz'): - raise ValidationError('.tar.gz files only!') - - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - service_manifest = SERVICES['spacy-nlp-pipeline'] - self.compatible_service_versions.choices = [('', 'Choose your option')] - self.compatible_service_versions.choices += [ - (x, x) for x in service_manifest['versions'].keys() - ] - self.compatible_service_versions.default = '' - - -class EditSpaCyNLPPipelineModelForm(EditContributionBaseForm): - pipeline_name = StringField( - 'Pipeline name', - validators=[InputRequired(), Length(max=64)] - ) - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - service_manifest = SERVICES['spacy-nlp-pipeline'] - self.compatible_service_versions.choices = [('', 'Choose your option')] - self.compatible_service_versions.choices += [ - (x, x) for x in service_manifest['versions'].keys() - ] - self.compatible_service_versions.default = '' diff --git a/app/contributions/spacy_nlp_pipeline_models/json_routes.py b/app/contributions/spacy_nlp_pipeline_models/json_routes.py deleted file mode 100644 index f7a9a254..00000000 --- a/app/contributions/spacy_nlp_pipeline_models/json_routes.py +++ /dev/null @@ -1,54 +0,0 @@ -from flask import abort, current_app, request -from flask_login import login_required, current_user -from threading import Thread -from app import db -from app.decorators import content_negotiation, permission_required -from app.models import SpaCyNLPPipelineModel -from . import bp - - -@bp.route('/', methods=['DELETE']) -@login_required -@content_negotiation(produces='application/json') -def delete_spacy_model(spacy_nlp_pipeline_model_id): - def _delete_spacy_model(app, spacy_nlp_pipeline_model_id): - with app.app_context(): - snpm = SpaCyNLPPipelineModel.query.get(spacy_nlp_pipeline_model_id) - snpm.delete() - db.session.commit() - - snpm = SpaCyNLPPipelineModel.query.get_or_404(spacy_nlp_pipeline_model_id) - if not (snpm.user == current_user or current_user.is_administrator()): - abort(403) - thread = Thread( - target=_delete_spacy_model, - args=(current_app._get_current_object(), snpm.id) - ) - thread.start() - resonse_data = { - 'message': \ - f'SpaCy NLP Pipeline Model "{snpm.title}" marked for deletion' - } - return resonse_data, 202 - - -@bp.route('//is_public', methods=['PUT']) -@login_required -@permission_required('CONTRIBUTE') -@content_negotiation(consumes='application/json', produces='application/json') -def update_spacy_nlp_pipeline_model_is_public(spacy_nlp_pipeline_model_id): - is_public = request.json - if not isinstance(is_public, bool): - abort(400) - snpm = SpaCyNLPPipelineModel.query.get_or_404(spacy_nlp_pipeline_model_id) - if not (snpm.user == current_user or current_user.is_administrator()): - abort(403) - snpm.is_public = is_public - db.session.commit() - response_data = { - 'message': ( - f'SpaCy NLP Pipeline Model "{snpm.title}"' - f' is now {"public" if is_public else "private"}' - ) - } - return response_data, 200 diff --git a/app/contributions/spacy_nlp_pipeline_models/routes.py b/app/contributions/spacy_nlp_pipeline_models/routes.py deleted file mode 100644 index fd972902..00000000 --- a/app/contributions/spacy_nlp_pipeline_models/routes.py +++ /dev/null @@ -1,76 +0,0 @@ -from flask import abort, flash, redirect, render_template, url_for -from flask_login import current_user, login_required -from app import db -from app.models import SpaCyNLPPipelineModel -from . import bp, template_base_dir -from .forms import ( - CreateSpaCyNLPPipelineModelForm, - EditSpaCyNLPPipelineModelForm -) - - -@bp.route('') -@login_required -def spacy_nlp_pipeline_models(): - return render_template( - f'{template_base_dir}/spacy_nlp_pipeline_models.html.j2', - title='SpaCy NLP Pipeline Models' - ) - - -@bp.route('/create', methods=['GET', 'POST']) -@login_required -def create_spacy_nlp_pipeline_model(): - form_prefix = 'create-spacy-nlp-pipeline-model-form' - form = CreateSpaCyNLPPipelineModelForm(prefix=form_prefix) - if form.is_submitted(): - if not form.validate(): - return {'errors': form.errors}, 400 - try: - snpm = SpaCyNLPPipelineModel.create( - form.spacy_model_file.data, - compatible_service_versions=form.compatible_service_versions.data, - description=form.description.data, - pipeline_name=form.pipeline_name.data, - publisher=form.publisher.data, - publisher_url=form.publisher_url.data, - publishing_url=form.publishing_url.data, - publishing_year=form.publishing_year.data, - is_public=False, - title=form.title.data, - version=form.version.data, - user=current_user - ) - except OSError: - abort(500) - db.session.commit() - flash(f'SpaCy NLP Pipeline model "{snpm.title}" created') - return {}, 201, {'Location': url_for('.spacy_nlp_pipeline_models')} - return render_template( - f'{template_base_dir}/create_spacy_nlp_pipeline_model.html.j2', - form=form, - title='Create SpaCy NLP Pipeline Model' - ) - - -@bp.route('/', methods=['GET', 'POST']) -@login_required -def spacy_nlp_pipeline_model(spacy_nlp_pipeline_model_id): - snpm = SpaCyNLPPipelineModel.query.get_or_404(spacy_nlp_pipeline_model_id) - form_prefix = 'edit-spacy-nlp-pipeline-model-form' - form = EditSpaCyNLPPipelineModelForm( - data=snpm.to_json_serializeable(), - prefix=form_prefix - ) - if form.validate_on_submit(): - form.populate_obj(snpm) - if db.session.is_modified(snpm): - flash(f'SpaCy NLP Pipeline model "{snpm.title}" updated') - db.session.commit() - return redirect(url_for('.spacy_nlp_pipeline_models')) - return render_template( - f'{template_base_dir}/spacy_nlp_pipeline_model.html.j2', - form=form, - spacy_nlp_pipeline_model=snpm, - title=f'{snpm.title} {snpm.version}' - ) diff --git a/app/contributions/tesseract_ocr_pipeline_models/__init__.py b/app/contributions/tesseract_ocr_pipeline_models/__init__.py deleted file mode 100644 index cf44126d..00000000 --- a/app/contributions/tesseract_ocr_pipeline_models/__init__.py +++ /dev/null @@ -1,8 +0,0 @@ -from flask import Blueprint - - -template_base_dir = 'contributions/tesseract_ocr_pipeline_models' - - -bp = Blueprint('tesseract_ocr_pipeline_models', __name__) -from . import routes, json_routes diff --git a/app/contributions/tesseract_ocr_pipeline_models/forms.py b/app/contributions/tesseract_ocr_pipeline_models/forms.py deleted file mode 100644 index 51f0d76c..00000000 --- a/app/contributions/tesseract_ocr_pipeline_models/forms.py +++ /dev/null @@ -1,35 +0,0 @@ -from flask_wtf.file import FileField, FileRequired -from wtforms import ValidationError -from app.services import SERVICES -from ..forms import ContributionBaseForm, EditContributionBaseForm - - -class CreateTesseractOCRPipelineModelForm(ContributionBaseForm): - tesseract_model_file = FileField( - 'File', - validators=[FileRequired()] - ) - - def validate_tesseract_model_file(self, field): - if not field.data.filename.lower().endswith('.traineddata'): - raise ValidationError('traineddata files only!') - - def __init__(self, *args, **kwargs): - service_manifest = SERVICES['tesseract-ocr-pipeline'] - super().__init__(*args, **kwargs) - self.compatible_service_versions.choices = [('', 'Choose your option')] - self.compatible_service_versions.choices += [ - (x, x) for x in service_manifest['versions'].keys() - ] - self.compatible_service_versions.default = '' - - -class EditTesseractOCRPipelineModelForm(EditContributionBaseForm): - def __init__(self, *args, **kwargs): - service_manifest = SERVICES['tesseract-ocr-pipeline'] - super().__init__(*args, **kwargs) - self.compatible_service_versions.choices = [('', 'Choose your option')] - self.compatible_service_versions.choices += [ - (x, x) for x in service_manifest['versions'].keys() - ] - self.compatible_service_versions.default = '' diff --git a/app/contributions/tesseract_ocr_pipeline_models/json_routes.py b/app/contributions/tesseract_ocr_pipeline_models/json_routes.py deleted file mode 100644 index 81aa6598..00000000 --- a/app/contributions/tesseract_ocr_pipeline_models/json_routes.py +++ /dev/null @@ -1,54 +0,0 @@ -from flask import abort, current_app, request -from flask_login import login_required, current_user -from threading import Thread -from app import db -from app.decorators import content_negotiation, permission_required -from app.models import TesseractOCRPipelineModel -from . import bp - - -@bp.route('/', methods=['DELETE']) -@login_required -@content_negotiation(produces='application/json') -def delete_tesseract_model(tesseract_ocr_pipeline_model_id): - def _delete_tesseract_ocr_pipeline_model(app, tesseract_ocr_pipeline_model_id): - with app.app_context(): - topm = TesseractOCRPipelineModel.query.get(tesseract_ocr_pipeline_model_id) - topm.delete() - db.session.commit() - - topm = TesseractOCRPipelineModel.query.get_or_404(tesseract_ocr_pipeline_model_id) - if not (topm.user == current_user or current_user.is_administrator()): - abort(403) - thread = Thread( - target=_delete_tesseract_ocr_pipeline_model, - args=(current_app._get_current_object(), topm.id) - ) - thread.start() - response_data = { - 'message': \ - f'Tesseract OCR Pipeline Model "{topm.title}" marked for deletion' - } - return response_data, 202 - - -@bp.route('//is_public', methods=['PUT']) -@login_required -@permission_required('CONTRIBUTE') -@content_negotiation(consumes='application/json', produces='application/json') -def update_tesseract_ocr_pipeline_model_is_public(tesseract_ocr_pipeline_model_id): - is_public = request.json - if not isinstance(is_public, bool): - abort(400) - topm = TesseractOCRPipelineModel.query.get_or_404(tesseract_ocr_pipeline_model_id) - if not (topm.user == current_user or current_user.is_administrator()): - abort(403) - topm.is_public = is_public - db.session.commit() - response_data = { - 'message': ( - f'Tesseract OCR Pipeline Model "{topm.title}"' - f' is now {"public" if is_public else "private"}' - ) - } - return response_data, 200 diff --git a/app/contributions/tesseract_ocr_pipeline_models/routes.py b/app/contributions/tesseract_ocr_pipeline_models/routes.py deleted file mode 100644 index b888cef7..00000000 --- a/app/contributions/tesseract_ocr_pipeline_models/routes.py +++ /dev/null @@ -1,75 +0,0 @@ -from flask import abort, flash, redirect, render_template, url_for -from flask_login import login_required, current_user -from app import db -from app.models import TesseractOCRPipelineModel -from . import bp, template_base_dir -from .forms import ( - CreateTesseractOCRPipelineModelForm, - EditTesseractOCRPipelineModelForm -) - - -@bp.route('') -@login_required -def tesseract_ocr_pipeline_models(): - return render_template( - f'{template_base_dir}/tesseract_ocr_pipeline_models.html.j2', - title='Tesseract OCR Pipeline Models' - ) - - -@bp.route('/create', methods=['GET', 'POST']) -@login_required -def create_tesseract_ocr_pipeline_model(): - form_prefix = 'create-tesseract-ocr-pipeline-model-form' - form = CreateTesseractOCRPipelineModelForm(prefix=form_prefix) - if form.is_submitted(): - if not form.validate(): - return {'errors': form.errors}, 400 - try: - topm = TesseractOCRPipelineModel.create( - form.tesseract_model_file.data, - compatible_service_versions=form.compatible_service_versions.data, - description=form.description.data, - publisher=form.publisher.data, - publisher_url=form.publisher_url.data, - publishing_url=form.publishing_url.data, - publishing_year=form.publishing_year.data, - is_public=False, - title=form.title.data, - version=form.version.data, - user=current_user - ) - except OSError: - abort(500) - db.session.commit() - flash(f'Tesseract OCR Pipeline model "{topm.title}" created') - return {}, 201, {'Location': url_for('.tesseract_ocr_pipeline_models')} - return render_template( - f'{template_base_dir}/create_tesseract_ocr_pipeline_model.html.j2', - form=form, - title='Create Tesseract OCR Pipeline Model' - ) - - -@bp.route('/', methods=['GET', 'POST']) -@login_required -def tesseract_ocr_pipeline_model(tesseract_ocr_pipeline_model_id): - topm = TesseractOCRPipelineModel.query.get_or_404(tesseract_ocr_pipeline_model_id) - form_prefix = 'edit-tesseract-ocr-pipeline-model-form' - form = EditTesseractOCRPipelineModelForm( - data=topm.to_json_serializeable(), - prefix=form_prefix - ) - if form.validate_on_submit(): - form.populate_obj(topm) - if db.session.is_modified(topm): - flash(f'Tesseract OCR Pipeline model "{topm.title}" updated') - db.session.commit() - return redirect(url_for('.tesseract_ocr_pipeline_models')) - return render_template( - f'{template_base_dir}/tesseract_ocr_pipeline_model.html.j2', - form=form, - tesseract_ocr_pipeline_model=topm, - title=f'{topm.title} {topm.version}' - ) diff --git a/app/corpora/routes.py b/app/corpora/routes.py index 5484fb50..82701cea 100644 --- a/app/corpora/routes.py +++ b/app/corpora/routes.py @@ -1,23 +1,18 @@ -from flask import ( - abort, - flash, - Markup, - redirect, - render_template, - url_for -) +from flask import abort, flash, redirect, render_template, url_for from flask_login import current_user, login_required from .decorators import corpus_follower_permission_required from app import db -from app.models import ( - Corpus, - CorpusFollowerAssociation, - CorpusFollowerRole, -) +from app.models import Corpus, CorpusFollowerAssociation, CorpusFollowerRole from . import bp from .forms import CreateCorpusForm +@bp.route('') +@login_required +def corpora(): + return redirect(url_for('main.dashboard', _anchor='corpora')) + + @bp.route('/create', methods=['GET', 'POST']) @login_required def create_corpus(): diff --git a/app/main/routes.py b/app/main/routes.py index 918f7414..5399b5e9 100644 --- a/app/main/routes.py +++ b/app/main/routes.py @@ -1,4 +1,5 @@ from flask import flash, redirect, render_template, url_for +from flask_breadcrumbs import register_breadcrumb from flask_login import current_user, login_required, login_user from app.auth.forms import LoginForm from app.models import Corpus, User @@ -6,6 +7,7 @@ from . import bp @bp.route('', methods=['GET', 'POST']) +@register_breadcrumb(bp, '.', 'home') def index(): form = LoginForm(prefix='login-form') if form.validate_on_submit(): @@ -20,37 +22,44 @@ def index(): @bp.route('/faq') +@register_breadcrumb(bp, '.faq', 'Frequently Asked Questions') def faq(): return render_template('main/faq.html.j2', title='Frequently Asked Questions') @bp.route('/dashboard') +@register_breadcrumb(bp, '.dashboard', 'Dashboard') @login_required def dashboard(): return render_template('main/dashboard.html.j2', title='Dashboard') @bp.route('/user_manual') +@register_breadcrumb(bp, '.user_manual', 'User manual') def user_manual(): return render_template('main/user_manual.html.j2', title='User manual') @bp.route('/news') +@register_breadcrumb(bp, '.news', 'News') def news(): return render_template('main/news.html.j2', title='News') @bp.route('/privacy_policy') +@register_breadcrumb(bp, '.privacy_policy', 'Private statement (GDPR)') def privacy_policy(): return render_template('main/privacy_policy.html.j2', title='Privacy statement (GDPR)') @bp.route('/terms_of_use') +@register_breadcrumb(bp, '.terms_of_use', 'Terms of Use') def terms_of_use(): return render_template('main/terms_of_use.html.j2', title='Terms of Use') @bp.route('/social-area') +@register_breadcrumb(bp, '.social_area', 'Social Area') def social_area(): users = [ u.to_json_serializeable(relationships=True, filter_by_privacy_settings=True,) for u diff --git a/app/services/routes.py b/app/services/routes.py index 0fb4b168..5d5a69a0 100644 --- a/app/services/routes.py +++ b/app/services/routes.py @@ -1,4 +1,5 @@ -from flask import abort, current_app, flash, make_response, Markup, render_template, request +from flask import abort, current_app, flash, Markup, redirect, render_template, request, url_for +from flask_breadcrumbs import register_breadcrumb from flask_login import current_user, login_required import requests from app import db, hashids @@ -18,7 +19,15 @@ from .forms import ( ) +@bp.route('/services') +@register_breadcrumb(bp, '.', 'Services') +@login_required +def services(): + return redirect(url_for('main.dashboard')) + + @bp.route('/file-setup-pipeline', methods=['GET', 'POST']) +@register_breadcrumb(bp, '.file_setup_pipeline', 'File Setup') @login_required def file_setup_pipeline(): service = 'file-setup-pipeline' @@ -60,6 +69,7 @@ def file_setup_pipeline(): @bp.route('/tesseract-ocr-pipeline', methods=['GET', 'POST']) +@register_breadcrumb(bp, '.tesseract_ocr_pipeline', 'Tesseract OCR Pipeline') @login_required def tesseract_ocr_pipeline(): service_name = 'tesseract-ocr-pipeline' @@ -109,6 +119,7 @@ def tesseract_ocr_pipeline(): @bp.route('/transkribus-htr-pipeline', methods=['GET', 'POST']) +@register_breadcrumb(bp, '.transkribus_htr_pipeline', 'Transkribus HTR Pipeline') @login_required def transkribus_htr_pipeline(): if not current_app.config.get('NOPAQUE_TRANSKRIBUS_ENABLED'): @@ -168,6 +179,7 @@ def transkribus_htr_pipeline(): @bp.route('/spacy-nlp-pipeline', methods=['GET', 'POST']) +@register_breadcrumb(bp, '.spacy_nlp_pipeline', 'SpaCy NLP Pipeline') @login_required def spacy_nlp_pipeline(): service = 'spacy-nlp-pipeline' @@ -213,9 +225,10 @@ def spacy_nlp_pipeline(): @bp.route('/corpus-analysis') +@register_breadcrumb(bp, '.corpus_analysis', 'Corpus Analysis') @login_required def corpus_analysis(): return render_template( 'services/corpus_analysis.html.j2', - title='Corpus analysis' + title='Corpus Analysis' ) diff --git a/app/templates/_navbar.html.j2 b/app/templates/_navbar.html.j2 index d943c0e4..2790ef1a 100644 --- a/app/templates/_navbar.html.j2 +++ b/app/templates/_navbar.html.j2 @@ -14,10 +14,12 @@
                -
              • home
                • - {% if breadcrumbs is defined %} - {{ breadcrumbs }} + {%- for breadcrumb in breadcrumbs -%} +
              • {{ breadcrumb.text }}
                • + {% if not loop.last %} +
              • navigate_next
                • {% endif %} + {%- endfor -%}
              {% if current_user.is_authenticated %} explore diff --git a/app/templates/_sidenav.html.j2 b/app/templates/_sidenav.html.j2 index 0027772e..fbaeddbe 100644 --- a/app/templates/_sidenav.html.j2 +++ b/app/templates/_sidenav.html.j2 @@ -35,7 +35,7 @@
            • HTR
              • {% endif %}
            • NLP
              • -
            • Corpus analysis
              • +
            • Corpus Analysis
            • Account
            • settingsGeneral Settings
              • diff --git a/app/templates/admin/_breadcrumbs.html.j2 b/app/templates/admin/_breadcrumbs.html.j2 deleted file mode 100644 index c4a64046..00000000 --- a/app/templates/admin/_breadcrumbs.html.j2 +++ /dev/null @@ -1,18 +0,0 @@ -{% set breadcrumbs %} -
            • navigate_next
              • -
            • Administration
              • -
            • navigate_next
              • -{% if request.path == url_for('.users') %} -
            • Users
              • -{% elif request.path == url_for('.user', user_id=user.id) %} -
            • Users
              • -
            • navigate_next
              • -
            • {{ user.username }}
              • -{% elif request.path == url_for('.edit_user', user_id=user.id) %} -
            • Users
              • -
            • navigate_next
              • -
            • {{ user.username }}
              • -
            • navigate_next
              • -
            • Edit
              • -{% endif %} -{% endset %} diff --git a/app/templates/admin/edit_user.html.j2 b/app/templates/admin/edit_user.html.j2 index c963b7f7..0ac4f27d 100644 --- a/app/templates/admin/edit_user.html.j2 +++ b/app/templates/admin/edit_user.html.j2 @@ -1,5 +1,4 @@ {% extends "base.html.j2" %} -{% from "admin/_breadcrumbs.html.j2" import breadcrumbs with context %} {% import "materialize/wtf.html.j2" as wtf %} {% block page_content %} diff --git a/app/templates/admin/user.html.j2 b/app/templates/admin/user.html.j2 index b4b0e303..aa4899ce 100644 --- a/app/templates/admin/user.html.j2 +++ b/app/templates/admin/user.html.j2 @@ -1,5 +1,4 @@ {% extends "base.html.j2" %} -{% from "admin/_breadcrumbs.html.j2" import breadcrumbs with context %} {% block page_content %}
              diff --git a/app/templates/admin/users.html.j2 b/app/templates/admin/users.html.j2 index c96024cf..25b27c95 100644 --- a/app/templates/admin/users.html.j2 +++ b/app/templates/admin/users.html.j2 @@ -1,5 +1,4 @@ {% extends "base.html.j2" %} -{% from "admin/_breadcrumbs.html.j2" import breadcrumbs with context %} {% block page_content %}
              diff --git a/app/templates/auth/_breadcrumbs.html.j2 b/app/templates/auth/_breadcrumbs.html.j2 deleted file mode 100644 index 2f46d9dc..00000000 --- a/app/templates/auth/_breadcrumbs.html.j2 +++ /dev/null @@ -1,14 +0,0 @@ -{% set breadcrumbs %} -
            • navigate_next
              • -{% if request.path == url_for('.login') %} -
            • {{ title }}
              • -{% elif request.path == url_for('.register') %} -
            • {{ title }}
              • -{% elif request.path == url_for('.reset_password', token=token) %} -
            • {{ title }}
              • -{% elif request.path == url_for('.reset_password_request') %} -
            • {{ title }}
              • -{% elif request.path == url_for('.unconfirmed') %} -
            • {{ title }}
              • -{% endif %} -{% endset %} diff --git a/app/templates/auth/login.html.j2 b/app/templates/auth/login.html.j2 index 213c0a5f..7aa402f6 100644 --- a/app/templates/auth/login.html.j2 +++ b/app/templates/auth/login.html.j2 @@ -1,5 +1,4 @@ {% extends "base.html.j2" %} -{% from "auth/_breadcrumbs.html.j2" import breadcrumbs with context %} {% import "materialize/wtf.html.j2" as wtf %} diff --git a/app/templates/auth/register.html.j2 b/app/templates/auth/register.html.j2 index 69a01912..d8e023a7 100644 --- a/app/templates/auth/register.html.j2 +++ b/app/templates/auth/register.html.j2 @@ -1,5 +1,4 @@ {% extends "base.html.j2" %} -{% from "auth/_breadcrumbs.html.j2" import breadcrumbs with context %} {% import "materialize/wtf.html.j2" as wtf %} diff --git a/app/templates/auth/reset_password.html.j2 b/app/templates/auth/reset_password.html.j2 index 06f11059..7df460bb 100644 --- a/app/templates/auth/reset_password.html.j2 +++ b/app/templates/auth/reset_password.html.j2 @@ -1,5 +1,4 @@ {% extends "base.html.j2" %} -{% from "auth/_breadcrumbs.html.j2" import breadcrumbs with context %} {% import "materialize/wtf.html.j2" as wtf %} {% block page_content %} diff --git a/app/templates/auth/reset_password_request.html.j2 b/app/templates/auth/reset_password_request.html.j2 index a94d18da..5bf28111 100644 --- a/app/templates/auth/reset_password_request.html.j2 +++ b/app/templates/auth/reset_password_request.html.j2 @@ -1,5 +1,4 @@ {% extends "base.html.j2" %} -{% from "auth/_breadcrumbs.html.j2" import breadcrumbs with context %} {% import "materialize/wtf.html.j2" as wtf %} {% block page_content %} diff --git a/app/templates/auth/unconfirmed.html.j2 b/app/templates/auth/unconfirmed.html.j2 index 26384ecc..f927fcff 100644 --- a/app/templates/auth/unconfirmed.html.j2 +++ b/app/templates/auth/unconfirmed.html.j2 @@ -1,5 +1,4 @@ {% extends "base.html.j2" %} -{% from "auth/_breadcrumbs.html.j2" import breadcrumbs with context %} {% block page_content %}
              diff --git a/app/templates/contributions/_breadcrumbs.html.j2 b/app/templates/contributions/_breadcrumbs.html.j2 deleted file mode 100644 index ab64dec4..00000000 --- a/app/templates/contributions/_breadcrumbs.html.j2 +++ /dev/null @@ -1,46 +0,0 @@ -{% set breadcrumbs %} -
            • navigate_next
              • -{% if request.path == url_for('.contributions') %} -
            • Contributions Overview
              • -{% elif request.path == url_for('.tesseract_ocr_pipeline_models')%} -
            • Contributions Overview
              • -
            • navigate_next
              • -
            • Tesseract OCR Pipeline Models
              • -{% elif request.path == url_for('.spacy_nlp_pipeline_models')%} -
            • Contributions Overview
              • -
            • navigate_next
              • -
            • SpaCy NLP Pipeline Models
              • -{% elif request.path == url_for('.create_tesseract_ocr_pipeline_model') %} -
            • Contributions Overview
              • -
            • navigate_next
              • -
            • Tesseract OCR Pipeline Models
              • -
            • navigate_next
              • -
            • {{ title }}
              • -{% elif request.path == url_for('.create_spacy_nlp_pipeline_model') %} -
            • Contributions Overview
              • -
            • navigate_next
              • -
            • SpaCy NLP Pipeline Models
              • -
            • navigate_next
              • -
            • {{ title }}
              • -{% elif tesseract_ocr_pipeline_model and request.path == url_for('.tesseract_ocr_pipeline_model', tesseract_ocr_pipeline_model_id=tesseract_ocr_pipeline_model.id) %} -
            • Contributions Overview
              • -
            • navigate_next
              • -
            • Tesseract OCR Pipeline Models
              • -
            • navigate_next
              • -
            • - - {{ tesseract_ocr_pipeline_model.title }} {{ tesseract_ocr_pipeline_model.version }} - -
              • -{% elif spacy_nlp_pipeline_model and request.path == url_for('.spacy_nlp_pipeline_model', spacy_nlp_pipeline_model_id=spacy_nlp_pipeline_model.id) %} -
            • Contributions Overview
              • -
            • navigate_next
              • -
            • SpaCy NLP Pipeline Models
              • -
            • navigate_next
              • -
            • - - {{ spacy_nlp_pipeline_model.title }} {{ spacy_nlp_pipeline_model.version }} - -
              • -{% endif %} -{% endset %} diff --git a/app/templates/contributions/contributions.html.j2 b/app/templates/contributions/contributions.html.j2 index efefcbbb..a0944723 100644 --- a/app/templates/contributions/contributions.html.j2 +++ b/app/templates/contributions/contributions.html.j2 @@ -10,7 +10,7 @@
              - +
              Tesseract OCR Pipeline Models

              Here you can see and edit the models that you have created. You can also create new models.

              @@ -20,7 +20,7 @@
              - +
              SpaCy NLP Pipeline Models

              Here you can see and edit the models that you have created. You can also create new models.

              diff --git a/app/templates/contributions/spacy_nlp_pipeline_models/create_spacy_nlp_pipeline_model.html.j2 b/app/templates/contributions/create_spacy_nlp_pipeline_model.html.j2 similarity index 100% rename from app/templates/contributions/spacy_nlp_pipeline_models/create_spacy_nlp_pipeline_model.html.j2 rename to app/templates/contributions/create_spacy_nlp_pipeline_model.html.j2 diff --git a/app/templates/contributions/tesseract_ocr_pipeline_models/create_tesseract_ocr_pipeline_model.html.j2 b/app/templates/contributions/create_tesseract_ocr_pipeline_model.html.j2 similarity index 100% rename from app/templates/contributions/tesseract_ocr_pipeline_models/create_tesseract_ocr_pipeline_model.html.j2 rename to app/templates/contributions/create_tesseract_ocr_pipeline_model.html.j2 diff --git a/app/templates/contributions/spacy_nlp_pipeline_models/spacy_nlp_pipeline_model.html.j2 b/app/templates/contributions/spacy_nlp_pipeline_model.html.j2 similarity index 100% rename from app/templates/contributions/spacy_nlp_pipeline_models/spacy_nlp_pipeline_model.html.j2 rename to app/templates/contributions/spacy_nlp_pipeline_model.html.j2 diff --git a/app/templates/contributions/spacy_nlp_pipeline_models/spacy_nlp_pipeline_models.html.j2 b/app/templates/contributions/spacy_nlp_pipeline_models.html.j2 similarity index 100% rename from app/templates/contributions/spacy_nlp_pipeline_models/spacy_nlp_pipeline_models.html.j2 rename to app/templates/contributions/spacy_nlp_pipeline_models.html.j2 diff --git a/app/templates/contributions/tesseract_ocr_pipeline_models/tesseract_ocr_pipeline_model.html.j2 b/app/templates/contributions/tesseract_ocr_pipeline_model.html.j2 similarity index 100% rename from app/templates/contributions/tesseract_ocr_pipeline_models/tesseract_ocr_pipeline_model.html.j2 rename to app/templates/contributions/tesseract_ocr_pipeline_model.html.j2 diff --git a/app/templates/contributions/tesseract_ocr_pipeline_models/tesseract_ocr_pipeline_models.html.j2 b/app/templates/contributions/tesseract_ocr_pipeline_models.html.j2 similarity index 100% rename from app/templates/contributions/tesseract_ocr_pipeline_models/tesseract_ocr_pipeline_models.html.j2 rename to app/templates/contributions/tesseract_ocr_pipeline_models.html.j2 diff --git a/app/templates/corpora/_breadcrumbs.html.j2 b/app/templates/corpora/_breadcrumbs.html.j2 deleted file mode 100644 index bdbe0f34..00000000 --- a/app/templates/corpora/_breadcrumbs.html.j2 +++ /dev/null @@ -1,28 +0,0 @@ -{# {% set breadcrumbs %} -
            • navigate_next
              • -
            • My corpora
              • -
            • navigate_next
              • -{% if request.path == url_for('.create_corpus') %} -
            • {{ title }}
              • -{% elif request.path == url_for('.import_corpus') %} -
            • {{ title }}
              • -{% elif request.path == url_for('.corpus', corpus_id=corpus.id) %} -
            • {{ corpus.title }}
              • -{% elif request.path == url_for('.analyse_corpus', corpus_id=corpus.id) %} -
            • {{ corpus.title }}
              • -
            • navigate_next
              • -
            • {{ title }}
              • -{% elif request.path == url_for('.create_corpus_file', corpus_id=corpus.id) %} -
            • {{ corpus.title }}
              • -
            • navigate_next
              • -
            • Corpus files
              • -
            • navigate_next
              • -
            • {{ title }}
              • -{% elif request.path == url_for('.corpus_file', corpus_file_id=corpus_file.id, corpus_id=corpus.id) %} -
            • {{ corpus.title }}
              • -
            • navigate_next
              • -
            • Corpus files
              • -
            • navigate_next
              • -
            • {{ corpus_file.author }}: {{ corpus_file.title }} ({{ corpus_file.publishing_year }})
              • -{% endif %} -{% endset %} #} diff --git a/app/templates/corpora/corpus.html.j2 b/app/templates/corpora/corpus.html.j2 index 053dbdc0..f17e1e88 100644 --- a/app/templates/corpora/corpus.html.j2 +++ b/app/templates/corpora/corpus.html.j2 @@ -1,6 +1,5 @@ {% extends "base.html.j2" %} {% import "materialize/wtf.html.j2" as wtf %} -{% from "corpora/_breadcrumbs.html.j2" import breadcrumbs with context %} {% block main_attribs %} class="service-scheme" data-service="corpus-analysis"{% endblock main_attribs %} diff --git a/app/templates/corpora/create_corpus.html.j2 b/app/templates/corpora/create_corpus.html.j2 index ccb49877..5feb7225 100644 --- a/app/templates/corpora/create_corpus.html.j2 +++ b/app/templates/corpora/create_corpus.html.j2 @@ -1,5 +1,4 @@ {% extends "base.html.j2" %} -{% from "corpora/_breadcrumbs.html.j2" import breadcrumbs with context %} {% import "materialize/wtf.html.j2" as wtf %} {% block main_attribs %} class="service-scheme" data-service="corpus-analysis"{% endblock main_attribs %} diff --git a/app/templates/corpora/files/corpus_file.html.j2 b/app/templates/corpora/files/corpus_file.html.j2 index 781ea059..28a762d4 100644 --- a/app/templates/corpora/files/corpus_file.html.j2 +++ b/app/templates/corpora/files/corpus_file.html.j2 @@ -1,5 +1,4 @@ {% extends "base.html.j2" %} -{% from "corpora/_breadcrumbs.html.j2" import breadcrumbs with context %} {% import "materialize/wtf.html.j2" as wtf %} {% block main_attribs %} class="service-scheme" data-service="corpus-analysis"{% endblock main_attribs %} diff --git a/app/templates/corpora/files/create_corpus_file.html.j2 b/app/templates/corpora/files/create_corpus_file.html.j2 index 8cff13a6..ff634294 100644 --- a/app/templates/corpora/files/create_corpus_file.html.j2 +++ b/app/templates/corpora/files/create_corpus_file.html.j2 @@ -1,5 +1,4 @@ {% extends "base.html.j2" %} -{% from "corpora/_breadcrumbs.html.j2" import breadcrumbs with context %} {% import "materialize/wtf.html.j2" as wtf %} {% block main_attribs %} class="service-scheme" data-service="corpus-analysis"{% endblock main_attribs %} diff --git a/app/templates/corpora/import_corpus.html.j2 b/app/templates/corpora/import_corpus.html.j2 index 957668e6..dd0806a7 100644 --- a/app/templates/corpora/import_corpus.html.j2 +++ b/app/templates/corpora/import_corpus.html.j2 @@ -1,5 +1,4 @@ {% extends "base.html.j2" %} -{% from "corpora/_breadcrumbs.html.j2" import breadcrumbs with context %} {% import "materialize/wtf.html.j2" as wtf %} {% block main_attribs %} class="service-scheme" data-service="corpus-analysis"{% endblock main_attribs %} diff --git a/app/templates/jobs/_breadcrumbs.html.j2 b/app/templates/jobs/_breadcrumbs.html.j2 deleted file mode 100644 index e3de43f3..00000000 --- a/app/templates/jobs/_breadcrumbs.html.j2 +++ /dev/null @@ -1,8 +0,0 @@ -{% set breadcrumbs %} -
            • navigate_next
              • -
            • My jobs
              • -{% if request.path == url_for('.job', job_id=job.id) %} -
            • navigate_next
              • -
            • {{ job.title }}
              • -{% endif %} -{% endset %} diff --git a/app/templates/jobs/job.html.j2 b/app/templates/jobs/job.html.j2 index b5055ce6..51f2fc6d 100644 --- a/app/templates/jobs/job.html.j2 +++ b/app/templates/jobs/job.html.j2 @@ -1,5 +1,4 @@ {% extends "base.html.j2" %} -{% from "jobs/_breadcrumbs.html.j2" import breadcrumbs with context %} {% block main_attribs %} class="service-scheme" data-service="{{ job.service }}"{% endblock main_attribs %} diff --git a/app/templates/main/_breadcrumbs.html.j2 b/app/templates/main/_breadcrumbs.html.j2 deleted file mode 100644 index d65978d6..00000000 --- a/app/templates/main/_breadcrumbs.html.j2 +++ /dev/null @@ -1,14 +0,0 @@ -{% set breadcrumbs %} -{% if not (request.path == url_for('.index')) %} -
            • navigate_next
              • -{% endif %} -{% if request.path == url_for('.faq') %} -
            • Frequently Asked Questions
              • -{% elif request.path == url_for('.dashboard') %} -
            • Dashboard
              • -{% elif request.path == url_for('.news') %} -
            • News
              • -{% elif request.path == url_for('.terms_of_use') %} -
            • Terms of use
              • -{% endif %} -{% endset %} diff --git a/app/templates/main/dashboard.html.j2 b/app/templates/main/dashboard.html.j2 index 5474db97..1598e139 100644 --- a/app/templates/main/dashboard.html.j2 +++ b/app/templates/main/dashboard.html.j2 @@ -1,5 +1,4 @@ {% extends "base.html.j2" %} -{% from "main/_breadcrumbs.html.j2" import breadcrumbs with context %} {% block page_content %}
              diff --git a/app/templates/main/faq.html.j2 b/app/templates/main/faq.html.j2 index fb10e3b4..5c168007 100644 --- a/app/templates/main/faq.html.j2 +++ b/app/templates/main/faq.html.j2 @@ -1,5 +1,4 @@ {% extends "base.html.j2" %} -{% from "main/_breadcrumbs.html.j2" import breadcrumbs with context %} {% block page_content %}
              diff --git a/app/templates/main/index.html.j2 b/app/templates/main/index.html.j2 index 74bfa306..7b80a794 100644 --- a/app/templates/main/index.html.j2 +++ b/app/templates/main/index.html.j2 @@ -1,5 +1,4 @@ {% extends "base.html.j2" %} -{% from "main/_breadcrumbs.html.j2" import breadcrumbs with context %} {% import "materialize/wtf.html.j2" as wtf %} {% block page_content %} diff --git a/app/templates/main/news.html.j2 b/app/templates/main/news.html.j2 index b8961b02..d1111d8b 100644 --- a/app/templates/main/news.html.j2 +++ b/app/templates/main/news.html.j2 @@ -1,5 +1,4 @@ {% extends "base.html.j2" %} -{% from "main/_breadcrumbs.html.j2" import breadcrumbs with context %} {% block page_content %}
              diff --git a/app/templates/main/news_new.html.j2 b/app/templates/main/news_new.html.j2 index d3e2f9b6..d2b339e3 100644 --- a/app/templates/main/news_new.html.j2 +++ b/app/templates/main/news_new.html.j2 @@ -1,5 +1,4 @@ {% extends "base.html.j2" %} -{% from "main/_breadcrumbs.html.j2" import breadcrumbs with context %} {% block page_content %}
              diff --git a/app/templates/main/privacy_policy.html.j2 b/app/templates/main/privacy_policy.html.j2 index ff22b10a..c55ae722 100644 --- a/app/templates/main/privacy_policy.html.j2 +++ b/app/templates/main/privacy_policy.html.j2 @@ -1,5 +1,4 @@ {% extends "base.html.j2" %} -{% from "main/_breadcrumbs.html.j2" import breadcrumbs with context %} {% block page_content %}
              diff --git a/app/templates/main/terms_of_use.html.j2 b/app/templates/main/terms_of_use.html.j2 index baedd0a2..d61084d6 100644 --- a/app/templates/main/terms_of_use.html.j2 +++ b/app/templates/main/terms_of_use.html.j2 @@ -1,5 +1,4 @@ {% extends "base.html.j2" %} -{% from "main/_breadcrumbs.html.j2" import breadcrumbs with context %} {% block page_content %}
              diff --git a/app/templates/main/user_manual.html.j2 b/app/templates/main/user_manual.html.j2 index 0da85809..2ef1da01 100644 --- a/app/templates/main/user_manual.html.j2 +++ b/app/templates/main/user_manual.html.j2 @@ -1,5 +1,4 @@ {% extends "base.html.j2" %} -{% from "main/_breadcrumbs.html.j2" import breadcrumbs with context %} {% block page_content %}
              diff --git a/app/templates/services/_breadcrumbs.html.j2 b/app/templates/services/_breadcrumbs.html.j2 deleted file mode 100644 index a08beafa..00000000 --- a/app/templates/services/_breadcrumbs.html.j2 +++ /dev/null @@ -1,16 +0,0 @@ -{% set breadcrumbs %} -
            • navigate_next
              • -
            • Processes & Services
              • -
            • navigate_next
              • -{% if request.path == url_for('.corpus_analysis') %} -
            • {{ title }}
              • -{% elif request.path == url_for('.file_setup_pipeline') %} -
            • {{ title }}
              • -{% elif request.path == url_for('.spacy_nlp_pipeline') %} -
            • {{ title }}
              • -{% elif request.path == url_for('.tesseract_ocr_pipeline') %} -
            • {{ title }}
              • -{% elif request.path == url_for('.transkribus_htr_pipeline') %} -
            • {{ title }}
              • -{% endif %} -{% endset %} diff --git a/app/templates/services/corpus_analysis.html.j2 b/app/templates/services/corpus_analysis.html.j2 index a7e3da8e..9ddc9ec3 100644 --- a/app/templates/services/corpus_analysis.html.j2 +++ b/app/templates/services/corpus_analysis.html.j2 @@ -1,5 +1,4 @@ {% extends "base.html.j2" %} -{% from "services/_breadcrumbs.html.j2" import breadcrumbs with context %} {% block main_attribs %} class="service-scheme" data-service="corpus-analysis"{% endblock main_attribs %} diff --git a/app/templates/services/file_setup_pipeline.html.j2 b/app/templates/services/file_setup_pipeline.html.j2 index ebc4cfc4..0f046e98 100644 --- a/app/templates/services/file_setup_pipeline.html.j2 +++ b/app/templates/services/file_setup_pipeline.html.j2 @@ -1,5 +1,4 @@ {% extends "base.html.j2" %} -{% from "services/_breadcrumbs.html.j2" import breadcrumbs with context %} {% import "materialize/wtf.html.j2" as wtf %} {% block main_attribs %} class="service-scheme" data-service="file-setup-pipeline"{% endblock main_attribs %} diff --git a/app/templates/services/spacy_nlp_pipeline.html.j2 b/app/templates/services/spacy_nlp_pipeline.html.j2 index 8f466e3d..2ebba838 100644 --- a/app/templates/services/spacy_nlp_pipeline.html.j2 +++ b/app/templates/services/spacy_nlp_pipeline.html.j2 @@ -1,5 +1,4 @@ {% extends "base.html.j2" %} -{% from "services/_breadcrumbs.html.j2" import breadcrumbs with context %} {% import "materialize/wtf.html.j2" as wtf %} {% block main_attribs %} class="service-scheme" data-service="spacy-nlp-pipeline"{% endblock main_attribs %} @@ -77,7 +76,7 @@ {{ form.model.label }} help_outline - new_label + new_label
              diff --git a/app/templates/services/tesseract_ocr_pipeline.html.j2 b/app/templates/services/tesseract_ocr_pipeline.html.j2 index 11d65c64..9b1d6187 100644 --- a/app/templates/services/tesseract_ocr_pipeline.html.j2 +++ b/app/templates/services/tesseract_ocr_pipeline.html.j2 @@ -1,5 +1,4 @@ {% extends "base.html.j2" %} -{% from "services/_breadcrumbs.html.j2" import breadcrumbs with context %} {% import "materialize/wtf.html.j2" as wtf %} {% block main_attribs %} class="service-scheme" data-service="tesseract-ocr-pipeline"{% endblock main_attribs %} @@ -59,7 +58,7 @@ {{ form.model.label }} help_outline - new_label + new_label {% for error in form.model.errors %} {{ error }} diff --git a/app/templates/services/transkribus_htr_pipeline.html.j2 b/app/templates/services/transkribus_htr_pipeline.html.j2 index f5468ce9..50eb3b6e 100644 --- a/app/templates/services/transkribus_htr_pipeline.html.j2 +++ b/app/templates/services/transkribus_htr_pipeline.html.j2 @@ -1,5 +1,4 @@ {% extends "base.html.j2" %} -{% from "services/_breadcrumbs.html.j2" import breadcrumbs with context %} {% import "materialize/wtf.html.j2" as wtf %} {% block main_attribs %} class="service-scheme" data-service="transkribus-htr-pipeline"{% endblock main_attribs %} diff --git a/app/templates/settings/_breadcrumbs.html.j2 b/app/templates/settings/_breadcrumbs.html.j2 deleted file mode 100644 index 3b5077bf..00000000 --- a/app/templates/settings/_breadcrumbs.html.j2 +++ /dev/null @@ -1,6 +0,0 @@ -{% set breadcrumbs %} -
            • navigate_next
              • -{% if request.path == url_for('settings.settings') %} -
            • Settings
              • -{% endif %} -{% endset %} diff --git a/app/templates/settings/settings.html.j2 b/app/templates/settings/settings.html.j2 index e9cfb97b..fd830aee 100644 --- a/app/templates/settings/settings.html.j2 +++ b/app/templates/settings/settings.html.j2 @@ -1,5 +1,4 @@ {% extends "base.html.j2" %} -{% from "settings/_breadcrumbs.html.j2" import breadcrumbs with context %} {% import "materialize/wtf.html.j2" as wtf %} {% block page_content %} diff --git a/requirements.txt b/requirements.txt index 838cee8f..e621d2ad 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,6 +6,7 @@ eventlet Flask==2.1.3 Flask-APScheduler Flask-Assets +Flask-Breadcrumbs Flask-Hashids==1.0.1 Flask-HTTPAuth Flask-Login From c91004d6ba423d00b1bac3b41521667ee6259c6b Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Tue, 14 Mar 2023 11:13:35 +0100 Subject: [PATCH 065/177] Implement flask-breadcrumbs everywhere --- app/__init__.py | 4 +- app/auth/routes.py | 6 +- app/contributions/__init__.py | 4 +- app/contributions/forms.py | 81 +------- app/contributions/json_routes.py | 107 ----------- app/contributions/routes.py | 181 +----------------- .../spacy_nlp_pipeline_models/__init__.py | 2 + .../spacy_nlp_pipeline_models/forms.py | 44 +++++ .../spacy_nlp_pipeline_models/json_routes.py | 54 ++++++ .../spacy_nlp_pipeline_models/routes.py | 83 ++++++++ .../spacy_nlp_pipeline_models/utils.py | 13 ++ .../tesseract_ocr_pipeline_models/__init__.py | 2 + .../tesseract_ocr_pipeline_models/forms.py | 35 ++++ .../json_routes.py | 54 ++++++ .../tesseract_ocr_pipeline_models/routes.py | 82 ++++++++ .../tesseract_ocr_pipeline_models/utils.py | 13 ++ app/corpora/__init__.py | 10 +- app/corpora/files/__init__.py | 10 +- app/corpora/files/json_routes.py | 10 +- app/corpora/files/routes.py | 36 ++-- app/corpora/files/utils.py | 15 ++ app/corpora/followers/__init__.py | 5 +- app/corpora/followers/json_routes.py | 14 +- app/corpora/routes.py | 15 +- app/corpora/utils.py | 17 ++ app/jobs/routes.py | 20 +- app/jobs/utils.py | 13 ++ app/main/routes.py | 2 +- app/services/routes.py | 10 +- app/templates/_roadmap.html.j2 | 2 +- .../contributions/contributions.html.j2 | 6 +- .../create_spacy_nlp_pipeline_model.html.j2 | 0 .../spacy_nlp_pipeline_model.html.j2 | 0 .../spacy_nlp_pipeline_models.html.j2 | 0 ...reate_tesseract_ocr_pipeline_model.html.j2 | 0 .../tesseract_ocr_pipeline_model.html.j2 | 0 .../tesseract_ocr_pipeline_models.html.j2 | 0 app/templates/corpora/corpus.html.j2 | 2 +- 38 files changed, 509 insertions(+), 443 deletions(-) delete mode 100644 app/contributions/json_routes.py create mode 100644 app/contributions/spacy_nlp_pipeline_models/__init__.py create mode 100644 app/contributions/spacy_nlp_pipeline_models/forms.py create mode 100644 app/contributions/spacy_nlp_pipeline_models/json_routes.py create mode 100644 app/contributions/spacy_nlp_pipeline_models/routes.py create mode 100644 app/contributions/spacy_nlp_pipeline_models/utils.py create mode 100644 app/contributions/tesseract_ocr_pipeline_models/__init__.py create mode 100644 app/contributions/tesseract_ocr_pipeline_models/forms.py create mode 100644 app/contributions/tesseract_ocr_pipeline_models/json_routes.py create mode 100644 app/contributions/tesseract_ocr_pipeline_models/routes.py create mode 100644 app/contributions/tesseract_ocr_pipeline_models/utils.py create mode 100644 app/corpora/files/utils.py create mode 100644 app/corpora/utils.py create mode 100644 app/jobs/utils.py rename app/templates/contributions/{ => spacy_nlp_pipeline_models}/create_spacy_nlp_pipeline_model.html.j2 (100%) rename app/templates/contributions/{ => spacy_nlp_pipeline_models}/spacy_nlp_pipeline_model.html.j2 (100%) rename app/templates/contributions/{ => spacy_nlp_pipeline_models}/spacy_nlp_pipeline_models.html.j2 (100%) rename app/templates/contributions/{ => tesseract_ocr_pipeline_models}/create_tesseract_ocr_pipeline_model.html.j2 (100%) rename app/templates/contributions/{ => tesseract_ocr_pipeline_models}/tesseract_ocr_pipeline_model.html.j2 (100%) rename app/templates/contributions/{ => tesseract_ocr_pipeline_models}/tesseract_ocr_pipeline_models.html.j2 (100%) diff --git a/app/__init__.py b/app/__init__.py index 68f9f053..4c2ef68e 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -68,16 +68,18 @@ def create_app(config: Config = Config) -> Flask: from .auth import bp as auth_blueprint default_breadcrumb_root(auth_blueprint, '.') - app.register_blueprint(auth_blueprint, url_prefix='/auth') + app.register_blueprint(auth_blueprint, url_prefix='/') from .contributions import bp as contributions_blueprint default_breadcrumb_root(contributions_blueprint, '.contributions') app.register_blueprint(contributions_blueprint, url_prefix='/contributions') from .corpora import bp as corpora_blueprint + default_breadcrumb_root(corpora_blueprint, '.dashboard.corpora') app.register_blueprint(corpora_blueprint, url_prefix='/corpora') from .jobs import bp as jobs_blueprint + default_breadcrumb_root(jobs_blueprint, '.dashboard.jobs') app.register_blueprint(jobs_blueprint, url_prefix='/jobs') from .main import bp as main_blueprint diff --git a/app/auth/routes.py b/app/auth/routes.py index 6e11a140..d6f11953 100644 --- a/app/auth/routes.py +++ b/app/auth/routes.py @@ -101,7 +101,7 @@ def unconfirmed(): return render_template('auth/unconfirmed.html.j2', title='Unconfirmed') -@bp.route('/confirm') +@bp.route('/confirm-request') @login_required def confirm_request(): if current_user.confirmed: @@ -132,7 +132,7 @@ def confirm(token): return redirect(url_for('.unconfirmed')) -@bp.route('/reset_password', methods=['GET', 'POST']) +@bp.route('/reset-password-request', methods=['GET', 'POST']) @register_breadcrumb(bp, '.reset_password_request', 'Password Reset') def reset_password_request(): if current_user.is_authenticated: @@ -162,7 +162,7 @@ def reset_password_request(): ) -@bp.route('/reset_password/', methods=['GET', 'POST']) +@bp.route('/reset-password/', methods=['GET', 'POST']) @register_breadcrumb(bp, '.reset_password', 'Password Reset') def reset_password(token): if current_user.is_authenticated: diff --git a/app/contributions/__init__.py b/app/contributions/__init__.py index 7749a278..22f3e514 100644 --- a/app/contributions/__init__.py +++ b/app/contributions/__init__.py @@ -2,4 +2,6 @@ from flask import Blueprint bp = Blueprint('contributions', __name__) -from . import json_routes, routes +from . import routes +from . import spacy_nlp_pipeline_models +from . import tesseract_ocr_pipeline_models diff --git a/app/contributions/forms.py b/app/contributions/forms.py index 1ef4fdc7..acec307f 100644 --- a/app/contributions/forms.py +++ b/app/contributions/forms.py @@ -1,14 +1,11 @@ from flask_wtf import FlaskForm -from flask_wtf.file import FileField, FileRequired from wtforms import ( StringField, SubmitField, SelectMultipleField, - IntegerField, - ValidationError + IntegerField ) from wtforms.validators import InputRequired, Length -from app.services import SERVICES class ContributionBaseForm(FlaskForm): @@ -48,79 +45,3 @@ class ContributionBaseForm(FlaskForm): class EditContributionBaseForm(ContributionBaseForm): pass - - -############################################################################## -# /spacy-nlp-pipeline-models # -############################################################################## -class CreateSpaCyNLPPipelineModelForm(ContributionBaseForm): - spacy_model_file = FileField( - 'File', - validators=[FileRequired()] - ) - pipeline_name = StringField( - 'Pipeline name', - validators=[InputRequired(), Length(max=64)] - ) - - def validate_spacy_model_file(self, field): - if not field.data.filename.lower().endswith('.tar.gz'): - raise ValidationError('.tar.gz files only!') - - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - service_manifest = SERVICES['spacy-nlp-pipeline'] - self.compatible_service_versions.choices = [('', 'Choose your option')] - self.compatible_service_versions.choices += [ - (x, x) for x in service_manifest['versions'].keys() - ] - self.compatible_service_versions.default = '' - - -class EditSpaCyNLPPipelineModelForm(EditContributionBaseForm): - pipeline_name = StringField( - 'Pipeline name', - validators=[InputRequired(), Length(max=64)] - ) - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - service_manifest = SERVICES['spacy-nlp-pipeline'] - self.compatible_service_versions.choices = [('', 'Choose your option')] - self.compatible_service_versions.choices += [ - (x, x) for x in service_manifest['versions'].keys() - ] - self.compatible_service_versions.default = '' - - -############################################################################## -# /tesseract-ocr-pipeline-models # -############################################################################## -class CreateTesseractOCRPipelineModelForm(ContributionBaseForm): - tesseract_model_file = FileField( - 'File', - validators=[FileRequired()] - ) - - def validate_tesseract_model_file(self, field): - if not field.data.filename.lower().endswith('.traineddata'): - raise ValidationError('traineddata files only!') - - def __init__(self, *args, **kwargs): - service_manifest = SERVICES['tesseract-ocr-pipeline'] - super().__init__(*args, **kwargs) - self.compatible_service_versions.choices = [('', 'Choose your option')] - self.compatible_service_versions.choices += [ - (x, x) for x in service_manifest['versions'].keys() - ] - self.compatible_service_versions.default = '' - - -class EditTesseractOCRPipelineModelForm(EditContributionBaseForm): - def __init__(self, *args, **kwargs): - service_manifest = SERVICES['tesseract-ocr-pipeline'] - super().__init__(*args, **kwargs) - self.compatible_service_versions.choices = [('', 'Choose your option')] - self.compatible_service_versions.choices += [ - (x, x) for x in service_manifest['versions'].keys() - ] - self.compatible_service_versions.default = '' diff --git a/app/contributions/json_routes.py b/app/contributions/json_routes.py deleted file mode 100644 index c44a4c9c..00000000 --- a/app/contributions/json_routes.py +++ /dev/null @@ -1,107 +0,0 @@ -from flask import abort, current_app, request -from flask_login import login_required, current_user -from threading import Thread -from app import db -from app.decorators import content_negotiation, permission_required -from app.models import SpaCyNLPPipelineModel, TesseractOCRPipelineModel -from . import bp - - -############################################################################## -# /spacy-nlp-pipeline-models # -############################################################################## -@bp.route('/spacy-nlp-pipeline-models', methods=['DELETE']) -@login_required -@content_negotiation(produces='application/json') -def delete_spacy_model(spacy_nlp_pipeline_model_id): - def _delete_spacy_model(app, spacy_nlp_pipeline_model_id): - with app.app_context(): - snpm = SpaCyNLPPipelineModel.query.get(spacy_nlp_pipeline_model_id) - snpm.delete() - db.session.commit() - - snpm = SpaCyNLPPipelineModel.query.get_or_404(spacy_nlp_pipeline_model_id) - if not (snpm.user == current_user or current_user.is_administrator()): - abort(403) - thread = Thread( - target=_delete_spacy_model, - args=(current_app._get_current_object(), snpm.id) - ) - thread.start() - resonse_data = { - 'message': \ - f'SpaCy NLP Pipeline Model "{snpm.title}" marked for deletion' - } - return resonse_data, 202 - - -@bp.route('/spacy-nlp-pipeline-models/is_public', methods=['PUT']) -@login_required -@permission_required('CONTRIBUTE') -@content_negotiation(consumes='application/json', produces='application/json') -def update_spacy_nlp_pipeline_model_is_public(spacy_nlp_pipeline_model_id): - is_public = request.json - if not isinstance(is_public, bool): - abort(400) - snpm = SpaCyNLPPipelineModel.query.get_or_404(spacy_nlp_pipeline_model_id) - if not (snpm.user == current_user or current_user.is_administrator()): - abort(403) - snpm.is_public = is_public - db.session.commit() - response_data = { - 'message': ( - f'SpaCy NLP Pipeline Model "{snpm.title}"' - f' is now {"public" if is_public else "private"}' - ) - } - return response_data, 200 - - -############################################################################## -# /tesseract-ocr-pipeline-models # -############################################################################## -@bp.route('/tesseract-ocr-pipeline-models/', methods=['DELETE']) -@login_required -@content_negotiation(produces='application/json') -def delete_tesseract_model(tesseract_ocr_pipeline_model_id): - def _delete_tesseract_ocr_pipeline_model(app, tesseract_ocr_pipeline_model_id): - with app.app_context(): - topm = TesseractOCRPipelineModel.query.get(tesseract_ocr_pipeline_model_id) - topm.delete() - db.session.commit() - - topm = TesseractOCRPipelineModel.query.get_or_404(tesseract_ocr_pipeline_model_id) - if not (topm.user == current_user or current_user.is_administrator()): - abort(403) - thread = Thread( - target=_delete_tesseract_ocr_pipeline_model, - args=(current_app._get_current_object(), topm.id) - ) - thread.start() - response_data = { - 'message': \ - f'Tesseract OCR Pipeline Model "{topm.title}" marked for deletion' - } - return response_data, 202 - - -@bp.route('/tesseract-ocr-pipeline-models//is_public', methods=['PUT']) -@login_required -@permission_required('CONTRIBUTE') -@content_negotiation(consumes='application/json', produces='application/json') -def update_tesseract_ocr_pipeline_model_is_public(tesseract_ocr_pipeline_model_id): - is_public = request.json - if not isinstance(is_public, bool): - abort(400) - topm = TesseractOCRPipelineModel.query.get_or_404(tesseract_ocr_pipeline_model_id) - if not (topm.user == current_user or current_user.is_administrator()): - abort(403) - topm.is_public = is_public - db.session.commit() - response_data = { - 'message': ( - f'Tesseract OCR Pipeline Model "{topm.title}"' - f' is now {"public" if is_public else "private"}' - ) - } - return response_data, 200 diff --git a/app/contributions/routes.py b/app/contributions/routes.py index 6da7dc12..dacf5b62 100644 --- a/app/contributions/routes.py +++ b/app/contributions/routes.py @@ -1,189 +1,14 @@ -from flask import abort, flash, redirect, render_template, request, url_for +from flask import render_template from flask_breadcrumbs import register_breadcrumb -from flask_login import current_user, login_required -from app import db -from app.models import SpaCyNLPPipelineModel, TesseractOCRPipelineModel +from flask_login import login_required from . import bp -from .forms import ( - CreateSpaCyNLPPipelineModelForm, - EditSpaCyNLPPipelineModelForm, - CreateTesseractOCRPipelineModelForm, - EditTesseractOCRPipelineModelForm -) @bp.route('') -@register_breadcrumb(bp, '.', 'Contributions') +@register_breadcrumb(bp, '.', 'new_labelContributions') @login_required def contributions(): return render_template( 'contributions/contributions.html.j2', title='Contributions' ) - - -############################################################################## -# /spacy-nlp-pipeline-models # -############################################################################## -@bp.route('/spacy-nlp-pipeline-models') -@register_breadcrumb(bp, '.spacy_nlp_pipeline_models', 'SpaCy NLP Pipeline Models') -@login_required -def spacy_nlp_pipeline_models(): - return render_template( - 'contributions/spacy_nlp_pipeline_models.html.j2', - title='SpaCy NLP Pipeline Models' - ) - - -@bp.route('/spacy-nlp-pipeline-models/create', methods=['GET', 'POST']) -@register_breadcrumb(bp, '.spacy_nlp_pipeline_models.create', 'Create') -@login_required -def create_spacy_nlp_pipeline_model(): - form_prefix = 'create-spacy-nlp-pipeline-model-form' - form = CreateSpaCyNLPPipelineModelForm(prefix=form_prefix) - if form.is_submitted(): - if not form.validate(): - return {'errors': form.errors}, 400 - try: - snpm = SpaCyNLPPipelineModel.create( - form.spacy_model_file.data, - compatible_service_versions=form.compatible_service_versions.data, - description=form.description.data, - pipeline_name=form.pipeline_name.data, - publisher=form.publisher.data, - publisher_url=form.publisher_url.data, - publishing_url=form.publishing_url.data, - publishing_year=form.publishing_year.data, - is_public=False, - title=form.title.data, - version=form.version.data, - user=current_user - ) - except OSError: - abort(500) - db.session.commit() - flash(f'SpaCy NLP Pipeline model "{snpm.title}" created') - return {}, 201, {'Location': url_for('.spacy_nlp_pipeline_models')} - return render_template( - 'contributions/create_spacy_nlp_pipeline_model.html.j2', - form=form, - title='Create SpaCy NLP Pipeline Model' - ) - - -def spacy_nlp_pipeline_model_dlc(*args, **kwargs): - snpm_id = request.view_args['spacy_nlp_pipeline_model_id'] - snpm = SpaCyNLPPipelineModel.query.get(snpm_id) - return [ - { - 'text': f'{snpm.title} {snpm.version}', - 'url': url_for('.spacy_nlp_pipeline_model', spacy_nlp_pipeline_model_id=snpm_id) - } - ] - - -@bp.route('/spacy-nlp-pipeline-models/', methods=['GET', 'POST']) -@register_breadcrumb(bp, '.spacy_nlp_pipeline_models.entity', '', dynamic_list_constructor=spacy_nlp_pipeline_model_dlc) -@login_required -def spacy_nlp_pipeline_model(spacy_nlp_pipeline_model_id): - snpm = SpaCyNLPPipelineModel.query.get_or_404(spacy_nlp_pipeline_model_id) - form_prefix = 'edit-spacy-nlp-pipeline-model-form' - form = EditSpaCyNLPPipelineModelForm( - data=snpm.to_json_serializeable(), - prefix=form_prefix - ) - if form.validate_on_submit(): - form.populate_obj(snpm) - if db.session.is_modified(snpm): - flash(f'SpaCy NLP Pipeline model "{snpm.title}" updated') - db.session.commit() - return redirect(url_for('.spacy_nlp_pipeline_models')) - return render_template( - 'contributions/spacy_nlp_pipeline_model.html.j2', - form=form, - spacy_nlp_pipeline_model=snpm, - title=f'{snpm.title} {snpm.version}' - ) - - -############################################################################## -# /tesseract-ocr-pipeline-models # -############################################################################## -@bp.route('/tesseract-ocr-pipeline-models') -@register_breadcrumb(bp, '.tesseract_ocr_pipeline_models', 'Tesseract OCR Pipeline Models') -@login_required -def tesseract_ocr_pipeline_models(): - return render_template( - 'contributions/tesseract_ocr_pipeline_models.html.j2', - title='Tesseract OCR Pipeline Models' - ) - - -@bp.route('/tesseract-ocr-pipeline-models/create', methods=['GET', 'POST']) -@register_breadcrumb(bp, '.tesseract_ocr_pipeline_models.create', 'Create') -@login_required -def create_tesseract_ocr_pipeline_model(): - form_prefix = 'create-tesseract-ocr-pipeline-model-form' - form = CreateTesseractOCRPipelineModelForm(prefix=form_prefix) - if form.is_submitted(): - if not form.validate(): - return {'errors': form.errors}, 400 - try: - topm = TesseractOCRPipelineModel.create( - form.tesseract_model_file.data, - compatible_service_versions=form.compatible_service_versions.data, - description=form.description.data, - publisher=form.publisher.data, - publisher_url=form.publisher_url.data, - publishing_url=form.publishing_url.data, - publishing_year=form.publishing_year.data, - is_public=False, - title=form.title.data, - version=form.version.data, - user=current_user - ) - except OSError: - abort(500) - db.session.commit() - flash(f'Tesseract OCR Pipeline model "{topm.title}" created') - return {}, 201, {'Location': url_for('.tesseract_ocr_pipeline_models')} - return render_template( - 'contributions/create_tesseract_ocr_pipeline_model.html.j2', - form=form, - title='Create Tesseract OCR Pipeline Model' - ) - - -def tesseract_ocr_pipeline_model_dlc(*args, **kwargs): - topm_id = request.view_args['tesseract_ocr_pipeline_model_id'] - topm = TesseractOCRPipelineModel.query.get(topm_id) - return [ - { - 'text': f'{topm.title} {topm.version}', - 'url': url_for('.tesseract_ocr_pipeline_model', tesseract_ocr_pipeline_model_id=topm_id) - } - ] - - -@bp.route('/tesseract-ocr-pipeline-models/', methods=['GET', 'POST']) -@register_breadcrumb(bp, '.tesseract_ocr_pipeline_models.entity', '', dynamic_list_constructor=tesseract_ocr_pipeline_model_dlc) -@login_required -def tesseract_ocr_pipeline_model(tesseract_ocr_pipeline_model_id): - topm = TesseractOCRPipelineModel.query.get_or_404(tesseract_ocr_pipeline_model_id) - form_prefix = 'edit-tesseract-ocr-pipeline-model-form' - form = EditTesseractOCRPipelineModelForm( - data=topm.to_json_serializeable(), - prefix=form_prefix - ) - if form.validate_on_submit(): - form.populate_obj(topm) - if db.session.is_modified(topm): - flash(f'Tesseract OCR Pipeline model "{topm.title}" updated') - db.session.commit() - return redirect(url_for('.tesseract_ocr_pipeline_models')) - return render_template( - 'contributions/tesseract_ocr_pipeline_model.html.j2', - form=form, - tesseract_ocr_pipeline_model=topm, - title=f'{topm.title} {topm.version}' - ) diff --git a/app/contributions/spacy_nlp_pipeline_models/__init__.py b/app/contributions/spacy_nlp_pipeline_models/__init__.py new file mode 100644 index 00000000..e06bada9 --- /dev/null +++ b/app/contributions/spacy_nlp_pipeline_models/__init__.py @@ -0,0 +1,2 @@ +from .. import bp +from . import json_routes, routes diff --git a/app/contributions/spacy_nlp_pipeline_models/forms.py b/app/contributions/spacy_nlp_pipeline_models/forms.py new file mode 100644 index 00000000..2670c1d1 --- /dev/null +++ b/app/contributions/spacy_nlp_pipeline_models/forms.py @@ -0,0 +1,44 @@ +from flask_wtf.file import FileField, FileRequired +from wtforms import StringField, ValidationError +from wtforms.validators import InputRequired, Length +from app.services import SERVICES +from ..forms import ContributionBaseForm, EditContributionBaseForm + + +class CreateSpaCyNLPPipelineModelForm(ContributionBaseForm): + spacy_model_file = FileField( + 'File', + validators=[FileRequired()] + ) + pipeline_name = StringField( + 'Pipeline name', + validators=[InputRequired(), Length(max=64)] + ) + + def validate_spacy_model_file(self, field): + if not field.data.filename.lower().endswith('.tar.gz'): + raise ValidationError('.tar.gz files only!') + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + service_manifest = SERVICES['spacy-nlp-pipeline'] + self.compatible_service_versions.choices = [('', 'Choose your option')] + self.compatible_service_versions.choices += [ + (x, x) for x in service_manifest['versions'].keys() + ] + self.compatible_service_versions.default = '' + + +class EditSpaCyNLPPipelineModelForm(EditContributionBaseForm): + pipeline_name = StringField( + 'Pipeline name', + validators=[InputRequired(), Length(max=64)] + ) + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + service_manifest = SERVICES['spacy-nlp-pipeline'] + self.compatible_service_versions.choices = [('', 'Choose your option')] + self.compatible_service_versions.choices += [ + (x, x) for x in service_manifest['versions'].keys() + ] + self.compatible_service_versions.default = '' diff --git a/app/contributions/spacy_nlp_pipeline_models/json_routes.py b/app/contributions/spacy_nlp_pipeline_models/json_routes.py new file mode 100644 index 00000000..af6c62d0 --- /dev/null +++ b/app/contributions/spacy_nlp_pipeline_models/json_routes.py @@ -0,0 +1,54 @@ +from flask import abort, current_app, request +from flask_login import login_required, current_user +from threading import Thread +from app import db +from app.decorators import content_negotiation, permission_required +from app.models import SpaCyNLPPipelineModel +from .. import bp + + +@bp.route('/spacy-nlp-pipeline-models', methods=['DELETE']) +@login_required +@content_negotiation(produces='application/json') +def delete_spacy_model(spacy_nlp_pipeline_model_id): + def _delete_spacy_model(app, spacy_nlp_pipeline_model_id): + with app.app_context(): + snpm = SpaCyNLPPipelineModel.query.get(spacy_nlp_pipeline_model_id) + snpm.delete() + db.session.commit() + + snpm = SpaCyNLPPipelineModel.query.get_or_404(spacy_nlp_pipeline_model_id) + if not (snpm.user == current_user or current_user.is_administrator()): + abort(403) + thread = Thread( + target=_delete_spacy_model, + args=(current_app._get_current_object(), snpm.id) + ) + thread.start() + resonse_data = { + 'message': \ + f'SpaCy NLP Pipeline Model "{snpm.title}" marked for deletion' + } + return resonse_data, 202 + + +@bp.route('/spacy-nlp-pipeline-models/is_public', methods=['PUT']) +@login_required +@permission_required('CONTRIBUTE') +@content_negotiation(consumes='application/json', produces='application/json') +def update_spacy_nlp_pipeline_model_is_public(spacy_nlp_pipeline_model_id): + is_public = request.json + if not isinstance(is_public, bool): + abort(400) + snpm = SpaCyNLPPipelineModel.query.get_or_404(spacy_nlp_pipeline_model_id) + if not (snpm.user == current_user or current_user.is_administrator()): + abort(403) + snpm.is_public = is_public + db.session.commit() + response_data = { + 'message': ( + f'SpaCy NLP Pipeline Model "{snpm.title}"' + f' is now {"public" if is_public else "private"}' + ) + } + return response_data, 200 diff --git a/app/contributions/spacy_nlp_pipeline_models/routes.py b/app/contributions/spacy_nlp_pipeline_models/routes.py new file mode 100644 index 00000000..7ed0797e --- /dev/null +++ b/app/contributions/spacy_nlp_pipeline_models/routes.py @@ -0,0 +1,83 @@ +from flask import abort, flash, redirect, render_template, url_for +from flask_breadcrumbs import register_breadcrumb +from flask_login import current_user, login_required +from app import db +from app.models import SpaCyNLPPipelineModel +from . import bp +from .forms import ( + CreateSpaCyNLPPipelineModelForm, + EditSpaCyNLPPipelineModelForm +) +from .utils import ( + spacy_nlp_pipeline_model_dlc as spacy_nlp_pipeline_model_dlc +) + + +@bp.route('/spacy-nlp-pipeline-models') +@register_breadcrumb(bp, '.spacy_nlp_pipeline_models', 'SpaCy NLP Pipeline Models') +@login_required +def spacy_nlp_pipeline_models(): + return render_template( + 'contributions/spacy_nlp_pipeline_models/spacy_nlp_pipeline_models.html.j2', + title='SpaCy NLP Pipeline Models' + ) + + +@bp.route('/spacy-nlp-pipeline-models/create', methods=['GET', 'POST']) +@register_breadcrumb(bp, '.spacy_nlp_pipeline_models.create', 'Create') +@login_required +def create_spacy_nlp_pipeline_model(): + form_prefix = 'create-spacy-nlp-pipeline-model-form' + form = CreateSpaCyNLPPipelineModelForm(prefix=form_prefix) + if form.is_submitted(): + if not form.validate(): + return {'errors': form.errors}, 400 + try: + snpm = SpaCyNLPPipelineModel.create( + form.spacy_model_file.data, + compatible_service_versions=form.compatible_service_versions.data, + description=form.description.data, + pipeline_name=form.pipeline_name.data, + publisher=form.publisher.data, + publisher_url=form.publisher_url.data, + publishing_url=form.publishing_url.data, + publishing_year=form.publishing_year.data, + is_public=False, + title=form.title.data, + version=form.version.data, + user=current_user + ) + except OSError: + abort(500) + db.session.commit() + flash(f'SpaCy NLP Pipeline model "{snpm.title}" created') + return {}, 201, {'Location': url_for('.spacy_nlp_pipeline_models')} + return render_template( + 'contributions/spacy_nlp_pipeline_models/create_spacy_nlp_pipeline_model.html.j2', + form=form, + title='Create SpaCy NLP Pipeline Model' + ) + + +@bp.route('/spacy-nlp-pipeline-models/', methods=['GET', 'POST']) +@register_breadcrumb(bp, '.spacy_nlp_pipeline_models.entity', '', dynamic_list_constructor=spacy_nlp_pipeline_model_dlc) +@login_required +def spacy_nlp_pipeline_model(spacy_nlp_pipeline_model_id): + snpm = SpaCyNLPPipelineModel.query.get_or_404(spacy_nlp_pipeline_model_id) + form_prefix = 'edit-spacy-nlp-pipeline-model-form' + form = EditSpaCyNLPPipelineModelForm( + data=snpm.to_json_serializeable(), + prefix=form_prefix + ) + if form.validate_on_submit(): + form.populate_obj(snpm) + if db.session.is_modified(snpm): + flash(f'SpaCy NLP Pipeline model "{snpm.title}" updated') + db.session.commit() + return redirect(url_for('.spacy_nlp_pipeline_models')) + return render_template( + 'contributions/spacy_nlp_pipeline_models/spacy_nlp_pipeline_model.html.j2', + form=form, + spacy_nlp_pipeline_model=snpm, + title=f'{snpm.title} {snpm.version}' + ) diff --git a/app/contributions/spacy_nlp_pipeline_models/utils.py b/app/contributions/spacy_nlp_pipeline_models/utils.py new file mode 100644 index 00000000..204bc56d --- /dev/null +++ b/app/contributions/spacy_nlp_pipeline_models/utils.py @@ -0,0 +1,13 @@ +from flask import request, url_for +from app.models import SpaCyNLPPipelineModel + + +def spacy_nlp_pipeline_model_dlc(): + snpm_id = request.view_args['spacy_nlp_pipeline_model_id'] + snpm = SpaCyNLPPipelineModel.query.get(snpm_id) + return [ + { + 'text': f'{snpm.title} {snpm.version}', + 'url': url_for('.spacy_nlp_pipeline_model', spacy_nlp_pipeline_model_id=snpm_id) + } + ] diff --git a/app/contributions/tesseract_ocr_pipeline_models/__init__.py b/app/contributions/tesseract_ocr_pipeline_models/__init__.py new file mode 100644 index 00000000..e06bada9 --- /dev/null +++ b/app/contributions/tesseract_ocr_pipeline_models/__init__.py @@ -0,0 +1,2 @@ +from .. import bp +from . import json_routes, routes diff --git a/app/contributions/tesseract_ocr_pipeline_models/forms.py b/app/contributions/tesseract_ocr_pipeline_models/forms.py new file mode 100644 index 00000000..51f0d76c --- /dev/null +++ b/app/contributions/tesseract_ocr_pipeline_models/forms.py @@ -0,0 +1,35 @@ +from flask_wtf.file import FileField, FileRequired +from wtforms import ValidationError +from app.services import SERVICES +from ..forms import ContributionBaseForm, EditContributionBaseForm + + +class CreateTesseractOCRPipelineModelForm(ContributionBaseForm): + tesseract_model_file = FileField( + 'File', + validators=[FileRequired()] + ) + + def validate_tesseract_model_file(self, field): + if not field.data.filename.lower().endswith('.traineddata'): + raise ValidationError('traineddata files only!') + + def __init__(self, *args, **kwargs): + service_manifest = SERVICES['tesseract-ocr-pipeline'] + super().__init__(*args, **kwargs) + self.compatible_service_versions.choices = [('', 'Choose your option')] + self.compatible_service_versions.choices += [ + (x, x) for x in service_manifest['versions'].keys() + ] + self.compatible_service_versions.default = '' + + +class EditTesseractOCRPipelineModelForm(EditContributionBaseForm): + def __init__(self, *args, **kwargs): + service_manifest = SERVICES['tesseract-ocr-pipeline'] + super().__init__(*args, **kwargs) + self.compatible_service_versions.choices = [('', 'Choose your option')] + self.compatible_service_versions.choices += [ + (x, x) for x in service_manifest['versions'].keys() + ] + self.compatible_service_versions.default = '' diff --git a/app/contributions/tesseract_ocr_pipeline_models/json_routes.py b/app/contributions/tesseract_ocr_pipeline_models/json_routes.py new file mode 100644 index 00000000..29a9f373 --- /dev/null +++ b/app/contributions/tesseract_ocr_pipeline_models/json_routes.py @@ -0,0 +1,54 @@ +from flask import abort, current_app, request +from flask_login import login_required, current_user +from threading import Thread +from app import db +from app.decorators import content_negotiation, permission_required +from app.models import TesseractOCRPipelineModel +from . import bp + + +@bp.route('/tesseract-ocr-pipeline-models/', methods=['DELETE']) +@login_required +@content_negotiation(produces='application/json') +def delete_tesseract_model(tesseract_ocr_pipeline_model_id): + def _delete_tesseract_ocr_pipeline_model(app, tesseract_ocr_pipeline_model_id): + with app.app_context(): + topm = TesseractOCRPipelineModel.query.get(tesseract_ocr_pipeline_model_id) + topm.delete() + db.session.commit() + + topm = TesseractOCRPipelineModel.query.get_or_404(tesseract_ocr_pipeline_model_id) + if not (topm.user == current_user or current_user.is_administrator()): + abort(403) + thread = Thread( + target=_delete_tesseract_ocr_pipeline_model, + args=(current_app._get_current_object(), topm.id) + ) + thread.start() + response_data = { + 'message': \ + f'Tesseract OCR Pipeline Model "{topm.title}" marked for deletion' + } + return response_data, 202 + + +@bp.route('/tesseract-ocr-pipeline-models//is_public', methods=['PUT']) +@login_required +@permission_required('CONTRIBUTE') +@content_negotiation(consumes='application/json', produces='application/json') +def update_tesseract_ocr_pipeline_model_is_public(tesseract_ocr_pipeline_model_id): + is_public = request.json + if not isinstance(is_public, bool): + abort(400) + topm = TesseractOCRPipelineModel.query.get_or_404(tesseract_ocr_pipeline_model_id) + if not (topm.user == current_user or current_user.is_administrator()): + abort(403) + topm.is_public = is_public + db.session.commit() + response_data = { + 'message': ( + f'Tesseract OCR Pipeline Model "{topm.title}"' + f' is now {"public" if is_public else "private"}' + ) + } + return response_data, 200 diff --git a/app/contributions/tesseract_ocr_pipeline_models/routes.py b/app/contributions/tesseract_ocr_pipeline_models/routes.py new file mode 100644 index 00000000..71f281ad --- /dev/null +++ b/app/contributions/tesseract_ocr_pipeline_models/routes.py @@ -0,0 +1,82 @@ +from flask import abort, flash, redirect, render_template, request, url_for +from flask_breadcrumbs import register_breadcrumb +from flask_login import current_user, login_required +from app import db +from app.models import TesseractOCRPipelineModel +from . import bp +from .forms import ( + CreateTesseractOCRPipelineModelForm, + EditTesseractOCRPipelineModelForm +) +from .utils import ( + tesseract_ocr_pipeline_model_dlc as tesseract_ocr_pipeline_model_dlc +) + + +@bp.route('/tesseract-ocr-pipeline-models') +@register_breadcrumb(bp, '.tesseract_ocr_pipeline_models', 'Tesseract OCR Pipeline Models') +@login_required +def tesseract_ocr_pipeline_models(): + return render_template( + 'contributions/tesseract_ocr_pipeline_models/tesseract_ocr_pipeline_models.html.j2', + title='Tesseract OCR Pipeline Models' + ) + + +@bp.route('/tesseract-ocr-pipeline-models/create', methods=['GET', 'POST']) +@register_breadcrumb(bp, '.tesseract_ocr_pipeline_models.create', 'Create') +@login_required +def create_tesseract_ocr_pipeline_model(): + form_prefix = 'create-tesseract-ocr-pipeline-model-form' + form = CreateTesseractOCRPipelineModelForm(prefix=form_prefix) + if form.is_submitted(): + if not form.validate(): + return {'errors': form.errors}, 400 + try: + topm = TesseractOCRPipelineModel.create( + form.tesseract_model_file.data, + compatible_service_versions=form.compatible_service_versions.data, + description=form.description.data, + publisher=form.publisher.data, + publisher_url=form.publisher_url.data, + publishing_url=form.publishing_url.data, + publishing_year=form.publishing_year.data, + is_public=False, + title=form.title.data, + version=form.version.data, + user=current_user + ) + except OSError: + abort(500) + db.session.commit() + flash(f'Tesseract OCR Pipeline model "{topm.title}" created') + return {}, 201, {'Location': url_for('.tesseract_ocr_pipeline_models')} + return render_template( + 'contributions/tesseract_ocr_pipeline_models/create_tesseract_ocr_pipeline_model.html.j2', + form=form, + title='Create Tesseract OCR Pipeline Model' + ) + + +@bp.route('/tesseract-ocr-pipeline-models/', methods=['GET', 'POST']) +@register_breadcrumb(bp, '.tesseract_ocr_pipeline_models.entity', '', dynamic_list_constructor=tesseract_ocr_pipeline_model_dlc) +@login_required +def tesseract_ocr_pipeline_model(tesseract_ocr_pipeline_model_id): + topm = TesseractOCRPipelineModel.query.get_or_404(tesseract_ocr_pipeline_model_id) + form_prefix = 'edit-tesseract-ocr-pipeline-model-form' + form = EditTesseractOCRPipelineModelForm( + data=topm.to_json_serializeable(), + prefix=form_prefix + ) + if form.validate_on_submit(): + form.populate_obj(topm) + if db.session.is_modified(topm): + flash(f'Tesseract OCR Pipeline model "{topm.title}" updated') + db.session.commit() + return redirect(url_for('.tesseract_ocr_pipeline_models')) + return render_template( + 'contributions/tesseract_ocr_pipeline_models/tesseract_ocr_pipeline_model.html.j2', + form=form, + tesseract_ocr_pipeline_model=topm, + title=f'{topm.title} {topm.version}' + ) diff --git a/app/contributions/tesseract_ocr_pipeline_models/utils.py b/app/contributions/tesseract_ocr_pipeline_models/utils.py new file mode 100644 index 00000000..d957f271 --- /dev/null +++ b/app/contributions/tesseract_ocr_pipeline_models/utils.py @@ -0,0 +1,13 @@ +from flask import request, url_for +from app.models import TesseractOCRPipelineModel + + +def tesseract_ocr_pipeline_model_dlc(): + topm_id = request.view_args['tesseract_ocr_pipeline_model_id'] + topm = TesseractOCRPipelineModel.query.get(topm_id) + return [ + { + 'text': f'{topm.title} {topm.version}', + 'url': url_for('.tesseract_ocr_pipeline_model', tesseract_ocr_pipeline_model_id=topm_id) + } + ] diff --git a/app/corpora/__init__.py b/app/corpora/__init__.py index f39ca22b..af734b0c 100644 --- a/app/corpora/__init__.py +++ b/app/corpora/__init__.py @@ -2,10 +2,6 @@ from flask import Blueprint bp = Blueprint('corpora', __name__) -from . import cqi_over_socketio, routes, json_routes # noqa - -from .files import bp as files_bp -bp.register_blueprint(files_bp, url_prefix='/files') - -from .followers import bp as followers_bp -bp.register_blueprint(followers_bp, url_prefix='/followers') +from . import cqi_over_socketio, routes, json_routes +from . import files +from . import followers diff --git a/app/corpora/files/__init__.py b/app/corpora/files/__init__.py index a52ff995..e06bada9 100644 --- a/app/corpora/files/__init__.py +++ b/app/corpora/files/__init__.py @@ -1,8 +1,2 @@ -from flask import Blueprint - - -template_base_dir = 'corpora/files' - - -bp = Blueprint('files', __name__) -from . import routes, json_routes +from .. import bp +from . import json_routes, routes diff --git a/app/corpora/files/json_routes.py b/app/corpora/files/json_routes.py index cddf4642..2e40775d 100644 --- a/app/corpora/files/json_routes.py +++ b/app/corpora/files/json_routes.py @@ -8,15 +8,7 @@ from ..decorators import corpus_follower_permission_required from . import bp -############################################################################## -# IMPORTANT NOTE: These routes are prefixed by the blueprint # -# Prefix: /files # -# This implies that the corpus_id is always in the kwargs of # -# a route that is registered to this blueprint. # -############################################################################## - - -@bp.route('/', methods=['DELETE']) +@bp.route('//files/', methods=['DELETE']) @login_required @corpus_follower_permission_required('REMOVE_CORPUS_FILE') @content_negotiation(produces='application/json') diff --git a/app/corpora/files/routes.py b/app/corpora/files/routes.py index 5ef4e0d0..0215e45e 100644 --- a/app/corpora/files/routes.py +++ b/app/corpora/files/routes.py @@ -1,29 +1,34 @@ from flask import ( abort, flash, - Markup, redirect, render_template, - send_from_directory + send_from_directory, + url_for ) -from flask_login import current_user, login_required +from flask_breadcrumbs import register_breadcrumb +from flask_login import login_required import os from app import db from app.models import Corpus, CorpusFile, CorpusStatus from ..decorators import corpus_follower_permission_required -from . import bp, template_base_dir +from ..utils import corpus_endpoint_arguments_constructor as corpus_eac +from . import bp from .forms import CreateCorpusFileForm, UpdateCorpusFileForm +from .utils import ( + corpus_file_dynamic_list_constructor as corpus_file_dlc +) -############################################################################## -# IMPORTANT NOTE: These routes are prefixed by the blueprint # -# Prefix: /files # -# This implies that the corpus_id is always in the kwargs of # -# a route that is registered to this blueprint. # -############################################################################## +@bp.route('//files') +@register_breadcrumb(bp, '.entity.files', 'Files', endpoint_arguments_constructor=corpus_eac) +@login_required +def corpus_files(corpus_id): + return redirect(url_for('.corpus', corpus_id=corpus_id, _anchor='files')) -@bp.route('/create', methods=['GET', 'POST']) +@bp.route('//files/create', methods=['GET', 'POST']) +@register_breadcrumb(bp, '.entity.files.create', 'Create', endpoint_arguments_constructor=corpus_eac) @login_required @corpus_follower_permission_required('ADD_CORPUS_FILE') def create_corpus_file(corpus_id): @@ -58,14 +63,15 @@ def create_corpus_file(corpus_id): flash(f'Corpus File "{corpus_file.filename}" added', category='corpus') return '', 201, {'Location': corpus.url} return render_template( - f'{template_base_dir}/create_corpus_file.html.j2', + 'corpora/files/create_corpus_file.html.j2', corpus=corpus, form=form, title='Add corpus file' ) -@bp.route('/', methods=['GET', 'POST']) +@bp.route('//files/', methods=['GET', 'POST']) +@register_breadcrumb(bp, '.entity.files.entity', '', dynamic_list_constructor=corpus_file_dlc) @login_required @corpus_follower_permission_required('UPDATE_CORPUS_FILE') def corpus_file(corpus_id, corpus_file_id): @@ -79,7 +85,7 @@ def corpus_file(corpus_id, corpus_file_id): flash(f'Corpus file "{corpus_file.filename}" updated', category='corpus') return redirect(corpus_file.corpus.url) return render_template( - f'{template_base_dir}/corpus_file.html.j2', + 'corpora/files/corpus_file.html.j2', corpus=corpus_file.corpus, corpus_file=corpus_file, form=form, @@ -87,7 +93,7 @@ def corpus_file(corpus_id, corpus_file_id): ) -@bp.route('//download') +@bp.route('//files//download') @login_required @corpus_follower_permission_required('VIEW') def download_corpus_file(corpus_id, corpus_file_id): diff --git a/app/corpora/files/utils.py b/app/corpora/files/utils.py new file mode 100644 index 00000000..2bb10285 --- /dev/null +++ b/app/corpora/files/utils.py @@ -0,0 +1,15 @@ +from flask import request, url_for +from app.models import CorpusFile +from ..utils import corpus_endpoint_arguments_constructor as corpus_eac + + +def corpus_file_dynamic_list_constructor(): + corpus_id = request.view_args['corpus_id'] + corpus_file_id = request.view_args['corpus_file_id'] + corpus_file = CorpusFile.query.filter_by(corpus_id=corpus_id, id=corpus_file_id).first_or_404() + return [ + { + 'text': f'{corpus_file.author}: {corpus_file.title} ({corpus_file.publishing_year})', + 'url': url_for('.corpus_file', corpus_id=corpus_id, corpus_file_id=corpus_file_id) + } + ] diff --git a/app/corpora/followers/__init__.py b/app/corpora/followers/__init__.py index e1e6d14e..1dbe44f0 100644 --- a/app/corpora/followers/__init__.py +++ b/app/corpora/followers/__init__.py @@ -1,5 +1,2 @@ -from flask import Blueprint - - -bp = Blueprint('followers', __name__) +from .. import bp from . import json_routes diff --git a/app/corpora/followers/json_routes.py b/app/corpora/followers/json_routes.py index 99071731..88fa81d2 100644 --- a/app/corpora/followers/json_routes.py +++ b/app/corpora/followers/json_routes.py @@ -12,15 +12,7 @@ from ..decorators import corpus_owner_or_admin_required from . import bp -############################################################################## -# IMPORTANT NOTE: These routes are prefixed by the blueprint # -# Prefix: /followers # -# This implies that the corpus_id is always in the kwargs of # -# a route that is registered to this blueprint. # -############################################################################## - - -@bp.route('', methods=['POST']) +@bp.route('//followers', methods=['POST']) @login_required @corpus_owner_or_admin_required @content_negotiation(consumes='application/json', produces='application/json') @@ -42,7 +34,7 @@ def create_corpus_followers(corpus_id): return response -@bp.route('//role', methods=['PUT']) +@bp.route('//followers//role', methods=['PUT']) @login_required @corpus_owner_or_admin_required @content_negotiation(consumes='application/json', produces='application/json') @@ -65,7 +57,7 @@ def update_corpus_follower_role(corpus_id, follower_id): return response -@bp.route('/', methods=['DELETE']) +@bp.route('//followers/', methods=['DELETE']) @login_required @content_negotiation(produces='application/json') def delete_corpus_follower(corpus_id, follower_id): diff --git a/app/corpora/routes.py b/app/corpora/routes.py index 92e454d5..ffdb375c 100644 --- a/app/corpora/routes.py +++ b/app/corpora/routes.py @@ -1,4 +1,5 @@ from flask import abort, flash, redirect, render_template, url_for +from flask_breadcrumbs import register_breadcrumb from flask_login import current_user, login_required from .decorators import corpus_follower_permission_required from app import db @@ -10,15 +11,21 @@ from app.models import ( ) from . import bp from .forms import CreateCorpusForm +from .utils import ( + corpus_endpoint_arguments_constructor as corpus_eac, + corpus_dynamic_list_constructor as corpus_dlc +) @bp.route('') +@register_breadcrumb(bp, '.', 'IMy Corpora') @login_required def corpora(): return redirect(url_for('main.dashboard', _anchor='corpora')) @bp.route('/create', methods=['GET', 'POST']) +@register_breadcrumb(bp, '.create', 'Create') @login_required def create_corpus(): form = CreateCorpusForm() @@ -42,6 +49,7 @@ def create_corpus(): @bp.route('/') +@register_breadcrumb(bp, '.entity', '', dynamic_list_constructor=corpus_dlc) @login_required def corpus(corpus_id): corpus = Corpus.query.get_or_404(corpus_id) @@ -54,7 +62,7 @@ def corpus(corpus_id): corpus=corpus, corpus_follower_roles=corpus_follower_roles, users = users, - title='Corpus' + title=corpus.title ) if current_user.is_following_corpus(corpus) or corpus.is_public: cfa = CorpusFollowerAssociation.query.filter_by(corpus_id=corpus_id, follower_id=current_user.id).first_or_404() @@ -66,12 +74,13 @@ def corpus(corpus_id): corpus_files=corpus_files, cfa=cfa, owner=owner, - title='Corpus', + title=corpus.title ) abort(403) @bp.route('//analyse') +@register_breadcrumb(bp, '.entity.analyse', 'Analyse', endpoint_arguments_constructor=corpus_eac) @login_required @corpus_follower_permission_required('VIEW') def analyse_corpus(corpus_id): @@ -95,12 +104,14 @@ def follow_corpus(corpus_id, token): @bp.route('/import', methods=['GET', 'POST']) +@register_breadcrumb(bp, '.import', 'Import') @login_required def import_corpus(): abort(503) @bp.route('//export') +@register_breadcrumb(bp, '.entity.export', 'Export', endpoint_arguments_constructor=corpus_eac) @login_required def export_corpus(corpus_id): abort(503) diff --git a/app/corpora/utils.py b/app/corpora/utils.py new file mode 100644 index 00000000..fd0e1c2a --- /dev/null +++ b/app/corpora/utils.py @@ -0,0 +1,17 @@ +from flask import request, url_for +from app.models import Corpus + + +def corpus_endpoint_arguments_constructor(): + return {'corpus_id': request.view_args['corpus_id']} + + +def corpus_dynamic_list_constructor(): + corpus_id = request.view_args['corpus_id'] + corpus = Corpus.query.get(corpus_id) + return [ + { + 'text': f'book{corpus.title}', + 'url': url_for('.corpus', corpus_id=corpus_id) + } + ] diff --git a/app/jobs/routes.py b/app/jobs/routes.py index f7848db9..0479cc5d 100644 --- a/app/jobs/routes.py +++ b/app/jobs/routes.py @@ -1,19 +1,27 @@ from flask import ( abort, - current_app, + redirect, render_template, - send_from_directory + send_from_directory, + url_for ) +from flask_breadcrumbs import register_breadcrumb from flask_login import current_user, login_required -from threading import Thread import os -from app import db -from app.decorators import admin_required -from app.models import Job, JobInput, JobResult, JobStatus +from app.models import Job, JobInput, JobResult from . import bp +from .utils import job_dynamic_list_constructor as job_dlc + + +@bp.route('') +@register_breadcrumb(bp, '.', 'JMy Jobs') +@login_required +def corpora(): + return redirect(url_for('main.dashboard', _anchor='jobs')) @bp.route('/') +@register_breadcrumb(bp, '.job', '', dynamic_list_constructor=job_dlc) @login_required def job(job_id): job = Job.query.get_or_404(job_id) diff --git a/app/jobs/utils.py b/app/jobs/utils.py new file mode 100644 index 00000000..8417af04 --- /dev/null +++ b/app/jobs/utils.py @@ -0,0 +1,13 @@ +from flask import request, url_for +from app.models import Job + + +def job_dynamic_list_constructor(): + job_id = request.view_args['job_id'] + job = Job.query.get(job_id) + return [ + { + 'text': f'{job.title}', + 'url': url_for('.job', job_id=job_id) + } + ] diff --git a/app/main/routes.py b/app/main/routes.py index 5399b5e9..a4b2ff2e 100644 --- a/app/main/routes.py +++ b/app/main/routes.py @@ -28,7 +28,7 @@ def faq(): @bp.route('/dashboard') -@register_breadcrumb(bp, '.dashboard', 'Dashboard') +@register_breadcrumb(bp, '.dashboard', 'dashboardDashboard') @login_required def dashboard(): return render_template('main/dashboard.html.j2', title='Dashboard') diff --git a/app/services/routes.py b/app/services/routes.py index 5d5a69a0..5a6ec7fd 100644 --- a/app/services/routes.py +++ b/app/services/routes.py @@ -27,7 +27,7 @@ def services(): @bp.route('/file-setup-pipeline', methods=['GET', 'POST']) -@register_breadcrumb(bp, '.file_setup_pipeline', 'File Setup') +@register_breadcrumb(bp, '.file_setup_pipeline', 'File Setup') @login_required def file_setup_pipeline(): service = 'file-setup-pipeline' @@ -69,7 +69,7 @@ def file_setup_pipeline(): @bp.route('/tesseract-ocr-pipeline', methods=['GET', 'POST']) -@register_breadcrumb(bp, '.tesseract_ocr_pipeline', 'Tesseract OCR Pipeline') +@register_breadcrumb(bp, '.tesseract_ocr_pipeline', 'Tesseract OCR Pipeline') @login_required def tesseract_ocr_pipeline(): service_name = 'tesseract-ocr-pipeline' @@ -119,7 +119,7 @@ def tesseract_ocr_pipeline(): @bp.route('/transkribus-htr-pipeline', methods=['GET', 'POST']) -@register_breadcrumb(bp, '.transkribus_htr_pipeline', 'Transkribus HTR Pipeline') +@register_breadcrumb(bp, '.transkribus_htr_pipeline', 'Transkribus HTR Pipeline') @login_required def transkribus_htr_pipeline(): if not current_app.config.get('NOPAQUE_TRANSKRIBUS_ENABLED'): @@ -179,7 +179,7 @@ def transkribus_htr_pipeline(): @bp.route('/spacy-nlp-pipeline', methods=['GET', 'POST']) -@register_breadcrumb(bp, '.spacy_nlp_pipeline', 'SpaCy NLP Pipeline') +@register_breadcrumb(bp, '.spacy_nlp_pipeline', 'SpaCy NLP Pipeline') @login_required def spacy_nlp_pipeline(): service = 'spacy-nlp-pipeline' @@ -225,7 +225,7 @@ def spacy_nlp_pipeline(): @bp.route('/corpus-analysis') -@register_breadcrumb(bp, '.corpus_analysis', 'Corpus Analysis') +@register_breadcrumb(bp, '.corpus_analysis', 'Corpus Analysis') @login_required def corpus_analysis(): return render_template( diff --git a/app/templates/_roadmap.html.j2 b/app/templates/_roadmap.html.j2 index 3b8ea308..50cc18cd 100644 --- a/app/templates/_roadmap.html.j2 +++ b/app/templates/_roadmap.html.j2 @@ -14,7 +14,7 @@
            • Create corpus
            • navigate_next
              • {% if corpus %} -
            • Create corpus file(s)
              • +
            • Create corpus file(s)
              • {% else %}
            • Create corpus file(s)
              • {% endif %} diff --git a/app/templates/contributions/contributions.html.j2 b/app/templates/contributions/contributions.html.j2 index a0944723..059dc9b2 100644 --- a/app/templates/contributions/contributions.html.j2 +++ b/app/templates/contributions/contributions.html.j2 @@ -12,7 +12,7 @@
              - Tesseract OCR Pipeline Models + Tesseract OCR Pipeline Models

              Here you can see and edit the models that you have created. You can also create new models.

              @@ -22,7 +22,7 @@
              - SpaCy NLP Pipeline Models + SpaCy NLP Pipeline Models

              Here you can see and edit the models that you have created. You can also create new models.

              @@ -33,7 +33,7 @@
              - Transkribus HTR Pipeline Models + Transkribus HTR Pipeline Models

              Here you can see and edit the models that you have created. You can also create new models.

              diff --git a/app/templates/contributions/create_spacy_nlp_pipeline_model.html.j2 b/app/templates/contributions/spacy_nlp_pipeline_models/create_spacy_nlp_pipeline_model.html.j2 similarity index 100% rename from app/templates/contributions/create_spacy_nlp_pipeline_model.html.j2 rename to app/templates/contributions/spacy_nlp_pipeline_models/create_spacy_nlp_pipeline_model.html.j2 diff --git a/app/templates/contributions/spacy_nlp_pipeline_model.html.j2 b/app/templates/contributions/spacy_nlp_pipeline_models/spacy_nlp_pipeline_model.html.j2 similarity index 100% rename from app/templates/contributions/spacy_nlp_pipeline_model.html.j2 rename to app/templates/contributions/spacy_nlp_pipeline_models/spacy_nlp_pipeline_model.html.j2 diff --git a/app/templates/contributions/spacy_nlp_pipeline_models.html.j2 b/app/templates/contributions/spacy_nlp_pipeline_models/spacy_nlp_pipeline_models.html.j2 similarity index 100% rename from app/templates/contributions/spacy_nlp_pipeline_models.html.j2 rename to app/templates/contributions/spacy_nlp_pipeline_models/spacy_nlp_pipeline_models.html.j2 diff --git a/app/templates/contributions/create_tesseract_ocr_pipeline_model.html.j2 b/app/templates/contributions/tesseract_ocr_pipeline_models/create_tesseract_ocr_pipeline_model.html.j2 similarity index 100% rename from app/templates/contributions/create_tesseract_ocr_pipeline_model.html.j2 rename to app/templates/contributions/tesseract_ocr_pipeline_models/create_tesseract_ocr_pipeline_model.html.j2 diff --git a/app/templates/contributions/tesseract_ocr_pipeline_model.html.j2 b/app/templates/contributions/tesseract_ocr_pipeline_models/tesseract_ocr_pipeline_model.html.j2 similarity index 100% rename from app/templates/contributions/tesseract_ocr_pipeline_model.html.j2 rename to app/templates/contributions/tesseract_ocr_pipeline_models/tesseract_ocr_pipeline_model.html.j2 diff --git a/app/templates/contributions/tesseract_ocr_pipeline_models.html.j2 b/app/templates/contributions/tesseract_ocr_pipeline_models/tesseract_ocr_pipeline_models.html.j2 similarity index 100% rename from app/templates/contributions/tesseract_ocr_pipeline_models.html.j2 rename to app/templates/contributions/tesseract_ocr_pipeline_models/tesseract_ocr_pipeline_models.html.j2 diff --git a/app/templates/corpora/corpus.html.j2 b/app/templates/corpora/corpus.html.j2 index f17e1e88..3ee805d1 100644 --- a/app/templates/corpora/corpus.html.j2 +++ b/app/templates/corpora/corpus.html.j2 @@ -90,7 +90,7 @@
              - addAdd corpus file + addAdd corpus file
              From a9767bf3c3148a8c9ee3365069c277721949739a Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Tue, 14 Mar 2023 11:44:15 +0100 Subject: [PATCH 066/177] Add breadcrumbs to users package --- app/__init__.py | 1 + .../spacy_nlp_pipeline_models/utils.py | 2 +- .../tesseract_ocr_pipeline_models/utils.py | 2 +- app/corpora/utils.py | 2 +- app/jobs/routes.py | 2 +- app/jobs/utils.py | 2 +- app/templates/main/social_area.html.j2 | 2 +- app/users/routes.py | 26 ++++++++++++------- app/users/utils.py | 17 ++++++++++++ 9 files changed, 41 insertions(+), 15 deletions(-) create mode 100644 app/users/utils.py diff --git a/app/__init__.py b/app/__init__.py index 4c2ef68e..318502f4 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -91,6 +91,7 @@ def create_app(config: Config = Config) -> Flask: app.register_blueprint(services_blueprint, url_prefix='/services') from .users import bp as users_blueprint + default_breadcrumb_root(users_blueprint, '.users') app.register_blueprint(users_blueprint, url_prefix='/users') return app diff --git a/app/contributions/spacy_nlp_pipeline_models/utils.py b/app/contributions/spacy_nlp_pipeline_models/utils.py index 204bc56d..e73bbfd6 100644 --- a/app/contributions/spacy_nlp_pipeline_models/utils.py +++ b/app/contributions/spacy_nlp_pipeline_models/utils.py @@ -4,7 +4,7 @@ from app.models import SpaCyNLPPipelineModel def spacy_nlp_pipeline_model_dlc(): snpm_id = request.view_args['spacy_nlp_pipeline_model_id'] - snpm = SpaCyNLPPipelineModel.query.get(snpm_id) + snpm = SpaCyNLPPipelineModel.query.get_or_404(snpm_id) return [ { 'text': f'{snpm.title} {snpm.version}', diff --git a/app/contributions/tesseract_ocr_pipeline_models/utils.py b/app/contributions/tesseract_ocr_pipeline_models/utils.py index d957f271..d0fcd758 100644 --- a/app/contributions/tesseract_ocr_pipeline_models/utils.py +++ b/app/contributions/tesseract_ocr_pipeline_models/utils.py @@ -4,7 +4,7 @@ from app.models import TesseractOCRPipelineModel def tesseract_ocr_pipeline_model_dlc(): topm_id = request.view_args['tesseract_ocr_pipeline_model_id'] - topm = TesseractOCRPipelineModel.query.get(topm_id) + topm = TesseractOCRPipelineModel.query.get_or_404(topm_id) return [ { 'text': f'{topm.title} {topm.version}', diff --git a/app/corpora/utils.py b/app/corpora/utils.py index fd0e1c2a..f5319dce 100644 --- a/app/corpora/utils.py +++ b/app/corpora/utils.py @@ -8,7 +8,7 @@ def corpus_endpoint_arguments_constructor(): def corpus_dynamic_list_constructor(): corpus_id = request.view_args['corpus_id'] - corpus = Corpus.query.get(corpus_id) + corpus = Corpus.query.get_or_404(corpus_id) return [ { 'text': f'book{corpus.title}', diff --git a/app/jobs/routes.py b/app/jobs/routes.py index 0479cc5d..2533e010 100644 --- a/app/jobs/routes.py +++ b/app/jobs/routes.py @@ -21,7 +21,7 @@ def corpora(): @bp.route('/') -@register_breadcrumb(bp, '.job', '', dynamic_list_constructor=job_dlc) +@register_breadcrumb(bp, '.entity', '', dynamic_list_constructor=job_dlc) @login_required def job(job_id): job = Job.query.get_or_404(job_id) diff --git a/app/jobs/utils.py b/app/jobs/utils.py index 8417af04..554db354 100644 --- a/app/jobs/utils.py +++ b/app/jobs/utils.py @@ -4,7 +4,7 @@ from app.models import Job def job_dynamic_list_constructor(): job_id = request.view_args['job_id'] - job = Job.query.get(job_id) + job = Job.query.get_or_404(job_id) return [ { 'text': f'{job.title}', diff --git a/app/templates/main/social_area.html.j2 b/app/templates/main/social_area.html.j2 index 8aaeecfa..fc101aad 100644 --- a/app/templates/main/social_area.html.j2 +++ b/app/templates/main/social_area.html.j2 @@ -36,7 +36,7 @@
              -

              Other Users

              +

              Other Users

              Find other users and see what corpora they have made public.

              diff --git a/app/users/routes.py b/app/users/routes.py index 82d37247..cd3f2ba4 100644 --- a/app/users/routes.py +++ b/app/users/routes.py @@ -1,16 +1,13 @@ -from datetime import datetime from flask import ( abort, - current_app, flash, - Markup, redirect, render_template, send_from_directory, url_for ) +from flask_breadcrumbs import register_breadcrumb from flask_login import current_user, login_required -from threading import Thread import os from app import db from app.models import Avatar, Corpus, ProfilePrivacySettings, User @@ -22,13 +19,21 @@ from .forms import ( EditProfileSettingsForm, EditPublicProfileInformationForm ) +from .utils import ( + user_endpoint_arguments_constructor as user_eac, + user_dynamic_list_constructor as user_dlc +) -@bp.before_request + +@bp.route('') +@register_breadcrumb(bp, '.', 'Users') @login_required -def before_request(): - pass +def users(): + return redirect(url_for('main.social_area', _anchor='users')) + @bp.route('/') +@register_breadcrumb(bp, '.entity', '', dynamic_list_constructor=user_dlc) @login_required def user(user_id): user = User.query.get_or_404(user_id) @@ -50,12 +55,13 @@ def user(user_id): member_since=member_since, own_public_corpora=own_public_corpora, user=user.to_json_serializeable(), - user_id=user_id + user_id=user_id, + title=user.username ) - @bp.route('//avatar') +@login_required def profile_avatar(user_id): user = User.query.get_or_404(user_id) if user.avatar is None: @@ -72,6 +78,8 @@ def profile_avatar(user_id): @bp.route('//edit', methods=['GET', 'POST']) +@register_breadcrumb(bp, '.entity.edit', 'Edit', endpoint_arguments_constructor=user_eac) +@login_required def edit_profile(user_id): user = User.query.get_or_404(user_id) if not (user == current_user or current_user.is_administrator()): diff --git a/app/users/utils.py b/app/users/utils.py new file mode 100644 index 00000000..e352fe5c --- /dev/null +++ b/app/users/utils.py @@ -0,0 +1,17 @@ +from flask import request, url_for +from app.models import User + + +def user_endpoint_arguments_constructor(): + return {'user_id': request.view_args['user_id']} + + +def user_dynamic_list_constructor(): + user_id = request.view_args['user_id'] + user = User.query.get_or_404(user_id) + return [ + { + 'text': user.username, + 'url': url_for('.user', user_id=user_id) + } + ] From 8aebe27aa8f8aefa136a4100bb7c383d625e5764 Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Tue, 14 Mar 2023 11:58:06 +0100 Subject: [PATCH 067/177] Fix wrong route decorator --- app/contributions/spacy_nlp_pipeline_models/json_routes.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/contributions/spacy_nlp_pipeline_models/json_routes.py b/app/contributions/spacy_nlp_pipeline_models/json_routes.py index af6c62d0..9d05b165 100644 --- a/app/contributions/spacy_nlp_pipeline_models/json_routes.py +++ b/app/contributions/spacy_nlp_pipeline_models/json_routes.py @@ -7,7 +7,7 @@ from app.models import SpaCyNLPPipelineModel from .. import bp -@bp.route('/spacy-nlp-pipeline-models', methods=['DELETE']) +@bp.route('/spacy-nlp-pipeline-models/', methods=['DELETE']) @login_required @content_negotiation(produces='application/json') def delete_spacy_model(spacy_nlp_pipeline_model_id): @@ -32,7 +32,7 @@ def delete_spacy_model(spacy_nlp_pipeline_model_id): return resonse_data, 202 -@bp.route('/spacy-nlp-pipeline-models/is_public', methods=['PUT']) +@bp.route('/spacy-nlp-pipeline-models//is_public', methods=['PUT']) @login_required @permission_required('CONTRIBUTE') @content_negotiation(consumes='application/json', produces='application/json') From 8dba78c474805d1f6de4f490e42ca30979a0c371 Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Tue, 14 Mar 2023 12:12:05 +0100 Subject: [PATCH 068/177] Return default user avatar if not set --- app/users/routes.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/users/routes.py b/app/users/routes.py index cd3f2ba4..64dca884 100644 --- a/app/users/routes.py +++ b/app/users/routes.py @@ -65,7 +65,7 @@ def user(user_id): def profile_avatar(user_id): user = User.query.get_or_404(user_id) if user.avatar is None: - abort(404) + return redirect(url_for('static', filename='images/default_avatar.png')) if not user.is_public and not (user == current_user or current_user.is_administrator()): abort(403) return send_from_directory( From b8e63d2342d104a7ac5177297f42eca6f60d55b1 Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Tue, 14 Mar 2023 12:20:29 +0100 Subject: [PATCH 069/177] Add Icons for users breadcrumbs --- app/users/routes.py | 2 +- app/users/utils.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/users/routes.py b/app/users/routes.py index 64dca884..a69fa503 100644 --- a/app/users/routes.py +++ b/app/users/routes.py @@ -26,7 +26,7 @@ from .utils import ( @bp.route('') -@register_breadcrumb(bp, '.', 'Users') +@register_breadcrumb(bp, '.', 'groupUsers') @login_required def users(): return redirect(url_for('main.social_area', _anchor='users')) diff --git a/app/users/utils.py b/app/users/utils.py index e352fe5c..1c4ab7a8 100644 --- a/app/users/utils.py +++ b/app/users/utils.py @@ -11,7 +11,7 @@ def user_dynamic_list_constructor(): user = User.query.get_or_404(user_id) return [ { - 'text': user.username, + 'text': f'account_circle{user.username}', 'url': url_for('.user', user_id=user_id) } ] From c14abf52005a264108e0df6abb40b2388f26a7ef Mon Sep 17 00:00:00 2001 From: Inga Kirschnick Date: Tue, 14 Mar 2023 13:32:32 +0100 Subject: [PATCH 070/177] Javascript Changes users --- app/templates/users/edit_profile.html.j2 | 48 ++++++++++++++++++++++++ app/templates/users/edit_profile.js.j2 | 41 -------------------- app/templates/users/profile.html.j2 | 15 +++++++- app/templates/users/profile.js.j2 | 19 ---------- 4 files changed, 62 insertions(+), 61 deletions(-) delete mode 100644 app/templates/users/edit_profile.js.j2 delete mode 100644 app/templates/users/profile.js.j2 diff --git a/app/templates/users/edit_profile.html.j2 b/app/templates/users/edit_profile.html.j2 index 5861a969..d28f6682 100644 --- a/app/templates/users/edit_profile.html.j2 +++ b/app/templates/users/edit_profile.html.j2 @@ -14,6 +14,7 @@
              + User Settings
              {{ edit_profile_settings_form.hidden_tag() }} @@ -190,3 +191,50 @@
              {% endblock modals %} + +{% block scripts %} +{{ super() }} + +{% endblock scripts %} diff --git a/app/templates/users/edit_profile.js.j2 b/app/templates/users/edit_profile.js.j2 deleted file mode 100644 index a56effae..00000000 --- a/app/templates/users/edit_profile.js.j2 +++ /dev/null @@ -1,41 +0,0 @@ -let publicProfile = document.querySelector('#public-profile'); -let disableButtons = document.querySelectorAll('[data-action="disable"]'); -let deleteButton = document.querySelector('#delete-avatar'); -let avatar = document.querySelector('#avatar'); -let avatarUpload = document.querySelector('#avatar-upload'); - -for (let disableButton of disableButtons) { - disableButton.disabled = !publicProfile.checked; -} - -publicProfile.addEventListener('change', () => { - if (publicProfile.checked) { - for (let disableButton of disableButtons) { - disableButton.disabled = false; - } - } else { - for (let disableButton of disableButtons) { - disableButton.checked = false; - disableButton.disabled = true; - } - } -}); - -avatarUpload.addEventListener('change', function() { - let file = this.files[0]; - avatar.src = URL.createObjectURL(file); -}); - -deleteButton.addEventListener('click', () => { - Requests.users.entity.deleteAvatar({{ user.hashid|tojson }}) - .then( - (response) => { - avatar.src = "{{ url_for('static', filename='images/user_avatar.png') }}"; - } - ); -}); - -document.querySelector('#delete-user-button').addEventListener('click', (event) => { - Requests.users.entity.delete(currentUserId) - .then((response) => {window.location.href = '/';}); -}); diff --git a/app/templates/users/profile.html.j2 b/app/templates/users/profile.html.j2 index e73a3b7a..7d67a11b 100644 --- a/app/templates/users/profile.html.j2 +++ b/app/templates/users/profile.html.j2 @@ -22,7 +22,11 @@
              -

              {{ user.username }}

              + {% if user.is_public %} +

              {{ user.username }}

              + {% else %} +

              {{ user.username }}

              + {% endif %}
              {% if user.show_last_seen %} @@ -111,3 +115,12 @@
              {% endblock page_content %} +{% block scripts %} +{{ super() }} + +{% endblock scripts %} diff --git a/app/templates/users/profile.js.j2 b/app/templates/users/profile.js.j2 deleted file mode 100644 index 5f729f18..00000000 --- a/app/templates/users/profile.js.j2 +++ /dev/null @@ -1,19 +0,0 @@ -let publicInformationBadge = document.querySelector('#public-information-badge'); -if ("{{ user.id }}" == "{{ current_user.hashid }}") { - if ("{{ user.is_public }}" == "True") { - publicInformationBadge.dataset.badgeCaption = 'Your profile is public'; - publicInformationBadge.classList.add('green'); - publicInformationBadge.classList.remove('red'); - } else { - publicInformationBadge.dataset.badgeCaption = 'Your profile is private'; - publicInformationBadge.classList.add('red'); - publicInformationBadge.classList.remove('green'); - } -} else { - publicInformationBadge.remove(); -} - -let followedCorpusList = new FollowedCorpusList(document.querySelector('.followed-corpus-list')); -followedCorpusList.add({{ followed_corpora|tojson }}); -let publicCorpusList = new PublicCorpusList(document.querySelector('.public-corpus-list')); -publicCorpusList.add({{ own_public_corpora|tojson }}); From f1be57e5094ffc604faeb6d6d976a3b128ab548d Mon Sep 17 00:00:00 2001 From: Inga Kirschnick Date: Tue, 14 Mar 2023 14:21:23 +0100 Subject: [PATCH 071/177] Avatar condition and breadcrumb update --- app/main/routes.py | 6 +++--- app/templates/users/edit_profile.html.j2 | 4 ---- app/templates/users/profile.html.j2 | 4 ---- app/users/routes.py | 6 +++--- app/users/utils.py | 2 +- 5 files changed, 7 insertions(+), 15 deletions(-) diff --git a/app/main/routes.py b/app/main/routes.py index a4b2ff2e..65a237e9 100644 --- a/app/main/routes.py +++ b/app/main/routes.py @@ -35,13 +35,13 @@ def dashboard(): @bp.route('/user_manual') -@register_breadcrumb(bp, '.user_manual', 'User manual') +@register_breadcrumb(bp, '.user_manual', 'helpUser manual') def user_manual(): return render_template('main/user_manual.html.j2', title='User manual') @bp.route('/news') -@register_breadcrumb(bp, '.news', 'News') +@register_breadcrumb(bp, '.news', 'emailNews') def news(): return render_template('main/news.html.j2', title='News') @@ -59,7 +59,7 @@ def terms_of_use(): @bp.route('/social-area') -@register_breadcrumb(bp, '.social_area', 'Social Area') +@register_breadcrumb(bp, '.social_area', 'groupSocial Area') def social_area(): users = [ u.to_json_serializeable(relationships=True, filter_by_privacy_settings=True,) for u diff --git a/app/templates/users/edit_profile.html.j2 b/app/templates/users/edit_profile.html.j2 index d28f6682..88eb8fb5 100644 --- a/app/templates/users/edit_profile.html.j2 +++ b/app/templates/users/edit_profile.html.j2 @@ -70,11 +70,7 @@
              - {% if user.avatar %} user-image - {% else %} - user-image - {% endif %}
              diff --git a/app/templates/users/profile.html.j2 b/app/templates/users/profile.html.j2 index 7d67a11b..31c12359 100644 --- a/app/templates/users/profile.html.j2 +++ b/app/templates/users/profile.html.j2 @@ -12,11 +12,7 @@


              - {% if user.avatar %} user-image - {% else %} - user-image - {% endif %}
              diff --git a/app/users/routes.py b/app/users/routes.py index a69fa503..21e2ff02 100644 --- a/app/users/routes.py +++ b/app/users/routes.py @@ -26,7 +26,7 @@ from .utils import ( @bp.route('') -@register_breadcrumb(bp, '.', 'groupUsers') +@register_breadcrumb(bp, '.', 'groupSocial Area') @login_required def users(): return redirect(url_for('main.social_area', _anchor='users')) @@ -65,7 +65,7 @@ def user(user_id): def profile_avatar(user_id): user = User.query.get_or_404(user_id) if user.avatar is None: - return redirect(url_for('static', filename='images/default_avatar.png')) + return redirect(url_for('static', filename='images/user_avatar.png')) if not user.is_public and not (user == current_user or current_user.is_administrator()): abort(403) return send_from_directory( @@ -78,7 +78,7 @@ def profile_avatar(user_id): @bp.route('//edit', methods=['GET', 'POST']) -@register_breadcrumb(bp, '.entity.edit', 'Edit', endpoint_arguments_constructor=user_eac) +@register_breadcrumb(bp, '.entity.edit', 'settingsEdit', endpoint_arguments_constructor=user_eac) @login_required def edit_profile(user_id): user = User.query.get_or_404(user_id) diff --git a/app/users/utils.py b/app/users/utils.py index 1c4ab7a8..5c1ca83e 100644 --- a/app/users/utils.py +++ b/app/users/utils.py @@ -11,7 +11,7 @@ def user_dynamic_list_constructor(): user = User.query.get_or_404(user_id) return [ { - 'text': f'account_circle{user.username}', + 'text': f'person{user.username}', 'url': url_for('.user', user_id=user_id) } ] From 2efc9533ec6263a757a6f2f7e4778ed5ee120eaf Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Tue, 14 Mar 2023 14:24:52 +0100 Subject: [PATCH 072/177] Add breadcrumbs to admin package --- app/__init__.py | 1 + app/admin/__init__.py | 17 ++++++++++++++- app/admin/json_routes.py | 22 +++++++++++++++++++ app/admin/routes.py | 46 ++++++++++------------------------------ 4 files changed, 50 insertions(+), 36 deletions(-) create mode 100644 app/admin/json_routes.py diff --git a/app/__init__.py b/app/__init__.py index 318502f4..bc2243cf 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -61,6 +61,7 @@ def create_app(config: Config = Config) -> Flask: init_error_handlers(app) from .admin import bp as admin_blueprint + default_breadcrumb_root(admin_blueprint, '.admin') app.register_blueprint(admin_blueprint, url_prefix='/admin') from .api import bp as api_blueprint diff --git a/app/admin/__init__.py b/app/admin/__init__.py index b5936b4c..be000a9a 100644 --- a/app/admin/__init__.py +++ b/app/admin/__init__.py @@ -1,5 +1,20 @@ from flask import Blueprint +from flask_login import login_required +from app.decorators import admin_required bp = Blueprint('admin', __name__) -from . import routes + + +@bp.before_request +@login_required +@admin_required +def before_request(): + ''' + Ensures that the routes in this package can be visited only by users with + administrator privileges (login_required and admin_required). + ''' + pass + + +from . import json_routes, routes diff --git a/app/admin/json_routes.py b/app/admin/json_routes.py new file mode 100644 index 00000000..d8b45425 --- /dev/null +++ b/app/admin/json_routes.py @@ -0,0 +1,22 @@ +from flask import current_app +from threading import Thread +from app import db +from app.models import User +from . import bp + + +@bp.route('/users//delete', methods=['DELETE']) +def delete_user(user_id): + def _delete_user(app, user_id): + with app.app_context(): + user = User.query.get(user_id) + user.delete() + db.session.commit() + + User.query.get_or_404(user_id) + thread = Thread( + target=_delete_user, + args=(current_app._get_current_object(), user_id) + ) + thread.start() + return {}, 202 diff --git a/app/admin/routes.py b/app/admin/routes.py index 95ce7730..15ff0d9f 100644 --- a/app/admin/routes.py +++ b/app/admin/routes.py @@ -1,34 +1,25 @@ -from flask import current_app, flash, redirect, render_template, url_for -from flask_login import login_required -from threading import Thread +from flask import flash, redirect, render_template, url_for +from flask_breadcrumbs import register_breadcrumb from app import db, hashids -from app.decorators import admin_required from app.models import Role, User, UserSettingJobStatusMailNotificationLevel -from app.users.forms import ( - EditNotificationSettingsForm -) +from app.users.forms import EditNotificationSettingsForm from app.users.forms import EditProfileSettingsForm from . import bp from .forms import AdminEditUserForm - - -@bp.before_request -@login_required -@admin_required -def before_request(): - ''' - Ensures that the routes in this package can be visited only by users with - administrator privileges (login_required and admin_required). - ''' - pass +from app.users.utils import ( + user_endpoint_arguments_constructor as user_eac, + user_dynamic_list_constructor as user_dlc +) @bp.route('') +@register_breadcrumb(bp, '.', 'admin_panel_settingsAdministration') def index(): return redirect(url_for('.users')) @bp.route('/users') +@register_breadcrumb(bp, '.users', 'groupUsers') def users(): users = [x.to_json_serializeable(backrefs=True) for x in User.query.all()] return render_template( @@ -39,12 +30,14 @@ def users(): @bp.route('/users/') +@register_breadcrumb(bp, '.users.entity', '', dynamic_list_constructor=user_dlc) def user(user_id): user = User.query.get_or_404(user_id) return render_template('admin/user.html.j2', title='User', user=user) @bp.route('/users//edit', methods=['GET', 'POST']) +@register_breadcrumb(bp, '.users.entity.edit', 'Edit', endpoint_arguments_constructor=user_eac) def edit_user(user_id): user = User.query.get_or_404(user_id) admin_edit_user_form = AdminEditUserForm( @@ -92,20 +85,3 @@ def edit_user(user_id): title='Edit user', user=user ) - - -@bp.route('/users//delete', methods=['DELETE']) -def delete_user(user_id): - def _delete_user(app, user_id): - with app.app_context(): - user = User.query.get(user_id) - user.delete() - db.session.commit() - - User.query.get_or_404(user_id) - thread = Thread( - target=_delete_user, - args=(current_app._get_current_object(), user_id) - ) - thread.start() - return {}, 202 From 4c97929b1b12e194ca0c39993717a5640bbea2e7 Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Tue, 14 Mar 2023 14:25:05 +0100 Subject: [PATCH 073/177] Move contributions to dashboard --- app/contributions/__init__.py | 1 + app/contributions/routes.py | 7 +-- .../__init__.py | 2 + .../transkribus_htr_pipeline_models/routes.py | 9 ++++ app/templates/_sidenav.html.j2 | 2 +- .../contributions/contributions.html.j2 | 44 ------------------- app/templates/main/dashboard.html.j2 | 33 ++++++++++++++ 7 files changed, 48 insertions(+), 50 deletions(-) create mode 100644 app/contributions/transkribus_htr_pipeline_models/__init__.py create mode 100644 app/contributions/transkribus_htr_pipeline_models/routes.py delete mode 100644 app/templates/contributions/contributions.html.j2 diff --git a/app/contributions/__init__.py b/app/contributions/__init__.py index 22f3e514..478631f9 100644 --- a/app/contributions/__init__.py +++ b/app/contributions/__init__.py @@ -5,3 +5,4 @@ bp = Blueprint('contributions', __name__) from . import routes from . import spacy_nlp_pipeline_models from . import tesseract_ocr_pipeline_models +from . import transkribus_htr_pipeline_models diff --git a/app/contributions/routes.py b/app/contributions/routes.py index dacf5b62..8c3b93a2 100644 --- a/app/contributions/routes.py +++ b/app/contributions/routes.py @@ -1,4 +1,4 @@ -from flask import render_template +from flask import redirect, url_for from flask_breadcrumbs import register_breadcrumb from flask_login import login_required from . import bp @@ -8,7 +8,4 @@ from . import bp @register_breadcrumb(bp, '.', 'new_labelContributions') @login_required def contributions(): - return render_template( - 'contributions/contributions.html.j2', - title='Contributions' - ) + return redirect(url_for('main.dashboard', _anchor='contributions')) diff --git a/app/contributions/transkribus_htr_pipeline_models/__init__.py b/app/contributions/transkribus_htr_pipeline_models/__init__.py new file mode 100644 index 00000000..e91268cf --- /dev/null +++ b/app/contributions/transkribus_htr_pipeline_models/__init__.py @@ -0,0 +1,2 @@ +from .. import bp +from . import routes diff --git a/app/contributions/transkribus_htr_pipeline_models/routes.py b/app/contributions/transkribus_htr_pipeline_models/routes.py new file mode 100644 index 00000000..317ff9b9 --- /dev/null +++ b/app/contributions/transkribus_htr_pipeline_models/routes.py @@ -0,0 +1,9 @@ +from flask import abort +from flask_login import login_required +from . import bp + + +@bp.route('/transkribus_htr_pipeline_models') +@login_required +def transkribus_htr_pipeline_models(): + return abort(503) diff --git a/app/templates/_sidenav.html.j2 b/app/templates/_sidenav.html.j2 index 3c891591..5ee67954 100644 --- a/app/templates/_sidenav.html.j2 +++ b/app/templates/_sidenav.html.j2 @@ -25,7 +25,7 @@
            • dashboardDashboard
            • IMy Corpora
            • JMy Jobs
              • -
            • new_labelContribute
              • +
            • new_labelMy Contributions
            • Processes & Services
              • diff --git a/app/templates/contributions/contributions.html.j2 b/app/templates/contributions/contributions.html.j2 deleted file mode 100644 index 059dc9b2..00000000 --- a/app/templates/contributions/contributions.html.j2 +++ /dev/null @@ -1,44 +0,0 @@ -{% extends "base.html.j2" %} -{% import "materialize/wtf.html.j2" as wtf %} - -{% block page_content %} -
              -
              -
              -

              {{ title }}

              -
              - -
              -
              - -
              - Tesseract OCR Pipeline Models -

              Here you can see and edit the models that you have created. You can also create new models.

              -
              -
              -
              - -
              -
              - -
              - SpaCy NLP Pipeline Models -

              Here you can see and edit the models that you have created. You can also create new models.

              -
              -
              -
              - - -
              -
              -{% endblock page_content %} diff --git a/app/templates/main/dashboard.html.j2 b/app/templates/main/dashboard.html.j2 index 1598e139..0b8e6f31 100644 --- a/app/templates/main/dashboard.html.j2 +++ b/app/templates/main/dashboard.html.j2 @@ -41,6 +41,39 @@
              + +
              +

              My Contributions

              +
              +
              + +
              + Tesseract OCR Pipeline Models +

              Here you can see and edit the models that you have created. You can also create new models.

              +
              +
              +
              + +
              +
              + +
              + SpaCy NLP Pipeline Models +

              Here you can see and edit the models that you have created. You can also create new models.

              +
              +
              +
              + +
              +
              + +
              + Transkribus HTR Pipeline Models +

              Here you can see and edit the models that you have created. You can also create new models.

              +
              +
              +
              +
              {% endblock page_content %} From 0520caeddd9134e6b69496044e15f13a7ea27d4e Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Tue, 14 Mar 2023 14:27:41 +0100 Subject: [PATCH 074/177] fix --- app/__init__.py | 2 +- app/contributions/routes.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index bc2243cf..076b006a 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -72,7 +72,7 @@ def create_app(config: Config = Config) -> Flask: app.register_blueprint(auth_blueprint, url_prefix='/') from .contributions import bp as contributions_blueprint - default_breadcrumb_root(contributions_blueprint, '.contributions') + default_breadcrumb_root(contributions_blueprint, '.dashboard.contributions') app.register_blueprint(contributions_blueprint, url_prefix='/contributions') from .corpora import bp as corpora_blueprint diff --git a/app/contributions/routes.py b/app/contributions/routes.py index 8c3b93a2..4bdc5cc7 100644 --- a/app/contributions/routes.py +++ b/app/contributions/routes.py @@ -5,7 +5,7 @@ from . import bp @bp.route('') -@register_breadcrumb(bp, '.', 'new_labelContributions') +@register_breadcrumb(bp, '.', 'new_labelMy Contributions') @login_required def contributions(): return redirect(url_for('main.dashboard', _anchor='contributions')) From fac6ba11ed659c3c97410b227374de4a1e007dce Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Tue, 14 Mar 2023 15:41:23 +0100 Subject: [PATCH 075/177] Move settings --- app/users/routes.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/users/routes.py b/app/users/routes.py index 21e2ff02..5431dfd0 100644 --- a/app/users/routes.py +++ b/app/users/routes.py @@ -78,7 +78,7 @@ def profile_avatar(user_id): @bp.route('//edit', methods=['GET', 'POST']) -@register_breadcrumb(bp, '.entity.edit', 'settingsEdit', endpoint_arguments_constructor=user_eac) +@register_breadcrumb(bp, 'breadcrumbs.settings', 'settingsSettings', endpoint_arguments_constructor=user_eac) @login_required def edit_profile(user_id): user = User.query.get_or_404(user_id) @@ -172,5 +172,5 @@ def edit_profile(user_id): change_password_form=change_password_form, edit_notification_settings_form=edit_notification_settings_form, user=user, - title='Edit Profile' + title='Settings' ) From 464ae8ecc35d4bd4ea55c802b74058c06e10a2d5 Mon Sep 17 00:00:00 2001 From: Inga Kirschnick Date: Wed, 15 Mar 2023 09:18:11 +0100 Subject: [PATCH 076/177] New user Settings page --- app/templates/users/edit_profile.html.j2 | 299 +++++++++++------------ app/users/forms.py | 4 +- app/users/routes.py | 2 +- 3 files changed, 152 insertions(+), 153 deletions(-) diff --git a/app/templates/users/edit_profile.html.j2 b/app/templates/users/edit_profile.html.j2 index 88eb8fb5..3636da42 100644 --- a/app/templates/users/edit_profile.html.j2 +++ b/app/templates/users/edit_profile.html.j2 @@ -2,163 +2,160 @@ {% import "materialize/wtf.html.j2" as wtf %} {% block page_content %} -
              +

              {{ title }}

              -
              -
              - -
              - -
              - User Settings -
              -
              - {{ edit_profile_settings_form.hidden_tag() }} - {{ wtf.render_field(edit_profile_settings_form.username, material_icon='person') }} - {{ wtf.render_field(edit_profile_settings_form.email, material_icon='email') }} -
              -
              -
              -
              -
              - {{ wtf.render_field(edit_profile_settings_form.submit, material_icon='send') }} -
              -
              - -
              - -
              - {{ edit_privacy_settings_form.hidden_tag() }} -
              -
              - Privacy settings -
              - {{ wtf.render_field(edit_privacy_settings_form.is_public, id='public-profile') }} -
              -
              -
              - {{ wtf.render_field(edit_privacy_settings_form.show_email, data_action='disable', disabled=true) }} -
              - {{ wtf.render_field(edit_privacy_settings_form.show_last_seen, data_action='disable', disabled=true) }} -
              - {{ wtf.render_field(edit_privacy_settings_form.show_member_since, data_action='disable', disabled=true) }} -
              -
              -
              -
              - {{ wtf.render_field(edit_privacy_settings_form.submit, material_icon='send') }} -
              -
              -
              -
              - -
              -
              -
              - {{ edit_public_profile_information_form.hidden_tag() }} -
              -
              - Public Profile -
              -
              -
              -
              -
              -
              -
              - user-image -
              -
              -
              -
              -
              -
              - delete -
              -
              -
              - {{ wtf.render_field(edit_public_profile_information_form.avatar, accept='image/jpeg, image/png, image/gif', placeholder='Choose an image file', id='avatar-upload') }} -
              -
              -
              -
              -

              -
              - {{ wtf.render_field(edit_public_profile_information_form.full_name, material_icon='badge') }} - {{ wtf.render_field(edit_public_profile_information_form.about_me, material_icon='description') }} - {{ wtf.render_field(edit_public_profile_information_form.website, material_icon='laptop') }} - {{ wtf.render_field(edit_public_profile_information_form.organization, material_icon='business') }} - {{ wtf.render_field(edit_public_profile_information_form.location, material_icon='location_on') }} -
              -
              -
              -
              -
              - {{ wtf.render_field(edit_public_profile_information_form.submit, material_icon='send') }} -
              -
              -
              -
              - -
              - {{ edit_notification_settings_form.hidden_tag() }} -
              -
              - Notification settings - {{ wtf.render_field(edit_notification_settings_form.job_status_mail_notification_level, material_icon='notifications') }} -
              -
              -
              - {{ wtf.render_field(edit_notification_settings_form.submit, material_icon='send') }} -
              -
              -
              -
              - -
              - {{ change_password_form.hidden_tag() }} -
              -
              - Change Password - {{ wtf.render_field(change_password_form.password, material_icon='vpn_key') }} - {{ wtf.render_field(change_password_form.new_password, material_icon='vpn_key') }} - {{ wtf.render_field(change_password_form.new_password_2, material_icon='vpn_key') }} -
              -
              -
              - {{ wtf.render_field(change_password_form.submit, material_icon='send') }} -
              -
              -
              -
              - -
              -
              - Delete account -

              Deleting an account has the following effects:

              -
                -
              • All data associated with your corpora and jobs will be permanently deleted.
                • -
              • All settings will be permanently deleted.
                • -
              -
              -
              - deleteDelete -
              -
              - +
              +
              +

              Profile Settings

              +

              Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam + nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, + sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. + Stet clita kasd gubergren, no sea tak

              -
              -
                -
              • User Settings
                • -
              • Privacy Settings
                • -
              • Public Profile Settings
                • -
              • Notification Settings
                • -
              • Change Password
                • -
              • Delete Account
                • +
                +
                  +
                • +
                  + User Settings + keyboard_arrow_right +
                  +
                  +
                  +
                  +
                  + {{ edit_profile_settings_form.hidden_tag() }} + {{ wtf.render_field(edit_profile_settings_form.username, material_icon='person') }} + {{ wtf.render_field(edit_profile_settings_form.email, material_icon='email') }} +
                  +
                  +
                  + {{ wtf.render_field(edit_profile_settings_form.submit, material_icon='send') }} +
                  +
                  +
                  +
                  • +
                • +
                  Privacy Settingskeyboard_arrow_right
                  +
                  +
                  + {{ edit_privacy_settings_form.hidden_tag() }} +
                  + {{ wtf.render_field(edit_privacy_settings_form.is_public, id='public-profile') }} +
                  +
                  +
                  + {{ wtf.render_field(edit_privacy_settings_form.show_email, data_action='disable', disabled=true) }} +
                  + {{ wtf.render_field(edit_privacy_settings_form.show_last_seen, data_action='disable', disabled=true) }} +
                  + {{ wtf.render_field(edit_privacy_settings_form.show_member_since, data_action='disable', disabled=true) }} +
                  +
                  + {{ wtf.render_field(edit_privacy_settings_form.submit, material_icon='send') }} +
                  +
                  +
                  +
                  • +
                • +
                  Public Profilekeyboard_arrow_right
                  +
                  +
                  + {{ edit_public_profile_information_form.hidden_tag() }} +
                  +
                  +
                  + user-image +
                  +
                  +
                  +
                  +
                  +
                  + delete +
                  +
                  +
                  + {{ wtf.render_field(edit_public_profile_information_form.avatar, accept='image/jpeg, image/png, image/gif', placeholder='Choose an image file', id='avatar-upload') }} +
                  +
                  +

                  +
                  + {{ wtf.render_field(edit_public_profile_information_form.full_name, material_icon='badge') }} + {{ wtf.render_field(edit_public_profile_information_form.about_me, material_icon='description', id='about-me-textfield') }} + {{ wtf.render_field(edit_public_profile_information_form.website, material_icon='laptop') }} + {{ wtf.render_field(edit_public_profile_information_form.organization, material_icon='business') }} + {{ wtf.render_field(edit_public_profile_information_form.location, material_icon='location_on') }} +
                  + {{ wtf.render_field(edit_public_profile_information_form.submit, material_icon='send') }} +
                  +
                  +
                  +
                  • +
                +
                +
              +
              +
              +

              General Settings

              +

              Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam + nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, + sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. + Stet clita kasd gubergren, no sea tak

              +
              +
              +
                +
              • +
                + Notification Settings + keyboard_arrow_right +
                +
                +
                + {{ edit_notification_settings_form.hidden_tag() }} + {{ wtf.render_field(edit_notification_settings_form.job_status_mail_notification_level, material_icon='notifications') }} +
                + {{ wtf.render_field(edit_notification_settings_form.submit, material_icon='send') }} +
                +
                +
                +
                • +
              • +
                + Change Password + keyboard_arrow_right +
                +
                +
                + {{ change_password_form.hidden_tag() }} + {{ wtf.render_field(change_password_form.password, material_icon='vpn_key') }} + {{ wtf.render_field(change_password_form.new_password, material_icon='vpn_key') }} + {{ wtf.render_field(change_password_form.new_password_2, material_icon='vpn_key') }} +
                + {{ wtf.render_field(change_password_form.submit, material_icon='send') }} +
                +
                +
                +
                • +
              • +
                + Delete Account + keyboard_arrow_right +
                +
                +

                Deleting an account has the following effects:

                +
                  +
                • All data associated with your corpora and jobs will be permanently deleted.
                  • +
                • All settings will be permanently deleted.
                  • +
                +
                + deleteDelete +
                +
                +
              diff --git a/app/users/forms.py b/app/users/forms.py index af0e1984..73d72c8d 100644 --- a/app/users/forms.py +++ b/app/users/forms.py @@ -64,11 +64,13 @@ class EditPublicProfileInformationForm(FlaskForm): 'Full name', validators=[Length(max=128)] ) + style={'style': 'overflow: auto;'} about_me = TextAreaField( 'About me', validators=[ Length(max=254) - ] + ], + render_kw=style ) website = StringField( 'Website', diff --git a/app/users/routes.py b/app/users/routes.py index 21e2ff02..bc2e90fb 100644 --- a/app/users/routes.py +++ b/app/users/routes.py @@ -172,5 +172,5 @@ def edit_profile(user_id): change_password_form=change_password_form, edit_notification_settings_form=edit_notification_settings_form, user=user, - title='Edit Profile' + title='User Settings' ) From 0f8c1b1cb4814e93a5348d032122ba4e22ead0c5 Mon Sep 17 00:00:00 2001 From: Inga Kirschnick Date: Wed, 15 Mar 2023 09:24:09 +0100 Subject: [PATCH 077/177] New profile page --- .../users/edit_profile_testing.html.j2 | 236 ++++++++++++++++++ 1 file changed, 236 insertions(+) create mode 100644 app/templates/users/edit_profile_testing.html.j2 diff --git a/app/templates/users/edit_profile_testing.html.j2 b/app/templates/users/edit_profile_testing.html.j2 new file mode 100644 index 00000000..88eb8fb5 --- /dev/null +++ b/app/templates/users/edit_profile_testing.html.j2 @@ -0,0 +1,236 @@ +{% extends "base.html.j2" %} +{% import "materialize/wtf.html.j2" as wtf %} + +{% block page_content %} +
              +
              +
              +

              {{ title }}

              +
              +
              +
              +
              + +
              +
              +
              + User Settings +
              +
              + {{ edit_profile_settings_form.hidden_tag() }} + {{ wtf.render_field(edit_profile_settings_form.username, material_icon='person') }} + {{ wtf.render_field(edit_profile_settings_form.email, material_icon='email') }} +
              +
              +
              +
              +
              + {{ wtf.render_field(edit_profile_settings_form.submit, material_icon='send') }} +
              +
              +
              +
              + +
              + {{ edit_privacy_settings_form.hidden_tag() }} +
              +
              + Privacy settings +
              + {{ wtf.render_field(edit_privacy_settings_form.is_public, id='public-profile') }} +
              +
              +
              + {{ wtf.render_field(edit_privacy_settings_form.show_email, data_action='disable', disabled=true) }} +
              + {{ wtf.render_field(edit_privacy_settings_form.show_last_seen, data_action='disable', disabled=true) }} +
              + {{ wtf.render_field(edit_privacy_settings_form.show_member_since, data_action='disable', disabled=true) }} +
              +
              +
              +
              + {{ wtf.render_field(edit_privacy_settings_form.submit, material_icon='send') }} +
              +
              +
              +
              + +
              +
              +
              + {{ edit_public_profile_information_form.hidden_tag() }} +
              +
              + Public Profile +
              +
              +
              +
              +
              +
              +
              + user-image +
              +
              +
              +
              +
              +
              + delete +
              +
              +
              + {{ wtf.render_field(edit_public_profile_information_form.avatar, accept='image/jpeg, image/png, image/gif', placeholder='Choose an image file', id='avatar-upload') }} +
              +
              +
              +
              +

              +
              + {{ wtf.render_field(edit_public_profile_information_form.full_name, material_icon='badge') }} + {{ wtf.render_field(edit_public_profile_information_form.about_me, material_icon='description') }} + {{ wtf.render_field(edit_public_profile_information_form.website, material_icon='laptop') }} + {{ wtf.render_field(edit_public_profile_information_form.organization, material_icon='business') }} + {{ wtf.render_field(edit_public_profile_information_form.location, material_icon='location_on') }} +
              +
              +
              +
              +
              + {{ wtf.render_field(edit_public_profile_information_form.submit, material_icon='send') }} +
              +
              +
              +
              + +
              + {{ edit_notification_settings_form.hidden_tag() }} +
              +
              + Notification settings + {{ wtf.render_field(edit_notification_settings_form.job_status_mail_notification_level, material_icon='notifications') }} +
              +
              +
              + {{ wtf.render_field(edit_notification_settings_form.submit, material_icon='send') }} +
              +
              +
              +
              + +
              + {{ change_password_form.hidden_tag() }} +
              +
              + Change Password + {{ wtf.render_field(change_password_form.password, material_icon='vpn_key') }} + {{ wtf.render_field(change_password_form.new_password, material_icon='vpn_key') }} + {{ wtf.render_field(change_password_form.new_password_2, material_icon='vpn_key') }} +
              +
              +
              + {{ wtf.render_field(change_password_form.submit, material_icon='send') }} +
              +
              +
              +
              + +
              +
              + Delete account +

              Deleting an account has the following effects:

              +
                +
              • All data associated with your corpora and jobs will be permanently deleted.
                • +
              • All settings will be permanently deleted.
                • +
              +
              +
              + deleteDelete +
              +
              + +
              +
              + +
              +
              +
              +{% endblock page_content %} + +{% block modals %} + + +{% endblock modals %} + +{% block scripts %} +{{ super() }} + +{% endblock scripts %} From 743ed52fd6fb7d561f10413826064db7416c9d6c Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Wed, 15 Mar 2023 09:37:36 +0100 Subject: [PATCH 078/177] Align carets on the right --- app/templates/users/edit_profile.html.j2 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/templates/users/edit_profile.html.j2 b/app/templates/users/edit_profile.html.j2 index 3636da42..9fdd1e36 100644 --- a/app/templates/users/edit_profile.html.j2 +++ b/app/templates/users/edit_profile.html.j2 @@ -19,7 +19,7 @@
              • -
                +
                User Settings keyboard_arrow_right
                @@ -39,7 +39,7 @@
              • -
                Privacy Settingskeyboard_arrow_right
                +
                Privacy Settingskeyboard_arrow_right
                {{ edit_privacy_settings_form.hidden_tag() }} @@ -61,7 +61,7 @@
              • -
                Public Profilekeyboard_arrow_right
                +
                Public Profilekeyboard_arrow_right
                {{ edit_public_profile_information_form.hidden_tag() }} From 8d21bfe434148fc14d8dbf86a523281898e2cbb3 Mon Sep 17 00:00:00 2001 From: Inga Kirschnick Date: Wed, 15 Mar 2023 09:42:07 +0100 Subject: [PATCH 079/177] Small fix edit profile page --- app/templates/users/edit_profile.html.j2 | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/templates/users/edit_profile.html.j2 b/app/templates/users/edit_profile.html.j2 index 3636da42..3a66484c 100644 --- a/app/templates/users/edit_profile.html.j2 +++ b/app/templates/users/edit_profile.html.j2 @@ -66,11 +66,9 @@ {{ edit_public_profile_information_form.hidden_tag() }}
                -
                -
                +
                user-image
                -
                From 268d00ce72190d0a9e68c6cc5c19fdd0f7d68d3f Mon Sep 17 00:00:00 2001 From: Inga Kirschnick Date: Wed, 15 Mar 2023 12:46:17 +0100 Subject: [PATCH 080/177] Icon + public profile section update on edit page --- app/templates/users/edit_profile.html.j2 | 38 ++++++++++++++++-------- 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/app/templates/users/edit_profile.html.j2 b/app/templates/users/edit_profile.html.j2 index fc03909a..1da2f377 100644 --- a/app/templates/users/edit_profile.html.j2 +++ b/app/templates/users/edit_profile.html.j2 @@ -65,19 +65,15 @@
                {{ edit_public_profile_information_form.hidden_tag() }} -
                -
                +
                +
                user-image
                -
                -
                -
                -
                - delete -
                -
                -
                +
                {{ wtf.render_field(edit_public_profile_information_form.avatar, accept='image/jpeg, image/png, image/gif', placeholder='Choose an image file', id='avatar-upload') }} +
                +
                + delete

                @@ -107,7 +103,7 @@
                • -
                  +
                  Notification Settings keyboard_arrow_right
                  @@ -122,7 +118,7 @@
                • -
                  +
                  Change Password keyboard_arrow_right
                  @@ -139,7 +135,7 @@
                • -
                  +
                  Delete Account keyboard_arrow_right
                  @@ -227,5 +223,21 @@ document.querySelector('#delete-user-button').addEventListener('click', (event) Requests.users.entity.delete(currentUserId) .then((response) => {window.location.href = '/';}); }); + +document.querySelectorAll('.collapsible').forEach((collapsible) => { + M.Collapsible.init( + collapsible, + { + onOpenStart: (event) => { + let caret = event.querySelector('.caret'); + caret.innerHTML = 'keyboard_arrow_down'; + }, + onCloseStart: (event) => { + let caret = event.querySelector('.caret'); + caret.innerHTML = 'keyboard_arrow_right'; + } + }); +}); + {% endblock scripts %} From 7ea7b6d7a7d7031382df1c233a34b974da509484 Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Thu, 16 Mar 2023 09:29:57 +0100 Subject: [PATCH 081/177] Rework sidenav --- app/__init__.py | 2 +- app/templates/_sidenav.html.j2 | 17 ++++++++++++----- app/users/routes.py | 2 +- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index 076b006a..bf465cbb 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -92,7 +92,7 @@ def create_app(config: Config = Config) -> Flask: app.register_blueprint(services_blueprint, url_prefix='/services') from .users import bp as users_blueprint - default_breadcrumb_root(users_blueprint, '.users') + default_breadcrumb_root(users_blueprint, '.social_area.users') app.register_blueprint(users_blueprint, url_prefix='/users') return app diff --git a/app/templates/_sidenav.html.j2 b/app/templates/_sidenav.html.j2 index 5ee67954..e05783a4 100644 --- a/app/templates/_sidenav.html.j2 +++ b/app/templates/_sidenav.html.j2 @@ -19,14 +19,18 @@
                • + {#
              • +
                + +
                +
                • #} {#
              • nopaque
                • #}
              • emailNews
              • helpManual
                • -
              • dashboardDashboard
                • -
              • IMy Corpora
                • -
              • JMy Jobs
                • -
              • new_labelMy Contributions
                • - +
              • Dashboard
                • +
              • IMy Corpora
                • +
              • JMy Jobs
                • +
              • new_labelMy Contributions
              • Processes & Services
              • File setup
                • @@ -37,6 +41,9 @@
              • NLP
              • Corpus Analysis
                • +
              • Social Area
                • + +
              • Account
              • settingsUser Settings
              • Log out
                • diff --git a/app/users/routes.py b/app/users/routes.py index 5431dfd0..bb1e25c6 100644 --- a/app/users/routes.py +++ b/app/users/routes.py @@ -26,7 +26,7 @@ from .utils import ( @bp.route('') -@register_breadcrumb(bp, '.', 'groupSocial Area') +@register_breadcrumb(bp, '.', 'groupUsers') @login_required def users(): return redirect(url_for('main.social_area', _anchor='users')) From f8e94a721ff9b9690333aaf1b04df38ad8795999 Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Thu, 16 Mar 2023 09:54:48 +0100 Subject: [PATCH 082/177] Change how the user avatar is exchanged between client und server --- app/models.py | 5 +---- app/static/js/ResourceLists/UserList.js | 2 +- app/users/routes.py | 4 ++-- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/app/models.py b/app/models.py index de995a5c..1ed18ada 100644 --- a/app/models.py +++ b/app/models.py @@ -838,6 +838,7 @@ class User(HashidMixin, UserMixin, db.Model): json_serializeable = { 'id': self.hashid, 'confirmed': self.confirmed, + 'avatar': url_for('users.profile_avatar', user_id=self.id), 'email': self.email, 'last_seen': ( None if self.last_seen is None @@ -857,10 +858,6 @@ class User(HashidMixin, UserMixin, db.Model): 'show_last_seen': self.has_profile_privacy_setting(ProfilePrivacySettings.SHOW_LAST_SEEN), 'show_member_since': self.has_profile_privacy_setting(ProfilePrivacySettings.SHOW_MEMBER_SINCE) } - json_serializeable['avatar'] = ( - None if self.avatar is None - else self.avatar.to_json_serializeable(relationships=True) - ) if backrefs: json_serializeable['role'] = \ self.role.to_json_serializeable(backrefs=True) diff --git a/app/static/js/ResourceLists/UserList.js b/app/static/js/ResourceLists/UserList.js index 8d0e590f..2ba4dc19 100644 --- a/app/static/js/ResourceLists/UserList.js +++ b/app/static/js/ResourceLists/UserList.js @@ -72,7 +72,7 @@ class UserList extends ResourceList { return { 'id': user.id, 'member-since': user.member_since, - 'avatar': user.avatar ? `/users/${user.id}/avatar` : '/static/images/user_avatar.png', + 'avatar': user.avatar, 'username': user.username, 'full-name': user.full_name ? user.full_name : '', 'location': user.location ? user.location : '', diff --git a/app/users/routes.py b/app/users/routes.py index bb1e25c6..52e25f18 100644 --- a/app/users/routes.py +++ b/app/users/routes.py @@ -64,10 +64,10 @@ def user(user_id): @login_required def profile_avatar(user_id): user = User.query.get_or_404(user_id) + if not (user.is_public or user == current_user or current_user.is_administrator()): + abort(403) if user.avatar is None: return redirect(url_for('static', filename='images/user_avatar.png')) - if not user.is_public and not (user == current_user or current_user.is_administrator()): - abort(403) return send_from_directory( os.path.dirname(user.avatar.path), os.path.basename(user.avatar.path), From faf5a618088d727c09088c5f8d85869229da5ccb Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Thu, 16 Mar 2023 09:58:56 +0100 Subject: [PATCH 083/177] Update sidenav --- app/templates/_sidenav.html.j2 | 3 ++- app/templates/main/social_area.html.j2 | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/templates/_sidenav.html.j2 b/app/templates/_sidenav.html.j2 index e05783a4..3ac227ee 100644 --- a/app/templates/_sidenav.html.j2 +++ b/app/templates/_sidenav.html.j2 @@ -42,7 +42,8 @@
              • Corpus Analysis
              • Social Area
                • - +
              • personPublic Users
                • +
              • IPublic Corpora
              • Account
              • settingsUser Settings
                • diff --git a/app/templates/main/social_area.html.j2 b/app/templates/main/social_area.html.j2 index fc101aad..47899297 100644 --- a/app/templates/main/social_area.html.j2 +++ b/app/templates/main/social_area.html.j2 @@ -35,8 +35,8 @@
              -
              -

              Other Users

              +
              +

              Public Users

              Find other users and see what corpora they have made public.

              @@ -45,7 +45,7 @@
              -
              +

              Public Corpora

              Find public corpora.

              From 823e42faf08d07bb5d99d618eb569f80352dd324 Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Thu, 16 Mar 2023 10:31:58 +0100 Subject: [PATCH 084/177] Replace roadmap with manual --- app/main/routes.py | 8 ++-- app/static/css/style.css | 4 ++ app/templates/_navbar.html.j2 | 7 ++-- app/templates/_sidenav.html.j2 | 2 +- app/templates/base.html.j2 | 5 ++- .../main/_manual_modal_contents.html.j2 | 42 +++++++++++++++++++ .../main/manual/_01_introduction.html.j2 | 2 +- .../_02_registration_and_log_in.html.j2 | 2 +- .../main/manual/_03_dashboard.html.j2 | 2 +- .../main/manual/_06_services.html.j2 | 12 +++--- ...closer_look_at_the_corpus_analysis.html.j2 | 6 +-- .../manual/_08_cqp_query_language.html.j2 | 10 ++--- 12 files changed, 75 insertions(+), 27 deletions(-) create mode 100644 app/templates/main/_manual_modal_contents.html.j2 diff --git a/app/main/routes.py b/app/main/routes.py index 65a237e9..5a23858b 100644 --- a/app/main/routes.py +++ b/app/main/routes.py @@ -34,10 +34,10 @@ def dashboard(): return render_template('main/dashboard.html.j2', title='Dashboard') -@bp.route('/user_manual') -@register_breadcrumb(bp, '.user_manual', 'helpUser manual') -def user_manual(): - return render_template('main/user_manual.html.j2', title='User manual') +# @bp.route('/user_manual') +# @register_breadcrumb(bp, '.user_manual', 'helpUser manual') +# def user_manual(): +# return render_template('main/user_manual.html.j2', title='User manual') @bp.route('/news') diff --git a/app/static/css/style.css b/app/static/css/style.css index 7c56d3d8..e85d697e 100644 --- a/app/static/css/style.css +++ b/app/static/css/style.css @@ -19,6 +19,10 @@ height: 30px !important; } +#manual-modal .manual-chapter-title { + display: none; +} + .show-if-only-child:not(:only-child) { display: none !important; } diff --git a/app/templates/_navbar.html.j2 b/app/templates/_navbar.html.j2 index 9365b1e7..467db7dd 100644 --- a/app/templates/_navbar.html.j2 +++ b/app/templates/_navbar.html.j2 @@ -21,15 +21,16 @@ {% endif %} {%- endfor -%}
            - {% if current_user.is_authenticated %} + {# {% if current_user.is_authenticated %} explore - {% endif %} + {% endif %} #} + help
              -
            • helpManual
              • + {#
            • helpManual
              • #} {% if current_user.is_authenticated %}
            • settingsUser settings
            • diff --git a/app/templates/_sidenav.html.j2 b/app/templates/_sidenav.html.j2 index 3ac227ee..2d66dc23 100644 --- a/app/templates/_sidenav.html.j2 +++ b/app/templates/_sidenav.html.j2 @@ -26,7 +26,7 @@ #} {#
            • nopaque
              • #}
            • emailNews
              • -
            • helpManual
              • + {#
            • helpManual
              • #}
            • Dashboard
            • IMy Corpora
            • JMy Jobs
              • diff --git a/app/templates/base.html.j2 b/app/templates/base.html.j2 index c9189e13..1b442bf9 100644 --- a/app/templates/base.html.j2 +++ b/app/templates/base.html.j2 @@ -34,9 +34,10 @@ {% block page_content %}{% endblock page_content %}
              {% block modals %} - {% if current_user.is_authenticated %} + {% include "main/_manual_modal_contents.html.j2" %} + {# {% if current_user.is_authenticated %} {% include "_roadmap.html.j2" %} - {% endif %} + {% endif %} #} {% endblock modals %}
              {% endblock main %} diff --git a/app/templates/main/_manual_modal_contents.html.j2 b/app/templates/main/_manual_modal_contents.html.j2 new file mode 100644 index 00000000..bb2c5708 --- /dev/null +++ b/app/templates/main/_manual_modal_contents.html.j2 @@ -0,0 +1,42 @@ + diff --git a/app/templates/main/manual/_01_introduction.html.j2 b/app/templates/main/manual/_01_introduction.html.j2 index 46064924..0b1d9ad7 100644 --- a/app/templates/main/manual/_01_introduction.html.j2 +++ b/app/templates/main/manual/_01_introduction.html.j2 @@ -1,4 +1,4 @@ -

              Introduction

              +

              Introduction

              nopaque is a web-based digital working environment. It implements a workflow based on the research process in the humanities and supports its diff --git a/app/templates/main/manual/_02_registration_and_log_in.html.j2 b/app/templates/main/manual/_02_registration_and_log_in.html.j2 index 93d061f3..5f05c543 100644 --- a/app/templates/main/manual/_02_registration_and_log_in.html.j2 +++ b/app/templates/main/manual/_02_registration_and_log_in.html.j2 @@ -1,4 +1,4 @@ -

              Registration and Log in

              +

              Registration and Log in

              Registration and Log in diff --git a/app/templates/main/manual/_03_dashboard.html.j2 b/app/templates/main/manual/_03_dashboard.html.j2 index abfd0ba4..e62fd434 100644 --- a/app/templates/main/manual/_03_dashboard.html.j2 +++ b/app/templates/main/manual/_03_dashboard.html.j2 @@ -1,4 +1,4 @@ -

              Dashboard

              +

              Dashboard

              Dashboard diff --git a/app/templates/main/manual/_06_services.html.j2 b/app/templates/main/manual/_06_services.html.j2 index 701e6c80..fcb986e3 100644 --- a/app/templates/main/manual/_06_services.html.j2 +++ b/app/templates/main/manual/_06_services.html.j2 @@ -1,4 +1,4 @@ -

              Services

              +

              Services

              Services @@ -19,7 +19,7 @@
              -

              File Setup

              +

              File Setup

              The File Setup Service bundles image data, such as scans and photos, together in a handy PDF file. To use this service, use the job form to @@ -34,16 +34,16 @@ sorted in ascending order by file name.

              -

              Optical Character Recognition (OCR)

              +

              Optical Character Recognition (OCR)

              Comming soon...

              -

              Handwritten Text Recognition (HTR)

              +

              Handwritten Text Recognition (HTR)

              Comming soon...

              -

              Natural Language Processing (NLP)

              +

              Natural Language Processing (NLP)

              Comming soon...

              -

              Corpus Analysis

              +

              Corpus Analysis

              With the corpus analysis service, it is possible to create a text corpus and then explore it in an analysis session. The analysis session is realized diff --git a/app/templates/main/manual/_07_a_closer_look_at_the_corpus_analysis.html.j2 b/app/templates/main/manual/_07_a_closer_look_at_the_corpus_analysis.html.j2 index a2c2732c..b2a500c8 100644 --- a/app/templates/main/manual/_07_a_closer_look_at_the_corpus_analysis.html.j2 +++ b/app/templates/main/manual/_07_a_closer_look_at_the_corpus_analysis.html.j2 @@ -1,5 +1,5 @@ -

              A closer look at the Corpus Analysis

              -

              Create a corpus

              +

              A closer look at the Corpus Analysis

              +

              Create a corpus

              Create a Corpus @@ -32,7 +32,7 @@
              -

              Analyze a corpus

              +

              Analyze a corpus

              After you have created and built a corpus, it can be analyzed. To do this, use the button labeled Analyze. The corpus analysis currently offers two diff --git a/app/templates/main/manual/_08_cqp_query_language.html.j2 b/app/templates/main/manual/_08_cqp_query_language.html.j2 index 0af61dd6..9069d495 100644 --- a/app/templates/main/manual/_08_cqp_query_language.html.j2 +++ b/app/templates/main/manual/_08_cqp_query_language.html.j2 @@ -1,4 +1,4 @@ -

              CQP Query Language

              +

              CQP Query Language

              Within the Corpus Query Language, a distinction is made between two types of annotations: positional attributes and structural attributes. Positional attributes refer to a token, e.g. the word "book" is assigned the part-of-speech tag "NN", the lemma "book" and the simplified part-of-speech tag "NOUN" within the token structure. Structural attributes refer to text structure-giving elements such as sentence and entity markup. For example, the markup of a sentence is represented in the background as follows:

                 
@@ -13,7 +13,7 @@
              -

              Positional attributes

              +

              Positional attributes

              Before you can start searching for positional attributes (also called tokens), it is necessary to know what properties they contain.

              1. word: The string as it is also found in the original text
                2. @@ -33,7 +33,7 @@
              -

              Searching for positional attributes

              +
              Searching for positional attributes

              Token with no condition on any property (also called wildcard token)
              @@ -118,7 +118,7 @@ 

                       ^             ^ the braces indicate the start and end of an option group
              -

              Structural attributes

              +

              Structural attributes

              nopaque provides several structural attributes for query. A distinction is made between attributes with and without value.

              1. s: Annotates a sentence
                2. @@ -153,7 +153,7 @@
              -

              Searching for structural attributes

              +
              Searching for structural attributes
              <ent> [] </ent>;                       A one token long entity of any type
              <ent_type="PERSON"> [] </ent_type>;     A one token long entity of type PERSON
              <ent_type="PERSON"> []* </ent_type>;    Entity of any length of type PERSON
              From 41096445a623b901cce1f43cbcf061491036211c Mon Sep 17 00:00:00 2001 From: Inga Kirschnick Date: Fri, 17 Mar 2023 15:56:37 +0100 Subject: [PATCH 085/177] small update settings page+new package 'settings' --- app/__init__.py | 4 + app/settings/__init__.py | 6 + app/{users => settings}/forms.py | 10 +- app/{users => settings}/json_routes.py | 21 +- app/settings/routes.py | 108 ++++++++ app/settings/utils.py | 6 + app/static/js/Requests/settings/settings.js | 35 +++ app/static/js/Requests/users/users.js | 23 -- app/templates/_navbar.html.j2 | 2 +- app/templates/_scripts.html.j2 | 2 +- app/templates/_sidenav.html.j2 | 2 +- .../{users => settings}/edit_profile.html.j2 | 101 +++++--- .../users/edit_profile_testing.html.j2 | 236 ------------------ app/templates/users/profile.html.j2 | 2 +- app/users/routes.py | 114 +-------- 15 files changed, 256 insertions(+), 416 deletions(-) create mode 100644 app/settings/__init__.py rename app/{users => settings}/forms.py (93%) rename app/{users => settings}/json_routes.py (71%) create mode 100644 app/settings/routes.py create mode 100644 app/settings/utils.py create mode 100644 app/static/js/Requests/settings/settings.js delete mode 100644 app/static/js/Requests/users/users.js rename app/templates/{users => settings}/edit_profile.html.j2 (79%) delete mode 100644 app/templates/users/edit_profile_testing.html.j2 diff --git a/app/__init__.py b/app/__init__.py index bf465cbb..50e70fd2 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -91,6 +91,10 @@ def create_app(config: Config = Config) -> Flask: default_breadcrumb_root(services_blueprint, '.services') app.register_blueprint(services_blueprint, url_prefix='/services') + from .settings import bp as settings_blueprint + default_breadcrumb_root(settings_blueprint, '.settings') + app.register_blueprint(settings_blueprint, url_prefix='/settings') + from .users import bp as users_blueprint default_breadcrumb_root(users_blueprint, '.social_area.users') app.register_blueprint(users_blueprint, url_prefix='/users') diff --git a/app/settings/__init__.py b/app/settings/__init__.py new file mode 100644 index 00000000..aaa1cb1b --- /dev/null +++ b/app/settings/__init__.py @@ -0,0 +1,6 @@ +from flask import Blueprint + + +bp = Blueprint('settings', __name__) +from . import routes, json_routes + diff --git a/app/users/forms.py b/app/settings/forms.py similarity index 93% rename from app/users/forms.py rename to app/settings/forms.py index 73d72c8d..a814feee 100644 --- a/app/users/forms.py +++ b/app/settings/forms.py @@ -56,6 +56,9 @@ class EditProfileSettingsForm(FlaskForm): raise ValidationError('Username already in use') class EditPublicProfileInformationForm(FlaskForm): + show_email = BooleanField('Email') + show_last_seen = BooleanField('Last seen') + show_member_since = BooleanField('Member since') avatar = FileField( 'Image File', [FileSizeLimit(max_size_in_mb=2)] @@ -97,13 +100,6 @@ class EditPublicProfileInformationForm(FlaskForm): if not field.data.filename.lower().endswith('.jpg' or '.png' or '.jpeg'): raise ValidationError('only .jpg, .png and .jpeg!') -class EditPrivacySettingsForm(FlaskForm): - is_public = BooleanField('Public profile') - show_email = BooleanField('Show email') - show_last_seen = BooleanField('Show last seen') - show_member_since = BooleanField('Show member since') - submit = SubmitField() - class ChangePasswordForm(FlaskForm): password = PasswordField('Old password', validators=[DataRequired()]) new_password = PasswordField( diff --git a/app/users/json_routes.py b/app/settings/json_routes.py similarity index 71% rename from app/users/json_routes.py rename to app/settings/json_routes.py index 0e421078..77b421d9 100644 --- a/app/users/json_routes.py +++ b/app/settings/json_routes.py @@ -1,4 +1,4 @@ -from flask import abort, current_app +from flask import abort, current_app, request from flask_login import current_user, login_required, logout_user from threading import Thread import os @@ -52,3 +52,22 @@ def delete_profile_avatar(user_id): 'message': f'Avatar marked for deletion' } return response_data, 202 + +@bp.route('//is_public', methods=['PUT']) +@login_required +@content_negotiation(consumes='application/json', produces='application/json') +def update_user_is_public(user_id): + is_public = request.json + if not isinstance(is_public, bool): + abort(400) + user = User.query.get_or_404(user_id) + user.is_public = is_public + db.session.commit() + response_data = { + 'message': ( + f'User "{user.username}" is now' + f' {"public" if is_public else "private"}' + ), + 'category': 'corpus' + } + return response_data, 200 diff --git a/app/settings/routes.py b/app/settings/routes.py new file mode 100644 index 00000000..bc36a9c8 --- /dev/null +++ b/app/settings/routes.py @@ -0,0 +1,108 @@ +from flask import ( + abort, + flash, + redirect, + render_template, + url_for +) +from flask_breadcrumbs import register_breadcrumb +from flask_login import current_user, login_required +import os +from app import db +from app.models import Avatar, Corpus, ProfilePrivacySettings, User +from . import bp +from .forms import ( + ChangePasswordForm, + EditNotificationSettingsForm, + EditProfileSettingsForm, + EditPublicProfileInformationForm +) +from .utils import user_endpoint_arguments_constructor as user_eac + + +@bp.route('//edit', methods=['GET', 'POST']) +@register_breadcrumb(bp, 'breadcrumbs.settings', 'settingsSettings', endpoint_arguments_constructor=user_eac) +@login_required +def edit_profile(user_id): + user = User.query.get_or_404(user_id) + if not (user == current_user or current_user.is_administrator()): + abort(403) + # region forms + edit_profile_settings_form = EditProfileSettingsForm( + current_user, + data=current_user.to_json_serializeable(), + prefix='edit-profile-settings-form' + ) + edit_public_profile_information_form = EditPublicProfileInformationForm( + data=current_user.to_json_serializeable(), + prefix='edit-public-profile-information-form' + ) + change_password_form = ChangePasswordForm( + current_user, + prefix='change-password-form' + ) + edit_notification_settings_form = EditNotificationSettingsForm( + data=current_user.to_json_serializeable(), + prefix='edit-notification-settings-form' + ) + # endregion forms + # region handle edit profile settings form + if edit_profile_settings_form.validate_on_submit(): + current_user.email = edit_profile_settings_form.email.data + current_user.username = edit_profile_settings_form.username.data + db.session.commit() + flash('Profile settings updated') + return redirect(url_for('users.user', user_id=user.id)) + # endregion handle edit profile settings forms + # region handle edit public profile information form + if edit_public_profile_information_form.submit.data and edit_public_profile_information_form.validate(): + print(edit_public_profile_information_form.show_email.data) + if edit_public_profile_information_form.show_email.data: + current_user.add_profile_privacy_setting(ProfilePrivacySettings.SHOW_EMAIL) + else: + current_user.remove_profile_privacy_setting(ProfilePrivacySettings.SHOW_EMAIL) + if edit_public_profile_information_form.show_last_seen.data: + current_user.add_profile_privacy_setting(ProfilePrivacySettings.SHOW_LAST_SEEN) + else: + current_user.remove_profile_privacy_setting(ProfilePrivacySettings.SHOW_LAST_SEEN) + if edit_public_profile_information_form.show_member_since.data: + current_user.add_profile_privacy_setting(ProfilePrivacySettings.SHOW_MEMBER_SINCE) + else: + current_user.remove_profile_privacy_setting(ProfilePrivacySettings.SHOW_MEMBER_SINCE) + if edit_public_profile_information_form.avatar.data: + try: + Avatar.create(edit_public_profile_information_form.avatar.data, user=current_user) + except (AttributeError, OSError): + abort(500) + current_user.about_me = edit_public_profile_information_form.about_me.data + current_user.location = edit_public_profile_information_form.location.data + current_user.organization = edit_public_profile_information_form.organization.data + current_user.website = edit_public_profile_information_form.website.data + current_user.full_name = edit_public_profile_information_form.full_name.data + db.session.commit() + flash('Profile settings updated') + return redirect(url_for('users.user', user_id=user.id)) + # endregion handle edit public profile information form + # region handle change_password_form POST + if change_password_form.submit.data and change_password_form.validate(): + current_user.password = change_password_form.new_password.data + db.session.commit() + flash('Your changes have been saved') + return redirect(url_for('.edit_profile', user_id=user.id)) + # endregion handle change_password_form POST + # region handle edit_notification_settings_form POST + if edit_notification_settings_form.submit and edit_notification_settings_form.validate(): + current_user.setting_job_status_mail_notification_level = edit_notification_settings_form.job_status_mail_notification_level.data + db.session.commit() + flash('Your changes have been saved') + return redirect(url_for('.edit_profile', user_id=user.id)) + # endregion handle edit_notification_settings_form POST + return render_template( + 'settings/edit_profile.html.j2', + edit_profile_settings_form=edit_profile_settings_form, + edit_public_profile_information_form=edit_public_profile_information_form, + change_password_form=change_password_form, + edit_notification_settings_form=edit_notification_settings_form, + user=user, + title='Settings' + ) diff --git a/app/settings/utils.py b/app/settings/utils.py new file mode 100644 index 00000000..53572740 --- /dev/null +++ b/app/settings/utils.py @@ -0,0 +1,6 @@ +from flask import request, url_for +from app.models import User + + +def user_endpoint_arguments_constructor(): + return {'user_id': request.view_args['user_id']} diff --git a/app/static/js/Requests/settings/settings.js b/app/static/js/Requests/settings/settings.js new file mode 100644 index 00000000..55ae94b2 --- /dev/null +++ b/app/static/js/Requests/settings/settings.js @@ -0,0 +1,35 @@ +/***************************************************************************** +* Users * +* Fetch requests for /users routes * +*****************************************************************************/ +Requests.settings = {}; + +Requests.settings.entity = {}; + +Requests.settings.entity.delete = (userId) => { + let input = `/settings/${userId}`; + let init = { + method: 'DELETE' + }; + return Requests.JSONfetch(input, init); +} + +Requests.settings.entity.deleteAvatar = (userId) => { + let input = `/settings/${userId}/avatar`; + let init = { + method: 'DELETE' + }; + return Requests.JSONfetch(input, init); +} + +Requests.settings.entity.isPublic = {}; + +Requests.settings.entity.isPublic.update = (userId, isPublic) => { + let input = `/settings/${userId}/is_public`; + let init = { + method: 'PUT', + body: JSON.stringify(isPublic) + }; + return Requests.JSONfetch(input, init); +}; + diff --git a/app/static/js/Requests/users/users.js b/app/static/js/Requests/users/users.js deleted file mode 100644 index 0ae1434e..00000000 --- a/app/static/js/Requests/users/users.js +++ /dev/null @@ -1,23 +0,0 @@ -/***************************************************************************** -* Users * -* Fetch requests for /users routes * -*****************************************************************************/ -Requests.users = {}; - -Requests.users.entity = {}; - -Requests.users.entity.delete = (userId) => { - let input = `/users/${userId}`; - let init = { - method: 'DELETE' - }; - return Requests.JSONfetch(input, init); -} - -Requests.users.entity.deleteAvatar = (userId) => { - let input = `/users/${userId}/avatar`; - let init = { - method: 'DELETE' - }; - return Requests.JSONfetch(input, init); -} diff --git a/app/templates/_navbar.html.j2 b/app/templates/_navbar.html.j2 index 467db7dd..8819d076 100644 --- a/app/templates/_navbar.html.j2 +++ b/app/templates/_navbar.html.j2 @@ -32,7 +32,7 @@
                {#
              • helpManual
                • #} {% if current_user.is_authenticated %} -
              • settingsUser settings
                • +
              • settingsUser settings
              • Log out
                • {% else %} diff --git a/app/templates/_scripts.html.j2 b/app/templates/_scripts.html.j2 index 11398cb9..bed2aef2 100644 --- a/app/templates/_scripts.html.j2 +++ b/app/templates/_scripts.html.j2 @@ -65,7 +65,7 @@ 'js/Requests/corpora/files.js', 'js/Requests/corpora/followers.js', 'js/Requests/jobs/jobs.js', - 'js/Requests/users/users.js' + 'js/Requests/settings/settings.js' %} {%- endassets %} diff --git a/app/templates/_sidenav.html.j2 b/app/templates/_sidenav.html.j2 index 2d66dc23..f48ae4be 100644 --- a/app/templates/_sidenav.html.j2 +++ b/app/templates/_sidenav.html.j2 @@ -46,7 +46,7 @@
              • IPublic Corpora
              • Account
                • -
              • settingsUser Settings
                • +
              • settingsUser Settings
              • Log out
                • {% if current_user.can('ADMINISTRATE') or current_user.can('USE_API') %}
                • diff --git a/app/templates/users/edit_profile.html.j2 b/app/templates/settings/edit_profile.html.j2 similarity index 79% rename from app/templates/users/edit_profile.html.j2 rename to app/templates/settings/edit_profile.html.j2 index 1da2f377..afdc652d 100644 --- a/app/templates/users/edit_profile.html.j2 +++ b/app/templates/settings/edit_profile.html.j2 @@ -16,7 +16,8 @@ sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea tak

              -
              +
              +
              • @@ -38,7 +39,7 @@
                • -
              • + {#
              • Privacy Settingskeyboard_arrow_right
                @@ -59,21 +60,48 @@
              - + #}
            • Public Profilekeyboard_arrow_right
              {{ edit_public_profile_information_form.hidden_tag() }} +
              + +
              +

              +
              +
              +

              Show:

              -
              - user-image +
              +

              + +

              -
              - {{ wtf.render_field(edit_public_profile_information_form.avatar, accept='image/jpeg, image/png, image/gif', placeholder='Choose an image file', id='avatar-upload') }} -
              -
              - delete +
              +

              + +

              +
              +
              +

              + +

              @@ -83,9 +111,23 @@ {{ wtf.render_field(edit_public_profile_information_form.website, material_icon='laptop') }} {{ wtf.render_field(edit_public_profile_information_form.organization, material_icon='business') }} {{ wtf.render_field(edit_public_profile_information_form.location, material_icon='location_on') }} +

              +
              +
              + user-image +
              +
              + {{ wtf.render_field(edit_public_profile_information_form.avatar, accept='image/jpeg, image/png, image/gif', placeholder='Choose an image file', id='avatar-upload') }} +
              +
              + delete +
              +
              +
              +

              {{ wtf.render_field(edit_public_profile_information_form.submit, material_icon='send') }} -
              +
              • @@ -100,7 +142,8 @@ sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea tak

              -
              +
              +
              • @@ -182,36 +225,17 @@ {% block scripts %} {{ super() }} {% endblock scripts %} diff --git a/app/templates/users/edit_profile_testing.html.j2 b/app/templates/users/edit_profile_testing.html.j2 deleted file mode 100644 index 88eb8fb5..00000000 --- a/app/templates/users/edit_profile_testing.html.j2 +++ /dev/null @@ -1,236 +0,0 @@ -{% extends "base.html.j2" %} -{% import "materialize/wtf.html.j2" as wtf %} - -{% block page_content %} -
                -
                -
                -

                {{ title }}

                -
                -
                -
                -
                - -
                -
                -
                - User Settings -
                -
                - {{ edit_profile_settings_form.hidden_tag() }} - {{ wtf.render_field(edit_profile_settings_form.username, material_icon='person') }} - {{ wtf.render_field(edit_profile_settings_form.email, material_icon='email') }} -
                -
                -
                -
                -
                - {{ wtf.render_field(edit_profile_settings_form.submit, material_icon='send') }} -
                -
                -
                -
                - -
                - {{ edit_privacy_settings_form.hidden_tag() }} -
                -
                - Privacy settings -
                - {{ wtf.render_field(edit_privacy_settings_form.is_public, id='public-profile') }} -
                -
                -
                - {{ wtf.render_field(edit_privacy_settings_form.show_email, data_action='disable', disabled=true) }} -
                - {{ wtf.render_field(edit_privacy_settings_form.show_last_seen, data_action='disable', disabled=true) }} -
                - {{ wtf.render_field(edit_privacy_settings_form.show_member_since, data_action='disable', disabled=true) }} -
                -
                -
                -
                - {{ wtf.render_field(edit_privacy_settings_form.submit, material_icon='send') }} -
                -
                -
                -
                - -
                -
                -
                - {{ edit_public_profile_information_form.hidden_tag() }} -
                -
                - Public Profile -
                -
                -
                -
                -
                -
                -
                - user-image -
                -
                -
                -
                -
                -
                - delete -
                -
                -
                - {{ wtf.render_field(edit_public_profile_information_form.avatar, accept='image/jpeg, image/png, image/gif', placeholder='Choose an image file', id='avatar-upload') }} -
                -
                -
                -
                -

                -
                - {{ wtf.render_field(edit_public_profile_information_form.full_name, material_icon='badge') }} - {{ wtf.render_field(edit_public_profile_information_form.about_me, material_icon='description') }} - {{ wtf.render_field(edit_public_profile_information_form.website, material_icon='laptop') }} - {{ wtf.render_field(edit_public_profile_information_form.organization, material_icon='business') }} - {{ wtf.render_field(edit_public_profile_information_form.location, material_icon='location_on') }} -
                -
                -
                -
                -
                - {{ wtf.render_field(edit_public_profile_information_form.submit, material_icon='send') }} -
                -
                -
                -
                - -
                - {{ edit_notification_settings_form.hidden_tag() }} -
                -
                - Notification settings - {{ wtf.render_field(edit_notification_settings_form.job_status_mail_notification_level, material_icon='notifications') }} -
                -
                -
                - {{ wtf.render_field(edit_notification_settings_form.submit, material_icon='send') }} -
                -
                -
                -
                - -
                - {{ change_password_form.hidden_tag() }} -
                -
                - Change Password - {{ wtf.render_field(change_password_form.password, material_icon='vpn_key') }} - {{ wtf.render_field(change_password_form.new_password, material_icon='vpn_key') }} - {{ wtf.render_field(change_password_form.new_password_2, material_icon='vpn_key') }} -
                -
                -
                - {{ wtf.render_field(change_password_form.submit, material_icon='send') }} -
                -
                -
                -
                - -
                -
                - Delete account -

                Deleting an account has the following effects:

                -
                  -
                • All data associated with your corpora and jobs will be permanently deleted.
                  • -
                • All settings will be permanently deleted.
                  • -
                -
                -
                - deleteDelete -
                -
                - -
                -
                - -
                -
                -
                -{% endblock page_content %} - -{% block modals %} - - -{% endblock modals %} - -{% block scripts %} -{{ super() }} - -{% endblock scripts %} diff --git a/app/templates/users/profile.html.j2 b/app/templates/users/profile.html.j2 index 31c12359..895fba82 100644 --- a/app/templates/users/profile.html.j2 +++ b/app/templates/users/profile.html.j2 @@ -81,7 +81,7 @@


                {% if current_user.is_authenticated and current_user.hashid == user.id %} - Edit profile + Edit profile {% endif %}
              diff --git a/app/users/routes.py b/app/users/routes.py index 52e25f18..876df291 100644 --- a/app/users/routes.py +++ b/app/users/routes.py @@ -1,6 +1,5 @@ from flask import ( abort, - flash, redirect, render_template, send_from_directory, @@ -10,19 +9,9 @@ from flask_breadcrumbs import register_breadcrumb from flask_login import current_user, login_required import os from app import db -from app.models import Avatar, Corpus, ProfilePrivacySettings, User +from app.models import Corpus, User from . import bp -from .forms import ( - ChangePasswordForm, - EditNotificationSettingsForm, - EditPrivacySettingsForm, - EditProfileSettingsForm, - EditPublicProfileInformationForm -) -from .utils import ( - user_endpoint_arguments_constructor as user_eac, - user_dynamic_list_constructor as user_dlc -) +from .utils import user_dynamic_list_constructor as user_dlc @bp.route('') @@ -75,102 +64,3 @@ def profile_avatar(user_id): attachment_filename=user.avatar.filename, mimetype=user.avatar.mimetype ) - - -@bp.route('//edit', methods=['GET', 'POST']) -@register_breadcrumb(bp, 'breadcrumbs.settings', 'settingsSettings', endpoint_arguments_constructor=user_eac) -@login_required -def edit_profile(user_id): - user = User.query.get_or_404(user_id) - if not (user == current_user or current_user.is_administrator()): - abort(403) - # region forms - edit_profile_settings_form = EditProfileSettingsForm( - current_user, - data=current_user.to_json_serializeable(), - prefix='edit-profile-settings-form' - ) - edit_privacy_settings_form = EditPrivacySettingsForm( - data=current_user.to_json_serializeable(), - prefix='edit-privacy-settings-form' - ) - edit_public_profile_information_form = EditPublicProfileInformationForm( - data=current_user.to_json_serializeable(), - prefix='edit-public-profile-information-form' - ) - change_password_form = ChangePasswordForm( - current_user, - prefix='change-password-form' - ) - edit_notification_settings_form = EditNotificationSettingsForm( - data=current_user.to_json_serializeable(), - prefix='edit-notification-settings-form' - ) - # endregion forms - # region handle edit profile settings form - if edit_profile_settings_form.validate_on_submit(): - current_user.email = edit_profile_settings_form.email.data - current_user.username = edit_profile_settings_form.username.data - db.session.commit() - flash('Profile settings updated') - return redirect(url_for('.user', user_id=user.id)) - # endregion handle edit profile settings form - # region handle edit privacy settings form - if edit_privacy_settings_form.submit.data and edit_privacy_settings_form.validate(): - current_user.is_public = edit_privacy_settings_form.is_public.data - if edit_privacy_settings_form.show_email.data: - current_user.add_profile_privacy_setting(ProfilePrivacySettings.SHOW_EMAIL) - else: - current_user.remove_profile_privacy_setting(ProfilePrivacySettings.SHOW_EMAIL) - if edit_privacy_settings_form.show_last_seen.data: - current_user.add_profile_privacy_setting(ProfilePrivacySettings.SHOW_LAST_SEEN) - else: - current_user.remove_profile_privacy_setting(ProfilePrivacySettings.SHOW_LAST_SEEN) - if edit_privacy_settings_form.show_member_since.data: - current_user.add_profile_privacy_setting(ProfilePrivacySettings.SHOW_MEMBER_SINCE) - else: - current_user.remove_profile_privacy_setting(ProfilePrivacySettings.SHOW_MEMBER_SINCE) - db.session.commit() - flash('Your changes have been saved') - return redirect(url_for('.user', user_id=user.id)) - # endregion handle edit privacy settings form - # region handle edit public profile information form - if edit_public_profile_information_form.submit.data and edit_public_profile_information_form.validate(): - if edit_public_profile_information_form.avatar.data: - try: - Avatar.create(edit_public_profile_information_form.avatar.data, user=current_user) - except (AttributeError, OSError): - abort(500) - current_user.about_me = edit_public_profile_information_form.about_me.data - current_user.location = edit_public_profile_information_form.location.data - current_user.organization = edit_public_profile_information_form.organization.data - current_user.website = edit_public_profile_information_form.website.data - current_user.full_name = edit_public_profile_information_form.full_name.data - db.session.commit() - flash('Profile settings updated') - return redirect(url_for('.user', user_id=user.id)) - # endregion handle edit public profile information form - # region handle change_password_form POST - if change_password_form.submit.data and change_password_form.validate(): - current_user.password = change_password_form.new_password.data - db.session.commit() - flash('Your changes have been saved') - return redirect(url_for('.edit_profile', user_id=user.id)) - # endregion handle change_password_form POST - # region handle edit_notification_settings_form POST - if edit_notification_settings_form.submit and edit_notification_settings_form.validate(): - current_user.setting_job_status_mail_notification_level = edit_notification_settings_form.job_status_mail_notification_level.data - db.session.commit() - flash('Your changes have been saved') - return redirect(url_for('.edit_profile', user_id=user.id)) - # endregion handle edit_notification_settings_form POST - return render_template( - 'users/edit_profile.html.j2', - edit_profile_settings_form=edit_profile_settings_form, - edit_privacy_settings_form=edit_privacy_settings_form, - edit_public_profile_information_form=edit_public_profile_information_form, - change_password_form=change_password_form, - edit_notification_settings_form=edit_notification_settings_form, - user=user, - title='Settings' - ) From ff4406aaae748c3c486ed8f6be099036f18f750a Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Mon, 20 Mar 2023 15:31:25 +0100 Subject: [PATCH 086/177] Move elements in navigation bars --- app/templates/_navbar.html.j2 | 3 ++- app/templates/_sidenav.html.j2 | 10 +++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/app/templates/_navbar.html.j2 b/app/templates/_navbar.html.j2 index 467db7dd..a6cc0012 100644 --- a/app/templates/_navbar.html.j2 +++ b/app/templates/_navbar.html.j2 @@ -8,7 +8,8 @@ -
              diff --git a/app/templates/_sidenav.html.j2 b/app/templates/_sidenav.html.j2 index 2d66dc23..7b61cb03 100644 --- a/app/templates/_sidenav.html.j2 +++ b/app/templates/_sidenav.html.j2 @@ -25,7 +25,7 @@
              #} {#
            • nopaque
              • #} -
            • emailNews
              • +
            • emailNews
              • {#
            • helpManual
              • #}
            • Dashboard
            • IMy Corpora
              • @@ -44,10 +44,10 @@
            • Social Area
            • personPublic Users
            • IPublic Corpora
              • -
              • -
            • Account
              • -
            • settingsUser Settings
              • -
            • Log out
              • +
              • +
            • Account
              • +
            • settingsUser Settings
              • +
            • Log out
              • {% if current_user.can('ADMINISTRATE') or current_user.can('USE_API') %}
              • {% endif %} From 3d4403e997dca184aaea31d7fb7cd0aa11d07400 Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Mon, 20 Mar 2023 15:33:49 +0100 Subject: [PATCH 087/177] Move breadcrumbs --- app/__init__.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index 50e70fd2..de8afb15 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -72,15 +72,15 @@ def create_app(config: Config = Config) -> Flask: app.register_blueprint(auth_blueprint, url_prefix='/') from .contributions import bp as contributions_blueprint - default_breadcrumb_root(contributions_blueprint, '.dashboard.contributions') + default_breadcrumb_root(contributions_blueprint, '.contributions') app.register_blueprint(contributions_blueprint, url_prefix='/contributions') from .corpora import bp as corpora_blueprint - default_breadcrumb_root(corpora_blueprint, '.dashboard.corpora') + default_breadcrumb_root(corpora_blueprint, '.corpora') app.register_blueprint(corpora_blueprint, url_prefix='/corpora') from .jobs import bp as jobs_blueprint - default_breadcrumb_root(jobs_blueprint, '.dashboard.jobs') + default_breadcrumb_root(jobs_blueprint, '.jobs') app.register_blueprint(jobs_blueprint, url_prefix='/jobs') from .main import bp as main_blueprint @@ -96,7 +96,7 @@ def create_app(config: Config = Config) -> Flask: app.register_blueprint(settings_blueprint, url_prefix='/settings') from .users import bp as users_blueprint - default_breadcrumb_root(users_blueprint, '.social_area.users') + default_breadcrumb_root(users_blueprint, '.users') app.register_blueprint(users_blueprint, url_prefix='/users') return app From 575eeae94a8034f1348c8b932810a3adccb6ae9d Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Mon, 20 Mar 2023 16:00:25 +0100 Subject: [PATCH 088/177] Fix errors from settings move --- app/settings/routes.py | 26 +++++++------------ app/templates/_navbar.html.j2 | 2 +- app/templates/_sidenav.html.j2 | 2 +- ...{edit_profile.html.j2 => settings.html.j2} | 5 ++-- app/users/__init__.py | 2 +- app/users/routes.py | 1 - 6 files changed, 16 insertions(+), 22 deletions(-) rename app/templates/settings/{edit_profile.html.j2 => settings.html.j2} (98%) diff --git a/app/settings/routes.py b/app/settings/routes.py index bc36a9c8..a4e1e124 100644 --- a/app/settings/routes.py +++ b/app/settings/routes.py @@ -7,9 +7,8 @@ from flask import ( ) from flask_breadcrumbs import register_breadcrumb from flask_login import current_user, login_required -import os from app import db -from app.models import Avatar, Corpus, ProfilePrivacySettings, User +from app.models import Avatar, ProfilePrivacySettings from . import bp from .forms import ( ChangePasswordForm, @@ -17,16 +16,12 @@ from .forms import ( EditProfileSettingsForm, EditPublicProfileInformationForm ) -from .utils import user_endpoint_arguments_constructor as user_eac -@bp.route('//edit', methods=['GET', 'POST']) -@register_breadcrumb(bp, 'breadcrumbs.settings', 'settingsSettings', endpoint_arguments_constructor=user_eac) +@bp.route('', methods=['GET', 'POST']) +@register_breadcrumb(bp, '.', 'settingsSettings') @login_required -def edit_profile(user_id): - user = User.query.get_or_404(user_id) - if not (user == current_user or current_user.is_administrator()): - abort(403) +def settings(): # region forms edit_profile_settings_form = EditProfileSettingsForm( current_user, @@ -52,7 +47,7 @@ def edit_profile(user_id): current_user.username = edit_profile_settings_form.username.data db.session.commit() flash('Profile settings updated') - return redirect(url_for('users.user', user_id=user.id)) + return redirect(url_for('.settings')) # endregion handle edit profile settings forms # region handle edit public profile information form if edit_public_profile_information_form.submit.data and edit_public_profile_information_form.validate(): @@ -80,29 +75,28 @@ def edit_profile(user_id): current_user.website = edit_public_profile_information_form.website.data current_user.full_name = edit_public_profile_information_form.full_name.data db.session.commit() - flash('Profile settings updated') - return redirect(url_for('users.user', user_id=user.id)) + flash('Your changes have been saved') + return redirect(url_for('.settings')) # endregion handle edit public profile information form # region handle change_password_form POST if change_password_form.submit.data and change_password_form.validate(): current_user.password = change_password_form.new_password.data db.session.commit() flash('Your changes have been saved') - return redirect(url_for('.edit_profile', user_id=user.id)) + return redirect(url_for('.settings')) # endregion handle change_password_form POST # region handle edit_notification_settings_form POST if edit_notification_settings_form.submit and edit_notification_settings_form.validate(): current_user.setting_job_status_mail_notification_level = edit_notification_settings_form.job_status_mail_notification_level.data db.session.commit() flash('Your changes have been saved') - return redirect(url_for('.edit_profile', user_id=user.id)) + return redirect(url_for('.settings')) # endregion handle edit_notification_settings_form POST return render_template( - 'settings/edit_profile.html.j2', + 'settings/settings.html.j2', edit_profile_settings_form=edit_profile_settings_form, edit_public_profile_information_form=edit_public_profile_information_form, change_password_form=change_password_form, edit_notification_settings_form=edit_notification_settings_form, - user=user, title='Settings' ) diff --git a/app/templates/_navbar.html.j2 b/app/templates/_navbar.html.j2 index 00dd7700..61adaee5 100644 --- a/app/templates/_navbar.html.j2 +++ b/app/templates/_navbar.html.j2 @@ -33,7 +33,7 @@
                {#
              • helpManual
                • #} {% if current_user.is_authenticated %} -
              • settingsUser settings
                • +
              • settingsSettings
              • Log out
                • {% else %} diff --git a/app/templates/_sidenav.html.j2 b/app/templates/_sidenav.html.j2 index 7b61cb03..5157e262 100644 --- a/app/templates/_sidenav.html.j2 +++ b/app/templates/_sidenav.html.j2 @@ -46,7 +46,7 @@
              • IPublic Corpora
              • Account
                • -
              • settingsUser Settings
                • +
              • settingsSettings
              • Log out
                • {% if current_user.can('ADMINISTRATE') or current_user.can('USE_API') %}
                • diff --git a/app/templates/settings/edit_profile.html.j2 b/app/templates/settings/settings.html.j2 similarity index 98% rename from app/templates/settings/edit_profile.html.j2 rename to app/templates/settings/settings.html.j2 index afdc652d..fe60f0d2 100644 --- a/app/templates/settings/edit_profile.html.j2 +++ b/app/templates/settings/settings.html.j2 @@ -69,7 +69,7 @@
                @@ -114,7 +114,7 @@

                - user-image + user-image
                {{ wtf.render_field(edit_public_profile_information_form.avatar, accept='image/jpeg, image/png, image/gif', placeholder='Choose an image file', id='avatar-upload') }} @@ -200,6 +200,7 @@ {% endblock page_content %} {% block modals %} +{{ super() }}
              @@ -53,6 +64,28 @@
              + +
              +

              Contributions

              +
              + +
              +

              SpaCy NLP Pipeline Models

              +
              +
              +
              +
              +
              +
              + +
              +

              Tesseract OCR Pipeline Models

              +
              +
              +
              +
              +
              +
              {% endblock page_content %} diff --git a/app/templates/base.html.j2 b/app/templates/base.html.j2 index 1b442bf9..a924e9b7 100644 --- a/app/templates/base.html.j2 +++ b/app/templates/base.html.j2 @@ -34,7 +34,7 @@ {% block page_content %}{% endblock page_content %}
              {% block modals %} - {% include "main/_manual_modal_contents.html.j2" %} + {% include "main/_manual_modal.html.j2" %} {# {% if current_user.is_authenticated %} {% include "_roadmap.html.j2" %} {% endif %} #} diff --git a/app/templates/main/_manual_modal_contents.html.j2 b/app/templates/main/_manual_modal.html.j2 similarity index 100% rename from app/templates/main/_manual_modal_contents.html.j2 rename to app/templates/main/_manual_modal.html.j2 From a676475b553e598a4f3d5fe0f60fae7b8f95f7df Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Tue, 21 Mar 2023 09:14:16 +0100 Subject: [PATCH 091/177] Fix JobList delete function --- app/static/js/ResourceLists/CorpusList.js | 2 +- app/static/js/ResourceLists/JobList.js | 34 +++++++++++++++++++++-- 2 files changed, 33 insertions(+), 3 deletions(-) diff --git a/app/static/js/ResourceLists/CorpusList.js b/app/static/js/ResourceLists/CorpusList.js index 955bb424..00ddd7c1 100644 --- a/app/static/js/ResourceLists/CorpusList.js +++ b/app/static/js/ResourceLists/CorpusList.js @@ -56,7 +56,7 @@ class CorpusList extends ResourceList {
              search - +
              diff --git a/app/static/js/ResourceLists/JobList.js b/app/static/js/ResourceLists/JobList.js index 2c48996e..ff09d3cf 100644 --- a/app/static/js/ResourceLists/JobList.js +++ b/app/static/js/ResourceLists/JobList.js @@ -56,7 +56,7 @@ class JobList extends ResourceList {
              search - +
              @@ -96,7 +96,37 @@ class JobList extends ResourceList { let listAction = listActionElement === null ? 'view' : listActionElement.dataset.listAction; switch (listAction) { case 'delete-request': { - Requests.jobs.entity.delete(itemId); + let values = this.listjs.get('id', itemId)[0].values(); + let modalElement = Utils.HTMLToElement( + ` +
              +
              +

              Confirm Job deletion

              +

              Do you really want to delete the Job ${values.title}? All files will be permanently deleted!

              +
              +
              + Cancel + Delete +
              +
              + ` + ); + document.querySelector('#modals').appendChild(modalElement); + let modal = M.Modal.init( + modalElement, + { + dismissible: false, + onCloseEnd: () => { + modal.destroy(); + modalElement.remove(); + } + } + ); + let confirmElement = modalElement.querySelector('.action-button[data-action="confirm"]'); + confirmElement.addEventListener('click', (event) => { + Requests.jobs.entity.delete(itemId); + }); + modal.open(); break; } case 'view': { From 622d32fa45e6223d1b163dab33e240c9402ff359 Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Tue, 21 Mar 2023 10:50:29 +0100 Subject: [PATCH 092/177] UI enhancements --- app/admin/routes.py | 32 ++++++++-- app/templates/_sidenav.html.j2 | 11 ++-- app/templates/admin/admin.html.j2 | 11 ++++ app/templates/admin/corpora.html.j2 | 23 +++++++ app/templates/admin/user.html.j2 | 91 +++++++++++++++++----------- app/templates/main/dashboard.html.j2 | 55 +++++++++-------- app/templates/users/profile.html.j2 | 16 +++-- app/users/routes.py | 2 +- 8 files changed, 163 insertions(+), 78 deletions(-) create mode 100644 app/templates/admin/admin.html.j2 create mode 100644 app/templates/admin/corpora.html.j2 diff --git a/app/admin/routes.py b/app/admin/routes.py index 15ff0d9f..b2d0643b 100644 --- a/app/admin/routes.py +++ b/app/admin/routes.py @@ -1,9 +1,9 @@ -from flask import flash, redirect, render_template, url_for +from flask import flash, redirect, render_template, request, url_for from flask_breadcrumbs import register_breadcrumb from app import db, hashids -from app.models import Role, User, UserSettingJobStatusMailNotificationLevel -from app.users.forms import EditNotificationSettingsForm -from app.users.forms import EditProfileSettingsForm +from app.models import Corpus, Role, User, UserSettingJobStatusMailNotificationLevel +from app.settings.forms import EditNotificationSettingsForm +from app.settings.forms import EditProfileSettingsForm from . import bp from .forms import AdminEditUserForm from app.users.utils import ( @@ -15,7 +15,21 @@ from app.users.utils import ( @bp.route('') @register_breadcrumb(bp, '.', 'admin_panel_settingsAdministration') def index(): - return redirect(url_for('.users')) + return render_template( + 'admin/admin.html.j2', + title='Administration' + ) + + +@bp.route('/corpora') +@register_breadcrumb(bp, '.corpora', 'Corpora') +def corpora(): + corpora = [x.to_json_serializeable(backrefs=True) for x in Corpus.query.all()] + return render_template( + 'admin/corpora.html.j2', + corpora=corpora, + title='Corpora' + ) @bp.route('/users') @@ -33,7 +47,13 @@ def users(): @register_breadcrumb(bp, '.users.entity', '', dynamic_list_constructor=user_dlc) def user(user_id): user = User.query.get_or_404(user_id) - return render_template('admin/user.html.j2', title='User', user=user) + return render_template('admin/user.html.j2', title=user.username, user=user) + + +@bp.route('/users//dashboard') +@register_breadcrumb(bp, '.users.entity.dashboard', 'Dashboard', endpoint_arguments_constructor=user_eac) +def user_dashboard(user_id): + return render_template('main/dashboard.html.j2', title='Dashboard') @bp.route('/users//edit', methods=['GET', 'POST']) diff --git a/app/templates/_sidenav.html.j2 b/app/templates/_sidenav.html.j2 index 5157e262..5f6f6482 100644 --- a/app/templates/_sidenav.html.j2 +++ b/app/templates/_sidenav.html.j2 @@ -48,13 +48,16 @@
            • Account
            • settingsSettings
            • Log out
              • - {% if current_user.can('ADMINISTRATE') or current_user.can('USE_API') %} -
              • - {% endif %} {% if current_user.can('ADMINISTRATE') %} -
            • admin_panel_settingsAdministration
              • +
              • +
            • Administration
              • +
            • ICorpora
              • +
            • JJobs
              • +
            • groupUsers
              • {% endif %} {% if current_user.can('USE_API') %} +
              • +
            • API
            • apiAPI
              • {% endif %} diff --git a/app/templates/admin/admin.html.j2 b/app/templates/admin/admin.html.j2 new file mode 100644 index 00000000..d00adf58 --- /dev/null +++ b/app/templates/admin/admin.html.j2 @@ -0,0 +1,11 @@ +{% extends "base.html.j2" %} + +{% block page_content %} +
              +
              +
              +

              {{ title }}

              +
              +
              +
              +{% endblock page_content %} diff --git a/app/templates/admin/corpora.html.j2 b/app/templates/admin/corpora.html.j2 new file mode 100644 index 00000000..99fcc661 --- /dev/null +++ b/app/templates/admin/corpora.html.j2 @@ -0,0 +1,23 @@ +{% extends "base.html.j2" %} + +{% block page_content %} +
              +

              {{ title }}

              + +
              +
              +
              +
              +
              +
              + +{% endblock page_content %} + +{% block scripts %} +{{ super() }} + +{% endblock scripts %} diff --git a/app/templates/admin/user.html.j2 b/app/templates/admin/user.html.j2 index e3864e75..30f7c084 100644 --- a/app/templates/admin/user.html.j2 +++ b/app/templates/admin/user.html.j2 @@ -3,52 +3,49 @@ {% block page_content %}
              -
              +
              +

               

              + user-image +
              +

              {{ title }}

              + {{ user.role.name }} + {{ 'confirmed' if user.confirmed else 'unconfirmed' }} +

              {{ user.about_me }}

              -
              -

              Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren,

              - arrow_backBack to Users +
               
              + +
              +
              -
              +
              - User information
              • Username: {{ user.username }}
              • Email: {{ user.email }}
              • Id: {{ user.id }}
              • Hashid: {{ user.hashid }}
              • Member since: {{ user.member_since }}
                • -
              • Confirmed status: {{ user.confirmed }}
              • Last seen: {{ user.last_seen }}
                • -
              • Permissions as Int: {{ user.role.permissions }}
                • -
              • Role: {{ user.role.name }}
                • -
              • Permissions: -
                  - {% for permission in ['ADMINISTRATE', 'CONTRIBUTE', 'USE_API'] %} -
                • - -
                  • - {% endfor %} -
                -
              - editEdit - deleteDelete + editEdit + deleteDelete
              -
              -

              Corpora

              +
              @@ -56,8 +53,7 @@
              -
              -

              Jobs

              +
              @@ -65,12 +61,7 @@
              -
              -

              Contributions

              -
              - -
              -

              SpaCy NLP Pipeline Models

              +
              @@ -78,8 +69,7 @@
              -
              -

              Tesseract OCR Pipeline Models

              +
              @@ -99,8 +89,35 @@

              Do you really want to delete the user {{ user.username }}? All associated data will be permanently deleted!

              - Cancel - deleteDelete + Cancel + deleteDelete
              {% endblock modals %} + + +{% block scripts %} +{{ super() }} + +{% endblock scripts %} diff --git a/app/templates/main/dashboard.html.j2 b/app/templates/main/dashboard.html.j2 index 0b8e6f31..54f91eaa 100644 --- a/app/templates/main/dashboard.html.j2 +++ b/app/templates/main/dashboard.html.j2 @@ -8,8 +8,11 @@
              -

              My Corpora

              +

              My Corpora

              Create a corpus to interactively perform linguistic analysis.

              +
              + +
              @@ -22,7 +25,7 @@
              -

              My Jobs

              +

              My Jobs

              A job is the execution of a service provided by nopaque. You can create any number of jobs and let them be processed simultaneously. We @@ -32,6 +35,9 @@ next step.

              Where is my Job data? Don't worry, please read this news entry

              +
              + +
              @@ -43,34 +49,35 @@
              -

              My Contributions

              -
              -
              - -
              - Tesseract OCR Pipeline Models -

              Here you can see and edit the models that you have created. You can also create new models.

              -
              +

              My Contributions

              +
              + +
              +
              + +
              + Tesseract OCR Pipeline Models +

              Here you can see and edit the models that you have created. You can also create new models.

              +
              -
              -
              - -
              - SpaCy NLP Pipeline Models -

              Here you can see and edit the models that you have created. You can also create new models.

              -
              +
              +
              + +
              + SpaCy NLP Pipeline Models +

              Here you can see and edit the models that you have created. You can also create new models.

              +
              -
              -
              - -
              - Transkribus HTR Pipeline Models -

              Here you can see and edit the models that you have created. You can also create new models.

              -
              +
              +
              + +
              + Transkribus HTR Pipeline Models +

              Here you can see and edit the models that you have created. You can also create new models.

              diff --git a/app/templates/users/profile.html.j2 b/app/templates/users/profile.html.j2 index 895fba82..6e02a42c 100644 --- a/app/templates/users/profile.html.j2 +++ b/app/templates/users/profile.html.j2 @@ -18,10 +18,14 @@
              +

              {{ user.username }}

              + {% if user.role.name != 'User' %} + {{ user.role.name }} + {% endif %} {% if user.is_public %} -

              {{ user.username }}

              + Public Profile {% else %} -

              {{ user.username }}

              + Private Profile {% endif %}
              @@ -34,10 +38,10 @@


              {% if user.about_me %} -
              +
              About me

              {{ user.about_me }}

              -
              + {% endif %}
              @@ -80,8 +84,8 @@ {% endif %}


              - {% if current_user.is_authenticated and current_user.hashid == user.id %} - Edit profile + {% if current_user.hashid == user.id %} + Edit profile {% endif %}
              diff --git a/app/users/routes.py b/app/users/routes.py index 0bf8eb1d..5d51e81f 100644 --- a/app/users/routes.py +++ b/app/users/routes.py @@ -42,7 +42,7 @@ def user(user_id): last_seen=last_seen, member_since=member_since, own_public_corpora=own_public_corpora, - user=user.to_json_serializeable(), + user=user, user_id=user_id, title=user.username ) From 57813b4bc2dac150f4a5aa8a70cf4ae48bf9e932 Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Wed, 22 Mar 2023 12:06:33 +0100 Subject: [PATCH 093/177] Fix link issues --- app/admin/routes.py | 2 +- app/models.py | 40 ++++++--- app/templates/_sidenav.html.j2 | 87 ++++++++++++------- app/templates/admin/user.html.j2 | 2 +- app/templates/corpora/public_corpus.html.j2 | 6 +- app/templates/settings/settings.html.j2 | 2 +- .../users/{profile.html.j2 => user.html.j2} | 57 +++++++----- app/users/routes.py | 20 +---- 8 files changed, 127 insertions(+), 89 deletions(-) rename app/templates/users/{profile.html.j2 => user.html.j2} (71%) diff --git a/app/admin/routes.py b/app/admin/routes.py index b2d0643b..c1014250 100644 --- a/app/admin/routes.py +++ b/app/admin/routes.py @@ -14,7 +14,7 @@ from app.users.utils import ( @bp.route('') @register_breadcrumb(bp, '.', 'admin_panel_settingsAdministration') -def index(): +def admin(): return render_template( 'admin/admin.html.j2', title='Administration' diff --git a/app/models.py b/app/models.py index 1ed18ada..a527c1b2 100644 --- a/app/models.py +++ b/app/models.py @@ -100,6 +100,15 @@ class ProfilePrivacySettings(IntEnum): SHOW_LAST_SEEN = 2 SHOW_MEMBER_SINCE = 4 + @staticmethod + def get(profile_privacy_setting: Union['ProfilePrivacySettings', int, str]) -> 'ProfilePrivacySettings': + if isinstance(profile_privacy_setting, ProfilePrivacySettings): + return profile_privacy_setting + if isinstance(profile_privacy_setting, int): + return ProfilePrivacySettings(profile_privacy_setting) + if isinstance(profile_privacy_setting, str): + return ProfilePrivacySettings[profile_privacy_setting] + raise TypeError('profile_privacy_setting must be ProfilePrivacySettings, int, or str') class CorpusFollowerPermission(IntEnum): VIEW = 1 @@ -227,18 +236,18 @@ class Role(HashidMixin, db.Model): return f'' def has_permission(self, permission: Union[Permission, int, str]): - perm = Permission.get(permission) - return self.permissions & perm.value == perm.value + p = Permission.get(permission) + return self.permissions & p.value == p.value def add_permission(self, permission: Union[Permission, int, str]): - perm = Permission.get(permission) - if not self.has_permission(perm): - self.permissions += perm.value + p = Permission.get(permission) + if not self.has_permission(p): + self.permissions += p.value def remove_permission(self, permission: Union[Permission, int, str]): - perm = Permission.get(permission) - if self.has_permission(perm): - self.permissions -= perm.value + p = Permission.get(permission) + if self.has_permission(p): + self.permissions -= p.value def reset_permissions(self): self.permissions = 0 @@ -763,15 +772,18 @@ class User(HashidMixin, UserMixin, db.Model): #region Profile Privacy settings def has_profile_privacy_setting(self, setting): - return self.profile_privacy_settings & setting == setting + s = ProfilePrivacySettings.get(setting) + return self.profile_privacy_settings & s.value == s.value def add_profile_privacy_setting(self, setting): - if not self.has_profile_privacy_setting(setting): - self.profile_privacy_settings += setting + s = ProfilePrivacySettings.get(setting) + if not self.has_profile_privacy_setting(s): + self.profile_privacy_settings += s.value def remove_profile_privacy_setting(self, setting): - if self.has_profile_privacy_setting(setting): - self.profile_privacy_settings -= setting + s = ProfilePrivacySettings.get(setting) + if self.has_profile_privacy_setting(s): + self.profile_privacy_settings -= s.value def reset_profile_privacy_settings(self): self.profile_privacy_settings = 0 @@ -838,7 +850,7 @@ class User(HashidMixin, UserMixin, db.Model): json_serializeable = { 'id': self.hashid, 'confirmed': self.confirmed, - 'avatar': url_for('users.profile_avatar', user_id=self.id), + 'avatar': url_for('users.user_avatar', user_id=self.id), 'email': self.email, 'last_seen': ( None if self.last_seen is None diff --git a/app/templates/_sidenav.html.j2 b/app/templates/_sidenav.html.j2 index 5f6f6482..3a01ec4a 100644 --- a/app/templates/_sidenav.html.j2 +++ b/app/templates/_sidenav.html.j2 @@ -4,13 +4,9 @@
              - - {% if current_user.avatar %} - user-image - {% else %} - user-image - {% endif %} - + + user-image +
              {{ current_user.username }} @@ -25,39 +21,72 @@
              #} {#
            • nopaque
              • #} -
            • emailNews
              • +
            • + emailNews +
              • {#
            • helpManual
              • #} -
            • Dashboard
              • -
            • IMy Corpora
              • -
            • JMy Jobs
              • -
            • new_labelMy Contributions
              • +
            • + dashboardDashboard + +
            • Processes & Services
              • -
            • File setup
              • -
            • OCR
              • +
            • + File setup +
              • +
            • + OCR +
              • {% if config.NOPAQUE_TRANSKRIBUS_ENABLED %} -
            • HTR
              • +
            • + HTR +
              • {% endif %} -
            • NLP
              • -
            • Corpus Analysis
              • +
            • + NLP +
              • +
            • + Corpus Analysis +
              • -
            • Social Area
              • -
            • personPublic Users
              • -
            • IPublic Corpora
              • +
            • + rocket_launchSocial Area + +
            • Account
              • -
            • settingsSettings
              • -
            • Log out
              • +
            • + settingsSettings +
              • +
            • + Log out +
              • {% if current_user.can('ADMINISTRATE') %}
              • -
            • Administration
              • -
            • ICorpora
              • -
            • JJobs
              • -
            • groupUsers
              • +
            • + admin_panel_settingsAdministration +
              • {% endif %} {% if current_user.can('USE_API') %} -
              • -
            • API
              • -
            • apiAPI
              • +
            • + apiAPI +
              • {% endif %} diff --git a/app/templates/admin/user.html.j2 b/app/templates/admin/user.html.j2 index 30f7c084..f8943430 100644 --- a/app/templates/admin/user.html.j2 +++ b/app/templates/admin/user.html.j2 @@ -5,7 +5,7 @@

               

              - user-image + user-image

              {{ title }}

              diff --git a/app/templates/corpora/public_corpus.html.j2 b/app/templates/corpora/public_corpus.html.j2 index ff445e38..77e3ea4b 100644 --- a/app/templates/corpora/public_corpus.html.j2 +++ b/app/templates/corpora/public_corpus.html.j2 @@ -48,11 +48,7 @@
              {% endif %} - {% if user.show_email %} + {% if user.has_profile_privacy_setting('SHOW_EMAIL') %} @@ -78,18 +80,17 @@ {% endif %}
              - {% if corpus.user.avatar %} - user-image - {% else %} - user-image - {% endif %} + user-image diff --git a/app/templates/settings/settings.html.j2 b/app/templates/settings/settings.html.j2 index fe60f0d2..282d4185 100644 --- a/app/templates/settings/settings.html.j2 +++ b/app/templates/settings/settings.html.j2 @@ -114,7 +114,7 @@

              - user-image + user-image
              {{ wtf.render_field(edit_public_profile_information_form.avatar, accept='image/jpeg, image/png, image/gif', placeholder='Choose an image file', id='avatar-upload') }} diff --git a/app/templates/users/profile.html.j2 b/app/templates/users/user.html.j2 similarity index 71% rename from app/templates/users/profile.html.j2 rename to app/templates/users/user.html.j2 index 6e02a42c..cc138794 100644 --- a/app/templates/users/profile.html.j2 +++ b/app/templates/users/user.html.j2 @@ -1,6 +1,7 @@ {% extends "base.html.j2" %} {% import "materialize/wtf.html.j2" as wtf %} + {% block page_content %}
              @@ -10,9 +11,8 @@
              -
              -
              - user-image +

               

              + user-image
              @@ -27,16 +27,18 @@ {% else %} Private Profile {% endif %} + {% if user.has_profile_privacy_setting('SHOW_MEMBER_SINCE') %} + Member since: {{ user.member_since.strftime('%Y-%m-%d') }} + {% endif %} + {% if user.has_profile_privacy_setting('SHOW_LAST_SEEN') %} + Last seen: {{ user.last_seen.strftime('%Y-%m-%d') }} + {% endif %}
              - {% if user.show_last_seen %} -
              Last seen: {{ last_seen }}
              - {% endif %} {% if user.location %} -

              location_on{{ user.location }}

              +

               

              +

              location_on{{ user.location }}

              {% endif %} -

              -
              {% if user.about_me %}
              About me
              @@ -59,7 +61,7 @@
              		{{ user.full_name }}
              email {{ user.email }}
              -
              - {% if user.show_member_since %} -

              Member since: {{ member_since }}

              - {% endif %} -

              -
              - {% if current_user.hashid == user.id %} - Edit profile - {% endif %} +

               

              + {% if current_user == user %} +
              +

              + Edit profile +

              +
              + {% endif %} @@ -119,8 +120,22 @@ {{ super() }} {% endblock scripts %} diff --git a/app/users/routes.py b/app/users/routes.py index 5d51e81f..2c2334f3 100644 --- a/app/users/routes.py +++ b/app/users/routes.py @@ -25,32 +25,18 @@ def users(): @login_required def user(user_id): user = User.query.get_or_404(user_id) - last_seen = user.last_seen.strftime('%Y-%m-%d %H:%M') - member_since = user.member_since.strftime('%Y-%m-%d') - followed_corpora = [ - c.to_json_serializeable() for c in user.followed_corpora - ] - own_public_corpora = [ - c.to_json_serializeable() for c - in Corpus.query.filter_by(is_public = True, user = user).all() - ] - if not user.is_public and user != current_user: + if not (user.is_public or user == current_user or current_user.is_administrator()): abort(403) return render_template( - 'users/profile.html.j2', - followed_corpora=followed_corpora, - last_seen=last_seen, - member_since=member_since, - own_public_corpora=own_public_corpora, + 'users/user.html.j2', user=user, - user_id=user_id, title=user.username ) @bp.route('//avatar') @login_required -def profile_avatar(user_id): +def user_avatar(user_id): user = User.query.get_or_404(user_id) if not (user.is_public or user == current_user or current_user.is_administrator()): abort(403) From 5b6eae76455e1b9f59a4c8d93fb3cf153b90afb9 Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Thu, 23 Mar 2023 17:42:51 +0100 Subject: [PATCH 094/177] Cleanup --- app/admin/routes.py | 32 ++++--- app/settings/forms.py | 55 ++++++++++-- app/settings/routes.py | 100 +++++++++------------ app/templates/admin/corpora.html.j2 | 9 +- app/templates/admin/user.html.j2 | 20 +++-- app/templates/admin/users.html.j2 | 9 +- app/templates/settings/settings.html.j2 | 110 ++++++++++-------------- 7 files changed, 177 insertions(+), 158 deletions(-) diff --git a/app/admin/routes.py b/app/admin/routes.py index c1014250..0b4ac8fc 100644 --- a/app/admin/routes.py +++ b/app/admin/routes.py @@ -2,8 +2,8 @@ from flask import flash, redirect, render_template, request, url_for from flask_breadcrumbs import register_breadcrumb from app import db, hashids from app.models import Corpus, Role, User, UserSettingJobStatusMailNotificationLevel -from app.settings.forms import EditNotificationSettingsForm -from app.settings.forms import EditProfileSettingsForm +from app.settings.forms import EditNotificationsForm +from app.settings.forms import EditAccountForm from . import bp from .forms import AdminEditUserForm from app.users.utils import ( @@ -24,22 +24,22 @@ def admin(): @bp.route('/corpora') @register_breadcrumb(bp, '.corpora', 'Corpora') def corpora(): - corpora = [x.to_json_serializeable(backrefs=True) for x in Corpus.query.all()] + corpora = Corpus.query.all() return render_template( 'admin/corpora.html.j2', - corpora=corpora, - title='Corpora' + title='Corpora', + corpora=corpora ) @bp.route('/users') @register_breadcrumb(bp, '.users', 'groupUsers') def users(): - users = [x.to_json_serializeable(backrefs=True) for x in User.query.all()] + users = User.query.all() return render_template( 'admin/users.html.j2', - users=users, - title='Users' + title='Users', + users=users ) @@ -47,13 +47,11 @@ def users(): @register_breadcrumb(bp, '.users.entity', '', dynamic_list_constructor=user_dlc) def user(user_id): user = User.query.get_or_404(user_id) - return render_template('admin/user.html.j2', title=user.username, user=user) - - -@bp.route('/users//dashboard') -@register_breadcrumb(bp, '.users.entity.dashboard', 'Dashboard', endpoint_arguments_constructor=user_eac) -def user_dashboard(user_id): - return render_template('main/dashboard.html.j2', title='Dashboard') + return render_template( + 'admin/user.html.j2', + title=user.username, + user=user + ) @bp.route('/users//edit', methods=['GET', 'POST']) @@ -64,12 +62,12 @@ def edit_user(user_id): data={'confirmed': user.confirmed, 'role': user.role.hashid}, prefix='admin-edit-user-form' ) - edit_profile_settings_form = EditProfileSettingsForm( + edit_profile_settings_form = EditAccountForm( user, data=user.to_json_serializeable(), prefix='edit-profile-settings-form' ) - edit_notification_settings_form = EditNotificationSettingsForm( + edit_notification_settings_form = EditNotificationsForm( data=user.to_json_serializeable(), prefix='edit-notification-settings-form' ) diff --git a/app/settings/forms.py b/app/settings/forms.py index a814feee..7a38e074 100644 --- a/app/settings/forms.py +++ b/app/settings/forms.py @@ -1,3 +1,4 @@ +from flask_login import current_user from flask_wtf import FlaskForm from wtforms import ( BooleanField, @@ -20,7 +21,8 @@ from app.models import User, UserSettingJobStatusMailNotificationLevel from app.auth import USERNAME_REGEX from app.wtf_validators import FileSizeLimit -class EditProfileSettingsForm(FlaskForm): + +class EditAccountForm(FlaskForm): email = StringField( 'E-Mail', validators=[DataRequired(), Length(max=254), Email()] @@ -41,7 +43,12 @@ class EditProfileSettingsForm(FlaskForm): ) submit = SubmitField() - def __init__(self, user, *args, **kwargs): + def __init__(self, *args, **kwargs): + user = kwargs.get('user', current_user._get_current_object()) + if 'data' not in kwargs: + kwargs['data'] = user.to_json_serializeable() + if 'prefix' not in kwargs: + kwargs['prefix'] = 'edit-profile-settings-form' super().__init__(*args, **kwargs) self.user = user @@ -55,7 +62,11 @@ class EditProfileSettingsForm(FlaskForm): and User.query.filter_by(username=field.data).first()): raise ValidationError('Username already in use') -class EditPublicProfileInformationForm(FlaskForm): + def validate_on_submit(self): + return self.submit.data and self.validate() + + +class EditProfileForm(FlaskForm): show_email = BooleanField('Email') show_last_seen = BooleanField('Last seen') show_member_since = BooleanField('Member since') @@ -67,13 +78,11 @@ class EditPublicProfileInformationForm(FlaskForm): 'Full name', validators=[Length(max=128)] ) - style={'style': 'overflow: auto;'} about_me = TextAreaField( 'About me', validators=[ Length(max=254) - ], - render_kw=style + ] ) website = StringField( 'Website', @@ -93,13 +102,24 @@ class EditPublicProfileInformationForm(FlaskForm): Length(max=128) ] ) - submit = SubmitField() + def __init__(self, *args, **kwargs): + if 'data' not in kwargs: + user = current_user._get_current_object() + kwargs['data'] = user.to_json_serializeable() + if 'prefix' not in kwargs: + kwargs['prefix'] = 'edit-public-profile-information-form' + super().__init__(*args, **kwargs) + def validate_image_file(self, field): if not field.data.filename.lower().endswith('.jpg' or '.png' or '.jpeg'): raise ValidationError('only .jpg, .png and .jpeg!') + def validate_on_submit(self): + return self.submit.data and self.validate() + + class ChangePasswordForm(FlaskForm): password = PasswordField('Old password', validators=[DataRequired()]) new_password = PasswordField( @@ -118,7 +138,10 @@ class ChangePasswordForm(FlaskForm): ) submit = SubmitField() - def __init__(self, user, *args, **kwargs): + def __init__(self, *args, **kwargs): + user = kwargs.get('user', current_user._get_current_object()) + if 'prefix' not in kwargs: + kwargs['prefix'] = 'change-password-form' super().__init__(*args, **kwargs) self.user = user @@ -126,8 +149,11 @@ class ChangePasswordForm(FlaskForm): if not self.user.verify_password(field.data): raise ValidationError('Invalid password') + def validate_on_submit(self): + return self.submit.data and self.validate() -class EditNotificationSettingsForm(FlaskForm): + +class EditNotificationsForm(FlaskForm): job_status_mail_notification_level = SelectField( 'Job status mail notification level', choices=[ @@ -137,3 +163,14 @@ class EditNotificationSettingsForm(FlaskForm): validators=[DataRequired()] ) submit = SubmitField() + + def __init__(self, *args, **kwargs): + if 'data' not in kwargs: + user = current_user._get_current_object() + kwargs['data'] = user.to_json_serializeable() + if 'prefix' not in kwargs: + kwargs['prefix'] = 'edit-notification-settings-form' + super().__init__(*args, **kwargs) + + def validate_on_submit(self): + return self.submit.data and self.validate() diff --git a/app/settings/routes.py b/app/settings/routes.py index a4e1e124..dba854b0 100644 --- a/app/settings/routes.py +++ b/app/settings/routes.py @@ -1,20 +1,14 @@ -from flask import ( - abort, - flash, - redirect, - render_template, - url_for -) +from flask import abort, flash, redirect, render_template, url_for from flask_breadcrumbs import register_breadcrumb from flask_login import current_user, login_required from app import db -from app.models import Avatar, ProfilePrivacySettings +from app.models import Avatar from . import bp from .forms import ( ChangePasswordForm, - EditNotificationSettingsForm, - EditProfileSettingsForm, - EditPublicProfileInformationForm + EditNotificationsForm, + EditAccountForm, + EditProfileForm ) @@ -22,81 +16,73 @@ from .forms import ( @register_breadcrumb(bp, '.', 'settingsSettings') @login_required def settings(): + user = current_user._get_current_object() # region forms - edit_profile_settings_form = EditProfileSettingsForm( - current_user, - data=current_user.to_json_serializeable(), - prefix='edit-profile-settings-form' - ) - edit_public_profile_information_form = EditPublicProfileInformationForm( - data=current_user.to_json_serializeable(), - prefix='edit-public-profile-information-form' - ) - change_password_form = ChangePasswordForm( - current_user, - prefix='change-password-form' - ) - edit_notification_settings_form = EditNotificationSettingsForm( - data=current_user.to_json_serializeable(), - prefix='edit-notification-settings-form' - ) + edit_account_form = EditAccountForm() + edit_profile_form = EditProfileForm() + change_password_form = ChangePasswordForm() + edit_notifications_form = EditNotificationsForm() # endregion forms # region handle edit profile settings form - if edit_profile_settings_form.validate_on_submit(): - current_user.email = edit_profile_settings_form.email.data - current_user.username = edit_profile_settings_form.username.data + if edit_account_form.validate_on_submit(): + user.email = edit_account_form.email.data + user.username = edit_account_form.username.data db.session.commit() flash('Profile settings updated') return redirect(url_for('.settings')) # endregion handle edit profile settings forms # region handle edit public profile information form - if edit_public_profile_information_form.submit.data and edit_public_profile_information_form.validate(): - print(edit_public_profile_information_form.show_email.data) - if edit_public_profile_information_form.show_email.data: - current_user.add_profile_privacy_setting(ProfilePrivacySettings.SHOW_EMAIL) + if edit_profile_form.validate_on_submit(): + if edit_profile_form.show_email.data: + user.add_profile_privacy_setting('SHOW_EMAIL') else: - current_user.remove_profile_privacy_setting(ProfilePrivacySettings.SHOW_EMAIL) - if edit_public_profile_information_form.show_last_seen.data: - current_user.add_profile_privacy_setting(ProfilePrivacySettings.SHOW_LAST_SEEN) + user.remove_profile_privacy_setting('SHOW_EMAIL') + if edit_profile_form.show_last_seen.data: + user.add_profile_privacy_setting('SHOW_LAST_SEEN') else: - current_user.remove_profile_privacy_setting(ProfilePrivacySettings.SHOW_LAST_SEEN) - if edit_public_profile_information_form.show_member_since.data: - current_user.add_profile_privacy_setting(ProfilePrivacySettings.SHOW_MEMBER_SINCE) + user.remove_profile_privacy_setting('SHOW_LAST_SEEN') + if edit_profile_form.show_member_since.data: + user.add_profile_privacy_setting('SHOW_MEMBER_SINCE') else: - current_user.remove_profile_privacy_setting(ProfilePrivacySettings.SHOW_MEMBER_SINCE) - if edit_public_profile_information_form.avatar.data: + user.remove_profile_privacy_setting('SHOW_MEMBER_SINCE') + if edit_profile_form.avatar.data: try: - Avatar.create(edit_public_profile_information_form.avatar.data, user=current_user) + Avatar.create( + edit_profile_form.avatar.data, + user=user + ) except (AttributeError, OSError): abort(500) - current_user.about_me = edit_public_profile_information_form.about_me.data - current_user.location = edit_public_profile_information_form.location.data - current_user.organization = edit_public_profile_information_form.organization.data - current_user.website = edit_public_profile_information_form.website.data - current_user.full_name = edit_public_profile_information_form.full_name.data + user.about_me = edit_profile_form.about_me.data + user.location = edit_profile_form.location.data + user.organization = edit_profile_form.organization.data + user.website = edit_profile_form.website.data + user.full_name = edit_profile_form.full_name.data db.session.commit() flash('Your changes have been saved') return redirect(url_for('.settings')) # endregion handle edit public profile information form # region handle change_password_form POST - if change_password_form.submit.data and change_password_form.validate(): - current_user.password = change_password_form.new_password.data + if change_password_form.validate_on_submit(): + user.password = change_password_form.new_password.data db.session.commit() flash('Your changes have been saved') return redirect(url_for('.settings')) # endregion handle change_password_form POST # region handle edit_notification_settings_form POST - if edit_notification_settings_form.submit and edit_notification_settings_form.validate(): - current_user.setting_job_status_mail_notification_level = edit_notification_settings_form.job_status_mail_notification_level.data + if edit_notifications_form.validate_on_submit(): + user.setting_job_status_mail_notification_level = \ + edit_notifications_form.job_status_mail_notification_level.data db.session.commit() flash('Your changes have been saved') return redirect(url_for('.settings')) # endregion handle edit_notification_settings_form POST return render_template( 'settings/settings.html.j2', - edit_profile_settings_form=edit_profile_settings_form, - edit_public_profile_information_form=edit_public_profile_information_form, + title='Settings', change_password_form=change_password_form, - edit_notification_settings_form=edit_notification_settings_form, - title='Settings' + edit_account_form=edit_account_form, + edit_notifications_form=edit_notifications_form, + edit_profile_form=edit_profile_form, + user=user ) diff --git a/app/templates/admin/corpora.html.j2 b/app/templates/admin/corpora.html.j2 index 99fcc661..cc4a177c 100644 --- a/app/templates/admin/corpora.html.j2 +++ b/app/templates/admin/corpora.html.j2 @@ -18,6 +18,13 @@ {% endblock scripts %} diff --git a/app/templates/admin/user.html.j2 b/app/templates/admin/user.html.j2 index f8943430..403828f2 100644 --- a/app/templates/admin/user.html.j2 +++ b/app/templates/admin/user.html.j2 @@ -9,12 +9,18 @@

              {{ title }}

              - {{ user.role.name }} - {{ 'confirmed' if user.confirmed else 'unconfirmed' }} -

              {{ user.about_me }}

              +

              + {{ user.role.name }} + {% if user.confirmed %} + confirmed + {% else %} + unconfirmed + {% endif %} +

              +

              {{ user.about_me }}

              -
               
              +
               
                @@ -34,8 +40,8 @@
              • Email: {{ user.email }}
              • Id: {{ user.id }}
              • Hashid: {{ user.hashid }}
                • -
              • Member since: {{ user.member_since }}
                • -
              • Last seen: {{ user.last_seen }}
                • +
              • Member since: {{ user.member_since.strftime('%Y-%m-%d') }}
                • +
              • Last seen: {{ user.last_seen.strftime('%Y-%m-%d') }}
              @@ -89,7 +95,7 @@

              Do you really want to delete the user {{ user.username }}? All associated data will be permanently deleted!

              - Cancel + Cancel deleteDelete
              diff --git a/app/templates/admin/users.html.j2 b/app/templates/admin/users.html.j2 index 25b27c95..a71c8f59 100644 --- a/app/templates/admin/users.html.j2 +++ b/app/templates/admin/users.html.j2 @@ -23,6 +23,13 @@ {% endblock scripts %} diff --git a/app/templates/settings/settings.html.j2 b/app/templates/settings/settings.html.j2 index 282d4185..b219d3e6 100644 --- a/app/templates/settings/settings.html.j2 +++ b/app/templates/settings/settings.html.j2 @@ -18,7 +18,7 @@

              -
                +
                • User Settings @@ -28,48 +28,26 @@
                  - {{ edit_profile_settings_form.hidden_tag() }} - {{ wtf.render_field(edit_profile_settings_form.username, material_icon='person') }} - {{ wtf.render_field(edit_profile_settings_form.email, material_icon='email') }} + {{ edit_account_form.hidden_tag() }} + {{ wtf.render_field(edit_account_form.username, material_icon='person') }} + {{ wtf.render_field(edit_account_form.email, material_icon='email') }}
                  - {{ wtf.render_field(edit_profile_settings_form.submit, material_icon='send') }} + {{ wtf.render_field(edit_account_form.submit, material_icon='send') }}
                  • - {#
                • -
                  Privacy Settingskeyboard_arrow_right
                  -
                  -
                  - {{ edit_privacy_settings_form.hidden_tag() }} -
                  - {{ wtf.render_field(edit_privacy_settings_form.is_public, id='public-profile') }} -
                  -
                  -
                  - {{ wtf.render_field(edit_privacy_settings_form.show_email, data_action='disable', disabled=true) }} -
                  - {{ wtf.render_field(edit_privacy_settings_form.show_last_seen, data_action='disable', disabled=true) }} -
                  - {{ wtf.render_field(edit_privacy_settings_form.show_member_since, data_action='disable', disabled=true) }} -
                  -
                  - {{ wtf.render_field(edit_privacy_settings_form.submit, material_icon='send') }} -
                  -
                  -
                  -
                  • #}
                • Public Profilekeyboard_arrow_right
                  - {{ edit_public_profile_information_form.hidden_tag() }} + {{ edit_profile_form.hidden_tag() }}
                  @@ -82,42 +60,42 @@


                  - {{ wtf.render_field(edit_public_profile_information_form.full_name, material_icon='badge') }} - {{ wtf.render_field(edit_public_profile_information_form.about_me, material_icon='description', id='about-me-textfield') }} - {{ wtf.render_field(edit_public_profile_information_form.website, material_icon='laptop') }} - {{ wtf.render_field(edit_public_profile_information_form.organization, material_icon='business') }} - {{ wtf.render_field(edit_public_profile_information_form.location, material_icon='location_on') }} + {{ wtf.render_field(edit_profile_form.full_name, material_icon='badge') }} + {{ wtf.render_field(edit_profile_form.about_me, material_icon='description', id='about-me-textfield') }} + {{ wtf.render_field(edit_profile_form.website, material_icon='laptop') }} + {{ wtf.render_field(edit_profile_form.organization, material_icon='business') }} + {{ wtf.render_field(edit_profile_form.location, material_icon='location_on') }}

                  - user-image + user-image
                  - {{ wtf.render_field(edit_public_profile_information_form.avatar, accept='image/jpeg, image/png, image/gif', placeholder='Choose an image file', id='avatar-upload') }} + {{ wtf.render_field(edit_profile_form.avatar, accept='image/jpeg, image/png, image/gif', placeholder='Choose an image file', id='avatar-upload') }}
                  delete @@ -126,7 +104,7 @@

                  - {{ wtf.render_field(edit_public_profile_information_form.submit, material_icon='send') }} + {{ wtf.render_field(edit_profile_form.submit, material_icon='send') }}
                  @@ -144,7 +122,7 @@

                  -
                    +
                    • Notification Settings @@ -152,10 +130,10 @@
                      - {{ edit_notification_settings_form.hidden_tag() }} - {{ wtf.render_field(edit_notification_settings_form.job_status_mail_notification_level, material_icon='notifications') }} + {{ edit_notifications_form.hidden_tag() }} + {{ wtf.render_field(edit_notifications_form.job_status_mail_notification_level, material_icon='notifications') }}
                      - {{ wtf.render_field(edit_notification_settings_form.submit, material_icon='send') }} + {{ wtf.render_field(edit_notifications_form.submit, material_icon='send') }}
                      @@ -204,7 +182,7 @@
                  - editEdit + editEdit deleteDelete
                  diff --git a/app/templates/admin/user_settings.html.j2 b/app/templates/admin/user_settings.html.j2 new file mode 100644 index 00000000..49d8ba4d --- /dev/null +++ b/app/templates/admin/user_settings.html.j2 @@ -0,0 +1,6 @@ +{% extends "settings/settings.html.j2" %} + +{% block page_content %} +{{ super() }} +ADMIN ADDITIONS +{% endblock page_content %} diff --git a/app/templates/settings/settings.html.j2 b/app/templates/settings/settings.html.j2 index b219d3e6..370a0312 100644 --- a/app/templates/settings/settings.html.j2 +++ b/app/templates/settings/settings.html.j2 @@ -19,26 +19,6 @@

                    -
                  • -
                    - User Settings - keyboard_arrow_right -
                    -
                    -
                    -
                    -
                    - {{ edit_account_form.hidden_tag() }} - {{ wtf.render_field(edit_account_form.username, material_icon='person') }} - {{ wtf.render_field(edit_account_form.email, material_icon='email') }} -
                    -
                    -
                    - {{ wtf.render_field(edit_account_form.submit, material_icon='send') }} -
                    -
                    -
                    -
                  • Public Profilekeyboard_arrow_right
                    @@ -57,6 +37,26 @@

                    Show:

                    +
                    + +
                    +
                    + +
                    +
                    + +
                    +
                    + {#

                    -
                    +
                    #}


                    {{ wtf.render_field(edit_profile_form.full_name, material_icon='badge') }} @@ -125,7 +125,33 @@
                    • - Notification Settings + Account + keyboard_arrow_right +
                      +
                      +
                      + {{ edit_account_form.hidden_tag() }} + {{ wtf.render_field(edit_account_form.username, material_icon='person') }} + {{ wtf.render_field(edit_account_form.email, material_icon='email') }} +
                      + {{ wtf.render_field(edit_account_form.submit, material_icon='send') }} +
                      +
                      +
                      +
                      +

                      Deleting an account has the following effects:

                      +
                        +
                      • All data associated with your corpora and jobs will be permanently deleted.
                        • +
                      • All settings will be permanently deleted.
                        • +
                      +
                      + deleteDelete +
                      +
                      +
                      • +
                    • +
                      + Notifications keyboard_arrow_right
                      @@ -155,22 +181,6 @@
                      • -
                    • -
                      - Delete Account - keyboard_arrow_right -
                      -
                      -

                      Deleting an account has the following effects:

                      -
                        -
                      • All data associated with your corpora and jobs will be permanently deleted.
                        • -
                      • All settings will be permanently deleted.
                        • -
                      -
                      - deleteDelete -
                      -
                      -
              From df870c1c7d87f9cd89c3c6270bc8e0585c23f062 Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Mon, 27 Mar 2023 13:56:24 +0200 Subject: [PATCH 097/177] Update settings page --- app/settings/forms.py | 4 - app/settings/json_routes.py | 50 +++---- app/settings/routes.py | 12 -- app/static/js/Requests/settings/settings.js | 12 +- app/templates/settings/settings.html.j2 | 150 ++++++++++---------- 5 files changed, 112 insertions(+), 116 deletions(-) diff --git a/app/settings/forms.py b/app/settings/forms.py index 7a38e074..39a235cc 100644 --- a/app/settings/forms.py +++ b/app/settings/forms.py @@ -1,7 +1,6 @@ from flask_login import current_user from flask_wtf import FlaskForm from wtforms import ( - BooleanField, FileField, PasswordField, SelectField, @@ -67,9 +66,6 @@ class EditAccountForm(FlaskForm): class EditProfileForm(FlaskForm): - show_email = BooleanField('Email') - show_last_seen = BooleanField('Last seen') - show_member_since = BooleanField('Member since') avatar = FileField( 'Image File', [FileSizeLimit(max_size_in_mb=2)] diff --git a/app/settings/json_routes.py b/app/settings/json_routes.py index c091174b..63eaeb04 100644 --- a/app/settings/json_routes.py +++ b/app/settings/json_routes.py @@ -7,6 +7,7 @@ from app.decorators import content_negotiation from app.models import Avatar, User, ProfilePrivacySettings from . import bp + @bp.route('/', methods=['DELETE']) @login_required @content_negotiation(produces='application/json') @@ -32,6 +33,7 @@ def delete_user(user_id): } return response_data, 202 + @bp.route('//avatar', methods=['DELETE']) @content_negotiation(produces='application/json') def delete_profile_avatar(user_id): @@ -53,7 +55,8 @@ def delete_profile_avatar(user_id): } return response_data, 202 -@bp.route('//is_public', methods=['PUT']) + +@bp.route('//is-public', methods=['PUT']) @login_required @content_negotiation(consumes='application/json', produces='application/json') def update_user_is_public(user_id): @@ -73,26 +76,25 @@ def update_user_is_public(user_id): return response_data, 200 -# @bp.route('//profile-privacy-settings', methods=['PUT']) -# @login_required -# @content_negotiation(consumes='application/json', produces='application/json') -# def update_profile_privacy_settings(user_id): -# profile_privacy_settings = request.json -# if not isinstance(profile_privacy_settings, list): -# abort(400) -# for profile_privacy_setting in profile_privacy_settings: -# if not isinstance(profile_privacy_setting, str): -# abort(400) -# if not profile_privacy_setting in ProfilePrivacySettings.__members__: -# abort(400) -# user = User.query.get_or_404(user_id) -# user.is_public = is_public -# db.session.commit() -# response_data = { -# 'message': ( -# f'User "{user.username}" is now' -# f' {"public" if is_public else "private"}' -# ), -# 'category': 'corpus' -# } -# return response_data, 200 +@bp.route('//profile-privacy-settings/', methods=['PUT']) +@login_required +@content_negotiation(consumes='application/json', produces='application/json') +def add_profile_privacy_settings(user_id, profile_privacy_setting_name): + user = User.query.get_or_404(user_id) + enabled = request.json + if not isinstance(enabled, bool): + abort(400) + try: + profile_privacy_setting = ProfilePrivacySettings[profile_privacy_setting_name] + except KeyError: + abort(404) + if enabled: + user.add_profile_privacy_setting(profile_privacy_setting) + else: + user.remove_profile_privacy_setting(profile_privacy_setting) + db.session.commit() + response_data = { + 'message': 'Profile privacy settings updated', + 'category': 'corpus' + } + return response_data, 200 diff --git a/app/settings/routes.py b/app/settings/routes.py index dba854b0..7a9b8a09 100644 --- a/app/settings/routes.py +++ b/app/settings/routes.py @@ -33,18 +33,6 @@ def settings(): # endregion handle edit profile settings forms # region handle edit public profile information form if edit_profile_form.validate_on_submit(): - if edit_profile_form.show_email.data: - user.add_profile_privacy_setting('SHOW_EMAIL') - else: - user.remove_profile_privacy_setting('SHOW_EMAIL') - if edit_profile_form.show_last_seen.data: - user.add_profile_privacy_setting('SHOW_LAST_SEEN') - else: - user.remove_profile_privacy_setting('SHOW_LAST_SEEN') - if edit_profile_form.show_member_since.data: - user.add_profile_privacy_setting('SHOW_MEMBER_SINCE') - else: - user.remove_profile_privacy_setting('SHOW_MEMBER_SINCE') if edit_profile_form.avatar.data: try: Avatar.create( diff --git a/app/static/js/Requests/settings/settings.js b/app/static/js/Requests/settings/settings.js index 55ae94b2..8f1aee74 100644 --- a/app/static/js/Requests/settings/settings.js +++ b/app/static/js/Requests/settings/settings.js @@ -25,7 +25,7 @@ Requests.settings.entity.deleteAvatar = (userId) => { Requests.settings.entity.isPublic = {}; Requests.settings.entity.isPublic.update = (userId, isPublic) => { - let input = `/settings/${userId}/is_public`; + let input = `/settings/${userId}/is-public`; let init = { method: 'PUT', body: JSON.stringify(isPublic) @@ -33,3 +33,13 @@ Requests.settings.entity.isPublic.update = (userId, isPublic) => { return Requests.JSONfetch(input, init); }; +Requests.settings.entity.profilePrivacySettings = {}; + +Requests.settings.entity.profilePrivacySettings.update = (userId, profilePrivacySetting, enabled) => { + let input = `/settings/${userId}/profile-privacy-settings/${profilePrivacySetting}`; + let init = { + method: 'PUT', + body: JSON.stringify(enabled) + }; + return Requests.JSONfetch(input, init); +} diff --git a/app/templates/settings/settings.html.j2 b/app/templates/settings/settings.html.j2 index 370a0312..b6ec4fa5 100644 --- a/app/templates/settings/settings.html.j2 +++ b/app/templates/settings/settings.html.j2 @@ -9,81 +9,62 @@
              -
              +

              Profile Settings

              Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea tak

              -
              +

              • -
                Public Profilekeyboard_arrow_right
                +
                + Profile Privacy Settings + keyboard_arrow_right +
                +
                +
                +
                +
                + +
                +
                +
                + +
                +
                + +
                +
                + +
                +
                +
                +
                • +
              • +
                + Profile information + keyboard_arrow_right +
                {{ edit_profile_form.hidden_tag() }} -
                - -
                -

                -
                -
                -

                Show:

                -
                -
                - -
                -
                - -
                -
                - -
                -
                - {#
                -
                -

                - -

                -
                -
                -

                - -

                -
                -
                -

                - -

                -
                -
                #} -

                -
                {{ wtf.render_field(edit_profile_form.full_name, material_icon='badge') }} {{ wtf.render_field(edit_profile_form.about_me, material_icon='description', id='about-me-textfield') }} {{ wtf.render_field(edit_profile_form.website, material_icon='laptop') }} @@ -113,20 +94,20 @@
              -
              +

              General Settings

              Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea tak

              -
              +

              • Account - keyboard_arrow_right + keyboard_arrow_right
                @@ -167,7 +148,7 @@
              • Change Password - keyboard_arrow_right + keyboard_arrow_right
                @@ -199,6 +180,7 @@ Delete
              + {% endblock modals %} + +{% block scripts %} +{{ super() }} + +{% endblock scripts %} diff --git a/app/templates/corpora/corpus.js.j2 b/app/templates/corpora/corpus.js.j2 deleted file mode 100644 index 016b0b6a..00000000 --- a/app/templates/corpora/corpus.js.j2 +++ /dev/null @@ -1,128 +0,0 @@ -let corpusId = {{ corpus.hashid|tojson }}; -let corpusDisplay = new CorpusDisplay(document.querySelector('#corpus-display')); - -// #region Publishing -let publishingModalIsPublicSwitchElement = document.querySelector('#publishing-modal-is-public-switch'); -publishingModalIsPublicSwitchElement.addEventListener('change', (event) => { - let newIsPublic = publishingModalIsPublicSwitchElement.checked; - Requests.corpora.entity.isPublic.update(corpusId, newIsPublic) - .catch((response) => { - publishingModalIsPublicSwitchElement.checked = !newIsPublic; - }); -}); -// #endregion Publishing - -// #region Delete -let deleteModalDeleteButtonElement = document.querySelector('#delete-modal-delete-button'); -deleteModalDeleteButtonElement.addEventListener('click', (event) => { - Requests.corpora.entity.delete(corpusId) - .then((response) => { - window.location.href = {{ url_for('main.dashboard')|tojson }}; - }); -}); -// #endregion Delete - -// #region Invite users -let inviteUserModalElement = document.querySelector('#invite-user-modal'); -let inviteUserModalSearchElement = document.querySelector('#invite-user-modal-search'); -let inviteUserModalInviteButtonElement = document.querySelector('#invite-user-modal-invite-button'); -const users = {}; - -for (let user of {{ users|tojson }}) { - users[user.username] = user.avatar ? `/users/${user.id}/avatar` : '/static/images/user_avatar.png'; -} - -let inviteUserModalSearch = M.Chips.init( - inviteUserModalSearchElement, - { - autocompleteOptions: { - data: users - }, - limit: 3, - onChipAdd: (a, chipElement) => { - if (!(chipElement.firstChild.data in inviteUserModalSearch.autocomplete.options.data)) { - chipElement.firstElementChild.click(); - } - }, - placeholder: 'Enter username', - secondaryPlaceholder: 'Add more users' - } -); - -M.Modal.init( - inviteUserModalElement, - { - onOpenStart: (modalElement, modalTriggerElement) => { - while (inviteUserModalSearch.chipsData.length > 0) { - inviteUserModalSearch.deleteChip(0); - } - } - } -) - -inviteUserModalInviteButtonElement.addEventListener('click', (event) => { - let usernames = inviteUserModalSearch.chipsData.map((chipData) => chipData.tag); - Requests.corpora.entity.followers.add(corpusId, usernames); -}); -// #endregion Invite users - -// #region Share link -let shareLinkModalElement = document.querySelector('#share-link-modal'); -let shareLinkModalCorpusFollowerRoleSelectElement = document.querySelector('#share-link-modal-corpus-follower-role-select'); -let shareLinkModalExpirationDateDatepickerElement = document.querySelector('#share-link-modal-expiration-date-datepicker'); -let shareLinkModalCreateButtonElement = document.querySelector('#share-link-modal-create-button'); -let shareLinkModalOutputContainerElement = document.querySelector('#share-link-modal-output-container'); -let shareLinkModalOutputFieldElement = document.querySelector('#share-link-modal-output-field'); -let shareLinkModalOutputCopyButtonElement = document.querySelector('#share-link-modal-output-copy-button'); - -let today = new Date(); -let tomorrow = new Date(); -tomorrow.setDate(today.getDate() + 1); -let oneWeekLater = new Date(); -oneWeekLater.setDate(today.getDate() + 7); -let fourWeeksLater = new Date(); -fourWeeksLater.setDate(today.getDate() + 28); - -M.Datepicker.init( - shareLinkModalExpirationDateDatepickerElement, - { - container: document.querySelector('main'), - defaultDate: oneWeekLater, - setDefaultDate: true, - minDate: tomorrow, - maxDate: fourWeeksLater - } -); - -M.Modal.init( - shareLinkModalElement, - { - onOpenStart: (modalElement, modalTriggerElement) => { - shareLinkModalOutputFieldElement.value = ''; - shareLinkModalOutputContainerElement.classList.add('hide'); - } - } -) - -shareLinkModalCreateButtonElement.addEventListener('click', (event) => { - let role = shareLinkModalCorpusFollowerRoleSelectElement.value; - let expiration = shareLinkModalExpirationDateDatepickerElement.value - Requests.corpora.entity.generateShareLink(corpusId, role, expiration) - .then((response) => { - response.json() - .then((json) => { - shareLinkModalOutputContainerElement.classList.remove('hide'); - shareLinkModalOutputFieldElement.value = json.corpusShareLink; - }); - }); -}); - -shareLinkModalOutputCopyButtonElement.addEventListener('click', (event) => { - navigator.clipboard.writeText(shareLinkModalOutputFieldElement.value) - .then( - () => {app.flash('Copied!');}, - () => {app.flash('Could not copy to clipboard. Please copy manually.', 'error');} - ); - -}); -// #endregion Share link diff --git a/app/templates/corpora/public_corpus.html.j2 b/app/templates/corpora/public_corpus.html.j2 index 77e3ea4b..531b3cea 100644 --- a/app/templates/corpora/public_corpus.html.j2 +++ b/app/templates/corpora/public_corpus.html.j2 @@ -53,12 +53,12 @@
                -
              • {{ owner.username }}
                • - {% if owner.full_name %} -
              • {{ owner.full_name }}
                • +
              • {{ corpus.user.username }}
                • + {% if corpus.user.full_name %} +
              • {{ corpus.user.full_name }}
                • {% endif %} - {% if owner.show_email %} -
              • {{ owner.email }} + {% if corpus.user.show_email %} +
              • {{ corpus.user.email }} {% endif %}
              @@ -78,8 +78,8 @@ {% if cfa.role.has_permission('VIEW') %}
              - Corpus files -
              + Corpus files +
              {% endif %} @@ -87,8 +87,8 @@ {% if cfa.role.has_permission('UPDATE_FOLLOWER') %}
              - Corpus followers -
              + Corpus followers +
              {% endif %} @@ -97,3 +97,26 @@
              {% endblock page_content %} + + +{% block scripts %} +{{ super() }} + +{% endblock scripts %} diff --git a/app/templates/corpora/public_corpus.js.j2 b/app/templates/corpora/public_corpus.js.j2 deleted file mode 100644 index 0b8205f4..00000000 --- a/app/templates/corpora/public_corpus.js.j2 +++ /dev/null @@ -1,11 +0,0 @@ -let corpusId = {{ corpus.hashid|tojson }}; -let corpusFileList = new PublicCorpusFileList(document.querySelector('.corpus-file-list')); -corpusFileList.add({{ corpus_files|tojson }}); - -let unfollowRequestElement = document.querySelector('.action-button[data-action="unfollow-request"]'); -unfollowRequestElement.addEventListener('click', () => { - Requests.corpora.entity.followers.entity.delete(corpusId, currentUserId) - .then((response) => { - window.location.href = {{ url_for('main.dashboard')|tojson }}; - }); -}); diff --git a/app/templates/main/social_area.html.j2 b/app/templates/main/social_area.html.j2 index 47899297..bda0407e 100644 --- a/app/templates/main/social_area.html.j2 +++ b/app/templates/main/social_area.html.j2 @@ -63,8 +63,20 @@ {{ super() }} {% endblock scripts %} diff --git a/app/templates/users/user.html.j2 b/app/templates/users/user.html.j2 index cc138794..68648a30 100644 --- a/app/templates/users/user.html.j2 +++ b/app/templates/users/user.html.j2 @@ -123,8 +123,7 @@ let followedCorpusList = new FollowedCorpusList(document.querySelector('.followe followedCorpusList.add( [ {% for corpus in user.followed_corpora %} - {{ corpus.to_json_serializeable()|tojson }} - {% if not loop.last %},{% endif %} + {{ corpus.to_json_serializeable()|tojson }}, {% endfor %} ] ); @@ -132,8 +131,7 @@ let publicCorpusList = new PublicCorpusList(document.querySelector('.public-corp publicCorpusList.add( [ {% for corpus in user.corpora if corpus.is_public %} - {{ corpus.to_json_serializeable()|tojson }} - {% if not loop.last %},{% endif %} + {{ corpus.to_json_serializeable()|tojson }}, {% endfor %} ] ); From 9de09519d64554b75b33180d634ffd3aabac5aa4 Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Tue, 28 Mar 2023 14:19:37 +0200 Subject: [PATCH 100/177] more normalization --- app/auth/routes.py | 21 +++++++---- .../spacy_nlp_pipeline_models/routes.py | 8 ++--- .../tesseract_ocr_pipeline_models/routes.py | 8 ++--- app/corpora/files/routes.py | 12 +++---- app/corpora/routes.py | 12 +++---- app/jobs/routes.py | 4 +-- app/main/routes.py | 35 ++++++++++++++----- app/services/routes.py | 14 ++++---- app/users/routes.py | 4 +-- 9 files changed, 72 insertions(+), 46 deletions(-) diff --git a/app/auth/routes.py b/app/auth/routes.py index d6f11953..1f30d58a 100644 --- a/app/auth/routes.py +++ b/app/auth/routes.py @@ -60,8 +60,8 @@ def register(): return redirect(url_for('.login')) return render_template( 'auth/register.html.j2', - form=form, - title='Register' + title='Register', + form=form ) @@ -81,7 +81,11 @@ def login(): flash('You have been logged in') return redirect(next) flash('Invalid email/username or password', category='error') - return render_template('auth/login.html.j2', form=form, title='Log in') + return render_template( + 'auth/login.html.j2', + title='Log in', + form=form + ) @bp.route('/logout') @@ -98,7 +102,10 @@ def logout(): def unconfirmed(): if current_user.confirmed: return redirect(url_for('main.dashboard')) - return render_template('auth/unconfirmed.html.j2', title='Unconfirmed') + return render_template( + 'auth/unconfirmed.html.j2', + title='Unconfirmed' + ) @bp.route('/confirm-request') @@ -157,8 +164,8 @@ def reset_password_request(): return redirect(url_for('.login')) return render_template( 'auth/reset_password_request.html.j2', - form=form, - title='Password Reset' + title='Password Reset', + form=form ) @@ -176,7 +183,7 @@ def reset_password(token): return redirect(url_for('main.index')) return render_template( 'auth/reset_password.html.j2', - form=form, title='Password Reset', + form=form, token=token ) diff --git a/app/contributions/spacy_nlp_pipeline_models/routes.py b/app/contributions/spacy_nlp_pipeline_models/routes.py index 7ed0797e..91dee8c7 100644 --- a/app/contributions/spacy_nlp_pipeline_models/routes.py +++ b/app/contributions/spacy_nlp_pipeline_models/routes.py @@ -54,8 +54,8 @@ def create_spacy_nlp_pipeline_model(): return {}, 201, {'Location': url_for('.spacy_nlp_pipeline_models')} return render_template( 'contributions/spacy_nlp_pipeline_models/create_spacy_nlp_pipeline_model.html.j2', - form=form, - title='Create SpaCy NLP Pipeline Model' + title='Create SpaCy NLP Pipeline Model', + form=form ) @@ -77,7 +77,7 @@ def spacy_nlp_pipeline_model(spacy_nlp_pipeline_model_id): return redirect(url_for('.spacy_nlp_pipeline_models')) return render_template( 'contributions/spacy_nlp_pipeline_models/spacy_nlp_pipeline_model.html.j2', + title=f'{snpm.title} {snpm.version}', form=form, - spacy_nlp_pipeline_model=snpm, - title=f'{snpm.title} {snpm.version}' + spacy_nlp_pipeline_model=snpm ) diff --git a/app/contributions/tesseract_ocr_pipeline_models/routes.py b/app/contributions/tesseract_ocr_pipeline_models/routes.py index 71f281ad..31552a59 100644 --- a/app/contributions/tesseract_ocr_pipeline_models/routes.py +++ b/app/contributions/tesseract_ocr_pipeline_models/routes.py @@ -53,8 +53,8 @@ def create_tesseract_ocr_pipeline_model(): return {}, 201, {'Location': url_for('.tesseract_ocr_pipeline_models')} return render_template( 'contributions/tesseract_ocr_pipeline_models/create_tesseract_ocr_pipeline_model.html.j2', - form=form, - title='Create Tesseract OCR Pipeline Model' + title='Create Tesseract OCR Pipeline Model', + form=form ) @@ -76,7 +76,7 @@ def tesseract_ocr_pipeline_model(tesseract_ocr_pipeline_model_id): return redirect(url_for('.tesseract_ocr_pipeline_models')) return render_template( 'contributions/tesseract_ocr_pipeline_models/tesseract_ocr_pipeline_model.html.j2', + title=f'{topm.title} {topm.version}', form=form, - tesseract_ocr_pipeline_model=topm, - title=f'{topm.title} {topm.version}' + tesseract_ocr_pipeline_model=topm ) diff --git a/app/corpora/files/routes.py b/app/corpora/files/routes.py index 0215e45e..7dca50a2 100644 --- a/app/corpora/files/routes.py +++ b/app/corpora/files/routes.py @@ -24,7 +24,7 @@ from .utils import ( @register_breadcrumb(bp, '.entity.files', 'Files', endpoint_arguments_constructor=corpus_eac) @login_required def corpus_files(corpus_id): - return redirect(url_for('.corpus', corpus_id=corpus_id, _anchor='files')) + return redirect(url_for('.corpus', _anchor='files', corpus_id=corpus_id)) @bp.route('//files/create', methods=['GET', 'POST']) @@ -64,9 +64,9 @@ def create_corpus_file(corpus_id): return '', 201, {'Location': corpus.url} return render_template( 'corpora/files/create_corpus_file.html.j2', - corpus=corpus, + title='Add corpus file', form=form, - title='Add corpus file' + corpus=corpus ) @@ -86,10 +86,10 @@ def corpus_file(corpus_id, corpus_file_id): return redirect(corpus_file.corpus.url) return render_template( 'corpora/files/corpus_file.html.j2', - corpus=corpus_file.corpus, - corpus_file=corpus_file, + title='Edit corpus file', form=form, - title='Edit corpus file' + corpus=corpus_file.corpus, + corpus_file=corpus_file ) diff --git a/app/corpora/routes.py b/app/corpora/routes.py index 1a05722e..ae5069fa 100644 --- a/app/corpora/routes.py +++ b/app/corpora/routes.py @@ -43,8 +43,8 @@ def create_corpus(): return redirect(corpus.url) return render_template( 'corpora/create_corpus.html.j2', - form=form, - title='Create corpus' + title='Create corpus', + form=form ) @@ -59,18 +59,18 @@ def corpus(corpus_id): if corpus.user == current_user or current_user.is_administrator(): return render_template( 'corpora/corpus.html.j2', + title=corpus.title, corpus=corpus, corpus_follower_roles=corpus_follower_roles, - users = users, - title=corpus.title + users = users ) if current_user.is_following_corpus(corpus) or corpus.is_public: cfa = CorpusFollowerAssociation.query.filter_by(corpus_id=corpus_id, follower_id=current_user.id).first_or_404() return render_template( 'corpora/public_corpus.html.j2', + title=corpus.title, corpus=corpus, - cfa=cfa, - title=corpus.title + cfa=cfa ) abort(403) diff --git a/app/jobs/routes.py b/app/jobs/routes.py index 2533e010..5f0d6273 100644 --- a/app/jobs/routes.py +++ b/app/jobs/routes.py @@ -29,8 +29,8 @@ def job(job_id): abort(403) return render_template( 'jobs/job.html.j2', - job=job, - title='Job' + title='Job', + job=job ) diff --git a/app/main/routes.py b/app/main/routes.py index edca61d5..b14b3ae9 100644 --- a/app/main/routes.py +++ b/app/main/routes.py @@ -18,20 +18,30 @@ def index(): return redirect(url_for('.dashboard')) flash('Invalid email/username or password', category='error') redirect(url_for('.index')) - return render_template('main/index.html.j2', form=form, title='nopaque') + return render_template( + 'main/index.html.j2', + title='nopaque', + form=form + ) @bp.route('/faq') @register_breadcrumb(bp, '.faq', 'Frequently Asked Questions') def faq(): - return render_template('main/faq.html.j2', title='Frequently Asked Questions') + return render_template( + 'main/faq.html.j2', + title='Frequently Asked Questions' + ) @bp.route('/dashboard') @register_breadcrumb(bp, '.dashboard', 'dashboardDashboard') @login_required def dashboard(): - return render_template('main/dashboard.html.j2', title='Dashboard') + return render_template( + 'main/dashboard.html.j2', + title='Dashboard' + ) # @bp.route('/user_manual') @@ -43,19 +53,28 @@ def dashboard(): @bp.route('/news') @register_breadcrumb(bp, '.news', 'emailNews') def news(): - return render_template('main/news.html.j2', title='News') + return render_template( + 'main/news.html.j2', + title='News' + ) @bp.route('/privacy_policy') @register_breadcrumb(bp, '.privacy_policy', 'Private statement (GDPR)') def privacy_policy(): - return render_template('main/privacy_policy.html.j2', title='Privacy statement (GDPR)') + return render_template( + 'main/privacy_policy.html.j2', + title='Privacy statement (GDPR)' + ) @bp.route('/terms_of_use') @register_breadcrumb(bp, '.terms_of_use', 'Terms of Use') def terms_of_use(): - return render_template('main/terms_of_use.html.j2', title='Terms of Use') + return render_template( + 'main/terms_of_use.html.j2', + title='Terms of Use' + ) @bp.route('/social-area') @@ -73,7 +92,7 @@ def social_area(): users = User.query.filter(User.is_public == True, User.id != current_user.id).all() return render_template( 'main/social_area.html.j2', - users=users, + title='Social Area', corpora=corpora, - title='Social Area' + users=users ) diff --git a/app/services/routes.py b/app/services/routes.py index 5a6ec7fd..324aab63 100644 --- a/app/services/routes.py +++ b/app/services/routes.py @@ -63,8 +63,8 @@ def file_setup_pipeline(): return {}, 201, {'Location': job.url} return render_template( 'services/file_setup_pipeline.html.j2', - form=form, - title=service_manifest['name'] + title=service_manifest['name'], + form=form ) @@ -112,9 +112,9 @@ def tesseract_ocr_pipeline(): ] return render_template( 'services/tesseract_ocr_pipeline.html.j2', + title=service_manifest['name'], form=form, - tesseract_ocr_pipeline_models=tesseract_ocr_pipeline_models, - title=service_manifest['name'] + tesseract_ocr_pipeline_models=tesseract_ocr_pipeline_models ) @@ -172,8 +172,8 @@ def transkribus_htr_pipeline(): return {}, 201, {'Location': job.url} return render_template( 'services/transkribus_htr_pipeline.html.j2', - form=form, title=service_manifest['name'], + form=form, transkribus_htr_pipeline_models=transkribus_htr_pipeline_models ) @@ -218,9 +218,9 @@ def spacy_nlp_pipeline(): return {}, 201, {'Location': job.url} return render_template( 'services/spacy_nlp_pipeline.html.j2', + title=service_manifest['name'], form=form, - spacy_nlp_pipeline_models=spacy_nlp_pipeline_models, - title=service_manifest['name'] + spacy_nlp_pipeline_models=spacy_nlp_pipeline_models ) diff --git a/app/users/routes.py b/app/users/routes.py index 2c2334f3..7b86a8e1 100644 --- a/app/users/routes.py +++ b/app/users/routes.py @@ -29,8 +29,8 @@ def user(user_id): abort(403) return render_template( 'users/user.html.j2', - user=user, - title=user.username + title=user.username, + user=user ) From 9b2353105e902051d59c39e36d35497bc125c00c Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Wed, 29 Mar 2023 09:25:08 +0200 Subject: [PATCH 101/177] Add NopaqueForm as a base for all others --- app/admin/forms.py | 6 +++--- app/auth/forms.py | 10 +++++----- app/auth/routes.py | 8 ++++---- app/contributions/forms.py | 4 ++-- .../spacy_nlp_pipeline_models/routes.py | 9 ++------- .../tesseract_ocr_pipeline_models/routes.py | 9 ++------- app/corpora/files/forms.py | 14 +++---------- app/corpora/forms.py | 20 +++++++------------ app/forms.py | 9 +++++++++ app/main/routes.py | 2 +- app/services/forms.py | 17 ++++++++++------ app/services/routes.py | 7 +++---- app/settings/forms.py | 18 +++++------------ 13 files changed, 57 insertions(+), 76 deletions(-) create mode 100644 app/forms.py diff --git a/app/admin/forms.py b/app/admin/forms.py index 7b468161..b063b938 100644 --- a/app/admin/forms.py +++ b/app/admin/forms.py @@ -1,9 +1,9 @@ -from app.models import Role -from flask_wtf import FlaskForm from wtforms import BooleanField, SelectField, SubmitField +from app.forms import NopaqueForm +from app.models import Role -class AdminEditUserForm(FlaskForm): +class AdminEditUserForm(NopaqueForm): confirmed = BooleanField('Confirmed') role = SelectField('Role') submit = SubmitField('Submit') diff --git a/app/auth/forms.py b/app/auth/forms.py index 6917b78b..5655b3af 100644 --- a/app/auth/forms.py +++ b/app/auth/forms.py @@ -1,4 +1,3 @@ -from flask_wtf import FlaskForm from wtforms import ( BooleanField, PasswordField, @@ -7,11 +6,12 @@ from wtforms import ( ValidationError ) from wtforms.validators import InputRequired, Email, EqualTo, Length, Regexp +from app.forms import NopaqueForm from app.models import User from . import USERNAME_REGEX -class RegistrationForm(FlaskForm): +class RegistrationForm(NopaqueForm): email = StringField( 'Email', validators=[InputRequired(), Email(), Length(max=254)] @@ -55,19 +55,19 @@ class RegistrationForm(FlaskForm): raise ValidationError('Username already in use') -class LoginForm(FlaskForm): +class LoginForm(NopaqueForm): user = StringField('Email or username', validators=[InputRequired()]) password = PasswordField('Password', validators=[InputRequired()]) remember_me = BooleanField('Keep me logged in') submit = SubmitField() -class ResetPasswordRequestForm(FlaskForm): +class ResetPasswordRequestForm(NopaqueForm): email = StringField('Email', validators=[InputRequired(), Email()]) submit = SubmitField() -class ResetPasswordForm(FlaskForm): +class ResetPasswordForm(NopaqueForm): password = PasswordField( 'New password', validators=[ diff --git a/app/auth/routes.py b/app/auth/routes.py index 1f30d58a..dc6140f2 100644 --- a/app/auth/routes.py +++ b/app/auth/routes.py @@ -34,7 +34,7 @@ def before_request(): def register(): if current_user.is_authenticated: return redirect(url_for('main.dashboard')) - form = RegistrationForm(prefix='registration-form') + form = RegistrationForm() if form.validate_on_submit(): try: user = User.create( @@ -70,7 +70,7 @@ def register(): def login(): if current_user.is_authenticated: return redirect(url_for('main.dashboard')) - form = LoginForm(prefix='login-form') + form = LoginForm() if form.validate_on_submit(): user = User.query.filter((User.email == form.user.data.lower()) | (User.username == form.user.data)).first() if user and user.verify_password(form.password.data): @@ -144,7 +144,7 @@ def confirm(token): def reset_password_request(): if current_user.is_authenticated: return redirect(url_for('main.dashboard')) - form = ResetPasswordRequestForm(prefix='reset-password-request-form') + form = ResetPasswordRequestForm() if form.validate_on_submit(): user = User.query.filter_by(email=form.email.data.lower()).first() if user is not None: @@ -174,7 +174,7 @@ def reset_password_request(): def reset_password(token): if current_user.is_authenticated: return redirect(url_for('main.dashboard')) - form = ResetPasswordForm(prefix='reset-password-form') + form = ResetPasswordForm() if form.validate_on_submit(): if User.reset_password(token, form.password.data): db.session.commit() diff --git a/app/contributions/forms.py b/app/contributions/forms.py index acec307f..46777ff0 100644 --- a/app/contributions/forms.py +++ b/app/contributions/forms.py @@ -1,4 +1,3 @@ -from flask_wtf import FlaskForm from wtforms import ( StringField, SubmitField, @@ -6,9 +5,10 @@ from wtforms import ( IntegerField ) from wtforms.validators import InputRequired, Length +from app.forms import NopaqueForm -class ContributionBaseForm(FlaskForm): +class ContributionBaseForm(NopaqueForm): title = StringField( 'Title', validators=[InputRequired(), Length(max=64)] diff --git a/app/contributions/spacy_nlp_pipeline_models/routes.py b/app/contributions/spacy_nlp_pipeline_models/routes.py index 91dee8c7..eab8ac49 100644 --- a/app/contributions/spacy_nlp_pipeline_models/routes.py +++ b/app/contributions/spacy_nlp_pipeline_models/routes.py @@ -27,8 +27,7 @@ def spacy_nlp_pipeline_models(): @register_breadcrumb(bp, '.spacy_nlp_pipeline_models.create', 'Create') @login_required def create_spacy_nlp_pipeline_model(): - form_prefix = 'create-spacy-nlp-pipeline-model-form' - form = CreateSpaCyNLPPipelineModelForm(prefix=form_prefix) + form = CreateSpaCyNLPPipelineModelForm() if form.is_submitted(): if not form.validate(): return {'errors': form.errors}, 400 @@ -64,11 +63,7 @@ def create_spacy_nlp_pipeline_model(): @login_required def spacy_nlp_pipeline_model(spacy_nlp_pipeline_model_id): snpm = SpaCyNLPPipelineModel.query.get_or_404(spacy_nlp_pipeline_model_id) - form_prefix = 'edit-spacy-nlp-pipeline-model-form' - form = EditSpaCyNLPPipelineModelForm( - data=snpm.to_json_serializeable(), - prefix=form_prefix - ) + form = EditSpaCyNLPPipelineModelForm(data=snpm.to_json_serializeable()) if form.validate_on_submit(): form.populate_obj(snpm) if db.session.is_modified(snpm): diff --git a/app/contributions/tesseract_ocr_pipeline_models/routes.py b/app/contributions/tesseract_ocr_pipeline_models/routes.py index 31552a59..51adf402 100644 --- a/app/contributions/tesseract_ocr_pipeline_models/routes.py +++ b/app/contributions/tesseract_ocr_pipeline_models/routes.py @@ -27,8 +27,7 @@ def tesseract_ocr_pipeline_models(): @register_breadcrumb(bp, '.tesseract_ocr_pipeline_models.create', 'Create') @login_required def create_tesseract_ocr_pipeline_model(): - form_prefix = 'create-tesseract-ocr-pipeline-model-form' - form = CreateTesseractOCRPipelineModelForm(prefix=form_prefix) + form = CreateTesseractOCRPipelineModelForm() if form.is_submitted(): if not form.validate(): return {'errors': form.errors}, 400 @@ -63,11 +62,7 @@ def create_tesseract_ocr_pipeline_model(): @login_required def tesseract_ocr_pipeline_model(tesseract_ocr_pipeline_model_id): topm = TesseractOCRPipelineModel.query.get_or_404(tesseract_ocr_pipeline_model_id) - form_prefix = 'edit-tesseract-ocr-pipeline-model-form' - form = EditTesseractOCRPipelineModelForm( - data=topm.to_json_serializeable(), - prefix=form_prefix - ) + form = EditTesseractOCRPipelineModelForm(data=topm.to_json_serializeable()) if form.validate_on_submit(): form.populate_obj(topm) if db.session.is_modified(topm): diff --git a/app/corpora/files/forms.py b/app/corpora/files/forms.py index f5b0f0c8..c819fba2 100644 --- a/app/corpora/files/forms.py +++ b/app/corpora/files/forms.py @@ -1,4 +1,3 @@ -from flask_wtf import FlaskForm from flask_wtf.file import FileField, FileRequired from wtforms import ( StringField, @@ -7,9 +6,10 @@ from wtforms import ( IntegerField ) from wtforms.validators import InputRequired, Length +from app.forms import NopaqueForm -class CorpusFileBaseForm(FlaskForm): +class CorpusFileBaseForm(NopaqueForm): author = StringField( 'Author', validators=[InputRequired(), Length(max=255)] @@ -37,18 +37,10 @@ class CorpusFileBaseForm(FlaskForm): class CreateCorpusFileForm(CorpusFileBaseForm): vrt = FileField('File', validators=[FileRequired()]) - def __init__(self, *args, **kwargs): - if 'prefix' not in kwargs: - kwargs['prefix'] = 'create-corpus-file-form' - super().__init__(*args, **kwargs) - def validate_vrt(self, field): if not field.data.filename.lower().endswith('.vrt'): raise ValidationError('VRT files only!') class UpdateCorpusFileForm(CorpusFileBaseForm): - def __init__(self, *args, **kwargs): - if 'prefix' not in kwargs: - kwargs['prefix'] = 'update-corpus-file-form' - super().__init__(*args, **kwargs) + pass diff --git a/app/corpora/forms.py b/app/corpora/forms.py index 36ee34c8..e923ca1b 100644 --- a/app/corpora/forms.py +++ b/app/corpora/forms.py @@ -1,9 +1,9 @@ -from flask_wtf import FlaskForm from wtforms import StringField, SubmitField, TextAreaField from wtforms.validators import InputRequired, Length +from app.forms import NopaqueForm -class CorpusBaseForm(FlaskForm): +class CorpusBaseForm(NopaqueForm): description = TextAreaField( 'Description', validators=[InputRequired(), Length(max=255)] @@ -13,18 +13,12 @@ class CorpusBaseForm(FlaskForm): class CreateCorpusForm(CorpusBaseForm): - def __init__(self, *args, **kwargs): - if 'prefix' not in kwargs: - kwargs['prefix'] = 'create-corpus-form' - super().__init__(*args, **kwargs) + pass class UpdateCorpusForm(CorpusBaseForm): - def __init__(self, *args, **kwargs): - if 'prefix' not in kwargs: - kwargs['prefix'] = 'update-corpus-form' - super().__init__(*args, **kwargs) - - -class ImportCorpusForm(FlaskForm): + pass + + +class ImportCorpusForm(NopaqueForm): pass diff --git a/app/forms.py b/app/forms.py new file mode 100644 index 00000000..55e80d01 --- /dev/null +++ b/app/forms.py @@ -0,0 +1,9 @@ +from flask_wtf import FlaskForm +import re + + +class NopaqueForm(FlaskForm): + def __init__(self, *args, **kwargs): + if 'prefix' not in kwargs: + kwargs['prefix'] = re.sub(r'(?home') def index(): - form = LoginForm(prefix='login-form') + form = LoginForm() if form.validate_on_submit(): user = User.query.filter((User.email == form.user.data.lower()) | (User.username == form.user.data)).first() if user and user.verify_password(form.password.data): diff --git a/app/services/forms.py b/app/services/forms.py index 1ad544dc..d53132f8 100644 --- a/app/services/forms.py +++ b/app/services/forms.py @@ -1,16 +1,21 @@ from flask_login import current_user -from flask_wtf import FlaskForm from flask_wtf.file import FileField, FileRequired -from wtforms import (BooleanField, DecimalRangeField, MultipleFileField, - SelectField, StringField, SubmitField, ValidationError) +from wtforms import ( + BooleanField, + DecimalRangeField, + MultipleFileField, + SelectField, + StringField, + SubmitField, + ValidationError +) from wtforms.validators import InputRequired, Length - +from app.forms import NopaqueForm from app.models import SpaCyNLPPipelineModel, TesseractOCRPipelineModel - from . import SERVICES -class CreateJobBaseForm(FlaskForm): +class CreateJobBaseForm(NopaqueForm): description = StringField( 'Description', validators=[InputRequired(), Length(max=255)] diff --git a/app/services/routes.py b/app/services/routes.py index 324aab63..3a3cbd7b 100644 --- a/app/services/routes.py +++ b/app/services/routes.py @@ -35,7 +35,7 @@ def file_setup_pipeline(): version = request.args.get('version', service_manifest['latest_version']) if version not in service_manifest['versions']: abort(404) - form = CreateFileSetupPipelineJobForm(prefix='create-job-form', version=version) + form = CreateFileSetupPipelineJobForm(version=version) if form.is_submitted(): if not form.validate(): response = {'errors': form.errors} @@ -77,7 +77,7 @@ def tesseract_ocr_pipeline(): version = request.args.get('version', service_manifest['latest_version']) if version not in service_manifest['versions']: abort(404) - form = CreateTesseractOCRPipelineJobForm(prefix='create-job-form', version=version) + form = CreateTesseractOCRPipelineJobForm(version=version) if form.is_submitted(): if not form.validate(): response = {'errors': form.errors} @@ -140,7 +140,6 @@ def transkribus_htr_pipeline(): print(transkribus_htr_pipeline_models[len(transkribus_htr_pipeline_models)-1]) form = CreateTranskribusHTRPipelineJobForm( transkribus_htr_pipeline_models=transkribus_htr_pipeline_models, - prefix='create-job-form', version=version ) if form.is_submitted(): @@ -187,7 +186,7 @@ def spacy_nlp_pipeline(): version = request.args.get('version', SERVICES[service]['latest_version']) if version not in service_manifest['versions']: abort(404) - form = CreateSpacyNLPPipelineJobForm(prefix='create-job-form', version=version) + form = CreateSpacyNLPPipelineJobForm(version=version) spacy_nlp_pipeline_models = SpaCyNLPPipelineModel.query.all() if form.is_submitted(): if not form.validate(): diff --git a/app/settings/forms.py b/app/settings/forms.py index 39a235cc..2cfccf5f 100644 --- a/app/settings/forms.py +++ b/app/settings/forms.py @@ -1,5 +1,4 @@ from flask_login import current_user -from flask_wtf import FlaskForm from wtforms import ( FileField, PasswordField, @@ -16,12 +15,13 @@ from wtforms.validators import ( Length, Regexp ) +from app.forms import NopaqueForm from app.models import User, UserSettingJobStatusMailNotificationLevel from app.auth import USERNAME_REGEX from app.wtf_validators import FileSizeLimit -class EditAccountForm(FlaskForm): +class EditAccountForm(NopaqueForm): email = StringField( 'E-Mail', validators=[DataRequired(), Length(max=254), Email()] @@ -46,8 +46,6 @@ class EditAccountForm(FlaskForm): user = kwargs.get('user', current_user._get_current_object()) if 'data' not in kwargs: kwargs['data'] = user.to_json_serializeable() - if 'prefix' not in kwargs: - kwargs['prefix'] = 'edit-profile-settings-form' super().__init__(*args, **kwargs) self.user = user @@ -65,7 +63,7 @@ class EditAccountForm(FlaskForm): return self.submit.data and self.validate() -class EditProfileForm(FlaskForm): +class EditProfileForm(NopaqueForm): avatar = FileField( 'Image File', [FileSizeLimit(max_size_in_mb=2)] @@ -104,8 +102,6 @@ class EditProfileForm(FlaskForm): if 'data' not in kwargs: user = current_user._get_current_object() kwargs['data'] = user.to_json_serializeable() - if 'prefix' not in kwargs: - kwargs['prefix'] = 'edit-public-profile-information-form' super().__init__(*args, **kwargs) def validate_image_file(self, field): @@ -116,7 +112,7 @@ class EditProfileForm(FlaskForm): return self.submit.data and self.validate() -class ChangePasswordForm(FlaskForm): +class ChangePasswordForm(NopaqueForm): password = PasswordField('Old password', validators=[DataRequired()]) new_password = PasswordField( 'New password', @@ -136,8 +132,6 @@ class ChangePasswordForm(FlaskForm): def __init__(self, *args, **kwargs): user = kwargs.get('user', current_user._get_current_object()) - if 'prefix' not in kwargs: - kwargs['prefix'] = 'change-password-form' super().__init__(*args, **kwargs) self.user = user @@ -149,7 +143,7 @@ class ChangePasswordForm(FlaskForm): return self.submit.data and self.validate() -class EditNotificationsForm(FlaskForm): +class EditNotificationsForm(NopaqueForm): job_status_mail_notification_level = SelectField( 'Job status mail notification level', choices=[ @@ -164,8 +158,6 @@ class EditNotificationsForm(FlaskForm): if 'data' not in kwargs: user = current_user._get_current_object() kwargs['data'] = user.to_json_serializeable() - if 'prefix' not in kwargs: - kwargs['prefix'] = 'edit-notification-settings-form' super().__init__(*args, **kwargs) def validate_on_submit(self): From e4a8ad911f1962aad3bb38c79a51d9ccf48b1533 Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Wed, 29 Mar 2023 14:32:35 +0200 Subject: [PATCH 102/177] Update admin user settings --- app/admin/forms.py | 9 +- app/admin/json_routes.py | 35 +++-- app/admin/routes.py | 179 +++++++++------------- app/api/schemas.py | 6 +- app/auth/__init__.py | 3 - app/auth/forms.py | 3 +- app/forms.py | 19 ++- app/settings/forms.py | 53 +++---- app/settings/routes.py | 106 +++++++------ app/static/js/Requests/admin/admin.js | 20 +++ app/templates/_scripts.html.j2 | 1 + app/templates/admin/user.html.j2 | 2 +- app/templates/admin/user_settings.html.j2 | 74 ++++++++- app/templates/base.html.j2 | 4 - app/templates/settings/settings.html.j2 | 136 ++++++++-------- app/wtf_validators.py | 9 -- 16 files changed, 362 insertions(+), 297 deletions(-) create mode 100644 app/static/js/Requests/admin/admin.js delete mode 100644 app/wtf_validators.py diff --git a/app/admin/forms.py b/app/admin/forms.py index b063b938..f24ce8f3 100644 --- a/app/admin/forms.py +++ b/app/admin/forms.py @@ -3,11 +3,12 @@ from app.forms import NopaqueForm from app.models import Role -class AdminEditUserForm(NopaqueForm): - confirmed = BooleanField('Confirmed') +class UpdateUserForm(NopaqueForm): role = SelectField('Role') - submit = SubmitField('Submit') + submit = SubmitField() - def __init__(self, *args, **kwargs): + def __init__(self, user, *args, **kwargs): + if 'data' not in kwargs: + kwargs['data'] = {'role': user.role.hashid} super().__init__(*args, **kwargs) self.role.choices = [(x.hashid, x.name) for x in Role.query.all()] diff --git a/app/admin/json_routes.py b/app/admin/json_routes.py index d8b45425..d4c21307 100644 --- a/app/admin/json_routes.py +++ b/app/admin/json_routes.py @@ -1,22 +1,23 @@ -from flask import current_app -from threading import Thread +from flask import abort, request from app import db +from app.decorators import content_negotiation from app.models import User from . import bp -@bp.route('/users//delete', methods=['DELETE']) -def delete_user(user_id): - def _delete_user(app, user_id): - with app.app_context(): - user = User.query.get(user_id) - user.delete() - db.session.commit() - - User.query.get_or_404(user_id) - thread = Thread( - target=_delete_user, - args=(current_app._get_current_object(), user_id) - ) - thread.start() - return {}, 202 +@bp.route('/users//confirmed', methods=['PUT']) +@content_negotiation(consumes='application/json', produces='application/json') +def update_user_role(user_id): + confirmed = request.json + if not isinstance(confirmed, bool): + abort(400) + user = User.query.get_or_404(user_id) + user.confirmed = confirmed + db.session.commit() + resonse_data = { + 'message': ( + f'User "{user.username}" is now ' + f'{"confirmed" if confirmed else "unconfirmed"}' + ) + } + return resonse_data, 200 diff --git a/app/admin/routes.py b/app/admin/routes.py index 899b4dfd..9a5401b8 100644 --- a/app/admin/routes.py +++ b/app/admin/routes.py @@ -1,15 +1,16 @@ from flask import abort, flash, redirect, render_template, url_for from flask_breadcrumbs import register_breadcrumb -from app import db -from app.models import Avatar, Corpus, User +from app import db, hashids +from app.models import Avatar, Corpus, Role, User from app.settings.forms import ( - ChangePasswordForm, - EditNotificationsForm, - EditAccountForm, - EditProfileForm + UpdateAvatarForm, + UpdatePasswordForm, + UpdateNotificationsForm, + UpdateAccountInformationForm, + UpdateProfileInformationForm ) from . import bp -from .forms import AdminEditUserForm +from .forms import UpdateUserForm from app.users.utils import ( user_endpoint_arguments_constructor as user_eac, user_dynamic_list_constructor as user_dlc @@ -62,112 +63,82 @@ def user(user_id): @register_breadcrumb(bp, '.users.entity.settings', 'settingsSettings') def user_settings(user_id): user = User.query.get_or_404(user_id) - # region forms - edit_account_form = EditAccountForm(user=user) - edit_profile_form = EditProfileForm(user=user) - change_password_form = ChangePasswordForm(user=user) - edit_notifications_form = EditNotificationsForm(user=user) - # endregion forms - # region handle edit profile settings form - if edit_account_form.validate_on_submit(): - user.email = edit_account_form.email.data - user.username = edit_account_form.username.data + update_account_information_form = UpdateAccountInformationForm(user=user) + update_profile_information_form = UpdateProfileInformationForm(user=user) + update_avatar_form = UpdateAvatarForm(user=user) + update_password_form = UpdatePasswordForm(user=user) + update_notifications_form = UpdateNotificationsForm(user=user) + update_user_form = UpdateUserForm(user) + + # region handle update profile information form + if update_profile_information_form.submit.data and update_profile_information_form.validate(): + user.about_me = update_profile_information_form.about_me.data + user.location = update_profile_information_form.location.data + user.organization = update_profile_information_form.organization.data + user.website = update_profile_information_form.website.data + user.full_name = update_profile_information_form.full_name.data + db.session.commit() + flash('Your changes have been saved') + return redirect(url_for('.user_settings', user_id=user.id)) + # endregion handle update profile information form + + # region handle update avatar form + if update_avatar_form.submit.data and update_avatar_form.validate(): + try: + Avatar.create( + update_avatar_form.avatar.data, + user=user + ) + except (AttributeError, OSError): + abort(500) + db.session.commit() + flash('Your changes have been saved') + return redirect(url_for('.user_settings', user_id=user.id)) + # endregion handle update avatar form + + # region handle update account information form + if update_account_information_form.submit.data and update_account_information_form.validate(): + user.email = update_account_information_form.email.data + user.username = update_account_information_form.username.data db.session.commit() flash('Profile settings updated') - return redirect(url_for('.user_settings')) - # endregion handle edit profile settings forms - # region handle edit public profile information form - if edit_profile_form.validate_on_submit(): - if edit_profile_form.avatar.data: - try: - Avatar.create( - edit_profile_form.avatar.data, - user=user - ) - except (AttributeError, OSError): - abort(500) - user.about_me = edit_profile_form.about_me.data - user.location = edit_profile_form.location.data - user.organization = edit_profile_form.organization.data - user.website = edit_profile_form.website.data - user.full_name = edit_profile_form.full_name.data + return redirect(url_for('.user_settings', user_id=user.id)) + # endregion handle update account information form + + # region handle update password form + if update_password_form.submit.data and update_password_form.validate(): + user.password = update_password_form.new_password.data db.session.commit() flash('Your changes have been saved') - return redirect(url_for('.user_settings')) - # endregion handle edit public profile information form - # region handle change_password_form POST - if change_password_form.validate_on_submit(): - user.password = change_password_form.new_password.data - db.session.commit() - flash('Your changes have been saved') - return redirect(url_for('.user_settings')) - # endregion handle change_password_form POST - # region handle edit_notification_settings_form POST - if edit_notifications_form.validate_on_submit(): + return redirect(url_for('.user_settings', user_id=user.id)) + # endregion handle update password form + + # region handle update notifications form + if update_notifications_form.submit.data and update_notifications_form.validate(): user.setting_job_status_mail_notification_level = \ - edit_notifications_form.job_status_mail_notification_level.data + update_notifications_form.job_status_mail_notification_level.data db.session.commit() flash('Your changes have been saved') - return redirect(url_for('.user_settings')) - # endregion handle edit_notification_settings_form POST + return redirect(url_for('.user_settings', user_id=user.id)) + # endregion handle update notifications form + + # region handle update user form + if update_user_form.submit.data and update_user_form.validate(): + role_id = hashids.decode(update_user_form.role.data) + user.role = Role.query.get(role_id) + db.session.commit() + flash('Your changes have been saved') + return redirect(url_for('.user_settings', user_id=user.id)) + # endregion handle update user form + return render_template( 'admin/user_settings.html.j2', title='Settings', - change_password_form=change_password_form, - edit_account_form=edit_account_form, - edit_notifications_form=edit_notifications_form, - edit_profile_form=edit_profile_form, + update_account_information_form=update_account_information_form, + update_avatar_form=update_avatar_form, + update_notifications_form=update_notifications_form, + update_password_form=update_password_form, + update_profile_information_form=update_profile_information_form, + update_user_form=update_user_form, user=user ) - - - -# @bp.route('/users//edit', methods=['GET', 'POST']) -# @register_breadcrumb(bp, '.users.entity.edit', 'Edit', endpoint_arguments_constructor=user_eac) -# def edit_user(user_id): -# user = User.query.get_or_404(user_id) -# admin_edit_user_form = AdminEditUserForm( -# data={'confirmed': user.confirmed, 'role': user.role.hashid}, -# prefix='admin-edit-user-form' -# ) -# edit_profile_settings_form = EditAccountForm( -# user, -# data=user.to_json_serializeable(), -# prefix='edit-profile-settings-form' -# ) -# edit_notification_settings_form = EditNotificationsForm( -# data=user.to_json_serializeable(), -# prefix='edit-notification-settings-form' -# ) -# if (admin_edit_user_form.submit.data -# and admin_edit_user_form.validate()): -# user.confirmed = admin_edit_user_form.confirmed.data -# role_id = hashids.decode(admin_edit_user_form.role.data) -# user.role = Role.query.get(role_id) -# db.session.commit() -# flash('Your changes have been saved') -# return redirect(url_for('.edit_user', user_id=user.id)) -# if (edit_profile_settings_form.submit.data -# and edit_profile_settings_form.validate()): -# user.email = edit_profile_settings_form.email.data -# user.username = edit_profile_settings_form.username.data -# db.session.commit() -# flash('Your changes have been saved') -# return redirect(url_for('.edit_user', user_id=user.id)) -# if (edit_notification_settings_form.submit.data -# and edit_notification_settings_form.validate()): -# user.setting_job_status_mail_notification_level = \ -# UserSettingJobStatusMailNotificationLevel[ -# edit_notification_settings_form.job_status_mail_notification_level.data # noqa -# ] -# db.session.commit() -# flash('Your changes have been saved') -# return redirect(url_for('.edit_user', user_id=user.id)) -# return render_template( -# 'admin/edit_user.html.j2', -# admin_edit_user_form=admin_edit_user_form, -# edit_profile_settings_form=edit_profile_settings_form, -# edit_notification_settings_form=edit_notification_settings_form, -# title='Edit user', -# user=user -# ) diff --git a/app/api/schemas.py b/app/api/schemas.py index f0792f7c..74f4cb2a 100644 --- a/app/api/schemas.py +++ b/app/api/schemas.py @@ -2,7 +2,6 @@ from apifairy.fields import FileField from marshmallow import validate, validates, ValidationError from marshmallow.decorators import post_dump from app import ma -from app.auth import USERNAME_REGEX from app.models import ( Job, JobStatus, @@ -142,7 +141,10 @@ class UserSchema(ma.SQLAlchemySchema): username = ma.auto_field( validate=[ validate.Length(min=1, max=64), - validate.Regexp(USERNAME_REGEX, error='Usernames must have only letters, numbers, dots or underscores') + validate.Regexp( + User.username_pattern, + error='Usernames must have only letters, numbers, dots or underscores' + ) ] ) email = ma.auto_field(validate=validate.Email()) diff --git a/app/auth/__init__.py b/app/auth/__init__.py index 505e7e42..6f6ba82d 100644 --- a/app/auth/__init__.py +++ b/app/auth/__init__.py @@ -1,8 +1,5 @@ from flask import Blueprint -USERNAME_REGEX = '^[A-Za-zÄÖÜäöüß0-9_.]*$' - - bp = Blueprint('auth', __name__) from . import routes diff --git a/app/auth/forms.py b/app/auth/forms.py index 5655b3af..43db510a 100644 --- a/app/auth/forms.py +++ b/app/auth/forms.py @@ -8,7 +8,6 @@ from wtforms import ( from wtforms.validators import InputRequired, Email, EqualTo, Length, Regexp from app.forms import NopaqueForm from app.models import User -from . import USERNAME_REGEX class RegistrationForm(NopaqueForm): @@ -22,7 +21,7 @@ class RegistrationForm(NopaqueForm): InputRequired(), Length(max=64), Regexp( - USERNAME_REGEX, + User.username_pattern, message=( 'Usernames must have only letters, numbers, dots or ' 'underscores' diff --git a/app/forms.py b/app/forms.py index 55e80d01..6ac58347 100644 --- a/app/forms.py +++ b/app/forms.py @@ -1,9 +1,26 @@ from flask_wtf import FlaskForm +from wtforms.validators import ValidationError import re +form_prefix_pattern = re.compile(r'(?= max_size_b: + raise ValidationError( + f'File size must be less or equal than {max_size_mb} MB' + ) + field.data.seek(0) + return file_length_check + + class NopaqueForm(FlaskForm): def __init__(self, *args, **kwargs): if 'prefix' not in kwargs: - kwargs['prefix'] = re.sub(r'(?settingsSettings') @login_required def settings(): - user = current_user._get_current_object() - # region forms - edit_account_form = EditAccountForm() - edit_profile_form = EditProfileForm() - change_password_form = ChangePasswordForm() - edit_notifications_form = EditNotificationsForm() - # endregion forms - # region handle edit profile settings form - if edit_account_form.validate_on_submit(): - user.email = edit_account_form.email.data - user.username = edit_account_form.username.data + user = current_user + update_account_information_form = UpdateAccountInformationForm() + update_profile_information_form = UpdateProfileInformationForm() + update_avatar_form = UpdateAvatarForm() + update_password_form = UpdatePasswordForm() + update_notifications_form = UpdateNotificationsForm() + + # region handle update profile information form + if update_profile_information_form.submit.data and update_profile_information_form.validate(): + user.about_me = update_profile_information_form.about_me.data + user.location = update_profile_information_form.location.data + user.organization = update_profile_information_form.organization.data + user.website = update_profile_information_form.website.data + user.full_name = update_profile_information_form.full_name.data + db.session.commit() + flash('Your changes have been saved') + return redirect(url_for('.settings')) + # endregion handle update profile information form + + # region handle update avatar form + if update_avatar_form.submit.data and update_avatar_form.validate(): + try: + Avatar.create( + update_avatar_form.avatar.data, + user=user + ) + except (AttributeError, OSError): + abort(500) + db.session.commit() + flash('Your changes have been saved') + return redirect(url_for('.settings')) + # endregion handle update avatar form + + # region handle update account information form + if update_account_information_form.submit.data and update_account_information_form.validate(): + user.email = update_account_information_form.email.data + user.username = update_account_information_form.username.data db.session.commit() flash('Profile settings updated') return redirect(url_for('.settings')) - # endregion handle edit profile settings forms - # region handle edit public profile information form - if edit_profile_form.validate_on_submit(): - if edit_profile_form.avatar.data: - try: - Avatar.create( - edit_profile_form.avatar.data, - user=user - ) - except (AttributeError, OSError): - abort(500) - user.about_me = edit_profile_form.about_me.data - user.location = edit_profile_form.location.data - user.organization = edit_profile_form.organization.data - user.website = edit_profile_form.website.data - user.full_name = edit_profile_form.full_name.data + # endregion handle update account information form + + # region handle update password form + if update_password_form.submit.data and update_password_form.validate(): + user.password = update_password_form.new_password.data db.session.commit() flash('Your changes have been saved') return redirect(url_for('.settings')) - # endregion handle edit public profile information form - # region handle change_password_form POST - if change_password_form.validate_on_submit(): - user.password = change_password_form.new_password.data - db.session.commit() - flash('Your changes have been saved') - return redirect(url_for('.settings')) - # endregion handle change_password_form POST - # region handle edit_notification_settings_form POST - if edit_notifications_form.validate_on_submit(): + # endregion handle update password form + + # region handle update notifications form + if update_notifications_form.submit.data and update_notifications_form.validate(): user.setting_job_status_mail_notification_level = \ - edit_notifications_form.job_status_mail_notification_level.data + update_notifications_form.job_status_mail_notification_level.data db.session.commit() flash('Your changes have been saved') return redirect(url_for('.settings')) - # endregion handle edit_notification_settings_form POST + # endregion handle update notifications form + return render_template( 'settings/settings.html.j2', title='Settings', - change_password_form=change_password_form, - edit_account_form=edit_account_form, - edit_notifications_form=edit_notifications_form, - edit_profile_form=edit_profile_form, + update_account_information_form=update_account_information_form, + update_avatar_form=update_avatar_form, + update_notifications_form=update_notifications_form, + update_password_form=update_password_form, + update_profile_information_form=update_profile_information_form, user=user ) diff --git a/app/static/js/Requests/admin/admin.js b/app/static/js/Requests/admin/admin.js new file mode 100644 index 00000000..77fdb6b1 --- /dev/null +++ b/app/static/js/Requests/admin/admin.js @@ -0,0 +1,20 @@ +/***************************************************************************** +* Admin * +* Fetch requests for /admin routes * +*****************************************************************************/ +Requests.admin = {}; + +Requests.admin.users = {}; + +Requests.admin.users.entity = {}; + +Requests.admin.users.entity.confirmed = {}; + +Requests.admin.users.entity.confirmed.update = (userId, value) => { + let input = `/admin/users/${userId}/confirmed`; + let init = { + method: 'PUT', + body: JSON.stringify(value) + }; + return Requests.JSONfetch(input, init); +}; diff --git a/app/templates/_scripts.html.j2 b/app/templates/_scripts.html.j2 index bed2aef2..45e5457b 100644 --- a/app/templates/_scripts.html.j2 +++ b/app/templates/_scripts.html.j2 @@ -58,6 +58,7 @@ filters='rjsmin', output='gen/Requests.%(version)s.js', 'js/Requests/Requests.js', + 'js/Requests/admin/admin.js', 'js/Requests/contributions/contributions.js', 'js/Requests/contributions/spacy_nlp_pipeline_models.js', 'js/Requests/contributions/tesseract_ocr_pipeline_models.js', diff --git a/app/templates/admin/user.html.j2 b/app/templates/admin/user.html.j2 index dc5af986..0512db75 100644 --- a/app/templates/admin/user.html.j2 +++ b/app/templates/admin/user.html.j2 @@ -96,7 +96,7 @@
              Cancel - deleteDelete + deleteDelete
              {% endblock modals %} diff --git a/app/templates/admin/user_settings.html.j2 b/app/templates/admin/user_settings.html.j2 index 49d8ba4d..66d6250e 100644 --- a/app/templates/admin/user_settings.html.j2 +++ b/app/templates/admin/user_settings.html.j2 @@ -1,6 +1,74 @@ {% extends "settings/settings.html.j2" %} -{% block page_content %} +{% block admin_settings %} +
              +

              Administrator Settings

              +

              Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam + nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, + sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. + Stet clita kasd gubergren, no sea tak

              +
              +
              +
              +
                +
              • +
                + Confirmation status + keyboard_arrow_right +
                +
                +
                +
                +

                check

                +
                +
                +

                + Confirmed
                + Change confirmation status manually. +

                +
                +
                +
                + +
                +
                +
                +
                +
                • +
              • +
                + Role + keyboard_arrow_right +
                +
                + + {{ update_user_form.hidden_tag() }} + {{ wtf.render_field(update_user_form.role, material_icon='manage_accounts') }} +
                + {{ wtf.render_field(update_user_form.submit, material_icon='send') }} +
                + +
                +
                • +
              +
              +{% endblock admin_settings %} + +{% block scripts %} {{ super() }} -ADMIN ADDITIONS -{% endblock page_content %} + +{% endblock scripts %} diff --git a/app/templates/base.html.j2 b/app/templates/base.html.j2 index a924e9b7..82132828 100644 --- a/app/templates/base.html.j2 +++ b/app/templates/base.html.j2 @@ -50,8 +50,4 @@ {% block scripts %} {{ super() }} {% include "_scripts.html.j2" %} -{% set page_script = self._TemplateReference__context.name|replace('.html.j2', '.js.j2') %} - {% endblock scripts %} diff --git a/app/templates/settings/settings.html.j2 b/app/templates/settings/settings.html.j2 index b6ec4fa5..004a553a 100644 --- a/app/templates/settings/settings.html.j2 +++ b/app/templates/settings/settings.html.j2 @@ -7,8 +7,7 @@

              {{ title }}

              -
              -
              +

              Profile Settings

              Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam @@ -21,7 +20,7 @@

              • - Profile Privacy Settings + Profile Privacy keyboard_arrow_right
                @@ -62,38 +61,47 @@ Profile information keyboard_arrow_right
                +
                +
                + {{ update_profile_information_form.hidden_tag() }} + {{ wtf.render_field(update_profile_information_form.full_name, material_icon='badge') }} + {{ wtf.render_field(update_profile_information_form.about_me, material_icon='description', id='about-me-textfield') }} + {{ wtf.render_field(update_profile_information_form.website, material_icon='laptop') }} + {{ wtf.render_field(update_profile_information_form.organization, material_icon='business') }} + {{ wtf.render_field(update_profile_information_form.location, material_icon='location_on') }} +
                + {{ wtf.render_field(update_profile_information_form.submit, material_icon='send') }} +
                +
                +
                +
                • +
              • +
                + Avatar + keyboard_arrow_right +
                - {{ edit_profile_form.hidden_tag() }} - {{ wtf.render_field(edit_profile_form.full_name, material_icon='badge') }} - {{ wtf.render_field(edit_profile_form.about_me, material_icon='description', id='about-me-textfield') }} - {{ wtf.render_field(edit_profile_form.website, material_icon='laptop') }} - {{ wtf.render_field(edit_profile_form.organization, material_icon='business') }} - {{ wtf.render_field(edit_profile_form.location, material_icon='location_on') }} -

                + {{ update_avatar_form.hidden_tag() }}
                -
                - user-image +
                + Avatar
                -
                - {{ wtf.render_field(edit_profile_form.avatar, accept='image/jpeg, image/png, image/gif', placeholder='Choose an image file', id='avatar-upload') }} -
                -
                - delete +
                +
                + {{ wtf.render_field(update_avatar_form.avatar, accept='image/jpeg, image/png, image/gif', placeholder='Choose a JPEG or PNG file') }}
                -
                -

                - {{ wtf.render_field(edit_profile_form.submit, material_icon='send') }} + deleteDelete + {{ wtf.render_field(update_avatar_form.submit, material_icon='send') }}
              -
              -
              +

              General Settings

              Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam @@ -109,38 +117,14 @@ Account keyboard_arrow_right

              -
              -
              - {{ edit_account_form.hidden_tag() }} - {{ wtf.render_field(edit_account_form.username, material_icon='person') }} - {{ wtf.render_field(edit_account_form.email, material_icon='email') }} -
              - {{ wtf.render_field(edit_account_form.submit, material_icon='send') }} -
              -
              -
              -
              -

              Deleting an account has the following effects:

              -
                -
              • All data associated with your corpora and jobs will be permanently deleted.
                • -
              • All settings will be permanently deleted.
                • -
              -
              - deleteDelete -
              -
              - -
            • -
              - Notifications - keyboard_arrow_right -
              - {{ edit_notifications_form.hidden_tag() }} - {{ wtf.render_field(edit_notifications_form.job_status_mail_notification_level, material_icon='notifications') }} + {{ update_account_information_form.hidden_tag() }} + {{ wtf.render_field(update_account_information_form.username, material_icon='person') }} + {{ wtf.render_field(update_account_information_form.email, material_icon='email') }}
              - {{ wtf.render_field(edit_notifications_form.submit, material_icon='send') }} + deleteDelete + {{ wtf.render_field(update_account_information_form.submit, material_icon='send') }}
              @@ -152,18 +136,35 @@
              • - {{ change_password_form.hidden_tag() }} - {{ wtf.render_field(change_password_form.password, material_icon='vpn_key') }} - {{ wtf.render_field(change_password_form.new_password, material_icon='vpn_key') }} - {{ wtf.render_field(change_password_form.new_password_2, material_icon='vpn_key') }} + {{ update_password_form.hidden_tag() }} + {{ wtf.render_field(update_password_form.password, material_icon='vpn_key') }} + {{ wtf.render_field(update_password_form.new_password, material_icon='vpn_key') }} + {{ wtf.render_field(update_password_form.new_password_2, material_icon='vpn_key') }}
              - {{ wtf.render_field(change_password_form.submit, material_icon='send') }} + {{ wtf.render_field(update_password_form.submit, material_icon='send') }} +
              +
              +
              + +
            • +
              + Notifications + keyboard_arrow_right +
              +
              +
              + {{ update_notifications_form.hidden_tag() }} + {{ wtf.render_field(update_notifications_form.job_status_mail_notification_level, material_icon='notifications') }} +
              + {{ wtf.render_field(update_notifications_form.submit, material_icon='send') }}
            + + {% block admin_settings %}{% endblock admin_settings %} {% endblock page_content %} @@ -184,11 +185,16 @@ {% endblock modals %} @@ -196,25 +202,25 @@ {% block scripts %} {{ super() }} {%- endassets %} diff --git a/app/templates/settings/settings.html.j2 b/app/templates/settings/settings.html.j2 index 004a553a..27c9590c 100644 --- a/app/templates/settings/settings.html.j2 +++ b/app/templates/settings/settings.html.j2 @@ -221,7 +221,7 @@ deleteAvatarButtonElement.addEventListener('click', () => { }); document.querySelector('#delete-user').addEventListener('click', (event) => { - Requests.settings.entity.delete({{ user.hashid|tojson }}) + Requests.users.entity.delete({{ user.hashid|tojson }}) .then((response) => {window.location.href = '/';}); }); diff --git a/app/users/json_routes.py b/app/users/json_routes.py new file mode 100644 index 00000000..d228f8f3 --- /dev/null +++ b/app/users/json_routes.py @@ -0,0 +1,33 @@ +from flask import abort, current_app +from flask_login import current_user, login_required, logout_user +from threading import Thread +from app import db +from app.decorators import content_negotiation +from app.models import User +from . import bp + + +@bp.route('/', methods=['DELETE']) +@login_required +@content_negotiation(produces='application/json') +def delete_user(user_id): + def _delete_user(app, user_id): + with app.app_context(): + user = User.query.get(user_id) + user.delete() + db.session.commit() + + user = User.query.get_or_404(user_id) + if not (user == current_user or current_user.is_administrator()): + abort(403) + thread = Thread( + target=_delete_user, + args=(current_app._get_current_object(), user_id) + ) + if user == current_user: + logout_user() + thread.start() + response_data = { + 'message': f'User "{user.username}" marked for deletion' + } + return response_data, 202 From cca0185500db069eda6c522e0ba299a2115305e1 Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Fri, 31 Mar 2023 09:13:55 +0200 Subject: [PATCH 106/177] Remove latest extension recommendation --- .vscode/extensions.json | 1 - .vscode/settings.json | 5 +---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/.vscode/extensions.json b/.vscode/extensions.json index e3d1f58e..ecf868e0 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -1,7 +1,6 @@ { "recommendations": [ "samuelcolvin.jinjahtml", - "streetsidesoftware.code-spell-checker", "ms-azuretools.vscode-docker", "ms-python.python" ] diff --git a/.vscode/settings.json b/.vscode/settings.json index 4de986b9..5879e013 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -18,8 +18,5 @@ }, "[jinja-js]": { "editor.tabSize": 2 - }, - "cSpell.words": [ - "hashid" - ], + } } From cff4b2c5880556fe0c531530d967dd23527d76cf Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Fri, 31 Mar 2023 09:14:21 +0200 Subject: [PATCH 107/177] Fix problems with new forms --- app/admin/forms.py | 8 +++-- app/auth/forms.py | 30 +++++++++++++++---- app/contributions/forms.py | 6 ++-- .../spacy_nlp_pipeline_models/forms.py | 8 +++-- .../spacy_nlp_pipeline_models/routes.py | 4 +-- .../tesseract_ocr_pipeline_models/forms.py | 8 +++-- .../tesseract_ocr_pipeline_models/routes.py | 4 +-- app/corpora/files/forms.py | 14 +++++++-- app/corpora/forms.py | 21 +++++++++---- app/forms.py | 26 ---------------- app/services/forms.py | 12 ++++++-- app/services/routes.py | 8 ++--- app/settings/forms.py | 29 +++++++++++++----- .../services/corpus_analysis.html.j2 | 29 +----------------- app/wtforms/__init__.py | 0 app/wtforms/validators.py | 14 +++++++++ 16 files changed, 126 insertions(+), 95 deletions(-) delete mode 100644 app/forms.py create mode 100644 app/wtforms/__init__.py create mode 100644 app/wtforms/validators.py diff --git a/app/admin/forms.py b/app/admin/forms.py index f24ce8f3..ea684624 100644 --- a/app/admin/forms.py +++ b/app/admin/forms.py @@ -1,14 +1,16 @@ -from wtforms import BooleanField, SelectField, SubmitField -from app.forms import NopaqueForm +from flask_wtf import FlaskForm +from wtforms import SelectField, SubmitField from app.models import Role -class UpdateUserForm(NopaqueForm): +class UpdateUserForm(FlaskForm): role = SelectField('Role') submit = SubmitField() def __init__(self, user, *args, **kwargs): if 'data' not in kwargs: kwargs['data'] = {'role': user.role.hashid} + if 'prefix' not in kwargs: + kwargs['prefix'] = 'update-user-form' super().__init__(*args, **kwargs) self.role.choices = [(x.hashid, x.name) for x in Role.query.all()] diff --git a/app/auth/forms.py b/app/auth/forms.py index 43db510a..d8ca5770 100644 --- a/app/auth/forms.py +++ b/app/auth/forms.py @@ -1,3 +1,4 @@ +from flask_wtf import FlaskForm from wtforms import ( BooleanField, PasswordField, @@ -6,11 +7,10 @@ from wtforms import ( ValidationError ) from wtforms.validators import InputRequired, Email, EqualTo, Length, Regexp -from app.forms import NopaqueForm from app.models import User -class RegistrationForm(NopaqueForm): +class RegistrationForm(FlaskForm): email = StringField( 'Email', validators=[InputRequired(), Email(), Length(max=254)] @@ -45,6 +45,11 @@ class RegistrationForm(NopaqueForm): ) submit = SubmitField() + def __init__(self, *args, **kwargs): + if 'prefix' not in kwargs: + kwargs['prefix'] = 'registration-form' + super().__init__(*args, **kwargs) + def validate_email(self, field): if User.query.filter_by(email=field.data.lower()).first(): raise ValidationError('Email already registered') @@ -54,19 +59,29 @@ class RegistrationForm(NopaqueForm): raise ValidationError('Username already in use') -class LoginForm(NopaqueForm): +class LoginForm(FlaskForm): user = StringField('Email or username', validators=[InputRequired()]) password = PasswordField('Password', validators=[InputRequired()]) remember_me = BooleanField('Keep me logged in') submit = SubmitField() + def __init__(self, *args, **kwargs): + if 'prefix' not in kwargs: + kwargs['prefix'] = 'login-form' + super().__init__(*args, **kwargs) -class ResetPasswordRequestForm(NopaqueForm): + +class ResetPasswordRequestForm(FlaskForm): email = StringField('Email', validators=[InputRequired(), Email()]) submit = SubmitField() + def __init__(self, *args, **kwargs): + if 'prefix' not in kwargs: + kwargs['prefix'] = 'reset-password-request-form' + super().__init__(*args, **kwargs) -class ResetPasswordForm(NopaqueForm): + +class ResetPasswordForm(FlaskForm): password = PasswordField( 'New password', validators=[ @@ -82,3 +97,8 @@ class ResetPasswordForm(NopaqueForm): ] ) submit = SubmitField() + + def __init__(self, *args, **kwargs): + if 'prefix' not in kwargs: + kwargs['prefix'] = 'reset-password-form' + super().__init__(*args, **kwargs) diff --git a/app/contributions/forms.py b/app/contributions/forms.py index 46777ff0..598fb7cc 100644 --- a/app/contributions/forms.py +++ b/app/contributions/forms.py @@ -1,3 +1,4 @@ +from flask_wtf import FlaskForm from wtforms import ( StringField, SubmitField, @@ -5,10 +6,9 @@ from wtforms import ( IntegerField ) from wtforms.validators import InputRequired, Length -from app.forms import NopaqueForm -class ContributionBaseForm(NopaqueForm): +class ContributionBaseForm(FlaskForm): title = StringField( 'Title', validators=[InputRequired(), Length(max=64)] @@ -43,5 +43,5 @@ class ContributionBaseForm(NopaqueForm): submit = SubmitField() -class EditContributionBaseForm(ContributionBaseForm): +class UpdateContributionBaseForm(ContributionBaseForm): pass diff --git a/app/contributions/spacy_nlp_pipeline_models/forms.py b/app/contributions/spacy_nlp_pipeline_models/forms.py index 2670c1d1..dc3ca781 100644 --- a/app/contributions/spacy_nlp_pipeline_models/forms.py +++ b/app/contributions/spacy_nlp_pipeline_models/forms.py @@ -2,7 +2,7 @@ from flask_wtf.file import FileField, FileRequired from wtforms import StringField, ValidationError from wtforms.validators import InputRequired, Length from app.services import SERVICES -from ..forms import ContributionBaseForm, EditContributionBaseForm +from ..forms import ContributionBaseForm, UpdateContributionBaseForm class CreateSpaCyNLPPipelineModelForm(ContributionBaseForm): @@ -20,6 +20,8 @@ class CreateSpaCyNLPPipelineModelForm(ContributionBaseForm): raise ValidationError('.tar.gz files only!') def __init__(self, *args, **kwargs): + if 'prefix' not in kwargs: + kwargs['prefix'] = 'create-spacy-nlp-pipeline-model-form' super().__init__(*args, **kwargs) service_manifest = SERVICES['spacy-nlp-pipeline'] self.compatible_service_versions.choices = [('', 'Choose your option')] @@ -29,12 +31,14 @@ class CreateSpaCyNLPPipelineModelForm(ContributionBaseForm): self.compatible_service_versions.default = '' -class EditSpaCyNLPPipelineModelForm(EditContributionBaseForm): +class UpdateSpaCyNLPPipelineModelForm(UpdateContributionBaseForm): pipeline_name = StringField( 'Pipeline name', validators=[InputRequired(), Length(max=64)] ) def __init__(self, *args, **kwargs): + if 'prefix' not in kwargs: + kwargs['prefix'] = 'edit-spacy-nlp-pipeline-model-form' super().__init__(*args, **kwargs) service_manifest = SERVICES['spacy-nlp-pipeline'] self.compatible_service_versions.choices = [('', 'Choose your option')] diff --git a/app/contributions/spacy_nlp_pipeline_models/routes.py b/app/contributions/spacy_nlp_pipeline_models/routes.py index eab8ac49..f53d55f1 100644 --- a/app/contributions/spacy_nlp_pipeline_models/routes.py +++ b/app/contributions/spacy_nlp_pipeline_models/routes.py @@ -6,7 +6,7 @@ from app.models import SpaCyNLPPipelineModel from . import bp from .forms import ( CreateSpaCyNLPPipelineModelForm, - EditSpaCyNLPPipelineModelForm + UpdateSpaCyNLPPipelineModelForm ) from .utils import ( spacy_nlp_pipeline_model_dlc as spacy_nlp_pipeline_model_dlc @@ -63,7 +63,7 @@ def create_spacy_nlp_pipeline_model(): @login_required def spacy_nlp_pipeline_model(spacy_nlp_pipeline_model_id): snpm = SpaCyNLPPipelineModel.query.get_or_404(spacy_nlp_pipeline_model_id) - form = EditSpaCyNLPPipelineModelForm(data=snpm.to_json_serializeable()) + form = UpdateSpaCyNLPPipelineModelForm(data=snpm.to_json_serializeable()) if form.validate_on_submit(): form.populate_obj(snpm) if db.session.is_modified(snpm): diff --git a/app/contributions/tesseract_ocr_pipeline_models/forms.py b/app/contributions/tesseract_ocr_pipeline_models/forms.py index 51f0d76c..9a5979dd 100644 --- a/app/contributions/tesseract_ocr_pipeline_models/forms.py +++ b/app/contributions/tesseract_ocr_pipeline_models/forms.py @@ -1,7 +1,7 @@ from flask_wtf.file import FileField, FileRequired from wtforms import ValidationError from app.services import SERVICES -from ..forms import ContributionBaseForm, EditContributionBaseForm +from ..forms import ContributionBaseForm, UpdateContributionBaseForm class CreateTesseractOCRPipelineModelForm(ContributionBaseForm): @@ -15,6 +15,8 @@ class CreateTesseractOCRPipelineModelForm(ContributionBaseForm): raise ValidationError('traineddata files only!') def __init__(self, *args, **kwargs): + if 'prefix' not in kwargs: + kwargs['prefix'] = 'create-tesseract-ocr-pipeline-model-form' service_manifest = SERVICES['tesseract-ocr-pipeline'] super().__init__(*args, **kwargs) self.compatible_service_versions.choices = [('', 'Choose your option')] @@ -24,8 +26,10 @@ class CreateTesseractOCRPipelineModelForm(ContributionBaseForm): self.compatible_service_versions.default = '' -class EditTesseractOCRPipelineModelForm(EditContributionBaseForm): +class UpdateTesseractOCRPipelineModelForm(UpdateContributionBaseForm): def __init__(self, *args, **kwargs): + if 'prefix' not in kwargs: + kwargs['prefix'] = 'edit-tesseract-ocr-pipeline-model-form' service_manifest = SERVICES['tesseract-ocr-pipeline'] super().__init__(*args, **kwargs) self.compatible_service_versions.choices = [('', 'Choose your option')] diff --git a/app/contributions/tesseract_ocr_pipeline_models/routes.py b/app/contributions/tesseract_ocr_pipeline_models/routes.py index 51adf402..e0261e80 100644 --- a/app/contributions/tesseract_ocr_pipeline_models/routes.py +++ b/app/contributions/tesseract_ocr_pipeline_models/routes.py @@ -6,7 +6,7 @@ from app.models import TesseractOCRPipelineModel from . import bp from .forms import ( CreateTesseractOCRPipelineModelForm, - EditTesseractOCRPipelineModelForm + UpdateTesseractOCRPipelineModelForm ) from .utils import ( tesseract_ocr_pipeline_model_dlc as tesseract_ocr_pipeline_model_dlc @@ -62,7 +62,7 @@ def create_tesseract_ocr_pipeline_model(): @login_required def tesseract_ocr_pipeline_model(tesseract_ocr_pipeline_model_id): topm = TesseractOCRPipelineModel.query.get_or_404(tesseract_ocr_pipeline_model_id) - form = EditTesseractOCRPipelineModelForm(data=topm.to_json_serializeable()) + form = UpdateTesseractOCRPipelineModelForm(data=topm.to_json_serializeable()) if form.validate_on_submit(): form.populate_obj(topm) if db.session.is_modified(topm): diff --git a/app/corpora/files/forms.py b/app/corpora/files/forms.py index c819fba2..e6918a83 100644 --- a/app/corpora/files/forms.py +++ b/app/corpora/files/forms.py @@ -1,3 +1,4 @@ +from flask_wtf import FlaskForm from flask_wtf.file import FileField, FileRequired from wtforms import ( StringField, @@ -6,10 +7,9 @@ from wtforms import ( IntegerField ) from wtforms.validators import InputRequired, Length -from app.forms import NopaqueForm -class CorpusFileBaseForm(NopaqueForm): +class CorpusFileBaseForm(FlaskForm): author = StringField( 'Author', validators=[InputRequired(), Length(max=255)] @@ -41,6 +41,14 @@ class CreateCorpusFileForm(CorpusFileBaseForm): if not field.data.filename.lower().endswith('.vrt'): raise ValidationError('VRT files only!') + def __init__(self, *args, **kwargs): + if 'prefix' not in kwargs: + kwargs['prefix'] = 'create-corpus-file-form' + super().__init__(*args, **kwargs) + class UpdateCorpusFileForm(CorpusFileBaseForm): - pass + def __init__(self, *args, **kwargs): + if 'prefix' not in kwargs: + kwargs['prefix'] = 'update-corpus-file-form' + super().__init__(*args, **kwargs) diff --git a/app/corpora/forms.py b/app/corpora/forms.py index e923ca1b..fa8ccd05 100644 --- a/app/corpora/forms.py +++ b/app/corpora/forms.py @@ -1,9 +1,9 @@ +from flask_wtf import FlaskForm from wtforms import StringField, SubmitField, TextAreaField from wtforms.validators import InputRequired, Length -from app.forms import NopaqueForm -class CorpusBaseForm(NopaqueForm): +class CorpusBaseForm(FlaskForm): description = TextAreaField( 'Description', validators=[InputRequired(), Length(max=255)] @@ -13,12 +13,21 @@ class CorpusBaseForm(NopaqueForm): class CreateCorpusForm(CorpusBaseForm): - pass + def __init__(self, *args, **kwargs): + if 'prefix' not in kwargs: + kwargs['prefix'] = 'create-corpus-form' + super().__init__(*args, **kwargs) class UpdateCorpusForm(CorpusBaseForm): - pass + def __init__(self, *args, **kwargs): + if 'prefix' not in kwargs: + kwargs['prefix'] = 'update-corpus-form' + super().__init__(*args, **kwargs) -class ImportCorpusForm(NopaqueForm): - pass +class ImportCorpusForm(FlaskForm): + def __init__(self, *args, **kwargs): + if 'prefix' not in kwargs: + kwargs['prefix'] = 'import-corpus-form' + super().__init__(*args, **kwargs) diff --git a/app/forms.py b/app/forms.py deleted file mode 100644 index 6ac58347..00000000 --- a/app/forms.py +++ /dev/null @@ -1,26 +0,0 @@ -from flask_wtf import FlaskForm -from wtforms.validators import ValidationError -import re - - -form_prefix_pattern = re.compile(r'(?= max_size_b: - raise ValidationError( - f'File size must be less or equal than {max_size_mb} MB' - ) - field.data.seek(0) - return file_length_check - - -class NopaqueForm(FlaskForm): - def __init__(self, *args, **kwargs): - if 'prefix' not in kwargs: - kwargs['prefix'] = \ - form_prefix_pattern.sub('-', self.__class__.__name__).lower() - super().__init__(*args, **kwargs) - diff --git a/app/services/forms.py b/app/services/forms.py index d53132f8..01b1cdd8 100644 --- a/app/services/forms.py +++ b/app/services/forms.py @@ -1,3 +1,4 @@ +from flask_wtf import FlaskForm from flask_login import current_user from flask_wtf.file import FileField, FileRequired from wtforms import ( @@ -10,12 +11,11 @@ from wtforms import ( ValidationError ) from wtforms.validators import InputRequired, Length -from app.forms import NopaqueForm from app.models import SpaCyNLPPipelineModel, TesseractOCRPipelineModel from . import SERVICES -class CreateJobBaseForm(NopaqueForm): +class CreateJobBaseForm(FlaskForm): description = StringField( 'Description', validators=[InputRequired(), Length(max=255)] @@ -38,6 +38,8 @@ class CreateFileSetupPipelineJobForm(CreateJobBaseForm): raise ValidationError('JPEG, PNG and TIFF files only!') def __init__(self, *args, **kwargs): + if 'prefix' not in kwargs: + kwargs['prefix'] = 'create-file-setup-pipeline-job-form' service_manifest = SERVICES['file-setup-pipeline'] version = kwargs.pop('version', service_manifest['latest_version']) super().__init__(*args, **kwargs) @@ -65,6 +67,8 @@ class CreateTesseractOCRPipelineJobForm(CreateJobBaseForm): raise ValidationError('PDF files only!') def __init__(self, *args, **kwargs): + if 'prefix' not in kwargs: + kwargs['prefix'] = 'create-tesseract-ocr-pipeline-job-form' service_manifest = SERVICES['tesseract-ocr-pipeline'] version = kwargs.pop('version', service_manifest['latest_version']) super().__init__(*args, **kwargs) @@ -111,6 +115,8 @@ class CreateTranskribusHTRPipelineJobForm(CreateJobBaseForm): raise ValidationError('PDF files only!') def __init__(self, *args, **kwargs): + if 'prefix' not in kwargs: + kwargs['prefix'] = 'create-transkribus-htr-pipeline-job-form' transkribus_htr_pipeline_models = kwargs.pop('transkribus_htr_pipeline_models', []) service_manifest = SERVICES['transkribus-htr-pipeline'] version = kwargs.pop('version', service_manifest['latest_version']) @@ -149,6 +155,8 @@ class CreateSpacyNLPPipelineJobForm(CreateJobBaseForm): raise ValidationError('Plain text files only!') def __init__(self, *args, **kwargs): + if 'prefix' not in kwargs: + kwargs['prefix'] = 'create-spacy-nlp-pipeline-job-form' service_manifest = SERVICES['spacy-nlp-pipeline'] version = kwargs.pop('version', service_manifest['latest_version']) super().__init__(*args, **kwargs) diff --git a/app/services/routes.py b/app/services/routes.py index 3a3cbd7b..7ab36384 100644 --- a/app/services/routes.py +++ b/app/services/routes.py @@ -35,7 +35,7 @@ def file_setup_pipeline(): version = request.args.get('version', service_manifest['latest_version']) if version not in service_manifest['versions']: abort(404) - form = CreateFileSetupPipelineJobForm(version=version) + form = CreateFileSetupPipelineJobForm(prefix='create-job-form', version=version) if form.is_submitted(): if not form.validate(): response = {'errors': form.errors} @@ -77,7 +77,7 @@ def tesseract_ocr_pipeline(): version = request.args.get('version', service_manifest['latest_version']) if version not in service_manifest['versions']: abort(404) - form = CreateTesseractOCRPipelineJobForm(version=version) + form = CreateTesseractOCRPipelineJobForm(prefix='create-job-form', version=version) if form.is_submitted(): if not form.validate(): response = {'errors': form.errors} @@ -137,8 +137,8 @@ def transkribus_htr_pipeline(): abort(500) transkribus_htr_pipeline_models = r.json()['trpModelMetadata'] transkribus_htr_pipeline_models.append({'modelId': 48513, 'name': 'Caroline Minuscle', 'language': 'lat', 'isoLanguages': ['lat']}) - print(transkribus_htr_pipeline_models[len(transkribus_htr_pipeline_models)-1]) form = CreateTranskribusHTRPipelineJobForm( + prefix='create-job-form', transkribus_htr_pipeline_models=transkribus_htr_pipeline_models, version=version ) @@ -186,7 +186,7 @@ def spacy_nlp_pipeline(): version = request.args.get('version', SERVICES[service]['latest_version']) if version not in service_manifest['versions']: abort(404) - form = CreateSpacyNLPPipelineJobForm(version=version) + form = CreateSpacyNLPPipelineJobForm(prefix='create-job-form', version=version) spacy_nlp_pipeline_models = SpaCyNLPPipelineModel.query.all() if form.is_submitted(): if not form.validate(): diff --git a/app/settings/forms.py b/app/settings/forms.py index 6778bbe6..77c8687c 100644 --- a/app/settings/forms.py +++ b/app/settings/forms.py @@ -1,4 +1,5 @@ from flask_login import current_user +from flask_wtf import FlaskForm from flask_wtf.file import FileField, FileRequired from wtforms import ( PasswordField, @@ -15,11 +16,11 @@ from wtforms.validators import ( Length, Regexp ) -from app.forms import NopaqueForm, LimitFileSize from app.models import User, UserSettingJobStatusMailNotificationLevel +from app.wtforms.validators import FileSize -class UpdateAccountInformationForm(NopaqueForm): +class UpdateAccountInformationForm(FlaskForm): email = StringField( 'E-Mail', validators=[DataRequired(), Length(max=254), Email()] @@ -43,6 +44,8 @@ class UpdateAccountInformationForm(NopaqueForm): def __init__(self, *args, user=current_user, **kwargs): if 'data' not in kwargs: kwargs['data'] = user.to_json_serializeable() + if 'prefix' not in kwargs: + kwargs['prefix'] = 'update-account-information-form' super().__init__(*args, **kwargs) self.user = user @@ -57,7 +60,7 @@ class UpdateAccountInformationForm(NopaqueForm): raise ValidationError('Username already in use') -class UpdateProfileInformationForm(NopaqueForm): +class UpdateProfileInformationForm(FlaskForm): full_name = StringField( 'Full name', validators=[Length(max=128)] @@ -91,11 +94,13 @@ class UpdateProfileInformationForm(NopaqueForm): def __init__(self, *args, user=current_user, **kwargs): if 'data' not in kwargs: kwargs['data'] = user.to_json_serializeable() + if 'prefix' not in kwargs: + kwargs['prefix'] = 'update-profile-information-form' super().__init__(*args, **kwargs) -class UpdateAvatarForm(NopaqueForm): - avatar = FileField('File', validators=[FileRequired(), LimitFileSize(2)]) +class UpdateAvatarForm(FlaskForm): + avatar = FileField('File', validators=[FileRequired(), FileSize(2)]) submit = SubmitField() def validate_avatar(self, field): @@ -103,7 +108,13 @@ class UpdateAvatarForm(NopaqueForm): if field.data.mimetype not in valid_mimetypes: raise ValidationError('JPEG and PNG files only!') -class UpdatePasswordForm(NopaqueForm): + def __init__(self, *args, **kwargs): + if 'prefix' not in kwargs: + kwargs['prefix'] = 'update-avatar-form' + super().__init__(*args, **kwargs) + + +class UpdatePasswordForm(FlaskForm): password = PasswordField('Old password', validators=[DataRequired()]) new_password = PasswordField( 'New password', @@ -122,6 +133,8 @@ class UpdatePasswordForm(NopaqueForm): submit = SubmitField() def __init__(self, *args, user=current_user, **kwargs): + if 'prefix' not in kwargs: + kwargs['prefix'] = 'update-password-form' super().__init__(*args, **kwargs) self.user = user @@ -130,7 +143,7 @@ class UpdatePasswordForm(NopaqueForm): raise ValidationError('Invalid password') -class UpdateNotificationsForm(NopaqueForm): +class UpdateNotificationsForm(FlaskForm): job_status_mail_notification_level = SelectField( 'Job status mail notification level', choices=[ @@ -144,4 +157,6 @@ class UpdateNotificationsForm(NopaqueForm): def __init__(self, *args, user=current_user, **kwargs): if 'data' not in kwargs: kwargs['data'] = user.to_json_serializeable() + if 'prefix' not in kwargs: + kwargs['prefix'] = 'update-notifications-form' super().__init__(*args, **kwargs) diff --git a/app/templates/services/corpus_analysis.html.j2 b/app/templates/services/corpus_analysis.html.j2 index 9ddc9ec3..47fc6a47 100644 --- a/app/templates/services/corpus_analysis.html.j2 +++ b/app/templates/services/corpus_analysis.html.j2 @@ -28,38 +28,11 @@
            - Import Corpusimport_export + Import Corpusimport_export Create corpusadd
            - -
            -

            My query results

            -
            -
            -
            - search - - -
            - - - - - - - - - -
            Title and DescriptionCorpus and Query
            -
              -
              -
              - Add query resultfile_upload -
              -
              -
              {% endblock page_content %} diff --git a/app/wtforms/__init__.py b/app/wtforms/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/app/wtforms/validators.py b/app/wtforms/validators.py new file mode 100644 index 00000000..bef95681 --- /dev/null +++ b/app/wtforms/validators.py @@ -0,0 +1,14 @@ +from wtforms.validators import ValidationError + + +def FileSize(max_size_mb): + max_size_b = max_size_mb * 1024 * 1024 + + def file_length_check(form, field): + if len(field.data.read()) >= max_size_b: + raise ValidationError( + f'File size must be less or equal than {max_size_mb} MB' + ) + field.data.seek(0) + + return file_length_check From 43751b44ac23aa1e8e8e194cf862229c53a8d270 Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Fri, 31 Mar 2023 09:25:13 +0200 Subject: [PATCH 108/177] Fix missing job status value in toast notification --- app/static/js/App.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/static/js/App.js b/app/static/js/App.js index 87d44d71..6d54a7a5 100644 --- a/app/static/js/App.js +++ b/app/static/js/App.js @@ -91,7 +91,7 @@ class App { .filter((operation) => {return subRegExp.test(operation.path);}); for (let operation of subFilteredPatch) { let [match, userId, jobId] = operation.path.match(subRegExp); - this.flash(`[${this.data.users[userId].jobs[jobId].title}] New status: `, 'job'); + this.flash(`[${this.data.users[userId].jobs[jobId].title}] New status: `, 'job'); } // Apply Patch From 491e24f0a3339d3cbbe239223a974b489995f194 Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Fri, 31 Mar 2023 09:32:59 +0200 Subject: [PATCH 109/177] Fix jobinputlist --- app/static/js/ResourceLists/JobInputList.js | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/app/static/js/ResourceLists/JobInputList.js b/app/static/js/ResourceLists/JobInputList.js index 7f1a5105..97a8dd14 100644 --- a/app/static/js/ResourceLists/JobInputList.js +++ b/app/static/js/ResourceLists/JobInputList.js @@ -12,11 +12,7 @@ class JobInputList extends ResourceList { this.userId = listContainerElement.dataset.userId; this.jobId = listContainerElement.dataset.jobId; if (this.userId === undefined || this.jobId === undefined) {return;} - app.subscribeUser(this.userId).then((response) => { - app.socket.on('PATCH', (patch) => { - if (this.isInitialized) {this.onPatch(patch);} - }); - }); + app.subscribeUser(this.userId); app.getUser(this.userId).then((user) => { this.add(Object.values(user.jobs[this.jobId].inputs)); this.isInitialized = true; From 9167bffa61ea18948e2e65f4e8454183b7c66c1c Mon Sep 17 00:00:00 2001 From: Inga Kirschnick Date: Fri, 31 Mar 2023 11:46:17 +0200 Subject: [PATCH 110/177] New user avatar --- app/settings/forms.py | 2 +- app/static/images/user_avatar.png | Bin 2011 -> 14567 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/app/settings/forms.py b/app/settings/forms.py index 6778bbe6..e14ab91a 100644 --- a/app/settings/forms.py +++ b/app/settings/forms.py @@ -95,7 +95,7 @@ class UpdateProfileInformationForm(NopaqueForm): class UpdateAvatarForm(NopaqueForm): - avatar = FileField('File', validators=[FileRequired(), LimitFileSize(2)]) + avatar = FileField('File', validators=[LimitFileSize(2)]) submit = SubmitField() def validate_avatar(self, field): diff --git a/app/static/images/user_avatar.png b/app/static/images/user_avatar.png index 09892098aa943af5fe95e7dd434a07fe03e7ccd1..01dfaa60ee378b82d15034d459111dafee0738dd 100644 GIT binary patch literal 14567 zcmbWe2UJr{*D!i$0)ir4il735RHds(9zmLjp;sZ&K}zT#ghW9>x`2S7f>Kokq)Ux- z1ToSjNDBy3q6sAg((dv3{_lJLb=SRX{rB!1uNMHAnE~-v4pXIo@FBm>7RXQHnU zGq;2qn%p$_cTmhHU4w%B|27T?3=6R|(mQSM;CPyS6&%gq@qpm!9vXDb-2CQW{J($y z;{O5C)PL0-SNhx67Of;*`;k#kKtl&K8hcXZKlT0}v7;WIq3+-lDp)SK2Ze-zj8Ft| z^T@EEzc>QK1wz0o#1KV5!@BHn-6U0q`K)@YP1{6VD6}SKv)xUfO+k!xv{9pW2{Lj7k1pv5; zW-u6S|G9Sq4FI)T0C2SBKlkLc0f3ha00vuvTti&{?T!V!GJAm%wp{@L#~c8F{~OrG zDb!0%_21`A+-OpIPY666#c)4%XL5n#?}rb*WJU@%iG8IZfIC|L}b*x==g_^5)vOLC1+(n&B@JsmS0d@ zQd(AC@#gKjy84F3rsj_=t=&Dnef)I|(DK$%ipj*i3Q6XvdB^lyh(*C9F|BSG>|6i2-4`KhIYZlN4HT*9ygI^YA zW^k%lKwt$)0D_2^1z4UH}5n>2k%%!2gsQ3~E-3el&@4lHMKdAHSTKa)yjt?DQqq5aN7G0%# zBxr~zZV52`HbeLl!9hVNM-Znz77XB2`Y>F+)3yhEPAK2m;h@rp3;lo2#WqbJ)NC#Y zqZUgf3Fa8Sd7qsP7j1G)tmyN%yK|aX<_xv1w0CrSywU_rvQyvRXu)-2$W{#C2ocp~ zt$Pmky}EYM55n%-JbG^ddzn<}DPaEA`I8ykPibW1;(Ehupw<5URkS_>cx-mRTVeIt z_db#>EPQU^2NKQzcoQ%7U-3N2X%-oYLdn-LfKM4)JTL|jACFpmdYP?fR;#z7-Q$m6 z=|;%g!wZdA)aA7R$RcimEOTli?vhSqEC;0bP`NCF8u4R#I}&6>7k79KGdZVSjTlNQ zAd4(jKE8D>Zn^Jf^F`X7kB!ZjNQ&pf|B%lv^k}=o$k$Q+JP-25Br3ykJ^_h~?pmyL zn_ouvKe`O>??i6W^afr+PLS*HG?#+rTj)b)44&naB*76)mRabHu-}EHURHWu3mmh; zjNjAU&+LUbQudby`itTjz{#-2DY`&Zg$YrqWc%E>%9&Q^SJ}G^KvxGh7fMb3J@xY`v3l*NAm2Sz9Vbx#txZc9>m-XvUupb)RL>Yy685oGe z&vim|2}PP+vf4&iqxNuA1Oo`id|3J;yp4#lUQ_W_9vh9N#F8LojtYf@niPb}^2;N$ zeY)He0ejAx+ZwrC&mDy9OO4EjY@R*|;ee!tX&jUmkJm#iQnT%@83?>qq;s9oj{(ueHX%xzEiJ~(5@5N1xY?<)|!T0W1Z>mp$Tc8I+gh1 z+8}Qx?CAo*a)B(5!n1?(s7-z=k^DBaJW76k%ivX%%eVTx$bih@ptmD^6Zt@pp0~ey zmJ=QdN)G|5GLuN>Y$RkD(Lj}0tjaoN)Yr_%h32A)H)XN6Pw;$c+VKPG1DcPE`WByY zO|p=BSzciK0rIW=(x;O;$ThLjk>zTA)#-#&KP%M zzrE+p@y+uH3DhJymE3dRQAXP)Sf%wV`-ellc~;_^hpa}?#@jW{n8At{ix-pzn4nlF z9cgWM(0_bAdN}_;DPuMx8Dt}@W){<@dop9G;*&#|WZXP=V{^gRSp&kYJhlP@*6J^9 zvd_#E`QG@$8#H?^-AOh>no_OF3&fJ;@8oxan86)`t0XW z=~Q9qm#>!3wRa|ywzpE)A2NW5(qc+kxsKxSnC2n39$n(mECC$Wrxp>kybZHewDIcfu{Bi}wq-LQ` z79Y=zRiO&XlA=Z%M+^_@Rnm1hN^THYy%hA>+6J?Xt0Fe2Iazy3_h;#;bjP=4M0PsI z+eJyNaF=67{{mTBrSFPl>fy1tBo!T%H?6*Oxet27qU^~w%?^=u(9^0t-YrthY#*ih zsfTuO!ZOag7ZyLSR!2@F6gf}mXwW9ec~Z2oGbEOfpWbti%!y~Mw^#|re|xy zVfjT(!dozk4Y>21X8=BC=Oj3w*o&r427L>4a)unpfywd19Y>3JQPNQ4p;SD{p|9*$!KwFodCgXu6Uir^)?b8NgRRDbTyp`3 z^qgu8UY}B9yv9aGD(*KpB{mc0Q(I)>PZizG7yk2O zbLf;8pY-;;bu}D250BYR@4&3q@J8j92dCdt=0i02&Q0W*X?3(3d9)4<*ZxLx>#z}| z=*JiUnWX~xZ9%eOSW<*O<#K5pi{grMSvkm^7p{M%j=I~%F`HT6;+1n_SS_Kx!6OZ> zTzODRo+P&6FnAH7mMwXJ*aK@Lsw9QC6vVV`4*b|MS>m;3O_m!N7Pu(i#|LD-E55Hx zMUnADHPUnPFis@{b~60P1l0%^Gtl0ipAx{jPdcqKwRmfi?HH%Zk|&=8gx;jC?6m!k0(~@Tfm7`|#@bXaEuehM*ofvj>v87O=_bE*`Q5KPjDPn|qjuXCgxM2>x{j z0#BTLHA6SEDz(34{t%HKFG(xW7D-yOz0`AuIaXyrlHhBUuBf9D8A+I3PD`(>I=hM; zxB4bCj`#3Smu^X*lZ^XSLz=cj`!9_ku0r{@Phw`;_0XjSl(A-9EFN++D$bf#+;b(m z57IKk03J|dEnwvfO&BVlFln6@hp*N#BW84$SQ1{g$rthasEX0#0x!y`X*Y~9pyrhI~WCT6JT&3YX$#&Pz?%@1em<#VGf_RZko z)lpLY(WW_#6I+wH#(_!|N%^+86QlX=M(!d}a}LG1=OrmIpn6E7 zy6n|4WI5Tc9l|CqXTls|LwI^rL;Hi2XwI8%8LHd`)muX077r2PY~eMl{B+JFia`_? zsgEoc%m7%OXf<%Y;eUuW!_J7y#G8dyn591_j*WE%)I}I%iMbZg=EndUYN&kKq!r)Nv<8$oRbz6bW3FZXbbDgj=N)6kPhJ)&z<`A(w~>3 zDklYZ&|9x5rc@nT4Fm9A;HH0L0Nm$x)N6RLigc$F9?j1X^|QmN52RI(819P)!>-$H zCrI&Jwvo9}+>l-G;zRH3!JTn@ad#{-#SYr)Y9L^HZh$dHrzzXwtWO$(s2*6o z4>fK3{9q-uKhP@)##A|nUaV&TP4sw*6LNf%dYP<6a)LcXaV+Wz6P(ME&pOfyXWSET zzg3h?+_tISQNC}(N!EPV)-82!iqG#hDlxn1sRqR%P_7VT%~DoqS9>hp_I zG&oac6gPZ+iGP37v6KPykfaVq4y(Hi1ng#txCJZ>fLL%tW}Tzm@03Ax8KQlicpf0x z^26pd=cV3kV%r}$sN*$dt+UJ@JsnnSD>d(Jum7mjB$IWW0hraySdq-hViaM7$ap6k z5`$Hb)=hGye1mXG~b7Z^aM8n(_hw+LrjVP(s zhSs#DLe3{TA%=^UB_+)7-W*<(4 zNAICQiLg%C;JOt7ZcbI^>_WjR`IRTMO_+iZ@l<%?)_9MXy1POk|k2soa6l< z+4!Mq-HQ`Or{gZM+U>$9!7lcwE(^%wbEF739Z%OYdl`UGC+}zWc)F~#i*<<0jPXC? zd!fuX-n|(&R%xmOv24`x|dR@=wK44y0xr*GJDcNh%^+i>8@cMDEreoV1y&d@qh z)7aMv@Bil*=YX;wrL1P#o5%nj(&a&0PYX0(!F89rv`#h&$xki`ulkaC^+TJ}`QF@V z=Cgedg`fE67~(|F8%c{#AC@3akgJw3=|$`a6=Ghu%BpYS`7wOBsr$lkYm%pVEXT39 zE24BHF+;k7+e`<;L$HA*Z|>Mq@@c}0g)x>CWxhxj)ge&^>ejL>evL6s zr-XBD1}JyO-XJ#V!^KRcB!=$SLhcLFZ!myHbYBr4aths~mDYLQen7J4`h&v_{Y5zQwvXkfeoGY%&en3L5E4Ji@;^S;>`z3_2%eal}C5s^lX3 zgI(HLhk}K{myHU;QQVj_k_z{lB1mekA%ZKxS)mzgb)5uotgorJrgSf$x(syH$;*x% zq7UH08@Za}>1m!7w>8q9oZR4>;&>{tXxFtz$ve7OD5+d>!)d#m=2Ay>f-vK#(Y>qT z8v}t}d1UwB1BAam+9AstbF$nko;_`__bVIpV^iP&pP|@P5J$V-XZP5Wwx3+2=Lcer z5va;z7KJpw-C}e;gscHBg7u?FS$aRVXshDg4}FOa!hl7glWDkfhH_@*&3#`@(`<#Z z%{l2u)`~vgScc8SM&*cY5f&%<_1re3gu?1j}LWSbK_I@I?WuU z%{pnQY-Xrn>8&B~Q`RG6=Nd@N_DmGAhkg`8jN{?%6VM!qEH~cdU^441Fv$KVu%8a(Rd~qG z@<{x64lbOwm$~>evCE{wFWU*($gT4JPW)ujq9$_t7x1%4cA`^p& za60FJ_oDMHE2Xs_n%j=SaFhLPi_@TPa%J$(nmYGJlxmTXMj8+3RZ_+33HA2zMi4BT z6M25aMOf=ctx#)K$5hRg;CB3RK5=uxd10qzsAD1u-nnzGNB@aZjZ?FohyxWGgZ6zS-Q|f zdfUvlIGLVoO!xJdD^oNENTsj-RVXkd>xP=;$4zg^QVe`h4MyEuxlSV*U$myq8JfnL zLZ8-P6|4Ul^eH>aG1QzVKOp}=+Q;ZH0NDd;W&m4rAkpk(#|1vLH|_RqGq*ElFyj{H ztNNye9*UVida}2hrg^_Sdi}KIVT9Zg>NB=Oa!IRSGP#IZC)|^$wK(uNoQI1X50&mh zmH)Wfz9E*NH=5ZZj;Kz18ZKjh!no$^$3HzoB42EbJ8#sE>ZV1YO4iqE54{uV(l}L< z%a$2e&tGYr)ZN^3Ml?gddnGdf2>L#Z5C+Fj6E^0149N?x$dNdum$grR%zb8AcP#r# zQhYVygY134gw_1+@kXp}#(j677fQYY#UU$}-UcA~5rSj8W_NP7e>cY7jkTQl2XevB zM@fC(%?L=EW`7}(LzY3Y?+jY6q-n^^nK%)B>Fm22Jff9e~{m*1bj*ZliNKEn%?dddz8$As%UZ3ZV7X7gUKu@#-gL z*cD6}MB&vBRIk+~Tl2_tXYA$~Y&&gjxU3QXkS0OVXh+VWn$tQ45UFx&(51MYOwt9!#w6F;}06{sb8eaG~Ol8=;HVMDz5KM zn<7nc?5S``Lwm(mlyO!=Tm8er6gi;P!lFd!nD8GQIIMnOLq4yB zA3LsuIQ4dLK|k25XryvmXHK7@qG1|%FP8e00a%f4=U^yya&V+EZGNoc7wUBm=s$n< zCW$a6=`T@>9lFe|WH3<6`kq|o>Gphe{7&5@d!7BlHJu7Vnkf1)7&JHoNvB>R{GlI3 z6HvE_27`?at)1wx$*)1vqJ{a9?tYSzJ7c)0Cou&Kz~~PawPc1KfX)mIppFElPY`d# zzwwPhw+2?tpI&(2KYgG@Jxfl)!DptI(FwYWzD@72m*8!=N4Za>X5qi^8Aa$*_jC{!{FW(5_geJrrM5`ihgIQw7U?7Zd5g zBms*`6NN%v!Dj@8@hV&O#SOC=C8t>4pB5#Tv#r-Fn~O~=y)*3a&0Be(Y|ugf0&>?W zs$IV_Do`Z>%NiflK@2r@*LmQE6BBYe{dE`qSzp84Hw5-Q@eHE(m2ux^e%VVLriat+pSL)7d`?Z-zD-}I<~Wf%rw zwe0b9PW;``VZ3QgF%9+uWgL|Ez#_<|{$3lpR-&+G7ZwA_ML$3j?iOujERw7KAa$cC zy@i^c&29WAcXyjd{be5nUFX+N87>Uc*Rc!E;u&s8Et+5ekI)1I7+I#Mi)L%)-iBXHNirei9a5X4jl@11w|C<4LxGKRtC0is} z$kTLAaBpIrBkm_w5c=B)T3zN&x4G5UTQ$m`2SI+c)Edj`|IT886{5iuBUXicPPjJ= zbRHkd-X!wem-wN%{CZ>itE}wnr*}8sNalS=9VpzRFDA87x98Yp4BJ+snII{1J!%z4WWM8=< z=pH|k>vu`7Ke9dR$Lt!bJpX;va|VzKW7WNg#2_`FFAWT+aNkApP2YiCn7P|D<~TH( z>)~K-T=FF;|D^QW7D?7hUf9+tmiG9tWF@!@YVSLmQj3;0kQTl3Y3=QP);6(3Gp zCim8~o3(771t%eA{0{XMM&#UmjQA7s)IICzt@}nh#{-_?E@&sY23!1m5eb`G-;LD+ zt&M+nGJeSubs`B+`mx%EG;d@7&Idv>&nCtX&Z0`rOGop#Ai)hg-n>(y zvyx(lxJ7X(pD#Vr!eP8$>TY*O@M(2L!Xpf$>{rc8<4kDZ!M^QvIneQFcl1d_;Di#jh3bpr zhr`d%uUu7?Ni!zxth_)9k|X(-C$#e4vY=?(rhkznSfC#xg_Bv1=iwB3aAxXH zm>WCaIQnWn7Gvv0`gD#miUV1AQ4)XgEg1Nw$TxSR(nW7~9wXkg`Z`4#t-`h2Hd_w9e=ek% zYb;@Pmc#X9?#-VD2o;JyeF&*ROG4jOIf)$6y`-d07whoB2hP~A;UB&-^^SO#aki!? zaQ)0bTkdY7wezX$y9w9nl_^zurUsGPs08RdjI{Oqz(n%P?SDF3;!E-e>^yIwaLM~l z3_yVIpx;biqNCIhr9BT6K$uUkE%+ero%fPJr&x|zGoS`sOHsKI83ePJG1C+Sr z>|aZQIkK$Zr}#d%8|cXWYkOic$nq6idrOj7cRJ?*5xTUN>@ReP8}Hf2_GkSg;c>Y< zpJmSBvsjMX!{L+ZdLO-#Rx-3hi?+*ab}67OG)V=uwgQf$@P~BVh9cFZ?nG_Vy!_{_ug>)QDxb@O=M7MdD!xJ7uUQOVly|0uE)iJWx}1`oZHOFt@in@k><@mJ5)nmN?tCD28%uufKv7N-2-XQajD1&@ z{(@Wa>#%w*@%q>sZPoe{M}i<@vvf`x<+2mZ!T!lbmQ3g}!Q@e7#m?@-tQ(&iYr0&u~!x{J7}9Wmx!B1Wx-eGf$jFZm`u??>9FM^7J` zOfS+^y`H|Ma2N3q#!b+zqcE9+qHivoo;G)B?pJ!LHcqC0+KWckw~xvdqq!lm5XLkZ zJ!Z(zhR}|)O&oth*^lK=7#~*yxBEl!X%S8LL zvl{gUIJQ^l+6quz!L$>$q!(SkmLg;l;9stF*M* zUbmuifk{Kw?s1UOMfIO25uB{S2vb6cY540~LFl`BYMMn-5}KF?KeG%!Grzzq@*J!o z*ud;`J?Sj1q@f6WB~NOBY$`(VjdqOR;G7|O*dWw9^0>v95M{F0&B_4jBeq?VQ!g&P zM8Q1?HHIc`KJhaLv}x(qi<1k>23OP_N_ye71-bOtu4A zaEWXKZUEs~$j>w~YsPbY^rs~uca?9BpXMyoNc^D0K~AfsY* zPD$`(Sh7CF_t!Us2(1MEUPq94WA1grT%fnHqQ!JTmrIx)czNQM<-IZZK;xpJNTD`G`scq6jxNL`E0kRYp5@? z^2Jl71eKwd!IL%pA1k{IY)dPDhFYL!Vi1MsP?&ng>_?*kqZ==R4jRO(NMOiFqhh{j zXzeh06gD9F2|~Uic|G?k|H_M>jK2!?mERVfMl15=qE~BWz&2-N5Z&@`NfG|Gq%U7K_S^JdN1G=8c zcxte%h9p@-fYtnFvK=zQ2))pcG+WNAhNeLQN`lIS_4`k-Rn@m$HNp12_607EXh z3zuJfIewWrss;l|MG+z(U8m%Xc(!PSyxY?^Gc^y|^FkLDno$Dv#Ph7T1=hB7`@OwbUAsM_6)JRjL_^s0eEA>h z*!sEzTC+oBUklFwK-oJ={`W_S4Dy-FYS|gv<$0$DUhEU`=uvu}|B8^Y_4f9V&CQ)o zkEieAuKNo363PVsM#WgcpiEpe)sogpm;2!pEkGp0yClR@@N`9D0G%H?+CZKJ12LI1 zyyYH-+r{%OU6CG1(wUHZaL(MN%X%+_Kcl)(F|jjLQm&d>fA~uW^m9}(EX2k5Pzn?k z3KyAu8Iu~Gf$bqRe+12Q6bVH(6t*NPzYS{(sQHbPBlz-WRgdfRJ;4ZYN>_=M%JKPC zMnE)>3#cZo-aq8?5PbYQs?Wq$*|B#cLYYe)q9?|#R=*Ta&9!~p_M+kISC2ej>^|S% z;G6ev&^D+pQ^?|L6c190%%exU4{@D!P?wycER8>G%(lpHDy%gx|J}G|e{uo}1hr@T@mjOufE&JV75!nw=laY3jvW zqrYckZP2g&kfo-#c;OTPIZ$BNLyMlX>c31m=F}UK4xN=Y7Xm&#v77@8q(oMpaB3V@ z7zk3c^H(*3qmpobZ9})V=>0?6SbH7y3k`xLf}S*_D;V(LoJallnKgw2@Z4kE2C9o6 zgI5ZOr8v`vqVK9?RGrPX?hEC9&vj2FY{HWS4sznj}Dwg;t+8jlGf|hzdt9RxJ?pcoM+8 zBz7JVOe=iU{76?WKqZJ{drKpZoq0u$_Jj6t|@qv8bT)sfSWNc|b zS)#^!B27Z!XWM3Pcd7FQCa+H6&WT_*TQ3zOj)>R}E+1x``}!e&!~P2!)H5l$-f10c zddr6tQ=N8|0c6*=XNdLS7ekLCr@3UqNYm{u?ODH@V$`Q9ULvlMLy0U)DyeX!1j6du zAF5W(`uobr@{Ncwtn(*lq3eA5s+H9%p5cQcw%n>58vS;=7r{uZg5A~*W3Uqf!B<;xy+oEG&&C1?f+ zB2+?&m2}Qb541qScq(F&B3hPBYjNwXwB2o+D3KDocJXorB*5{Som=!MP z8bxtTVhA?UE?L?deFHOb5Z!)`$T>OWjd!QES-X7L+!U+PCkQ3)!jdJ~=}HJ*q89ZG zOoXaZ8D-?Kos0UgX>0ZU_5t)s-90-_u`Pdb%?m+6eqSp$)+bVNWx`>YCvR_=XQxgU zfJV~$`{2=K4D#1gJ?U~F-Z*xvbI2VR21)=gyx@=y{hxiqx+CJ~)Hxboe9J%aPs_=A9M;O)m zaS%H_eXT6EL@>cNGTL@^s5v<^>2x~Ijn<7B}G%tdB!~lS>NC(gH@s$Z3{irr5cF%-m z@b_a2#K%Ghk(uk`Z66Y@z%wEKu-P_J1IUmxs#P6PYaqbI*$a0`V!`0s?ys8>nrBy? z=M8d-17*JF=u0O!CD}+hNXI5+{4%9;f}(h2jU3_FLxmiIC<(cih(q?*gAIDGX@OYVn?QC8m4kPc+<@xK)n4UwQl?s*OpH! zPvr()r54a*ssfQZ^kFoA)?v4E%+jCKhLA3qq~BpxH@**+iTS-v_Su&b)RvMrUJ(UN zet7~k9aT5IwMMz=Xx@5c~zqVLg4bnO<92b&hU8&15fuI*of%e(-pYKLE#rnH2_Pv0ZPr|n< zJTBa7Cb@RpjJ#GpQ1`VMEl&qeVZ4DgBxH@qc7tcZC8mYRc2-R-eLe{uqB# z6g~|vvQ4d--Zwcjutc_N+TkvTzVr$)ZPr2A{~#>qu5pIwlq>C%LTEDZPw_qANt?wv z*rP&`3DHG9n4KdPA)8))P7Rw+Os+O64$DjaV_mSw#_{{*Q= z^(@5in^x!+9yWkm5mJ4ik+BNscC{XL)(PyxeIG!YlON8=A z{>UAN#yM&U9r!j2E~@C9Lpy>g{g^qe0C7=KYe52edb3b5SCf0{FwA^C;wz+ehH~?} zZl%2Fw%YNtOOKs#ena(JKQF1Y8ON^GZ(R%4ROaVc_(pOd=`3sx7MMw%|30NBjQJhi7X_X-iIb!gU=3= zT0b^ShgWfSo+8_NvF$-m^b>B5u4S_&_4Ou-R}=Xz{Mw`aqL07`W;NgANrt?)sT}0+ zGT+M&|9LY}mO8hvxW@oYTU4R(za%9l_fIexPA(ojxH;YLd8=r0JNhW^FRWvkpKVy literal 2011 zcmV<12PF83P)D!y%g4vZ*x1<2%*?Q`u)x5;+S=OH)zz}HvdGBD zw6wIs!oteR%FWHqrlzLJ$;r^r(7(UGt*x!9s;a}o!>FjJ#>U3Iy}i%R&$YF+x3{;h zuCCtR-nO>3udlDMv9Z$9(zv*|ySuyA*4EqG+ZlWNivR!y*-1n}RCr$O+*gj>NDPM2 zpNco<96RTn9rwSi8F&oCZFlz#Qq{xgJ4+x4LZrx&UjP6A00000000000000000000 z0000000000h)13Iv~gIg9X6)(&Ma2$kko6>k^LchuGJIe1?9VT%ih&$-<6da;(GtY zRygU`V`YKSGPJdX%aOK)>O)}bd#Gv~*uA$6-S28s*y-CA`a9YL;;WKvrF0c*ZKyul z)*h=`7wH^W2Elqsjqd}?Xz*Ptp%PkVVMQxo5?Bs`i9Upe<)onxU}?Eo>Ro7Cj@nv* ze0H1D=vvOYdIRQ`ySe^?YRPg}s_G9&F3o|+E;KJf72K|Qva4ddGB4O%8ki>o6?HI`i*6#+w#5|Y?<y|LwN+|wJ-DOs*c9lZ(lz;YDS^$r~880p|x z??Sy~IVsik0el`?F2Y>=KFtcZ1R zaGELyc&axa?H!NJ`jhg5v~%-y@6vvAx%c&^lgbGsy=v!Q)n20Y000000000000000 z0000001(G=0_9$3(l{U9f4Ydqf&CDSql-`X!}G?Z(<>_@q?M!EmqlnRgo`h=qe`mH zp^F!L#dKMP=0-j66q)X!m2_UKU< z?=gcl`PrjD-Z_UQ!Oo*l-Y$R@ac4on7M&O-j9L_~HG+QG8x@#l(9NwQst~Om6uTU# z#^D0B?jkA@-9e`x4^-yi2NWuOs^gbXXX{ZRZwp;qmr8Y=vc4+;?DuSiV=6Wdp+vB! zYWn~xgnKHt51~MOqTGjPD@PoaW3S(TV1qAdpLGPU;{}n+CNZ&z1&l zAk)yBhI<>K$Szko#25&!NK0f~qZEphQ8{ z3aIf)#a^Mvnrf|~$}^REhB95M)P*|TX3iCPq&kn#$aR|+5*6uFl|Ix;s7M0Ewp3#a z)kYpw@J3LsOsPOxLcOd<@p>5y2p=fiLkJUGpQ800tayqjR`dizEyTFw96Gb|` z!YX_?aV~Q~zz%VD}8+~-=U|TkA>Od+oZ}G}nbJRjS zi+DxREJj@nPrRDb5Owl07n$q)ia(q8)f$NXg*KhY?6EB-U9U5WqIxO65S z|C%@HT<{BxaK1b6FYI^o5WlAp7RhA6Kem`8MTkGt$mX+;7JpOgV>ZtqfL8IK*!Dm6 zzQ>>P{QXCNTMXj=+Nnb$0D%|)f;hy>mx(1hlm3f?BA8dZ4V=5bdfd6DDtbSk-BC3w tPksUb00000000000000000000fEW70#Mag`cL)Fg002ovPDHLkV1gNB=am2e From 2289106ac7cac9e1fad9aa60aaa1163b0f80613f Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Fri, 31 Mar 2023 14:17:08 +0200 Subject: [PATCH 111/177] Fix last seen not set error on admin user page --- app/templates/admin/user.html.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/admin/user.html.j2 b/app/templates/admin/user.html.j2 index 0512db75..7ecc6f19 100644 --- a/app/templates/admin/user.html.j2 +++ b/app/templates/admin/user.html.j2 @@ -41,7 +41,7 @@
            • Id: {{ user.id }}
            • Hashid: {{ user.hashid }}
            • Member since: {{ user.member_since.strftime('%Y-%m-%d') }}
              • -
            • Last seen: {{ user.last_seen.strftime('%Y-%m-%d') }}
              • +
            • Last seen: {% if user.last_seen %}{{ user.last_seen.strftime('%Y-%m-%d') }}
              • {% endif %}
              From 4d2d4fcc40b28eaf188199cc2ebb0507c355539b Mon Sep 17 00:00:00 2001 From: Inga Kirschnick Date: Fri, 31 Mar 2023 14:28:11 +0200 Subject: [PATCH 112/177] Add followed corpora to Corpus List --- app/static/js/ResourceLists/CorpusList.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/static/js/ResourceLists/CorpusList.js b/app/static/js/ResourceLists/CorpusList.js index 00ddd7c1..a6207baf 100644 --- a/app/static/js/ResourceLists/CorpusList.js +++ b/app/static/js/ResourceLists/CorpusList.js @@ -17,7 +17,12 @@ class CorpusList extends ResourceList { }); }); app.getUser(this.userId).then((user) => { + let followedCorpora = []; + for (let cfa of Object.values(user.corpus_follower_associations)) { + followedCorpora.push(cfa.corpus); + } this.add(Object.values(user.corpora)); + this.add(followedCorpora); this.isInitialized = true; }); } From f1d8b81923966ab35ba1ab5deea3d381cb9cebf7 Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Mon, 3 Apr 2023 15:25:55 +0200 Subject: [PATCH 113/177] move settings related json routes to users package --- app/admin/routes.py | 4 +- app/settings/__init__.py | 3 +- app/settings/utils.py | 6 --- app/static/js/Requests/settings/settings.js | 45 --------------------- app/static/js/Requests/users/users.js | 25 +++++++++++- app/templates/_scripts.html.j2 | 1 - app/templates/settings/settings.html.j2 | 12 +++--- app/users/__init__.py | 2 +- app/users/settings/__init__.py | 2 + app/{ => users}/settings/json_routes.py | 21 +++++----- 10 files changed, 47 insertions(+), 74 deletions(-) delete mode 100644 app/settings/utils.py delete mode 100644 app/static/js/Requests/settings/settings.js create mode 100644 app/users/settings/__init__.py rename app/{ => users}/settings/json_routes.py (79%) diff --git a/app/admin/routes.py b/app/admin/routes.py index 9a5401b8..3822dc28 100644 --- a/app/admin/routes.py +++ b/app/admin/routes.py @@ -65,10 +65,10 @@ def user_settings(user_id): user = User.query.get_or_404(user_id) update_account_information_form = UpdateAccountInformationForm(user=user) update_profile_information_form = UpdateProfileInformationForm(user=user) - update_avatar_form = UpdateAvatarForm(user=user) + update_avatar_form = UpdateAvatarForm() update_password_form = UpdatePasswordForm(user=user) update_notifications_form = UpdateNotificationsForm(user=user) - update_user_form = UpdateUserForm(user) + update_user_form = UpdateUserForm(user=user) # region handle update profile information form if update_profile_information_form.submit.data and update_profile_information_form.validate(): diff --git a/app/settings/__init__.py b/app/settings/__init__.py index aaa1cb1b..56265277 100644 --- a/app/settings/__init__.py +++ b/app/settings/__init__.py @@ -2,5 +2,4 @@ from flask import Blueprint bp = Blueprint('settings', __name__) -from . import routes, json_routes - +from . import routes diff --git a/app/settings/utils.py b/app/settings/utils.py deleted file mode 100644 index 53572740..00000000 --- a/app/settings/utils.py +++ /dev/null @@ -1,6 +0,0 @@ -from flask import request, url_for -from app.models import User - - -def user_endpoint_arguments_constructor(): - return {'user_id': request.view_args['user_id']} diff --git a/app/static/js/Requests/settings/settings.js b/app/static/js/Requests/settings/settings.js deleted file mode 100644 index d3137267..00000000 --- a/app/static/js/Requests/settings/settings.js +++ /dev/null @@ -1,45 +0,0 @@ -/***************************************************************************** -* Settings * -* Fetch requests for /settings routes * -*****************************************************************************/ -Requests.settings = {}; - -Requests.settings.entity = {}; - -Requests.settings.entity.delete = (userId) => { - let input = `/settings/${userId}`; - let init = { - method: 'DELETE' - }; - return Requests.JSONfetch(input, init); -} - -Requests.settings.entity.deleteAvatar = (userId) => { - let input = `/settings/${userId}/avatar`; - let init = { - method: 'DELETE' - }; - return Requests.JSONfetch(input, init); -} - -Requests.settings.entity.isPublic = {}; - -Requests.settings.entity.isPublic.update = (userId, isPublic) => { - let input = `/settings/${userId}/is-public`; - let init = { - method: 'PUT', - body: JSON.stringify(isPublic) - }; - return Requests.JSONfetch(input, init); -}; - -Requests.settings.entity.profilePrivacySettings = {}; - -Requests.settings.entity.profilePrivacySettings.update = (userId, profilePrivacySetting, enabled) => { - let input = `/settings/${userId}/profile-privacy-settings/${profilePrivacySetting}`; - let init = { - method: 'PUT', - body: JSON.stringify(enabled) - }; - return Requests.JSONfetch(input, init); -} diff --git a/app/static/js/Requests/users/users.js b/app/static/js/Requests/users/users.js index 00adbee9..9ed77cb0 100644 --- a/app/static/js/Requests/users/users.js +++ b/app/static/js/Requests/users/users.js @@ -6,10 +6,33 @@ Requests.users = {}; Requests.users.entity = {}; -Requests.settings.entity.delete = (userId) => { +Requests.users.entity.delete = (userId) => { let input = `/users/${userId}`; let init = { method: 'DELETE' }; return Requests.JSONfetch(input, init); }; + +Requests.users.entity.settings = {}; + +Requests.users.entity.settings.avatar = {}; + +Requests.users.entity.settings.avatar.delete = (userId) => { + let input = `/users/${userId}/settings/avatar`; + let init = { + method: 'DELETE' + }; + return Requests.JSONfetch(input, init); +} + +Requests.users.entity.settings.profilePrivacy = {}; + +Requests.users.entity.settings.profilePrivacy.update = (userId, profilePrivacySetting, enabled) => { + let input = `/users/${userId}/settings/profile-privacy/${profilePrivacySetting}`; + let init = { + method: 'PUT', + body: JSON.stringify(enabled) + }; + return Requests.JSONfetch(input, init); +} diff --git a/app/templates/_scripts.html.j2 b/app/templates/_scripts.html.j2 index 089a7cd2..dbc26470 100644 --- a/app/templates/_scripts.html.j2 +++ b/app/templates/_scripts.html.j2 @@ -66,7 +66,6 @@ 'js/Requests/corpora/files.js', 'js/Requests/corpora/followers.js', 'js/Requests/jobs/jobs.js', - 'js/Requests/settings/settings.js', 'js/Requests/users/users.js' %} diff --git a/app/templates/settings/settings.html.j2 b/app/templates/settings/settings.html.j2 index 27c9590c..b267dd44 100644 --- a/app/templates/settings/settings.html.j2 +++ b/app/templates/settings/settings.html.j2 @@ -212,7 +212,7 @@ avatarUploadElement.addEventListener('change', () => { }); deleteAvatarButtonElement.addEventListener('click', () => { - Requests.settings.entity.deleteAvatar({{ user.hashid|tojson }}) + Requests.users.entity.settings.avatar.delete({{ user.hashid|tojson }}) .then( (response) => { avatarPreviewElement.src = {{ url_for('static', filename='images/user_avatar.png')|tojson }}; @@ -245,16 +245,16 @@ for (let collapsibleElement of document.querySelectorAll('.collapsible.no-autoin let profileIsPublicSwitchElement = document.querySelector('#profile-is-public-switch'); let profilePrivacySettingCheckboxElements = document.querySelectorAll('.profile-privacy-setting-checkbox'); profileIsPublicSwitchElement.addEventListener('change', (event) => { - let newIsPublic = profileIsPublicSwitchElement.checked; - Requests.settings.entity.isPublic.update({{ user.hashid|tojson }}, newIsPublic) + let newEnabled = profileIsPublicSwitchElement.checked; + Requests.users.entity.settings.profilePrivacy.update({{ user.hashid|tojson }}, 'is-public', newEnabled) .then( (response) => { for (let profilePrivacySettingCheckboxElement of document.querySelectorAll('.profile-privacy-setting-checkbox')) { - profilePrivacySettingCheckboxElement.disabled = !newIsPublic; + profilePrivacySettingCheckboxElement.disabled = !newEnabled; } }, (response) => { - profileIsPublicSwitchElement.checked = !newIsPublic; + profileIsPublicSwitchElement.checked = !newEnabled; } ); }); @@ -262,7 +262,7 @@ for (let profilePrivacySettingCheckboxElement of profilePrivacySettingCheckboxEl profilePrivacySettingCheckboxElement.addEventListener('change', (event) => { let newEnabled = profilePrivacySettingCheckboxElement.checked; let valueName = profilePrivacySettingCheckboxElement.dataset.profilePrivacySettingName; - Requests.settings.entity.profilePrivacySettings.update({{ user.hashid|tojson }}, valueName, newEnabled) + Requests.users.entity.settings.profilePrivacy.update({{ user.hashid|tojson }}, valueName, newEnabled) .catch((response) => { profilePrivacySettingCheckboxElement.checked = !newEnabled; }); diff --git a/app/users/__init__.py b/app/users/__init__.py index ecd6b9da..11a38f25 100644 --- a/app/users/__init__.py +++ b/app/users/__init__.py @@ -3,4 +3,4 @@ from flask import Blueprint bp = Blueprint('users', __name__) from . import events, routes - +from . import settings diff --git a/app/users/settings/__init__.py b/app/users/settings/__init__.py new file mode 100644 index 00000000..1dbe44f0 --- /dev/null +++ b/app/users/settings/__init__.py @@ -0,0 +1,2 @@ +from .. import bp +from . import json_routes diff --git a/app/settings/json_routes.py b/app/users/settings/json_routes.py similarity index 79% rename from app/settings/json_routes.py rename to app/users/settings/json_routes.py index 31002d26..acc7dbc9 100644 --- a/app/settings/json_routes.py +++ b/app/users/settings/json_routes.py @@ -1,5 +1,5 @@ from flask import abort, current_app, request -from flask_login import current_user, login_required, logout_user +from flask_login import login_required from threading import Thread import os from app import db @@ -8,14 +8,15 @@ from app.models import Avatar, User, ProfilePrivacySettings from . import bp -@bp.route('//avatar', methods=['DELETE']) +@bp.route('//settings/avatar', methods=['DELETE']) @content_negotiation(produces='application/json') -def delete_profile_avatar(user_id): +def delete_user_avatar(user_id): def _delete_avatar(app, avatar_id): with app.app_context(): avatar = Avatar.query.get(avatar_id) avatar.delete() db.session.commit() + user = User.query.get_or_404(user_id) if user.avatar is None: abort(404) @@ -30,27 +31,27 @@ def delete_profile_avatar(user_id): return response_data, 202 -@bp.route('//is-public', methods=['PUT']) +@bp.route('//settings/profile-privacy/is-public', methods=['PUT']) @login_required @content_negotiation(consumes='application/json', produces='application/json') -def update_user_is_public(user_id): +def update_user_profile_privacy_setting_is_public(user_id): + user = User.query.get_or_404(user_id) is_public = request.json if not isinstance(is_public, bool): abort(400) - user = User.query.get_or_404(user_id) user.is_public = is_public db.session.commit() response_data = { 'message': 'Profile privacy settings updated', - 'category': 'corpus' + 'category': 'settings' } return response_data, 200 -@bp.route('//profile-privacy-settings/', methods=['PUT']) +@bp.route('//settings/profile-privacy/', methods=['PUT']) @login_required @content_negotiation(consumes='application/json', produces='application/json') -def add_profile_privacy_settings(user_id, profile_privacy_setting_name): +def update_user_profile_privacy_settings(user_id, profile_privacy_setting_name): user = User.query.get_or_404(user_id) enabled = request.json if not isinstance(enabled, bool): @@ -66,6 +67,6 @@ def add_profile_privacy_settings(user_id, profile_privacy_setting_name): db.session.commit() response_data = { 'message': 'Profile privacy settings updated', - 'category': 'corpus' + 'category': 'settings' } return response_data, 200 From 87798f47813f8ddeb9fe9154274810df986b56ba Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Mon, 3 Apr 2023 16:34:03 +0200 Subject: [PATCH 114/177] completly move settings logic to users package --- app/admin/routes.py | 12 +-- app/settings/routes.py | 88 ++---------------- .../{ => users}/settings/settings.html.j2 | 0 app/users/settings/__init__.py | 2 +- app/{ => users}/settings/forms.py | 8 +- app/users/settings/json_routes.py | 20 ++-- app/users/settings/routes.py | 93 +++++++++++++++++++ 7 files changed, 124 insertions(+), 99 deletions(-) rename app/templates/{ => users}/settings/settings.html.j2 (100%) rename app/{ => users}/settings/forms.py (94%) create mode 100644 app/users/settings/routes.py diff --git a/app/admin/routes.py b/app/admin/routes.py index 3822dc28..67739edc 100644 --- a/app/admin/routes.py +++ b/app/admin/routes.py @@ -2,7 +2,7 @@ from flask import abort, flash, redirect, render_template, url_for from flask_breadcrumbs import register_breadcrumb from app import db, hashids from app.models import Avatar, Corpus, Role, User -from app.settings.forms import ( +from app.users.settings.forms import ( UpdateAvatarForm, UpdatePasswordForm, UpdateNotificationsForm, @@ -63,12 +63,12 @@ def user(user_id): @register_breadcrumb(bp, '.users.entity.settings', 'settingsSettings') def user_settings(user_id): user = User.query.get_or_404(user_id) - update_account_information_form = UpdateAccountInformationForm(user=user) - update_profile_information_form = UpdateProfileInformationForm(user=user) + update_account_information_form = UpdateAccountInformationForm(user) + update_profile_information_form = UpdateProfileInformationForm(user) update_avatar_form = UpdateAvatarForm() - update_password_form = UpdatePasswordForm(user=user) - update_notifications_form = UpdateNotificationsForm(user=user) - update_user_form = UpdateUserForm(user=user) + update_password_form = UpdatePasswordForm(user) + update_notifications_form = UpdateNotificationsForm(user) + update_user_form = UpdateUserForm(user) # region handle update profile information form if update_profile_information_form.submit.data and update_profile_information_form.validate(): diff --git a/app/settings/routes.py b/app/settings/routes.py index 70b69d6c..9496e6fd 100644 --- a/app/settings/routes.py +++ b/app/settings/routes.py @@ -1,88 +1,14 @@ -from flask import abort, flash, redirect, render_template, url_for +from flask import url_for from flask_breadcrumbs import register_breadcrumb -from flask_login import current_user, login_required -from app import db -from app.models import Avatar +from flask_login import current_user +from app.users.settings.routes import settings as settings_route from . import bp -from .forms import ( - UpdateAvatarForm, - UpdatePasswordForm, - UpdateNotificationsForm, - UpdateAccountInformationForm, - UpdateProfileInformationForm -) -@bp.route('', methods=['GET', 'POST']) +@bp.route('/settings', methods=['GET', 'POST']) @register_breadcrumb(bp, '.', 'settingsSettings') -@login_required def settings(): - user = current_user - update_account_information_form = UpdateAccountInformationForm() - update_profile_information_form = UpdateProfileInformationForm() - update_avatar_form = UpdateAvatarForm() - update_password_form = UpdatePasswordForm() - update_notifications_form = UpdateNotificationsForm() - - # region handle update profile information form - if update_profile_information_form.submit.data and update_profile_information_form.validate(): - user.about_me = update_profile_information_form.about_me.data - user.location = update_profile_information_form.location.data - user.organization = update_profile_information_form.organization.data - user.website = update_profile_information_form.website.data - user.full_name = update_profile_information_form.full_name.data - db.session.commit() - flash('Your changes have been saved') - return redirect(url_for('.settings')) - # endregion handle update profile information form - - # region handle update avatar form - if update_avatar_form.submit.data and update_avatar_form.validate(): - try: - Avatar.create( - update_avatar_form.avatar.data, - user=user - ) - except (AttributeError, OSError): - abort(500) - db.session.commit() - flash('Your changes have been saved') - return redirect(url_for('.settings')) - # endregion handle update avatar form - - # region handle update account information form - if update_account_information_form.submit.data and update_account_information_form.validate(): - user.email = update_account_information_form.email.data - user.username = update_account_information_form.username.data - db.session.commit() - flash('Profile settings updated') - return redirect(url_for('.settings')) - # endregion handle update account information form - - # region handle update password form - if update_password_form.submit.data and update_password_form.validate(): - user.password = update_password_form.new_password.data - db.session.commit() - flash('Your changes have been saved') - return redirect(url_for('.settings')) - # endregion handle update password form - - # region handle update notifications form - if update_notifications_form.submit.data and update_notifications_form.validate(): - user.setting_job_status_mail_notification_level = \ - update_notifications_form.job_status_mail_notification_level.data - db.session.commit() - flash('Your changes have been saved') - return redirect(url_for('.settings')) - # endregion handle update notifications form - - return render_template( - 'settings/settings.html.j2', - title='Settings', - update_account_information_form=update_account_information_form, - update_avatar_form=update_avatar_form, - update_notifications_form=update_notifications_form, - update_password_form=update_password_form, - update_profile_information_form=update_profile_information_form, - user=user + return settings_route( + current_user.id, + redirect_location_on_post=url_for('.settings') ) diff --git a/app/templates/settings/settings.html.j2 b/app/templates/users/settings/settings.html.j2 similarity index 100% rename from app/templates/settings/settings.html.j2 rename to app/templates/users/settings/settings.html.j2 diff --git a/app/users/settings/__init__.py b/app/users/settings/__init__.py index 1dbe44f0..e06bada9 100644 --- a/app/users/settings/__init__.py +++ b/app/users/settings/__init__.py @@ -1,2 +1,2 @@ from .. import bp -from . import json_routes +from . import json_routes, routes diff --git a/app/settings/forms.py b/app/users/settings/forms.py similarity index 94% rename from app/settings/forms.py rename to app/users/settings/forms.py index 77c8687c..71c29456 100644 --- a/app/settings/forms.py +++ b/app/users/settings/forms.py @@ -41,7 +41,7 @@ class UpdateAccountInformationForm(FlaskForm): ) submit = SubmitField() - def __init__(self, *args, user=current_user, **kwargs): + def __init__(self, user, *args, **kwargs): if 'data' not in kwargs: kwargs['data'] = user.to_json_serializeable() if 'prefix' not in kwargs: @@ -91,7 +91,7 @@ class UpdateProfileInformationForm(FlaskForm): ) submit = SubmitField() - def __init__(self, *args, user=current_user, **kwargs): + def __init__(self, user, *args, **kwargs): if 'data' not in kwargs: kwargs['data'] = user.to_json_serializeable() if 'prefix' not in kwargs: @@ -132,7 +132,7 @@ class UpdatePasswordForm(FlaskForm): ) submit = SubmitField() - def __init__(self, *args, user=current_user, **kwargs): + def __init__(self, user, *args, **kwargs): if 'prefix' not in kwargs: kwargs['prefix'] = 'update-password-form' super().__init__(*args, **kwargs) @@ -154,7 +154,7 @@ class UpdateNotificationsForm(FlaskForm): ) submit = SubmitField() - def __init__(self, *args, user=current_user, **kwargs): + def __init__(self, user, *args, **kwargs): if 'data' not in kwargs: kwargs['data'] = user.to_json_serializeable() if 'prefix' not in kwargs: diff --git a/app/users/settings/json_routes.py b/app/users/settings/json_routes.py index acc7dbc9..7fdfa7fc 100644 --- a/app/users/settings/json_routes.py +++ b/app/users/settings/json_routes.py @@ -1,5 +1,5 @@ from flask import abort, current_app, request -from flask_login import login_required +from flask_login import current_user, login_required from threading import Thread import os from app import db @@ -20,6 +20,8 @@ def delete_user_avatar(user_id): user = User.query.get_or_404(user_id) if user.avatar is None: abort(404) + if not (user == current_user or current_user.is_administrator()): + abort(403) thread = Thread( target=_delete_avatar, args=(current_app._get_current_object(), user.avatar.id) @@ -36,10 +38,12 @@ def delete_user_avatar(user_id): @content_negotiation(consumes='application/json', produces='application/json') def update_user_profile_privacy_setting_is_public(user_id): user = User.query.get_or_404(user_id) - is_public = request.json - if not isinstance(is_public, bool): + if not (user == current_user or current_user.is_administrator()): + abort(403) + enabled = request.json + if not isinstance(enabled, bool): abort(400) - user.is_public = is_public + user.is_public = enabled db.session.commit() response_data = { 'message': 'Profile privacy settings updated', @@ -53,13 +57,15 @@ def update_user_profile_privacy_setting_is_public(user_id): @content_negotiation(consumes='application/json', produces='application/json') def update_user_profile_privacy_settings(user_id, profile_privacy_setting_name): user = User.query.get_or_404(user_id) - enabled = request.json - if not isinstance(enabled, bool): - abort(400) try: profile_privacy_setting = ProfilePrivacySettings[profile_privacy_setting_name] except KeyError: abort(404) + if not (user == current_user or current_user.is_administrator()): + abort(403) + enabled = request.json + if not isinstance(enabled, bool): + abort(400) if enabled: user.add_profile_privacy_setting(profile_privacy_setting) else: diff --git a/app/users/settings/routes.py b/app/users/settings/routes.py new file mode 100644 index 00000000..f023bf00 --- /dev/null +++ b/app/users/settings/routes.py @@ -0,0 +1,93 @@ +from flask import abort, flash, redirect, render_template, url_for +from flask_breadcrumbs import register_breadcrumb +from flask_login import current_user, login_required +from app import db +from app.models import Avatar, User +from ..utils import user_endpoint_arguments_constructor as user_eac +from . import bp +from .forms import ( + UpdateAvatarForm, + UpdatePasswordForm, + UpdateNotificationsForm, + UpdateAccountInformationForm, + UpdateProfileInformationForm +) + + +@bp.route('//settings', methods=['GET', 'POST']) +@register_breadcrumb(bp, '.entity.settings', 'settingsSettings', endpoint_arguments_constructor=user_eac) +@login_required +def settings(user_id, redirect_location_on_post=None): + user = User.query.get_or_404(user_id) + if not (user == current_user or current_user.is_administrator()): + abort(403) + if redirect_location_on_post is None: + redirect_location_on_post = url_for('.settings', user_id=user_id) + update_account_information_form = UpdateAccountInformationForm(user) + update_profile_information_form = UpdateProfileInformationForm(user) + update_avatar_form = UpdateAvatarForm() + update_password_form = UpdatePasswordForm(user) + update_notifications_form = UpdateNotificationsForm(user) + + # region handle update profile information form + if update_profile_information_form.submit.data and update_profile_information_form.validate(): + user.about_me = update_profile_information_form.about_me.data + user.location = update_profile_information_form.location.data + user.organization = update_profile_information_form.organization.data + user.website = update_profile_information_form.website.data + user.full_name = update_profile_information_form.full_name.data + db.session.commit() + flash('Your changes have been saved') + return redirect(redirect_location_on_post) + # endregion handle update profile information form + + # region handle update avatar form + if update_avatar_form.submit.data and update_avatar_form.validate(): + try: + Avatar.create( + update_avatar_form.avatar.data, + user=user + ) + except (AttributeError, OSError): + abort(500) + db.session.commit() + flash('Your changes have been saved') + return redirect(redirect_location_on_post) + # endregion handle update avatar form + + # region handle update account information form + if update_account_information_form.submit.data and update_account_information_form.validate(): + user.email = update_account_information_form.email.data + user.username = update_account_information_form.username.data + db.session.commit() + flash('Profile settings updated') + return redirect(redirect_location_on_post) + # endregion handle update account information form + + # region handle update password form + if update_password_form.submit.data and update_password_form.validate(): + user.password = update_password_form.new_password.data + db.session.commit() + flash('Your changes have been saved') + return redirect(redirect_location_on_post) + # endregion handle update password form + + # region handle update notifications form + if update_notifications_form.submit.data and update_notifications_form.validate(): + user.setting_job_status_mail_notification_level = \ + update_notifications_form.job_status_mail_notification_level.data + db.session.commit() + flash('Your changes have been saved') + return redirect(redirect_location_on_post) + # endregion handle update notifications form + + return render_template( + 'users/settings/settings.html.j2', + title='Settings', + update_account_information_form=update_account_information_form, + update_avatar_form=update_avatar_form, + update_notifications_form=update_notifications_form, + update_password_form=update_password_form, + update_profile_information_form=update_profile_information_form, + user=user + ) From a27caaa8a2f91d3548c24c9c2e2b14bff5dcccfe Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Tue, 4 Apr 2023 08:44:25 +0200 Subject: [PATCH 115/177] Use a better redirect mechanic in the proxied settings route --- app/settings/routes.py | 5 +---- app/templates/admin/user_settings.html.j2 | 2 ++ app/templates/users/settings/settings.html.j2 | 2 ++ app/users/settings/routes.py | 12 ++++++++---- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/app/settings/routes.py b/app/settings/routes.py index 9496e6fd..046f2f8c 100644 --- a/app/settings/routes.py +++ b/app/settings/routes.py @@ -8,7 +8,4 @@ from . import bp @bp.route('/settings', methods=['GET', 'POST']) @register_breadcrumb(bp, '.', 'settingsSettings') def settings(): - return settings_route( - current_user.id, - redirect_location_on_post=url_for('.settings') - ) + return settings_route(current_user.id) diff --git a/app/templates/admin/user_settings.html.j2 b/app/templates/admin/user_settings.html.j2 index 66d6250e..0d574d0e 100644 --- a/app/templates/admin/user_settings.html.j2 +++ b/app/templates/admin/user_settings.html.j2 @@ -1,6 +1,8 @@ {% extends "settings/settings.html.j2" %} {% block admin_settings %} +
              +

              Administrator Settings

              Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam diff --git a/app/templates/users/settings/settings.html.j2 b/app/templates/users/settings/settings.html.j2 index b267dd44..d52c989b 100644 --- a/app/templates/users/settings/settings.html.j2 +++ b/app/templates/users/settings/settings.html.j2 @@ -102,6 +102,8 @@

              +
              +

              General Settings

              Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam diff --git a/app/users/settings/routes.py b/app/users/settings/routes.py index f023bf00..13f222b7 100644 --- a/app/users/settings/routes.py +++ b/app/users/settings/routes.py @@ -1,4 +1,4 @@ -from flask import abort, flash, redirect, render_template, url_for +from flask import abort, flash, g, redirect, render_template, url_for from flask_breadcrumbs import register_breadcrumb from flask_login import current_user, login_required from app import db @@ -17,12 +17,16 @@ from .forms import ( @bp.route('//settings', methods=['GET', 'POST']) @register_breadcrumb(bp, '.entity.settings', 'settingsSettings', endpoint_arguments_constructor=user_eac) @login_required -def settings(user_id, redirect_location_on_post=None): +def settings(user_id): user = User.query.get_or_404(user_id) if not (user == current_user or current_user.is_administrator()): abort(403) - if redirect_location_on_post is None: - redirect_location_on_post = url_for('.settings', user_id=user_id) + + redirect_location_on_post = g.pop( + 'redirect_location_on_post', + url_for('.settings', user_id=user_id) + ) + update_account_information_form = UpdateAccountInformationForm(user) update_profile_information_form = UpdateProfileInformationForm(user) update_avatar_form = UpdateAvatarForm() From 423709b4eb9d086010efb94a8e3a9b6cfc7be0e6 Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Tue, 4 Apr 2023 08:56:19 +0200 Subject: [PATCH 116/177] Add a prefix for nopaque's data within the application context --- app/settings/routes.py | 3 ++- app/users/settings/routes.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/settings/routes.py b/app/settings/routes.py index 046f2f8c..837c0f6f 100644 --- a/app/settings/routes.py +++ b/app/settings/routes.py @@ -1,4 +1,4 @@ -from flask import url_for +from flask import g, url_for from flask_breadcrumbs import register_breadcrumb from flask_login import current_user from app.users.settings.routes import settings as settings_route @@ -8,4 +8,5 @@ from . import bp @bp.route('/settings', methods=['GET', 'POST']) @register_breadcrumb(bp, '.', 'settingsSettings') def settings(): + g._nopaque_redirect_location_on_post = url_for('.settings') return settings_route(current_user.id) diff --git a/app/users/settings/routes.py b/app/users/settings/routes.py index 13f222b7..d921c5c4 100644 --- a/app/users/settings/routes.py +++ b/app/users/settings/routes.py @@ -23,7 +23,7 @@ def settings(user_id): abort(403) redirect_location_on_post = g.pop( - 'redirect_location_on_post', + '_nopaque_redirect_location_on_post', url_for('.settings', user_id=user_id) ) From ee82dafb7ca9eb0fb0613f2529bf4581871340f2 Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Tue, 4 Apr 2023 09:01:51 +0200 Subject: [PATCH 117/177] Fix admin user settings template --- app/templates/admin/user_settings.html.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/admin/user_settings.html.j2 b/app/templates/admin/user_settings.html.j2 index 0d574d0e..527e96d2 100644 --- a/app/templates/admin/user_settings.html.j2 +++ b/app/templates/admin/user_settings.html.j2 @@ -1,4 +1,4 @@ -{% extends "settings/settings.html.j2" %} +{% extends "users/settings/settings.html.j2" %} {% block admin_settings %}

              From 477e583be9d2942e6422c975a441ad52074cd841 Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Tue, 4 Apr 2023 09:14:32 +0200 Subject: [PATCH 118/177] fix settings page delete user function --- app/templates/users/settings/settings.html.j2 | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/templates/users/settings/settings.html.j2 b/app/templates/users/settings/settings.html.j2 index d52c989b..91b2864d 100644 --- a/app/templates/users/settings/settings.html.j2 +++ b/app/templates/users/settings/settings.html.j2 @@ -125,7 +125,7 @@ {{ wtf.render_field(update_account_information_form.username, material_icon='person') }} {{ wtf.render_field(update_account_information_form.email, material_icon='email') }}
              - deleteDelete + deleteDelete {{ wtf.render_field(update_account_information_form.submit, material_icon='send') }}
              @@ -184,7 +184,7 @@
              - diff --git a/app/templates/admin/user_settings.html.j2 b/app/templates/admin/user_settings.html.j2 index 48391a71..fb022564 100644 --- a/app/templates/admin/user_settings.html.j2 +++ b/app/templates/admin/user_settings.html.j2 @@ -5,10 +5,7 @@

              Administrator Settings

              -

              Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam - nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, - sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. - Stet clita kasd gubergren, no sea tak

              +

              Here the Confirmation Status of the user can be set manually and a special role can be assigned.


              diff --git a/app/templates/corpora/analyse_corpus.reader.html.j2 b/app/templates/corpora/analyse_corpus.reader.html.j2 index 99cdf56e..a4ca22fb 100644 --- a/app/templates/corpora/analyse_corpus.reader.html.j2 +++ b/app/templates/corpora/analyse_corpus.reader.html.j2 @@ -6,7 +6,7 @@
              -
              +
              format_list_numbered
              -
              +
              format_shapes
              -
              +
              format_quote - help Corpus Query Language tutorial + help Corpus Query Language tutorial | - info Tagsets + info Tagsets | info Examples
              diff --git a/app/templates/corpora/analyse_corpus.reader.html.j2 b/app/templates/corpora/_analysis/reader.html.j2 similarity index 100% rename from app/templates/corpora/analyse_corpus.reader.html.j2 rename to app/templates/corpora/_analysis/reader.html.j2 diff --git a/app/templates/corpora/analyse_corpus.html.j2 b/app/templates/corpora/analysis.html.j2 similarity index 65% rename from app/templates/corpora/analyse_corpus.html.j2 rename to app/templates/corpora/analysis.html.j2 index 7d9debe1..dcb42b9f 100644 --- a/app/templates/corpora/analyse_corpus.html.j2 +++ b/app/templates/corpora/analysis.html.j2 @@ -32,216 +32,25 @@
              -{% include "corpora/analyse_corpus.reader.html.j2" %} -{% include "corpora/analyse_corpus.concordance.html.j2" %} + +{# #} +{% include "corpora/_analysis/reader.html.j2" %} + +{% include "corpora/_analysis/concordance.html.j2" %} {% endblock page_content %} {% block modals %} {{ super() }}