refactor(ui,next): move admin views from packages/next to packages/ui

Author: jacobsfletch

packages/next/src/esbuildEntry.ts

@@ -1,4 +1,2 @@
 export { RootLayout } from './layouts/Root/index.js'
-export { DashboardView } from './views/Dashboard/index.js'
-export { LoginView } from './views/Login/index.js'
 export { RootPage } from './views/Root/index.js'

packages/next/src/exports/views.ts

@@ -1,16 +1,16 @@
 export { AccountView } from '../views/Account/index.js'
-export { CreateFirstUserView } from '../views/CreateFirstUser/index.js'
-export {
-  type DashboardViewClientProps,
-  type DashboardViewServerProps,
-  type DashboardViewServerPropsOnly,
-  DefaultDashboard,
-} from '../views/Dashboard/Default/index.js'
-export { DashboardView } from '../views/Dashboard/index.js'
-
 export { ListView, renderListView, type RenderListViewArgs } from '../views/List/index.js'
-export { LoginView } from '../views/Login/index.js'
 export { NotFoundPage } from '../views/NotFound/index.js'
 
 export { type GenerateViewMetadata, RootPage } from '../views/Root/index.js'
 export { generatePageMetadata } from '../views/Root/metadata.js'
+export { CreateFirstUserView } from '@payloadcms/ui/views/CreateFirstUser'
+
+export {
+  DashboardView,
+  type DashboardViewClientProps,
+  type DashboardViewServerProps,
+  type DashboardViewServerPropsOnly,
+  DefaultDashboard,
+} from '@payloadcms/ui/views/Dashboard'
+export { LoginView } from '@payloadcms/ui/views/Login'

packages/next/src/utilities/handleServerFunctions.ts

