fix(richtext-lexical): respect disableBlockName (#12597)

Fixes #12588 

Previously, the new `disableBlockName` was not respected for lexical
blocks. This PR adds a new e2e test and does some clean-up of previous
e2e tests

Author: AlessioGr

package.json

@@ -84,7 +84,7 @@
     "publish-prerelease": "pnpm --filter releaser publish-prerelease",
     "reinstall": "pnpm clean:all && pnpm install",
     "release": "pnpm --filter releaser release --tag latest",
-    "runts": "cross-env NODE_OPTIONS=--no-deprecation node --no-deprecation --import @swc-node/register/esm-register",
+    "runts": "cross-env NODE_OPTIONS=\"--no-deprecation --no-experimental-strip-types\" node --no-deprecation --no-experimental-strip-types --import @swc-node/register/esm-register",
     "script:build-template-with-local-pkgs": "pnpm --filter scripts build-template-with-local-pkgs",
     "script:gen-templates": "pnpm --filter scripts gen-templates",
     "script:gen-templates:build": "pnpm --filter scripts gen-templates --build",
@@ -93,17 +93,17 @@
     "script:pack": "pnpm --filter scripts pack-all-to-dest",
     "pretest": "pnpm build",
     "test": "pnpm test:int && pnpm test:components && pnpm test:e2e",
-    "test:components": "cross-env NODE_OPTIONS=\" --no-deprecation\" jest --config=jest.components.config.js",
+    "test:components": "cross-env NODE_OPTIONS=\" --no-deprecation --no-experimental-strip-types\" jest --config=jest.components.config.js",
     "test:e2e": "pnpm runts ./test/runE2E.ts",
-    "test:e2e:debug": "cross-env NODE_OPTIONS=--no-deprecation NODE_NO_WARNINGS=1 PWDEBUG=1 DISABLE_LOGGING=true playwright test",
-    "test:e2e:headed": "cross-env NODE_OPTIONS=--no-deprecation NODE_NO_WARNINGS=1 DISABLE_LOGGING=true playwright test --headed",
+    "test:e2e:debug": "cross-env NODE_OPTIONS=\"--no-deprecation --no-experimental-strip-types\" NODE_NO_WARNINGS=1 PWDEBUG=1 DISABLE_LOGGING=true playwright test",
+    "test:e2e:headed": "cross-env NODE_OPTIONS=\"--no-deprecation --no-experimental-strip-types\" NODE_NO_WARNINGS=1 DISABLE_LOGGING=true playwright test --headed",
     "test:e2e:prod": "pnpm prepare-run-test-against-prod && pnpm runts ./test/runE2E.ts --prod",
     "test:e2e:prod:ci": "pnpm prepare-run-test-against-prod:ci && pnpm runts ./test/runE2E.ts --prod",
-    "test:int": "cross-env NODE_OPTIONS=\"--no-deprecation\" NODE_NO_WARNINGS=1 DISABLE_LOGGING=true jest --forceExit --detectOpenHandles --config=test/jest.config.js --runInBand",
-    "test:int:postgres": "cross-env NODE_OPTIONS=\"--no-deprecation\" NODE_NO_WARNINGS=1 PAYLOAD_DATABASE=postgres DISABLE_LOGGING=true jest --forceExit --detectOpenHandles --config=test/jest.config.js --runInBand",
-    "test:int:sqlite": "cross-env NODE_OPTIONS=\"--no-deprecation\" NODE_NO_WARNINGS=1 PAYLOAD_DATABASE=sqlite DISABLE_LOGGING=true jest --forceExit --detectOpenHandles --config=test/jest.config.js --runInBand",
+    "test:int": "cross-env NODE_OPTIONS=\"--no-deprecation --no-experimental-strip-types\" NODE_NO_WARNINGS=1 DISABLE_LOGGING=true jest --forceExit --detectOpenHandles --config=test/jest.config.js --runInBand",
+    "test:int:postgres": "cross-env NODE_OPTIONS=\"--no-deprecation --no-experimental-strip-types\" NODE_NO_WARNINGS=1 PAYLOAD_DATABASE=postgres DISABLE_LOGGING=true jest --forceExit --detectOpenHandles --config=test/jest.config.js --runInBand",
+    "test:int:sqlite": "cross-env NODE_OPTIONS=\"--no-deprecation --no-experimental-strip-types\" NODE_NO_WARNINGS=1 PAYLOAD_DATABASE=sqlite DISABLE_LOGGING=true jest --forceExit --detectOpenHandles --config=test/jest.config.js --runInBand",
     "test:types": "tstyche",
-    "test:unit": "cross-env NODE_OPTIONS=\"--no-deprecation\" NODE_NO_WARNINGS=1 DISABLE_LOGGING=true jest --forceExit --detectOpenHandles  --config=jest.config.js --runInBand",
+    "test:unit": "cross-env NODE_OPTIONS=\"--no-deprecation --no-experimental-strip-types\" NODE_NO_WARNINGS=1 DISABLE_LOGGING=true jest --forceExit --detectOpenHandles  --config=jest.config.js --runInBand",
     "translateNewKeys": "pnpm --filter translations run translateNewKeys"
   },
   "lint-staged": {

packages/payload/src/utilities/getRequestLanguage.ts

@@ -18,7 +18,7 @@ export const getRequestLanguage = ({
   cookies,
   headers,
 }: GetRequestLanguageArgs): AcceptedLanguages => {
-  const supportedLanguageKeys = <AcceptedLanguages[]>Object.keys(config.i18n.supportedLanguages)
+  const supportedLanguageKeys = Object.keys(config.i18n.supportedLanguages) as AcceptedLanguages[]
   const langCookie = cookies.get(`${config.cookiePrefix || 'payload'}-lng`)
 
   const languageFromCookie: AcceptedLanguages = (

packages/richtext-lexical/src/features/blocks/client/component/index.tsx

@@ -441,7 +441,7 @@ export const BlockComponent: React.FC<Props> = (props) => {
                     >
                       {blockDisplayName ?? formData?.blockType}
                     </Pill>
-                    {!disableBlockName && (
+                    {!disableBlockName && !clientBlock?.admin?.disableBlockName && (
                       <SectionTitle
                         path="blockName"
                         readOnly={parentLexicalRichTextField?.admin?.readOnly || false}
@@ -479,6 +479,7 @@ export const BlockComponent: React.FC<Props> = (props) => {
       EditButton,
       RemoveButton,
       blockDisplayName,
+      clientBlock?.admin?.disableBlockName,
       editor,
       formData.blockType,
       i18n,
@@ -488,8 +489,6 @@ export const BlockComponent: React.FC<Props> = (props) => {
     ],
   )
 
-  const clientBlockFields = clientBlock?.fields ?? []
-
   const BlockDrawer = useMemo(
     () => () => (
       <EditDepthProvider>
@@ -503,7 +502,7 @@ export const BlockComponent: React.FC<Props> = (props) => {
           {initialState ? (
             <>
               <RenderFields
-                fields={clientBlockFields}
+                fields={clientBlock?.fields ?? []}
                 forceRender
                 parentIndexPath=""
                 parentPath="" // See Blocks feature path for details as for why this is empty
@@ -543,7 +542,7 @@ export const BlockComponent: React.FC<Props> = (props) => {
           },
         ]}
         el="div"
-        fields={clientBlockFields}
+        fields={clientBlock?.fields ?? []}
         initialState={initialState}
         onChange={[onChange]}
         onSubmit={(formState, newData) => {
@@ -567,7 +566,7 @@ export const BlockComponent: React.FC<Props> = (props) => {
           CustomBlock={CustomBlock}
           EditButton={EditButton}
           errorCount={errorCount}
-          formSchema={clientBlockFields}
+          formSchema={clientBlock?.fields ?? []}
           initialState={initialState}
           nodeKey={nodeKey}
           RemoveButton={RemoveButton}
@@ -578,7 +577,7 @@ export const BlockComponent: React.FC<Props> = (props) => {
     BlockCollapsible,
     BlockDrawer,
     CustomBlock,
-    clientBlockFields,
+    clientBlock?.fields,
     RemoveButton,
     EditButton,
     editor,

test/lexical/collections/Lexical/blocks.ts

@@ -444,3 +444,16 @@ export const CodeBlock: Block = {
   ],
   slug: 'code',
 }
+
+export const NoBlockNameBlock: Block = {
+  fields: [
+    {
+      name: 'text',
+      type: 'text',
+    },
+  ],
+  admin: {
+    disableBlockName: true,
+  },
+  slug: 'noBlockName',
+}