From 637422454b3642447c430d9ee426b997783afc33 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <5845193+andrasbacsai@users.noreply.github.com>
Date: Wed, 3 Dec 2025 08:52:52 +0100
Subject: [PATCH] Revert "Add Simple View toggle for logs"

---
 .../forms/checkbox-alpine.blade.php           |  23 ---
 .../project/shared/get-logs.blade.php         | 166 +++++++++++-------
 2 files changed, 98 insertions(+), 91 deletions(-)
 delete mode 100644 resources/views/components/forms/checkbox-alpine.blade.php

diff --git a/resources/views/components/forms/checkbox-alpine.blade.php b/resources/views/components/forms/checkbox-alpine.blade.php
deleted file mode 100644
index e9bc4044f..000000000
--- a/resources/views/components/forms/checkbox-alpine.blade.php
+++ /dev/null
@@ -1,23 +0,0 @@
-@props([
-    'label' => null,
-    'disabled' => false,
-    'defaultClass' => 'dark:border-neutral-700 text-coolgray-400 dark:bg-coolgray-100 rounded-sm cursor-pointer dark:disabled:bg-base dark:disabled:cursor-not-allowed focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-coollabs dark:focus-visible:ring-warning focus-visible:ring-offset-2 dark:focus-visible:ring-offset-base',
-])
-
-<div @class([
-    'flex flex-row items-center gap-4 pr-2 py-1 form-control min-w-fit',
-    'dark:hover:bg-coolgray-100 cursor-pointer' => !$disabled,
-])>
-    <label @class(['flex gap-4 items-center px-0 min-w-fit label w-full'])>
-        <span class="flex grow gap-2">
-            @if ($label)
-                @if ($disabled)
-                    <span class="opacity-60">{!! $label !!}</span>
-                @else
-                    {!! $label !!}
-                @endif
-            @endif
-        </span>
-        <input type="checkbox" @disabled($disabled) {{ $attributes->merge(['class' => $defaultClass]) }} />
-    </label>
-</div>
diff --git a/resources/views/livewire/project/shared/get-logs.blade.php b/resources/views/livewire/project/shared/get-logs.blade.php
index 048e64a5a..f6477a882 100644
--- a/resources/views/livewire/project/shared/get-logs.blade.php
+++ b/resources/views/livewire/project/shared/get-logs.blade.php
@@ -1,12 +1,36 @@
 <div class="p-4 my-4 border dark:border-coolgray-200 border-neutral-200">
     <div x-init="$wire.getLogs" id="screen" x-data="{
         fullscreen: false,
-        useSimpleView: localStorage.getItem('logView') === 'simple',
+        alwaysScroll: false,
+        intervalId: null,
         makeFullscreen() {
             this.fullscreen = !this.fullscreen;
+            if (this.fullscreen === false) {
+                this.alwaysScroll = false;
+                clearInterval(this.intervalId);
+            }
         },
-        toggleLogView() {
-            localStorage.setItem('logView', this.useSimpleView ? 'simple' : 'enhanced');
+        toggleScroll() {
+            this.alwaysScroll = !this.alwaysScroll;
+    
+            if (this.alwaysScroll) {
+                this.intervalId = setInterval(() => {
+                    const screen = document.getElementById('screen');
+                    const logs = document.getElementById('logs');
+                    if (screen.scrollTop !== logs.scrollHeight) {
+                        screen.scrollTop = logs.scrollHeight;
+                    }
+                }, 100);
+            } else {
+                clearInterval(this.intervalId);
+                this.intervalId = null;
+            }
+        },
+        goTop() {
+            this.alwaysScroll = false;
+            clearInterval(this.intervalId);
+            const screen = document.getElementById('screen');
+            screen.scrollTop = 0;
         }
     }">
         <div class="flex gap-2 items-center">
@@ -33,8 +57,6 @@
                 <x-forms.button type="submit">Refresh</x-forms.button>
                 <x-forms.checkbox instantSave label="Stream Logs" id="streamLogs"></x-forms.checkbox>
                 <x-forms.checkbox instantSave label="Include Timestamps" id="showTimeStamps"></x-forms.checkbox>
-                <x-forms.checkbox-alpine label="Simple View" x-model="useSimpleView"
-                    @click="$nextTick(() => toggleLogView())" />
             </div>
         </form>
         <div :class="fullscreen ? 'fullscreen' : 'relative w-full py-4 mx-auto'">
@@ -43,6 +65,21 @@
                 <div :class="fullscreen ? 'fixed top-4 right-4' : 'absolute top-6 right-0'">
                     <div class="flex justify-end gap-4" :class="fullscreen ? 'fixed' : ''"
                         style="transform: translateX(-100%)">
