Merge pull request #11751 from CenterForOpenScience/feature/pbs-26-9

[ENG-11560] PBS-26-9 Feature Release PR

Author: cslzchen

admin/base/urls.py

@@ -38,6 +38,7 @@
             re_path(r'^draft_registrations/', include('admin.draft_registrations.urls', namespace='draft_registrations')),
             re_path(r'^files/', include('admin.files.urls', namespace='files')),
             re_path(r'^share_reindex/', include('admin.share_reindex.urls', namespace='share_reindex')),
+            re_path(r'^notifications/', include('admin.notifications.urls', namespace='notifications')),
         ]),
     ),
 ]

admin/maintenance/views.py

@@ -1,7 +1,7 @@
 import pytz
 import datetime
 
-from osf.models import MaintenanceState
+from osf.models import MaintenanceState, MaintenanceMode
 import website.maintenance as maintenance
 from admin.maintenance.forms import MaintenanceForm
 
@@ -36,15 +36,17 @@ def get_context_data(self, **kwargs):
         maintenance = MaintenanceState.objects.first()
         kwargs['form'] = MaintenanceForm()
         kwargs['current_alert'] = model_to_dict(maintenance) if maintenance else None
+        kwargs['maintenance_mode'] = MaintenanceMode.is_under_maintenance()
         return super().get_context_data(**kwargs)
 
     def post(self, request, *args, **kwargs):
         data = request.POST
-
-        start = convert_eastern_to_utc(data['start']).isoformat() if data.get('start') else None
-        end = convert_eastern_to_utc(data['end']).isoformat() if data.get('end') else None
-
-        maintenance.set_maintenance(data.get('message', ''), data['level'], start, end)
+        if maintenance_mode := data.get('maintenance_mode'):
+            MaintenanceMode(maintenance_mode=False if maintenance_mode == 'True' else True).save()
+        else:
+            start = convert_eastern_to_utc(data['start']).isoformat() if data.get('start') else None
+            end = convert_eastern_to_utc(data['end']).isoformat() if data.get('end') else None
+            maintenance.set_maintenance(data.get('message', ''), data['level'], start, end)
         return redirect('maintenance:display')
 
 

admin/management/views.py

@@ -194,7 +194,17 @@ def post(self, request):
 class SyncNotificationTemplates(ManagementCommandPermissionView):
 
     def post(self, request):
-        populate_notification_types()
+        run_type = request.POST.get('run_type')
+        if run_type == 'restore_one':
+            template_name = request.POST.get('template_name')
+            if not template_name:
+                messages.error(request, 'A template name must be specified when restoring one template. Check your inputs and try again')
+                return redirect(reverse('management:commands'))
+            populate_notification_types(restore_one=template_name)
+        elif run_type == 'restore_all':
+            populate_notification_types(restore_all=True)
+        else:
+            populate_notification_types()
         messages.success(request, 'Notification templates have been successfully synced.')
         return redirect(reverse('management:commands'))
 

admin/nodes/views.py

@@ -110,13 +110,16 @@ def post(self, request, *args, **kwargs):
             node.created = new_date
             node.save()
 
+            params = dict(node.log_params)
+            params.update({
+                'last_date': str(last_date),
+                'new_date': str(new_date),
+            })
             node.add_log(
                 action=NodeLog.REGISTRATION_DATE_UPDATED,
-                auth=request,
-                params={
-                    'last_date': str(last_date),
-                    'new_date': str(new_date)
-                },
+                auth=None,
+                foreign_user=NodeLog.SUPPORT_USER_LABEL,
+                params=params,
                 log_date=timezone.now(),
                 should_hide=False,
             )
@@ -225,22 +228,18 @@ def post(self, request, *args, **kwargs):
                 message=f'User {user.pk} removed from {node.__class__.__name__.lower()} {node.pk}.',
                 action_flag=CONTRIBUTOR_REMOVED
             )
-            # Log invisibly on the OSF.
-            self.add_contributor_removed_log(node, user)
-        return redirect(self.get_success_url())
+            params = dict(node.log_params)
+            params['contributors'] = [user._id]
+            node.add_log(
+                action=NodeLog.CONTRIB_REMOVED,
+                auth=None,
+                foreign_user=NodeLog.SUPPORT_USER_LABEL,
+                params=params,
+                log_date=timezone.now(),
+                should_hide=False,
+            )
 
-    def add_contributor_removed_log(self, node, user):
-        NodeLog(
-            action=NodeLog.CONTRIB_REMOVED,
-            user=None,
-            params={
-                'project': node.parent_id,
-                'node': node.pk,
-                'contributors': user.pk
-            },
-            date=timezone.now(),
-            should_hide=True,
-        ).save()
+        return redirect(self.get_success_url())
 
 
 class NodeUpdatePermissionsView(NodeMixin, View):
