Import/Export to new bucket

Author: ilestis

app/Http/Controllers/Campaign/ExportController.php

@@ -2,7 +2,6 @@
 
 namespace App\Http\Controllers\Campaign;
 
-use App\Facades\Datagrid;
 use App\Http\Controllers\Controller;
 use App\Models\Campaign;
 use App\Services\Campaign\ExportService;
@@ -21,26 +20,7 @@ public function __construct(ExportService $exportService)
     public function index(Campaign $campaign)
     {
         $this->authorize('setting', $campaign);
-
-        Datagrid::layout(\App\Renderers\Layouts\Campaign\CampaignExport::class);
-
-        $rows = $campaign->campaignExports()
-            ->sort(request()->only(['o', 'k']))
-            ->with(['user', 'campaign'])
-            ->orderBy('updated_at', 'DESC')
-            ->paginate();
-
-        // Ajax Datagrid
-        if (request()->ajax()) {
-            $html = view('layouts.datagrid._table')->with('rows', $rows)->render();
-
-            return response()->json([
-                'success' => true,
-                'html' => $html,
-            ]);
-        }
-
-        return view('campaigns.export', compact('campaign', 'rows'));
+        return view('campaigns.export', compact('campaign'));
     }
 
     /**

app/Livewire/Campaigns/ExportsTable.php

@@ -101,8 +101,8 @@ public function download(CampaignExport $model): string
         if (! $model->finished()) {
             return '';
         }
-        if ($model->path && Storage::exists($model->path)) {
-            $html = '<a class="block break-all truncate" href="' . Storage::url($model->path) . '" target="_blank">' . __('campaigns/export.actions.download') . '</a>';
+        if ($model->path && Storage::disk('export')->exists($model->path)) {
+            $html = '<a class="block break-all truncate" href="' . Storage::disk('export')->url($model->path) . '" target="_blank">' . __('campaigns/export.actions.download') . '</a>';
 
             return $html;
         }

app/Renderers/Layouts/Campaign/CampaignExport.php

@@ -15,27 +15,10 @@ class CampaignImport extends Layout
     public function columns(): array
     {
         $columns = [
-            'status' => [
-                'key' => 'status_id',
-                'label' => 'campaigns/plugins.fields.status',
-                'render' => function ($model) {
-                    $key = 'running';
-                    /** @var \App\Models\CampaignImport $model */
-                    if ($model->status_id === CampaignImportStatus::FAILED) {
-                        $key = 'failed';
-                    } elseif ($model->status_id == CampaignImportStatus::QUEUED) {
-                        $key = 'queued';
-                    } elseif ($model->status_id == CampaignImportStatus::FINISHED) {
-                        $key = 'finished';
-                    }
-
-                    return __('campaigns/import.status.' . $key);
-                },
-            ],
             'user_id' => [
                 'key' => 'user.name',
                 'label' => 'campaigns.members.fields.name',
-                'render' => function ($model) {
+                'render' => function (\App\Models\CampaignImport $model) {
                     if (! $model->user_id) {
                         return '';
                     }
@@ -47,12 +30,26 @@ public function columns(): array
             'updated_at' => [
                 'key' => 'updated_at',
                 'label' => 'campaigns/import.fields.updated',
-                'render' => function ($model) {
+                'render' => function (\App\Models\CampaignImport $model) {
                     $html = '<span data-title="' . $model->updated_at . 'UTC" data-toggle="tooltip">' . $model->updated_at->diffForHumans() . '</span>';
 
                     return $html;
                 },
             ],
+            'status' => [
+                'key' => 'status_id',
+                'label' => 'campaigns/plugins.fields.status',
+                'render' => function (\App\Models\CampaignImport $model) {
+                    if ($model->status_id === CampaignImportStatus::FAILED) {
+                        return '<span class="text-error"><i class="fa-regular fa-xmark-circle" aria-hidden="true"></i> ' .  __('campaigns/import.status.failed') . '</span>';
+                    } elseif ($model->status_id == CampaignImportStatus::QUEUED) {
+                        return '<span class="text-neutral-content"><i class="fa-regular fa-hourglass" aria-hidden="true"></i> ' .  __('campaigns/import.status.queued') . '</span>';
+                    } elseif ($model->status_id == CampaignImportStatus::FINISHED) {
+                        return '<span class="text-success"><i class="fa-regular fa-check-circle" aria-hidden="true"></i> ' .  __('campaigns/import.status.finished') . '</span>';
+                    }
+                    return '<span class="text-neutral-content"><i class="fa-regular fa-spinner fa-spin" aria-hidden="true"></i> ' .  __('campaigns/import.status.running') . '</span>';
+                },
+            ],
         ];
 
         return $columns;

app/Renderers/Layouts/Campaign/CampaignImport.php

@@ -460,11 +460,11 @@ protected function finish(): self
     {
         // Save all the content.
         try {
-            $path = 'exports/campaigns/' . $this->campaign->id . '/';
-            $this->exportPath = $path . $this->file;
+            $path = 'exports/' . $this->campaign->id;
+            $this->exportPath = $path . '/' . $this->file;
             Log::info('Campaign export finished', ['exportPath' => $this->exportPath]);
-            $this->archive->saveToDisk('s3', $path);
-            Storage::disk('s3')->setVisibility($this->exportPath, 'public');
+            $this->archive->saveToDisk('export', $path);
+            Storage::disk('export')->setVisibility($this->exportPath, 'public');
             $this->filesize = (int) floor($this->archive->getFinalSize() / pow(1024, 2));
         } catch (Exception $e) {
             Log::error('Campaign export', ['action' => 'finish', 'err' => $e->getMessage()]);

app/Services/Campaign/ExportService.php

@@ -148,7 +148,7 @@ protected function download(): self
         $path = '/campaigns/' . $this->campaign->id . '/imports/';
         foreach ($files as $file) {
             Log::info('Want to download ' . $file);
-            $s3 = Storage::disk('s3')->get($file);
+            $s3 = Storage::disk('export')->get($file);
             $local = $path . uniqid() . '.zip';
             Storage::disk('local')->put($local, $s3);
 

app/Services/Campaign/Import/ImportService.php

@@ -70,6 +70,18 @@
             'visibility' => 'private',
         ],
 
+        'export' => [
+            'driver' => 's3',
+            'key' => env('HETZNER_S3_ACCESS_KEY_ID', env('AWS_ACCESS_KEY_ID')),
+            'secret' => env('HETZNER_S3_ACCESS_KEY_SECRET', env('AWS_SECRET_ACCESS_KEY')),
+            'region' => env('HETZNER_S3_REGION', env('AWS_DEFAULT_REGION')),
+            'bucket' => env('S3_BUCKET_EXPORT', env('AWS_BUCKET')),
+            'root' => env('APP_ENV'),
+            'endpoint' => env('HETZNER_S3_ENDPOINT', env('AWS_ENDPOINT')),
+            'use_path_style_endpoint' => env('AWS_USE_PATH_STYLE_ENDPOINT', false),
+            'throw' => false,
+        ],
+
         's3-assets' => [
             'driver' => 's3',
             'key' => env('AWS_ACCESS_KEY_ID'),

config/filesystems.php

@@ -341,7 +341,7 @@
     "isEntry": true
   },
   "resources/sass/app.scss": {
-    "file": "assets/app-s_6r0suL.css",
+    "file": "assets/app-enioaHuc.css",
     "src": "resources/sass/app.scss",
     "isEntry": true
   },

public/build/assets/app-s_6r0suL.css

@@ -82,6 +82,10 @@
     --tw-text-opacity: 1;
     color:hsl(var(--erc)/var(--tw-text-opacity));
 }
+.text-success {
+    --tw-text-opacity: 1;
+    color:hsl(var(--su)/var(--tw-text-opacity))
+}
 .text-success-content {
     --tw-text-opacity: 1;
     color:hsl(var(--suc)/var(--tw-text-opacity));