+                        {{-- <button title="Go Top" x-show="fullscreen" x-on:click="goTop">
+                            <svg class="w-5 h-5 opacity-30 hover:opacity-100" viewBox="0 0 24 24"
+                                xmlns="http://www.w3.org/2000/svg">
+                                <path fill="none" stroke="currentColor" stroke-linecap="round"
+                                    stroke-linejoin="round" stroke-width="2" d="M12 5v14m4-10l-4-4M8 9l4-4" />
+                            </svg>
+                        </button>
+                        <button title="Follow Logs" x-show="fullscreen" :class="alwaysScroll ? 'dark:text-warning' : ''"
+                            x-on:click="toggleScroll">
+                            <svg class="w-5 h-5 opacity-30 hover:opacity-100" viewBox="0 0 24 24"
+                                xmlns="http://www.w3.org/2000/svg">
+                                <path fill="none" stroke="currentColor" stroke-linecap="round"
+                                    stroke-linejoin="round" stroke-width="2" d="M12 5v14m4-4l-4 4m-4-4l4 4" />
+                            </svg>
+                        </button> --}}
                         <button title="Fullscreen" x-show="!fullscreen" x-on:click="makeFullscreen">
                             <svg class="w-5 h-5 opacity-30 hover:opacity-100" viewBox="0 0 24 24"
                                 xmlns="http://www.w3.org/2000/svg">
@@ -55,76 +92,69 @@
                             </svg>
                         </button>
                         <button title="Minimize" x-show="fullscreen" x-on:click="makeFullscreen">
-                            <svg class="w-5 h-5 opacity-30 hover:opacity-100" viewBox="0 0 24 24"
-                                xmlns="http://www.w3.org/2000/svg">
-                                <path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"
-                                    stroke-width="2" d="M6 14h4m0 0v4m0-4l-6 6m14-10h-4m0 0V6m0 4l6-6" />
+                            <svg class="w-5 h-5 opacity-30 hover:opacity-100"
+                                viewBox="0 0 24 24"xmlns="http://www.w3.org/2000/svg">
+                                <path fill="none" stroke="currentColor" stroke-linecap="round"
+                                    stroke-linejoin="round" stroke-width="2"
+                                    d="M6 14h4m0 0v4m0-4l-6 6m14-10h-4m0 0V6m0 4l6-6" />
                             </svg>
                         </button>
                     </div>
                 </div>
                 @if ($outputs)
                     <div id="logs" class="font-mono text-sm">
-                        <!-- Simple View (Original) -->
-                        <div x-show="useSimpleView">
-                            <pre class="whitespace-pre-wrap break-all">{{ $outputs }}</pre>
-                        </div>
+                        @foreach (explode("\n", trim($outputs)) as $line)
+                            @if (!empty(trim($line)))
+                                @php
+                                    $lowerLine = strtolower($line);
+                                    $isError =
+                                        str_contains($lowerLine, 'error') ||
+                                        str_contains($lowerLine, 'err') ||
+                                        str_contains($lowerLine, 'failed') ||
+                                        str_contains($lowerLine, 'exception');
+                                    $isWarning =
+                                        str_contains($lowerLine, 'warn') ||
+                                        str_contains($lowerLine, 'warning') ||
+                                        str_contains($lowerLine, 'wrn');
+                                    $isDebug =
+                                        str_contains($lowerLine, 'debug') ||
+                                        str_contains($lowerLine, 'dbg') ||
+                                        str_contains($lowerLine, 'trace');
+                                    $barColor = $isError
+                                        ? 'bg-red-500 dark:bg-red-400'
+                                        : ($isWarning
+                                            ? 'bg-warning-500 dark:bg-warning-400'
+                                            : ($isDebug
+                                                ? 'bg-purple-500 dark:bg-purple-400'
+                                                : 'bg-blue-500 dark:bg-blue-400'));
+                                    $bgColor = $isError
+                                        ? 'bg-red-50/50 dark:bg-red-900/20 hover:bg-red-100/50 dark:hover:bg-red-800/30'
+                                        : ($isWarning
+                                            ? 'bg-warning-50/50 dark:bg-warning-900/20 hover:bg-warning-100/50 dark:hover:bg-warning-800/30'
+                                            : ($isDebug
+                                                ? 'bg-purple-50/50 dark:bg-purple-900/20 hover:bg-purple-100/50 dark:hover:bg-purple-800/30'
+                                                : 'bg-blue-50/50 dark:bg-blue-900/20 hover:bg-blue-100/50 dark:hover:bg-blue-800/30'));
 
