separate React components into folderitem and editor

jrief · jrief · commit 4d5a97816ca5 · 2024-11-02T20:13:37.000+01:00
diff --git a/client/browser/FileSelectDialog.tsx b/client/browser/FileSelectDialog.tsx
@@ -21,8 +21,8 @@ function StaticFigure(props) {
 
 function Figure(props) {
 	const FigBody = useMemo(() => {
-		if (props.browser_component) {
-			const component = `./components/folderitem/${props.browser_component}.js`;
+		if (props.folderitem_component) {
+			const component = `./components/folderitem/${props.folderitem_component}.js`;
 			const LazyItem = lazy(() => import(component));
 			return (props) => (
 				<Suspense>
diff --git a/client/finder/FileAdmin.tsx b/client/finder/FileAdmin.tsx
@@ -7,8 +7,8 @@ import FileDetails from './FileDetails';
 export function FileAdmin() {
 	const settings = useContext(FinderSettings);
 	const FileEditor = useMemo(() => {
-		if (settings.react_component) {
-			const component = `./components/editor/${settings.react_component}.js`;
+		if (settings.editor_component) {
+			const component = `./components/editor/${settings.editor_component}.js`;
 			const LazyItem = lazy(() => import(component));
 			return (props) => (
 				<Suspense fallback={<span>{gettext("Loading...")}</span>}>
diff --git a/client/finder/Item.tsx b/client/finder/Item.tsx
@@ -87,8 +87,8 @@ export function ListItem(props) {
 	const settings = useContext(FinderSettings);
 	const [focusHandler, setFocusHandler] = useState(null);
 	const FigBody = useMemo(() => {
-		if (props.react_component) {
-			const component = `./components/folderitem/${props.react_component}.js`;
+		if (props.folderitem_component) {
+			const component = `./components/folderitem/${props.folderitem_component}.js`;
 			const LazyItem = lazy(() => import(component));
 			return (props) => (
 				<Suspense>
@@ -193,7 +193,7 @@ export function ListItem(props) {
 					</div>
 				</div>
 				<div>
-					{props.owner_name}
+					{props.owner}
 				</div>
 				<div>
 					{props.summary}
diff --git a/finder/contrib/archive/admin.py b/finder/contrib/archive/admin.py
@@ -160,10 +160,7 @@ def unarchive_file(self, request, file_id):
 
     def get_editor_settings(self, request, inode):
         settings = super().get_editor_settings(request, inode)
-        settings.update(
-            react_component='Archive',
-            download_file=True,
-        )
+        settings.update(download_file=True)
         return settings
 
     def get_menu_extension_settings(self, request):
diff --git a/finder/contrib/archive/models.py b/finder/contrib/archive/models.py
@@ -5,6 +5,7 @@
 
 class ArchiveModel(FileModel):
     accept_mime_types = ['application/zip', 'application/x-tar', 'application/x-gzip']
+    editor_component = 'Archive'
     fallback_thumbnail_url = staticfiles_storage.url('filer/icons/file-zip.svg')
 
     class Meta:
diff --git a/finder/contrib/audio/admin.py b/finder/contrib/audio/admin.py
@@ -32,7 +32,6 @@ class AudioAdmin(FileAdmin):
     def get_editor_settings(self, request, inode):
         settings = super().get_editor_settings(request, inode)
         settings.update(
-            react_component='Audio',
             replace_file= True,
             download_file=True,
         )
diff --git a/finder/contrib/audio/models.py b/finder/contrib/audio/models.py
@@ -14,7 +14,7 @@
 
 class AudioFileModel(FileModel):
     accept_mime_types = ['audio/mpeg', 'audio/ogg', 'audio/wav', 'audio/x-wav', 'audio/opus']
-    browser_component = 'Audio'
+    editor_component = folderitem_component = 'Audio'
     fallback_thumbnail_url = staticfiles_storage.url('filer/icons/file-audio.svg')
     filer_public_thumbnails = Path(
         filer_settings.FILER_STORAGES['public']['thumbnails']['THUMBNAIL_OPTIONS']['base_dir']
diff --git a/finder/contrib/common/admin.py b/finder/contrib/common/admin.py
@@ -13,7 +13,6 @@ class CommonAdmin(FileAdmin):
     def get_editor_settings(self, request, inode):
         settings = super().get_editor_settings(request, inode)
         settings.update(
-            react_component='Common',
             replace_file=True,
             download_file=True,
         )
diff --git a/finder/contrib/common/models.py b/finder/contrib/common/models.py
@@ -5,6 +5,7 @@
 
 class PDFFileModel(FileModel):
     accept_mime_types = ['application/pdf']
+    editor_component = 'Common'
     fallback_thumbnail_url = staticfiles_storage.url('filer/icons/file-pdf.svg')
 
     class Meta:
@@ -19,6 +20,7 @@ class SpreadsheetModel(FileModel):
         'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
         'application/vnd.oasis.opendocument.spreadsheet',
     ]
+    editor_component = 'Common'
     fallback_thumbnail_url = staticfiles_storage.url('filer/icons/file-spreadsheet.svg')
 
     class Meta:
diff --git a/finder/contrib/image/admin.py b/finder/contrib/image/admin.py
@@ -42,7 +42,6 @@ class ImageAdmin(FileAdmin):
     def get_editor_settings(self, request, inode):
         settings = super().get_editor_settings(request, inode)
         settings.update(
-            react_component='Image',
             replace_file= True,
             download_file=True,
             view_original=True,
diff --git a/finder/contrib/image/models.py b/finder/contrib/image/models.py
@@ -2,7 +2,7 @@
 
 from django.contrib.staticfiles.storage import staticfiles_storage
 from django.db import models
-from django.utils.functional import cached_property, classproperty
+from django.utils.functional import cached_property
 
 from filer import settings as filer_settings
 
@@ -11,6 +11,7 @@
 
 class ImageModel(AbstractFileModel):
     accept_mime_types = ['image/*']
+    editor_component = 'Image'
     data_fields = AbstractFileModel.data_fields + ['width', 'height']
     filer_public_thumbnails = Path(
         filer_settings.FILER_STORAGES['public']['thumbnails']['THUMBNAIL_OPTIONS']['base_dir']
diff --git a/finder/contrib/video/admin.py b/finder/contrib/video/admin.py
@@ -30,13 +30,13 @@ class VideoAdmin(FileAdmin):
     def get_editor_settings(self, request, inode):
         settings = super().get_editor_settings(request, inode)
         settings.update(
-            react_component='Video',
             replace_file= True,
             download_file=True,
         )
         return settings
 
     def get_folderitem_settings(self, request, inode):
+        raise NotImplementedError()
         settings = super().get_folderitem_settings(request, inode)
         settings.update(
             react_component=inode.browser_component,
diff --git a/finder/contrib/video/models.py b/finder/contrib/video/models.py
@@ -13,7 +13,7 @@
 
 class VideoFileModel(FileModel):
     accept_mime_types = ['video/mp4']
-    browser_component = 'Video'
+    editor_component = folderitem_component = 'Video'
     thumbnail_size = 180
     fallback_thumbnail_url = staticfiles_storage.url('filer/icons/file-video.svg')
     filer_public_thumbnails = Path(
diff --git a/finder/models/file.py b/finder/models/file.py
@@ -64,7 +64,7 @@ class AbstractFileModel(InodeModel):
     data_fields = InodeModel.data_fields + ['file_size', 'file_name', 'sha1', 'mime_type', 'labels']
     filer_public = Path(filer_settings.FILER_STORAGES['public']['main']['UPLOAD_TO_PREFIX'])
     fallback_thumbnail_url = staticfiles_storage.url('filer/icons/file-unknown.svg')
-    browser_component = None
+    folderitem_component = None
 
     file_name = models.CharField(
         _("File name"),
diff --git a/finder/models/folder.py b/finder/models/folder.py
@@ -48,6 +48,7 @@ def get_trash_folder(self, realm, owner):
 
 class FolderModel(InodeModel):
     is_folder = True
+    folderitem_component = None
 
     realm = models.ForeignKey(
         RealmModel,
@@ -73,6 +74,7 @@ def __str__(self):
 
     @property
     def cast(self):
+        raise NotImplementedError
         return self
 
     @property
@@ -188,7 +190,7 @@ def listdir(self, **lookup):
         """
         List all inodes belonging to this folder.
         """
-        return self._meta.model.objects.filter_inodes(parent=self, **lookup)
+        return self._meta.model.objects.filter_unified(parent=self, **lookup)
 
     def copy_to(self, folder, **kwargs):
         """

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,6 @@ class AudioAdmin(FileAdmin):`
`32`	`32`	`def get_editor_settings(self, request, inode):`
`33`	`33`	`settings = super().get_editor_settings(request, inode)`
`34`	`34`	`settings.update(`
`35`		`- react_component='Audio',`
`36`	`35`	`replace_file= True,`
`37`	`36`	`download_file=True,`
`38`	`37`	`)`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,6 @@ class CommonAdmin(FileAdmin):`
`13`	`13`	`def get_editor_settings(self, request, inode):`
`14`	`14`	`settings = super().get_editor_settings(request, inode)`
`15`	`15`	`settings.update(`
`16`		`- react_component='Common',`
`17`	`16`	`replace_file=True,`
`18`	`17`	`download_file=True,`
`19`	`18`	`)`