test: consolidates custom id e2e tests (#10061)

Although we have a dedicated e2e test suite for custom IDs, tests for
custom unnamed tab and row IDs were still located within the admin test
suite. This consolidates these tests into the appropriate test suite as
expected.

Author: jacobsfletch

test/admin/collections/CustomIdRow.ts

@@ -5,8 +5,6 @@ const dirname = path.dirname(filename)
 import { buildConfigWithDefaults } from '../buildConfigWithDefaults.js'
 import { BaseListFilter } from './collections/BaseListFilter.js'
 import { CustomFields } from './collections/CustomFields/index.js'
-import { CustomIdRow } from './collections/CustomIdRow.js'
-import { CustomIdTab } from './collections/CustomIdTab.js'
 import { CustomViews1 } from './collections/CustomViews1.js'
 import { CustomViews2 } from './collections/CustomViews2.js'
 import { DisableDuplicate } from './collections/DisableDuplicate.js'
@@ -155,8 +153,6 @@ export default buildConfigWithDefaults({
     CollectionGroup2A,
     CollectionGroup2B,
     Geo,
-    CustomIdTab,
-    CustomIdRow,
     DisableDuplicate,
     BaseListFilter,
   ],

test/admin/collections/CustomIdTab.ts

@@ -20,7 +20,6 @@ import { AdminUrlUtil } from '../../../helpers/adminUrlUtil.js'
 import { initPayloadE2ENoConfig } from '../../../helpers/initPayloadE2ENoConfig.js'
 import { customAdminRoutes } from '../../shared.js'
 import {
-  customIdCollectionId,
   disableDuplicateSlug,
   geoCollectionSlug,
   globalSlug,
@@ -544,7 +543,7 @@ describe('admin3', () => {
         defaultValueField: 'not the default value',
       }
       const updatedPostTitle = `${post1Title} (Updated)`
-      await Promise.all([createPost(postData)])
+      await createPost(postData)
       await page.goto(postsUrl.list)
       await page.locator('input#select-all').check()
       await page.locator('.edit-many__toggle').click()
@@ -652,24 +651,6 @@ describe('admin3', () => {
       await expect(modalContainer).toHaveClass(/payload__modal-container--exitDone/)
     })
   })
-
-  describe('custom IDs', () => {
-    test('unnamed tab — should allow custom ID field', async () => {
-      await page.goto(postsUrl.collection('customIdTab') + '/' + customIdCollectionId)
-
-      const idField = page.locator('#field-id')
-
-      await expect(idField).toHaveValue(customIdCollectionId)
-    })
-
-    test('row — should allow custom ID field', async () => {
-      await page.goto(postsUrl.collection('customIdRow') + '/' + customIdCollectionId)
-
-      const idField = page.locator('#field-id')
-
-      await expect(idField).toHaveValue(customIdCollectionId)
-    })
-  })
 })
 
 async function createPost(overrides?: Partial<Post>): Promise<Post> {

test/admin/config.ts

@@ -15,6 +15,7 @@ export interface Config {
     posts: Post;
     users: User;
     'hidden-collection': HiddenCollection;
+    'not-in-view-collection': NotInViewCollection;
     'collection-no-api-view': CollectionNoApiView;
     'custom-views-one': CustomViewsOne;
     'custom-views-two': CustomViewsTwo;
@@ -24,8 +25,6 @@ export interface Config {
     'group-two-collection-ones': GroupTwoCollectionOne;
     'group-two-collection-twos': GroupTwoCollectionTwo;
     geo: Geo;
-    customIdTab: CustomIdTab;
-    customIdRow: CustomIdRow;
     'disable-duplicate': DisableDuplicate;
     'base-list-filters': BaseListFilter;
     'payload-locked-documents': PayloadLockedDocument;
@@ -38,6 +37,7 @@ export interface Config {
     posts: PostsSelect<false> | PostsSelect<true>;
     users: UsersSelect<false> | UsersSelect<true>;
     'hidden-collection': HiddenCollectionSelect<false> | HiddenCollectionSelect<true>;
+    'not-in-view-collection': NotInViewCollectionSelect<false> | NotInViewCollectionSelect<true>;
     'collection-no-api-view': CollectionNoApiViewSelect<false> | CollectionNoApiViewSelect<true>;
     'custom-views-one': CustomViewsOneSelect<false> | CustomViewsOneSelect<true>;
     'custom-views-two': CustomViewsTwoSelect<false> | CustomViewsTwoSelect<true>;
@@ -47,8 +47,6 @@ export interface Config {
     'group-two-collection-ones': GroupTwoCollectionOnesSelect<false> | GroupTwoCollectionOnesSelect<true>;
     'group-two-collection-twos': GroupTwoCollectionTwosSelect<false> | GroupTwoCollectionTwosSelect<true>;
     geo: GeoSelect<false> | GeoSelect<true>;
-    customIdTab: CustomIdTabSelect<false> | CustomIdTabSelect<true>;
-    customIdRow: CustomIdRowSelect<false> | CustomIdRowSelect<true>;
     'disable-duplicate': DisableDuplicateSelect<false> | DisableDuplicateSelect<true>;
     'base-list-filters': BaseListFiltersSelect<false> | BaseListFiltersSelect<true>;
     'payload-locked-documents': PayloadLockedDocumentsSelect<false> | PayloadLockedDocumentsSelect<true>;
@@ -60,6 +58,7 @@ export interface Config {
   };
   globals: {
     'hidden-global': HiddenGlobal;
+    'not-in-view-global': NotInViewGlobal;
     'global-no-api-view': GlobalNoApiView;
     global: Global;
     'custom-global-views-one': CustomGlobalViewsOne;
@@ -70,6 +69,7 @@ export interface Config {
   };
   globalsSelect: {
     'hidden-global': HiddenGlobalSelect<false> | HiddenGlobalSelect<true>;
+    'not-in-view-global': NotInViewGlobalSelect<false> | NotInViewGlobalSelect<true>;
     'global-no-api-view': GlobalNoApiViewSelect<false> | GlobalNoApiViewSelect<true>;
     global: GlobalSelect<false> | GlobalSelect<true>;
     'custom-global-views-one': CustomGlobalViewsOneSelect<false> | CustomGlobalViewsOneSelect<true>;
@@ -199,6 +199,16 @@ export interface HiddenCollection {
   updatedAt: string;
   createdAt: string;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "not-in-view-collection".
+ */
+export interface NotInViewCollection {
+  id: string;
+  title?: string | null;
+  updatedAt: string;
+  createdAt: string;
+}
 /**
  * This interface was referenced by `Config`'s JSON-Schema
  * via the `definition` "collection-no-api-view".
@@ -318,30 +328,6 @@ export interface Geo {
   updatedAt: string;
   createdAt: string;
 }
-/**
- * This interface was referenced by `Config`'s JSON-Schema
- * via the `definition` "customIdTab".
- */
-export interface CustomIdTab {
-  title?: string | null;
-  id: string;
-  description?: string | null;
-  number?: number | null;
-  updatedAt: string;
-  createdAt: string;
-}
-/**
- * This interface was referenced by `Config`'s JSON-Schema
- * via the `definition` "customIdRow".
- */
-export interface CustomIdRow {
-  title?: string | null;
-  id: string;
-  description?: string | null;
-  number?: number | null;
-  updatedAt: string;
-  createdAt: string;
-}
 /**
  * This interface was referenced by `Config`'s JSON-Schema
  * via the `definition` "disable-duplicate".
@@ -385,6 +371,10 @@ export interface PayloadLockedDocument {
         relationTo: 'hidden-collection';
         value: string | HiddenCollection;
       } | null)
+    | ({
+        relationTo: 'not-in-view-collection';
+        value: string | NotInViewCollection;
+      } | null)
     | ({
         relationTo: 'collection-no-api-view';
         value: string | CollectionNoApiView;
@@ -421,14 +411,6 @@ export interface PayloadLockedDocument {
         relationTo: 'geo';
         value: string | Geo;
       } | null)
-    | ({
-        relationTo: 'customIdTab';
-        value: string | CustomIdTab;
-      } | null)
-    | ({
-        relationTo: 'customIdRow';
-        value: string | CustomIdRow;
-      } | null)
     | ({
         relationTo: 'disable-duplicate';
         value: string | DisableDuplicate;
@@ -569,6 +551,15 @@ export interface HiddenCollectionSelect<T extends boolean = true> {
   updatedAt?: T;
   createdAt?: T;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "not-in-view-collection_select".
+ */
+export interface NotInViewCollectionSelect<T extends boolean = true> {
+  title?: T;
+  updatedAt?: T;
+  createdAt?: T;
+}
 /**
  * This interface was referenced by `Config`'s JSON-Schema
  * via the `definition` "collection-no-api-view_select".
@@ -680,30 +671,6 @@ export interface GeoSelect<T extends boolean = true> {
   updatedAt?: T;
   createdAt?: T;
 }
-/**
- * This interface was referenced by `Config`'s JSON-Schema
- * via the `definition` "customIdTab_select".
- */
-export interface CustomIdTabSelect<T extends boolean = true> {
-  title?: T;
-  id?: T;
-  description?: T;
-  number?: T;
-  updatedAt?: T;
-  createdAt?: T;
-}
-/**
- * This interface was referenced by `Config`'s JSON-Schema
- * via the `definition` "customIdRow_select".
- */
-export interface CustomIdRowSelect<T extends boolean = true> {
-  title?: T;
-  id?: T;
-  description?: T;
-  number?: T;
-  updatedAt?: T;
-  createdAt?: T;
-}
 /**
  * This interface was referenced by `Config`'s JSON-Schema
  * via the `definition` "disable-duplicate_select".
@@ -764,6 +731,16 @@ export interface HiddenGlobal {
   updatedAt?: string | null;
   createdAt?: string | null;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "not-in-view-global".
+ */
+export interface NotInViewGlobal {
+  id: string;
+  title?: string | null;
+  updatedAt?: string | null;
+  createdAt?: string | null;
+}
 /**
  * This interface was referenced by `Config`'s JSON-Schema
  * via the `definition` "global-no-api-view".
@@ -845,6 +822,16 @@ export interface HiddenGlobalSelect<T extends boolean = true> {
   createdAt?: T;
   globalType?: T;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "not-in-view-global_select".
+ */
+export interface NotInViewGlobalSelect<T extends boolean = true> {
+  title?: T;
+  updatedAt?: T;
+  createdAt?: T;
+  globalType?: T;
+}
 /**
  * This interface was referenced by `Config`'s JSON-Schema
  * via the `definition` "global-no-api-view_select".

test/admin/e2e/3/e2e.spec.ts

@@ -5,7 +5,6 @@ import { executePromises } from '../helpers/executePromises.js'
 import { seedDB } from '../helpers/seed.js'
 import {
   collectionSlugs,
-  customIdCollectionId,
   customViews1CollectionSlug,
   customViews2CollectionSlug,
   geoCollectionSlug,
@@ -113,26 +112,6 @@ export const seed = async (_payload) => {
           depth: 0,
           overrideAccess: true,
         }),
-      () =>
-        _payload.create({
-          collection: 'customIdTab',
-          data: {
-            id: customIdCollectionId,
-            title: 'Hello world title',
-          },
-          depth: 0,
-          overrideAccess: true,
-        }),
-      () =>
-        _payload.create({
-          collection: 'customIdRow',
-          data: {
-            id: customIdCollectionId,
-            title: 'Hello world title',
-          },
-          depth: 0,
-          overrideAccess: true,
-        }),
     ],
     false,
   )

test/admin/payload-types.ts

@@ -48,6 +48,3 @@ export const globalSlugs = [
   hiddenGlobalSlug,
   noApiViewGlobalSlug,
 ]
-
-export const customIdCollectionSlug = 'customId'
-export const customIdCollectionId = '111111111111111111111111'