Refactor progress components to use a new Progress class and display progress as Int

resources/views/infolists/components/circle-progress-entry.blade.php

@@ -1,32 +1,18 @@
 <x-dynamic-component :component="$getEntryWrapperView()" :entry="$entry">
     @php
-        $total = $getState()['total'];
-        $progress = $getState()['progress'];
-        $progress = $total > 0 ? ($progress / $total) * 100 : 0;
-
-        if($progress === 100){
-            $progressColor = '#2980b9';
-        } else if($progress > 50){
-            $progressColor = '#27ae60';
-        } else if($progress > 25){
-            $progressColor = '#f39c12';
-        } else {
-            $progressColor = '#e74c3c';
-        }    
-
-        $displayProgress = $progress === 100 ? number_format($progress, 0) : number_format($progress, 2);
+        $data = $column->getProgressData($getState());
     @endphp
-    
+
     <div class="progress-circle" style="
         background: conic-gradient(
-            {{ $progressColor }} {{ $displayProgress * 3.6 }}deg,
-            #e5e7eb {{ $displayProgress * 3.6 }}deg
+            {{ $data['progressColor'] }} {{ $data['displayProgress'] * 3.6 }}deg,
+            #e5e7eb {{ $data['displayProgress'] * 3.6 }}deg
         );">
         @if($entry instanceof \LaraZeus\Progress\Infolists\Components\CircleProgressEntry && $entry->getCanShow())
-            <small>{{ $displayProgress }}%</small>
+            <small>{{ $data['displayProgress'] }}%</small>
         @endif
     </div>
-    
+
     <style>
         .progress-circle {
             position: relative;

resources/views/infolists/components/progress-bar-entry.blade.php

@@ -1,31 +1,17 @@
 <x-dynamic-component :component="$getEntryWrapperView()" :entry="$entry">
     @php
-        $total = $getState()['total'];
-        $progress = $getState()['progress'];
-        $progress = $total > 0 ? ($progress / $total) * 100 : 0;
-
-        if($progress === 100){
-            $progressColor = '#2980b9';
-        } else if($progress > 50){
-            $progressColor = '#27ae60';
-        } else if($progress > 25){
-            $progressColor = '#f39c12';
-        } else {
-            $progressColor = '#e74c3c';
-        }
-
-        $displayProgress = $progress === 100 ? number_format($progress, 0) : number_format($progress, 2);
+        $data = $column->getProgressData($getState());
     @endphp
 
     <div class="progress-container">
-        <div class="progress-bar" style="width: {{ $displayProgress }}%; background-color: {{ $progressColor }};"></div>
+        <div class="progress-bar" style="width: {{ $data['displayProgress'] }}%; background-color: {{ $data['progressColor'] }};"></div>
         <div class="progress-text">
             @if($entry instanceof \LaraZeus\Progress\Infolists\Components\ProgressBarEntry && $entry->getCanShow())
                 <small @class([
-                    'text-gray-700' => $displayProgress != 100,
-                    'text-white' => $displayProgress == 100
+                    'text-gray-700' => $data['displayProgress'] != 100,
+                    'text-white' => $data['displayProgress'] == 100
                     ])>
-                    {{ $displayProgress }}%
+                    {{ $data['displayProgress'] }}%
                 </small>
             @endif
         </div>

resources/views/tables/columns/circle-progress.blade.php

@@ -1,28 +1,14 @@
 @php
-    $total = $getState()['total'];
-    $progress = $getState()['progress'];
-    $progress = $total > 0 ? ($progress / $total) * 100 : 0;
-
-    if($progress === 100){
-        $progressColor = '#2980b9';
-    } else if($progress > 50){
-        $progressColor = '#27ae60';
-    } else if($progress > 25){
-        $progressColor = '#f39c12';
-    } else {
-        $progressColor = '#e74c3c';
-    }    
-
-    $displayProgress = $progress === 100 ? number_format($progress, 0) : number_format($progress, 2);
+    $data = $column->getProgressData($getState());
 @endphp
 
 <div class="progress-circle" style="
     background: conic-gradient(
-        {{ $progressColor }} {{ $displayProgress * 3.6 }}deg,
-        #e5e7eb {{ $displayProgress * 3.6 }}deg
+        {{ $data['progressColor'] }} {{ $data['displayProgress'] * 3.6 }}deg,
+        #e5e7eb {{ $data['displayProgress'] * 3.6 }}deg
     );">
     @if($column instanceof \LaraZeus\Progress\Tables\Columns\CircleProgress && $column->getCanShow())
-        <small>{{ $displayProgress }}%</small>
+        <small>{{ $data['displayProgress'] }}%</small>
     @endif
 </div>
 
@@ -55,4 +41,4 @@
         font-size: 8pt;
         z-index: 2;
     }
