chore(messages): cut over to the React messages index

app/Community/Actions/BuildMessageThreadIndexPagePropsAction.php

@@ -32,6 +32,7 @@ public function execute(
             ->whereNull('message_thread_participants.deleted_at')
             ->with([
                 'messages',
+                'lastMessage',
                 'messages.author' => function ($query) {
                     $query->withTrashed();
                 },

app/Community/Controllers/MessageThreadController.php

@@ -28,7 +28,7 @@ public function index(Request $request): InertiaResponse|RedirectResponse
         $actionResult = (new BuildMessageThreadIndexPagePropsAction())->execute($user, $currentPage);
 
         if ($actionResult['redirectToPage'] !== null) {
-            return redirect()->route('message-thread.index2', [
+            return redirect()->route('message-thread.index', [
                 'page' => $actionResult['redirectToPage'],
             ]);
         }

app/Community/Data/MessageThreadData.php

@@ -18,7 +18,7 @@ public function __construct(
         public int $id,
         public string $title,
         public int $numMessages,
-        public int $lastMessageId,
+        public Lazy|MessageData $lastMessage,
         public bool $isUnread,
         /** @var MessageData[] */
         public Lazy|array $messages = [],
@@ -33,7 +33,7 @@ public static function fromMessageThread(MessageThread $messageThread): self
             id: $messageThread->id,
             title: $messageThread->title,
             numMessages: $messageThread->num_messages,
-            lastMessageId: $messageThread->last_message_id,
+            lastMessage: Lazy::create(fn () => MessageData::fromMessage($messageThread->lastMessage)),
             isUnread: $messageThread->is_unread,
 
             /** @phpstan-ignore-next-line -- all() is valid */
@@ -55,7 +55,7 @@ public static function fromMessageThread(MessageThread $messageThread): self
     public static function fromCollection(Collection $messageThreads): array
     {
         return array_map(
-            fn ($messageThread) => self::fromMessageThread($messageThread),
+            fn ($messageThread) => self::fromMessageThread($messageThread)->include('lastMessage'),
             $messageThreads->all()
         );
     }

app/Community/RouteServiceProvider.php

@@ -109,7 +109,7 @@ protected function mapWebRoutes(): void
                         Route::get('forums/{category}/{forum}/create', [ForumTopicController::class, 'create'])->name('forum-topic.create');
                         Route::get('forums/post/{comment}/edit', [ForumTopicCommentController::class, 'edit'])->name('forum-topic-comment.edit');
 
-                        Route::get('messages2', [MessageThreadController::class, 'index'])->name('message-thread.index2');
+                        Route::get('messages', [MessageThreadController::class, 'index'])->name('message-thread.index');
 
                         Route::get('settings', [UserSettingsController::class, 'show'])->name('settings.show');
                     });

app/Models/MessageThread.php

@@ -7,6 +7,7 @@
 use App\Support\Database\Eloquent\BaseModel;
 use Database\Factories\MessageThreadFactory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\HasManyThrough;
@@ -50,6 +51,14 @@ public function getIsUnreadAttribute(): bool
 
     // == relations
 
+    /**
+     * @return BelongsTo<Message, MessageThread>
+     */
+    public function lastMessage(): BelongsTo
+    {
+        return $this->belongsTo(Message::class, 'last_message_id');
+    }
+
     /**
      * @return HasMany<Message>
      */

resources/js/features/messages/components/+root/MessagesRoot.test.tsx

@@ -125,7 +125,7 @@ describe('Component: MessagesRoot', () => {
 
     // ASSERT
     expect(visitSpy).toHaveBeenCalledOnce();
-    expect(visitSpy).toHaveBeenCalledWith(['message-thread.index2', { _query: { page: 2 } }]);
+    expect(visitSpy).toHaveBeenCalledWith(['message-thread.index', { _query: { page: 2 } }]);
   });
 
   it('displays a link to create a new message', () => {

resources/js/features/messages/components/+root/MessagesRoot.tsx

@@ -18,7 +18,7 @@ export const MessagesRoot: FC = memo(() => {
 
   const handlePageSelectValueChange = (newPageValue: number) => {
     router.visit(
-      route('message-thread.index2', {
+      route('message-thread.index', {
         _query: { page: newPageValue },
       }),
     );

resources/js/features/messages/components/MessagesBreadcrumbs/MessagesBreadcrumbs.tsx

@@ -24,7 +24,7 @@ export const MessagesBreadcrumbs: FC<MessagesBreadcrumbsProps> = ({ t_currentPag
       <BaseBreadcrumb>
         <BaseBreadcrumbList>
           <BaseBreadcrumbItem aria-label={t('Messages')}>
-            <BaseBreadcrumbLink href={route('message-thread.index2')}>
+            <BaseBreadcrumbLink href={route('message-thread.index')}>
               {t('Messages')}
             </BaseBreadcrumbLink>
           </BaseBreadcrumbItem>

resources/js/features/messages/components/MessagesCardList/MessagesCard.tsx

@@ -15,9 +15,6 @@ export const MessagesCard: FC<MessagesCardProps> = ({ messageThread }) => {
 
   const { t } = useTranslation();
 
-  const messages = messageThread.messages as App.Community.Data.Message[];
-  const lastMessage = messages[messages.length - 1];
-
   const otherParticipant =
     (messageThread.participants?.find(
       (p) => p.displayName !== auth?.user.displayName,
@@ -32,7 +29,7 @@ export const MessagesCard: FC<MessagesCardProps> = ({ messageThread }) => {
           <span className="text-2xs text-neutral-400 light:text-neutral-700">
             <DiffTimestamp
               asAbsoluteDate={auth?.user.preferences.prefersAbsoluteDates ?? false}
-              at={lastMessage.createdAt}
+              at={messageThread.lastMessage!.createdAt}
             />
           </span>
         </div>

resources/js/features/messages/components/MessagesTable/MessagesTableRow.tsx

@@ -17,9 +17,6 @@ export const MessagesTableRow: FC<MessagesTableRowProps> = ({ messageThread }) =
 
   const { t } = useTranslation();
 
-  const messages = messageThread.messages as App.Community.Data.Message[];
-  const lastMessage = messages[messages.length - 1];
-
   // Find who we're chatting with in order to populate the "With" column.
   const otherParticipant =
     (messageThread.participants?.find(
@@ -43,7 +40,7 @@ export const MessagesTableRow: FC<MessagesTableRowProps> = ({ messageThread }) =
       <BaseTableCell className="text-right">
         <DiffTimestamp
           asAbsoluteDate={auth?.user.preferences.prefersAbsoluteDates ?? false}
-          at={lastMessage.createdAt}
+          at={messageThread.lastMessage!.createdAt}
           className="text-2xs text-neutral-400 light:text-neutral-800"
         />
       </BaseTableCell>

resources/js/test/factories/createMessageThread.ts

@@ -5,7 +5,7 @@ export const createMessageThread = createFactory<App.Community.Data.MessageThrea
   return {
     id: faker.number.int({ min: 1, max: 999_999 }),
     isUnread: faker.datatype.boolean(),
-    lastMessageId: faker.number.int({ min: 1, max: 999_999 }),
+    lastMessage: createMessage(),
     numMessages: faker.number.int({ min: 1, max: 20 }),
     title: faker.word.words(12),
     messages: [createMessage()],

resources/js/types/generated.d.ts

@@ -78,7 +78,7 @@ declare namespace App.Community.Data {
     id: number;
     title: string;
     numMessages: number;
-    lastMessageId: number;
+    lastMessage?: App.Community.Data.Message;
     isUnread: boolean;
     messages?: Array<App.Community.Data.Message>;
     participants?: Array<App.Data.User>;

resources/js/ziggy.d.ts

@@ -4,7 +4,6 @@ declare module 'ziggy-js' {
     "demo": [],
     "tickets.index": [],
     "ranking.beaten-games": [],
-    "message-thread.index": [],
     "message.create": [],
     "achievement.tickets": [
         {
@@ -460,7 +459,7 @@ declare module 'ziggy-js' {
             "binding": "id"
         }
     ],
-    "message-thread.index2": [],
+    "message-thread.index": [],
     "settings.show": [],
     "achievement.comment.index": [
         {

tests/Feature/Community/Controllers/MessageThreadControllerTest.php

@@ -56,7 +56,7 @@ public function testIndexReturnsCorrectProps(): void
 
         // Act
         $response = $this->actingAs($this->user)
-            ->get(route('message-thread.index2'));
+            ->get(route('message-thread.index'));
 
         // Assert
         $response->assertOk();
@@ -65,7 +65,7 @@ public function testIndexReturnsCorrectProps(): void
             ->has('paginatedMessageThreads.items', 1)
             ->where('paginatedMessageThreads.items.0.id', $thread->id)
             ->where('paginatedMessageThreads.items.0.title', $thread->title)
-            ->where('paginatedMessageThreads.items.0.lastMessageId', $thread->last_message_id)
+            ->has('paginatedMessageThreads.items.0.lastMessage.createdAt')
             ->where('paginatedMessageThreads.items.0.isUnread', false)
             ->has('paginatedMessageThreads.items.0.messages')
             ->has('paginatedMessageThreads.items.0.participants')