@strapi/upload 5.51.0 → 5.51.2

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

@@ -0,0 +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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"}

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

@@ -0,0 +1,201 @@
+'use strict';
+
+const MIME_BY_VALUE = {
+    picture: 'image',
+    audio: 'audio',
+    video: 'video'
+};
+const ALL_MIMES = Object.values(MIME_BY_VALUE);
+const PRESET_DELTAS = {
+    '1day': {
+        days: 1
+    },
+    '3days': {
+        days: 3
+    },
+    '1week': {
+        days: 7
+    },
+    '1month': {
+        months: 1
+    },
+    '3months': {
+        months: 3
+    },
+    '6months': {
+        months: 6
+    },
+    '1year': {
+        years: 1
+    }
+};
+const subtractPreset = (now, preset)=>{
+    const { days = 0, months = 0, years = 0 } = PRESET_DELTAS[preset];
+    const result = new Date(now.getTime());
+    if (years || months) {
+        // JS date setters overflow at month ends (Mar 31 − 1 month → Feb 31 → Mar 3),
+        // so move to the 1st first and clamp the day to the target month's length.
+        const dayOfMonth = result.getDate();
+        result.setDate(1);
+        result.setFullYear(result.getFullYear() - years);
+        result.setMonth(result.getMonth() - months);
+        const daysInTargetMonth = new Date(result.getFullYear(), result.getMonth() + 1, 0).getDate();
+        result.setDate(Math.min(dayOfMonth, daysInTargetMonth));
+    }
+    result.setDate(result.getDate() - days);
+    return result;
+};
+const startOfDay = (date)=>{
+    const result = new Date(date.getTime());
+    result.setHours(0, 0, 0, 0);
+    return result;
+};
+const endOfDay = (date)=>{
+    const result = new Date(date.getTime());
+    result.setHours(23, 59, 59, 999);
+    return result;
+};
+/**
+ * Parses `YYYY-MM-DD` as a local calendar date — NOT `new Date(value)`, which
+ * treats date-only strings as UTC midnight and shifts the day in every
+ * timezone west of UTC. Shared by the query builder, the badge labels and the
+ * range calendar so all three agree on which day a range endpoint means.
+ */ const parseCalendarDate = (value)=>{
+    const [year, month, day] = value.split('-').map(Number);
+    return new Date(year, month - 1, day);
+};
+const buildDateClause = (filter, now)=>{
+    const { field } = filter;
+    if (filter.mode === 'preset') {
+        const pivot = subtractPreset(now, filter.preset);
+        switch(filter.condition){
+            case 'withinLast':
+                return {
+                    [field]: {
+                        $gte: pivot.toISOString()
+                    }
+                };
+            case 'notWithinLast':
+                return {
+                    [field]: {
+                        $lt: pivot.toISOString()
+                    }
+                };
+            case 'isExactly':
+                return {
+                    [field]: {
+                        $gte: startOfDay(pivot).toISOString(),
+                        $lte: endOfDay(pivot).toISOString()
+                    }
+                };
+        }
+    }
+    const from = startOfDay(parseCalendarDate(filter.from)).toISOString();
+    const to = endOfDay(parseCalendarDate(filter.to)).toISOString();
+    if (filter.condition === 'is') {
+        return {
+            [field]: {
+                $gte: from,
+                $lte: to
+            }
+        };
+    }
+    return {
+        $or: [
+            {
+                [field]: {
+                    $lt: from
+                }
+            },
+            {
+                [field]: {
+                    $gt: to
+                }
+            }
+        ]
+    };
+};
+const buildMimeClause = (filter)=>{
+    const fileValues = filter.values.filter((value)=>value !== 'folder');
+    if (fileValues.length === 0) {
+        return null;
+    }
+    const branches = fileValues.map((value)=>{
+        if (value === 'document') {
+            // Catch-all: none of the known mime families.
+            return {
+                $and: ALL_MIMES.map((mime)=>({
+                        mime: {
+                            $notContains: mime
+                        }
+                    }))
+            };
+        }
+        return {
+            mime: {
+                $contains: MIME_BY_VALUE[value]
+            }
+        };
+    });
+    if (filter.condition === 'is') {
+        return branches.length === 1 ? branches[0] : {
+            $or: branches
+        };
+    }
+    // "is not" = matches none of the selected values: negate each branch, AND them.
+    const negated = fileValues.map((value)=>{
+        if (value === 'document') {
+            // Not a document = is one of the known families.
+            return {
+                $or: ALL_MIMES.map((mime)=>({
+                        mime: {
+                            $contains: mime
+                        }
+                    }))
+            };
+        }
+        return {
+            mime: {
+                $notContains: MIME_BY_VALUE[value]
+            }
+        };
+    });
+    return negated.length === 1 ? negated[0] : {
+        $and: negated
+    };
+};
+const buildAssetFilters = (filters, now)=>{
+    const fileClauses = [];
+    const folderClauses = [];
+    let showFolders = true;
+    let showFiles = true;
+    for (const filter of filters){
+        if (filter.kind === 'date') {
+            const clause = buildDateClause(filter, now);
+            fileClauses.push(clause);
+            folderClauses.push(clause);
+            continue;
+        }
+        const includesFolder = filter.values.includes('folder');
+        if (filter.condition === 'is' ? !includesFolder : includesFolder) {
+            showFolders = false;
+        }
+        const mimeClause = buildMimeClause(filter);
+        if (mimeClause) {
+            fileClauses.push(mimeClause);
+        } else if (filter.condition === 'is') {
+            // `is [folder]` only — no file can match the badge.
+            showFiles = false;
+        }
+    }
+    return {
+        fileClauses,
+        folderClauses,
+        showFolders,
+        showFiles
+    };
+};
+
+exports.buildAssetFilters = buildAssetFilters;
+exports.parseCalendarDate = parseCalendarDate;
+//# sourceMappingURL=buildAssetFilters.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"buildAssetFilters.js","sources":["../../../../../../admin/src/future/pages/Assets/utils/buildAssetFilters.ts"],"sourcesContent":["import {\n  type DateFilter,\n  type DatePreset,\n  type ListFilter,\n  type TypeFilter,\n  type TypeValue,\n} from '../hooks/useListFilters';\n\n/**\n * Translates the URL filter model into Strapi `filters[$and]` entries for the\n * files and folders queries, and decides the structural visibility of both\n * sections.\n *\n * Relative presets resolve against `now` at build time — the URL stays\n * relative (\"within the last week\"), only the outgoing query is absolute.\n *\n * Semantics:\n * - Every badge is one `$and` entry (badges combine with AND, per ticket).\n * - Type: `folder` is not a mime — it acts structurally on the folders\n *   section. The remaining values map to mime clauses; `document` is the\n *   legacy catch-all (mime contains none of image/audio/video — audio\n *   included in the exclusion, fixing the legacy quirk).\n * - Dates apply to files and folders alike (folders have both timestamps).\n * - \"is exactly <preset>\" means the calendar day of `now - delta`.\n * - Ranges are inclusive on both ends (start-of-day .. end-of-day).\n */\n\ntype QueryClause = Record<string, unknown>;\n\nconst MIME_BY_VALUE: Record<Exclude<TypeValue, 'folder' | 'document'>, string> = {\n  picture: 'image',\n  audio: 'audio',\n  video: 'video',\n};\n\nconst ALL_MIMES = Object.values(MIME_BY_VALUE);\n\nconst PRESET_DELTAS: Record<DatePreset, { days?: number; months?: number; years?: number }> = {\n  '1day': { days: 1 },\n  '3days': { days: 3 },\n  '1week': { days: 7 },\n  '1month': { months: 1 },\n  '3months': { months: 3 },\n  '6months': { months: 6 },\n  '1year': { years: 1 },\n};\n\nconst subtractPreset = (now: Date, preset: DatePreset): Date => {\n  const { days = 0, months = 0, years = 0 } = PRESET_DELTAS[preset];\n  const result = new Date(now.getTime());\n\n  if (years || months) {\n    // JS date setters overflow at month ends (Mar 31 − 1 month → Feb 31 → Mar 3),\n    // so move to the 1st first and clamp the day to the target month's length.\n    const dayOfMonth = result.getDate();\n    result.setDate(1);\n    result.setFullYear(result.getFullYear() - years);\n    result.setMonth(result.getMonth() - months);\n\n    const daysInTargetMonth = new Date(result.getFullYear(), result.getMonth() + 1, 0).getDate();\n    result.setDate(Math.min(dayOfMonth, daysInTargetMonth));\n  }\n\n  result.setDate(result.getDate() - days);\n\n  return result;\n};\n\nconst startOfDay = (date: Date): Date => {\n  const result = new Date(date.getTime());\n  result.setHours(0, 0, 0, 0);\n  return result;\n};\n\nconst endOfDay = (date: Date): Date => {\n  const result = new Date(date.getTime());\n  result.setHours(23, 59, 59, 999);\n  return result;\n};\n\n/**\n * Parses `YYYY-MM-DD` as a local calendar date — NOT `new Date(value)`, which\n * treats date-only strings as UTC midnight and shifts the day in every\n * timezone west of UTC. Shared by the query builder, the badge labels and the\n * range calendar so all three agree on which day a range endpoint means.\n */\nexport const parseCalendarDate = (value: string): Date => {\n  const [year, month, day] = value.split('-').map(Number);\n  return new Date(year, month - 1, day);\n};\n\nconst buildDateClause = (filter: DateFilter, now: Date): QueryClause => {\n  const { field } = filter;\n\n  if (filter.mode === 'preset') {\n    const pivot = subtractPreset(now, filter.preset);\n\n    switch (filter.condition) {\n      case 'withinLast':\n        return { [field]: { $gte: pivot.toISOString() } };\n      case 'notWithinLast':\n        return { [field]: { $lt: pivot.toISOString() } };\n      case 'isExactly':\n        return {\n          [field]: {\n            $gte: startOfDay(pivot).toISOString(),\n            $lte: endOfDay(pivot).toISOString(),\n          },\n        };\n    }\n  }\n\n  const from = startOfDay(parseCalendarDate(filter.from)).toISOString();\n  const to = endOfDay(parseCalendarDate(filter.to)).toISOString();\n\n  if (filter.condition === 'is') {\n    return { [field]: { $gte: from, $lte: to } };\n  }\n\n  return { $or: [{ [field]: { $lt: from } }, { [field]: { $gt: to } }] };\n};\n\nconst buildMimeClause = (filter: TypeFilter): QueryClause | null => {\n  const fileValues = filter.values.filter((value): value is TypeValue => value !== 'folder');\n\n  if (fileValues.length === 0) {\n    return null;\n  }\n\n  const branches: QueryClause[] = fileValues.map((value) => {\n    if (value === 'document') {\n      // Catch-all: none of the known mime families.\n      return { $and: ALL_MIMES.map((mime) => ({ mime: { $notContains: mime } })) };\n    }\n    return { mime: { $contains: MIME_BY_VALUE[value as keyof typeof MIME_BY_VALUE] } };\n  });\n\n  if (filter.condition === 'is') {\n    return branches.length === 1 ? branches[0] : { $or: branches };\n  }\n\n  // \"is not\" = matches none of the selected values: negate each branch, AND them.\n  const negated: QueryClause[] = fileValues.map((value) => {\n    if (value === 'document') {\n      // Not a document = is one of the known families.\n      return { $or: ALL_MIMES.map((mime) => ({ mime: { $contains: mime } })) };\n    }\n    return { mime: { $notContains: MIME_BY_VALUE[value as keyof typeof MIME_BY_VALUE] } };\n  });\n\n  return negated.length === 1 ? negated[0] : { $and: negated };\n};\n\nexport interface BuiltFilters {\n  /** Extra `$and` entries for the files query. */\n  fileClauses: QueryClause[];\n  /** Extra `$and` entries for the folders query (dates only). */\n  folderClauses: QueryClause[];\n  /**\n   * Whether the folders section can show at all. A type badge decides it by\n   * evaluating \"folder\" like any other value: `is` shows folders only when\n   * folder is selected; `is not` hides them only when folder is selected.\n   */\n  showFolders: boolean;\n  /**\n   * Whether the files list can show at all — false when an `is` type badge\n   * selects only \"folder\" (no file can match).\n   */\n  showFiles: boolean;\n}\n\nexport const buildAssetFilters = (filters: ListFilter[], now: Date): BuiltFilters => {\n  const fileClauses: QueryClause[] = [];\n  const folderClauses: QueryClause[] = [];\n  let showFolders = true;\n  let showFiles = true;\n\n  for (const filter of filters) {\n    if (filter.kind === 'date') {\n      const clause = buildDateClause(filter, now);\n      fileClauses.push(clause);\n      folderClauses.push(clause);\n      continue;\n    }\n\n    const includesFolder = filter.values.includes('folder');\n    if (filter.condition === 'is' ? !includesFolder : includesFolder) {\n      showFolders = false;\n    }\n\n    const mimeClause = buildMimeClause(filter);\n    if (mimeClause) {\n      fileClauses.push(mimeClause);\n    } else if (filter.condition === 'is') {\n      // `is [folder]` only — no file can match the badge.\n      showFiles = false;\n    }\n  }\n\n  return { fileClauses, folderClauses, showFolders, showFiles };\n};\n"],"names":["MIME_BY_VALUE","picture","audio","video","ALL_MIMES","Object","values","PRESET_DELTAS","days","months","years","subtractPreset","now","preset","result","Date","getTime","dayOfMonth","getDate","setDate","setFullYear","getFullYear","setMonth","getMonth","daysInTargetMonth","Math","min","startOfDay","date","setHours","endOfDay","parseCalendarDate","value","year","month","day","split","map","Number","buildDateClause","filter","field","mode","pivot","condition","$gte","toISOString","$lt","$lte","from","to","$or","$gt","buildMimeClause","fileValues","length","branches","$and","mime","$notContains","$contains","negated","buildAssetFilters","filters","fileClauses","folderClauses","showFolders","showFiles","kind","clause","push","includesFolder","includes","mimeClause"],"mappings":"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"}

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

