Update corpus page

app/corpora/files/json_routes.py

@@ -8,7 +8,7 @@ from . import bp
 
 
 @bp.route('/<hashid:corpus_id>/files/<hashid:corpus_file_id>', methods=['DELETE'])
-@corpus_follower_permission_required('REMOVE_CORPUS_FILE')
+@corpus_follower_permission_required('MANAGE_FILES')
 @content_negotiation(produces='application/json')
 def delete_corpus_file(corpus_id, corpus_file_id):
     def _delete_corpus_file(app, corpus_file_id):

app/corpora/files/routes.py

@@ -25,7 +25,7 @@ def corpus_files(corpus_id):
 
 @bp.route('/<hashid:corpus_id>/files/create', methods=['GET', 'POST'])
 @register_breadcrumb(bp, '.entity.files.create', 'Create', endpoint_arguments_constructor=corpus_eac)
-@corpus_follower_permission_required('ADD_CORPUS_FILE')
+@corpus_follower_permission_required('MANAGE_FILES')
 def create_corpus_file(corpus_id):
     corpus = Corpus.query.get_or_404(corpus_id)
     form = CreateCorpusFileForm()
@@ -67,7 +67,7 @@ def create_corpus_file(corpus_id):
 
 @bp.route('/<hashid:corpus_id>/files/<hashid:corpus_file_id>', methods=['GET', 'POST'])
 @register_breadcrumb(bp, '.entity.files.entity', '', dynamic_list_constructor=corpus_file_dlc)
-@corpus_follower_permission_required('UPDATE_CORPUS_FILE')
+@corpus_follower_permission_required('MANAGE_FILES')
 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()
     form = UpdateCorpusFileForm(data=corpus_file.to_json_serializeable())

app/corpora/followers/json_routes.py

@@ -1,4 +1,5 @@
-from flask import abort, request
+from flask import abort, flash, jsonify, make_response, request
+from flask_login import current_user
 from app import db
 from app.decorators import content_negotiation
 from app.models import (
@@ -10,9 +11,8 @@ from app.models import (
 from ..decorators import corpus_follower_permission_required
 from . import bp
 
-
 @bp.route('/<hashid:corpus_id>/followers', methods=['POST'])
-@corpus_follower_permission_required('ADD_FOLLOWER')
+@corpus_follower_permission_required('MANAGE_FOLLOWERS')
 @content_negotiation(consumes='application/json', produces='application/json')
 def create_corpus_followers(corpus_id):
     usernames = request.json
@@ -31,7 +31,7 @@ def create_corpus_followers(corpus_id):
 
 
 @bp.route('/<hashid:corpus_id>/followers/<hashid:follower_id>/role', methods=['PUT'])
-@corpus_follower_permission_required('UPDATE_FOLLOWER')
+@corpus_follower_permission_required('MANAGE_FOLLOWERS')
 @content_negotiation(consumes='application/json', produces='application/json')
 def update_corpus_follower_role(corpus_id, follower_id):
     role_name = request.json
@@ -51,17 +51,25 @@ def update_corpus_follower_role(corpus_id, follower_id):
 
 
 @bp.route('/<hashid:corpus_id>/followers/<hashid:follower_id>', methods=['DELETE'])
-@corpus_follower_permission_required('REMOVE_FOLLOWER')
-@content_negotiation(produces='application/json')
 def delete_corpus_follower(corpus_id, follower_id):
     cfa = CorpusFollowerAssociation.query.filter_by(corpus_id=corpus_id, follower_id=follower_id).first_or_404()
+    if not (
+        current_user.id == follower_id
+        or current_user == cfa.corpus.user 
+        or CorpusFollowerAssociation.query.filter_by(corpus_id=corpus_id, follower_id=current_user.id).first().role.has_permission('MANAGE_FOLLOWERS')
+        or current_user.is_administrator()):
+        abort(403)
+    if current_user.id == follower_id:
+        flash(f'You are no longer following "{cfa.corpus.title}"', 'corpus')
+        response = make_response()
+        response.status_code = 204
+    else:
+        response_data = {
+            'message': f'"{cfa.follower.username}" is not following "{cfa.corpus.title}" anymore',
+            'category': 'corpus'
+        }
+        response = jsonify(response_data)
+        response.status_code = 200
     cfa.follower.unfollow_corpus(cfa.corpus)
     db.session.commit()
-    response_data = {
-        'message': (
-            f'"{cfa.follower.username}" is not following '
-            f'"{cfa.corpus.title}" anymore'
-        ),
-        'category': 'corpus'
-    }
-    return response_data, 200
+    return response

app/corpora/json_routes.py

@@ -33,7 +33,7 @@ def delete_corpus(corpus_id):
 
 
 @bp.route('/<hashid:corpus_id>/build', methods=['POST'])
-@corpus_owner_or_admin_required
+@corpus_follower_permission_required('MANAGE_FILES')
 @content_negotiation(produces='application/json')
 def build_corpus(corpus_id):
     def _build_corpus(app, corpus_id):
@@ -58,7 +58,7 @@ def build_corpus(corpus_id):
 
 
 @bp.route('/<hashid:corpus_id>/generate-share-link', methods=['POST'])
-@corpus_follower_permission_required('ADD_FOLLOWER')
+@corpus_follower_permission_required('MANAGE_FOLLOWERS')
 @content_negotiation(consumes='application/json', produces='application/json')
 def generate_corpus_share_link(corpus_id):
     data = request.json

app/corpora/routes.py

@@ -50,26 +50,24 @@ def create_corpus():
 @register_breadcrumb(bp, '.entity', '', dynamic_list_constructor=corpus_dlc)
 def corpus(corpus_id):
     corpus = Corpus.query.get_or_404(corpus_id)
-    corpus_follower_roles = CorpusFollowerRole.query.all()
+    cfrs = CorpusFollowerRole.query.all()
     users = 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',
-            title=corpus.title,
-            corpus=corpus,
-            corpus_follower_roles=corpus_follower_roles,
-            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
-        )
-    abort(403)
+    cfa = CorpusFollowerAssociation.query.filter_by(corpus_id=corpus_id, follower_id=current_user.id).first()
+    if cfa is None:
+        if corpus.user == current_user or current_user.is_administrator():
+            cfr = CorpusFollowerRole.query.filter_by(name='Administrator').first()
+        else:
+            cfr = CorpusFollowerRole.query.filter_by(name='Anonymous').first()
+    else:
+        cfr = cfa.role
+    return render_template(
+        'corpora/corpus.html.j2',
+        title=corpus.title,
+        corpus=corpus,
+        cfrs=cfrs,
+        cfr=cfr,
+        users = users
+    )
 
 
 @bp.route('/<hashid:corpus_id>/analysis')