@payloadcms/next 3.0.0-canary.ca3dd1c → 3.0.0-canary.cb7fa00

package/dist/views/Document/getCustomViewByRoute.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/views/Document/getCustomViewByRoute.tsx"],"sourcesContent":["import type { EditViewComponent, SanitizedCollectionConfig, SanitizedGlobalConfig } from 'payload'\n\nimport { isPathMatchingRoute } from '../Root/isPathMatchingRoute.js'\n\nexport const getCustomViewByRoute = ({\n  baseRoute,\n  currentRoute,\n  views,\n}: {\n  baseRoute: string\n  currentRoute: string\n  views:\n    | SanitizedCollectionConfig['admin']['components']['views']\n    | SanitizedGlobalConfig['admin']['components']['views']\n}): EditViewComponent => {\n  if (typeof views?.Edit === 'object' && typeof views?.Edit !== 'function') {\n    const foundViewConfig = Object.entries(views.Edit).find(([, view]) => {\n      if (typeof view === 'object' && typeof view !== 'function' && 'path' in view) {\n        const viewPath = `${baseRoute}${view.path}`\n\n        return isPathMatchingRoute({\n          currentRoute,\n          exact: true,\n          path: viewPath,\n        })\n      }\n      return false\n    })?.[1]\n\n    if (foundViewConfig && 'Component' in foundViewConfig) {\n      return foundViewConfig.Component\n    }\n  }\n\n  return null\n}\n"],"names":["isPathMatchingRoute","getCustomViewByRoute","baseRoute","currentRoute","views","Edit","foundViewConfig","Object","entries","find","view","viewPath","path","exact","Component"],"mappings":"AAEA,SAASA,mBAAmB,QAAQ,iCAAgC;AAEpE,OAAO,MAAMC,uBAAuB,CAAC,EACnCC,SAAS,EACTC,YAAY,EACZC,KAAK,EAON;IACC,IAAI,OAAOA,OAAOC,SAAS,YAAY,OAAOD,OAAOC,SAAS,YAAY;QACxE,MAAMC,kBAAkBC,OAAOC,OAAO,CAACJ,MAAMC,IAAI,EAAEI,IAAI,CAAC,CAAC,GAAGC,KAAK;YAC/D,IAAI,OAAOA,SAAS,YAAY,OAAOA,SAAS,cAAc,UAAUA,MAAM;gBAC5E,MAAMC,WAAW,CAAC,EAAET,UAAU,EAAEQ,KAAKE,IAAI,CAAC,CAAC;gBAE3C,OAAOZ,oBAAoB;oBACzBG;oBACAU,OAAO;oBACPD,MAAMD;gBACR;YACF;YACA,OAAO;QACT,IAAI,CAAC,EAAE;QAEP,IAAIL,mBAAmB,eAAeA,iBAAiB;YACrD,OAAOA,gBAAgBQ,SAAS;QAClC;IACF;IAEA,OAAO;AACT,EAAC"}
+{"version":3,"sources":["../../../src/views/Document/getCustomViewByRoute.tsx"],"sourcesContent":["import type { EditViewComponent, SanitizedCollectionConfig, SanitizedGlobalConfig } from 'payload'\n\nimport { isPathMatchingRoute } from '../Root/isPathMatchingRoute.js'\n\nexport const getCustomViewByRoute = ({\n  baseRoute,\n  currentRoute,\n  views,\n}: {\n  baseRoute: string\n  currentRoute: string\n  views:\n    | SanitizedCollectionConfig['admin']['components']['views']\n    | SanitizedGlobalConfig['admin']['components']['views']\n}): EditViewComponent => {\n  if (typeof views?.edit === 'object' && typeof views?.edit !== 'function') {\n    const foundViewConfig = Object.entries(views.edit).find(([, view]) => {\n      if (typeof view === 'object' && typeof view !== 'function' && 'path' in view) {\n        const viewPath = `${baseRoute}${view.path}`\n\n        return isPathMatchingRoute({\n          currentRoute,\n          exact: true,\n          path: viewPath,\n        })\n      }\n      return false\n    })?.[1]\n\n    if (foundViewConfig && 'Component' in foundViewConfig) {\n      return foundViewConfig.Component\n    }\n  }\n\n  return null\n}\n"],"names":["isPathMatchingRoute","getCustomViewByRoute","baseRoute","currentRoute","views","edit","foundViewConfig","Object","entries","find","view","viewPath","path","exact","Component"],"mappings":"AAEA,SAASA,mBAAmB,QAAQ,iCAAgC;AAEpE,OAAO,MAAMC,uBAAuB,CAAC,EACnCC,SAAS,EACTC,YAAY,EACZC,KAAK,EAON;IACC,IAAI,OAAOA,OAAOC,SAAS,YAAY,OAAOD,OAAOC,SAAS,YAAY;QACxE,MAAMC,kBAAkBC,OAAOC,OAAO,CAACJ,MAAMC,IAAI,EAAEI,IAAI,CAAC,CAAC,GAAGC,KAAK;YAC/D,IAAI,OAAOA,SAAS,YAAY,OAAOA,SAAS,cAAc,UAAUA,MAAM;gBAC5E,MAAMC,WAAW,CAAC,EAAET,UAAU,EAAEQ,KAAKE,IAAI,CAAC,CAAC;gBAE3C,OAAOZ,oBAAoB;oBACzBG;oBACAU,OAAO;oBACPD,MAAMD;gBACR;YACF;YACA,OAAO;QACT,IAAI,CAAC,EAAE;QAEP,IAAIL,mBAAmB,eAAeA,iBAAiB;YACrD,OAAOA,gBAAgBQ,SAAS;QAClC;IACF;IAEA,OAAO;AACT,EAAC"}