@@ -266,6 +265,7 @@ def post(self, request, *args, **kwargs):
         new_permissions_to_add = data.get('new-permissions', [])
 
         new_permission_indexes_to_remove = []
+        added_contributor_ids = []
         for email, permission in zip(new_emails_to_add, new_permissions_to_add):
             contributor_user = OSFUser.objects.filter(emails__address=email.lower()).first()
             if not contributor_user:
@@ -281,8 +281,10 @@ def post(self, request, *args, **kwargs):
                 auth=request,
                 user_id=contributor_user._id,
                 permissions=permission,
-                notification_type=None
+                notification_type=None,
+                log=False,
             )
+            added_contributor_ids.append(contributor_user._id)
             messages.success(self.request, f'User with email {email} was successfully added.')
 
         # should remove permissions of invalid emails because
@@ -291,13 +293,27 @@ def post(self, request, *args, **kwargs):
         for permission_index in new_permission_indexes_to_remove:
             new_permissions_to_add.pop(permission_index)
 
+        # Log support-added contributors, if any
+        if added_contributor_ids:
+            params = resource.log_params
+            params['contributors'] = added_contributor_ids
+            resource.add_log(
+                action=NodeLog.CONTRIB_ADDED,
+                auth=None,
+                foreign_user=NodeLog.SUPPORT_USER_LABEL,
+                params=params,
+                log_date=timezone.now(),
+                should_hide=False,
+            )
+
         updated_permissions = data.get('updated-permissions', [])
         all_permissions = updated_permissions + new_permissions_to_add
         has_admin = list(filter(lambda permission: ADMIN in permission, all_permissions))
         if not has_admin:
             messages.error(self.request, 'Must be at least one admin on this node.')
             return redirect(self.get_success_url())
 
+        permissions_changed = {}
         for contributor_permission in updated_permissions:
             guid, permission = contributor_permission.split('-')
             user = OSFUser.load(guid)
@@ -307,7 +323,21 @@ def post(self, request, *args, **kwargs):
                 resource.get_visible(user),
                 request,
                 save=True,
-                skip_permission=True
+                skip_permission=True,
+                log=False,
+            )
+            permissions_changed[user._id] = permission
+
+        if permissions_changed:
+            params = resource.log_params
+            params['contributors'] = permissions_changed
+            resource.add_log(
+                action=NodeLog.PERMISSIONS_UPDATED,
+                auth=None,
+                foreign_user=NodeLog.SUPPORT_USER_LABEL,
+                params=params,
+                log_date=timezone.now(),
+                should_hide=False,
             )
 
         return redirect(self.get_success_url())
@@ -332,15 +362,14 @@ def post(self, request, *args, **kwargs):
                 message=f'Node {node.pk} restored.',
                 action_flag=NODE_RESTORED
             )
-            NodeLog(
+            node.add_log(
                 action=NodeLog.NODE_CREATED,
-                user=None,
-                params={
-                    'project': node.parent_id,
-                },
-                date=timezone.now(),
-                should_hide=True,
-            ).save()
+                auth=None,
+                foreign_user=NodeLog.SUPPORT_USER_LABEL,
+                params=dict(node.log_params),
+                log_date=timezone.now(),
+                should_hide=False,
+            )
         else:
             node.is_deleted = True
             node.deleted = timezone.now()
@@ -352,15 +381,14 @@ def post(self, request, *args, **kwargs):
                 message=f'Node {node.pk} removed.',
                 action_flag=NODE_REMOVED
             )
-            NodeLog(
+            node.add_log(
                 action=NodeLog.NODE_REMOVED,
-                user=None,
-                params={
-                    'project': node.parent_id,
-                },
-                date=timezone.now(),
-                should_hide=True,
-            ).save()
+                auth=None,
+                foreign_user=NodeLog.SUPPORT_USER_LABEL,
+                params=dict(node.log_params),
+                log_date=timezone.now(),
+                should_hide=False,
+            )
         node.save()
 
         return redirect(self.get_success_url())
@@ -860,6 +888,15 @@ def post(self, request, *args, **kwargs):
 
         node.save()
 
+        node.add_log(
+            action=NodeLog.MADE_PRIVATE,
+            auth=None,
+            foreign_user=NodeLog.SUPPORT_USER_LABEL,
+            params=dict(node.log_params),
+            log_date=timezone.now(),
+            should_hide=False,
+        )
+
         return redirect(self.get_success_url())
 
 
