test: move draft validation tests from form-state to field error states test suite (#14599)

### What?

Move draft-validation tests from #14584 into `field-error-states` test
suite for simplicity

Author: PatrikKozak

test/field-error-states/collections/ValidateDraftsOn/index.ts

@@ -1,15 +1,38 @@
-import type { CollectionConfig } from 'payload'
+import type { CollectionConfig, TextFieldSingleValidation } from 'payload'
 
 import { collectionSlugs } from '../../shared.js'
 
 export const ValidateDraftsOn: CollectionConfig = {
-  slug: collectionSlugs.validateDraftsOn,
+  slug: collectionSlugs.validateDraftsOn as 'validate-drafts-on',
   fields: [
     {
       name: 'title',
       type: 'text',
       required: true,
     },
+    {
+      name: 'failValidation',
+      type: 'checkbox',
+      admin: {
+        description:
+          'Check this box to simulate a validation failure. The save button should remain enabled after the failure.',
+      },
+      defaultValue: false,
+    },
+    {
+      name: 'validatedField',
+      type: 'text',
+      admin: {
+        description:
+          'This field will fail validation if "Fail Validation" checkbox is checked. This simulates validation failures from business logic, network errors, or third-party validation.',
+      },
+      validate: ((value, { data }) => {
+        if ((data as any)?.failValidation) {
+          return 'Validation failed: simulated validation error to test save button behavior.'
+        }
+        return true
+      }) as TextFieldSingleValidation,
+    },
   ],
   versions: {
     drafts: {

test/field-error-states/e2e.spec.ts

@@ -2,7 +2,7 @@ import type { Page } from '@playwright/test'
 
 import { expect, test } from '@playwright/test'
 import { AdminUrlUtil } from 'helpers/adminUrlUtil.js'
-import { addArrayRow, openArrayRowActions, removeArrayRow } from 'helpers/e2e/fields/array/index.js'
+import { addArrayRow, removeArrayRow } from 'helpers/e2e/fields/array/index.js'
 import path from 'path'
 import { wait } from 'payload/shared'
 import { fileURLToPath } from 'url'
@@ -29,12 +29,15 @@ describe('Field Error States', () => {
   beforeAll(async ({ browser }, testInfo) => {
     testInfo.setTimeout(TEST_TIMEOUT_LONG)
     ;({ serverURL } = await initPayloadE2ENoConfig({ dirname }))
-    validateDraftsOff = new AdminUrlUtil(serverURL, collectionSlugs.validateDraftsOff)
-    validateDraftsOn = new AdminUrlUtil(serverURL, collectionSlugs.validateDraftsOn)
-    validateDraftsOnAutosave = new AdminUrlUtil(serverURL, collectionSlugs.validateDraftsOnAutosave)
-    prevValue = new AdminUrlUtil(serverURL, collectionSlugs.prevValue)
-    prevValueRelation = new AdminUrlUtil(serverURL, collectionSlugs.prevValueRelation)
-    errorFieldsURL = new AdminUrlUtil(serverURL, collectionSlugs.errorFields)
+    validateDraftsOff = new AdminUrlUtil(serverURL, collectionSlugs.validateDraftsOff!)
+    validateDraftsOn = new AdminUrlUtil(serverURL, collectionSlugs.validateDraftsOn!)
+    validateDraftsOnAutosave = new AdminUrlUtil(
+      serverURL,
+      collectionSlugs.validateDraftsOnAutosave!,
+    )
+    prevValue = new AdminUrlUtil(serverURL, collectionSlugs.prevValue!)
+    prevValueRelation = new AdminUrlUtil(serverURL, collectionSlugs.prevValueRelation!)
+    errorFieldsURL = new AdminUrlUtil(serverURL, collectionSlugs.errorFields!)
     const context = await browser.newContext()
     page = await context.newPage()
     initPageConsoleErrorCatch(page)
@@ -94,6 +97,40 @@ describe('Field Error States', () => {
       await page.locator('#field-title').fill('')
       await saveDocAndAssert(page, '#action-save', 'error')
     })
+
+    test('should keep save draft button enabled after validation failure on update', async () => {
+      await page.goto(validateDraftsOn.create)
+      await page.locator('#field-title').fill('Test Document')
+      await page.click('#action-save-draft')
+      await expect(page.locator('.payload-toast-container .toast-success')).toBeVisible()
+
+      await page.waitForURL(/\/admin\/collections\/validate-drafts-on\/[a-zA-Z0-9]+/)
+
+      await page.locator('#field-title').fill('Modified Document')
+      await page.locator('#field-failValidation').check()
+      await page.locator('#field-validatedField').fill('This will fail')
+
+      await page.click('#action-save-draft')
+      await expect(page.locator('.payload-toast-container .toast-error')).toBeVisible()
+
+      const saveDraftButton = page.locator('#action-save-draft')
+      await expect(saveDraftButton).toBeEnabled()
+
+      await page.click('#action-save-draft')
+      await expect(page.locator('.payload-toast-container .toast-error')).toBeVisible()
+    })
+
+    test('should keep save draft button enabled after successful save when form is modified again', async () => {
+      await page.goto(validateDraftsOn.create)
+      await page.locator('#field-title').fill('Test Document')
+      await page.click('#action-save-draft')
+      await expect(page.locator('.payload-toast-container .toast-success')).toBeVisible()
+
+      await page.locator('#field-title').fill('Modified Document')
+
+      const saveDraftButton = page.locator('#action-save-draft')
+      await expect(saveDraftButton).toBeEnabled()
+    })
   })
 
   describe('previous values', () => {

test/field-error-states/payload-types.ts

@@ -74,6 +74,7 @@ export interface Config {
     'validate-drafts-on-autosave': ValidateDraftsOnAutosave;
     'prev-value': PrevValue;
     'prev-value-relation': PrevValueRelation;
+    'payload-kv': PayloadKv;
     users: User;
     'payload-locked-documents': PayloadLockedDocument;
     'payload-preferences': PayloadPreference;
@@ -88,6 +89,7 @@ export interface Config {
     'validate-drafts-on-autosave': ValidateDraftsOnAutosaveSelect<false> | ValidateDraftsOnAutosaveSelect<true>;
     'prev-value': PrevValueSelect<false> | PrevValueSelect<true>;
     'prev-value-relation': PrevValueRelationSelect<false> | PrevValueRelationSelect<true>;
+    'payload-kv': PayloadKvSelect<false> | PayloadKvSelect<true>;
     users: UsersSelect<false> | UsersSelect<true>;
     'payload-locked-documents': PayloadLockedDocumentsSelect<false> | PayloadLockedDocumentsSelect<true>;
     'payload-preferences': PayloadPreferencesSelect<false> | PayloadPreferencesSelect<true>;
@@ -179,7 +181,7 @@ export interface ErrorField {
             root: {
               type: string;
               children: {
-                type: string;
+                type: any;
                 version: number;
                 [k: string]: unknown;
               }[];
@@ -232,7 +234,7 @@ export interface ErrorField {
           root: {
             type: string;
             children: {
-              type: string;
+              type: any;
               version: number;
               [k: string]: unknown;
             }[];
@@ -286,7 +288,7 @@ export interface ErrorField {
                 root: {
                   type: string;
                   children: {
-                    type: string;
+                    type: any;
                     version: number;
                     [k: string]: unknown;
                   }[];
@@ -351,7 +353,7 @@ export interface Upload {
     root: {
       type: string;
       children: {
-        type: string;
+        type: any;
         version: number;
         [k: string]: unknown;
       }[];
@@ -381,6 +383,14 @@ export interface Upload {
 export interface ValidateDraftsOn {
   id: string;
   title: string;
+  /**
+   * Check this box to simulate a validation failure. The save button should remain enabled after the failure.
+   */
+  failValidation?: boolean | null;
+  /**
+   * This field will fail validation if "Fail Validation" checkbox is checked. This simulates validation failures from business logic, network errors, or third-party validation.
+   */
+  validatedField?: string | null;
   updatedAt: string;
   createdAt: string;
   _status?: ('draft' | 'published') | null;
@@ -392,6 +402,14 @@ export interface ValidateDraftsOn {
 export interface ValidateDraftsOff {
   id: string;
   title: string;
+  /**
+   * Check this box to simulate a validation failure. The save button should remain enabled after the failure.
+   */
+  failValidation?: boolean | null;
+  /**
+   * This field will fail validation if "Fail Validation" checkbox is checked. This simulates validation failures from business logic, network errors, or third-party validation.
+   */
+  validatedField?: string | null;
   updatedAt: string;
   createdAt: string;
   _status?: ('draft' | 'published') | null;
@@ -403,6 +421,14 @@ export interface ValidateDraftsOff {
 export interface ValidateDraftsOnAutosave {
   id: string;
   title: string;
+  /**
+   * Check this box to simulate a validation failure. The save button should remain enabled after the failure.
+   */
+  failValidation?: boolean | null;
+  /**
+   * This field will fail validation if "Fail Validation" checkbox is checked. This simulates validation failures from business logic, network errors, or third-party validation.
+   */
+  validatedField?: string | null;
   updatedAt: string;
   createdAt: string;
   _status?: ('draft' | 'published') | null;
@@ -428,6 +454,23 @@ export interface PrevValueRelation {
   updatedAt: string;
   createdAt: string;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "payload-kv".
+ */
+export interface PayloadKv {
+  id: string;
+  key: string;
+  data:
+    | {
+        [k: string]: unknown;
+      }
+    | unknown[]
+    | string
+    | number
+    | boolean
+    | null;
+}
 /**
  * This interface was referenced by `Config`'s JSON-Schema
  * via the `definition` "payload-locked-documents".
@@ -657,6 +700,8 @@ export interface UploadsSelect<T extends boolean = true> {
  */
 export interface ValidateDraftsOnSelect<T extends boolean = true> {
   title?: T;
+  failValidation?: T;
+  validatedField?: T;
   updatedAt?: T;
   createdAt?: T;
   _status?: T;
@@ -667,6 +712,8 @@ export interface ValidateDraftsOnSelect<T extends boolean = true> {
  */
 export interface ValidateDraftsOffSelect<T extends boolean = true> {
   title?: T;
+  failValidation?: T;
+  validatedField?: T;
   updatedAt?: T;
   createdAt?: T;
   _status?: T;
@@ -677,6 +724,8 @@ export interface ValidateDraftsOffSelect<T extends boolean = true> {
  */
 export interface ValidateDraftsOnAutosaveSelect<T extends boolean = true> {
   title?: T;
+  failValidation?: T;
+  validatedField?: T;
   updatedAt?: T;
   createdAt?: T;
   _status?: T;
@@ -700,6 +749,14 @@ export interface PrevValueRelationSelect<T extends boolean = true> {
   updatedAt?: T;
   createdAt?: T;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "payload-kv_select".
+ */
+export interface PayloadKvSelect<T extends boolean = true> {
+  key?: T;
+  data?: T;
+}
 /**
  * This interface was referenced by `Config`'s JSON-Schema
  * via the `definition` "users_select".

test/form-state/collections/DraftValidation/index.ts

@@ -4,14 +4,13 @@ import path from 'path'
 import { buildConfigWithDefaults } from '../buildConfigWithDefaults.js'
 import { devUser } from '../credentials.js'
 import { AutosavePostsCollection } from './collections/Autosave/index.js'
-import { DraftValidationCollection } from './collections/DraftValidation/index.js'
 import { PostsCollection, postsSlug } from './collections/Posts/index.js'
 
 const filename = fileURLToPath(import.meta.url)
 const dirname = path.dirname(filename)
 
 export default buildConfigWithDefaults({
-  collections: [PostsCollection, AutosavePostsCollection, DraftValidationCollection],
+  collections: [PostsCollection, AutosavePostsCollection],
   admin: {
     importMap: {
       baseDir: path.resolve(dirname),