package/dist/views/Document/getDocumentData.d.ts

@@ -5,5 +5,6 @@ export declare const getDocumentData: (args: {
     id?: number | string;
     locale: Locale;
     req: PayloadRequest;
+    schemaPath?: string;
 }) => Promise<Data>;
 //# sourceMappingURL=getDocumentData.d.ts.map

package/dist/views/Document/getDocumentData.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getDocumentData.d.ts","sourceRoot":"","sources":["../../../src/views/Document/getDocumentData.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,IAAI,EACJ,MAAM,EACN,cAAc,EACd,yBAAyB,EACzB,qBAAqB,EACtB,MAAM,SAAS,CAAA;AAKhB,eAAO,MAAM,eAAe,SAAgB;IAC1C,gBAAgB,CAAC,EAAE,yBAAyB,CAAA;IAC5C,YAAY,CAAC,EAAE,qBAAqB,CAAA;IACpC,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IACpB,MAAM,EAAE,MAAM,CAAA;IACd,GAAG,EAAE,cAAc,CAAA;CACpB,KAAG,OAAO,CAAC,IAAI,CA4Bf,CAAA"}
+{"version":3,"file":"getDocumentData.d.ts","sourceRoot":"","sources":["../../../src/views/Document/getDocumentData.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,IAAI,EACJ,MAAM,EACN,cAAc,EACd,yBAAyB,EACzB,qBAAqB,EACtB,MAAM,SAAS,CAAA;AAKhB,eAAO,MAAM,eAAe,SAAgB;IAC1C,gBAAgB,CAAC,EAAE,yBAAyB,CAAA;IAC5C,YAAY,CAAC,EAAE,qBAAqB,CAAA;IACpC,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IACpB,MAAM,EAAE,MAAM,CAAA;IACd,GAAG,EAAE,cAAc,CAAA;IACnB,UAAU,CAAC,EAAE,MAAM,CAAA;CACpB,KAAG,OAAO,CAAC,IAAI,CA8Bf,CAAA"}

package/dist/views/Document/getDocumentData.js

@@ -1,7 +1,8 @@
 import { buildFormState } from '@payloadcms/ui/utilities/buildFormState';
 import { reduceFieldsToValues } from 'payload/shared';
 export const getDocumentData = async (args)=>{
-    const { id, collectionConfig, globalConfig, locale, req } = args;
+    const { id, collectionConfig, globalConfig, locale, req, schemaPath: schemaPathFromProps } = args;
+    const schemaPath = schemaPathFromProps || collectionConfig?.slug || globalConfig?.slug;
     try {
         const formState = await buildFormState({
             req: {
@@ -12,7 +13,7 @@ export const getDocumentData = async (args)=>{
                     globalSlug: globalConfig?.slug,
                     locale: locale?.code,
                     operation: collectionConfig && id || globalConfig ? 'update' : 'create',
-                    schemaPath: collectionConfig?.slug || globalConfig?.slug
+                    schemaPath
                 }
             }
         });

package/dist/views/Document/getDocumentData.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/views/Document/getDocumentData.tsx"],"sourcesContent":["import type {\n  Data,\n  Locale,\n  PayloadRequest,\n  SanitizedCollectionConfig,\n  SanitizedGlobalConfig,\n} from 'payload'\n\nimport { buildFormState } from '@payloadcms/ui/utilities/buildFormState'\nimport { reduceFieldsToValues } from 'payload/shared'\n\nexport const getDocumentData = async (args: {\n  collectionConfig?: SanitizedCollectionConfig\n  globalConfig?: SanitizedGlobalConfig\n  id?: number | string\n  locale: Locale\n  req: PayloadRequest\n}): Promise<Data> => {\n  const { id, collectionConfig, globalConfig, locale, req } = args\n\n  try {\n    const formState = await buildFormState({\n      req: {\n        ...req,\n        data: {\n          id,\n          collectionSlug: collectionConfig?.slug,\n          globalSlug: globalConfig?.slug,\n          locale: locale?.code,\n          operation: (collectionConfig && id) || globalConfig ? 'update' : 'create',\n          schemaPath: collectionConfig?.slug || globalConfig?.slug,\n        },\n      },\n    })\n\n    const data = reduceFieldsToValues(formState, true)\n\n    return {\n      data,\n      formState,\n    }\n  } catch (error) {\n    console.error('Error getting document data', error) // eslint-disable-line no-console\n    return {}\n  }\n}\n"],"names":["buildFormState","reduceFieldsToValues","getDocumentData","args","id","collectionConfig","globalConfig","locale","req","formState","data","collectionSlug","slug","globalSlug","code","operation","schemaPath","error","console"],"mappings":"AAQA,SAASA,cAAc,QAAQ,0CAAyC;AACxE,SAASC,oBAAoB,QAAQ,iBAAgB;AAErD,OAAO,MAAMC,kBAAkB,OAAOC;IAOpC,MAAM,EAAEC,EAAE,EAAEC,gBAAgB,EAAEC,YAAY,EAAEC,MAAM,EAAEC,GAAG,EAAE,GAAGL;IAE5D,IAAI;QACF,MAAMM,YAAY,MAAMT,eAAe;YACrCQ,KAAK;gBACH,GAAGA,GAAG;gBACNE,MAAM;oBACJN;oBACAO,gBAAgBN,kBAAkBO;oBAClCC,YAAYP,cAAcM;oBAC1BL,QAAQA,QAAQO;oBAChBC,WAAW,AAACV,oBAAoBD,MAAOE,eAAe,WAAW;oBACjEU,YAAYX,kBAAkBO,QAAQN,cAAcM;gBACtD;YACF;QACF;QAEA,MAAMF,OAAOT,qBAAqBQ,WAAW;QAE7C,OAAO;YACLC;YACAD;QACF;IACF,EAAE,OAAOQ,OAAO;QACdC,QAAQD,KAAK,CAAC,+BAA+BA,OAAO,iCAAiC;;QACrF,OAAO,CAAC;IACV;AACF,EAAC"}
+{"version":3,"sources":["../../../src/views/Document/getDocumentData.tsx"],"sourcesContent":["import type {\n  Data,\n  Locale,\n  PayloadRequest,\n  SanitizedCollectionConfig,\n  SanitizedGlobalConfig,\n} from 'payload'\n\nimport { buildFormState } from '@payloadcms/ui/utilities/buildFormState'\nimport { reduceFieldsToValues } from 'payload/shared'\n\nexport const getDocumentData = async (args: {\n  collectionConfig?: SanitizedCollectionConfig\n  globalConfig?: SanitizedGlobalConfig\n  id?: number | string\n  locale: Locale\n  req: PayloadRequest\n  schemaPath?: string\n}): Promise<Data> => {\n  const { id, collectionConfig, globalConfig, locale, req, schemaPath: schemaPathFromProps } = args\n\n  const schemaPath = schemaPathFromProps || collectionConfig?.slug || globalConfig?.slug\n\n  try {\n    const formState = await buildFormState({\n      req: {\n        ...req,\n        data: {\n          id,\n          collectionSlug: collectionConfig?.slug,\n          globalSlug: globalConfig?.slug,\n          locale: locale?.code,\n          operation: (collectionConfig && id) || globalConfig ? 'update' : 'create',\n          schemaPath,\n        },\n      },\n    })\n\n    const data = reduceFieldsToValues(formState, true)\n\n    return {\n      data,\n      formState,\n    }\n  } catch (error) {\n    console.error('Error getting document data', error) // eslint-disable-line no-console\n    return {}\n  }\n}\n"],"names":["buildFormState","reduceFieldsToValues","getDocumentData","args","id","collectionConfig","globalConfig","locale","req","schemaPath","schemaPathFromProps","slug","formState","data","collectionSlug","globalSlug","code","operation","error","console"],"mappings":"AAQA,SAASA,cAAc,QAAQ,0CAAyC;AACxE,SAASC,oBAAoB,QAAQ,iBAAgB;AAErD,OAAO,MAAMC,kBAAkB,OAAOC;IAQpC,MAAM,EAAEC,EAAE,EAAEC,gBAAgB,EAAEC,YAAY,EAAEC,MAAM,EAAEC,GAAG,EAAEC,YAAYC,mBAAmB,EAAE,GAAGP;IAE7F,MAAMM,aAAaC,uBAAuBL,kBAAkBM,QAAQL,cAAcK;IAElF,IAAI;QACF,MAAMC,YAAY,MAAMZ,eAAe;YACrCQ,KAAK;gBACH,GAAGA,GAAG;gBACNK,MAAM;oBACJT;oBACAU,gBAAgBT,kBAAkBM;oBAClCI,YAAYT,cAAcK;oBAC1BJ,QAAQA,QAAQS;oBAChBC,WAAW,AAACZ,oBAAoBD,MAAOE,eAAe,WAAW;oBACjEG;gBACF;YACF;QACF;QAEA,MAAMI,OAAOZ,qBAAqBW,WAAW;QAE7C,OAAO;YACLC;YACAD;QACF;IACF,EAAE,OAAOM,OAAO;QACdC,QAAQD,KAAK,CAAC,+BAA+BA,OAAO,iCAAiC;;QACrF,OAAO,CAAC;IACV;AACF,EAAC"}

package/dist/views/Document/getViewsFromConfig.d.ts

@@ -1,4 +1,9 @@
-import type { AdminViewComponent, CollectionPermission, EditViewComponent, GlobalPermission, SanitizedCollectionConfig, SanitizedConfig, SanitizedGlobalConfig } from 'payload';
+import type { AdminViewProps, CollectionPermission, GlobalPermission, PayloadComponent, SanitizedCollectionConfig, SanitizedConfig, SanitizedGlobalConfig, ServerSideEditViewProps } from 'payload';
+import type React from 'react';
+export type ViewFromConfig<TProps extends object> = {
+    Component?: React.FC<TProps>;
+    payloadComponent?: PayloadComponent<TProps>;
+};
 export declare const getViewsFromConfig: ({ collectionConfig, config, docPermissions, globalConfig, routeSegments, }: {
     collectionConfig?: SanitizedCollectionConfig;
     config: SanitizedConfig;
@@ -6,11 +11,11 @@ export declare const getViewsFromConfig: ({ collectionConfig, config, docPermiss
     globalConfig?: SanitizedGlobalConfig;
     routeSegments: string[];
 }) => {
-    CustomView: EditViewComponent;
-    DefaultView: EditViewComponent;
+    CustomView: ViewFromConfig<ServerSideEditViewProps>;
+    DefaultView: ViewFromConfig<ServerSideEditViewProps>;
     /**
      * The error view to display if CustomView or DefaultView do not exist (could be either due to not found, or unauthorized). Can be null
      */
-    ErrorView: AdminViewComponent;
+    ErrorView: ViewFromConfig<AdminViewProps>;
 } | null;
 //# sourceMappingURL=getViewsFromConfig.d.ts.map

package/dist/views/Document/getViewsFromConfig.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getViewsFromConfig.d.ts","sourceRoot":"","sources":["../../../src/views/Document/getViewsFromConfig.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,kBAAkB,EAClB,oBAAoB,EACpB,iBAAiB,EACjB,gBAAgB,EAChB,yBAAyB,EACzB,eAAe,EACf,qBAAqB,EACtB,MAAM,SAAS,CAAA;AAahB,eAAO,MAAM,kBAAkB,+EAM5B;IACD,gBAAgB,CAAC,EAAE,yBAAyB,CAAA;IAC5C,MAAM,EAAE,eAAe,CAAA;IAEvB,cAAc,EAAE,oBAAoB,GAAG,gBAAgB,CAAA;IACvD,YAAY,CAAC,EAAE,qBAAqB,CAAA;IACpC,aAAa,EAAE,MAAM,EAAE,CAAA;CACxB,KAAG;IACF,UAAU,EAAE,iBAAiB,CAAA;IAC7B,WAAW,EAAE,iBAAiB,CAAA;IAC9B;;OAEG;IACH,SAAS,EAAE,kBAAkB,CAAA;CAC9B,GAAG,IAqPH,CAAA"}
+{"version":3,"file":"getViewsFromConfig.d.ts","sourceRoot":"","sources":["../../../src/views/Document/getViewsFromConfig.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,cAAc,EACd,oBAAoB,EACpB,gBAAgB,EAChB,gBAAgB,EAChB,yBAAyB,EACzB,eAAe,EACf,qBAAqB,EACrB,uBAAuB,EACxB,MAAM,SAAS,CAAA;AAChB,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAa9B,MAAM,MAAM,cAAc,CAAC,MAAM,SAAS,MAAM,IAAI;IAClD,SAAS,CAAC,EAAE,KAAK,CAAC,EAAE,CAAC,MAAM,CAAC,CAAA;IAC5B,gBAAgB,CAAC,EAAE,gBAAgB,CAAC,MAAM,CAAC,CAAA;CAC5C,CAAA;AAED,eAAO,MAAM,kBAAkB,+EAM5B;IACD,gBAAgB,CAAC,EAAE,yBAAyB,CAAA;IAC5C,MAAM,EAAE,eAAe,CAAA;IACvB,cAAc,EAAE,oBAAoB,GAAG,gBAAgB,CAAA;IACvD,YAAY,CAAC,EAAE,qBAAqB,CAAA;IACpC,aAAa,EAAE,MAAM,EAAE,CAAA;CACxB,KAAG;IACF,UAAU,EAAE,cAAc,CAAC,uBAAuB,CAAC,CAAA;IACnD,WAAW,EAAE,cAAc,CAAC,uBAAuB,CAAC,CAAA;IACpD;;OAEG;IACH,SAAS,EAAE,cAAc,CAAC,cAAc,CAAC,CAAA;CAC1C,GAAG,IA6SH,CAAA"}

package/dist/views/Document/getViewsFromConfig.js

@@ -16,233 +16,281 @@ export const getViewsFromConfig = ({ collectionConfig, config, docPermissions, g
     const views = collectionConfig && collectionConfig?.admin?.components?.views || globalConfig && globalConfig?.admin?.components?.views;
     const livePreviewEnabled = collectionConfig && collectionConfig?.admin?.livePreview || config?.admin?.livePreview?.collections?.includes(collectionConfig?.slug) || globalConfig && globalConfig?.admin?.livePreview || config?.admin?.livePreview?.globals?.includes(globalConfig?.slug);
     if (collectionConfig) {
-        const editConfig = collectionConfig?.admin?.components?.views?.Edit;
-        const EditOverride = typeof editConfig === 'function' ? editConfig : null;
-        if (EditOverride) {
-            CustomView = EditOverride;
-        }
-        if (!EditOverride) {
-            const [collectionEntity, collectionSlug, segment3, segment4, segment5, ...remainingSegments] = routeSegments;
-            if (!docPermissions?.read?.permission) {
-                notFound();
-            } else {
-                // `../:id`, or `../create`
-                switch(routeSegments.length){
-                    case 3:
-                        {
-                            switch(segment3){
-                                case 'create':
-                                    {
-                                        if ('create' in docPermissions && docPermissions?.create?.permission) {
-                                            CustomView = getCustomViewByKey(views, 'Default');
-                                            DefaultView = DefaultEditView;
-                                        } else {
-                                            ErrorView = UnauthorizedView;
-                                        }
-                                        break;
-                                    }
-                                default:
-                                    {
-                                        CustomView = getCustomViewByKey(views, 'Default');
-                                        DefaultView = DefaultEditView;
-                                        break;
+        const [collectionEntity, collectionSlug, segment3, segment4, segment5, ...remainingSegments] = routeSegments;
+        if (!docPermissions?.read?.permission) {
+            notFound();
+        } else {
+            // `../:id`, or `../create`
+            switch(routeSegments.length){
+                case 3:
+                    {
+                        switch(segment3){
+                            case 'create':
+                                {
+                                    if ('create' in docPermissions && docPermissions?.create?.permission) {
+                                        CustomView = {
+                                            payloadComponent: getCustomViewByKey(views, 'default')
+                                        };
+                                        DefaultView = {
+                                            Component: DefaultEditView
+                                        };
+                                    } else {
+                                        ErrorView = {
+                                            Component: UnauthorizedView
+                                        };
                                     }
-                            }
-                            break;
+                                    break;
+                                }
+                            default:
+                                {
+                                    CustomView = {
+                                        payloadComponent: getCustomViewByKey(views, 'default')
+                                    };
+                                    DefaultView = {
+                                        Component: DefaultEditView
+                                    };
+                                    break;
+                                }
                         }
-                    // `../:id/api`, `../:id/preview`, `../:id/versions`, etc
-                    case 4:
-                        {
-                            switch(segment4){
-                                case 'api':
-                                    {
-                                        if (collectionConfig?.admin?.hideAPIURL !== true) {
-                                            CustomView = getCustomViewByKey(views, 'API');
-                                            DefaultView = DefaultAPIView;
-                                        }
-                                        break;
+                        break;
+                    }
+                // `../:id/api`, `../:id/preview`, `../:id/versions`, etc
+                case 4:
+                    {
+                        switch(segment4){
+                            case 'api':
+                                {
+                                    if (collectionConfig?.admin?.hideAPIURL !== true) {
+                                        CustomView = {
+                                            payloadComponent: getCustomViewByKey(views, 'api')
+                                        };
+                                        DefaultView = {
+                                            Component: DefaultAPIView
+                                        };
                                     }
-                                case 'preview':
-                                    {
-                                        if (livePreviewEnabled) {
-                                            DefaultView = DefaultLivePreviewView;
-                                        }
-                                        break;
+                                    break;
+                                }
+                            case 'preview':
+                                {
+                                    if (livePreviewEnabled) {
+                                        DefaultView = {
+                                            Component: DefaultLivePreviewView
+                                        };
                                     }
-                                case 'versions':
-                                    {
-                                        if (docPermissions?.readVersions?.permission) {
-                                            CustomView = getCustomViewByKey(views, 'Versions');
-                                            DefaultView = DefaultVersionsView;
-                                        } else {
-                                            ErrorView = UnauthorizedView;
-                                        }
-                                        break;
+                                    break;
+                                }
+                            case 'versions':
+                                {
+                                    if (docPermissions?.readVersions?.permission) {
+                                        CustomView = {
+                                            payloadComponent: getCustomViewByKey(views, 'versions')
+                                        };
+                                        DefaultView = {
+                                            Component: DefaultVersionsView
+                                        };
+                                    } else {
+                                        ErrorView = {
+                                            Component: UnauthorizedView
+                                        };
                                     }
-                                default:
-                                    {
-                                        const baseRoute = [
-                                            adminRoute,
-                                            'collections',
-                                            collectionSlug,
-                                            segment3
-                                        ].filter(Boolean).join('/');
-                                        const currentRoute = [
-                                            baseRoute,
-                                            segment4,
-                                            segment5,
-                                            ...remainingSegments
-                                        ].filter(Boolean).join('/');
-                                        CustomView = getCustomViewByRoute({
+                                    break;
+                                }
+                            default:
+                                {
+                                    const baseRoute = [
+                                        adminRoute !== '/' && adminRoute,
+                                        'collections',
+                                        collectionSlug,
+                                        segment3
+                                    ].filter(Boolean).join('/');
+                                    const currentRoute = [
+                                        baseRoute,
+                                        segment4,
+                                        segment5,
+                                        ...remainingSegments
+                                    ].filter(Boolean).join('/');
+                                    CustomView = {
+                                        payloadComponent: getCustomViewByRoute({
                                             baseRoute,
                                             currentRoute,
                                             views
-                                        });
-                                        break;
-                                    }
-                            }
-                            break;
-                        }
-                    // `../:id/versions/:version`, etc
-                    default:
-                        {
-                            if (segment4 === 'versions') {
-                                if (docPermissions?.readVersions?.permission) {
-                                    CustomView = getCustomViewByKey(views, 'Version');
-                                    DefaultView = DefaultVersionView;
-                                } else {
-                                    ErrorView = UnauthorizedView;
+                                        })
+                                    };
+                                    break;
                                 }
+                        }
+                        break;
+                    }
+                // `../:id/versions/:version`, etc
+                default:
+                    {
+                        if (segment4 === 'versions') {
+                            if (docPermissions?.readVersions?.permission) {
+                                CustomView = {
+                                    payloadComponent: getCustomViewByKey(views, 'version')
+                                };
+                                DefaultView = {
+                                    Component: DefaultVersionView
+                                };
                             } else {
-                                const baseRoute = [
-                                    adminRoute,
-                                    collectionEntity,
-                                    collectionSlug,
-                                    segment3
-                                ].filter(Boolean).join('/');
-                                const currentRoute = [
-                                    baseRoute,
-                                    segment4,
-                                    segment5,
-                                    ...remainingSegments
-                                ].filter(Boolean).join('/');
-                                CustomView = getCustomViewByRoute({
+                                ErrorView = {
+                                    Component: UnauthorizedView
+                                };
+                            }
+                        } else {
+                            const baseRoute = [
+                                adminRoute !== '/' && adminRoute,
+                                collectionEntity,
+                                collectionSlug,
+                                segment3
+                            ].filter(Boolean).join('/');
+                            const currentRoute = [
+                                baseRoute,
+                                segment4,
+                                segment5,
+                                ...remainingSegments
+                            ].filter(Boolean).join('/');
+                            CustomView = {
+                                payloadComponent: getCustomViewByRoute({
                                     baseRoute,
                                     currentRoute,
                                     views
-                                });
-                            }
-                            break;
+                                })
+                            };
                         }
-                }
+                        break;
+                    }
             }
         }
     }
     if (globalConfig) {
-        const editConfig = globalConfig?.admin?.components?.views?.Edit;
-        const EditOverride = typeof editConfig === 'function' ? editConfig : null;
-        if (EditOverride) {
-            CustomView = EditOverride;
-        }
-        if (!EditOverride) {
-            const [globalEntity, globalSlug, segment3, ...remainingSegments] = routeSegments;
-            if (!docPermissions?.read?.permission) {
-                notFound();
-            } else {
-                switch(routeSegments.length){
-                    case 2:
-                        {
-                            CustomView = getCustomViewByKey(views, 'Default');
-                            DefaultView = DefaultEditView;
-                            break;
-                        }
-                    case 3:
-                        {
-                            // `../:slug/api`, `../:slug/preview`, `../:slug/versions`, etc
-                            switch(segment3){
-                                case 'api':
-                                    {
-                                        if (globalConfig?.admin?.hideAPIURL !== true) {
-                                            CustomView = getCustomViewByKey(views, 'API');
-                                            DefaultView = DefaultAPIView;
-                                        }
-                                        break;
+        const [globalEntity, globalSlug, segment3, ...remainingSegments] = routeSegments;
+        if (!docPermissions?.read?.permission) {
+            notFound();
+        } else {
+            switch(routeSegments.length){
+                case 2:
+                    {
+                        CustomView = {
+                            payloadComponent: getCustomViewByKey(views, 'default')
+                        };
+                        DefaultView = {
+                            Component: DefaultEditView
+                        };
+                        break;
+                    }
+                case 3:
+                    {
+                        // `../:slug/api`, `../:slug/preview`, `../:slug/versions`, etc
+                        switch(segment3){
+                            case 'api':
+                                {
+                                    if (globalConfig?.admin?.hideAPIURL !== true) {
+                                        CustomView = {
+                                            payloadComponent: getCustomViewByKey(views, 'api')
+                                        };
+                                        DefaultView = {
+                                            Component: DefaultAPIView
+                                        };
                                     }
-                                case 'preview':
-                                    {
-                                        if (livePreviewEnabled) {
-                                            DefaultView = DefaultLivePreviewView;
-                                        }
-                                        break;
+                                    break;
+                                }
+                            case 'preview':
+                                {
+                                    if (livePreviewEnabled) {
+                                        DefaultView = {
+                                            Component: DefaultLivePreviewView
+                                        };
                                     }
-                                case 'versions':
-                                    {
-                                        if (docPermissions?.readVersions?.permission) {
-                                            CustomView = getCustomViewByKey(views, 'Versions');
-                                            DefaultView = DefaultVersionsView;
-                                        } else {
-                                            ErrorView = UnauthorizedView;
-                                        }
-                                        break;
+                                    break;
+                                }
+                            case 'versions':
+                                {
+                                    if (docPermissions?.readVersions?.permission) {
+                                        CustomView = {
+                                            payloadComponent: getCustomViewByKey(views, 'versions')
+                                        };
+                                        DefaultView = {
+                                            Component: DefaultVersionsView
+                                        };
+                                    } else {
+                                        ErrorView = {
+                                            Component: UnauthorizedView
+                                        };
                                     }
-                                default:
-                                    {
-                                        if (docPermissions?.read?.permission) {
-                                            const baseRoute = [
-                                                adminRoute,
-                                                globalEntity,
-                                                globalSlug,
-                                                segment3
-                                            ].filter(Boolean).join('/');
-                                            const currentRoute = [
-                                                baseRoute,
-                                                segment3,
-                                                ...remainingSegments
-                                            ].filter(Boolean).join('/');
-                                            CustomView = getCustomViewByRoute({
+                                    break;
+                                }
+                            default:
+                                {
+                                    if (docPermissions?.read?.permission) {
+                                        const baseRoute = [
+                                            adminRoute,
+                                            globalEntity,
+                                            globalSlug,
+                                            segment3
+                                        ].filter(Boolean).join('/');
+                                        const currentRoute = [
+                                            baseRoute,
+                                            segment3,
+                                            ...remainingSegments
+                                        ].filter(Boolean).join('/');
+                                        CustomView = {
+                                            payloadComponent: getCustomViewByRoute({
                                                 baseRoute,
                                                 currentRoute,
                                                 views
-                                            });
-                                            DefaultView = DefaultEditView;
-                                        } else {
-                                            ErrorView = UnauthorizedView;
-                                        }
-                                        break;
+                                            })
+                                        };
+                                        DefaultView = {
+                                            Component: DefaultEditView
+                                        };
+                                    } else {
+                                        ErrorView = {
+                                            Component: UnauthorizedView
+                                        };
                                     }
-                            }
-                            break;
-                        }
-                    default:
-                        {
-                            // `../:slug/versions/:version`, etc
-                            if (segment3 === 'versions') {
-                                if (docPermissions?.readVersions?.permission) {
-                                    CustomView = getCustomViewByKey(views, 'Version');
-                                    DefaultView = DefaultVersionView;
-                                } else {
-                                    ErrorView = UnauthorizedView;
+                                    break;
                                 }
+                        }
+                        break;
+                    }
+                default:
+                    {
+                        // `../:slug/versions/:version`, etc
+                        if (segment3 === 'versions') {
+                            if (docPermissions?.readVersions?.permission) {
+                                CustomView = {
+                                    payloadComponent: getCustomViewByKey(views, 'version')
+                                };
+                                DefaultView = {
+                                    Component: DefaultVersionView
+                                };
                             } else {
-                                const baseRoute = [
-                                    adminRoute,
-                                    'globals',
-                                    globalSlug
-                                ].filter(Boolean).join('/');
-                                const currentRoute = [
-                                    baseRoute,
-                                    segment3,
-                                    ...remainingSegments
-                                ].filter(Boolean).join('/');
-                                CustomView = getCustomViewByRoute({
+                                ErrorView = {
+                                    Component: UnauthorizedView
+                                };
+                            }
+                        } else {
+                            const baseRoute = [
+                                adminRoute !== '/' && adminRoute,
+                                'globals',
+                                globalSlug
+                            ].filter(Boolean).join('/');
+                            const currentRoute = [
+                                baseRoute,
+                                segment3,
+                                ...remainingSegments
+                            ].filter(Boolean).join('/');
+                            CustomView = {
+                                payloadComponent: getCustomViewByRoute({
                                     baseRoute,
                                     currentRoute,
                                     views
-                                });
-                            }
-                            break;
+                                })
+                            };
                         }
-                }
+                        break;
+                    }
             }
         }
     }