@strapi/upload 5.58.0 → 5.60.0

package/dist/admin/pages/Assets/AssetsPage.js

@@ -2,7 +2,6 @@
 
 var jsxRuntime = require('react/jsx-runtime');
 var React = require('react');
-var ToggleGroup = require('@radix-ui/react-toggle-group');
 var strapiAdmin = require('@strapi/admin/strapi-admin');
 var designSystem = require('@strapi/design-system');
 var icons = require('@strapi/icons');
@@ -12,73 +11,32 @@ var useAIMetadataEnabled = require('../../hooks/useAIMetadataEnabled.js');
 var useMediaLibraryPermissions = require('../../hooks/useMediaLibraryPermissions.js');
 var useTracking = require('../../hooks/useTracking.js');
 var api = require('../../services/api.js');
-var folders = require('../../services/folders.js');
 var settings = require('../../services/settings.js');
 var itemLocations = require('../../utils/itemLocations.js');
 var translations = require('../../utils/translations.js');
 var typeFromMime = require('../../utils/typeFromMime.js');
 var AssetDetailsDrawer = require('./components/AssetDetails/AssetDetailsDrawer.js');
-var AssetsGrid = require('./components/AssetsGrid.js');
 var AssetsSearchInput = require('./components/AssetsSearchInput.js');
-var AssetsTable = require('./components/AssetsTable.js');
-var BulkActionsBar = require('./components/BulkActionsBar.js');
+var AssetsView = require('./components/AssetsView.js');
 var AssetsDndProvider = require('./components/Dnd/AssetsDndProvider.js');
 var UploadDropZone = require('./components/DropZone/UploadDropZone.js');
 var UploadDropZoneContext = require('./components/DropZone/UploadDropZoneContext.js');
-var EmptyState = require('./components/EmptyState.js');
 var FilterBadges = require('./components/FilterBadges.js');
 var FilterMenu = require('./components/FilterMenu.js');
 var FolderFormDialog = require('./components/FolderFormDialog.js');
 var FolderTree = require('./components/FolderTree/FolderTree.js');
 var ImportFromUrlDialog = require('./components/ImportFromUrlDialog.js');
-var ItemContextMenu = require('./components/ItemContextMenu.js');
 var MainAreaContextMenu = require('./components/MainAreaContextMenu.js');
 var SortMenu = require('./components/SortMenu.js');
+var ViewToggle = require('./components/ViewToggle.js');
 var constants = require('./constants.js');
-var useAssetSearch = require('./hooks/useAssetSearch.js');
 var useAssetSelection = require('./hooks/useAssetSelection.js');
+var useAssetsList = require('./hooks/useAssetsList.js');
 var useBusyAssets = require('./hooks/useBusyAssets.js');
 var useFolderInfo = require('./hooks/useFolderInfo.js');
-var useFolderNavigation = require('./hooks/useFolderNavigation.js');
-var useInfiniteAssets = require('./hooks/useInfiniteAssets.js');
-var useInfiniteScrollSentinel = require('./hooks/useInfiniteScrollSentinel.js');
-var useListFilters = require('./hooks/useListFilters.js');
 var useListScrollRestoration = require('./hooks/useListScrollRestoration.js');
-var useListSort = require('./hooks/useListSort.js');
-var buildAssetFilters = require('./utils/buildAssetFilters.js');
 var listQueryKey = require('./utils/listQueryKey.js');
-var mergeMixedList = require('./utils/mergeMixedList.js');
-var renderedKeys = require('./utils/renderedKeys.js');
 
