Merge pull request #26 from alkrauss48/issue-23-and-25

Update daily view dispatching and add loop test

app/Filament/Resources/PresentationResource/Pages/EditPresentation.php

@@ -55,13 +55,13 @@ protected function getHeaderActions(): array
                         return;
                     }
 
-                    // Note: If in the future we implement a websocket server,
-                    // then we can implement an initial notification like this.
-                    //
-                    // Notification::make()
-                    //     ->title('Hang tight for just a sec, your thumbnail is being generated.')
-                    //     ->info()
-                    //     ->send();
+                    Notification::make()
+                        ->title(
+                            'Hang tight, your thumbnail is being generated in '
+                            .'the background. Please refresh your browser in 5-10 '
+                            .'seconds.'
+                        )->info()
+                        ->send();
 
                     GenerateThumbnail::dispatch(
                         presentation: $record,

app/Http/Controllers/AdhocSlidesController.php

@@ -10,9 +10,7 @@ class AdhocSlidesController extends Controller
 {
     public function index(): Response
     {
-        dispatch(function () {
-            DailyView::createForAdhocPresentation();
-        })->afterResponse();
+        $this->dispatchDailyView();
 
         return Inertia::render('Slides');
     }
@@ -23,9 +21,7 @@ public function show(string $slides): Response
             abort(404);
         }
 
-        dispatch(function () use ($slides) {
-            DailyView::createForAdhocPresentation(slug: $slides);
-        })->afterResponse();
+        $this->dispatchDailyView(slug: $slides);
 
         return Inertia::render('Slides', [
             'slides' => $slides,
@@ -45,4 +41,15 @@ private function isValidBase64String(string $value): bool
 
         return false;
     }
+
+    private function dispatchDailyView(?string $slug = null): void
+    {
+        if (auth()->user()?->isAdministrator() ?? false) {
+            return;
+        }
+
+        dispatch(
+            fn () => DailyView::createForAdhocPresentation(slug: $slug)
+        )->afterResponse();
+    }
 }

app/Jobs/GenerateThumbnail.php

@@ -57,10 +57,13 @@ public function handle(): void
         $this->presentation->clearMediaCollection('thumbnail');
         $this->presentation->addMedia($tempPath)->toMediaCollection('thumbnail');
 
-        Notification::make()
-            ->title('Thumbnail successfully generated. Refresh your page to view the new thumbnail.')
-            ->broadcast($this->user)
-            ->success()
-            ->send();
+        // Note: If in the future we implement a websocket server,
+        // then we can implement a completed notification like this.
+        //
+        // Notification::make()
+        //     ->title('Thumbnail successfully generated. Refresh your page to view the new thumbnail.')
+        //     ->broadcast($this->user)
+        //     ->success()
+        //     ->send();
     }
 }

resources/js/lib/textFit.js

@@ -36,6 +36,11 @@ var defaultSettings = {
 
 export default function textFit(els, options) {
 
+  // Vitest doesn't always play nicely with textFit
+  if (process.env.NODE_ENV === 'test') {
+    return;
+  }
+
   if (!options) options = {};
 
   // Extend options.

resources/js/test/components/SlideView.loop.test.ts

@@ -51,3 +51,17 @@ test('loopInterval is not cleared on invalid key press', async () => {
 
     expect(spy).toHaveBeenCalledTimes(0);
 });
+
+test('slide increments with loop timer', async () => {
+    vi.useFakeTimers();
+
+    const wrapper = mountWrapper();
+
+    expect(slideStore.index).toBe(1);
+
+    vi
+        .advanceTimersToNextTimer() // Font load interval
+        .advanceTimersToNextTimer();
+
+    expect(slideStore.index).toBe(2);
+});

tests/Feature/AdhocSlidesControllerTest.php

@@ -1,6 +1,7 @@
 <?php
 
 use App\Models\DailyView;
+use App\Models\User;
 
 describe('Index', function () {
     test('adhoc slides index screen can be rendered', function () {
@@ -10,12 +11,24 @@
     });
 
     test('adhoc slides index screen generate daily view', function () {
-        $response = $this->get(route('home'));
+        $this->get(route('home'));
 
         $this->assertDatabaseHas(DailyView::class, [
             'adhoc_slug' => null,
         ]);
     });
+
+    test('adhoc slides index screen does not generate daily view for admin user', function () {
+        $admin = User::factory()->admin()->create();
+
+        $this
+            ->actingAs($admin)
+            ->get(route('home'));
+
+        $this->assertDatabaseMissing(DailyView::class, [
+            'adhoc_slug' => null,
+        ]);
+    });
 });
 
 describe('Show', function () {
@@ -36,7 +49,7 @@
     });
 
     test('adhoc slides show screen generate daily view', function () {
-        $response = $this->get(route('adhoc-slides.show', [
+        $this->get(route('adhoc-slides.show', [
             'slides' => base64_encode('foo'),
         ]));
 
@@ -46,12 +59,26 @@
     });
 
     test('adhoc slides show screen will not generate daily view with invalid slug', function () {
-        $response = $this->get(route('adhoc-slides.show', [
+        $this->get(route('adhoc-slides.show', [
             'slides' => 'foo', // Not base64 encoded
         ]));
 
         $this->assertDatabaseMissing(DailyView::class, [
             'adhoc_slug' => 'foo',
         ]);
     });
+
+    test('adhoc slides show screen does not generate daily view for admin user', function () {
+        $admin = User::factory()->admin()->create();
+
+        $this
+            ->actingAs($admin)
+            ->get(route('adhoc-slides.show', [
+                'slides' => base64_encode('foo'),
+            ]));
+
+        $this->assertDatabaseMissing(DailyView::class, [
+            'adhoc_slug' => base64_encode('foo'),
+        ]);
+    });
 });