@@ -871,9 +908,18 @@ class NodeMakePublic(NodeMixin, View):
     def post(self, request, *args, **kwargs):
         node = self.get_object()
         try:
-            node.set_privacy('public')
+            node.set_privacy('public', auth=None, log=False)
         except NodeStateError as e:
             messages.error(request, str(e))
+        else:
+            node.add_log(
+                action=NodeLog.MADE_PUBLIC,
+                auth=None,
+                foreign_user=NodeLog.SUPPORT_USER_LABEL,
+                params=dict(node.log_params),
+                log_date=timezone.now(),
+                should_hide=False,
+            )
         return redirect(self.get_success_url())
 
 
@@ -900,10 +946,26 @@ def _remove_file_from_schema_response_blocks(registration, removed_file_id):
 
         # delete file from registration and metadata and keep it for original project
         if guid and (file := guid.referent) and (file.target == node) and not isinstance(file, TrashedFile):
+            file_id = file._id
+            file_path = getattr(file, 'materialized_path', None) or getattr(file, 'path', None) or ''
+            copied_from_id = getattr(file, 'copied_from_id', None) or getattr(getattr(file, 'copied_from', None), '_id', None)
             with transaction.atomic():
                 file.delete()
                 _update_schema_meta(file.target)
-                _remove_file_from_schema_response_blocks(node, [file._id, file.copied_from._id])
+                _remove_file_from_schema_response_blocks(node, [file_id, copied_from_id])
+            params = dict(node.log_params)
+            params.update({
+                'pathType': 'file',
+                'path': file_path,
+            })
+            node.add_log(
+                action=NodeLog.FILE_REMOVED,
+                auth=None,
+                foreign_user=NodeLog.SUPPORT_USER_LABEL,
+                params=params,
+                log_date=timezone.now(),
+                should_hide=False,
+            )
         return redirect(self.get_success_url())
 
 
@@ -940,7 +1002,18 @@ def post(self, request, *args, **kwargs):
             parent=osfstorage.get_root(),
             name=osfstorage.archive_folder_name
         ).first()
-        file.copy_under(archive_folder)
+        copied = file.copy_under(archive_folder)
+        copied_path = getattr(copied, 'materialized_path', None) or getattr(copied, 'path', None) or ''
+        params = dict(registration.log_params)
+        params['path'] = copied_path
+        registration.add_log(
+            action=NodeLog.FILE_ADDED,
+            auth=None,
+            foreign_user=NodeLog.SUPPORT_USER_LABEL,
+            params=params,
+            log_date=timezone.now(),
+            should_hide=False,
+        )
         messages.success(request, 'The file was successfully added.')
         return redirect(self.get_success_url())
 
@@ -967,8 +1040,21 @@ def post(self, request, *args, **kwargs):
         if not registration_file.exists():
             messages.error(request, 'The file with the provided guid is not part of the registration.')
             return redirect(self.get_success_url())
-
+        file_path = getattr(file, 'materialized_path', None) or getattr(file, 'path', None) or ''
         registration_file.delete()
+        params = dict(registration.log_params)
+        params.update({
+            'pathType': 'file',
+            'path': file_path,
+        })
+        registration.add_log(
+            action=NodeLog.FILE_REMOVED,
+            auth=None,
+            foreign_user=NodeLog.SUPPORT_USER_LABEL,
+            params=params,
+            log_date=timezone.now(),
+            should_hide=False,
+        )
         messages.success(request, 'The file was successfully removed.')
         return redirect(self.get_success_url())
 

admin/notifications/forms.py

@@ -0,0 +1,8 @@
+from django import forms
+from osf.models import NotificationType
+
+
+class NotificationTypeForm(forms.ModelForm):
+    class Meta:
+        model = NotificationType
+        fields = '__all__'

admin/notifications/urls.py

@@ -0,0 +1,14 @@
+from django.urls import re_path
+from . import views
+
+app_name = 'admin'
+
+urlpatterns = [
+    re_path(r'$', views.NotificationsList.as_view(), name='list'),
+    re_path(r'types/$', views.NotificationTypeList.as_view(), name='types_list'),
+    re_path(r'type_display/(?P<pk>\d+)/$', views.NotificationTypeDisplay.as_view(), name='type_display'),
+    re_path(r'type_detail/(?P<pk>\d+)/$', views.NotificationTypeDetail.as_view(), name='type_detail'),
+    re_path(r'types_preview/(?P<pk>\d+)/$', views.NotificationTypePreview.as_view(), name='types_preview'),
+    re_path(r'subscriptions/$', views.NotificationSubscriptionsList.as_view(), name='subscriptions_list'),
+    re_path(r'email_tasks/$', views.EmailTasksList.as_view(), name='email_tasks_list'),
+]