@strapi/content-manager 5.59.0 → 5.61.0

package/dist/admin/pages/ListConfiguration/components/Settings.mjs

@@ -3,6 +3,8 @@ import * as React from 'react';
 import { useForm, InputRenderer } from '@strapi/admin/strapi-admin';
 import { useCollator, Flex, Typography, Grid } from '@strapi/design-system';
 import { useIntl } from 'react-intl';
+import { COLLECTION_TYPES } from '../../../constants/collections.mjs';
+import { isCustomOrderFeatureEnabled } from '../../../constants/customOrder.mjs';
 import { useDoc } from '../../../hooks/useDocument.mjs';
 import { getTranslation } from '../../../utils/translations.mjs';
 
@@ -20,8 +22,10 @@ const Settings = ()=>{
     const formatter = useCollator(locale, {
         sensitivity: 'base'
     });
-    const { schema } = useDoc();
+    const { schema, collectionType } = useDoc();
     const layout = useForm('Settings', (state)=>state.values.layout ?? []);
+    const hasCustomOrder = useForm('Settings', (state)=>state.values.settings.customOrder);
+    const canUseCustomOrder = collectionType === COLLECTION_TYPES && isCustomOrderFeatureEnabled();
     const currentSortBy = useForm('Settings', (state)=>state.values.settings.defaultSortBy);
     const onChange = useForm('Settings', (state)=>state.onChange);
     const sortOptions = React.useMemo(()=>Object.values(layout).reduce((acc, field)=>{
@@ -47,10 +51,17 @@ const Settings = ()=>{
         onChange,
         sortOptionsSorted
     ]);
-    const formLayout = React.useMemo(()=>SETTINGS_FORM_LAYOUT.map((row)=>row.map((field)=>{
+    const formLayout = React.useMemo(()=>[
+            ...SETTINGS_FORM_LAYOUT,
+            ...canUseCustomOrder ? [
+                CUSTOM_ORDER_FORM_LAYOUT
+            ] : []
+        ].map((row)=>row.map((field)=>{
                 if (field.type === 'enumeration') {
                     return {
                         ...field,
+                        // The custom order takes over the default sort of the list
+                        disabled: canUseCustomOrder && hasCustomOrder && isDefaultSortField(field.name),
                         hint: field.hint ? formatMessage(field.hint) : undefined,
                         label: formatMessage(field.label),
                         options: field.name === 'settings.defaultSortBy' ? sortOptionsSorted : field.options
@@ -63,7 +74,9 @@ const Settings = ()=>{
                     };
                 }
             })), [
+        canUseCustomOrder,
         formatMessage,
+        hasCustomOrder,
         sortOptionsSorted
     ]);
     return /*#__PURE__*/ jsxs(Flex, {
@@ -175,6 +188,22 @@ const SETTINGS_FORM_LAYOUT = [
         }
     ]
 ];
+const CUSTOM_ORDER_FORM_LAYOUT = [
+    {
+        hint: {
+            id: getTranslation('form.Input.customOrder.hint'),
+            defaultMessage: 'Arrange entries by hand in the list view. New entries are added on top. The Content API returns entries in this order when no sort is requested.'
+        },
+        label: {
+            id: getTranslation('form.Input.customOrder'),
+            defaultMessage: 'Enable custom order'
+        },
+        name: 'settings.customOrder',
+        size: 6,
+        type: 'boolean'
+    }
+];
+const isDefaultSortField = (name)=>name === 'settings.defaultSortBy' || name === 'settings.defaultSortOrder';
 
 export { Settings };
 //# sourceMappingURL=Settings.mjs.map

package/dist/admin/pages/ListConfiguration/components/Settings.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"Settings.mjs","sources":["../../../../../admin/src/pages/ListConfiguration/components/Settings.tsx"],"sourcesContent":["import * as React from 'react';\n\nimport { useForm, InputRenderer, type InputProps } from '@strapi/admin/strapi-admin';\nimport { Flex, Grid, Typography, useCollator } from '@strapi/design-system';\nimport { type MessageDescriptor, useIntl } from 'react-intl';\n\nimport { useDoc } from '../../../hooks/useDocument';\nimport { type EditFieldLayout } from '../../../hooks/useDocumentLayout';\nimport { getTranslation } from '../../../utils/translations';\nimport { type FormData } from '../ListConfigurationPage';\n\nimport type { DistributiveOmit } from 'react-redux';\n\nexport type InputPropsWithMessageDescriptors = DistributiveOmit<\n  InputProps,\n  'hint' | 'label' | 'placeholder'\n> & {\n  hint?: MessageDescriptor;\n  label: MessageDescriptor;\n  placeholder?: MessageDescriptor;\n};\n\n/**\n * @internal\n * @description Form inputs are always displayed in a grid, so we need\n * to use the size property to determine how many columns the input should\n * take up.\n */\nexport type FormLayoutInputProps = InputPropsWithMessageDescriptors & { size: number };\n\nconst EXCLUDED_SORT_ATTRIBUTE_TYPES = new Set([\n  'media',\n  'richtext',\n  'dynamiczone',\n  'relation',\n  'component',\n  'json',\n  'blocks',\n]);\n\ninterface SortOption {\n  value: string;\n  label: string;\n}\n\nconst Settings = () => {\n  const { formatMessage, locale } = useIntl();\n  const formatter = useCollator(locale, {\n    sensitivity: 'base',\n  });\n  const { schema } = useDoc();\n\n  const layout = useForm<FormData['layout']>(\n    'Settings',\n    (state) => (state.values as FormData).layout ?? []\n  );\n  const currentSortBy = useForm<FormData['settings']['defaultSortBy']>(\n    'Settings',\n    (state) => (state.values as FormData).settings.defaultSortBy\n  );\n  const onChange = useForm('Settings', (state) => state.onChange);\n\n  const sortOptions = React.useMemo(\n    () =>\n      Object.values(layout).reduce<SortOption[]>((acc, field) => {\n        if (schema && !EXCLUDED_SORT_ATTRIBUTE_TYPES.has(schema.attributes[field.name].type)) {\n          acc.push({\n            value: field.name,\n            label: typeof field.label !== 'string' ? formatMessage(field.label) : field.label,\n          });\n        }\n\n        return acc;\n      }, []),\n    [formatMessage, layout, schema]\n  );\n\n  const sortOptionsSorted = sortOptions.sort((a, b) => formatter.compare(a.label, b.label));\n\n  React.useEffect(() => {\n    if (sortOptionsSorted.findIndex((opt) => opt.value === currentSortBy) === -1) {\n      onChange('settings.defaultSortBy', sortOptionsSorted[0]?.value);\n    }\n  }, [currentSortBy, onChange, sortOptionsSorted]);\n\n  const formLayout = React.useMemo(\n    () =>\n      SETTINGS_FORM_LAYOUT.map((row) =>\n        row.map((field) => {\n          if (field.type === 'enumeration') {\n            return {\n              ...field,\n              hint: field.hint ? formatMessage(field.hint) : undefined,\n              label: formatMessage(field.label),\n              options: field.name === 'settings.defaultSortBy' ? sortOptionsSorted : field.options,\n            };\n          } else {\n            return {\n              ...field,\n              hint: field.hint ? formatMessage(field.hint) : undefined,\n              label: formatMessage(field.label),\n            };\n          }\n        })\n      ) as [top: EditFieldLayout[], bottom: EditFieldLayout[]],\n    [formatMessage, sortOptionsSorted]\n  );\n\n  return (\n    <Flex direction=\"column\" alignItems=\"stretch\" gap={4}>\n      <Typography variant=\"delta\" tag=\"h2\">\n        {formatMessage({\n          id: getTranslation('containers.SettingPage.settings'),\n          defaultMessage: 'Settings',\n        })}\n      </Typography>\n      <Grid.Root key=\"bottom\" gap={4}>\n        {formLayout.map((row) =>\n          row.map(({ size, ...field }) => (\n            <Grid.Item key={field.name} xs={12} col={size} direction=\"column\" alignItems=\"stretch\">\n              {/* @ts-expect-error – issue with EnumerationProps conflicting with InputProps */}\n              <InputRenderer {...field} />\n            </Grid.Item>\n          ))\n        )}\n      </Grid.Root>\n    </Flex>\n  );\n};\n\nconst SETTINGS_FORM_LAYOUT: FormLayoutInputProps[][] = [\n  [\n    {\n      label: {\n        id: getTranslation('form.Input.search'),\n        defaultMessage: 'Enable search',\n      },\n      name: 'settings.searchable',\n      size: 4,\n      type: 'boolean' as const,\n    },\n    {\n      label: {\n        id: getTranslation('form.Input.filters'),\n        defaultMessage: 'Enable filters',\n      },\n      name: 'settings.filterable',\n      size: 4,\n      type: 'boolean' as const,\n    },\n    {\n      label: {\n        id: getTranslation('form.Input.bulkActions'),\n        defaultMessage: 'Enable bulk actions',\n      },\n      name: 'settings.bulkable',\n      size: 4,\n      type: 'boolean' as const,\n    },\n  ],\n  [\n    {\n      hint: {\n        id: getTranslation('form.Input.pageEntries.inputDescription'),\n        defaultMessage: 'Note: You can override this value in the Collection Type settings page.',\n      },\n      label: {\n        id: getTranslation('form.Input.pageEntries'),\n        defaultMessage: 'Entries per page',\n      },\n      name: 'settings.pageSize',\n      options: ['10', '20', '50', '100'].map((value) => ({ value, label: value })),\n      size: 6,\n      type: 'enumeration' as const,\n    },\n    {\n      label: {\n        id: getTranslation('form.Input.defaultSort'),\n        defaultMessage: 'Default sort attribute',\n      },\n      name: 'settings.defaultSortBy',\n      options: [],\n      size: 3,\n      type: 'enumeration' as const,\n    },\n    {\n      label: {\n        id: getTranslation('form.Input.sort.order'),\n        defaultMessage: 'Default sort order',\n      },\n      name: 'settings.defaultSortOrder',\n      options: ['ASC', 'DESC'].map((value) => ({ value, label: value })),\n      size: 3,\n      type: 'enumeration' as const,\n    },\n  ],\n];\n\nexport { Settings };\n"],"names":["EXCLUDED_SORT_ATTRIBUTE_TYPES","Set","Settings","formatMessage","locale","useIntl","formatter","useCollator","sensitivity","schema","useDoc","layout","useForm","state","values","currentSortBy","settings","defaultSortBy","onChange","sortOptions","React","useMemo","Object","reduce","acc","field","has","attributes","name","type","push","value","label","sortOptionsSorted","sort","a","b","compare","useEffect","findIndex","opt","formLayout","SETTINGS_FORM_LAYOUT","map","row","hint","undefined","options","_jsxs","Flex","direction","alignItems","gap","_jsx","Typography","variant","tag","id","getTranslation","defaultMessage","Grid","Root","size","Item","xs","col","InputRenderer"],"mappings":"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"}
+{"version":3,"file":"Settings.mjs","sources":["../../../../../admin/src/pages/ListConfiguration/components/Settings.tsx"],"sourcesContent":["import * as React from 'react';\n\nimport { useForm, InputRenderer, type InputProps } from '@strapi/admin/strapi-admin';\nimport { Flex, Grid, Typography, useCollator } from '@strapi/design-system';\nimport { type MessageDescriptor, useIntl } from 'react-intl';\n\nimport { COLLECTION_TYPES } from '../../../constants/collections';\nimport { isCustomOrderFeatureEnabled } from '../../../constants/customOrder';\nimport { useDoc } from '../../../hooks/useDocument';\nimport { type EditFieldLayout } from '../../../hooks/useDocumentLayout';\nimport { getTranslation } from '../../../utils/translations';\nimport { type FormData } from '../ListConfigurationPage';\n\nimport type { DistributiveOmit } from 'react-redux';\n\nexport type InputPropsWithMessageDescriptors = DistributiveOmit<\n  InputProps,\n  'hint' | 'label' | 'placeholder'\n> & {\n  hint?: MessageDescriptor;\n  label: MessageDescriptor;\n  placeholder?: MessageDescriptor;\n};\n\n/**\n * @internal\n * @description Form inputs are always displayed in a grid, so we need\n * to use the size property to determine how many columns the input should\n * take up.\n */\nexport type FormLayoutInputProps = InputPropsWithMessageDescriptors & { size: number };\n\nconst EXCLUDED_SORT_ATTRIBUTE_TYPES = new Set([\n  'media',\n  'richtext',\n  'dynamiczone',\n  'relation',\n  'component',\n  'json',\n  'blocks',\n]);\n\ninterface SortOption {\n  value: string;\n  label: string;\n}\n\nconst Settings = () => {\n  const { formatMessage, locale } = useIntl();\n  const formatter = useCollator(locale, {\n    sensitivity: 'base',\n  });\n  const { schema, collectionType } = useDoc();\n\n  const layout = useForm<FormData['layout']>(\n    'Settings',\n    (state) => (state.values as FormData).layout ?? []\n  );\n  const hasCustomOrder = useForm<FormData['settings']['customOrder']>(\n    'Settings',\n    (state) => (state.values as FormData).settings.customOrder\n  );\n  const canUseCustomOrder = collectionType === COLLECTION_TYPES && isCustomOrderFeatureEnabled();\n  const currentSortBy = useForm<FormData['settings']['defaultSortBy']>(\n    'Settings',\n    (state) => (state.values as FormData).settings.defaultSortBy\n  );\n  const onChange = useForm('Settings', (state) => state.onChange);\n\n  const sortOptions = React.useMemo(\n    () =>\n      Object.values(layout).reduce<SortOption[]>((acc, field) => {\n        if (schema && !EXCLUDED_SORT_ATTRIBUTE_TYPES.has(schema.attributes[field.name].type)) {\n          acc.push({\n            value: field.name,\n            label: typeof field.label !== 'string' ? formatMessage(field.label) : field.label,\n          });\n        }\n\n        return acc;\n      }, []),\n    [formatMessage, layout, schema]\n  );\n\n  const sortOptionsSorted = sortOptions.sort((a, b) => formatter.compare(a.label, b.label));\n\n  React.useEffect(() => {\n    if (sortOptionsSorted.findIndex((opt) => opt.value === currentSortBy) === -1) {\n      onChange('settings.defaultSortBy', sortOptionsSorted[0]?.value);\n    }\n  }, [currentSortBy, onChange, sortOptionsSorted]);\n\n  const formLayout = React.useMemo(\n    () =>\n      [...SETTINGS_FORM_LAYOUT, ...(canUseCustomOrder ? [CUSTOM_ORDER_FORM_LAYOUT] : [])].map(\n        (row) =>\n          row.map((field) => {\n            if (field.type === 'enumeration') {\n              return {\n                ...field,\n                // The custom order takes over the default sort of the list\n                disabled: canUseCustomOrder && hasCustomOrder && isDefaultSortField(field.name),\n                hint: field.hint ? formatMessage(field.hint) : undefined,\n                label: formatMessage(field.label),\n                options:\n                  field.name === 'settings.defaultSortBy' ? sortOptionsSorted : field.options,\n              };\n            } else {\n              return {\n                ...field,\n                hint: field.hint ? formatMessage(field.hint) : undefined,\n                label: formatMessage(field.label),\n              };\n            }\n          })\n      ) as EditFieldLayout[][],\n    [canUseCustomOrder, formatMessage, hasCustomOrder, sortOptionsSorted]\n  );\n\n  return (\n    <Flex direction=\"column\" alignItems=\"stretch\" gap={4}>\n      <Typography variant=\"delta\" tag=\"h2\">\n        {formatMessage({\n          id: getTranslation('containers.SettingPage.settings'),\n          defaultMessage: 'Settings',\n        })}\n      </Typography>\n      <Grid.Root key=\"bottom\" gap={4}>\n        {formLayout.map((row) =>\n          row.map(({ size, ...field }) => (\n            <Grid.Item key={field.name} xs={12} col={size} direction=\"column\" alignItems=\"stretch\">\n              {/* @ts-expect-error – issue with EnumerationProps conflicting with InputProps */}\n              <InputRenderer {...field} />\n            </Grid.Item>\n          ))\n        )}\n      </Grid.Root>\n    </Flex>\n  );\n};\n\nconst SETTINGS_FORM_LAYOUT: FormLayoutInputProps[][] = [\n  [\n    {\n      label: {\n        id: getTranslation('form.Input.search'),\n        defaultMessage: 'Enable search',\n      },\n      name: 'settings.searchable',\n      size: 4,\n      type: 'boolean' as const,\n    },\n    {\n      label: {\n        id: getTranslation('form.Input.filters'),\n        defaultMessage: 'Enable filters',\n      },\n      name: 'settings.filterable',\n      size: 4,\n      type: 'boolean' as const,\n    },\n    {\n      label: {\n        id: getTranslation('form.Input.bulkActions'),\n        defaultMessage: 'Enable bulk actions',\n      },\n      name: 'settings.bulkable',\n      size: 4,\n      type: 'boolean' as const,\n    },\n  ],\n  [\n    {\n      hint: {\n        id: getTranslation('form.Input.pageEntries.inputDescription'),\n        defaultMessage: 'Note: You can override this value in the Collection Type settings page.',\n      },\n      label: {\n        id: getTranslation('form.Input.pageEntries'),\n        defaultMessage: 'Entries per page',\n      },\n      name: 'settings.pageSize',\n      options: ['10', '20', '50', '100'].map((value) => ({ value, label: value })),\n      size: 6,\n      type: 'enumeration' as const,\n    },\n    {\n      label: {\n        id: getTranslation('form.Input.defaultSort'),\n        defaultMessage: 'Default sort attribute',\n      },\n      name: 'settings.defaultSortBy',\n      options: [],\n      size: 3,\n      type: 'enumeration' as const,\n    },\n    {\n      label: {\n        id: getTranslation('form.Input.sort.order'),\n        defaultMessage: 'Default sort order',\n      },\n      name: 'settings.defaultSortOrder',\n      options: ['ASC', 'DESC'].map((value) => ({ value, label: value })),\n      size: 3,\n      type: 'enumeration' as const,\n    },\n  ],\n];\n\nconst CUSTOM_ORDER_FORM_LAYOUT: FormLayoutInputProps[] = [\n  {\n    hint: {\n      id: getTranslation('form.Input.customOrder.hint'),\n      defaultMessage:\n        'Arrange entries by hand in the list view. New entries are added on top. The Content API returns entries in this order when no sort is requested.',\n    },\n    label: {\n      id: getTranslation('form.Input.customOrder'),\n      defaultMessage: 'Enable custom order',\n    },\n    name: 'settings.customOrder',\n    size: 6,\n    type: 'boolean' as const,\n  },\n];\n\nconst isDefaultSortField = (name: string) =>\n  name === 'settings.defaultSortBy' || name === 'settings.defaultSortOrder';\n\nexport { Settings };\n"],"names":["EXCLUDED_SORT_ATTRIBUTE_TYPES","Set","Settings","formatMessage","locale","useIntl","formatter","useCollator","sensitivity","schema","collectionType","useDoc","layout","useForm","state","values","hasCustomOrder","settings","customOrder","canUseCustomOrder","COLLECTION_TYPES","isCustomOrderFeatureEnabled","currentSortBy","defaultSortBy","onChange","sortOptions","React","useMemo","Object","reduce","acc","field","has","attributes","name","type","push","value","label","sortOptionsSorted","sort","a","b","compare","useEffect","findIndex","opt","formLayout","SETTINGS_FORM_LAYOUT","CUSTOM_ORDER_FORM_LAYOUT","map","row","disabled","isDefaultSortField","hint","undefined","options","_jsxs","Flex","direction","alignItems","gap","_jsx","Typography","variant","tag","id","getTranslation","defaultMessage","Grid","Root","size","Item","xs","col","InputRenderer"],"mappings":"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"}

package/dist/admin/pages/ListView/ListViewPage.js

@@ -11,6 +11,8 @@ var reactIntl = require('react-intl');
 var reactRouterDom = require('react-router-dom');
 var styledComponents = require('styled-components');
 var InjectionZone = require('../../components/InjectionZone.js');
+var collections = require('../../constants/collections.js');
+var customOrder = require('../../constants/customOrder.js');
 var hooks = require('../../constants/hooks.js');
 var plugin = require('../../constants/plugin.js');
 var DocumentRBAC = require('../../features/DocumentRBAC.js');
@@ -25,6 +27,7 @@ var translations = require('../../utils/translations.js');
 var users = require('../../utils/users.js');
 var DocumentStatus = require('../EditView/components/DocumentStatus.js');
 var Actions = require('./components/BulkActions/Actions.js');
+var CustomOrder = require('./components/CustomOrder.js');
 var Filters = require('./components/Filters.js');
 var TableActions = require('./components/TableActions.js');
 var CellContent = require('./components/TableCells/CellContent.js');
@@ -63,6 +66,16 @@ const NON_LINKABLE_TYPES = new Set([
  * -----------------------------------------------------------------------------------------------*/ const LayoutsHeaderCustom = styledComponents.styled(strapiAdmin.Layouts.Header)`
   overflow-wrap: anywhere;
 `;
+/**
+ * When the entries of the collection type follow a custom order, that order is
+ * what the list shows unless the user sorts on a column.
+ */ const hasCustomOrderEnabled = (collectionType, settings)=>collectionType === collections.COLLECTION_TYPES && settings.customOrder === true && customOrder.isCustomOrderFeatureEnabled();
+const getDefaultSort = (settings, hasCustomOrder)=>{
+    if (hasCustomOrder) {
+        return customOrder.CUSTOM_ORDER_SORT;
+    }
+    return settings.defaultSortBy ? `${settings.defaultSortBy}:${settings.defaultSortOrder}` : '';
+};
 const ListViewPage = ()=>{
     const { trackUsage } = strapiAdmin.useTracking();
     const navigate = reactRouterDom.useNavigate();
@@ -178,11 +191,26 @@ const ListViewPage = ()=>{
         schema?.attributes,
         schema?.uid
     ]);
+    const hasCustomOrder = hasCustomOrderEnabled(collectionType, list.settings);
     const [{ query }, setQuery] = strapiAdmin.useQueryParams({
         page: '1',
         pageSize: list.settings.pageSize.toString(),
-        sort: list.settings.defaultSortBy ? `${list.settings.defaultSortBy}:${list.settings.defaultSortOrder}` : ''
+        sort: getDefaultSort(list.settings, hasCustomOrder)
     });
+    // A sort on the custom order can be left over in the URL or in the saved view
+    // after the setting has been turned off.
+    React__namespace.useEffect(()=>{
+        if (!isLoadingLayout && !hasCustomOrder && typeof query.sort === 'string' && query.sort.startsWith(`${customOrder.CUSTOM_ORDER_FIELD}:`)) {
+            setQuery(strapiAdmin.withEncodedUserParams(query, {
+                sort: undefined
+            }), 'push', true);
+        }
+    }, [
+        hasCustomOrder,
+        isLoadingLayout,
+        query,
+        setQuery
+    ]);
     React__namespace.useEffect(()=>{
         if (!configurationReady || !schema?.attributes || schema.uid !== model) {
             return;
@@ -247,7 +275,7 @@ const ListViewPage = ()=>{
         query,
         setQuery
     ]);
-    const { data, error, isLoading, isFetching } = documents.useGetAllDocumentsQuery({
+    const { data, error, isLoading, isFetching, fulfilledTimeStamp } = documents.useGetAllDocumentsQuery({
         model,
         params
     }, {
@@ -285,10 +313,19 @@ const ListViewPage = ()=>{
         query,
         navigate
     ]);
-    const { canCreate, isLoadingActionsRBAC } = DocumentRBAC.useDocumentRBAC('ListViewPage', ({ canCreate, isLoading })=>({
+    const { canCreate, canUpdate, isLoadingActionsRBAC } = DocumentRBAC.useDocumentRBAC('ListViewPage', ({ canCreate, canUpdate, isLoading })=>({
             canCreate,
+            canUpdate,
             isLoadingActionsRBAC: isLoading
         }));
+    const customOrder$1 = CustomOrder.useCustomOrder({
+        model,
+        isAvailable: hasCustomOrder,
+        canUpdate: canUpdate === true,
+        sort: query.sort,
+        params,
+        results,
+        pagination});
     const runHookWaterfall = strapiAdmin.useStrapiApp('ListViewPage', ({ runHookWaterfall })=>runHookWaterfall);
     /**
    * Run the waterfall and then inject our additional table headers.
@@ -327,10 +364,26 @@ const ListViewPage = ()=>{
                 sortable: !hasStatusFilter
             });
         }
+        if (hasCustomOrder) {
+            // Sorting on this column is how the user comes back to the custom order
+            formattedHeaders.unshift({
+                attribute: {
+                    type: 'custom'
+                },
+                name: customOrder.CUSTOM_ORDER_FIELD,
+                label: formatMessage({
+                    id: translations.getTranslation('containers.list.table-headers.order'),
+                    defaultMessage: 'order'
+                }),
+                searchable: false,
+                sortable: true
+            });
+        }
         return formattedHeaders;
     }, [
         displayedHeaders,
         formatMessage,
+        hasCustomOrder,
         hasStatusFilter,
         list,
         runHookWaterfall,
@@ -368,7 +421,7 @@ const ListViewPage = ()=>{
    * Only genuinely interactive cells are skipped: relations, media, components,
    * dynamic zones (they embed their own links/menus), plugin-formatted columns
    * (`cellFormatter`), and the synthetic `status` column.
-   */ const linkCandidates = tableHeaders.filter(({ name, attribute, cellFormatter })=>name !== 'status' && typeof cellFormatter !== 'function' && attribute && !NON_LINKABLE_TYPES.has(attribute.type));
+   */ const linkCandidates = tableHeaders.filter(({ name, attribute, cellFormatter })=>name !== 'status' && name !== customOrder.CUSTOM_ORDER_FIELD && typeof cellFormatter !== 'function' && attribute && !NON_LINKABLE_TYPES.has(attribute.type));
     // The link column for a given row: the first candidate that actually has a
     // value (uses CellContent's own hasContent so it matches the "-" the cell
     // would otherwise render). documentId is checked directly (its own cell).
@@ -483,141 +536,152 @@ const ListViewPage = ()=>{
                             direction: "column",
                             alignItems: "stretch",
                             children: [
-                                /*#__PURE__*/ jsxRuntime.jsxs(strapiAdmin.Table.Root, {
-                                    rows: results,
-                                    headers: tableHeaders,
-                                    isLoading: isFetching,
-                                    children: [
-                                        /*#__PURE__*/ jsxRuntime.jsx(TableActionsBar, {}),
-                                        /*#__PURE__*/ jsxRuntime.jsxs(strapiAdmin.Table.Content, {
-                                            children: [
-                                                /*#__PURE__*/ jsxRuntime.jsxs(strapiAdmin.Table.Head, {
-                                                    children: [
-                                                        /*#__PURE__*/ jsxRuntime.jsx(strapiAdmin.Table.HeaderCheckboxCell, {}),
-                                                        tableHeaders.map((header)=>/*#__PURE__*/ jsxRuntime.jsx(strapiAdmin.Table.HeaderCell, {
-                                                                ...header
-                                                            }, header.name))
-                                                    ]
-                                                }),
-                                                /*#__PURE__*/ jsxRuntime.jsx(strapiAdmin.Table.Loading, {}),
-                                                /*#__PURE__*/ jsxRuntime.jsx(strapiAdmin.Table.Empty, {
-                                                    action: canCreate ? /*#__PURE__*/ jsxRuntime.jsx(CreateButton, {
-                                                        variant: "secondary"
-                                                    }) : null
-                                                }),
-                                                /*#__PURE__*/ jsxRuntime.jsx(strapiAdmin.Table.Body, {
-                                                    children: results.map((row)=>{
-                                                        const rowLinkField = getRowLinkField(row);
-                                                        return /*#__PURE__*/ jsxRuntime.jsxs(strapiAdmin.Table.Row, {
-                                                            cursor: "pointer",
-                                                            onClick: handleRowClick(row.documentId),
-                                                            children: [
-                                                                /*#__PURE__*/ jsxRuntime.jsx(strapiAdmin.Table.CheckboxCell, {
-                                                                    id: row.id
-                                                                }),
-                                                                tableHeaders.map(({ cellFormatter, ...header })=>{
-                                                                    if (header.name === 'status') {
-                                                                        const { status } = row;
-                                                                        return /*#__PURE__*/ jsxRuntime.jsx(strapiAdmin.Table.Cell, {
-                                                                            children: /*#__PURE__*/ jsxRuntime.jsx(DocumentStatus.DocumentStatus, {
-                                                                                status: status,
-                                                                                maxWidth: 'min-content'
-                                                                            })
-                                                                        }, header.name);
-                                                                    }
-                                                                    if ([
-                                                                        'createdBy',
-                                                                        'updatedBy'
-                                                                    ].includes(header.name.split('.')[0])) {
-                                                                        // Display the users full name
-                                                                        // Some entries doesn't have a user assigned as creator/updater (ex: entries created through content API)
-                                                                        // In this case, we display a dash
-                                                                        return /*#__PURE__*/ jsxRuntime.jsx(strapiAdmin.Table.Cell, {
-                                                                            children: /*#__PURE__*/ jsxRuntime.jsx(designSystem.Typography, {
-                                                                                textColor: "neutral800",
-                                                                                children: row[header.name.split('.')[0]] ? users.getDisplayName(row[header.name.split('.')[0]]) : '-'
-                                                                            })
-                                                                        }, header.name);
-                                                                    }
-                                                                    if (header.name === 'documentId') {
-                                                                        // When documentId is the primary link column, only its
-                                                                        // id text becomes the link; the copy button stays outside.
-                                                                        const isDocumentIdLink = header.name === rowLinkField && Boolean(row.documentId);
-                                                                        return /*#__PURE__*/ jsxRuntime.jsx(strapiAdmin.Table.Cell, {
-                                                                            children: /*#__PURE__*/ jsxRuntime.jsxs(designSystem.Flex, {
-                                                                                gap: 2,
-                                                                                alignItems: "center",
-                                                                                width: "100%",
-                                                                                minWidth: 0,
-                                                                                children: [
-                                                                                    isDocumentIdLink ? /*#__PURE__*/ jsxRuntime.jsx(designSystem.Typography, {
-                                                                                        tag: reactRouterDom.Link,
-                                                                                        to: {
-                                                                                            pathname: row.documentId,
-                                                                                            search: qs.stringify({
-                                                                                                plugins: query.plugins
-                                                                                            })
-                                                                                        },
-                                                                                        onClick: (e)=>e.stopPropagation(),
-                                                                                        textColor: "neutral800",
-                                                                                        maxWidth: "30rem",
-                                                                                        ellipsis: true,
-                                                                                        children: row.documentId
-                                                                                    }) : /*#__PURE__*/ jsxRuntime.jsx(designSystem.Typography, {
-                                                                                        textColor: "neutral800",
-                                                                                        maxWidth: "30rem",
-                                                                                        ellipsis: true,
-                                                                                        children: row.documentId || '-'
-                                                                                    }),
-                                                                                    row.documentId && /*#__PURE__*/ jsxRuntime.jsx(designSystem.IconButton, {
-                                                                                        variant: "ghost",
-                                                                                        size: "S",
-                                                                                        label: formatMessage({
-                                                                                            id: 'content-manager.actions.copy-documentId.label',
-                                                                                            defaultMessage: 'Copy'
+                                /*#__PURE__*/ jsxRuntime.jsx(CustomOrder.CustomOrder.Root, {
+                                    state: customOrder$1,
+                                    children: /*#__PURE__*/ jsxRuntime.jsxs(strapiAdmin.Table.Root, {
+                                        rows: customOrder$1.rows,
+                                        headers: tableHeaders,
+                                        isLoading: isFetching && !customOrder$1.isMoving,
+                                        children: [
+                                            /*#__PURE__*/ jsxRuntime.jsx(TableActionsBar, {}),
+                                            /*#__PURE__*/ jsxRuntime.jsxs(strapiAdmin.Table.Content, {
+                                                children: [
+                                                    /*#__PURE__*/ jsxRuntime.jsxs(strapiAdmin.Table.Head, {
+                                                        children: [
+                                                            /*#__PURE__*/ jsxRuntime.jsx(strapiAdmin.Table.HeaderCheckboxCell, {}),
+                                                            tableHeaders.map((header)=>/*#__PURE__*/ jsxRuntime.jsx(strapiAdmin.Table.HeaderCell, {
+                                                                    ...header
+                                                                }, header.name))
+                                                        ]
+                                                    }),
+                                                    /*#__PURE__*/ jsxRuntime.jsx(strapiAdmin.Table.Loading, {}),
+                                                    /*#__PURE__*/ jsxRuntime.jsx(strapiAdmin.Table.Empty, {
+                                                        action: canCreate ? /*#__PURE__*/ jsxRuntime.jsx(CreateButton, {
+                                                            variant: "secondary"
+                                                        }) : null
+                                                    }),
+                                                    /*#__PURE__*/ jsxRuntime.jsx(strapiAdmin.Table.Body, {
+                                                        children: customOrder$1.rows.map((row, index)=>{
+                                                            const rowLinkField = getRowLinkField(row);
+                                                            return /*#__PURE__*/ jsxRuntime.jsxs(CustomOrder.CustomOrder.Row, {
+                                                                cursor: "pointer",
+                                                                documentId: row.documentId,
+                                                                onClick: handleRowClick(row.documentId),
+                                                                children: [
+                                                                    /*#__PURE__*/ jsxRuntime.jsx(strapiAdmin.Table.CheckboxCell, {
+                                                                        id: row.id
+                                                                    }),
+                                                                    tableHeaders.map(({ cellFormatter, ...header })=>{
+                                                                        if (header.name === customOrder.CUSTOM_ORDER_FIELD) {
+                                                                            return /*#__PURE__*/ jsxRuntime.jsx(CustomOrder.CustomOrder.PositionCell, {
+                                                                                documentId: row.documentId,
+                                                                                position: ((pagination?.page ?? 1) - 1) * (pagination?.pageSize ?? 0) + index + 1,
+                                                                                total: pagination?.total ?? customOrder$1.rows.length
+                                                                            }, header.name);
+                                                                        }
+                                                                        if (header.name === 'status') {
+                                                                            const { status } = row;
+                                                                            return /*#__PURE__*/ jsxRuntime.jsx(strapiAdmin.Table.Cell, {
+                                                                                children: /*#__PURE__*/ jsxRuntime.jsx(DocumentStatus.DocumentStatus, {
+                                                                                    status: status,
+                                                                                    maxWidth: 'min-content'
+                                                                                })
+                                                                            }, header.name);
+                                                                        }
+                                                                        if ([
+                                                                            'createdBy',
+                                                                            'updatedBy'
+                                                                        ].includes(header.name.split('.')[0])) {
+                                                                            // Display the users full name
+                                                                            // Some entries doesn't have a user assigned as creator/updater (ex: entries created through content API)
+                                                                            // In this case, we display a dash
+                                                                            return /*#__PURE__*/ jsxRuntime.jsx(strapiAdmin.Table.Cell, {
+                                                                                children: /*#__PURE__*/ jsxRuntime.jsx(designSystem.Typography, {
+                                                                                    textColor: "neutral800",
+                                                                                    children: row[header.name.split('.')[0]] ? users.getDisplayName(row[header.name.split('.')[0]]) : '-'
+                                                                                })
+                                                                            }, header.name);
+                                                                        }
+                                                                        if (header.name === 'documentId') {
+                                                                            // When documentId is the primary link column, only its
+                                                                            // id text becomes the link; the copy button stays outside.
+                                                                            const isDocumentIdLink = header.name === rowLinkField && Boolean(row.documentId);
+                                                                            return /*#__PURE__*/ jsxRuntime.jsx(strapiAdmin.Table.Cell, {
+                                                                                children: /*#__PURE__*/ jsxRuntime.jsxs(designSystem.Flex, {
+                                                                                    gap: 2,
+                                                                                    alignItems: "center",
+                                                                                    width: "100%",
+                                                                                    minWidth: 0,
+                                                                                    children: [
+                                                                                        isDocumentIdLink ? /*#__PURE__*/ jsxRuntime.jsx(designSystem.Typography, {
+                                                                                            tag: reactRouterDom.Link,
+                                                                                            to: {
+                                                                                                pathname: row.documentId,
+                                                                                                search: qs.stringify({
+                                                                                                    plugins: query.plugins
+                                                                                                })
+                                                                                            },
+                                                                                            onClick: (e)=>e.stopPropagation(),
+                                                                                            textColor: "neutral800",
+                                                                                            maxWidth: "30rem",
+                                                                                            ellipsis: true,
+                                                                                            children: row.documentId
+                                                                                        }) : /*#__PURE__*/ jsxRuntime.jsx(designSystem.Typography, {
+                                                                                            textColor: "neutral800",
+                                                                                            maxWidth: "30rem",
+                                                                                            ellipsis: true,
+                                                                                            children: row.documentId || '-'
                                                                                         }),
-                                                                                        onClick: (e)=>handleCopyDocumentId(e, row.documentId),
-                                                                                        children: /*#__PURE__*/ jsxRuntime.jsx(Icons.Duplicate, {})
-                                                                                    })
-                                                                                ]
-                                                                            })
-                                                                        }, header.name);
-                                                                    }
-                                                                    if (typeof cellFormatter === 'function') {
+                                                                                        row.documentId && /*#__PURE__*/ jsxRuntime.jsx(designSystem.IconButton, {
+                                                                                            variant: "ghost",
+                                                                                            size: "S",
+                                                                                            label: formatMessage({
+                                                                                                id: 'content-manager.actions.copy-documentId.label',
+                                                                                                defaultMessage: 'Copy'
+                                                                                            }),
+                                                                                            onClick: (e)=>handleCopyDocumentId(e, row.documentId),
+                                                                                            children: /*#__PURE__*/ jsxRuntime.jsx(Icons.Duplicate, {})
+                                                                                        })
+                                                                                    ]
+                                                                                })
+                                                                            }, header.name);
+                                                                        }
+                                                                        if (typeof cellFormatter === 'function') {
+                                                                            return /*#__PURE__*/ jsxRuntime.jsx(strapiAdmin.Table.Cell, {
+                                                                                children: cellFormatter(row, header, {
+                                                                                    collectionType,
+                                                                                    model
+                                                                                })
+                                                                            }, header.name);
+                                                                        }
                                                                         return /*#__PURE__*/ jsxRuntime.jsx(strapiAdmin.Table.Cell, {
-                                                                            children: cellFormatter(row, header, {
-                                                                                collectionType,
-                                                                                model
+                                                                            children: /*#__PURE__*/ jsxRuntime.jsx(CellContent.CellContent, {
+                                                                                content: row[header.name.split('.')[0]],
+                                                                                rowId: row.documentId,
+                                                                                ...header,
+                                                                                linkTo: header.name === rowLinkField ? {
+                                                                                    pathname: row.documentId,
+                                                                                    search: qs.stringify({
+                                                                                        plugins: query.plugins
+                                                                                    })
+                                                                                } : undefined
                                                                             })
                                                                         }, header.name);
-                                                                    }
-                                                                    return /*#__PURE__*/ jsxRuntime.jsx(strapiAdmin.Table.Cell, {
-                                                                        children: /*#__PURE__*/ jsxRuntime.jsx(CellContent.CellContent, {
-                                                                            content: row[header.name.split('.')[0]],
-                                                                            rowId: row.documentId,
-                                                                            ...header,
-                                                                            linkTo: header.name === rowLinkField ? {
-                                                                                pathname: row.documentId,
-                                                                                search: qs.stringify({
-                                                                                    plugins: query.plugins
-                                                                                })
-                                                                            } : undefined
+                                                                    }),
+                                                                    /*#__PURE__*/ jsxRuntime.jsx(ActionsCell, {
+                                                                        onClick: (e)=>e.stopPropagation(),
+                                                                        children: /*#__PURE__*/ jsxRuntime.jsx(TableActions.TableActions, {
+                                                                            document: row
                                                                         })
-                                                                    }, header.name);
-                                                                }),
-                                                                /*#__PURE__*/ jsxRuntime.jsx(ActionsCell, {
-                                                                    onClick: (e)=>e.stopPropagation(),
-                                                                    children: /*#__PURE__*/ jsxRuntime.jsx(TableActions.TableActions, {
-                                                                        document: row
                                                                     })
-                                                                })
-                                                            ]
-                                                        }, row.id);
+                                                                ]
+                                                            }, row.id);
+                                                        })
                                                     })
-                                                })
-                                            ]
-                                        })
-                                    ]
+                                                ]
+                                            })
+                                        ]
+                                    })
                                 }),
                                 /*#__PURE__*/ jsxRuntime.jsxs(strapiAdmin.Pagination.Root, {
                                     ...pagination,