-</style>
+</style>

resources/views/tables/columns/progress-bar.blade.php

@@ -1,30 +1,16 @@
 @php
-    $total = $getState()['total'];
-    $progress = $getState()['progress'];
-    $progress = $total > 0 ? ($progress / $total) * 100 : 0;
-
-    if($progress === 100){
-        $progressColor = '#2980b9';
-    } else if($progress > 50){
-        $progressColor = '#27ae60';
-    } else if($progress > 25){
-        $progressColor = '#f39c12';
-    } else {
-        $progressColor = '#e74c3c';
-    }
-
-    $displayProgress = $progress === 100 ? number_format($progress, 0) : number_format($progress, 2);
+    $data = $column->getProgressData($getState());
 @endphp
 
 <div class="progress-container">
-    <div class="progress-bar" style="width: {{ $displayProgress }}%; background-color: {{ $progressColor }};"></div>
+    <div class="progress-bar" style="width: {{ $data['displayProgress'] }}%; background-color: {{ $data['progressColor'] }};"></div>
     <div class="progress-text">
         @if($column instanceof \LaraZeus\Progress\Tables\Columns\ProgressBar && $column->getCanShow())
             <small @class([
-                'text-gray-700' => $displayProgress !== 100,
-                'text-white' => $displayProgress === 100
+                'text-gray-700' => $data['displayProgress'] !== 100,
+                'text-white' => $data['displayProgress'] === 100
                 ])>
-                {{ $displayProgress }}%
+                {{ $data['displayProgress'] }}%
             </small>
         @endif
     </div>
@@ -77,4 +63,4 @@
             background-position: 0 0;
         }
     }
-</style>
+</style>

src/Infolists/Components/CircleProgressEntry.php

@@ -2,23 +2,7 @@
 
 namespace LaraZeus\Progress\Infolists\Components;
 
-use Filament\Infolists\Components\Entry;
-
-class CircleProgressEntry extends Entry
+class CircleProgressEntry extends ProgressEntry
 {
-    protected bool $canShow = true;
-
     protected string $view = 'lara-zeus-progress::infolists.components.circle-progress-entry';
-
-    public function hideProgressValue($canShow = false): static
-    {
-        $this->canShow = $canShow;
-
-        return $this;
-    }
-
-    public function getCanShow(): bool
-    {
-        return $this->canShow;
-    }
 }

src/Infolists/Components/ProgressBarEntry.php

@@ -2,23 +2,7 @@
 
 namespace LaraZeus\Progress\Infolists\Components;
 
-use Filament\Infolists\Components\Entry;
-
-class ProgressBarEntry extends Entry
+class ProgressBarEntry extends ProgressEntry
 {
-    protected bool $canShow = true;
-
     protected string $view = 'lara-zeus-progress::infolists.components.progress-bar-entry';
-
-    public function hideProgressValue($canShow = false): static
-    {
-        $this->canShow = $canShow;
-
-        return $this;
-    }
-
-    public function getCanShow(): bool
-    {
-        return $this->canShow;
-    }
 }

