@strapi/upload 5.52.2 → 5.53.0

package/dist/admin/future/pages/Assets/hooks/useListScrollRestoration.js

@@ -0,0 +1,111 @@
+'use strict';
+
+var React = require('react');
+
+/**
+ * The admin layout marks the element that scrolls the main column (see
+ * `Layouts.Root`). The media library has no scroll container of its own, so the
+ * offset to save and restore belongs to that ancestor.
+ */ const SCROLL_ROOT_SELECTOR = '[data-strapi-main-content]';
+/**
+ * How long a restore keeps retrying after the list key changes.
+ *
+ * A returning list usually comes back from memory in one commit, so the first
+ * attempt lands. When it doesn't — pages still loading, so the content isn't yet
+ * tall enough to scroll that far — later commits retry. Past this window the
+ * offset is dropped rather than yanked out from under someone already reading.
+ */ const RESTORE_WINDOW_MS = 2000;
+/**
+ * How many list offsets to keep. Matches `MAX_REMEMBERED_LISTS` in
+ * `useInfiniteAssets`: the two are keyed identically, so they should forget on
+ * the same terms.
+ */ const MAX_REMEMBERED_OFFSETS = 10;
+/**
+ * Remembers where each list was scrolled to and puts it back on return.
+ *
+ * `key` fingerprints the list on screen (folder, search, sort, filters). While
+ * it holds steady the current offset is recorded; when it changes the incoming
+ * key's saved offset is restored, or the list is sent to the top if it has none
+ * — a first visit, or one whose entry has been dropped.
+ *
+ * Returns a callback ref to place on any element inside the scrolling column;
+ * it only locates that column, it is never scrolled itself.
+ *
+ * Restoring a *position* only helps if the rows that filled it come back too —
+ * that is `useInfiniteAssets`' job.
+ */ const useListScrollRestoration = (key)=>{
+    const offsetsRef = React.useRef(new Map());
+    const containerRef = React.useRef(null);
+    const detachRef = React.useRef(null);
+    // The key offsets are currently filed under. In a ref because the scroll
+    // listener is attached once and must read the current value.
+    const keyRef = React.useRef(key);
+    const pendingRef = React.useRef(null);
+    const anchorRef = React.useCallback((node)=>{
+        detachRef.current?.();
+        detachRef.current = null;
+        containerRef.current = null;
+        const container = node?.closest(SCROLL_ROOT_SELECTOR);
+        if (!container) {
+            return;
+        }
+        const handleScroll = ()=>{
+            const offsets = offsetsRef.current;
+            // Delete before set so the entry moves to the end. Map iterates in
+            // insertion order, so the first key is the least recently scrolled.
+            offsets.delete(keyRef.current);
+            offsets.set(keyRef.current, container.scrollTop);
+            while(offsets.size > MAX_REMEMBERED_OFFSETS){
+                const oldest = offsets.keys().next().value;
+                if (oldest === undefined) {
+                    break;
+                }
+                offsets.delete(oldest);
+            }
+        };
+        container.addEventListener('scroll', handleScroll, {
+            passive: true
+        });
+        containerRef.current = container;
+        detachRef.current = ()=>container.removeEventListener('scroll', handleScroll);
+    }, []);
+    React.useEffect(()=>()=>detachRef.current?.(), []);
+    // Runs on every commit, not just when `key` changes: a restore the first
+    // commit was too short to satisfy must be retried as the rows arrive, and
+    // there is no state to key that off. Layout phase so the list is never
+    // painted at the wrong offset.
+    React.useLayoutEffect(()=>{
+        const container = containerRef.current;
+        if (!container) {
+            return;
+        }
+        if (keyRef.current !== key) {
+            keyRef.current = key;
+            pendingRef.current = {
+                top: offsetsRef.current.get(key) ?? 0,
+                deadline: Date.now() + RESTORE_WINDOW_MS
+            };
+        }
+        const pending = pendingRef.current;
+        if (!pending) {
+            return;
+        }
+        // Before the assignment, not alongside it: past the window the offset has to
+        // be dropped rather than applied one final time to a list the user has since
+        // scrolled themselves.
+        if (Date.now() > pending.deadline) {
+            pendingRef.current = null;
+            return;
+        }
+        container.scrollTop = pending.top;
+        // The browser clamps to the content that exists now, so a target the list
+        // isn't tall enough for yet stays pending for the next commit.
+        if (container.scrollTop >= pending.top) {
+            pendingRef.current = null;
+        }
+    });
+    return anchorRef;
+};
+
+exports.useListScrollRestoration = useListScrollRestoration;
+//# sourceMappingURL=useListScrollRestoration.js.map

package/dist/admin/future/pages/Assets/hooks/useListScrollRestoration.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"useListScrollRestoration.js","sources":["../../../../../../admin/src/future/pages/Assets/hooks/useListScrollRestoration.ts"],"sourcesContent":["import { useCallback, useEffect, useLayoutEffect, useRef } from 'react';\n\n/**\n * The admin layout marks the element that scrolls the main column (see\n * `Layouts.Root`). The media library has no scroll container of its own, so the\n * offset to save and restore belongs to that ancestor.\n */\nconst SCROLL_ROOT_SELECTOR = '[data-strapi-main-content]';\n\n/**\n * How long a restore keeps retrying after the list key changes.\n *\n * A returning list usually comes back from memory in one commit, so the first\n * attempt lands. When it doesn't — pages still loading, so the content isn't yet\n * tall enough to scroll that far — later commits retry. Past this window the\n * offset is dropped rather than yanked out from under someone already reading.\n */\nconst RESTORE_WINDOW_MS = 2000;\n\n/**\n * How many list offsets to keep. Matches `MAX_REMEMBERED_LISTS` in\n * `useInfiniteAssets`: the two are keyed identically, so they should forget on\n * the same terms.\n */\nconst MAX_REMEMBERED_OFFSETS = 10;\n\ninterface PendingRestore {\n  top: number;\n  deadline: number;\n}\n\n/**\n * Remembers where each list was scrolled to and puts it back on return.\n *\n * `key` fingerprints the list on screen (folder, search, sort, filters). While\n * it holds steady the current offset is recorded; when it changes the incoming\n * key's saved offset is restored, or the list is sent to the top if it has none\n * — a first visit, or one whose entry has been dropped.\n *\n * Returns a callback ref to place on any element inside the scrolling column;\n * it only locates that column, it is never scrolled itself.\n *\n * Restoring a *position* only helps if the rows that filled it come back too —\n * that is `useInfiniteAssets`' job.\n */\nexport const useListScrollRestoration = (key: string) => {\n  const offsetsRef = useRef(new Map<string, number>());\n  const containerRef = useRef<HTMLElement | null>(null);\n  const detachRef = useRef<(() => void) | null>(null);\n  // The key offsets are currently filed under. In a ref because the scroll\n  // listener is attached once and must read the current value.\n  const keyRef = useRef(key);\n  const pendingRef = useRef<PendingRestore | null>(null);\n\n  const anchorRef = useCallback((node: HTMLElement | null) => {\n    detachRef.current?.();\n    detachRef.current = null;\n    containerRef.current = null;\n\n    const container = node?.closest<HTMLElement>(SCROLL_ROOT_SELECTOR);\n\n    if (!container) {\n      return;\n    }\n\n    const handleScroll = () => {\n      const offsets = offsetsRef.current;\n\n      // Delete before set so the entry moves to the end. Map iterates in\n      // insertion order, so the first key is the least recently scrolled.\n      offsets.delete(keyRef.current);\n      offsets.set(keyRef.current, container.scrollTop);\n\n      while (offsets.size > MAX_REMEMBERED_OFFSETS) {\n        const oldest = offsets.keys().next().value;\n\n        if (oldest === undefined) {\n          break;\n        }\n\n        offsets.delete(oldest);\n      }\n    };\n\n    container.addEventListener('scroll', handleScroll, { passive: true });\n    containerRef.current = container;\n    detachRef.current = () => container.removeEventListener('scroll', handleScroll);\n  }, []);\n\n  useEffect(() => () => detachRef.current?.(), []);\n\n  // Runs on every commit, not just when `key` changes: a restore the first\n  // commit was too short to satisfy must be retried as the rows arrive, and\n  // there is no state to key that off. Layout phase so the list is never\n  // painted at the wrong offset.\n  useLayoutEffect(() => {\n    const container = containerRef.current;\n\n    if (!container) {\n      return;\n    }\n\n    if (keyRef.current !== key) {\n      keyRef.current = key;\n      pendingRef.current = {\n        top: offsetsRef.current.get(key) ?? 0,\n        deadline: Date.now() + RESTORE_WINDOW_MS,\n      };\n    }\n\n    const pending = pendingRef.current;\n\n    if (!pending) {\n      return;\n    }\n\n    // Before the assignment, not alongside it: past the window the offset has to\n    // be dropped rather than applied one final time to a list the user has since\n    // scrolled themselves.\n    if (Date.now() > pending.deadline) {\n      pendingRef.current = null;\n      return;\n    }\n\n    container.scrollTop = pending.top;\n\n    // The browser clamps to the content that exists now, so a target the list\n    // isn't tall enough for yet stays pending for the next commit.\n    if (container.scrollTop >= pending.top) {\n      pendingRef.current = null;\n    }\n  });\n\n  return anchorRef;\n};\n"],"names":["SCROLL_ROOT_SELECTOR","RESTORE_WINDOW_MS","MAX_REMEMBERED_OFFSETS","useListScrollRestoration","key","offsetsRef","useRef","Map","containerRef","detachRef","keyRef","pendingRef","anchorRef","useCallback","node","current","container","closest","handleScroll","offsets","delete","set","scrollTop","size","oldest","keys","next","value","undefined","addEventListener","passive","removeEventListener","useEffect","useLayoutEffect","top","get","deadline","Date","now","pending"],"mappings":"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"}

