Merge branch 'develop-patch' into develop-minor

Author: distantnative

src/Cms/PageActions.php

@@ -455,6 +455,11 @@ public static function create(array $props): Page
 		// keep the initial storage class
 		$storage = $page->storage()::class;
 
+		// Make sure that the page does not already exist at this point.
+		// Otherwise, moving the storage to memory storage, might delete
+		// an existing page before we can even run the checks.
+		PageRules::create($page);
+
 		// make sure that the temporary page is stored in memory
 		$page->changeStorage(MemoryStorage::class);
 

src/Panel/File.php

@@ -230,10 +230,17 @@ protected function imageColor(): string
 			'xlsx'  => 'green-500',
 		];
 
-		return
-			$extensions[$this->model->extension()] ??
-			$types[$this->model->type()] ??
-			parent::imageDefaults()['color'];
+		if ($color = $extensions[$this->model->extension()] ?? null) {
+			return $color;
+		}
+
+		$type = $this->model->type();
+
+		if ($type && ($color = $types[$type] ?? null)) {
+			return $color;
+		}
+
+		return parent::imageDefaults()['color'];
 	}
 
 	/**
@@ -273,10 +280,17 @@ protected function imageIcon(): string
 			'xlsx'  => 'table',
 		];
 
-		return
-			$extensions[$this->model->extension()] ??
-			$types[$this->model->type()] ??
-			'file';
+		if ($icon = $extensions[$this->model->extension()] ?? null) {
+			return $icon;
+		}
+
+		$type = $this->model->type();
+
+		if ($type && ($icon = $types[$type] ?? null)) {
+			return $icon;
+		}
+
+		return 'file';
 	}
 
 	/**

tests/Panel/FileTest.php

@@ -384,6 +384,56 @@ public function testImageStringQuery(): void
 		$this->assertNotEmpty($image);
 	}
 
+	public function testImageColor(): void
+	{
+		$page = new ModelPage(['slug' => 'test']);
+		$file = new ModelFile([
+			'filename' => 'something.doc',
+			'parent'   => $page
+		]);
+
+		$this->assertSame('blue-500', $file->panel()->image()['color']);
+
+		$file = new ModelFile([
+			'filename' => 'something.mp4',
+			'parent'   => $page
+		]);
+
+		$this->assertSame('yellow-500', $file->panel()->image()['color']);
+
+		$file = new ModelFile([
+			'filename' => 'something.foo',
+			'parent'   => $page
+		]);
+
+		$this->assertSame('gray-500', $file->panel()->image()['color']);
+	}
+
+	public function testImageIcon(): void
+	{
+		$page = new ModelPage(['slug' => 'test']);
+		$file = new ModelFile([
+			'filename' => 'something.doc',
+			'parent'   => $page
+		]);
+
+		$this->assertSame('pen', $file->panel()->image()['icon']);
+
+		$file = new ModelFile([
+			'filename' => 'something.mp4',
+			'parent'   => $page
+		]);
+
+		$this->assertSame('video', $file->panel()->image()['icon']);
+
+		$file = new ModelFile([
+			'filename' => 'something.foo',
+			'parent'   => $page
+		]);
+
+		$this->assertSame('file', $file->panel()->image()['icon']);
+	}
+
 	public function testIsFocusable(): void
 	{
 		$this->app->clone([