remove other types

payloadcms · Oct 15, 2024 · 3754e9b · 3754e9b
1 parent e6dec93
commit 3754e9b
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 56 deletions.
diff --git a/packages/payload/src/admin/fields/Tabs.ts b/packages/payload/src/admin/fields/Tabs.ts
@@ -3,11 +3,9 @@ import type { MarkOptional } from 'ts-essentials'
 import type {
   ClientField,
   NamedTab,
-  NamedTabWithCondition,
   TabsField,
   TabsFieldClient,
   UnnamedTab,
-  UnnamedTabWithCondition,
 } from '../../fields/config/types.js'
 import type { FieldErrorClientComponent, FieldErrorServerComponent } from '../forms/Error.js'
 import type {
@@ -24,10 +22,8 @@ import type {
 } from '../types.js'
 
 export type ClientTab =
-  | ({ fields: ClientField[] } & Omit<NamedTab, 'fields'>)
-  | ({ fields: ClientField[] } & Omit<UnnamedTab, 'fields'>)
-  | ({ fields: ClientField[]; passesCondition: boolean } & Omit<NamedTabWithCondition, 'fields'>)
-  | ({ fields: ClientField[]; passesCondition: boolean } & Omit<UnnamedTabWithCondition, 'fields'>)
+  | ({ fields: ClientField[]; passesCondition?: boolean } & Omit<NamedTab, 'fields'>)
+  | ({ fields: ClientField[]; passesCondition?: boolean } & Omit<UnnamedTab, 'fields'>)
 
 type TabsFieldClientWithoutType = MarkOptional<TabsFieldClient, 'type'>
 

diff --git a/packages/payload/src/config/sanitize.ts b/packages/payload/src/config/sanitize.ts
@@ -18,7 +18,6 @@ import { sanitizeGlobals } from '../globals/config/sanitize.js'
 import { getLockedDocumentsCollection } from '../lockedDocuments/lockedDocumentsCollection.js'
 import getPreferencesCollection from '../preferences/preferencesCollection.js'
 import checkDuplicateCollections from '../utilities/checkDuplicateCollections.js'
-import checkDuplicateTabsIds from '../utilities/checkDuplicateTabsIds.js'
 import { defaults } from './defaults.js'
 
 const sanitizeAdminConfig = (configToSanitize: Config): Partial<SanitizedConfig> => {
@@ -201,8 +200,6 @@ export const sanitizeConfig = async (incomingConfig: Config): Promise<SanitizedC
     }
   }
 
-  checkDuplicateTabsIds(config.collections)
-
   const promises: Promise<void>[] = []
   for (const sanitizeFunction of richTextSanitizationPromises) {
     promises.push(sanitizeFunction(config as SanitizedConfig))

diff --git a/packages/payload/src/fields/config/types.ts b/packages/payload/src/fields/config/types.ts
@@ -766,6 +766,9 @@ export type CollapsibleFieldClient = {
   Pick<CollapsibleField, 'type'>
 
 type TabBase = {
+  admin?: {
+    condition?: Pick<Admin, 'condition'>
+  }
   description?: Description
   fields: Field[]
   interfaceName?: string
@@ -782,10 +785,6 @@ export type NamedTab = {
   interfaceName?: string
 } & TabBase
 
-export type NamedTabWithCondition = {
-  admin?: Pick<Admin, 'condition'>
-} & NamedTab
-
 export type UnnamedTab = {
   interfaceName?: never
   /**
@@ -802,30 +801,26 @@ export type UnnamedTab = {
   localized?: never
 } & Omit<TabBase, 'name' | 'virtual'>
 
-export type UnnamedTabWithCondition = {
-  admin?: Pick<Admin, 'condition'>
-} & UnnamedTab
-
-export type TabWithoutCondition = NamedTab | UnnamedTab
-export type TabWithCondition = NamedTabWithCondition | UnnamedTabWithCondition
-export type Tab = TabWithCondition | TabWithoutCondition
+export type Tab = NamedTab | UnnamedTab
 
 export type TabsField = {
   admin?: Omit<Admin, 'description'>
   type: 'tabs'
-} & ({ id: string; tabs: TabWithCondition[] } | { id?: never; tabs: TabWithoutCondition[] }) &
-  Omit<FieldBase, 'admin' | 'localized' | 'name' | 'saveToJWT' | 'virtual'>
+} & { id: string; tabs: Tab[] } & Omit<
+    FieldBase,
+    'admin' | 'localized' | 'name' | 'saveToJWT' | 'virtual'
+  >
 
 export type TabsFieldClient = {
   admin?: Omit<AdminClient, 'description'>
   tabs: ClientTab[]
 } & Omit<FieldBaseClient, 'admin' | 'localized' | 'name' | 'saveToJWT'> &
-  Pick<TabsField, 'id' | 'type'>
+  Pick<TabsField, 'type'>
 
 export type TabAsField = {
   name?: string
   type: 'tab'
-} & TabWithCondition
+} & Tab
 
 export type TabAsFieldClient = ClientTab & Pick<TabAsField, 'name' | 'type'>
 

diff --git a/packages/payload/src/index.ts b/packages/payload/src/index.ts
@@ -906,7 +906,6 @@ export type {
   Labels,
   LabelsClient,
   NamedTab,
-  NamedTabWithCondition,
   NonPresentationalField,
   NonPresentationalFieldClient,
   NumberField,
@@ -942,7 +941,6 @@ export type {
   UIField,
   UIFieldClient,
   UnnamedTab,
-  UnnamedTabWithCondition,
   UploadField,
   UploadFieldClient,
   Validate,

diff --git a/packages/payload/src/utilities/checkDuplicateTabsIds.ts b/packages/payload/src/utilities/checkDuplicateTabsIds.ts