full support of per-album-copyright

ThanasisMpalatsoukas · Apr 28, 2024 · adefdd3 · adefdd3
1 parent 7c1363e
commit adefdd3
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 2 deletions.
diff --git a/app/Livewire/Components/Forms/Album/Properties.php b/app/Livewire/Components/Forms/Album/Properties.php
@@ -20,6 +20,7 @@
 use App\Models\Album as ModelsAlbum;
 use App\Models\Extensions\BaseAlbum;
 use App\Policies\AlbumPolicy;
+use App\Rules\CopyrightRule;
 use App\Rules\TitleRule;
 use Illuminate\Contracts\View\View;
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
@@ -44,6 +45,7 @@ class Properties extends Component
 	public string $album_sorting_order = ''; // ! wired
 	public string $album_aspect_ratio = ''; // ! wired
 	public string $license = 'none'; // ! wired
+	public string $copyright = ''; // ! wired
 
 	/**
 	 * This is the equivalent of the constructor for Livewire Components.
@@ -63,6 +65,7 @@ public function mount(BaseAlbum $album): void
 		$this->description = $album->description ?? '';
 		$this->photo_sorting_column = $album->photo_sorting?->column->value ?? '';
 		$this->photo_sorting_order = $album->photo_sorting?->order->value ?? '';
+		$this->copyright = $album->copyright ?? '';
 		if ($this->is_model_album) {
 			/** @var ModelsAlbum $album */
 			$this->license = $album->license->value;
@@ -94,6 +97,7 @@ public function submit(AlbumFactory $albumFactory): void
 			...SetPhotoSortingRuleSet::rules(),
 			...SetAlbumSortingRuleSet::rules(),
 			RequestAttribute::ALBUM_ASPECT_RATIO_ATTRIBUTE => ['present', 'nullable', new Enum(AspectRatioType::class)],
+			RequestAttribute::COPYRIGHT_ATTRIBUTE => ['present', 'nullable', new CopyrightRule()],
 		];
 
 		if (!$this->areValid($rules)) {
@@ -106,12 +110,17 @@ public function submit(AlbumFactory $albumFactory): void
 		$baseAlbum->title = $this->title;
 		$baseAlbum->description = $this->description;
 
+		$this->copyright = trim($this->copyright);
+
 		// Not super pretty but whatever.
 		$column = ColumnSortingPhotoType::tryFrom($this->photo_sorting_column);
 		$order = OrderSortingType::tryFrom($this->photo_sorting_order);
 		$photoSortingCriterion = $column === null ? null : new PhotoSortingCriterion($column->toColumnSortingType(), $order);
 		$baseAlbum->photo_sorting = $photoSortingCriterion;
 
+		// If left empty, we set to null
+		$baseAlbum->copyright = $this->copyright === '' ? null : $this->copyright;
+
 		if ($this->is_model_album) {
 			/** @var ModelsAlbum $baseAlbum */
 			$baseAlbum->license = LicenseType::from($this->license);

diff --git a/app/Rules/CopyrightRule.php b/app/Rules/CopyrightRule.php
@@ -6,6 +6,6 @@ class CopyrightRule extends StringRule
 {
 	public function __construct()
 	{
-		parent::__construct(false, 300);
+		parent::__construct(true, 300);
 	}
 }
diff --git a/resources/views/components/gallery/album/details.blade.php b/resources/views/components/gallery/album/details.blade.php
@@ -10,7 +10,7 @@
         @endif
         @if($this->AlbumFormatted->copyright !== null && $this->AlbumFormatted->copyright !== '')
         <span class="block text-text-main-200 text-sm">
-            {{ $this->AlbumFormatted->copyright }}
+            {{ __('lychee.ALBUM_COPYRIGHT') }} {{ $this->AlbumFormatted->copyright }}
         </span>
         @endif
         @if($this->num_albums > 0)

diff --git a/resources/views/livewire/forms/album/properties.blade.php b/resources/views/livewire/forms/album/properties.blade.php
@@ -26,6 +26,11 @@
             <span class="font-bold">{{ __('lychee.ALBUM_SET_LICENSE') }}</span>
             <x-forms.dropdown class="mx-2" :options="$this->licenses" id="license_dialog_select" wire:model='license'/>
         </div>
+        <div class="mb-4 flex">
+            <span class="inline-block font-bold shrink-0 pr-2">{{ __('lychee.ALBUM_SET_COPYRIGHT') }}:</span>
+            <x-forms.inputs.text class="-mt-1 w-full" wire:model='copyright' id="copyright" />
+            <x-forms.error-message field='copyright' />
+        </div>
         <div class="h-10">
             <span class="font-bold">Set album thumbs aspect ratio</span>
             <x-forms.dropdown class="mx-2" :options="$this->aspectRatios" id="aspect_ratio_dialog_select" wire:model='album_aspect_ratio'/>

diff --git a/tests/Livewire/Forms/Album/PropertiesTest.php b/tests/Livewire/Forms/Album/PropertiesTest.php
@@ -13,6 +13,7 @@
 namespace Tests\Livewire\Forms\Album;
 
 use App\Livewire\Components\Forms\Album\Properties;
+use App\Models\Album;
 use Livewire\Livewire;
 use Tests\Livewire\Base\BaseLivewireTest;
 
@@ -40,4 +41,29 @@ public function testPropertiesLoggedIn(): void
 			->assertOk()
 			->assertNotDispatched('notify', self::notifySuccess());
 	}
+
+	public function testSetCopyright(): void
+	{
+		Livewire::actingAs($this->admin)->test(Properties::class, ['album' => $this->album1])
+			->assertOk()
+			->assertViewIs('livewire.forms.album.properties')
+			->set('copyright', 'something')
+			->call('submit')
+			->assertOk()
+			->assertDispatched('notify', self::notifySuccess());
+
+		$copyright = Album::findOrFail($this->album1->id)->copyright;
+		$this->assertEquals('something', $copyright);
+
+		Livewire::actingAs($this->admin)->test(Properties::class, ['album' => $this->album1])
+			->assertOk()
+			->assertViewIs('livewire.forms.album.properties')
+			->set('copyright', '')
+			->call('submit')
+			->assertOk()
+			->assertDispatched('notify', self::notifySuccess());
+
+		$copyright = Album::findOrFail($this->album1->id)->copyright;
+		$this->assertEquals(null, $copyright);
+	}
 }