-                        <!-- Enhanced View (Current with color coding) -->
-                        <div x-show="!useSimpleView">
-                            @foreach (explode("\n", trim($outputs)) as $line)
-                                @if (!empty(trim($line)))
-                                    @php
-                                        $lowerLine = strtolower($line);
-                                        $isError =
-                                            str_contains($lowerLine, 'error') ||
-                                            str_contains($lowerLine, 'err') ||
-                                            str_contains($lowerLine, 'failed') ||
-                                            str_contains($lowerLine, 'exception');
-                                        $isWarning =
-                                            str_contains($lowerLine, 'warn') ||
-                                            str_contains($lowerLine, 'warning') ||
-                                            str_contains($lowerLine, 'wrn');
-                                        $isDebug =
-                                            str_contains($lowerLine, 'debug') ||
-                                            str_contains($lowerLine, 'dbg') ||
-                                            str_contains($lowerLine, 'trace');
-                                        $barColor = $isError
-                                            ? 'bg-red-500 dark:bg-red-400'
-                                            : ($isWarning
-                                                ? 'bg-warning-500 dark:bg-warning-400'
-                                                : ($isDebug
-                                                    ? 'bg-purple-500 dark:bg-purple-400'
-                                                    : 'bg-blue-500 dark:bg-blue-400'));
-                                        $bgColor = $isError
-                                            ? 'bg-red-50/50 dark:bg-red-900/20 hover:bg-red-100/50 dark:hover:bg-red-800/30'
-                                            : ($isWarning
-                                                ? 'bg-warning-50/50 dark:bg-warning-900/20 hover:bg-warning-100/50 dark:hover:bg-warning-800/30'
-                                                : ($isDebug
-                                                    ? 'bg-purple-50/50 dark:bg-purple-900/20 hover:bg-purple-100/50 dark:hover:bg-purple-800/30'
-                                                    : 'bg-blue-50/50 dark:bg-blue-900/20 hover:bg-blue-100/50 dark:hover:bg-blue-800/30'));
-
-                                        // Check for timestamp at the beginning (ISO 8601 format)
-                                        $timestampPattern = '/^(\d{4}-\d{2}-\d{2}[T ]\d{2}:\d{2}:\d{2}(?:\.\d{3})?Z?)\s+/';
-                                        $hasTimestamp = preg_match($timestampPattern, $line, $matches);
-                                        $timestamp = $hasTimestamp ? $matches[1] : null;
-                                        $logContent = $hasTimestamp ? preg_replace($timestampPattern, '', $line) : $line;
-                                    @endphp
-                                    <div class="flex items-start gap-2 py-1 px-2 rounded-sm">
-                                        <div class="w-1 {{ $barColor }} rounded-full flex-shrink-0 self-stretch"></div>
-                                        <div class="flex-1 {{ $bgColor }} py-1 px-2 -mx-2 rounded-sm">
-                                            @if ($hasTimestamp)
-                                                <span
-                                                    class="text-xs text-gray-500 dark:text-gray-400 font-mono mr-2">{{ $timestamp }}</span>
-                                                <span class="whitespace-pre-wrap break-all">{{ $logContent }}</span>
-                                            @else
-                                                <span class="whitespace-pre-wrap break-all">{{ $line }}</span>
-                                            @endif
-                                        </div>
+                                    // Check for timestamp at the beginning (ISO 8601 format)
+                                    $timestampPattern = '/^(\d{4}-\d{2}-\d{2}[T ]\d{2}:\d{2}:\d{2}(?:\.\d{3})?Z?)\s+/';
+                                    $hasTimestamp = preg_match($timestampPattern, $line, $matches);
+                                    $timestamp = $hasTimestamp ? $matches[1] : null;
+                                    $logContent = $hasTimestamp ? preg_replace($timestampPattern, '', $line) : $line;
+                                @endphp
+                                <div class="flex items-start gap-2 py-1 px-2 rounded-sm">
+                                    <div class="w-1 {{ $barColor }} rounded-full flex-shrink-0 self-stretch"></div>
+                                    <div class="flex-1 {{ $bgColor }} py-1 px-2 -mx-2 rounded-sm">
+                                        @if ($hasTimestamp)
+                                            <span
+                                                class="text-xs text-gray-500 dark:text-gray-400 font-mono mr-2">{{ $timestamp }}</span>
+                                            <span class="whitespace-pre-wrap break-all">{{ $logContent }}</span>
+                                        @else
+                                            <span class="whitespace-pre-wrap break-all">{{ $line }}</span>
+                                        @endif
                                     </div>
-                                @endif
-                            @endforeach
-                        </div>
+                                </div>
+                            @endif
+                        @endforeach
                     </div>
                 @else
                     <div id="logs" class="font-mono text-sm py-4 px-2 text-gray-500 dark:text-gray-400">
@@ -134,4 +164,4 @@ class="text-xs text-gray-500 dark:text-gray-400 font-mono mr-2">{{ $timestamp }}
             </div>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>