@@ -0,0 +1,198 @@
+const MIME_BY_VALUE = {
+    picture: 'image',
+    audio: 'audio',
+    video: 'video'
+};
+const ALL_MIMES = Object.values(MIME_BY_VALUE);
+const PRESET_DELTAS = {
+    '1day': {
+        days: 1
+    },
+    '3days': {
+        days: 3
+    },
+    '1week': {
+        days: 7
+    },
+    '1month': {
+        months: 1
+    },
+    '3months': {
+        months: 3
+    },
+    '6months': {
+        months: 6
+    },
+    '1year': {
+        years: 1
+    }
+};
+const subtractPreset = (now, preset)=>{
+    const { days = 0, months = 0, years = 0 } = PRESET_DELTAS[preset];
+    const result = new Date(now.getTime());
+    if (years || months) {
+        // JS date setters overflow at month ends (Mar 31 − 1 month → Feb 31 → Mar 3),
+        // so move to the 1st first and clamp the day to the target month's length.
+        const dayOfMonth = result.getDate();
+        result.setDate(1);
+        result.setFullYear(result.getFullYear() - years);
+        result.setMonth(result.getMonth() - months);
+        const daysInTargetMonth = new Date(result.getFullYear(), result.getMonth() + 1, 0).getDate();
+        result.setDate(Math.min(dayOfMonth, daysInTargetMonth));
+    }
+    result.setDate(result.getDate() - days);
+    return result;
+};
+const startOfDay = (date)=>{
+    const result = new Date(date.getTime());
+    result.setHours(0, 0, 0, 0);
+    return result;
+};
+const endOfDay = (date)=>{
+    const result = new Date(date.getTime());
+    result.setHours(23, 59, 59, 999);
+    return result;
+};
+/**
+ * Parses `YYYY-MM-DD` as a local calendar date — NOT `new Date(value)`, which
+ * treats date-only strings as UTC midnight and shifts the day in every
+ * timezone west of UTC. Shared by the query builder, the badge labels and the
+ * range calendar so all three agree on which day a range endpoint means.
+ */ const parseCalendarDate = (value)=>{
+    const [year, month, day] = value.split('-').map(Number);
+    return new Date(year, month - 1, day);
+};
+const buildDateClause = (filter, now)=>{
+    const { field } = filter;
+    if (filter.mode === 'preset') {
+        const pivot = subtractPreset(now, filter.preset);
+        switch(filter.condition){
+            case 'withinLast':
+                return {
+                    [field]: {
+                        $gte: pivot.toISOString()
+                    }
+                };
+            case 'notWithinLast':
+                return {
+                    [field]: {
+                        $lt: pivot.toISOString()
+                    }
+                };
+            case 'isExactly':
+                return {
+                    [field]: {
+                        $gte: startOfDay(pivot).toISOString(),
+                        $lte: endOfDay(pivot).toISOString()
+                    }
+                };
+        }
+    }
+    const from = startOfDay(parseCalendarDate(filter.from)).toISOString();
+    const to = endOfDay(parseCalendarDate(filter.to)).toISOString();
+    if (filter.condition === 'is') {
+        return {
+            [field]: {
+                $gte: from,
+                $lte: to
+            }
+        };
+    }
+    return {
+        $or: [
+            {
+                [field]: {
+                    $lt: from
+                }
+            },
+            {
+                [field]: {
+                    $gt: to
+                }
+            }
+        ]
+    };
+};
+const buildMimeClause = (filter)=>{
+    const fileValues = filter.values.filter((value)=>value !== 'folder');
+    if (fileValues.length === 0) {
+        return null;
+    }
+    const branches = fileValues.map((value)=>{
+        if (value === 'document') {
+            // Catch-all: none of the known mime families.
+            return {
+                $and: ALL_MIMES.map((mime)=>({
+                        mime: {
+                            $notContains: mime
+                        }
+                    }))
+            };
+        }
+        return {
+            mime: {
+                $contains: MIME_BY_VALUE[value]
+            }
+        };
+    });
+    if (filter.condition === 'is') {
+        return branches.length === 1 ? branches[0] : {
+            $or: branches
+        };
+    }
+    // "is not" = matches none of the selected values: negate each branch, AND them.
+    const negated = fileValues.map((value)=>{
+        if (value === 'document') {
+            // Not a document = is one of the known families.
+            return {
+                $or: ALL_MIMES.map((mime)=>({
+                        mime: {
+                            $contains: mime
+                        }
+                    }))
+            };
+        }
+        return {
+            mime: {
+                $notContains: MIME_BY_VALUE[value]
+            }
+        };
+    });
+    return negated.length === 1 ? negated[0] : {
+        $and: negated
+    };
+};
+const buildAssetFilters = (filters, now)=>{
+    const fileClauses = [];
+    const folderClauses = [];
+    let showFolders = true;
+    let showFiles = true;
+    for (const filter of filters){
+        if (filter.kind === 'date') {
+            const clause = buildDateClause(filter, now);
+            fileClauses.push(clause);
+            folderClauses.push(clause);
+            continue;
+        }
+        const includesFolder = filter.values.includes('folder');
+        if (filter.condition === 'is' ? !includesFolder : includesFolder) {
+            showFolders = false;
+        }
+        const mimeClause = buildMimeClause(filter);
+        if (mimeClause) {
+            fileClauses.push(mimeClause);
+        } else if (filter.condition === 'is') {
+            // `is [folder]` only — no file can match the badge.
+            showFiles = false;
+        }
+    }
+    return {
+        fileClauses,
+        folderClauses,
+        showFolders,
+        showFiles
+    };
+};
+
+export { buildAssetFilters, parseCalendarDate };
+//# sourceMappingURL=buildAssetFilters.mjs.map