package/dist/admin/future/pages/Assets/hooks/useListScrollRestoration.mjs

@@ -0,0 +1,109 @@
+import { useRef, useCallback, useEffect, useLayoutEffect } from 'react';
+
+/**
+ * The admin layout marks the element that scrolls the main column (see
+ * `Layouts.Root`). The media library has no scroll container of its own, so the
+ * offset to save and restore belongs to that ancestor.
+ */ const SCROLL_ROOT_SELECTOR = '[data-strapi-main-content]';
+/**
+ * How long a restore keeps retrying after the list key changes.
+ *
+ * A returning list usually comes back from memory in one commit, so the first
+ * attempt lands. When it doesn't — pages still loading, so the content isn't yet
+ * tall enough to scroll that far — later commits retry. Past this window the
+ * offset is dropped rather than yanked out from under someone already reading.
+ */ const RESTORE_WINDOW_MS = 2000;
+/**
+ * How many list offsets to keep. Matches `MAX_REMEMBERED_LISTS` in
+ * `useInfiniteAssets`: the two are keyed identically, so they should forget on
+ * the same terms.
+ */ const MAX_REMEMBERED_OFFSETS = 10;
+/**
+ * Remembers where each list was scrolled to and puts it back on return.
+ *
+ * `key` fingerprints the list on screen (folder, search, sort, filters). While
+ * it holds steady the current offset is recorded; when it changes the incoming
+ * key's saved offset is restored, or the list is sent to the top if it has none
+ * — a first visit, or one whose entry has been dropped.
+ *
+ * Returns a callback ref to place on any element inside the scrolling column;
+ * it only locates that column, it is never scrolled itself.
+ *
+ * Restoring a *position* only helps if the rows that filled it come back too —
+ * that is `useInfiniteAssets`' job.
+ */ const useListScrollRestoration = (key)=>{
+    const offsetsRef = useRef(new Map());
+    const containerRef = useRef(null);
+    const detachRef = useRef(null);
+    // The key offsets are currently filed under. In a ref because the scroll
+    // listener is attached once and must read the current value.
+    const keyRef = useRef(key);
+    const pendingRef = useRef(null);
+    const anchorRef = useCallback((node)=>{
+        detachRef.current?.();
+        detachRef.current = null;
+        containerRef.current = null;
+        const container = node?.closest(SCROLL_ROOT_SELECTOR);
+        if (!container) {
+            return;
+        }
+        const handleScroll = ()=>{
+            const offsets = offsetsRef.current;
+            // Delete before set so the entry moves to the end. Map iterates in
+            // insertion order, so the first key is the least recently scrolled.
+            offsets.delete(keyRef.current);
+            offsets.set(keyRef.current, container.scrollTop);
+            while(offsets.size > MAX_REMEMBERED_OFFSETS){
+                const oldest = offsets.keys().next().value;
+                if (oldest === undefined) {
+                    break;
+                }
+                offsets.delete(oldest);
+            }
+        };
+        container.addEventListener('scroll', handleScroll, {
+            passive: true
+        });
+        containerRef.current = container;
+        detachRef.current = ()=>container.removeEventListener('scroll', handleScroll);
+    }, []);
+    useEffect(()=>()=>detachRef.current?.(), []);
+    // Runs on every commit, not just when `key` changes: a restore the first
+    // commit was too short to satisfy must be retried as the rows arrive, and
+    // there is no state to key that off. Layout phase so the list is never
+    // painted at the wrong offset.
+    useLayoutEffect(()=>{
+        const container = containerRef.current;
+        if (!container) {
+            return;
+        }
+        if (keyRef.current !== key) {
+            keyRef.current = key;
+            pendingRef.current = {
+                top: offsetsRef.current.get(key) ?? 0,
+                deadline: Date.now() + RESTORE_WINDOW_MS
+            };
+        }
+        const pending = pendingRef.current;
+        if (!pending) {
+            return;
+        }
+        // Before the assignment, not alongside it: past the window the offset has to
+        // be dropped rather than applied one final time to a list the user has since
+        // scrolled themselves.
+        if (Date.now() > pending.deadline) {
+            pendingRef.current = null;
+            return;
+        }
+        container.scrollTop = pending.top;
+        // The browser clamps to the content that exists now, so a target the list
+        // isn't tall enough for yet stays pending for the next commit.
+        if (container.scrollTop >= pending.top) {
+            pendingRef.current = null;
+        }
+    });
+    return anchorRef;
+};
+
+export { useListScrollRestoration };
+//# sourceMappingURL=useListScrollRestoration.mjs.map

