fix: handle imports bug

Author: ousid

resources/views/livewire/tailwindcss/handle-imports.blade.php

@@ -3,7 +3,11 @@
     @foreach ($this->imports as $import)
         <div class="p-6">
             <div>
-                <h2 class="font-medium">Importing {{ $import->file_name }}</h2>
+                <h2 class="font-medium">
+                    {{ __('Importing :file_name', [
+                        'file_name' => $import->file_name,
+                    ]) }}
+                </h2>
                 <span class="text-gray-700 text-sm">Imported {{ $import->processed_rows }}/{{ $import->total_rows }} rows</span>
                 <div class="w-full bg-indigo-100 rounded">
                     <div class="mt-2 w-full bg-indigo-500 rounded h-2" style="width: {{ $import->percentageComplete() }}%"></div>

src/Http/Livewire/HandleImports.php

@@ -28,9 +28,9 @@ public function getImportsProperty()
 
         return Import::query()
                     ->forModel($this->model)
-                    ->forUser($user)
+                    ->forUser($user->id)
                     ->oldest()
-                    ->notCompleted()
+                    ->unCompleted()
                     ->get();
     }
 

src/Scopes/ImportScope.php

@@ -22,11 +22,16 @@ public function scopeCompleted(Builder $builder): Builder
      *
      * @return \Illuminate\Database\Eloquent\Builder
      */
-    public function scopeNotCompleted(Builder $builder): Builder
+    public function scopeUnCompleted(Builder $builder): Builder
     {
         return $builder->whereNull('completed_at');
     }
 
+    public function percentageComplete()
+    {
+        return floor(($this->processed_rows / $this->total_rows) * 100);
+    }
+
     /**
      * Fetch imports based on the given model
      *
@@ -41,10 +46,10 @@ public function scopeForModel(Builder $builder, string $model): Builder
     /**
      * Fetch imports on the user id
      *
-     * @param  \Illuminate\Foundation\Auth\User  $user
+     * @param  int  $user
      * @return \Illuminate\Database\Eloquent\Builder
      */
-    public function scopeForUser(Builder $builder, User $user): Builder
+    public function scopeForUser(Builder $builder, int $user): Builder
     {
         return $builder->where('user_id', $user);
     }