package/dist/admin/future/pages/Assets/utils/buildAssetFilters.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"buildAssetFilters.mjs","sources":["../../../../../../admin/src/future/pages/Assets/utils/buildAssetFilters.ts"],"sourcesContent":["import {\n  type DateFilter,\n  type DatePreset,\n  type ListFilter,\n  type TypeFilter,\n  type TypeValue,\n} from '../hooks/useListFilters';\n\n/**\n * Translates the URL filter model into Strapi `filters[$and]` entries for the\n * files and folders queries, and decides the structural visibility of both\n * sections.\n *\n * Relative presets resolve against `now` at build time — the URL stays\n * relative (\"within the last week\"), only the outgoing query is absolute.\n *\n * Semantics:\n * - Every badge is one `$and` entry (badges combine with AND, per ticket).\n * - Type: `folder` is not a mime — it acts structurally on the folders\n *   section. The remaining values map to mime clauses; `document` is the\n *   legacy catch-all (mime contains none of image/audio/video — audio\n *   included in the exclusion, fixing the legacy quirk).\n * - Dates apply to files and folders alike (folders have both timestamps).\n * - \"is exactly <preset>\" means the calendar day of `now - delta`.\n * - Ranges are inclusive on both ends (start-of-day .. end-of-day).\n */\n\ntype QueryClause = Record<string, unknown>;\n\nconst MIME_BY_VALUE: Record<Exclude<TypeValue, 'folder' | 'document'>, string> = {\n  picture: 'image',\n  audio: 'audio',\n  video: 'video',\n};\n\nconst ALL_MIMES = Object.values(MIME_BY_VALUE);\n\nconst PRESET_DELTAS: Record<DatePreset, { days?: number; months?: number; years?: number }> = {\n  '1day': { days: 1 },\n  '3days': { days: 3 },\n  '1week': { days: 7 },\n  '1month': { months: 1 },\n  '3months': { months: 3 },\n  '6months': { months: 6 },\n  '1year': { years: 1 },\n};\n\nconst subtractPreset = (now: Date, preset: DatePreset): Date => {\n  const { days = 0, months = 0, years = 0 } = PRESET_DELTAS[preset];\n  const result = new Date(now.getTime());\n\n  if (years || months) {\n    // JS date setters overflow at month ends (Mar 31 − 1 month → Feb 31 → Mar 3),\n    // so move to the 1st first and clamp the day to the target month's length.\n    const dayOfMonth = result.getDate();\n    result.setDate(1);\n    result.setFullYear(result.getFullYear() - years);\n    result.setMonth(result.getMonth() - months);\n\n    const daysInTargetMonth = new Date(result.getFullYear(), result.getMonth() + 1, 0).getDate();\n    result.setDate(Math.min(dayOfMonth, daysInTargetMonth));\n  }\n\n  result.setDate(result.getDate() - days);\n\n  return result;\n};\n\nconst startOfDay = (date: Date): Date => {\n  const result = new Date(date.getTime());\n  result.setHours(0, 0, 0, 0);\n  return result;\n};\n\nconst endOfDay = (date: Date): Date => {\n  const result = new Date(date.getTime());\n  result.setHours(23, 59, 59, 999);\n  return result;\n};\n\n/**\n * Parses `YYYY-MM-DD` as a local calendar date — NOT `new Date(value)`, which\n * treats date-only strings as UTC midnight and shifts the day in every\n * timezone west of UTC. Shared by the query builder, the badge labels and the\n * range calendar so all three agree on which day a range endpoint means.\n */\nexport const parseCalendarDate = (value: string): Date => {\n  const [year, month, day] = value.split('-').map(Number);\n  return new Date(year, month - 1, day);\n};\n\nconst buildDateClause = (filter: DateFilter, now: Date): QueryClause => {\n  const { field } = filter;\n\n  if (filter.mode === 'preset') {\n    const pivot = subtractPreset(now, filter.preset);\n\n    switch (filter.condition) {\n      case 'withinLast':\n        return { [field]: { $gte: pivot.toISOString() } };\n      case 'notWithinLast':\n        return { [field]: { $lt: pivot.toISOString() } };\n      case 'isExactly':\n        return {\n          [field]: {\n            $gte: startOfDay(pivot).toISOString(),\n            $lte: endOfDay(pivot).toISOString(),\n          },\n        };\n    }\n  }\n\n  const from = startOfDay(parseCalendarDate(filter.from)).toISOString();\n  const to = endOfDay(parseCalendarDate(filter.to)).toISOString();\n\n  if (filter.condition === 'is') {\n    return { [field]: { $gte: from, $lte: to } };\n  }\n\n  return { $or: [{ [field]: { $lt: from } }, { [field]: { $gt: to } }] };\n};\n\nconst buildMimeClause = (filter: TypeFilter): QueryClause | null => {\n  const fileValues = filter.values.filter((value): value is TypeValue => value !== 'folder');\n\n  if (fileValues.length === 0) {\n    return null;\n  }\n\n  const branches: QueryClause[] = fileValues.map((value) => {\n    if (value === 'document') {\n      // Catch-all: none of the known mime families.\n      return { $and: ALL_MIMES.map((mime) => ({ mime: { $notContains: mime } })) };\n    }\n    return { mime: { $contains: MIME_BY_VALUE[value as keyof typeof MIME_BY_VALUE] } };\n  });\n\n  if (filter.condition === 'is') {\n    return branches.length === 1 ? branches[0] : { $or: branches };\n  }\n\n  // \"is not\" = matches none of the selected values: negate each branch, AND them.\n  const negated: QueryClause[] = fileValues.map((value) => {\n    if (value === 'document') {\n      // Not a document = is one of the known families.\n      return { $or: ALL_MIMES.map((mime) => ({ mime: { $contains: mime } })) };\n    }\n    return { mime: { $notContains: MIME_BY_VALUE[value as keyof typeof MIME_BY_VALUE] } };\n  });\n\n  return negated.length === 1 ? negated[0] : { $and: negated };\n};\n\nexport interface BuiltFilters {\n  /** Extra `$and` entries for the files query. */\n  fileClauses: QueryClause[];\n  /** Extra `$and` entries for the folders query (dates only). */\n  folderClauses: QueryClause[];\n  /**\n   * Whether the folders section can show at all. A type badge decides it by\n   * evaluating \"folder\" like any other value: `is` shows folders only when\n   * folder is selected; `is not` hides them only when folder is selected.\n   */\n  showFolders: boolean;\n  /**\n   * Whether the files list can show at all — false when an `is` type badge\n   * selects only \"folder\" (no file can match).\n   */\n  showFiles: boolean;\n}\n\nexport const buildAssetFilters = (filters: ListFilter[], now: Date): BuiltFilters => {\n  const fileClauses: QueryClause[] = [];\n  const folderClauses: QueryClause[] = [];\n  let showFolders = true;\n  let showFiles = true;\n\n  for (const filter of filters) {\n    if (filter.kind === 'date') {\n      const clause = buildDateClause(filter, now);\n      fileClauses.push(clause);\n      folderClauses.push(clause);\n      continue;\n    }\n\n    const includesFolder = filter.values.includes('folder');\n    if (filter.condition === 'is' ? !includesFolder : includesFolder) {\n      showFolders = false;\n    }\n\n    const mimeClause = buildMimeClause(filter);\n    if (mimeClause) {\n      fileClauses.push(mimeClause);\n    } else if (filter.condition === 'is') {\n      // `is [folder]` only — no file can match the badge.\n      showFiles = false;\n    }\n  }\n\n  return { fileClauses, folderClauses, showFolders, showFiles };\n};\n"],"names":["MIME_BY_VALUE","picture","audio","video","ALL_MIMES","Object","values","PRESET_DELTAS","days","months","years","subtractPreset","now","preset","result","Date","getTime","dayOfMonth","getDate","setDate","setFullYear","getFullYear","setMonth","getMonth","daysInTargetMonth","Math","min","startOfDay","date","setHours","endOfDay","parseCalendarDate","value","year","month","day","split","map","Number","buildDateClause","filter","field","mode","pivot","condition","$gte","toISOString","$lt","$lte","from","to","$or","$gt","buildMimeClause","fileValues","length","branches","$and","mime","$notContains","$contains","negated","buildAssetFilters","filters","fileClauses","folderClauses","showFolders","showFiles","kind","clause","push","includesFolder","includes","mimeClause"],"mappings":"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"}

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

