Merge branch 'develop-patch' into develop-minor

Author: bastianallgeier

panel/src/components/Text/Label.vue

@@ -12,16 +12,14 @@
 		<span v-else class="k-label-text">
 			<slot />
 		</span>
-		<template v-if="input !== false">
-			<abbr v-if="required" :title="$t(type + '.required')">✶</abbr>
-			<abbr
-				:title="$t(type + '.invalid')"
-				data-theme="negative"
-				class="k-label-invalid"
-			>
-				&times;
-			</abbr>
-		</template>
+		<abbr v-if="required" :title="$t(type + '.required')">✶</abbr>
+		<abbr
+			:title="$t(type + '.invalid')"
+			data-theme="negative"
+			class="k-label-invalid"
+		>
+			&times;
+		</abbr>
 	</component>
 </template>
 

panel/src/components/Views/Users/UserView.vue

@@ -94,7 +94,7 @@ export default {
 .k-user-view .k-user-profile {
 	margin-bottom: var(--spacing-12);
 }
-.k-user-view[data-has-tabs="true"] .k-user-profile {
+.k-user-view .k-user-profile:has(+ .k-tabs) {
 	margin-bottom: 0;
 }
 </style>

src/Panel/ChangesDialog.php

@@ -3,7 +3,13 @@
 namespace Kirby\Panel;
 
 use Kirby\Cms\Collection;
+use Kirby\Cms\File;
+use Kirby\Cms\Page;
+use Kirby\Cms\User;
 use Kirby\Content\Changes;
+use Kirby\Panel\Ui\Item\FileItem;
+use Kirby\Panel\Ui\Item\PageItem;
+use Kirby\Panel\Ui\Item\UserItem;
 
 /**
  * Manages the Panel dialog for content changes in
@@ -31,14 +37,26 @@ public function files(): array
 		return $this->items($this->changes->files());
 	}
 
+	/**
+	 * Helper method to return item props for a single given model
+	 */
+	public function item(File|Page|User $model): array
+	{
+		$item = match (true) {
+			$model instanceof File => new FileItem(file: $model),
+			$model instanceof Page => new PageItem(page: $model),
+			$model instanceof User => new UserItem(user: $model),
+		};
+
+		return $item->props();
+	}
+
 	/**
 	 * Helper method to return item props for the given models
 	 */
 	public function items(Collection $models): array
 	{
-		return $models->values(
-			fn ($model) => $model->panel()->dropdownOption()
-		);
+		return $models->values($this->item(...));
 	}
 
 	/**

src/Panel/File.php

@@ -196,13 +196,14 @@ public function dropdown(array $options = []): array
 	 * Returns the setup for a dropdown option
 	 * which is used in the changes dropdown
 	 * for example
+	 *
+	 * @deprecated 5.1.4 Use the Kirby\Panel\Ui\Item\FileItem class instead
 	 */
 	public function dropdownOption(): array
 	{
-		return [
-			'icon' => 'image',
-			'text' => $this->model->filename(),
-		] + parent::dropdownOption();
+		return (new FileItem(file: $this->model))->props() + [
+			'icon' => 'image'
+		];
 	}
 
 	/**

src/Panel/Page.php

@@ -197,12 +197,14 @@ public function dropdown(array $options = []): array
 	 * Returns the setup for a dropdown option
 	 * which is used in the changes dropdown
 	 * for example.
+	 *
+	 * @deprecated 5.1.4 Use the Kirby\Panel\Ui\Item\PageItem class instead
 	 */
 	public function dropdownOption(): array
 	{
-		return [
-			'text' => $this->model->title()->value(),
-		] + parent::dropdownOption();
+		return (new PageItem(page: $this->model))->props() + [
+			'icon' => 'page'
+		];
 	}
 
 	/**

src/Panel/Site.php

@@ -41,12 +41,14 @@ public function buttons(): array
 	 * Returns the setup for a dropdown option
 	 * which is used in the changes dropdown
 	 * for example.
+	 *
+	 * @deprecated 5.1.4
 	 */
 	public function dropdownOption(): array
 	{
 		return [
 			'icon' => 'home',
-			'text' => $this->model->title()->value(),
+			'text' => $this->model->toSafeString('{{ site.title }}'),
 		] + parent::dropdownOption();
 	}
 

src/Panel/User.php

@@ -138,13 +138,14 @@ public function dropdown(array $options = []): array
 	 * Returns the setup for a dropdown option
 	 * which is used in the changes dropdown
 	 * for example.
+	 *
+	 * @deprecated 5.1.4 Use the Kirby\Panel\Ui\Item\UserItem class instead
 	 */
 	public function dropdownOption(): array
 	{
-		return [
-			'icon' => 'user',
-			'text' => $this->model->username(),
-		] + parent::dropdownOption();
+		return (new UserItem(user: $this->model))->props() + [
+			'icon' => 'user'
+		];
 	}
 
 	public function home(): string|null

tests/Panel/ChangesDialogTest.php

@@ -84,6 +84,20 @@ public function testFilesWithoutChanges(): void
 		$this->assertSame([], $dialog->files());
 	}
 
+	public function testItem(): void
+	{
+		$this->setUpModels();
+		$page = $this->app->page('page://test');
+		$page->version('latest')->save([]);
+		$page->version('changes')->save([]);
+
+		$dialog = new ChangesDialog();
+		$item   = $dialog->item($page);
+
+		$this->assertSame('test', $item['text']);
+		$this->assertSame('/pages/test', $item['link']);
+	}
+
 	public function testItems(): void
 	{
 		$this->setUpModels();