src/Infolists/Components/ProgressEntry.php

@@ -0,0 +1,49 @@
+<?php
+
+namespace LaraZeus\Progress\Infolists\Components;
+
+use Filament\Infolists\Components\Entry;
+
+class ProgressEntry extends Entry
+{
+    protected bool $canShow = true;
+
+    protected string $view = 'lara-zeus-progress::infolists.components.circle-progress-entry';
+
+    public function hideProgressValue($canShow = false): static
+    {
+        $this->canShow = $canShow;
+
+        return $this;
+    }
+
+    public function getCanShow(): bool
+    {
+        return $this->canShow;
+    }
+
+    public function getProgressData(array $state): array
+    {
+        $total = $state['total'] ?? 0;
+        $progress = $state['progress'] ?? 0;
+        $progress = $total > 0 ? ($progress / $total) * 100 : 0;
+
+        if ($progress === 100) {
+            $progressColor = '#2980b9';
+        } elseif ($progress > 50) {
+            $progressColor = '#27ae60';
+        } elseif ($progress > 25) {
+            $progressColor = '#f39c12';
+        } else {
+            $progressColor = '#e74c3c';
+        }
+
+        $displayProgress = number_format($progress);
+
+        return [
+            'progress' => $progress,
+            'progressColor' => $progressColor,
+            'displayProgress' => $displayProgress,
+        ];
+    }
+}

src/Tables/Columns/CircleProgress.php

@@ -2,23 +2,7 @@
 
 namespace LaraZeus\Progress\Tables\Columns;
 
-use Filament\Tables\Columns\Column;
-
-class CircleProgress extends Column
+class CircleProgress extends Progress
 {
-    protected bool $canShow = true;
-
     protected string $view = 'lara-zeus-progress::tables.columns.circle-progress';
-
-    public function hideProgressValue($canShow = false): static
-    {
-        $this->canShow = $canShow;
-
-        return $this;
-    }
-
-    public function getCanShow(): bool
-    {
-        return $this->canShow;
-    }
 }

src/Tables/Columns/Progress.php

@@ -0,0 +1,47 @@
+<?php
+
+namespace LaraZeus\Progress\Tables\Columns;
+
+use Filament\Tables\Columns\Column;
+
+class Progress extends Column
+{
+    protected bool $canShow = true;
+
+    public function hideProgressValue($canShow = false): static
+    {
+        $this->canShow = $canShow;
+
+        return $this;
+    }
+
+    public function getCanShow(): bool
+    {
+        return $this->canShow;
+    }
+
+    public function getProgressData(array $state): array
+    {
+        $total = $state['total'] ?? 0;
+        $progress = $state['progress'] ?? 0;
+        $progress = $total > 0 ? ($progress / $total) * 100 : 0;
+
+        if ($progress === 100) {
+            $progressColor = '#2980b9';
+        } elseif ($progress > 50) {
+            $progressColor = '#27ae60';
+        } elseif ($progress > 25) {
+            $progressColor = '#f39c12';
+        } else {
+            $progressColor = '#e74c3c';
+        }
+
+        $displayProgress = number_format($progress);
+
+        return [
+            'progress' => $progress,
+            'progressColor' => $progressColor,
+            'displayProgress' => $displayProgress,
+        ];
+    }
+}

src/Tables/Columns/ProgressBar.php

@@ -2,23 +2,7 @@
 
 namespace LaraZeus\Progress\Tables\Columns;
 
-use Filament\Tables\Columns\Column;
-
-class ProgressBar extends Column
+class ProgressBar extends Progress
 {
-    protected bool $canShow = true;
-
     protected string $view = 'lara-zeus-progress::tables.columns.progress-bar';
-
-    public function hideProgressValue($canShow = false): static
-    {
-        $this->canShow = $canShow;
-
-        return $this;
-    }
-
-    public function getCanShow(): bool
-    {
-        return $this->canShow;
-    }
 }