@@ -0,0 +1,29 @@
+'use strict';
+
+/**
+ * Fingerprint for "which asset list the user is looking at".
+ *
+ * Selection clears when this key changes (see ClearSelectionOnChange in AssetsPage).
+ *
+ * Hybrid rule
+ * - Folder, search, sort, filter changes → new key → selection clears.
+ * - Switching table/grid view does NOT change the key — both views render the
+ *   same list, so the selection survives the toggle.
+ * - Infinite scroll (load more) does NOT change any segment → selection persists.
+ *
+ * Filter uses a stable default until its header control is wired; that follow-up
+ * only passes a real value — no selection logic changes needed.
+ */ /**
+ * Builds a stable fingerprint for the current asset list query.
+ *
+ * Selection clears when this key changes. Infinite scroll does not change any
+ * segment, so selection persists across load-more.
+ */ const getListQueryKey = ({ folderId, search, sort, filter })=>JSON.stringify({
+        folderId,
+        search,
+        sort,
+        filter
+    });
+
+exports.getListQueryKey = getListQueryKey;
+//# sourceMappingURL=listQueryKey.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"listQueryKey.js","sources":["../../../../../../admin/src/future/pages/Assets/utils/listQueryKey.ts"],"sourcesContent":["/**\n * Fingerprint for \"which asset list the user is looking at\".\n *\n * Selection clears when this key changes (see ClearSelectionOnChange in AssetsPage).\n *\n * Hybrid rule\n * - Folder, search, sort, filter changes → new key → selection clears.\n * - Switching table/grid view does NOT change the key — both views render the\n *   same list, so the selection survives the toggle.\n * - Infinite scroll (load more) does NOT change any segment → selection persists.\n *\n * Filter uses a stable default until its header control is wired; that follow-up\n * only passes a real value — no selection logic changes needed.\n */\nexport interface ListQueryKeyInput {\n  folderId: number | null;\n  search: string;\n  /** Composite of asset sort and folder position — both change the render order. */\n  sort: string | null;\n  /** Null until filter UI ships. */\n  filter: string | null;\n}\n\n/**\n * Builds a stable fingerprint for the current asset list query.\n *\n * Selection clears when this key changes. Infinite scroll does not change any\n * segment, so selection persists across load-more.\n */\nexport const getListQueryKey = ({ folderId, search, sort, filter }: ListQueryKeyInput): string =>\n  JSON.stringify({ folderId, search, sort, filter });\n"],"names":["getListQueryKey","folderId","search","sort","filter","JSON","stringify"],"mappings":";;AAAA;;;;;;;;;;;;;;;;;;AA4BC,IACM,MAAMA,eAAAA,GAAkB,CAAC,EAAEC,QAAQ,EAAEC,MAAM,EAAEC,IAAI,EAAEC,MAAM,EAAqB,GACnFC,IAAAA,CAAKC,SAAS,CAAC;AAAEL,QAAAA,QAAAA;AAAUC,QAAAA,MAAAA;AAAQC,QAAAA,IAAAA;AAAMC,QAAAA;KAAO;;;;"}

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

