Merge branch 'finder' of github.com:django-cms/django-filer into finder

Author: jrief

.github/workflows/docs.yml

@@ -8,11 +8,11 @@ jobs:
     name: docs
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v5
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
-          python-version: 3.9
+          python-version: 3.12
       - run: python -m pip install -r docs/requirements.txt
       - name: Build docs
         run: |

.github/workflows/lint.yml

@@ -14,7 +14,7 @@ jobs:
         with:
           python-version: 3.9
       - name: Install flake8
-        run: pip install --upgrade flake8
+        run: pip install --upgrade flake8 flake8-pyproject
       - name: Run flake8
         uses: liskin/gh-problem-matcher-wrap@v1
         with:

.nvmrc

@@ -0,0 +1 @@
+24

.pre-commit-config.yaml

@@ -24,14 +24,15 @@ repos:
     rev: 7.0.0
     hooks:
       - id: flake8
-
+        entry: pflake8
+        additional_dependencies: [pyproject-flake8]
   - repo: https://github.com/asottile/yesqa
     rev: v1.5.0
     hooks:
       - id: yesqa
 
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.6.0
+    rev: v6.0.0
     hooks:
       - id: check-merge-conflict
       - id: mixed-line-ending

CHANGELOG.rst

@@ -2,19 +2,99 @@
 CHANGELOG
 =========
 