@@ -8,9 +8,11 @@ import {
 import { buildFormStateHandler } from '@payloadcms/ui/utilities/buildFormState'
 import { buildTableStateHandler } from '@payloadcms/ui/utilities/buildTableState'
 import { schedulePublishHandler } from '@payloadcms/ui/utilities/schedulePublishHandler'
+import {
+  getDefaultLayoutHandler,
+  renderWidgetHandler,
+} from '@payloadcms/ui/views/Dashboard/serverFunctions'
 
-import { getDefaultLayoutHandler } from '../views/Dashboard/Default/ModularDashboard/renderWidget/getDefaultLayoutServerFn.js'
-import { renderWidgetHandler } from '../views/Dashboard/Default/ModularDashboard/renderWidget/renderWidgetServerFn.js'
 import { renderDocumentHandler } from '../views/Document/handleServerFunction.js'
 import { renderDocumentSlotsHandler } from '../views/Document/renderDocumentSlots.js'
 import { renderListHandler } from '../views/List/handleServerFunction.js'

packages/next/src/utilities/meta.spec.ts

@@ -1,10 +1,10 @@
 import { describe, expect, it } from 'vitest'
 
-import { generateMetadata } from './meta.js'
+import { formatNextMetadata } from './meta.js'
 
-describe('generateMetadata', () => {
+describe('formatNextMetadata', () => {
   it('should handle a string title with titleSuffix', async () => {
-    const result = await generateMetadata({
+    const result = await formatNextMetadata({
       serverURL: 'http://localhost:3000',
       title: 'Dashboard',
       titleSuffix: '- My CMS',
@@ -14,7 +14,7 @@ describe('generateMetadata', () => {
   })
 
   it('should apply titleSuffix to default and template fields of a TemplateString title object', async () => {
-    const result = await generateMetadata({
+    const result = await formatNextMetadata({
       serverURL: 'http://localhost:3000',
       title: { default: 'Dashboard', template: '%s | Dashboard' },
       titleSuffix: '- My CMS',
@@ -30,7 +30,7 @@ describe('generateMetadata', () => {
   })
 
   it('should use the TemplateString default for ogTitle when title is a TemplateString object', async () => {
-    const result = await generateMetadata({
+    const result = await formatNextMetadata({
       serverURL: 'http://localhost:3000',
       title: { default: 'My CMS', template: '%s | My CMS' },
       titleSuffix: '- Payload',
@@ -41,7 +41,7 @@ describe('generateMetadata', () => {
   })
 
   it('should use the TemplateString absolute for ogTitle when title has absolute property', async () => {
-    const result = await generateMetadata({
+    const result = await formatNextMetadata({
       serverURL: 'http://localhost:3000',
       title: { absolute: 'My CMS Absolute' },
       titleSuffix: '- Payload',
@@ -51,7 +51,7 @@ describe('generateMetadata', () => {
   })
 
   it('should apply titleSuffix to the absolute field of a TemplateString title object', async () => {
-    const result = await generateMetadata({
+    const result = await formatNextMetadata({
       serverURL: 'http://localhost:3000',
       title: { absolute: 'My CMS Absolute' },
       titleSuffix: '- Payload',
@@ -62,7 +62,7 @@ describe('generateMetadata', () => {
   })
 
   it('should use openGraph.title string over incomingMetadata.title for ogTitle', async () => {
-    const result = await generateMetadata({
+    const result = await formatNextMetadata({
       serverURL: 'http://localhost:3000',
       title: 'My CMS',
       titleSuffix: '- Payload',
@@ -73,15 +73,15 @@ describe('generateMetadata', () => {
   })
 
   it('should return undefined for metaTitle when no title and no titleSuffix are set', async () => {
-    const result = await generateMetadata({
+    const result = await formatNextMetadata({
       serverURL: 'http://localhost:3000',
     })
 
     expect(result.title).toBeUndefined()
   })
 
   it('should return just the title when no titleSuffix is set', async () => {
-    const result = await generateMetadata({
+    const result = await formatNextMetadata({
       serverURL: 'http://localhost:3000',
       title: 'My CMS',
     })

packages/next/src/utilities/meta.ts

@@ -50,8 +50,8 @@ const defaultOpenGraph: Metadata['openGraph'] = {
   title: 'Payload App',
 }
 
-export const generateMetadata = async (
-  args: { serverURL: string } & MetaConfig,
+export const formatNextMetadata = async (
+  args: { serverURL?: string } & MetaConfig,
 ): Promise<Metadata> => {
   const { defaultOGImageType, serverURL, titleSuffix, ...rest } = args
 

packages/next/src/views/Account/index.tsx

@@ -1,19 +1,23 @@
 import type { AdminViewServerProps, DocumentViewServerPropsOnly } from 'payload'
 
-import { DocumentInfoProvider, EditDepthProvider, HydrateAuthProvider } from '@payloadcms/ui'
+import {
+  DefaultEditView,
+  DocumentInfoProvider,
+  EditDepthProvider,
+  HydrateAuthProvider,
+} from '@payloadcms/ui'
 import { RenderServerComponent } from '@payloadcms/ui/elements/RenderServerComponent'
 import { DocumentHeader } from '@payloadcms/ui/rsc'
 import { buildFormState } from '@payloadcms/ui/utilities/buildFormState'
+import { getDocPreferences } from '@payloadcms/ui/utilities/getDocPreferences'
+import { getDocumentData } from '@payloadcms/ui/utilities/getDocumentData'
 import { notFound } from 'next/navigation.js'
 import { formatAdminURL } from 'payload/shared'
 import React from 'react'
 
-import { getDocPreferences } from '../Document/getDocPreferences.js'
-import { getDocumentData } from '../Document/getDocumentData.js'
 import { getDocumentPermissions } from '../Document/getDocumentPermissions.js'
 import { getIsLocked } from '../Document/getIsLocked.js'
 import { getVersions } from '../Document/getVersions.js'
-import { EditView } from '../Edit/index.js'
 import { AccountClient } from './index.client.js'
 import { Settings } from './Settings/index.js'
 
@@ -154,7 +158,7 @@ export async function AccountView({ initPageResult, params, searchParams }: Admi
           <HydrateAuthProvider permissions={permissions} />
           {RenderServerComponent({
             Component: config.admin?.components?.views?.account?.Component,
-            Fallback: EditView,
+            Fallback: DefaultEditView,
             importMap: payload.importMap,
             serverProps: {
               doc: data,

packages/next/src/views/Account/metadata.ts

@@ -1,9 +1,9 @@
 import type { GenerateViewMetadata } from '../Root/index.js'
 
-import { generateMetadata } from '../../utilities/meta.js'
+import { formatNextMetadata } from '../../utilities/meta.js'
 
 export const generateAccountViewMetadata: GenerateViewMetadata = async ({ config, i18n: { t } }) =>
-  generateMetadata({
+  formatNextMetadata({
     description: `${t('authentication:accountOfCurrentUser')}`,
     keywords: `${t('authentication:account')}`,
     serverURL: config.serverURL,

packages/next/src/views/CollectionTrash/metadata.ts

@@ -5,7 +5,7 @@ import { getTranslation } from '@payloadcms/translations'
 
 import type { GenerateViewMetadata } from '../Root/index.js'
 
-import { generateMetadata } from '../../utilities/meta.js'
+import { formatNextMetadata } from '../../utilities/meta.js'
 
 export const generateCollectionTrashMetadata = async (
   args: {
@@ -24,7 +24,7 @@ export const generateCollectionTrashMetadata = async (
 
   title = `${title ? `${title} ` : title}${i18n.t('general:trash')}`
 
-  return generateMetadata({
+  return formatNextMetadata({
     ...(config.admin.meta || {}),
     description,
     keywords,