Merge branch 'feature/remove-remaining-quickiles-code' of https://github.com/bodintsov/osf.io into feature/notification-refactor-phase-1

* 'feature/remove-remaining-quickiles-code' of https://github.com/bodintsov/osf.io:
  flake8
  fixed tests
  remove quickfiles

Author: Johnetordoff

README-docker-compose.md

@@ -271,10 +271,8 @@
       docker compose run --rm web python3 -m scripts.parse_citation_styles
       ```
 - Start ember_osf_web
-  - Needed for quickfiles feature:
-      ```bash
-      docker compose up -d ember_osf_web
-      ```
+  - Needed for ember app:
+    - `docker-compose up -d ember_osf_web`
 - OPTIONAL: Register OAuth Scopes
   - Needed for things such as the ember-osf dummy app
       ```bash

addons/base/views.py

@@ -21,7 +21,6 @@
 
 from addons.base import exceptions as addon_errors
 from addons.base.models import BaseStorageAddon
-from addons.osfstorage.models import OsfStorageFile
 from addons.osfstorage.models import OsfStorageFileNode
 from addons.osfstorage.utils import enqueue_update_analytics
 
@@ -34,7 +33,6 @@
 from framework.exceptions import HTTPError
 from framework.flask import redirect
 from framework.sentry import log_exception
-from framework.routing import proxy_url
 from framework.transactions.handlers import no_auto_transaction
 from website import mails
 from website import settings
@@ -483,7 +481,7 @@ def _construct_payload(auth, resource, credentials, waterbutler_settings):
 
 @must_be_signed
 @no_auto_transaction
-@must_be_valid_project(quickfiles_valid=True, preprints_valid=True)
+@must_be_valid_project(preprints_valid=True)
 def create_waterbutler_log(payload, **kwargs):
     with transaction.atomic():
         try:
@@ -603,7 +601,7 @@ def create_waterbutler_log(payload, **kwargs):
     metadata = payload.get('metadata') or payload.get('destination')
 
     target_node = AbstractNode.load(metadata.get('nid'))
-    if target_node and not target_node.is_quickfiles and payload['action'] != 'download_file':
+    if target_node and payload['action'] != 'download_file':
         update_storage_usage_with_size(payload)
 
     with transaction.atomic():
@@ -1032,16 +1030,6 @@ def persistent_file_download(auth, **kwargs):
     )
 
 
-def addon_view_or_download_quickfile(**kwargs):
-    fid = kwargs.get('fid', 'NOT_AN_FID')
-    file_ = OsfStorageFile.load(fid)
-    if not file_:
-        raise HTTPError(http_status.HTTP_404_NOT_FOUND, data={
-            'message_short': 'File Not Found',
-            'message_long': 'The requested file could not be found.'
-        })
-    return proxy_url(f'/project/{file_.target._id}/files/osfstorage/{fid}/')
-
 def addon_view_file(auth, node, file_node, version):
     # TODO: resolve circular import issue
     from addons.wiki import settings as wiki_settings

addons/osfstorage/tests/test_views.py

@@ -24,7 +24,7 @@
 from framework.auth import cas
 
 from osf import features
-from osf.models import Tag, QuickFilesNode
+from osf.models import Tag
 from osf.models import files as models
 from addons.osfstorage.apps import osf_storage_root
 from addons.osfstorage import utils

addons/osfstorage/views.py

@@ -314,9 +314,6 @@ def osfstorage_create_child(file_node, payload, **kwargs):
     if not (name or user) or '/' in name:
         raise HTTPError(http_status.HTTP_400_BAD_REQUEST)
 
-    if getattr(file_node.target, 'is_quickfiles', False) and is_folder:
-        raise HTTPError(http_status.HTTP_400_BAD_REQUEST, data={'message_long': 'You may not create a folder for QuickFiles'})
-
     try:
         # Create a save point so that we can rollback and unlock
         # the parent record