@@ -0,0 +1,27 @@
+/**
+ * Fingerprint for "which asset list the user is looking at".
+ *
+ * Selection clears when this key changes (see ClearSelectionOnChange in AssetsPage).
+ *
+ * Hybrid rule
+ * - Folder, search, sort, filter changes → new key → selection clears.
+ * - Switching table/grid view does NOT change the key — both views render the
+ *   same list, so the selection survives the toggle.
+ * - Infinite scroll (load more) does NOT change any segment → selection persists.
+ *
+ * Filter uses a stable default until its header control is wired; that follow-up
+ * only passes a real value — no selection logic changes needed.
+ */ /**
+ * Builds a stable fingerprint for the current asset list query.
+ *
+ * Selection clears when this key changes. Infinite scroll does not change any
+ * segment, so selection persists across load-more.
+ */ const getListQueryKey = ({ folderId, search, sort, filter })=>JSON.stringify({
+        folderId,
+        search,
+        sort,
+        filter
+    });
+
+export { getListQueryKey };
+//# sourceMappingURL=listQueryKey.mjs.map

package/dist/admin/future/pages/Assets/utils/listQueryKey.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"listQueryKey.mjs","sources":["../../../../../../admin/src/future/pages/Assets/utils/listQueryKey.ts"],"sourcesContent":["/**\n * Fingerprint for \"which asset list the user is looking at\".\n *\n * Selection clears when this key changes (see ClearSelectionOnChange in AssetsPage).\n *\n * Hybrid rule\n * - Folder, search, sort, filter changes → new key → selection clears.\n * - Switching table/grid view does NOT change the key — both views render the\n *   same list, so the selection survives the toggle.\n * - Infinite scroll (load more) does NOT change any segment → selection persists.\n *\n * Filter uses a stable default until its header control is wired; that follow-up\n * only passes a real value — no selection logic changes needed.\n */\nexport interface ListQueryKeyInput {\n  folderId: number | null;\n  search: string;\n  /** Composite of asset sort and folder position — both change the render order. */\n  sort: string | null;\n  /** Null until filter UI ships. */\n  filter: string | null;\n}\n\n/**\n * Builds a stable fingerprint for the current asset list query.\n *\n * Selection clears when this key changes. Infinite scroll does not change any\n * segment, so selection persists across load-more.\n */\nexport const getListQueryKey = ({ folderId, search, sort, filter }: ListQueryKeyInput): string =>\n  JSON.stringify({ folderId, search, sort, filter });\n"],"names":["getListQueryKey","folderId","search","sort","filter","JSON","stringify"],"mappings":"AAAA;;;;;;;;;;;;;;;;;;AA4BC,IACM,MAAMA,eAAAA,GAAkB,CAAC,EAAEC,QAAQ,EAAEC,MAAM,EAAEC,IAAI,EAAEC,MAAM,EAAqB,GACnFC,IAAAA,CAAKC,SAAS,CAAC;AAAEL,QAAAA,QAAAA;AAAUC,QAAAA,MAAAA;AAAQC,QAAAA,IAAAA;AAAMC,QAAAA;KAAO;;;;"}

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

