Import: better form

owlchester · Nov 16, 2023 · 3789ef3 · 3789ef3
1 parent 66f9864
commit 3789ef3
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 7 deletions.
diff --git a/app/Http/Controllers/Campaign/ImportController.php b/app/Http/Controllers/Campaign/ImportController.php
@@ -7,6 +7,7 @@
 use App\Http\Controllers\Controller;
 use App\Models\Campaign;
 use App\Services\Campaign\Import\PrepareService;
+use Exception;
 
 class ImportController extends Controller
 {
@@ -45,6 +46,7 @@ public function index(Campaign $campaign)
             ->user(auth()->user())
             ->token();
 
+
         return view('campaigns.import.index')
             ->with('campaign', $campaign)
             ->with('token', $token)

diff --git a/app/Models/CampaignImport.php b/app/Models/CampaignImport.php
@@ -56,6 +56,11 @@ public function user()
         return $this->belongsTo(User::class);
     }
 
+    public function isPrepared(): bool
+    {
+        return $this->status_id == CampaignImportStatus::PREPARED;
+    }
+
     public function isFailed(): bool
     {
         return $this->status_id == CampaignImportStatus::FAILED;

diff --git a/app/Services/Campaign/Import/PrepareService.php b/app/Services/Campaign/Import/PrepareService.php
@@ -16,7 +16,7 @@ public function token(): CampaignImport
     {
         $token = CampaignImport::where('campaign_id', $this->campaign->id)
             ->where('user_id', $this->user->id)
-            ->where('status_id', CampaignImportStatus::PREPARED)
+            ->whereNotIn('status_id', [CampaignImportStatus::FINISHED, CampaignImportStatus::FAILED])
             ->first();
         if ($token) {
             return $token;

diff --git a/public/build/assets/import-32d5882e.js b/public/build/assets/import-32d5882e.js
diff --git a/public/build/assets/import-9d98db56.js b/public/build/assets/import-9d98db56.js
diff --git a/public/build/manifest.json b/public/build/manifest.json
@@ -108,7 +108,7 @@
     "src": "resources/js/billing.js"
   },
   "resources/js/campaigns/import.js": {
-    "file": "assets/import-9d98db56.js",
+    "file": "assets/import-32d5882e.js",
     "imports": [
       "_index-0b481a1e.js",
       "__commonjsHelpers-725317a4.js"

diff --git a/resources/js/campaigns/import.js b/resources/js/campaigns/import.js
@@ -45,7 +45,7 @@ const initExport = () => {
 };
 
 const startProcess = (form, data) => {
-    console.log('start');
+    form.classList.add('hidden');
 
     // Now upload to the real endpoint
     let config = {
@@ -66,15 +66,14 @@ const startProcess = (form, data) => {
     axios
         .post(form.action, data, config)
         .then(function (res) {
-            console.log('yo?');
             fileProgress.hide();
 
             if (res.data.success) {
-
+                window.location.reload();
             }
         })
         .catch(function (err) {
-            alert('oops');
+            form.classList.remove('hidden');
             fileProgress.hide();
 
             if (err.response && err.response.data.message) {

diff --git a/resources/views/campaigns/import/index.blade.php b/resources/views/campaigns/import/index.blade.php
@@ -24,6 +24,7 @@
             </a>
         </div>
 
+        @if ($token->isPrepared())
         <form id="campaign-import-form" method="post" action="{{ \App\Facades\Domain::importer() }}">
             {{ csrf_field() }}
             <x-grid type="1/1">
@@ -51,6 +52,7 @@
                 <span class="sr-only"></span>
             </div>
         </div>
+        @endif
 
         <div class="box box-solid">
             <div id="datagrid-parent" class="table-responsive">