adopt Finder to be usable with Cascade 3

Author: jrief

client/scss/finder-select.scss

@@ -5,8 +5,10 @@ finder-file-select {
 	input.finder-file-field {
 		width: 0 !important;
 		height: 0 !important;
+		border: none !important;
+		outline: none !important;
 		position: absolute;
 		bottom: 0;
-		padding: 0;
+		padding: 0 !important;
 	}
 }

finder/admin/file.py

@@ -9,6 +9,7 @@
 from finder.forms.file import FileForm
 from finder.models.file import FileModel
 from finder.models.inode import InodeModel
+from finder.models.label import Label
 from finder.admin.inode import InodeAdmin
 
 
@@ -84,6 +85,12 @@ def replace_file(self, request, file_id):
         file_obj.save()
         return HttpResponse(f"Replaced content of {file_obj.name} successfully.")
 
+    def get_fields(self, request, obj=None):
+        fields = list(super().get_fields(request, obj))
+        if 'labels' in fields and not Label.objects.exists():
+            fields.remove('labels')
+        return fields
+
     def render_change_form(self, request, context, add=False, change=False, form_url='', obj=None):
         has_editable_inline_admin_formsets = False
         for inline in context['inline_admin_formsets']:

finder/browser/views.py

@@ -73,11 +73,13 @@ def structure(self, request, slug):
             # in addition to that, also open all ancestors of the last opened folder
             open_folders = set(request.session['finder.open_folders'])
             try:
-                open_folders.update(
-                    map(str, FolderModel.objects.get(id=last_folder_id).ancestors.values_list('id', flat=True))
-                )
+                ancestors = FolderModel.objects.get(id=last_folder_id).ancestors
             except FolderModel.DoesNotExist:
                 pass
+            if isinstance(ancestors, QuerySet):
+                open_folders.update(map(str, ancestors.values_list('id', flat=True)))
+            else:  # django-cte not installed
+                open_folders.update(str(ancestor.id) for ancestor in ancestors)
             children = self._get_children(open_folders, realm.root_folder)
         else:
             children = None

finder/forms/fields.py

@@ -1,5 +1,3 @@
-import uuid
-
 from django.forms.fields import UUIDField
 from django.forms.models import ModelMultipleChoiceField
 
@@ -9,15 +7,6 @@
 class FinderFileField(UUIDField):
     widget = FinderFileSelect
 
-    def prepare_value(self, value):
-        if isinstance(value, uuid.UUID):
-            return str(value)
-        return value
-
-    def to_python(self, value):
-        value = super().to_python(value)
-        return value
-
 
 class LabelsChoiceField(ModelMultipleChoiceField):
     def prepare_value(self, values):

finder/forms/widgets.py

@@ -1,12 +1,13 @@
 import json
+import uuid
 
 from django.core.serializers.json import DjangoJSONEncoder
 from django.forms.widgets import TextInput
 from django.templatetags.static import static
 from django.urls import reverse
 from django.utils.html import format_html
 
-from finder.models.file import AbstractFileModel
+from finder.models.file import AbstractFileModel, FileModel
 
 
 class FinderFileSelect(TextInput):
@@ -30,11 +31,19 @@ def get_context(self, name, value, attrs):
             realm='admin',
             style_url=static('finder/css/finder-browser.css'),
         )
+        if isinstance(value, str):
+            # file reference has not been stored using a `finder.models.fields.FinderFileField`
+            try:
+                value = FileModel.objects.get_inode(id=uuid.UUID(value), is_folder=False)
+            except (ValueError, FileModel.DoesNotExist):
+                pass
         if isinstance(value, AbstractFileModel):
             context['selected_file'] = json.dumps(value.as_dict, cls=DjangoJSONEncoder)
         return context
 
     def format_value(self, value):
         if value == "" or value is None:
             return None
-        return value.id
+        if isinstance(value, AbstractFileModel):
+            return value.id
+        return value