{hideCreate === false && !list.isSingleton && (
-
+
Create {list.singular}
@@ -106,7 +108,7 @@ function CreateButton (props: LinkProps) {
export function HomePage () {
const {
- adminMeta: { lists },
+ adminMeta: { lists, config },
visibleLists,
} = useKeystone()
const query = useMemo(
@@ -114,6 +116,9 @@ export function HomePage () {
query {
keystone {
adminMeta {
+ config {
+ adminPath
+ }
lists {
key
hideCreate
@@ -158,10 +163,11 @@ export function HomePage () {
)
}
return Object.keys(lists).map(key => {
- if (!visibleLists.lists.has(key)) {
+ const list = lists[key]
+ if (!visibleLists.lists.has(list.key)) {
return null
}
- const result = dataGetter.get(key)
+ const result = dataGetter.get(list.key)
return (
)
})
diff --git a/packages/core/src/___internal-do-not-use-will-break-in-patch/admin-ui/pages/ItemPage/index.tsx b/packages/core/src/___internal-do-not-use-will-break-in-patch/admin-ui/pages/ItemPage/index.tsx
index b5f3d46cd42..ebe8366d26d 100644
--- a/packages/core/src/___internal-do-not-use-will-break-in-patch/admin-ui/pages/ItemPage/index.tsx
+++ b/packages/core/src/___internal-do-not-use-will-break-in-patch/admin-ui/pages/ItemPage/index.tsx
@@ -45,7 +45,10 @@ import { CreateButtonLink } from '../../../../admin-ui/components/CreateButtonLi
import { BaseToolbar, ColumnLayout, ItemPageHeader } from './common'
type ItemPageProps = {
- listKey: string
+ params: {
+ id: string
+ listKey: string
+ }
}
function useEventCallback any>(callback: Func): Func {
@@ -330,11 +333,9 @@ function DeleteButton ({
)
}
-export const getItemPage = (props: ItemPageProps) => () =>
-
-function ItemPage ({ listKey }: ItemPageProps) {
- const list = useList(listKey)
- const id = useRouter().query.id as string
+export function ItemPage ({ params }: ItemPageProps) {
+ const list = useList(params?.listKey)
+ const id = params?.id as string
const { query, selectedFields } = useMemo(() => {
const selectedFields = Object.entries(list.fields)
@@ -385,6 +386,9 @@ function ItemPage ({ listKey }: ItemPageProps) {
item: ItemData
keystone: {
adminMeta: {
+ config: {
+ adminPath: string
+ }
list: {
fields: {
path: string
diff --git a/packages/core/src/___internal-do-not-use-will-break-in-patch/admin-ui/pages/ListPage/FieldSelection.tsx b/packages/core/src/___internal-do-not-use-will-break-in-patch/admin-ui/pages/ListPage/FieldSelection.tsx
index fcfd317dfba..4f6fb63a66d 100644
--- a/packages/core/src/___internal-do-not-use-will-break-in-patch/admin-ui/pages/ListPage/FieldSelection.tsx
+++ b/packages/core/src/___internal-do-not-use-will-break-in-patch/admin-ui/pages/ListPage/FieldSelection.tsx
@@ -5,7 +5,7 @@ import { Box, jsx } from '@keystone-ui/core'
import { ChevronDownIcon } from '@keystone-ui/icons/icons/ChevronDownIcon'
import { Options, OptionPrimitive, CheckMark } from '@keystone-ui/options'
import { Popover } from '@keystone-ui/popover'
-import { useRouter } from 'next/router'
+import { usePathname, useRouter, useSearchParams } from 'next/navigation'
import { type ListMeta } from '../../../../types'
import { useSelectedFields } from './useSelectedFields'
@@ -19,7 +19,7 @@ function isArrayEqual (arrA: string[], arrB: string[]) {
return true
}
-const Option: typeof OptionPrimitive = props => {
+const Option: typeof OptionPrimitive = (props) => {
return (
{props.children}
@@ -33,7 +33,9 @@ const Option: typeof OptionPrimitive = props => {
}
// TODO: return type required by pnpm :(
-export const fieldSelectionOptionsComponents: Parameters[0]['components'] = {
+export const fieldSelectionOptionsComponents: Parameters<
+ typeof Options
+>[0]['components'] = {
Option,
}
@@ -45,18 +47,26 @@ export function FieldSelection ({
fieldModesByFieldPath: Record
}) {
const router = useRouter()
+ const pathname = usePathname()
+ const searchParams = useSearchParams()
+
+ // Create a query object that behaves like the old query object
+ const query = {}
+ for (let [key, value] of searchParams.entries()) {
+ query[key] = value
+ }
const selectedFields = useSelectedFields(list, fieldModesByFieldPath)
const setNewSelectedFields = (selectedFields: string[]) => {
if (isArrayEqual(selectedFields, list.initialColumns)) {
- const { fields: _ignore, ...otherQueryFields } = router.query
+ const { fields: _ignore, ...otherQueryFields } = query
router.push({ query: otherQueryFields })
} else {
- router.push({ query: { ...router.query, fields: selectedFields.join(',') } })
+ router.push({ query: { ...query, fields: selectedFields.join(',') } })
}
}
const fields: { value: string, label: string, isDisabled: boolean }[] = []
- Object.keys(fieldModesByFieldPath).forEach(fieldPath => {
+ Object.keys(fieldModesByFieldPath).forEach((fieldPath) => {
if (fieldModesByFieldPath[fieldPath] === 'read') {
fields.push({
value: fieldPath,
@@ -72,7 +82,13 @@ export function FieldSelection ({
triggerRenderer={({ triggerProps }) => {
return (