Merge branch 'normalize-titles' into 9.0

# Conflicts:
#	src/EntityList/Commands/QuickCreate/QuickCreationCommand.php

Author: aguingand

demo/app/Sharp/Posts/PostForm.php

@@ -193,9 +193,9 @@ public function buildFormLayout(FormLayout $formLayout): void
 
     public function buildFormConfig(): void
     {
-        $this->configureDisplayShowPageAfterCreation();
-        // TODO handle configureEditTitle('Edit post')
-        // TODO handle configureCreateTitle('New post')
+        $this->configureDisplayShowPageAfterCreation()
+            ->configureEditTitle('Edit post')
+            ->configureCreateTitle('New post');
     }
 
     public function find($id): array

resources/js/Pages/EntityList/EntityList.vue

@@ -89,7 +89,7 @@
         >
             <template #card-header>
                 <CardTitle>
-                    {{ breadcrumb.items[0].label }}
+                    {{ entityList.title }}
                 </CardTitle>
             </template>
         </EntityListComponent>

resources/js/Pages/Form/Form.vue

@@ -72,7 +72,7 @@
             @submit="submit"
         >
             <template #title>
-                {{ breadcrumb.items.at(-1).documentTitleLabel }}
+                {{ form.title }}
             </template>
             <template #footer>
                 <div class="flex gap-4">

resources/js/entity-list/EntityList.ts

@@ -18,6 +18,7 @@ export class EntityList implements EntityListData {
     pageAlert: EntityListData['pageAlert'];
     query: EntityListData['query'];
     filterValues: EntityListData['filterValues'];
+    title: EntityListData['title'];
 
     entityKey: string;
     hiddenFilters?: Record<string, FilterData['value']>;

resources/js/form/Form.ts

@@ -25,6 +25,7 @@ export class Form implements FormData, CommandFormData {
     layout: FormData['layout'];
     locales: FormData['locales'];
     pageAlert: FormData['pageAlert'];
+    title: FormData['title'];
 
     state = reactive<{
         data: FormData['data'],

resources/js/show/Show.ts

@@ -20,6 +20,7 @@ export class Show implements ShowData {
     layout: ShowData['layout'];
     locales: ShowData['locales'];
     pageAlert: ShowData['pageAlert'];
+    title: ShowData['title'];
 
     entityKey: string;
     instanceId?: string;
@@ -65,15 +66,10 @@ export class Show implements ShowData {
     }
 
     getTitle(locale: string): string | null {
-        if(!this.config.titleAttribute) {
-            return null;
-        }
-        if(this.fields[this.config.titleAttribute]) {
-            const field = this.fields[this.config.titleAttribute] as ShowTextFieldData;
-            const value = this.data[this.config.titleAttribute] as ShowTextFieldData['value'];
-            return field.localized && typeof value?.text === 'object'
-                ? value?.text?.[locale]
-                : value?.text as string;
+        if(this.title) {
+            return typeof this.title === 'object'
+                ? this.title?.[locale]
+                : this.title;
         }
         return null;
     }

resources/js/types/generated.d.ts

@@ -149,6 +149,7 @@ export type EntityListData = {
   data: Array<{ [key: string]: any }>;
   filterValues: FilterValuesData;
   query: EntityListQueryParamsData | null;
+  title: string | null;
   forms: { [key: string]: EntityListMultiformData } | null;
   meta: PaginatorMetaData | null;
   pageAlert: PageAlertData | null;
@@ -274,9 +275,7 @@ export type FormConditionalDisplayData = {
   fields: Array<{ key: string; values: string | boolean | Array<string> }>;
 };
 export type FormConfigData = {
-  hasShowPage: boolean;
   isSingle: boolean;
-  breadcrumbAttribute: string | null;
 };
 export type FormCustomFieldData = {
   value?: any;
@@ -295,6 +294,7 @@ export type FormData = {
   fields: { [key: string]: FormFieldData };
   layout: FormLayoutData;
   locales: Array<string>;
+  title: string | null;
   pageAlert: PageAlertData | null;
 };
 export type FormDateFieldData = {
@@ -575,8 +575,6 @@ export type FormUploadFieldData = {
   allowedExtensions: Array<string> | null;
   maxFileSize: number | null;
   validationRule: Array<string> | null;
-  storageBasePath: string | null;
-  storageDisk: string | null;
   label: string | null;
   readOnly: boolean | null;
   conditionalDisplay: FormConditionalDisplayData | null;
@@ -764,6 +762,7 @@ export type ShowData = {
   fields: { [key: string]: ShowFieldData };
   layout: ShowLayoutData;
   locales: Array<string> | null;
+  title: string | { [locale: string]: string } | null;
   pageAlert: PageAlertData | null;
 };
 export type ShowEntityListFieldData = {

src/Data/EntityList/EntityListData.php

@@ -15,6 +15,7 @@
 final class EntityListData extends Data
 {
     public function __construct(
+        public ?string $title,
         public EntityListAuthorizationsData $authorizations,
         public EntityListConfigData $config,
         /** @var EntityListFieldData[] */
@@ -32,6 +33,7 @@ public function __construct(
     public static function from(array $entityList): self
     {
         return new self(
+            title: $entityList['title'] ?? null,
             authorizations: new EntityListAuthorizationsData(...$entityList['authorizations']),
             config: EntityListConfigData::from($entityList['config']),
             fields: EntityListFieldData::collection($entityList['fields']),

src/Data/Form/FormConfigData.php

@@ -10,9 +10,7 @@
 final class FormConfigData extends Data
 {
     public function __construct(
-        public bool $hasShowPage,
         public bool $isSingle = false,
-        public ?string $breadcrumbAttribute = null,
     ) {}
 
     public static function from(array $config): self

src/Data/Form/FormData.php

@@ -14,6 +14,7 @@
 final class FormData extends Data
 {
     public function __construct(
+        public ?string $title,
         public InstanceAuthorizationsData $authorizations,
         public FormConfigData $config,
         #[LiteralTypeScriptType('{ [key:string]: FormFieldData["value"] }')]
@@ -29,6 +30,7 @@ public function __construct(
     public static function from(array $form): self
     {
         return new self(
+            title: $form['title'],
             authorizations: InstanceAuthorizationsData::from($form['authorizations']),
             config: FormConfigData::from($form['config']),
             data: $form['data'],