package/dist/admin/future/pages/Assets/hooks/useListScrollRestoration.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"useListScrollRestoration.mjs","sources":["../../../../../../admin/src/future/pages/Assets/hooks/useListScrollRestoration.ts"],"sourcesContent":["import { useCallback, useEffect, useLayoutEffect, useRef } from 'react';\n\n/**\n * The admin layout marks the element that scrolls the main column (see\n * `Layouts.Root`). The media library has no scroll container of its own, so the\n * offset to save and restore belongs to that ancestor.\n */\nconst SCROLL_ROOT_SELECTOR = '[data-strapi-main-content]';\n\n/**\n * How long a restore keeps retrying after the list key changes.\n *\n * A returning list usually comes back from memory in one commit, so the first\n * attempt lands. When it doesn't — pages still loading, so the content isn't yet\n * tall enough to scroll that far — later commits retry. Past this window the\n * offset is dropped rather than yanked out from under someone already reading.\n */\nconst RESTORE_WINDOW_MS = 2000;\n\n/**\n * How many list offsets to keep. Matches `MAX_REMEMBERED_LISTS` in\n * `useInfiniteAssets`: the two are keyed identically, so they should forget on\n * the same terms.\n */\nconst MAX_REMEMBERED_OFFSETS = 10;\n\ninterface PendingRestore {\n  top: number;\n  deadline: number;\n}\n\n/**\n * Remembers where each list was scrolled to and puts it back on return.\n *\n * `key` fingerprints the list on screen (folder, search, sort, filters). While\n * it holds steady the current offset is recorded; when it changes the incoming\n * key's saved offset is restored, or the list is sent to the top if it has none\n * — a first visit, or one whose entry has been dropped.\n *\n * Returns a callback ref to place on any element inside the scrolling column;\n * it only locates that column, it is never scrolled itself.\n *\n * Restoring a *position* only helps if the rows that filled it come back too —\n * that is `useInfiniteAssets`' job.\n */\nexport const useListScrollRestoration = (key: string) => {\n  const offsetsRef = useRef(new Map<string, number>());\n  const containerRef = useRef<HTMLElement | null>(null);\n  const detachRef = useRef<(() => void) | null>(null);\n  // The key offsets are currently filed under. In a ref because the scroll\n  // listener is attached once and must read the current value.\n  const keyRef = useRef(key);\n  const pendingRef = useRef<PendingRestore | null>(null);\n\n  const anchorRef = useCallback((node: HTMLElement | null) => {\n    detachRef.current?.();\n    detachRef.current = null;\n    containerRef.current = null;\n\n    const container = node?.closest<HTMLElement>(SCROLL_ROOT_SELECTOR);\n\n    if (!container) {\n      return;\n    }\n\n    const handleScroll = () => {\n      const offsets = offsetsRef.current;\n\n      // Delete before set so the entry moves to the end. Map iterates in\n      // insertion order, so the first key is the least recently scrolled.\n      offsets.delete(keyRef.current);\n      offsets.set(keyRef.current, container.scrollTop);\n\n      while (offsets.size > MAX_REMEMBERED_OFFSETS) {\n        const oldest = offsets.keys().next().value;\n\n        if (oldest === undefined) {\n          break;\n        }\n\n        offsets.delete(oldest);\n      }\n    };\n\n    container.addEventListener('scroll', handleScroll, { passive: true });\n    containerRef.current = container;\n    detachRef.current = () => container.removeEventListener('scroll', handleScroll);\n  }, []);\n\n  useEffect(() => () => detachRef.current?.(), []);\n\n  // Runs on every commit, not just when `key` changes: a restore the first\n  // commit was too short to satisfy must be retried as the rows arrive, and\n  // there is no state to key that off. Layout phase so the list is never\n  // painted at the wrong offset.\n  useLayoutEffect(() => {\n    const container = containerRef.current;\n\n    if (!container) {\n      return;\n    }\n\n    if (keyRef.current !== key) {\n      keyRef.current = key;\n      pendingRef.current = {\n        top: offsetsRef.current.get(key) ?? 0,\n        deadline: Date.now() + RESTORE_WINDOW_MS,\n      };\n    }\n\n    const pending = pendingRef.current;\n\n    if (!pending) {\n      return;\n    }\n\n    // Before the assignment, not alongside it: past the window the offset has to\n    // be dropped rather than applied one final time to a list the user has since\n    // scrolled themselves.\n    if (Date.now() > pending.deadline) {\n      pendingRef.current = null;\n      return;\n    }\n\n    container.scrollTop = pending.top;\n\n    // The browser clamps to the content that exists now, so a target the list\n    // isn't tall enough for yet stays pending for the next commit.\n    if (container.scrollTop >= pending.top) {\n      pendingRef.current = null;\n    }\n  });\n\n  return anchorRef;\n};\n"],"names":["SCROLL_ROOT_SELECTOR","RESTORE_WINDOW_MS","MAX_REMEMBERED_OFFSETS","useListScrollRestoration","key","offsetsRef","useRef","Map","containerRef","detachRef","keyRef","pendingRef","anchorRef","useCallback","node","current","container","closest","handleScroll","offsets","delete","set","scrollTop","size","oldest","keys","next","value","undefined","addEventListener","passive","removeEventListener","useEffect","useLayoutEffect","top","get","deadline","Date","now","pending"],"mappings":"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"}

package/dist/admin/future/pages/Assets/hooks/useListSort.js

@@ -74,13 +74,13 @@ const useListSort = ()=>{
         }
         const serialized = serializeSort(nextSortBy, nextDirection);
         if (nextSortBy === DEFAULT_SORT_BY && nextDirection === null) {
-            setQuery({
-                sort: ''
-            }, 'remove');
+            setQuery(strapiAdmin.withEncodedUserParams(query, {
+                sort: undefined
+            }));
         } else {
-            setQuery({
+            setQuery(strapiAdmin.withEncodedUserParams(query, {
                 sort: serialized
-            });
+            }));
         }
     };
     // Groups are mutually exclusive — picking in one clears the other.