-function _interopNamespace(e) {
-  if (e && e.__esModule) return e;
-  var n = Object.create(null);
-  if (e) {
-    Object.keys(e).forEach(function (k) {
-      if (k !== 'default') {
-        var d = Object.getOwnPropertyDescriptor(e, k);
-        Object.defineProperty(n, k, d.get ? d : {
-          enumerable: true,
-          get: function () { return e[k]; }
-        });
-      }
-    });
-  }
-  n.default = e;
-  return Object.freeze(n);
-}
-
-var ToggleGroup__namespace = /*#__PURE__*/_interopNamespace(ToggleGroup);
-
-// The negative bottom margin shrinks the trigger area by a pixel so the 1px
-// sentinel sitting exactly at the fold (when a page's rows happen to fill the
-// viewport) reads as "not visible" and doesn't pull an extra page. It still
-// triggers as soon as the sentinel scrolls a hair into view. Tune the bottom
-// value if the list over- or under-fetches near the fold.
-const INTERSECTION_OPTIONS = {
-    threshold: 0,
-    rootMargin: '0px 0px -1px 0px'
-};
 // Module-level so the header sentinel's observer isn't rebuilt every render.
 const HEADER_SENTINEL_OPTIONS = {
     threshold: 0
@@ -110,116 +68,6 @@ const getSearchResultsCountMessage = (numberFolders, numberAssets)=>{
     }
     return SEARCH_RESULTS_COUNT_MESSAGES.both;
 };