-3.2 (2025-05-21)
-================
-* Fix: Reverse match for 'filer_image_expand_view' not found.
-* Drop support for Python 3.8 and 3.9.
-* Add support for Python 3.12.
+3.3.3 / 2025-11-07
+==================
+
+  * Pin svglib to a version below 1.6.0 by @payamnj (#1550) in https://github.com/django-cms/django-filer/pull/1551
+
+3.3.2 (2025-09-01)
+==================
+
+* fix: add filename length safety check with random suffix by @Baraff24 in https://github.com/django-cms/django-filer/pull/1515
+* fix: Remove user from autocomplete fields if (swapped) user model does not have search fields by @fsbraun in https://github.com/django-cms/django-filer/pull/1517
+* Fix: Include Private Storage in Orphan File Scanning for filer_check Command by @Baraff24 in https://github.com/django-cms/django-filer/pull/1518
+* fix: Relect template block structure of Django 5.2+ by @fsbraun in https://github.com/django-cms/django-filer/pull/1523
+* chore: Added Full Persian (Farsi) Translate by @dimacodev in https://github.com/django-cms/django-filer/pull/1524
+* fix: Update directory_table_list.html by @AliAkbarSobhanpoor in https://github.com/django-cms/django-filer/pull/1528
+* fix: Avoid locale-dependent ratio by @albanbochsler in https://github.com/django-cms/django-filer/pull/1536
+* fix: docs GitHub action built by @fsbraun in https://github.com/django-cms/django-filer/pull/1540
+* fix: Folder permission cache update sometimes raised TypeError by @fsbraun in https://github.com/django-cms/django-filer/pull/1539
+* fix: Failed to install submodules of filer by @fsbraun in https://github.com/django-cms/django-filer/pull/1544
+
+**New Contributors**
+
+* @Baraff24 made their first contribution in https://github.com/django-cms/django-filer/pull/1515
+* @dimacodev made their first contribution in https://github.com/django-cms/django-filer/pull/1524
+* @AliAkbarSobhanpoor made their first contribution in https://github.com/django-cms/django-filer/pull/1528
+* @albanbochsler made their first contribution in https://github.com/django-cms/django-filer/pull/1536
+
+3.3.1 (2024-12-07)
+==================
+
+* fix: editing buttons missing in admin when file present by @pajowu in https://github.com/django-cms/django-filer/pull/1511
+* fix: incompatibility with djangocms-versioning-filer 1.3 was fixed by @fscherf in https://github.com/django-cms/django-filer/pull/1509
+
+**New Contributors**
+
+* @pajowu made their first contribution in https://github.com/django-cms/django-filer/pull/1511
+* @fscherf made their first contribution in https://github.com/django-cms/django-filer/pull/1509
+
+3.3.0 (2024-11-19)
+==================
+
+* fix: Restrict upload of binary or unknown file types by default by @fsbraun in https://github.com/django-cms/django-filer/pull/1507
+* fix: remove extra brace in generated HTML of data-max-filesize attribute by @fabien-michel in https://github.com/django-cms/django-filer/pull/1502
+* fix: uploadButton data-max-filesize attribute is not passed to file-uploader by @fabien-michel in https://github.com/django-cms/django-filer/pull/1503
+* docs: Update for on_delete requirement in Filer fields
+
+3.2.3 (2024-09-18)
+==================
+
+* fix: Use TypeVar for type-hinting of the user parameter by @payamnj in https://github.com/django-cms/django-filer/pull/1496
+
+** New contributor**
+
+* @payamnj made their first contribution in https://github.com/django-cms/django-filer/pull/1496
+
+
+3.2.2 (2024-09-09)
+==================
+
+* fix: Remove version pin to Django<5.1
+
+3.2.1 (2024-09-05)
+==================
+
+* fix: Restore python 3.8 and python 3.9 compatibility
+
+3.2.0 (2024-08-23)
+==================
+
+* feat: Add cache for permission checks by @fsbraun in https://github.com/django-cms/django-filer/pull/1486
+* fix: Reduce number of thumbnails created for admin, avoid admin thumbnails for svg files by @fsbraun in https://github.com/django-cms/django-filer/pull/1490
+* fix: Allow ``Image.MAX_IMAGE_PIXELS`` to be ``None`` by @fsbraun in https://github.com/django-cms/django-filer/pull/1475
+* docs: Update extending_filer.rst by @DmytroLitvinov in https://github.com/django-cms/django-filer/pull/1488
+
+**New contributor:**
+
+* @DmytroLitvinov made their first contribution in https://github.com/django-cms/django-filer/pull/1488
+
+3.1.4 (2024-07-15)
+==================
+
+* feat: Accept new `STORAGES` setting, introduced in Django 4.2 by @fsbraun in https://github.com/django-cms/django-filer/pull/1472
+* feat: Replace `render` with `TemplateResponse` in admin views by @fsbraun in https://github.com/django-cms/django-filer/pull/1473
+* fix: File expand url incorrect and worked not with custom image models by @fsbraun in https://github.com/django-cms/django-filer/pull/1471
+* fix: Crash when moving files from a filtered directory listing by @W1ldPo1nter in https://github.com/django-cms/django-filer/pull/1482
+* ci: pre-commit autoupdate by @pre-commit-ci in https://github.com/django-cms/django-filer/pull/1477
 
 
-3.1.3 (2025-05-17)
+3.1.3 (2024-05-17)
 ==================
 * Fix: Folder select widget did not render correctly with standard Django admin
   styles.
 
-3.1.2 (2025-05-17)
+3.1.2 (2024-05-17)
 ==================
 
 * Made the filer check command compatible with custom image models.
@@ -719,7 +799,7 @@ CHANGELOG
 
 
 0.5.4a1
-=======
+========
 
 * Adds description field.
 

MANIFEST.in

@@ -117,13 +117,7 @@ git switch finder
 pip install --no-deps -e .
 ```
 
-The new version of **django-filer** requires Django-5.2 or later. Since this hasn't been
-released, you have to install the current development version of Django from GitHub rather than PyPI
-using:
-
-```shell
-pip install https://github.com/django/django/archive/refs/heads/main.zip
-```
+The new version of **django-filer** requires Django-5.2 or later.
 
 The new version of **django-filer** currently has only been tested with SQLite and Postgres, but
 should also work on MariaDB and MySQL.

README-Finder.md

@@ -54,7 +54,7 @@ for all the details on how to install, configure and use django-filer.
     :target: http://badge.fury.io/py/django-filer
 .. |coverage| image:: https://codecov.io/gh/django-cms/django-filer/branch/master/graph/badge.svg
     :target: https://codecov.io/gh/django-cms/django-filer
-.. |python| image:: https://img.shields.io/badge/python-3.8+-blue.svg
+.. |python| image:: https://img.shields.io/badge/python-3.10+-blue.svg
     :target: https://pypi.org/project/django-filer/
 .. |django| image:: https://img.shields.io/badge/django-3.2+-blue.svg
     :target: https://www.djangoproject.com/

README.rst

@@ -200,19 +200,35 @@ export default function FolderAdmin() {
 		const sourceFolderId = active.data.current.folderId;
 		let inodes = columnRefs[sourceFolderId].current?.inodes ?? [];
 		if (over) {
-			let [what, targetFolderId] = over.id.split(':');
-			targetFolderId = targetFolderId === 'parent' ? settings.parent_id : targetFolderId;
-			if (!draggedInodes.some(inode => [inode.id, inode.parent].includes(targetFolderId))) {
+			let [what, targetInodeId, targetFolderId] = over.id.split(':');
+			if (targetFolderId === undefined) {
+				targetFolderId = targetInodeId === 'parent' ? settings.parent_id : targetInodeId;
+			}
+			if (!draggedInodes.some(inode => [inode.id, inode.parent].includes(targetInodeId))) {
 				overlayRef.current.hidden = true;
-				if (what === 'download') {
-					downloadFiles(draggedInodes);
-					setTimeout(() => {
-						overlayRef.current.hidden = false;
-						setDraggedInodes([]);
-					}, 1000);
-					return;
+				let action: string;
+				switch (what) {
+					case 'download':
+						downloadFiles(draggedInodes);
+						setTimeout(() => {
+							overlayRef.current.hidden = false;
+							setDraggedInodes([]);
+						}, 1000);
+						return;
+					case 'folder': case 'column': case 'tab':
+						action = 'move';
+						break;
+					case 'discard':
+						action = 'delete';
+						break;
+					case 'reorder':
+						action = 'reorder';
+						break;
+					default:
+						console.error(`Unknown drop target: ${what}`);
+						return;
 				}
-				let fetchUrl = `${settings.base_url}${settings.folder_id}/${what === 'discard' ? 'delete' : 'move'}`;
+				let fetchUrl = `${settings.base_url}${settings.folder_id}/${action}`;
 				const response = await fetch(fetchUrl, {
 					method: 'POST',
 					headers: {
@@ -221,20 +237,24 @@ export default function FolderAdmin() {
 					},
 					body: JSON.stringify({
 						inode_ids: draggedInodes.map(inode => inode.id),
-						target_folder: targetFolderId,
+						target_id: targetInodeId,
 					}),
 				});
 				if (response.ok) {
 					const body = await response.json();
 					if (body.inodes && columnRefs[targetFolderId]?.current) {
-						const inodes = body.inodes.map(inode => ({...inode, elementRef: createRef()}));
-						columnRefs[targetFolderId].current.setInodes(inodes);
+						const targetInodes = body.inodes.map(inode => ({...inode, elementRef: createRef()}));
+						columnRefs[targetFolderId].current.setInodes(targetInodes);
+						if (sourceFolderId === targetFolderId) {
+							inodes = targetInodes;
+						}
 					}
 					if (body.favorite_folders) {
 						folderTabsRef.current.setFavoriteFolders(body.favorite_folders);
 					}
-					inodes = inodes.filter(inode => !inode.dragged);
-					columnRefs[sourceFolderId].current.setInodes(inodes);
+					if (sourceFolderId !== targetFolderId) {
+						inodes = inodes.filter(inode => !inode.dragged);
+					}
 				} else if (response.status === 409) {
 					alert(await response.text());
 				} else {

client/admin/FolderAdmin.tsx

@@ -1,14 +1,20 @@
 import React, {lazy, Suspense, useContext, useEffect, useMemo, useState} from 'react';
 import {useDraggable, useDroppable} from '@dnd-kit/core';
 import FinderSettings from './FinderSettings';
+import DroppableArea from './DroppableArea';
+import {useSearchParam} from './SearchField';
+import {useSorting} from '../common/SortingOptions';
+import {useFilter} from '../common/FilterByLabel';
 import FigureLabels from '../common/FigureLabels';
+import {Tooltip, TooltipContent, TooltipTrigger} from "../common/Tooltip";
 
 
 const dateTimeFormatter = new Intl.DateTimeFormat(
 	navigator.language,
 	{timeStyle: 'short', dateStyle: 'short'} as Intl.DateTimeFormatOptions,
 );
 
+
 export function DraggableItem(props) {
 	const {
 		attributes,
@@ -20,6 +26,24 @@ export function DraggableItem(props) {
 		disabled: props.disabled,
 	});
 	const [event, setEvent] = useState<PointerEvent>(null);
+	const [sorting] = useSorting();
+	const [filter] = useFilter();
+	const [searchQuery] = useSearchParam('q');
+	const ReOrdering = useMemo(() => {
+		return (props) => {
+			if (searchQuery || sorting || filter.some(v => v))
+				return <div className="reordering"></div>;
+			return (
+				<DroppableArea
+					id={`reorder:${props.id}:${props.folderId}`}
+					dragging={props.dragging}
+					className="reordering"
+				>
+					<div></div>
+				</DroppableArea>
+			);
+		};
+	}, []);
 
 	useEffect(() => {
 		if (!event)
@@ -73,6 +97,7 @@ export function DraggableItem(props) {
 				<div ref={setNodeRef} {...listeners} {...attributes}>
 					{props.children}
 				</div>
+				<ReOrdering {...props}></ReOrdering>
 			</li>
 		);
 }
@@ -164,7 +189,7 @@ export function ListItem(props) {
 	}
 
 	switch (props.layout) {
-		case 'tiles': case 'mosaic':
+		case 'tiles':
 			return (
 				<figure className="figure">
 					<FigBody {...props}>
@@ -179,6 +204,21 @@ export function ListItem(props) {
 					</figcaption>
 				</figure>
 			);
+		case 'mosaic':
+			return (
+				<Tooltip>
+					<TooltipTrigger>
+						<div className="figure">
+							<FigBody {...props}>
+								<FigureLabels labels={props.labels}>
+									<img src={props.thumbnail_url} {...props.listeners} {...props.attributes} />
+								</FigureLabels>
+							</FigBody>
+						</div>
+					</TooltipTrigger>
+					<TooltipContent>{props.name}</TooltipContent>
+				</Tooltip>
+			);
 		case 'list':
 			return (<>
 				<div className="figure">