@@ -0,0 +1,84 @@
+'use strict';
+
+const getComparableValue = (record, field)=>{
+    switch(field){
+        case 'createdAt':
+        case 'updatedAt':
+            return record[field] ? new Date(record[field]).getTime() : 0;
+        case 'size':
+            // Folders have no size — they compare as 0 (start of ascending, end of descending).
+            return record.size ?? 0;
+        case 'name':
+        default:
+            return (record.name ?? '').toLowerCase();
+    }
+};
+/**
+ * Builds a comparator from comma-separated sort rules (`updatedAt:DESC,name:ASC`).
+ * Rules apply in order; the first non-equal field decides. Client-side
+ * approximation of the server ordering — good enough to slot folders between
+ * files that were sorted server-side by the same rules.
+ */ const buildComparator = (sort)=>{
+    const rules = sort.split(',').map((rule)=>rule.trim()).filter(Boolean).map((rule)=>{
+        const [field, direction] = rule.split(':');
+        return {
+            field,
+            desc: direction?.toUpperCase() === 'DESC'
+        };
+    });
+    return (a, b)=>{
+        for (const { field, desc } of rules){
+            const va = getComparableValue(a, field);
+            const vb = getComparableValue(b, field);
+            let cmp;
+            if (typeof va === 'string' || typeof vb === 'string') {
+                cmp = String(va) < String(vb) ? -1 : String(va) > String(vb) ? 1 : 0;
+            } else {
+                cmp = va - vb;
+            }
+            if (cmp !== 0) {
+                return desc ? -cmp : cmp;
+            }
+        }
+        return 0;
+    };
+};
+/**
+ * Interleaves the complete folder list into the (possibly partially loaded)
+ * asset stream according to the active sort. Ties order folders first.
+ */ const mergeMixedList = ({ folders, assets, sort, hasNextPage })=>{
+    const compare = buildComparator(sort);
+    const sortedFolders = [
+        ...folders
+    ].sort(compare);
+    const lastAsset = assets[assets.length - 1];
+    const placeableFolders = !hasNextPage || !lastAsset ? hasNextPage ? [] // nothing loaded yet — wait for the first page
+     : sortedFolders : sortedFolders.filter((folder)=>compare(folder, lastAsset) <= 0);
+    const items = [];
+    let folderIndex = 0;
+    for (const asset of assets){
+        while(folderIndex < placeableFolders.length && compare(placeableFolders[folderIndex], asset) <= 0){
+            items.push({
+                kind: 'folder',
+                folder: placeableFolders[folderIndex]
+            });
+            folderIndex += 1;
+        }
+        items.push({
+            kind: 'asset',
+            asset
+        });
+    }
+    while(folderIndex < placeableFolders.length){
+        items.push({
+            kind: 'folder',
+            folder: placeableFolders[folderIndex]
+        });
+        folderIndex += 1;
+    }
+    return items;
+};
+
+exports.buildComparator = buildComparator;
+exports.mergeMixedList = mergeMixedList;
+//# sourceMappingURL=mergeMixedList.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"mergeMixedList.js","sources":["../../../../../../admin/src/future/pages/Assets/utils/mergeMixedList.ts"],"sourcesContent":["import type { File } from '../../../../../../shared/contracts/files';\nimport type { Folder } from '../../../../../../shared/contracts/folders';\n\nexport type MixedItem = { kind: 'folder'; folder: Folder } | { kind: 'asset'; asset: File };\n\ntype SortableRecord = {\n  name?: string | null;\n  createdAt?: string | null;\n  updatedAt?: string | null;\n  size?: number | null;\n};\n\nconst getComparableValue = (record: SortableRecord, field: string): number | string => {\n  switch (field) {\n    case 'createdAt':\n    case 'updatedAt':\n      return record[field] ? new Date(record[field]!).getTime() : 0;\n    case 'size':\n      // Folders have no size — they compare as 0 (start of ascending, end of descending).\n      return record.size ?? 0;\n    case 'name':\n    default:\n      return (record.name ?? '').toLowerCase();\n  }\n};\n\n/**\n * Builds a comparator from comma-separated sort rules (`updatedAt:DESC,name:ASC`).\n * Rules apply in order; the first non-equal field decides. Client-side\n * approximation of the server ordering — good enough to slot folders between\n * files that were sorted server-side by the same rules.\n */\nexport const buildComparator = (sort: string) => {\n  const rules = sort\n    .split(',')\n    .map((rule) => rule.trim())\n    .filter(Boolean)\n    .map((rule) => {\n      const [field, direction] = rule.split(':');\n      return { field, desc: direction?.toUpperCase() === 'DESC' };\n    });\n\n  return (a: SortableRecord, b: SortableRecord): number => {\n    for (const { field, desc } of rules) {\n      const va = getComparableValue(a, field);\n      const vb = getComparableValue(b, field);\n\n      let cmp: number;\n      if (typeof va === 'string' || typeof vb === 'string') {\n        cmp = String(va) < String(vb) ? -1 : String(va) > String(vb) ? 1 : 0;\n      } else {\n        cmp = va - vb;\n      }\n\n      if (cmp !== 0) {\n        return desc ? -cmp : cmp;\n      }\n    }\n\n    return 0;\n  };\n};\n\ninterface MergeMixedListParams {\n  folders: Folder[];\n  assets: File[];\n  /** Combined sort rules used for the assets query. */\n  sort: string;\n  /**\n   * More asset pages exist. A folder may only be placed once we know no\n   * not-yet-loaded asset sorts before it — i.e. it compares ≤ the last loaded\n   * asset. Later pages release the remaining folders progressively.\n   */\n  hasNextPage: boolean;\n}\n\n/**\n * Interleaves the complete folder list into the (possibly partially loaded)\n * asset stream according to the active sort. Ties order folders first.\n */\nexport const mergeMixedList = ({\n  folders,\n  assets,\n  sort,\n  hasNextPage,\n}: MergeMixedListParams): MixedItem[] => {\n  const compare = buildComparator(sort);\n\n  const sortedFolders = [...folders].sort(compare);\n\n  const lastAsset = assets[assets.length - 1];\n  const placeableFolders =\n    !hasNextPage || !lastAsset\n      ? hasNextPage\n        ? [] // nothing loaded yet — wait for the first page\n        : sortedFolders\n      : sortedFolders.filter((folder) => compare(folder, lastAsset) <= 0);\n\n  const items: MixedItem[] = [];\n  let folderIndex = 0;\n\n  for (const asset of assets) {\n    while (\n      folderIndex < placeableFolders.length &&\n      compare(placeableFolders[folderIndex], asset) <= 0\n    ) {\n      items.push({ kind: 'folder', folder: placeableFolders[folderIndex] });\n      folderIndex += 1;\n    }\n    items.push({ kind: 'asset', asset });\n  }\n\n  while (folderIndex < placeableFolders.length) {\n    items.push({ kind: 'folder', folder: placeableFolders[folderIndex] });\n    folderIndex += 1;\n  }\n\n  return items;\n};\n"],"names":["getComparableValue","record","field","Date","getTime","size","name","toLowerCase","buildComparator","sort","rules","split","map","rule","trim","filter","Boolean","direction","desc","toUpperCase","a","b","va","vb","cmp","String","mergeMixedList","folders","assets","hasNextPage","compare","sortedFolders","lastAsset","length","placeableFolders","folder","items","folderIndex","asset","push","kind"],"mappings":"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"}