-const AssetsView = ({ view, folders, isLoadingFolders, assets, isLoadingAssets, isFetchingMore, hasNextPage, fetchNextPage, error, locations, searchQuery, assetsSort, foldersPosition, hasActiveFilters, onClearFilters, onAssetItemClick, onAddAssets, canAddAssets, onClearSearch })=>{
-    const { formatMessage } = reactIntl.useIntl();
-    const isGridView = view === constants.viewOptions.GRID;
-    const isLoading = isLoadingAssets || isLoadingFolders;
-    // "Folders: Mixed with files" — interleave the complete folder list into the
-    // loaded asset stream client-side, following the active sort. Table view
-    // only: the grid always keeps folders in their own band on top.
-    const mixedItems = React.useMemo(()=>foldersPosition === 'mixed' && !isGridView ? mergeMixedList.mergeMixedList({
-            folders,
-            assets,
-            sort: assetsSort,
-            hasNextPage
-        }) : null, [
-        foldersPosition,
-        isGridView,
-        folders,
-        assets,
-        assetsSort,
-        hasNextPage
-    ]);
-    // Derived once here so the table, the grid and the bulk bar all agree on what
-    // is on screen — in mixed mode that is not simply every folder.
-    const renderedKeys$1 = renderedKeys.buildRenderedKeys({
-        folders,
-        assets,
-        mixedItems
-    });
-    const loadMoreRef = useInfiniteScrollSentinel.useInfiniteScrollSentinel({
-        hasNextPage,
-        isFetchingMore,
-        onLoadMore: fetchNextPage,
-        options: INTERSECTION_OPTIONS
-    });
-    if (isLoading) {
-        return /*#__PURE__*/ jsxRuntime.jsx(designSystem.Flex, {
-            justifyContent: "center",
-            padding: 8,
-            children: /*#__PURE__*/ jsxRuntime.jsx(designSystem.Loader, {
-                children: formatMessage({
-                    id: 'app.loading',
-                    defaultMessage: 'Loading...'
-                })
-            })
-        });
-    }
-    if (error) {
-        return /*#__PURE__*/ jsxRuntime.jsx(designSystem.Box, {
-            padding: 8,
-            children: /*#__PURE__*/ jsxRuntime.jsx(designSystem.Typography, {
-                textColor: "danger600",
-                children: formatMessage({
-                    id: translations.getTranslationKey('list.assets.error'),
-                    defaultMessage: 'An error occurred while fetching assets.'
-                })
-            })
-        });
-    }
-    if (folders.length === 0 && assets.length === 0) {
-        // While searching, the search empty state wins (it names the query); a
-        // filter-only dead end gets the filtered variant with its Clear action.
-        return hasActiveFilters && !searchQuery ? /*#__PURE__*/ jsxRuntime.jsx(EmptyState.FilteredEmptyState, {
-            onClearFilters: onClearFilters
-        }) : /*#__PURE__*/ jsxRuntime.jsx(EmptyState.EmptyState, {
-            onAddAssets: onAddAssets,
-            canAddAssets: canAddAssets,
-            searchQuery: searchQuery,
-            onClearSearch: onClearSearch
-        });
-    }
-    return /*#__PURE__*/ jsxRuntime.jsxs(jsxRuntime.Fragment, {
-        children: [
-            /*#__PURE__*/ jsxRuntime.jsx(ItemContextMenu.ItemContextMenuProvider, {
-                locations: locations,
-                children: isGridView ? /*#__PURE__*/ jsxRuntime.jsx(AssetsGrid.AssetsGrid, {
-                    folders: folders,
-                    assets: assets,
-                    renderedKeys: renderedKeys$1,
-                    onAssetItemClick: onAssetItemClick
-                }) : /*#__PURE__*/ jsxRuntime.jsx(AssetsTable.AssetsTable, {
-                    assets: assets,
-                    folders: folders,
-                    mixedItems: mixedItems,
-                    renderedKeys: renderedKeys$1,
-                    onAssetItemClick: onAssetItemClick
-                })
-            }),
-            /*#__PURE__*/ jsxRuntime.jsx("div", {
-                ref: loadMoreRef,
-                style: {
-                    height: 1
-                }
-            }),
-            isFetchingMore && /*#__PURE__*/ jsxRuntime.jsx(designSystem.Flex, {
-                justifyContent: "center",
-                padding: 4,
-                children: /*#__PURE__*/ jsxRuntime.jsx(designSystem.Loader, {
-                    children: formatMessage({
-                        id: translations.getTranslationKey('list.assets.loading-more'),
-                        defaultMessage: 'Loading more assets...'
-                    })
-                })
-            }),
-            /*#__PURE__*/ jsxRuntime.jsx(BulkActionsBar.BulkActionsBar, {
-                assets: assets,
-                renderedKeys: renderedKeys$1,
-                locations: locations
-            })
-        ]
-    });
-};
 const ClearSelectionOnChange = ({ listQueryKey })=>{
     const { clear } = useAssetSelection.useAssetSelection();
     React.useEffect(()=>{
@@ -232,50 +80,7 @@ const ClearSelectionOnChange = ({ listQueryKey })=>{
 };
 /* -------------------------------------------------------------------------------------------------
  * AssetsPage
- * -----------------------------------------------------------------------------------------------*/ /**
- * Mirrors the design-system Toggle look (grey track, white active segment
- * card) — reproduced locally because the DS component is a labels-only
- * boolean input (no icons) and paints its left segment in danger red. Here
- * both segments use the primary blue when active.
- */ const StyledToggleGroup = styledComponents.styled(ToggleGroup__namespace.Root)`
-  display: flex;
-  padding: ${({ theme })=>theme.spaces[1]};
-  background: ${({ theme })=>theme.colors.neutral100};
-  border: 1px solid ${({ theme })=>theme.colors.neutral200};
-  border-radius: ${({ theme })=>theme.borderRadius};
-`;
-const StyledToggleItem = styledComponents.styled(ToggleGroup__namespace.Item)`
-  display: flex;
-  flex: 1 1 50%;
-  align-items: center;
-  justify-content: center;
-  gap: ${({ theme })=>theme.spaces[2]};
-  padding: 0.6rem ${({ theme })=>theme.spaces[3]};
-  border: 1px solid transparent;
-  border-radius: ${({ theme })=>theme.borderRadius};
-  background: transparent;
-  color: ${({ theme })=>theme.colors.neutral600};
-  cursor: pointer;
-  font-size: ${({ theme })=>theme.fontSizes[1]};
-  font-weight: ${({ theme })=>theme.fontWeights.semiBold};
-  white-space: nowrap;
-
-  &:hover {
-    color: ${({ theme })=>theme.colors.neutral700};
-  }
-
-  &[data-state='on'] {
-    background: ${({ theme })=>theme.colors.neutral0};
-    border-color: ${({ theme })=>theme.colors.neutral200};
-    color: ${({ theme })=>theme.colors.primary600};
-  }
-
-  svg {
-    width: 1.6rem;
-    height: 1.6rem;
-  }
-`;
-// A single sticky header — same layout scrolled or not, so the toolbar
+ * -----------------------------------------------------------------------------------------------*/ // A single sticky header — same layout scrolled or not, so the toolbar
 // alignment can't reflow the way the shared sticky header did. Once the list
 // scrolls under it, it shrinks (reduced vertical padding + a shadow to lift it
 // off the rows), like the sticky headers elsewhere in the admin. Horizontal
@@ -385,73 +190,18 @@ const SearchSlot = styledComponents.styled(designSystem.Box)`
     flex: 0 1 auto;
   }
 `;
-// Toggle labels are hidden below desktop — icons only (buttons keep aria-label).
-const ToggleLabel = styledComponents.styled.span`
-  display: none;
-
-  ${({ theme })=>theme.breakpoints.large} {
-    display: inline;
-  }
-`;
 const AssetsPage = ()=>{
     const { formatMessage } = reactIntl.useIntl();
     const { openDetails } = AssetDetailsDrawer.useAssetDetailsParam();
     const { canCreate, canUpdate } = useMediaLibraryPermissions.useMediaLibraryPermissions();
-    const { currentFolderId, navigateToFolderId, navigateToRoot } = useFolderNavigation.useFolderNavigation();
-    // Deleted or missing folders (404) need a fetch — handled here, not in
-    // `useFolderNavigation` (which only strips malformed ?folder= values).
-    const { error: currentFolderError } = folders.useGetFolderQuery({
-        id: currentFolderId
-    }, {
-        skip: currentFolderId === null
-    });
-    React.useEffect(()=>{
-        if (currentFolderError?.name === 'NotFoundError') {
-            navigateToRoot();
-        }
-    }, [
-        currentFolderError,
-        navigateToRoot
-    ]);
+    const { currentFolderId, navigateToFolderId, searchQuery, isSearching, clearSearch, listSort, listFilters, assets, subscribers: assetPageSubscribers, pagination, isLoadingAssets, isFetchingMore, hasNextPage, fetchNextPage, assetsError, folders, isLoadingFolders } = useAssetsList.useAssetsList();
     const { title, itemCount } = useFolderInfo.useFolderInfo(currentFolderId);
-    const { searchQuery, isSearching, clearSearch } = useAssetSearch.useAssetSearch();
-    const listSort = useListSort.useListSort();
-    const listFilters = useListFilters.useListFilters();
-    // Resolve relative presets against "now" only when the filters change —
-    // keeps the query args (and RTK cache keys) stable between renders.
-    const builtFilters = React.useMemo(()=>buildAssetFilters.buildAssetFilters(listFilters.filters, new Date()), // eslint-disable-next-line react-hooks/exhaustive-deps -- serialized is the value identity of filters
-    [
-        listFilters.serialized
-    ]);
-    const { assets, subscribers: assetPageSubscribers, pagination, isLoading: isLoadingAssets, isFetchingMore, hasNextPage, fetchNextPage, error: assetsError } = useInfiniteAssets.useInfiniteAssets({
-        // The real folder is passed even while searching: the service drops the folder
-        // filter when `search` is set, so results are still global. List filters
-        // compose with both modes.
-        folder: currentFolderId,
-        search: searchQuery || undefined,
-        sort: listSort.assetsSort,
-        filters: builtFilters.fileClauses,
-        enabled: builtFilters.showFiles
-    });
-    const { data: fetchedFolders = [], isLoading: isLoadingFolders } = folders.useGetFoldersQuery({
-        parentId: currentFolderId,
-        search: searchQuery || undefined,
-        sort: listSort.foldersSort,
-        filters: builtFilters.folderClauses
-    }, {
-        skip: !builtFilters.showFolders
-    });
-    // A type badge can exclude folders structurally (e.g. "Type is Picture").
-    const folders$1 = React.useMemo(()=>builtFilters.showFolders ? fetchedFolders : [], [
-        builtFilters.showFolders,
-        fetchedFolders
-    ]);
     // Both move affordances (drag and the bulk bar) resolve each item's parent
     // from the rows on screen — while searching, results are global and the
     // folder currently open says nothing about where an item lives.
-    const itemLocations$1 = React.useMemo(()=>itemLocations.buildItemLocations(assets, folders$1), [
+    const itemLocations$1 = React.useMemo(()=>itemLocations.buildItemLocations(assets, folders), [
         assets,
-        folders$1
+        folders
     ]);
     const itemCountLabel = formatMessage(ITEM_COUNT_MESSAGE, {
         count: itemCount
@@ -462,7 +212,7 @@ const AssetsPage = ()=>{
     }, {
         query: searchQuery
     });
-    const numberFolders = folders$1.length;
+    const numberFolders = folders.length;
     const numberAssets = pagination?.total ?? 0;
     const searchResultsCountLabel = formatMessage(getSearchResultsCountMessage(numberFolders, numberAssets), {
         numberFolders,
@@ -723,48 +473,9 @@ const AssetsPage = ()=>{
                                                                                 showFoldersGroup: !isGridView
                                                                             })
                                                                         }),
-                                                                        /*#__PURE__*/ jsxRuntime.jsxs(StyledToggleGroup, {
-                                                                            type: "single",
-                                                                            value: isGridView ? 'grid' : 'table',
-                                                                            onValueChange: (value)=>value && setView(value === 'grid' ? constants.viewOptions.GRID : constants.viewOptions.TABLE),
-                                                                            "aria-label": formatMessage({
-                                                                                id: translations.getTranslationKey('view.switch.label'),
-                                                                                defaultMessage: 'View options'
-                                                                            }),
-                                                                            children: [
-                                                                                /*#__PURE__*/ jsxRuntime.jsxs(StyledToggleItem, {
-                                                                                    value: "table",
-                                                                                    "aria-label": formatMessage({
-                                                                                        id: translations.getTranslationKey('view.table'),
-                                                                                        defaultMessage: 'Table view'
-                                                                                    }),
-                                                                                    children: [
-                                                                                        /*#__PURE__*/ jsxRuntime.jsx(icons.List, {}),
-                                                                                        /*#__PURE__*/ jsxRuntime.jsx(ToggleLabel, {
-                                                                                            children: formatMessage({
-                                                                                                id: translations.getTranslationKey('view.table'),
-                                                                                                defaultMessage: 'Table view'
-                                                                                            })
-                                                                                        })
-                                                                                    ]
-                                                                                }),
-                                                                                /*#__PURE__*/ jsxRuntime.jsxs(StyledToggleItem, {
-                                                                                    value: "grid",
-                                                                                    "aria-label": formatMessage({
-                                                                                        id: translations.getTranslationKey('view.grid'),
-                                                                                        defaultMessage: 'Grid view'
-                                                                                    }),
-                                                                                    children: [
-                                                                                        /*#__PURE__*/ jsxRuntime.jsx(icons.GridFour, {}),
-                                                                                        /*#__PURE__*/ jsxRuntime.jsx(ToggleLabel, {
-                                                                                            children: formatMessage({
-                                                                                                id: translations.getTranslationKey('view.grid'),
-                                                                                                defaultMessage: 'Grid view'
-                                                                                            })
-                                                                                        })
-                                                                                    ]
-                                                                                })
-                                                                            ]
+                                                                        /*#__PURE__*/ jsxRuntime.jsx(ViewToggle.ViewToggle, {
+                                                                            view: view,
+                                                                            onChange: setView
                                                                         })
                                                                     ]
                                                                 })
@@ -785,9 +496,9 @@ const AssetsPage = ()=>{
                                                                     uploadDropZoneRef: uploadDropZoneRef,
                                                                     folderName: title
                                                                 }),
-                                                                /*#__PURE__*/ jsxRuntime.jsx(AssetsView, {
+                                                                /*#__PURE__*/ jsxRuntime.jsx(AssetsView.AssetsView, {
                                                                     view: view,
-                                                                    folders: folders$1,
+                                                                    folders: folders,
                                                                     isLoadingFolders: isLoadingFolders,
                                                                     assets: assets,
                                                                     isLoadingAssets: isLoadingAssets,