@@ -88,13 +88,13 @@ const useListSort = ()=>{
     const setDirection = (key)=>writeSort(null, key);
     const setFoldersPosition = (position)=>{
         if (position === 'mixed') {
-            setQuery({
+            setQuery(strapiAdmin.withEncodedUserParams(query, {
                 folders: 'mixed'
-            });
+            }));
         } else {
-            setQuery({
-                folders: ''
-            }, 'remove');
+            setQuery(strapiAdmin.withEncodedUserParams(query, {
+                folders: undefined
+            }));
         }
     };
     const assetsSort = serializeSort(sortBy, direction);

package/dist/admin/future/pages/Assets/hooks/useListSort.js.map

@@ -1 +1 @@
-{"version":3,"file":"useListSort.js","sources":["../../../../../../admin/src/future/pages/Assets/hooks/useListSort.ts"],"sourcesContent":["import { useQueryParams } from '@strapi/admin/strapi-admin';\n\n/**\n * Sort state for the assets list, backed by URL query params so the current\n * ordering is shareable and survives Back/refresh:\n *\n * - `?sort=<rule>` — a single whitelisted rule. Omitted → default (most\n *   recent updates).\n * - `?folders=mixed` — folders interleaved with files. Omitted → folders on top.\n *\n * The date rules and the direction rules are mutually exclusive: exactly one\n * rule is active at a time (one checkmark total, like the design mock). Picking\n * an option in one group clears the other; clearing the active option falls\n * back to the default — an unsorted list is not a state the UI offers.\n */\n\nexport const SORT_BY_RULES = {\n  oldestUploads: 'createdAt:ASC',\n  mostRecentUpdates: 'updatedAt:DESC',\n} as const;\n\nexport const SORT_DIRECTION_RULES = {\n  nameAsc: 'name:ASC',\n  nameDesc: 'name:DESC',\n  sizeAsc: 'size:ASC',\n  sizeDesc: 'size:DESC',\n} as const;\n\nexport type SortByKey = keyof typeof SORT_BY_RULES;\nexport type SortDirectionKey = keyof typeof SORT_DIRECTION_RULES;\nexport type FoldersPosition = 'top' | 'mixed';\n\nconst DEFAULT_SORT_BY: SortByKey = 'mostRecentUpdates';\n\nconst SORT_BY_BY_RULE = Object.fromEntries(\n  Object.entries(SORT_BY_RULES).map(([key, rule]) => [rule, key])\n) as Record<string, SortByKey>;\n\nconst SORT_DIRECTION_BY_RULE = Object.fromEntries(\n  Object.entries(SORT_DIRECTION_RULES).map(([key, rule]) => [rule, key])\n) as Record<string, SortDirectionKey>;\n\ninterface ParsedSort {\n  sortBy: SortByKey | null;\n  direction: SortDirectionKey | null;\n  /** False when the state is the fallback default (no recognized rule in the URL). */\n  isExplicit: boolean;\n}\n\n/** Parses `?sort=` — the first recognized rule wins, unknown rules are dropped. */\nconst parseSortParam = (raw: string | undefined): ParsedSort => {\n  for (const rule of (raw ?? '').split(',')) {\n    if (rule in SORT_BY_BY_RULE) {\n      return { sortBy: SORT_BY_BY_RULE[rule], direction: null, isExplicit: true };\n    }\n    if (rule in SORT_DIRECTION_BY_RULE) {\n      return { sortBy: null, direction: SORT_DIRECTION_BY_RULE[rule], isExplicit: true };\n    }\n  }\n\n  return { sortBy: DEFAULT_SORT_BY, direction: null, isExplicit: false };\n};\n\nconst serializeSort = (sortBy: SortByKey | null, direction: SortDirectionKey | null): string => {\n  const rules: (string | null)[] = [\n    sortBy && SORT_BY_RULES[sortBy],\n    direction && SORT_DIRECTION_RULES[direction],\n  ];\n\n  return rules.filter((rule): rule is string => Boolean(rule)).join(',');\n};\n\nexport interface ListSort {\n  sortBy: SortByKey | null;\n  direction: SortDirectionKey | null;\n  foldersPosition: FoldersPosition;\n  /**\n   * The active rule for the files query, e.g. `updatedAt:DESC` — always a\n   * single rule since the sort groups are mutually exclusive.\n   */\n  assetsSort: string;\n  /**\n   * Rule applicable to the folders query. In the default state (no sort in the\n   * URL) folders keep their alphabetical order so the band matches the sidebar\n   * tree; an explicit user sort applies, except size rules (folders have no\n   * `size` column), which fall back to alphabetical.\n   */\n  foldersSort: string;\n  setSortBy: (key: SortByKey | null) => void;\n  setDirection: (key: SortDirectionKey | null) => void;\n  setFoldersPosition: (position: FoldersPosition) => void;\n}\n\nexport const useListSort = (): ListSort => {\n  const [{ query }, setQuery] = useQueryParams<{ sort?: string; folders?: string }>();\n\n  const { sortBy, direction, isExplicit } = parseSortParam(query?.sort);\n  const foldersPosition: FoldersPosition = query?.folders === 'mixed' ? 'mixed' : 'top';\n\n  const writeSort = (nextSortBy: SortByKey | null, nextDirection: SortDirectionKey | null) => {\n    // Exactly one active rule: clearing the active one falls back to default.\n    if (nextSortBy === null && nextDirection === null) {\n      nextSortBy = DEFAULT_SORT_BY;\n    }\n\n    const serialized = serializeSort(nextSortBy, nextDirection);\n\n    if (nextSortBy === DEFAULT_SORT_BY && nextDirection === null) {\n      setQuery({ sort: '' }, 'remove');\n    } else {\n      setQuery({ sort: serialized });\n    }\n  };\n\n  // Groups are mutually exclusive — picking in one clears the other.\n  const setSortBy = (key: SortByKey | null) => writeSort(key, null);\n  const setDirection = (key: SortDirectionKey | null) => writeSort(null, key);\n\n  const setFoldersPosition = (position: FoldersPosition) => {\n    if (position === 'mixed') {\n      setQuery({ folders: 'mixed' });\n    } else {\n      setQuery({ folders: '' }, 'remove');\n    }\n  };\n\n  const assetsSort = serializeSort(sortBy, direction);\n  const folderRuleCandidates: (string | null)[] = [\n    sortBy && SORT_BY_RULES[sortBy],\n    direction && !direction.startsWith('size') ? SORT_DIRECTION_RULES[direction] : null,\n  ];\n  const folderRules = folderRuleCandidates.filter((rule): rule is string => Boolean(rule));\n  // Default state keeps folders alphabetical (matches the sidebar tree) — only\n  // an explicit user sort reorders the folders band.\n  const foldersSort = isExplicit && folderRules.length > 0 ? folderRules.join(',') : 'name:ASC';\n\n  return {\n    sortBy,\n    direction,\n    foldersPosition,\n    assetsSort,\n    foldersSort,\n    setSortBy,\n    setDirection,\n    setFoldersPosition,\n  };\n};\n"],"names":["SORT_BY_RULES","oldestUploads","mostRecentUpdates","SORT_DIRECTION_RULES","nameAsc","nameDesc","sizeAsc","sizeDesc","DEFAULT_SORT_BY","SORT_BY_BY_RULE","Object","fromEntries","entries","map","key","rule","SORT_DIRECTION_BY_RULE","parseSortParam","raw","split","sortBy","direction","isExplicit","serializeSort","rules","filter","Boolean","join","useListSort","query","setQuery","useQueryParams","sort","foldersPosition","folders","writeSort","nextSortBy","nextDirection","serialized","setSortBy","setDirection","setFoldersPosition","position","assetsSort","folderRuleCandidates","startsWith","folderRules","foldersSort","length"],"mappings":"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"}
+{"version":3,"file":"useListSort.js","sources":["../../../../../../admin/src/future/pages/Assets/hooks/useListSort.ts"],"sourcesContent":["import { useQueryParams, withEncodedUserParams } from '@strapi/admin/strapi-admin';\n\n/**\n * Sort state for the assets list, backed by URL query params so the current\n * ordering is shareable and survives Back/refresh:\n *\n * - `?sort=<rule>` — a single whitelisted rule. Omitted → default (most\n *   recent updates).\n * - `?folders=mixed` — folders interleaved with files. Omitted → folders on top.\n *\n * The date rules and the direction rules are mutually exclusive: exactly one\n * rule is active at a time (one checkmark total, like the design mock). Picking\n * an option in one group clears the other; clearing the active option falls\n * back to the default — an unsorted list is not a state the UI offers.\n */\n\nexport const SORT_BY_RULES = {\n  oldestUploads: 'createdAt:ASC',\n  mostRecentUpdates: 'updatedAt:DESC',\n} as const;\n\nexport const SORT_DIRECTION_RULES = {\n  nameAsc: 'name:ASC',\n  nameDesc: 'name:DESC',\n  sizeAsc: 'size:ASC',\n  sizeDesc: 'size:DESC',\n} as const;\n\nexport type SortByKey = keyof typeof SORT_BY_RULES;\nexport type SortDirectionKey = keyof typeof SORT_DIRECTION_RULES;\nexport type FoldersPosition = 'top' | 'mixed';\n\nconst DEFAULT_SORT_BY: SortByKey = 'mostRecentUpdates';\n\nconst SORT_BY_BY_RULE = Object.fromEntries(\n  Object.entries(SORT_BY_RULES).map(([key, rule]) => [rule, key])\n) as Record<string, SortByKey>;\n\nconst SORT_DIRECTION_BY_RULE = Object.fromEntries(\n  Object.entries(SORT_DIRECTION_RULES).map(([key, rule]) => [rule, key])\n) as Record<string, SortDirectionKey>;\n\ninterface ParsedSort {\n  sortBy: SortByKey | null;\n  direction: SortDirectionKey | null;\n  /** False when the state is the fallback default (no recognized rule in the URL). */\n  isExplicit: boolean;\n}\n\n/** Parses `?sort=` — the first recognized rule wins, unknown rules are dropped. */\nconst parseSortParam = (raw: string | undefined): ParsedSort => {\n  for (const rule of (raw ?? '').split(',')) {\n    if (rule in SORT_BY_BY_RULE) {\n      return { sortBy: SORT_BY_BY_RULE[rule], direction: null, isExplicit: true };\n    }\n    if (rule in SORT_DIRECTION_BY_RULE) {\n      return { sortBy: null, direction: SORT_DIRECTION_BY_RULE[rule], isExplicit: true };\n    }\n  }\n\n  return { sortBy: DEFAULT_SORT_BY, direction: null, isExplicit: false };\n};\n\nconst serializeSort = (sortBy: SortByKey | null, direction: SortDirectionKey | null): string => {\n  const rules: (string | null)[] = [\n    sortBy && SORT_BY_RULES[sortBy],\n    direction && SORT_DIRECTION_RULES[direction],\n  ];\n\n  return rules.filter((rule): rule is string => Boolean(rule)).join(',');\n};\n\nexport interface ListSort {\n  sortBy: SortByKey | null;\n  direction: SortDirectionKey | null;\n  foldersPosition: FoldersPosition;\n  /**\n   * The active rule for the files query, e.g. `updatedAt:DESC` — always a\n   * single rule since the sort groups are mutually exclusive.\n   */\n  assetsSort: string;\n  /**\n   * Rule applicable to the folders query. In the default state (no sort in the\n   * URL) folders keep their alphabetical order so the band matches the sidebar\n   * tree; an explicit user sort applies, except size rules (folders have no\n   * `size` column), which fall back to alphabetical.\n   */\n  foldersSort: string;\n  setSortBy: (key: SortByKey | null) => void;\n  setDirection: (key: SortDirectionKey | null) => void;\n  setFoldersPosition: (position: FoldersPosition) => void;\n}\n\nexport const useListSort = (): ListSort => {\n  const [{ query }, setQuery] = useQueryParams<{\n    sort?: string;\n    folders?: string;\n    _q?: string;\n  }>();\n\n  const { sortBy, direction, isExplicit } = parseSortParam(query?.sort);\n  const foldersPosition: FoldersPosition = query?.folders === 'mixed' ? 'mixed' : 'top';\n\n  const writeSort = (nextSortBy: SortByKey | null, nextDirection: SortDirectionKey | null) => {\n    // Exactly one active rule: clearing the active one falls back to default.\n    if (nextSortBy === null && nextDirection === null) {\n      nextSortBy = DEFAULT_SORT_BY;\n    }\n\n    const serialized = serializeSort(nextSortBy, nextDirection);\n\n    if (nextSortBy === DEFAULT_SORT_BY && nextDirection === null) {\n      setQuery(withEncodedUserParams(query, { sort: undefined }));\n    } else {\n      setQuery(withEncodedUserParams(query, { sort: serialized }));\n    }\n  };\n\n  // Groups are mutually exclusive — picking in one clears the other.\n  const setSortBy = (key: SortByKey | null) => writeSort(key, null);\n  const setDirection = (key: SortDirectionKey | null) => writeSort(null, key);\n\n  const setFoldersPosition = (position: FoldersPosition) => {\n    if (position === 'mixed') {\n      setQuery(withEncodedUserParams(query, { folders: 'mixed' }));\n    } else {\n      setQuery(withEncodedUserParams(query, { folders: undefined }));\n    }\n  };\n\n  const assetsSort = serializeSort(sortBy, direction);\n  const folderRuleCandidates: (string | null)[] = [\n    sortBy && SORT_BY_RULES[sortBy],\n    direction && !direction.startsWith('size') ? SORT_DIRECTION_RULES[direction] : null,\n  ];\n  const folderRules = folderRuleCandidates.filter((rule): rule is string => Boolean(rule));\n  // Default state keeps folders alphabetical (matches the sidebar tree) — only\n  // an explicit user sort reorders the folders band.\n  const foldersSort = isExplicit && folderRules.length > 0 ? folderRules.join(',') : 'name:ASC';\n\n  return {\n    sortBy,\n    direction,\n    foldersPosition,\n    assetsSort,\n    foldersSort,\n    setSortBy,\n    setDirection,\n    setFoldersPosition,\n  };\n};\n"],"names":["SORT_BY_RULES","oldestUploads","mostRecentUpdates","SORT_DIRECTION_RULES","nameAsc","nameDesc","sizeAsc","sizeDesc","DEFAULT_SORT_BY","SORT_BY_BY_RULE","Object","fromEntries","entries","map","key","rule","SORT_DIRECTION_BY_RULE","parseSortParam","raw","split","sortBy","direction","isExplicit","serializeSort","rules","filter","Boolean","join","useListSort","query","setQuery","useQueryParams","sort","foldersPosition","folders","writeSort","nextSortBy","nextDirection","serialized","withEncodedUserParams","undefined","setSortBy","setDirection","setFoldersPosition","position","assetsSort","folderRuleCandidates","startsWith","folderRules","foldersSort","length"],"mappings":"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"}

package/dist/admin/future/pages/Assets/hooks/useListSort.mjs

@@ -1,4 +1,4 @@
-import { useQueryParams } from '@strapi/admin/strapi-admin';
+import { useQueryParams, withEncodedUserParams } from '@strapi/admin/strapi-admin';
 
 /**
  * Sort state for the assets list, backed by URL query params so the current
@@ -72,13 +72,13 @@ const useListSort = ()=>{
         }
         const serialized = serializeSort(nextSortBy, nextDirection);
         if (nextSortBy === DEFAULT_SORT_BY && nextDirection === null) {
-            setQuery({
-                sort: ''
-            }, 'remove');
+            setQuery(withEncodedUserParams(query, {
+                sort: undefined
+            }));
         } else {
-            setQuery({
+            setQuery(withEncodedUserParams(query, {
                 sort: serialized
-            });
+            }));
         }
     };
     // Groups are mutually exclusive — picking in one clears the other.
@@ -86,13 +86,13 @@ const useListSort = ()=>{
     const setDirection = (key)=>writeSort(null, key);
     const setFoldersPosition = (position)=>{
         if (position === 'mixed') {
-            setQuery({
+            setQuery(withEncodedUserParams(query, {
                 folders: 'mixed'
-            });
+            }));
         } else {
-            setQuery({
-                folders: ''
-            }, 'remove');
+            setQuery(withEncodedUserParams(query, {
+                folders: undefined
+            }));
         }
     };
     const assetsSort = serializeSort(sortBy, direction);

package/dist/admin/future/pages/Assets/hooks/useListSort.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"useListSort.mjs","sources":["../../../../../../admin/src/future/pages/Assets/hooks/useListSort.ts"],"sourcesContent":["import { useQueryParams } from '@strapi/admin/strapi-admin';\n\n/**\n * Sort state for the assets list, backed by URL query params so the current\n * ordering is shareable and survives Back/refresh:\n *\n * - `?sort=<rule>` — a single whitelisted rule. Omitted → default (most\n *   recent updates).\n * - `?folders=mixed` — folders interleaved with files. Omitted → folders on top.\n *\n * The date rules and the direction rules are mutually exclusive: exactly one\n * rule is active at a time (one checkmark total, like the design mock). Picking\n * an option in one group clears the other; clearing the active option falls\n * back to the default — an unsorted list is not a state the UI offers.\n */\n\nexport const SORT_BY_RULES = {\n  oldestUploads: 'createdAt:ASC',\n  mostRecentUpdates: 'updatedAt:DESC',\n} as const;\n\nexport const SORT_DIRECTION_RULES = {\n  nameAsc: 'name:ASC',\n  nameDesc: 'name:DESC',\n  sizeAsc: 'size:ASC',\n  sizeDesc: 'size:DESC',\n} as const;\n\nexport type SortByKey = keyof typeof SORT_BY_RULES;\nexport type SortDirectionKey = keyof typeof SORT_DIRECTION_RULES;\nexport type FoldersPosition = 'top' | 'mixed';\n\nconst DEFAULT_SORT_BY: SortByKey = 'mostRecentUpdates';\n\nconst SORT_BY_BY_RULE = Object.fromEntries(\n  Object.entries(SORT_BY_RULES).map(([key, rule]) => [rule, key])\n) as Record<string, SortByKey>;\n\nconst SORT_DIRECTION_BY_RULE = Object.fromEntries(\n  Object.entries(SORT_DIRECTION_RULES).map(([key, rule]) => [rule, key])\n) as Record<string, SortDirectionKey>;\n\ninterface ParsedSort {\n  sortBy: SortByKey | null;\n  direction: SortDirectionKey | null;\n  /** False when the state is the fallback default (no recognized rule in the URL). */\n  isExplicit: boolean;\n}\n\n/** Parses `?sort=` — the first recognized rule wins, unknown rules are dropped. */\nconst parseSortParam = (raw: string | undefined): ParsedSort => {\n  for (const rule of (raw ?? '').split(',')) {\n    if (rule in SORT_BY_BY_RULE) {\n      return { sortBy: SORT_BY_BY_RULE[rule], direction: null, isExplicit: true };\n    }\n    if (rule in SORT_DIRECTION_BY_RULE) {\n      return { sortBy: null, direction: SORT_DIRECTION_BY_RULE[rule], isExplicit: true };\n    }\n  }\n\n  return { sortBy: DEFAULT_SORT_BY, direction: null, isExplicit: false };\n};\n\nconst serializeSort = (sortBy: SortByKey | null, direction: SortDirectionKey | null): string => {\n  const rules: (string | null)[] = [\n    sortBy && SORT_BY_RULES[sortBy],\n    direction && SORT_DIRECTION_RULES[direction],\n  ];\n\n  return rules.filter((rule): rule is string => Boolean(rule)).join(',');\n};\n\nexport interface ListSort {\n  sortBy: SortByKey | null;\n  direction: SortDirectionKey | null;\n  foldersPosition: FoldersPosition;\n  /**\n   * The active rule for the files query, e.g. `updatedAt:DESC` — always a\n   * single rule since the sort groups are mutually exclusive.\n   */\n  assetsSort: string;\n  /**\n   * Rule applicable to the folders query. In the default state (no sort in the\n   * URL) folders keep their alphabetical order so the band matches the sidebar\n   * tree; an explicit user sort applies, except size rules (folders have no\n   * `size` column), which fall back to alphabetical.\n   */\n  foldersSort: string;\n  setSortBy: (key: SortByKey | null) => void;\n  setDirection: (key: SortDirectionKey | null) => void;\n  setFoldersPosition: (position: FoldersPosition) => void;\n}\n\nexport const useListSort = (): ListSort => {\n  const [{ query }, setQuery] = useQueryParams<{ sort?: string; folders?: string }>();\n\n  const { sortBy, direction, isExplicit } = parseSortParam(query?.sort);\n  const foldersPosition: FoldersPosition = query?.folders === 'mixed' ? 'mixed' : 'top';\n\n  const writeSort = (nextSortBy: SortByKey | null, nextDirection: SortDirectionKey | null) => {\n    // Exactly one active rule: clearing the active one falls back to default.\n    if (nextSortBy === null && nextDirection === null) {\n      nextSortBy = DEFAULT_SORT_BY;\n    }\n\n    const serialized = serializeSort(nextSortBy, nextDirection);\n\n    if (nextSortBy === DEFAULT_SORT_BY && nextDirection === null) {\n      setQuery({ sort: '' }, 'remove');\n    } else {\n      setQuery({ sort: serialized });\n    }\n  };\n\n  // Groups are mutually exclusive — picking in one clears the other.\n  const setSortBy = (key: SortByKey | null) => writeSort(key, null);\n  const setDirection = (key: SortDirectionKey | null) => writeSort(null, key);\n\n  const setFoldersPosition = (position: FoldersPosition) => {\n    if (position === 'mixed') {\n      setQuery({ folders: 'mixed' });\n    } else {\n      setQuery({ folders: '' }, 'remove');\n    }\n  };\n\n  const assetsSort = serializeSort(sortBy, direction);\n  const folderRuleCandidates: (string | null)[] = [\n    sortBy && SORT_BY_RULES[sortBy],\n    direction && !direction.startsWith('size') ? SORT_DIRECTION_RULES[direction] : null,\n  ];\n  const folderRules = folderRuleCandidates.filter((rule): rule is string => Boolean(rule));\n  // Default state keeps folders alphabetical (matches the sidebar tree) — only\n  // an explicit user sort reorders the folders band.\n  const foldersSort = isExplicit && folderRules.length > 0 ? folderRules.join(',') : 'name:ASC';\n\n  return {\n    sortBy,\n    direction,\n    foldersPosition,\n    assetsSort,\n    foldersSort,\n    setSortBy,\n    setDirection,\n    setFoldersPosition,\n  };\n};\n"],"names":["SORT_BY_RULES","oldestUploads","mostRecentUpdates","SORT_DIRECTION_RULES","nameAsc","nameDesc","sizeAsc","sizeDesc","DEFAULT_SORT_BY","SORT_BY_BY_RULE","Object","fromEntries","entries","map","key","rule","SORT_DIRECTION_BY_RULE","parseSortParam","raw","split","sortBy","direction","isExplicit","serializeSort","rules","filter","Boolean","join","useListSort","query","setQuery","useQueryParams","sort","foldersPosition","folders","writeSort","nextSortBy","nextDirection","serialized","setSortBy","setDirection","setFoldersPosition","position","assetsSort","folderRuleCandidates","startsWith","folderRules","foldersSort","length"],"mappings":"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"}
+{"version":3,"file":"useListSort.mjs","sources":["../../../../../../admin/src/future/pages/Assets/hooks/useListSort.ts"],"sourcesContent":["import { useQueryParams, withEncodedUserParams } from '@strapi/admin/strapi-admin';\n\n/**\n * Sort state for the assets list, backed by URL query params so the current\n * ordering is shareable and survives Back/refresh:\n *\n * - `?sort=<rule>` — a single whitelisted rule. Omitted → default (most\n *   recent updates).\n * - `?folders=mixed` — folders interleaved with files. Omitted → folders on top.\n *\n * The date rules and the direction rules are mutually exclusive: exactly one\n * rule is active at a time (one checkmark total, like the design mock). Picking\n * an option in one group clears the other; clearing the active option falls\n * back to the default — an unsorted list is not a state the UI offers.\n */\n\nexport const SORT_BY_RULES = {\n  oldestUploads: 'createdAt:ASC',\n  mostRecentUpdates: 'updatedAt:DESC',\n} as const;\n\nexport const SORT_DIRECTION_RULES = {\n  nameAsc: 'name:ASC',\n  nameDesc: 'name:DESC',\n  sizeAsc: 'size:ASC',\n  sizeDesc: 'size:DESC',\n} as const;\n\nexport type SortByKey = keyof typeof SORT_BY_RULES;\nexport type SortDirectionKey = keyof typeof SORT_DIRECTION_RULES;\nexport type FoldersPosition = 'top' | 'mixed';\n\nconst DEFAULT_SORT_BY: SortByKey = 'mostRecentUpdates';\n\nconst SORT_BY_BY_RULE = Object.fromEntries(\n  Object.entries(SORT_BY_RULES).map(([key, rule]) => [rule, key])\n) as Record<string, SortByKey>;\n\nconst SORT_DIRECTION_BY_RULE = Object.fromEntries(\n  Object.entries(SORT_DIRECTION_RULES).map(([key, rule]) => [rule, key])\n) as Record<string, SortDirectionKey>;\n\ninterface ParsedSort {\n  sortBy: SortByKey | null;\n  direction: SortDirectionKey | null;\n  /** False when the state is the fallback default (no recognized rule in the URL). */\n  isExplicit: boolean;\n}\n\n/** Parses `?sort=` — the first recognized rule wins, unknown rules are dropped. */\nconst parseSortParam = (raw: string | undefined): ParsedSort => {\n  for (const rule of (raw ?? '').split(',')) {\n    if (rule in SORT_BY_BY_RULE) {\n      return { sortBy: SORT_BY_BY_RULE[rule], direction: null, isExplicit: true };\n    }\n    if (rule in SORT_DIRECTION_BY_RULE) {\n      return { sortBy: null, direction: SORT_DIRECTION_BY_RULE[rule], isExplicit: true };\n    }\n  }\n\n  return { sortBy: DEFAULT_SORT_BY, direction: null, isExplicit: false };\n};\n\nconst serializeSort = (sortBy: SortByKey | null, direction: SortDirectionKey | null): string => {\n  const rules: (string | null)[] = [\n    sortBy && SORT_BY_RULES[sortBy],\n    direction && SORT_DIRECTION_RULES[direction],\n  ];\n\n  return rules.filter((rule): rule is string => Boolean(rule)).join(',');\n};\n\nexport interface ListSort {\n  sortBy: SortByKey | null;\n  direction: SortDirectionKey | null;\n  foldersPosition: FoldersPosition;\n  /**\n   * The active rule for the files query, e.g. `updatedAt:DESC` — always a\n   * single rule since the sort groups are mutually exclusive.\n   */\n  assetsSort: string;\n  /**\n   * Rule applicable to the folders query. In the default state (no sort in the\n   * URL) folders keep their alphabetical order so the band matches the sidebar\n   * tree; an explicit user sort applies, except size rules (folders have no\n   * `size` column), which fall back to alphabetical.\n   */\n  foldersSort: string;\n  setSortBy: (key: SortByKey | null) => void;\n  setDirection: (key: SortDirectionKey | null) => void;\n  setFoldersPosition: (position: FoldersPosition) => void;\n}\n\nexport const useListSort = (): ListSort => {\n  const [{ query }, setQuery] = useQueryParams<{\n    sort?: string;\n    folders?: string;\n    _q?: string;\n  }>();\n\n  const { sortBy, direction, isExplicit } = parseSortParam(query?.sort);\n  const foldersPosition: FoldersPosition = query?.folders === 'mixed' ? 'mixed' : 'top';\n\n  const writeSort = (nextSortBy: SortByKey | null, nextDirection: SortDirectionKey | null) => {\n    // Exactly one active rule: clearing the active one falls back to default.\n    if (nextSortBy === null && nextDirection === null) {\n      nextSortBy = DEFAULT_SORT_BY;\n    }\n\n    const serialized = serializeSort(nextSortBy, nextDirection);\n\n    if (nextSortBy === DEFAULT_SORT_BY && nextDirection === null) {\n      setQuery(withEncodedUserParams(query, { sort: undefined }));\n    } else {\n      setQuery(withEncodedUserParams(query, { sort: serialized }));\n    }\n  };\n\n  // Groups are mutually exclusive — picking in one clears the other.\n  const setSortBy = (key: SortByKey | null) => writeSort(key, null);\n  const setDirection = (key: SortDirectionKey | null) => writeSort(null, key);\n\n  const setFoldersPosition = (position: FoldersPosition) => {\n    if (position === 'mixed') {\n      setQuery(withEncodedUserParams(query, { folders: 'mixed' }));\n    } else {\n      setQuery(withEncodedUserParams(query, { folders: undefined }));\n    }\n  };\n\n  const assetsSort = serializeSort(sortBy, direction);\n  const folderRuleCandidates: (string | null)[] = [\n    sortBy && SORT_BY_RULES[sortBy],\n    direction && !direction.startsWith('size') ? SORT_DIRECTION_RULES[direction] : null,\n  ];\n  const folderRules = folderRuleCandidates.filter((rule): rule is string => Boolean(rule));\n  // Default state keeps folders alphabetical (matches the sidebar tree) — only\n  // an explicit user sort reorders the folders band.\n  const foldersSort = isExplicit && folderRules.length > 0 ? folderRules.join(',') : 'name:ASC';\n\n  return {\n    sortBy,\n    direction,\n    foldersPosition,\n    assetsSort,\n    foldersSort,\n    setSortBy,\n    setDirection,\n    setFoldersPosition,\n  };\n};\n"],"names":["SORT_BY_RULES","oldestUploads","mostRecentUpdates","SORT_DIRECTION_RULES","nameAsc","nameDesc","sizeAsc","sizeDesc","DEFAULT_SORT_BY","SORT_BY_BY_RULE","Object","fromEntries","entries","map","key","rule","SORT_DIRECTION_BY_RULE","parseSortParam","raw","split","sortBy","direction","isExplicit","serializeSort","rules","filter","Boolean","join","useListSort","query","setQuery","useQueryParams","sort","foldersPosition","folders","writeSort","nextSortBy","nextDirection","serialized","withEncodedUserParams","undefined","setSortBy","setDirection","setFoldersPosition","position","assetsSort","folderRuleCandidates","startsWith","folderRules","foldersSort","length"],"mappings":"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"}

package/dist/admin/future/pages/Assets/utils/mergeUploadedAssets.js

@@ -0,0 +1,86 @@
+'use strict';
+
+/**
+ * Merges just-uploaded assets into the loaded asset list so each one appears as
+ * soon as its own upload finishes, rather than when the whole batch settles.
+ *
+ * The upload is one mutation per batch, so its cache invalidation fires once at
+ * the end. These helpers bridge that gap purely client-side: the completed
+ * uploads already sit in the progress store as full `File` objects, so they can
+ * be placed into the list at their sort position with no extra request.
+ *
+ * The server list stays authoritative — merging never reorders it, and an id it
+ * already contains wins over the local copy, so the end-of-batch refetch
+ * silently takes over.
+ */ const SORT_FIELDS = [
+    'createdAt',
+    'updatedAt',
+    'name',
+    'size'
+];
+const isSortField = (value)=>SORT_FIELDS.includes(value);
+const DEFAULT_RULE = 'updatedAt:DESC';
+const compareByField = (field, a, b)=>{
+    if (field === 'size') {
+        return (a.size ?? 0) - (b.size ?? 0);
+    }
+    if (field === 'name') {
+        return a.name.localeCompare(b.name);
+    }
+    // `createdAt` / `updatedAt` are ISO-8601, which sorts correctly as text.
+    return (a[field] ?? '').localeCompare(b[field] ?? '');
+};
+/**
+ * Comparator matching a `<field>:<ASC|DESC>` sort rule, as sent to the API.
+ *
+ * Ties break on id so the order is total: without it, two files sharing a
+ * timestamp could swap places between renders.
+ */ const getAssetComparator = (rule = DEFAULT_RULE)=>{
+    const [field, requestedDirection] = rule.split(':');
+    // An unrecognised field discards the direction too: half-applying a rule we
+    // cannot read would order the list differently from the default it stands in for.
+    const isKnownField = isSortField(field);
+    const sortField = isKnownField ? field : 'updatedAt';
+    const direction = isKnownField ? requestedDirection : 'DESC';
+    const sign = direction === 'ASC' ? 1 : -1;
+    return (a, b)=>{
+        const byField = compareByField(sortField, a, b);
+        return byField !== 0 ? sign * byField : sign * (a.id - b.id);
+    };
+};
+/**
+ * Places `uploaded` into `assets` at their sort position.
+ *
+ * An upload that sorts past everything loaded is dropped unless the list is
+ * fully loaded: it belongs on a page the user has not reached, and appending it
+ * would show it adjacent to the last loaded item instead of at its real place.
+ */ const mergeUploadedAssets = ({ assets, uploaded, sort, hasNextPage })=>{
+    if (uploaded.length === 0) {
+        return assets;
+    }
+    const loadedIds = new Set(assets.map((asset)=>asset.id));
+    const compare = getAssetComparator(sort);
+    const fresh = uploaded.filter((asset)=>!loadedIds.has(asset.id)).sort(compare);
+    if (fresh.length === 0) {
+        return assets;
+    }
+    const merged = [
+        ...assets
+    ];
+    for (const asset of fresh){
+        const at = merged.findIndex((loaded)=>compare(asset, loaded) < 0);
+        if (at === -1) {
+            if (hasNextPage) {
+                continue;
+            }
+            merged.push(asset);
+        } else {
+            merged.splice(at, 0, asset);
+        }
+    }
+    return merged;
+};
+
+exports.getAssetComparator = getAssetComparator;
+exports.mergeUploadedAssets = mergeUploadedAssets;
+//# sourceMappingURL=mergeUploadedAssets.js.map

package/dist/admin/future/pages/Assets/utils/mergeUploadedAssets.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mergeUploadedAssets.js","sources":["../../../../../../admin/src/future/pages/Assets/utils/mergeUploadedAssets.ts"],"sourcesContent":["/**\n * Merges just-uploaded assets into the loaded asset list so each one appears as\n * soon as its own upload finishes, rather than when the whole batch settles.\n *\n * The upload is one mutation per batch, so its cache invalidation fires once at\n * the end. These helpers bridge that gap purely client-side: the completed\n * uploads already sit in the progress store as full `File` objects, so they can\n * be placed into the list at their sort position with no extra request.\n *\n * The server list stays authoritative — merging never reorders it, and an id it\n * already contains wins over the local copy, so the end-of-batch refetch\n * silently takes over.\n */\n\nimport type { File } from '../../../../../../shared/contracts/files';\n\ntype SortField = 'createdAt' | 'updatedAt' | 'name' | 'size';\n\nconst SORT_FIELDS: SortField[] = ['createdAt', 'updatedAt', 'name', 'size'];\n\nconst isSortField = (value: string): value is SortField =>\n  (SORT_FIELDS as string[]).includes(value);\n\nconst DEFAULT_RULE = 'updatedAt:DESC';\n\nconst compareByField = (field: SortField, a: File, b: File): number => {\n  if (field === 'size') {\n    return (a.size ?? 0) - (b.size ?? 0);\n  }\n\n  if (field === 'name') {\n    return a.name.localeCompare(b.name);\n  }\n\n  // `createdAt` / `updatedAt` are ISO-8601, which sorts correctly as text.\n  return (a[field] ?? '').localeCompare(b[field] ?? '');\n};\n\n/**\n * Comparator matching a `<field>:<ASC|DESC>` sort rule, as sent to the API.\n *\n * Ties break on id so the order is total: without it, two files sharing a\n * timestamp could swap places between renders.\n */\nexport const getAssetComparator = (rule: string = DEFAULT_RULE) => {\n  const [field, requestedDirection] = rule.split(':');\n  // An unrecognised field discards the direction too: half-applying a rule we\n  // cannot read would order the list differently from the default it stands in for.\n  const isKnownField = isSortField(field);\n  const sortField: SortField = isKnownField ? field : 'updatedAt';\n  const direction = isKnownField ? requestedDirection : 'DESC';\n  const sign = direction === 'ASC' ? 1 : -1;\n\n  return (a: File, b: File): number => {\n    const byField = compareByField(sortField, a, b);\n\n    return byField !== 0 ? sign * byField : sign * (a.id - b.id);\n  };\n};\n\n/**\n * Places `uploaded` into `assets` at their sort position.\n *\n * An upload that sorts past everything loaded is dropped unless the list is\n * fully loaded: it belongs on a page the user has not reached, and appending it\n * would show it adjacent to the last loaded item instead of at its real place.\n */\nexport const mergeUploadedAssets = ({\n  assets,\n  uploaded,\n  sort,\n  hasNextPage,\n}: {\n  assets: File[];\n  uploaded: File[];\n  sort?: string;\n  /** Whether more pages remain, i.e. the tail of the list is not loaded. */\n  hasNextPage: boolean;\n}): File[] => {\n  if (uploaded.length === 0) {\n    return assets;\n  }\n\n  const loadedIds = new Set(assets.map((asset) => asset.id));\n  const compare = getAssetComparator(sort);\n  const fresh = uploaded.filter((asset) => !loadedIds.has(asset.id)).sort(compare);\n\n  if (fresh.length === 0) {\n    return assets;\n  }\n\n  const merged = [...assets];\n\n  for (const asset of fresh) {\n    const at = merged.findIndex((loaded) => compare(asset, loaded) < 0);\n\n    if (at === -1) {\n      if (hasNextPage) {\n        continue;\n      }\n      merged.push(asset);\n    } else {\n      merged.splice(at, 0, asset);\n    }\n  }\n\n  return merged;\n};\n"],"names":["SORT_FIELDS","isSortField","value","includes","DEFAULT_RULE","compareByField","field","a","b","size","name","localeCompare","getAssetComparator","rule","requestedDirection","split","isKnownField","sortField","direction","sign","byField","id","mergeUploadedAssets","assets","uploaded","sort","hasNextPage","length","loadedIds","Set","map","asset","compare","fresh","filter","has","merged","at","findIndex","loaded","push","splice"],"mappings":"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"}

package/dist/admin/future/pages/Assets/utils/mergeUploadedAssets.mjs

@@ -0,0 +1,83 @@
+/**
+ * Merges just-uploaded assets into the loaded asset list so each one appears as
+ * soon as its own upload finishes, rather than when the whole batch settles.
+ *
+ * The upload is one mutation per batch, so its cache invalidation fires once at
+ * the end. These helpers bridge that gap purely client-side: the completed
+ * uploads already sit in the progress store as full `File` objects, so they can
+ * be placed into the list at their sort position with no extra request.
+ *
+ * The server list stays authoritative — merging never reorders it, and an id it
+ * already contains wins over the local copy, so the end-of-batch refetch
+ * silently takes over.
+ */ const SORT_FIELDS = [
+    'createdAt',
+    'updatedAt',
+    'name',
+    'size'
+];
+const isSortField = (value)=>SORT_FIELDS.includes(value);
+const DEFAULT_RULE = 'updatedAt:DESC';
+const compareByField = (field, a, b)=>{
+    if (field === 'size') {
+        return (a.size ?? 0) - (b.size ?? 0);
+    }
+    if (field === 'name') {
+        return a.name.localeCompare(b.name);
+    }
+    // `createdAt` / `updatedAt` are ISO-8601, which sorts correctly as text.
+    return (a[field] ?? '').localeCompare(b[field] ?? '');
+};
+/**
+ * Comparator matching a `<field>:<ASC|DESC>` sort rule, as sent to the API.
+ *
+ * Ties break on id so the order is total: without it, two files sharing a
+ * timestamp could swap places between renders.
+ */ const getAssetComparator = (rule = DEFAULT_RULE)=>{
+    const [field, requestedDirection] = rule.split(':');
+    // An unrecognised field discards the direction too: half-applying a rule we
+    // cannot read would order the list differently from the default it stands in for.
+    const isKnownField = isSortField(field);
+    const sortField = isKnownField ? field : 'updatedAt';
+    const direction = isKnownField ? requestedDirection : 'DESC';
+    const sign = direction === 'ASC' ? 1 : -1;
+    return (a, b)=>{
+        const byField = compareByField(sortField, a, b);
+        return byField !== 0 ? sign * byField : sign * (a.id - b.id);
+    };
+};
+/**
+ * Places `uploaded` into `assets` at their sort position.
+ *
+ * An upload that sorts past everything loaded is dropped unless the list is
+ * fully loaded: it belongs on a page the user has not reached, and appending it
+ * would show it adjacent to the last loaded item instead of at its real place.
+ */ const mergeUploadedAssets = ({ assets, uploaded, sort, hasNextPage })=>{
+    if (uploaded.length === 0) {
+        return assets;
+    }
+    const loadedIds = new Set(assets.map((asset)=>asset.id));
+    const compare = getAssetComparator(sort);
+    const fresh = uploaded.filter((asset)=>!loadedIds.has(asset.id)).sort(compare);
+    if (fresh.length === 0) {
+        return assets;
+    }
+    const merged = [
+        ...assets
+    ];
+    for (const asset of fresh){
+        const at = merged.findIndex((loaded)=>compare(asset, loaded) < 0);
+        if (at === -1) {
+            if (hasNextPage) {
+                continue;
+            }
+            merged.push(asset);
+        } else {
+            merged.splice(at, 0, asset);
+        }
+    }
+    return merged;
+};
+
+export { getAssetComparator, mergeUploadedAssets };
+//# sourceMappingURL=mergeUploadedAssets.mjs.map