admin/base/settings/defaults.py

@@ -40,7 +40,8 @@
 CSRF_COOKIE_HTTPONLY = False
 
 ALLOWED_HOSTS = [
-    '.osf.io'
+    '.osf.io',
+    '*'
 ]
 
 AUTH_PASSWORD_VALIDATORS = [

api/caching/tasks.py

@@ -181,7 +181,7 @@ def update_storage_usage(target):
     # for fetching files we use AbstractNode instances, this is why we use branched_from property
     if isinstance(target, DraftRegistration):
         enqueue_postcommit_task(update_storage_usage_cache, (target.branched_from.id, target.branched_from._id), {}, celery=True)
-    elif not isinstance(target, Preprint) and not target.is_quickfiles:
+    elif not isinstance(target, Preprint):
         enqueue_postcommit_task(update_storage_usage_cache, (target.id, target._id), {}, celery=True)
 
 def update_storage_usage_with_size(payload):
@@ -194,9 +194,6 @@ def update_storage_usage_with_size(payload):
         return
     target_node = AbstractNode.load(metadata['nid'])
 
-    if target_node.is_quickfiles:
-        return
-
     action = payload['action']
     provider = metadata.get('provider', 'osfstorage')
 
@@ -225,7 +222,7 @@ def update_storage_usage_with_size(payload):
         source_provider = payload['source']['provider']
         if target_node == source_node and source_provider == provider:
             return  # Its not going anywhere.
-        if source_provider == 'osfstorage' and not source_node.is_quickfiles:
+        if source_provider == 'osfstorage':
             if source_node.storage_limit_status is settings.StorageLimits.NOT_CALCULATED:
                 return update_storage_usage(source_node)
 

api/files/serializers.py

@@ -448,18 +448,6 @@ def to_representation(self, value):
         return data
 
 
-class QuickFilesSerializer(BaseFileSerializer):
-    user = RelationshipField(
-        related_view='users:user-detail',
-        related_view_kwargs={'user_id': '<target.creator._id>'},
-        help_text='The user who uploaded this file',
-    )
-
-
-class QuickFilesDetailSerializer(QuickFilesSerializer):
-    id = IDField(source='_id', required=True)
-
-
 class FileVersionSerializer(JSONAPISerializer):
     filterable_fields = frozenset([
         'id',

api/files/views.py

@@ -24,11 +24,12 @@
 from api.cedar_metadata_records.utils import can_view_record
 from api.nodes.permissions import ContributorOrPublic
 from api.files import annotations
-from api.files.permissions import IsPreprintFile
-from api.files.permissions import CheckedOutOrAdmin
-from api.files.serializers import FileSerializer
-from api.files.serializers import FileDetailSerializer
-from api.files.serializers import FileVersionSerializer
+from api.files.permissions import IsPreprintFile, CheckedOutOrAdmin
+from api.files.serializers import (
+    FileSerializer,
+    FileDetailSerializer,
+    FileVersionSerializer,
+)
 from osf.utils.permissions import ADMIN
 
 
@@ -53,10 +54,6 @@ def get_file(self, check_permissions=True):
         if getattr(obj.target, 'deleted', None):
             raise Gone(detail='The requested file is no longer available')
 
-        if getattr(obj.target, 'is_quickfiles', False) and getattr(obj.target, 'creator'):
-            if obj.target.creator.is_disabled:
-                raise Gone(detail='This user has been deactivated and their quickfiles are no longer available.')
-
         if getattr(obj.target, 'is_retracted', False):
             raise Gone(detail='The requested file is no longer available.')
 
@@ -85,9 +82,6 @@ class FileDetail(JSONAPIBaseView, generics.RetrieveUpdateAPIView, FileMixin):
     view_category = 'files'
     view_name = 'file-detail'
 
-    def get_serializer_class(self):
-        return FileDetailSerializer
-
     def get_target(self):
         return self.get_file().target
 
@@ -97,8 +91,7 @@ def get_object(self):
         file = self.get_file()
 
         if self.request.GET.get('create_guid', False):
-            # allows quickfiles to be given guids when another user wants a permanent link to it
-            if (self.get_target().has_permission(user, ADMIN) and utils.has_admin_scope(self.request)) or getattr(file.target, 'is_quickfiles', False):
+            if (self.get_target().has_permission(user, ADMIN) and utils.has_admin_scope(self.request)):
                 file.get_guid(create=True)
 
         # We normally would pass this through `get_file` as an annotation, but the `select_for_update` feature prevents

api/users/urls.py

@@ -24,7 +24,6 @@
     re_path(r'^(?P<user_id>\w+)/registrations/$', views.UserRegistrations.as_view(), name=views.UserRegistrations.view_name),
     re_path(r'^(?P<user_id>\w+)/settings/$', views.UserSettings.as_view(), name=views.UserSettings.view_name),
     re_path(r'^(?P<user_id>\w+)/messages/$', views.UserMessageView.as_view(), name=views.UserMessageView.view_name),
-    re_path(r'^(?P<user_id>\w+)/quickfiles/$', views.UserQuickFiles.as_view(), name=views.UserQuickFiles.view_name),
     re_path(r'^(?P<user_id>\w+)/relationships/institutions/$', views.UserInstitutionsRelationship.as_view(), name=views.UserInstitutionsRelationship.view_name),
     re_path(r'^(?P<user_id>\w+)/settings/emails/$', views.UserEmailsList.as_view(), name=views.UserEmailsList.view_name),
     re_path(r'^(?P<user_id>\w+)/settings/emails/(?P<email_id>\w+)/$', views.UserEmailsDetail.as_view(), name=views.UserEmailsDetail.view_name),

api/users/views.py

@@ -12,7 +12,7 @@
 from api.addons.views import AddonSettingsMixin
 from api.base import permissions as base_permissions
 from api.users.permissions import UserMessagePermissions
-from api.base.exceptions import Conflict, UserGone, Gone
+from api.base.exceptions import Conflict, UserGone
 from api.base.filters import ListFilterMixin, PreprintFilterMixin
 from api.base.parsers import (
     JSONAPIRelationshipParser,
@@ -356,22 +356,6 @@ def get_queryset(self):
         )
 
 
-class UserQuickFiles(JSONAPIBaseView, generics.ListAPIView):
-    view_category = 'users'
-    view_name = 'user-quickfiles'
-
-    permission_classes = (
-        drf_permissions.IsAuthenticatedOrReadOnly,
-        base_permissions.TokenHasScope,
-    )
-
-    required_read_scopes = [CoreScopes.NULL]
-    required_write_scopes = [CoreScopes.NULL]
-
-    def get(self, *args, **kwargs):
-        raise Gone()
-
-
 class UserPreprints(JSONAPIBaseView, generics.ListAPIView, UserMixin, PreprintFilterMixin):
     """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/users_preprints_list).
     """

api_tests/files/views/test_file_detail.py

@@ -16,7 +16,7 @@
 from api.base.settings.defaults import API_BASE
 from api_tests import utils as api_utils
 from framework.auth.core import Auth
-from osf.models import NodeLog, QuickFilesNode, Node, FileVersionUserMetadata
+from osf.models import NodeLog, Node, FileVersionUserMetadata
 from osf.utils.permissions import WRITE, READ
 from osf.utils.workflows import DefaultStates
 from osf_tests.factories import (
@@ -56,10 +56,6 @@ class TestFileView:
     def node(self, user):
         return ProjectFactory(creator=user, comment_level='public')
 
-    @pytest.fixture()
-    def quickfiles_node(self, user):
-        return QuickFilesNode.objects.get(creator=user)
-
     @pytest.fixture()
     def file(self, user, node):
         return api_utils.create_test_file(node, user, create_guid=False)

api_tests/wb/views/test_wb_hooks.py

@@ -1,6 +1,5 @@
 import pytest
 
-from addons.osfstorage.models import OsfStorageFolder
 from framework.auth import signing
 
 from osf_tests.factories import (
@@ -9,26 +8,12 @@
     PreprintFactory
 )
 from api_tests.utils import create_test_file, create_test_preprint_file
-from osf.models import QuickFilesNode
 
 
 @pytest.fixture()
 def user():
     return AuthUserFactory()
 
-@pytest.fixture()
-def quickfiles_node(user):
-    return QuickFilesNode.objects.get_for_user(user)
-
-@pytest.fixture()
-def quickfiles_file(user, quickfiles_node):
-    file = create_test_file(quickfiles_node, user, filename='road_dogg.mp3')
-    return file
-
-@pytest.fixture()
-def quickfiles_folder(quickfiles_node):
-    return OsfStorageFolder.objects.get_root(target=quickfiles_node)
-
 @pytest.fixture()
 def node(user):
     return ProjectFactory(creator=user)
@@ -72,10 +57,6 @@ class TestMove():
     def move_url(self, node):
         return f'/_/wb/hooks/{node._id}/move/'
 
-    @pytest.fixture()
-    def quickfiles_move_url(self, quickfiles_node):
-        return f'/_/wb/hooks/{quickfiles_node._id}/move/'
-
     @pytest.fixture()
     def payload(self, file, folder, root_node, user):
         return {
@@ -568,10 +549,6 @@ class TestCopy():
     def copy_url(self, node):
         return f'/_/wb/hooks/{node._id}/copy/'
 
-    @pytest.fixture()
-    def quickfiles_copy_url(self, quickfiles_node):
-        return f'/_/wb/hooks/{quickfiles_node._id}/copy/'
-
     @pytest.fixture()
     def payload(self, file, folder, root_node, user):
         return {

osf/management/commands/data_storage_usage.py

@@ -139,23 +139,6 @@
         GROUP BY node.type, node.is_public
     """
 
-# Aggregation of non-deleted quick file sizes (NOTE: This will break when QuickFolders is merged)
-ND_QUICK_FILE_SIZE_SUM_SQL = """
-        SELECT
-           node.type, sum(size)
-        FROM osf_basefileversionsthrough AS obfnv
-        LEFT JOIN osf_basefilenode file ON obfnv.basefilenode_id = file.id
-        LEFT JOIN osf_fileversion version ON obfnv.fileversion_id = version.id
-        LEFT JOIN osf_abstractnode node ON file.target_object_id = node.id
-        WHERE file.provider = 'osfstorage' AND file.target_content_type_id = %s
-          AND node.type = 'osf.quickfilesnode'
-          AND node.is_deleted = False
-          AND file.deleted_on IS NULL
-          AND obfnv.id >= %s AND obfnv.id <= %s
-        GROUP BY node.type
-
-    """
-
 # Aggregation of size of non-deleted files in preprint supplemental nodes based on the node query above
 ND_PREPRINT_SUPPLEMENT_SIZE_SUM_SQL = """
         SELECT
@@ -320,16 +303,6 @@ def gather_usage_data(start, end, dry_run, zip_file):
             cursor=cursor,
         ))
 
-        # TODO: Move the next when Quick Folders is done
-        logger.debug(f'Gathering quickfile summary at {datetime.datetime.now()}')
-        summary_data = combine_summary_data(summary_data, summarize(
-            sql=ND_QUICK_FILE_SIZE_SUM_SQL,
-            content_type=abstractnode_content_type,
-            start=start,
-            end=end,
-            cursor=cursor,
-        ))
-
         logger.debug(f'Gathering supplement summary at {datetime.datetime.now()}')
         summary_data = combine_summary_data(summary_data, summarize(
             sql=ND_PREPRINT_SUPPLEMENT_SIZE_SUM_SQL,