Merge branch 'trunk'

fix: adding an article code to a media was broken #28

See merge request ldc-web/projets/dam!10

.env.example

@@ -60,4 +60,4 @@ MAIL_LIST_SERVICEWEB=
 PROJECT_UUID=
 
 ## MAIL ADDRESSES
-MAIL_LIST_SERVICEWEB=equipe.web@ldc.fr
+MAIL_LIST_SERVICEWEB=digital@ldc.fr

.env.testing

@@ -39,7 +39,7 @@ MAIL_PASSWORD=
 MAIL_ENCRYPTION=null
 MAIL_FROM_ADDRESS=no-reply@dam.lesidc.com
 MAIL_FROM_NAME="${APP_NAME}"
-MAIL_ADMIN=equipe.web@ldc.fr
+MAIL_ADMIN=digital@ldc.fr
 
 
 LDAP_ACCOUNT_PREFIX="cn="
@@ -54,7 +54,7 @@ LDAP_USE_SSL=false
 PROJECT_UUID=
 
 ## MAIL ADDRESSES
-MAIL_LIST_SERVICEWEB=equipe.web@ldc.fr
+MAIL_LIST_SERVICEWEB=digital@ldc.fr
 
 LDC_STATUS_CHECKER_API_KEY=CE8S52Qq7stf5k8frF4T
 LDC_STATUS_CHECKER_UUID=4d8b2c20-107a-4682-b591-dc6c685126df

.env.testing.example

@@ -39,7 +39,7 @@ MAIL_PASSWORD=
 MAIL_ENCRYPTION=null
 MAIL_FROM_ADDRESS=no-reply@dam.lesidc.com
 MAIL_FROM_NAME="${APP_NAME}"
-MAIL_ADMIN=equipe.web@ldc.fr
+MAIL_ADMIN=digital@ldc.fr
 
 
 LDAP_ACCOUNT_PREFIX=
@@ -54,7 +54,7 @@ LDAP_USE_SSL=
 PROJECT_UUID=
 
 ## MAIL ADDRESSES
-MAIL_LIST_SERVICEWEB=equipe.web@ldc.fr
+MAIL_LIST_SERVICEWEB=digital@ldc.fr
 
 LDC_STATUS_CHECKER_API_KEY=
 LDC_STATUS_CHECKER_UUID=

.gitignore

@@ -25,7 +25,7 @@ public/uploads/*
 
 /storage/*.key
 /vendor
-.env
+.env*
 .phpunit.result.cache
 Homestead.json
 Homestead.yaml
@@ -34,4 +34,4 @@ yarn-error.log
 /.idea
 /.vscode
 *.sqlite*
-auth.json
+auth.json

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "clients/Api"]
-	path = clients/Api
-	url = git@gitlab.com:service-web-lab/dam-client.git
+path = clients/Api
+url = ../dam-client.git

README.md

@@ -25,7 +25,7 @@ php artisan key:generate
 .env => remplacer MAIL_DRIVER par MAIL_MAILER
 .env => remplacer FILESYSTEM_DRIVER par FILESYSTEM_DISK
 .env rajouter PROJECT_UUID=
-.env rajouter MAIL_LIST_SERVICEWEB=equipe.web@ldc.fr
+.env rajouter MAIL_LIST_SERVICEWEB=digital@ldc.fr
 
 # SUPERVISOR
  jobs Api stats sur queue `database`

app/Console/Commands/ImportArcadiaModelFiles.php

@@ -127,20 +127,20 @@ class ImportArcadiaModelFiles extends Command
         /** @var \SimpleXMLElement $row */
         foreach ($fileContent->dam as $row) {
             /** @var \App\Models\Article|null $record */
-            $record = Article::where('noArt', $row->noArt)->first();
+            $record = Article::where('noArt', (int)$row->noArt)->first();
             if (!$record) {
                 $record        = new Article();
-                $record->noArt = $row->noArt;
+                $record->noArt = (int)$row->noArt;
             }
-            $record->libCcial         = $row->libCcial;
-            $record->codMarq          = $row->codMarq;
-            $record->libMarq          = $row->libMarq;
-            $record->codFamVte        = $row->codFamVte;
-            $record->libFamVte        = $row->libFamVte;
-            $record->codGencodAdm     = $row->codGencodAdm;
-            $record->codGencodSymb    = $row->codGencodSymb;
-            $record->codGencodPds     = $row->codGencodPds;
-            $record->utilisableGroupe = $row->utilisableGroupe;
+            $record->libCcial         = (string)$row->libCcial;
+            $record->codMarq          = (int)$row->codMarq;
+            $record->libMarq          = (string)$row->libMarq;
+            $record->codFamVte        = (int)$row->codFamVte;
+            $record->libFamVte        = (string)$row->libFamVte;
+            $record->codGencodAdm     = (string)$row->codGencodAdm;
+            $record->codGencodSymb    = (string)$row->codGencodSymb;
+            $record->codGencodPds     = (string)$row->codGencodPds;
+            $record->utilisableGroupe = (int)$row->utilisableGroupe;
             $record->saveOrFail();
         } //end foreach
     }
@@ -157,12 +157,12 @@ class ImportArcadiaModelFiles extends Command
         /** @var \SimpleXMLElement $row */
         foreach ($fileContent->dam as $row) {
             /** @var \App\Models\Marque|null $record */
-            $record = Marque::where('codMarq', $row->codMarq)->first();
+            $record = Marque::where('codMarq', (int)$row->codMarq)->first();
             if (!$record) {
                 $record          = new Marque();
-                $record->codMarq = $row->codMarq;
+                $record->codMarq = (int)$row->codMarq;
             }
-            $record->libMarq = $row->libMarq;
+            $record->libMarq = (string)$row->libMarq;
             $record->saveOrFail();
         }
     }
@@ -179,12 +179,12 @@ class ImportArcadiaModelFiles extends Command
         /** @var \SimpleXMLElement $row */
         foreach ($fileContent->mediaSujet as $row) {
             /** @var \App\Models\Sujet|null $record */
-            $record = Sujet::where('codeSujet', $row->code)->first();
+            $record = Sujet::where('codeSujet', (int)$row->code)->first();
             if (!$record) {
                 $record            = new Sujet();
-                $record->codeSujet = $row->code;
+                $record->codeSujet = (int)$row->code;
             }
-            $record->libelle = $row->libelle;
+            $record->libelle = (string)$row->libelle;
             $record->saveOrFail();
         }
     }
@@ -201,12 +201,12 @@ class ImportArcadiaModelFiles extends Command
         /** @var \SimpleXMLElement $row */
         foreach ($fileContent->mediatypemedia as $row) {
             /** @var \App\Models\TypeMedia|null $record */
-            $record = TypeMedia::where('codeTypemedia', $row->code)->first();
+            $record = TypeMedia::where('codeTypemedia', (int)$row->code)->first();
             if (!$record) {
                 $record                = new TypeMedia();
-                $record->codeTypemedia = $row->code;
+                $record->codeTypemedia = (int)$row->code;
             }
-            $record->libelle = $row->libelle;
+            $record->libelle = (string)$row->libelle;
             $record->saveOrFail();
         }
     }
@@ -223,13 +223,13 @@ class ImportArcadiaModelFiles extends Command
         /** @var \SimpleXMLElement $row */
         foreach ($fileContent->mediatypesvue as $row) {
             /** @var \App\Models\TypeVue|null $record */
-            $record = TypeVue::where('codeTypevue', $row->code)->first();
+            $record = TypeVue::where('codeTypevue', (int)$row->code)->first();
             if (!$record) {
                 $record              = new TypeVue();
-                $record->codeTypevue = $row->code;
+                $record->codeTypevue = (int)$row->code;
             }
-            $record->libelle  = $row->libelle;
-            $record->sujet_id = $row->sujet_id->mediasujet->code;
+            $record->libelle  = (string)$row->libelle;
+            $record->sujet_id = (int)$row->sujet_id->mediasujet->code;
             $record->saveOrFail();
         }
     }
@@ -246,14 +246,14 @@ class ImportArcadiaModelFiles extends Command
         /** @var \SimpleXMLElement $row */
         foreach ($fileContent->mediavariante as $row) {
             /** @var \App\Models\TypeVue|null $record */
-            $record = Variante::where('codeVariante', $row->code)->first();
+            $record = Variante::where('codeVariante', (int)$row->code)->first();
             if (!$record) {
                 $record               = new Variante();
-                $record->codeVariante = $row->code;
+                $record->codeVariante = (int)$row->code;
             }
-            $record->libelle     = $row->libelle;
-            $record->sujet_id    = $row->sujet_id->children()[0]->code;
-            $record->type_vue_id = $row->CodeTypeVue->mediatypesvue->code;
+            $record->libelle     = (string)$row->libelle;
+            $record->sujet_id    = (int)$row->sujet_id->children()[0]->code;
+            $record->type_vue_id = (int)$row->CodeTypeVue->mediatypesvue->code;
             $record->saveOrFail();
         }
     }
@@ -270,12 +270,12 @@ class ImportArcadiaModelFiles extends Command
         /** @var \SimpleXMLElement $row */
         foreach ($fileContent->SITE_PROD_GRP as $row) {
             /** @var \App\Models\TypeVue|null $record */
-            $record = Site::where('id', $row->code)->first();
+            $record = Site::where('id', (int)$row->code)->first();
             if (!$record) {
                 $record     = new Site();
-                $record->id = $row->code;
+                $record->id = (int)$row->code;
             }
-            $record->libelle = $row->libelle;
+            $record->libelle = (string)$row->libelle;
             $record->saveOrFail();
         }
     }
@@ -292,12 +292,12 @@ class ImportArcadiaModelFiles extends Command
         /** @var \SimpleXMLElement $row */
         foreach ($fileContent->dam as $row) {
             /** @var \App\Models\TypeVue|null $record */
-            $record = Societe::where('id', $row->codSociete)->first();
+            $record = Societe::where('id', (int)$row->codSociete)->first();
             if (!$record) {
                 $record     = new Societe();
-                $record->id = $row->codSociete;
+                $record->id = (int)$row->codSociete;
             }
-            $record->libelle = $row->nomSociete;
+            $record->libelle = (string)$row->nomSociete;
             $record->saveOrFail();
         }
     }

app/Console/Commands/ResendArcadiaLinkMedias.php

@@ -0,0 +1,54 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Lib\ArcadiaLinkUtilities;
+use App\Models\ArcadiaLink;
+use App\Models\Media;
+use Illuminate\Console\Command;
+
+class ResendArcadiaLinkMedias extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'medias:resend-aracadia-links';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Resend files to Arcadia after Arcadia Link fix';
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     */
+    public function handle()
+    {
+        // FIXME : Variabiliser la date
+        //$al = ArcadiaLink::where('created_at', '>=', '2025-10-23')->get();
+
+        foreach ($al as $error)
+        {
+            $media = Media::withTrashed()->find($error->media_id);
+
+            if ($error->arcadia_id === 0) {
+                
+                ArcadiaLinkUtilities::create($media);
+            } else {
+                if (is_null($media->deleted_at)) {
+                    ArcadiaLinkUtilities::update($media);
+                } else {
+                    ArcadiaLinkUtilities::delete($media);
+                }
+            }
+        }
+
+        return Command::SUCCESS;
+    }
+}

app/Http/Controllers/ArcadiaLinkController.php

@@ -3,7 +3,7 @@
 namespace App\Http\Controllers;
 
 use App\Models\ArcadiaLink;
-use Illuminate\Support\Carbon;
+use Illuminate\Contracts\Database\Eloquent\Builder;
 
 class ArcadiaLinkController extends Controller
 {
@@ -17,9 +17,14 @@ class ArcadiaLinkController extends Controller
         /** @var \App\Models\User */
         $user = auth()->user();
         $user->authorizeRoles(config('roles.const.ADMIN'));
-        $dt  = Carbon::now('Europe/Paris')->subMinutes(15)->toDateTimeString();
-        $ano = ArcadiaLink::where('created_at', '<', $dt)->orderBy('id', 'DESC')->get();
-        return view('arcadialinks.index', ['ano' => $ano]);
+
+        // * ArcadiaLink->Media is nullable
+        $arcadiaLinkList = ArcadiaLink::query()
+            ->with('media', fn (Builder $q) => $q->withTrashed())
+            ->where('created_at', '<', now()->subMinutes(15))
+            ->orderBy('id', 'DESC')->get();
+
+        return view('arcadialinks.index', compact('arcadiaLinkList'));
     }
 
     /**

app/Http/Controllers/CommonController.php

@@ -39,7 +39,8 @@ class CommonController extends Controller
         })->with('sujet')->get();
 
         return view('home')->with([
-            'sujets' => $sujets, 'recherches' => $recherches,
+            'sujets' => $sujets,
+            'recherches' => $recherches,
             'dossiers' => $dossiers
         ]);
     }
@@ -54,8 +55,10 @@ class CommonController extends Controller
     {
         /** @var \App\Models\User $user */
         $user = auth()->user();
-        Mail::to(env('MAIL_ADMIN_ADDRESS', "informatique.internet@ldc.fr"))
-            ->send(new ContactMail(ContactType::from($request->type), $request->url, $request->message, $user));
+        foreach (config('mail.contactsList.admin') as $mail) {
+            Mail::to($mail)
+                ->send(new ContactMail(ContactType::from($request->type), $request->url, $request->message, $user));
+        }
 
         return response()->json(['status' => 'OK']);
     }

app/Http/Controllers/DossierController.php

@@ -15,9 +15,11 @@ use App\Models\Marque;
 use App\Models\Media;
 use App\Models\Variante;
 use App\Models\Format;
+use Illuminate\Contracts\Database\Eloquent\Builder;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
+use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
 
@@ -38,51 +40,64 @@ class DossierController extends Controller
         $select = ['id', 'libelle', 'system'];
 
         /** @var \Illuminate\Database\Eloquent\Collection<\App\Models\Dossier> Dossiers publiques */
-        $publicFolders = Dossier::whereHas('sujet', function ($q) use ($request) {
-            $q->where('codeSujet', $request->sujet_id);
-        })->whereIsPrivate(false)->whereNull('parent_id')->select($select)->get();
+        $publicFolders = Dossier::query()
+            ->whereHas('sujet', fn (Builder $q) => $q->where('codeSujet', $request->input('sujet_id')))
+            ->where('is_private', false)
+            ->whereNull('parent_id')
+            ->select($select)->get();
 
 
-        // On récupère les dossiers privés.
+        // * On récupère les dossiers privés.
         /** @var \Illuminate\Database\Eloquent\Builder */
-        $privateQuery = Dossier::whereHas('sujet', function ($q) use ($request) {
-            $q->where('codeSujet', $request->sujet_id);
-        })->select($select)->whereIsPrivate(true);
+        $privateQuery = Dossier::query()
+            ->whereHas('sujet', fn (Builder $q) => $q->where('codeSujet', $request->input('sujet_id')))
+            ->where('is_private', true)
+            ->select($select);
 
-        // If not admin, get using brands.
+        // ? Is admin ?
         if (!$user->hasRole(config('roles.const.ADMIN'))) {
+            // * If not admin, get using brands.
             /** @var \Illuminate\Database\Eloquent\Collection<integer> Codes marques */
             $marques = $user->marques()->pluck('codMarq');
-            $privateQuery->whereHas('marques', function ($q) use ($marques) {
-                $q->whereIn('codMarq', $marques);
-            });
+            $privateQuery->whereHas('marques', fn (Builder $q) => $q->whereIn('codMarq', $marques));
         }
 
         /** @var \Illuminate\Database\Eloquent\Collection<\App\Models\Dossier> Dossiers privés */
         $privateFolders = $privateQuery->get();
 
         $foldersCollection = $publicFolders->merge($privateFolders);
-        $foldersCollection = $foldersCollection->sortBy('libelle', SORT_NATURAL | SORT_FLAG_CASE)
+        $foldersCollection = $foldersCollection
+            ->sortBy('libelle', SORT_NATURAL | SORT_FLAG_CASE)
             ->sortBy('favoris')->values();
 
-        // Ajout du dépôt de fichier pour les admin.
+        // ? Is admin ?
         if ($user->hasRole(config('roles.const.ADMIN'))) {
+            // * Ajout du dépôt de fichier pour les admin.
             /** @var \Illuminate\Database\Eloquent\Collection<\App\Models\Dossier> Dossiers depots */
-            $depotQuery        = Dossier::whereNull('parent_id')
+            $depotQuery        = Dossier::query()
+                ->whereNull('parent_id')
                 ->where('system', true)
                 ->orderBy('libelle', 'ASC')
                 ->get();
             $foldersCollection = $foldersCollection->merge($depotQuery);
         }
 
-        $folders['data']        = new NestedDossiersListResource($foldersCollection);
-        $folders['racineCount'] = Media::whereSujetId($request->sujet_id)
-            ->whereNull('dossier_id')
-            ->where(function ($query) use ($user) {
-                $query->where('statut', MediaStatut::public_etendu)
+        Arr::set($folders, 'data', new NestedDossiersListResource($foldersCollection));
+
+        // * Racine Count
+        $racineCountQuery = Media::query()
+            ->whereHas('sujet', fn (Builder $q) => $q->where('codeSujet', $request->input('sujet_id')))
+            ->whereDoesntHave('dossier');
+        // ? Is not admin ?
+        if (!$user->hasRole(config('roles.const.ADMIN'))) {
+            $racineCountQuery->where(
+                fn (Builder $q) =>
+                $q->where('statut', MediaStatut::public_etendu)
                     ->orWhere('statut', MediaStatut::public)
-                    ->orWhere('created_by', $user->id);
-            })->count();
+                    ->orWhere('created_by', $user->id)
+            );
+        }
+        Arr::set($folders, 'racineCount', $racineCountQuery->count());
 
         return response()->json($folders);
     }
@@ -99,13 +114,16 @@ class DossierController extends Controller
         $user = auth()->user();
 
         $response              = [];
-        $response['variantes'] = Variante::where('sujet_id', $request->sujetId)->get();
+        $response['variantes'] = Variante::query()
+            ->whereHas('sujet', fn (Builder $q) => $q->where('codeSujet', $request->input('sujetId')))
+            ->get();
         /** @var \Illuminate\Database\Eloquent\Collection<\App\Models\Format> */
-        $FormatsSujet = Format::whereHas('sujets', function ($query) use ($request) {
-            $query->where('sujet_id', $request->sujetId);
-        })->get();
+        $FormatsSujet = Format::query()
+            ->whereHas('sujets', fn (Builder $q) => $q->where('sujet_id', $request->input('sujetId')))
+            ->get();
         /** @var \Illuminate\Database\Eloquent\Collection<\App\Models\Format> */
-        $FormatsSystem       = Format::withoutGlobalScope('App\Scopes\SystemScope')
+        $FormatsSystem       = Format::query()
+            ->withoutGlobalScope('App\Scopes\SystemScope')
             ->where('system', true)->get();
         $response['formats'] = $FormatsSujet->merge($FormatsSystem);
 
@@ -131,14 +149,15 @@ class DossierController extends Controller
         $user->authorizeRoles(config('roles.const.ADMIN'));
 
         /** @var \Illuminate\Database\Eloquent\Collection<\App\Models\Dossier> */
-        $dossiers = Dossier::whereNull('parent_id')
-        ->where('system', false)
+        $dossiers = Dossier::query()
+            ->whereNull('parent_id')
+            ->where('system', false)
             ->orderBy('libelle', 'asc')
             ->get();
         /** @var \Illuminate\Database\Eloquent\Collection<\App\Models\Sujet> */
-        $sujets = Sujet::where('sujet_dam', true)->get();
+        $sujets = Sujet::query()->where('sujet_dam', true)->get();
 
-        return view('dossiers.index')->with([
+        return view('dossiers.index', [
             'dossiers' => $dossiers,
             'sujets' => $sujets,
         ]);
@@ -154,9 +173,13 @@ class DossierController extends Controller
     {
         if ($request->sub) {
             /** @var \Illuminate\Database\Eloquent\Collection<\App\Models\Dossier> */
-            $dossiers = Dossier::whereNull('parent_id')->where('system', false)
+            $dossiers = Dossier::query()
+                ->whereNull('parent_id')
+                ->where('system', false)
                 ->orderBy('libelle', 'asc')->get();
-            return view('dossiers.create-sub')->with(['dossiers' => $dossiers]);
+            return view('dossiers.create-sub', [
+                'dossiers' => $dossiers
+            ]);
         }
 
         /** @var \App\Models\User */
@@ -166,10 +189,11 @@ class DossierController extends Controller
         $marques = Marque::all();
 
         /** @var \Illuminate\Database\Eloquent\Collection<\App\Models\Sujet> */
-        $sujets = Sujet::where('sujet_dam', true)->get();
+        $sujets = Sujet::query()->where('sujet_dam', true)->get();
 
         return view('dossiers.create')->with([
-            'marques' => $marques, 'sujets' => $sujets
+            'marques' => $marques,
+            'sujets' => $sujets
         ]);
     }
 
@@ -192,19 +216,19 @@ class DossierController extends Controller
 
             if ($request->sub) {
                 /** @var \App\Models\Dossier */
-                $parent_dossier = Dossier::findOrFail($request->parent_id);
+                $parent_dossier = Dossier::query()->findOrFail($request->input('parent_id'));
                 $dossier->sujet()->associate($parent_dossier->sujet);
             } else {
-                $dossier->sujet()->associate($request->sujet);
+                $dossier->sujet()->associate($request->input('sujet'));
             }
 
             if ($dossier->saveOrFail()) {
                 // ---- Les marques
-                if ($request->marques) {
-                    $dossier->marques()->sync($request->marques);
+                if ($request->input('marques')) {
+                    $dossier->marques()->sync($request->input('marques'));
                 }
                 return redirect()->route('dossier.edit', ['dossier' => $dossier])
-                ->with('success', 'Le dossier a été enregistré');
+                    ->with('success', 'Le dossier a été enregistré');
             }
         });
         return back();
@@ -228,9 +252,9 @@ class DossierController extends Controller
         /** @var \Illuminate\Database\Eloquent\Collection<\App\Models\Sujet> */
         $dossierSujets = $dossier->sujets;
         /** @var \Illuminate\Database\Eloquent\Collection<\App\Models\Sujet> */
-        $sujets = Sujet::where('sujet_dam', true)->get();
+        $sujets = Sujet::query()->where('sujet_dam', true)->get();
 
-        return view('dossiers.edit')->with([
+        return view('dossiers.edit', [
             'dossier' => $dossier,
             'dossierMarques' => $dossierMarques,
             'marques' => $marques,
@@ -261,7 +285,7 @@ class DossierController extends Controller
                     $dossier->marques()->sync($request->marques);
                 }
                 return redirect()->route('dossier.edit', ['dossier' => $dossier])
-                ->with('success', 'Le dossier a été mis à jour');
+                    ->with('success', trans('Le dossier a été mis à jour'));
             }
         });
         return back();
@@ -280,7 +304,7 @@ class DossierController extends Controller
         $user->authorizeRoles(config('roles.const.ADMIN'));
         if ($dossier->deleteOrFail()) {
             return \response()->redirectToRoute('dossier.index')
-            ->with('warning', trans('Le dossier à été supprimé'));
+                ->with('warning', trans('Le dossier à été supprimé'));
         }
         return back();
     }

app/Http/Controllers/MediaController.php

@@ -34,11 +34,12 @@ use App\Models\Sujet;
 use App\Models\Tag;
 use App\Models\TypeMedia;
 use App\Traits\Http\HandlesMedia;
+use Illuminate\Contracts\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\Storage;
@@ -65,6 +66,8 @@ class MediaController extends Controller
 
         /** @var \Illuminate\Database\Eloquent\Collection<\App\Models\Sujet> */
         $sujets = $user->sujets;
+        // ! Has to flush Media cache before querying basket with media list
+        Media::flushQueryCache();
         /** @var \Illuminate\Database\Eloquent\Collection<\App\Models\Panier> */
         $paniers = $user->paniersOwner;
         /** @var \Illuminate\Database\Eloquent\Collection<\App\Models\Societe> */
@@ -102,7 +105,7 @@ class MediaController extends Controller
                 $textSearch,
                 $filters,
                 intval(Dossier::where('id', $dossier_id)->exists() ?
-                $dossier_id : (in_array($dossier_id, [-1, 0]) ? $dossier_id : -1))
+                    $dossier_id : (in_array($dossier_id, [-1, 0]) ? $dossier_id : -1))
             );
         }
 
@@ -124,7 +127,7 @@ class MediaController extends Controller
             'etiquettes' => $etiquettes,
             'societes' => $societes,
             'marques' => $marques,
-            'currentFolder' => $dossier_id,
+            'currentFolder' => Dossier::query()->where('id', $dossier_id)->first() ?? $dossier_id,
             'currentSujet' => optional($sujet)->codeSujet ?? \optional($sujets->first())->codeSujet,
             'currentFilters' => json_encode($filters),
             'paniers' => $paniers,
@@ -156,12 +159,16 @@ class MediaController extends Controller
         $user = auth()->user();
 
         /** @var \App\Models\Dossier|null */
-        $dossier = Dossier::where('id', $request->folder)->first();
+        $dossier = Dossier::query()
+            ->with('dossierParent')
+            ->where('id', $request->input('folder'))
+            ->first();
 
         $response = [];
-        $filters  = (object)collect($request->filters)->all();
+        $filters  = (object)collect($request->input('filters'))->all();
 
-        $isDepot = ($dossier->parent_id ?? null) === 1 || ($dossier->id ?? null) === 1;
+        /** @var boolean Est un dossier Dépot ? */
+        $isDepot = !empty($dossier) && (\optional($dossier->dossierParent)->id === 1 || $dossier->id === 1);
 
         /**
          * Elastic Search must conditions
@@ -205,7 +212,6 @@ class MediaController extends Controller
             $esMust,
             $esMustNot,
             $esShould,
-            $esFilters,
             $request,
             $dossier,
             $sujet,
@@ -220,26 +226,30 @@ class MediaController extends Controller
             'bool.should' => $esShould,
             'bool.filter' => $esFilters,
         ]);
+        $sort  = [[$orderField => ['order' => $order]]];
 
-        $sort = [[$orderField => ['order' => $order]]];
-
-        $response['data'] = Media::searchByQuery(
+        Arr::set($response, 'data', Media::searchByQuery(
             $query,
             null,
             null,
             intval($request->post('limit', 50)),
             intval($request->post('offset', 0)),
             $sort
+        ));
+
+        Arr::set($response, 'draggable', $user->hasRole([
+            config('roles.const.ADMIN'),
+            config('roles.const.REDACTEUR')
+        ]));
+        Arr::set($response, 'isDepot', $isDepot);
+        Arr::set(
+            $response,
+            'isCAQuery',
+            $searchText &&
+                strpos($searchText, '=') !== false &&
+                \strval(collect(explode('=', $searchText))->get(0)) === 'ca'
         );
-
-        $response['draggable'] = $user->hasRole([config('roles.const.ADMIN'), config('roles.const.REDACTEUR')]);
-        $response['isDepot']   = $isDepot;
-
-        $response['isCAQuery'] = $searchText &&
-        strpos($searchText, '=') !== false &&
-        \strval(collect(explode('=', $searchText))->get(0)) === 'ca';
-
-        $response['role'] = $user->role;
+        Arr::set($response, 'role', $user->role);
 
         return \response()->json($response);
     }
@@ -262,7 +272,7 @@ class MediaController extends Controller
 
         /** @var \Illuminate\Database\Eloquent\Collection<\App\Models\Media> */
         $mediaList = Media::whereIn('id', collect($request->mediaList)->pluck('id'))
-        ->where('isLocked', false)->get();
+            ->where('isLocked', false)->get();
 
         $destinationDossierId = \intval($request->dossier_id);
 
@@ -346,7 +356,7 @@ class MediaController extends Controller
             });
         } catch (ModelNotFoundException | \RuntimeException $e) {
             return response()->json($e->getMessage(), 500);
-        }//end try
+        } //end try
     }
 
     /**
@@ -397,6 +407,7 @@ class MediaController extends Controller
 
                 // ---- Les articles
                 $media->articles()->sync(collect($request->articles)->pluck('id')->all());
+                Article::flushQueryCache();
 
                 $media->saveOrFail();
 
@@ -416,7 +427,7 @@ class MediaController extends Controller
                 'status' => false,
                 'error' => trans('Une erreur est survenue veuillez réessayer')
             ]);
-        }//end try
+        } //end try
     }
 
     /**
@@ -428,90 +439,98 @@ class MediaController extends Controller
      */
     public function duplicateMedia(Media $media): JsonResponse
     {
-        /** @var \App\Models\User */
-        $user = auth()->user();
+        return DB::transaction(function () use ($media) {
+            /** @var \App\Models\User */
+            $user = auth()->user();
 
-        $user->authorizeRoles([
-            config('roles.const.ADMIN'),
-            config('roles.const.REDACTEUR'),
-            config('roles.const.CONTRIBUTEUR')
-        ]);
-
-        if ($media->isLocked) {
-            return \response()->json([
-                'status' => false,
-                'error' => trans('Le média est en attente d\'un retour d\'Arcadia.')
+            $user->authorizeRoles([
+                config('roles.const.ADMIN'),
+                config('roles.const.REDACTEUR'),
+                config('roles.const.CONTRIBUTEUR')
             ]);
-        }
 
-        $clonedMedia = $media->replicate();
+            if ($media->isLocked) {
+                return \response()->json([
+                    'status' => false,
+                    'error' => trans('Le média est en attente d\'un retour d\'Arcadia.')
+                ]);
+            }
 
-        $media->articles->map(function (Article $article) use ($clonedMedia) {
-            $clonedMedia->articles()->attach($article);
+            $clonedMedia = $media->replicate();
+
+            // * Remove Arcadia ID (cloned is not linked to arcadia)
+            $clonedMedia->arcadia_id = null;
+
+            /** @var \Illuminate\Filesystem\FilesystemAdapter */
+            $storage = Storage::disk('media');
+
+            $clonedMedia->uid       = Str::uuid();
+            $clonedMedia->extension = MediaExtension::jpg;
+
+            if (!Storage::exists('assets/images/default.jpg')) {
+                throw new \RuntimeException('Missing default picture');
+            }
+
+            $fileContent = Storage::get('assets/images/default.jpg');
+
+            if (!$storage->put($clonedMedia->relative_path, $fileContent)) {
+                throw new \RuntimeException('Failed to copy default picture');
+            }
+
+            $clonedMedia->libelle = Str::limit("{$clonedMedia->libelle}_copy", 45);
+            $clonedMedia->taille  = \strlen($fileContent);
+
+            $dimensions = ToolboxHelper::getImageDimensions(Storage::path('assets/images/default.jpg'));
+
+            if ($dimensions) {
+                $clonedMedia->resolution = $dimensions['resolutionX'];
+                $clonedMedia->largeur    = $dimensions['width'];
+                $clonedMedia->hauteur    = $dimensions['height'];
+                $clonedMedia->largeur_mm = !empty($media->resolution) ? ceil($media->largeur * 10) : 0;
+                $clonedMedia->hauteur_mm = !empty($media->resolution) ? ceil($media->hauteur * 10) : 0;
+            }
+
+            $clonedMedia->isDefault = true;
+            $clonedMedia->owner()->associate($user);
+
+            $clonedMedia->typeMedia()->associate(TypeMedia::getMediaType($clonedMedia->extension));
+
+            // ---- Creation des vignettes de base
+            $clonedMedia->createThumbnail();
+            // ---- Creation des vignettes en lien avec le sujet du média
+            $clonedMedia->createSubjectThumbnails();
+
+            $clonedMedia->isDuplicate = true;
+
+            $clonedMedia->save();
+
+            // * Add relations after having a media id
+            $media->articles->map(function (Article $article) use ($clonedMedia) {
+                $clonedMedia->articles()->attach($article);
+            });
+            $media->marques->map(function (Marque $marque) use ($clonedMedia) {
+                $clonedMedia->marques()->attach($marque);
+            });
+            $media->societes->map(function (Societe $societe) use ($clonedMedia) {
+                $clonedMedia->societes()->attach($societe);
+            });
+            $media->tags->map(function (Tag $tag) use ($clonedMedia) {
+                $clonedMedia->tags()->attach($tag);
+            });
+
+
+            /** @throws \RuntimeException */
+            $clonedMedia->addToElasticSearch();
+
+            // * Get props inserted by DB.
+            $clonedMedia->refresh();
+
+            return \response()->json([
+                'status' => true,
+                'sujet_id' => $clonedMedia->sujet_id,
+                'datas' => $clonedMedia
+            ]);
         });
-        $media->marques->map(function (Marque $marque) use ($clonedMedia) {
-            $clonedMedia->marques()->attach($marque);
-        });
-        $media->societes->map(function (Societe $societe) use ($clonedMedia) {
-            $clonedMedia->societes()->attach($societe);
-        });
-        $media->tags->map(function (Tag $tag) use ($clonedMedia) {
-            $clonedMedia->tags()->attach($tag);
-        });
-
-        /** @var \Illuminate\Filesystem\FilesystemAdapter */
-        $storage = Storage::disk('media');
-
-        $clonedMedia->uid       = Str::uuid();
-        $clonedMedia->extension = MediaExtension::jpg;
-
-        if (!Storage::exists('assets/images/default.jpg')) {
-            throw new \RuntimeException('Missing default picture');
-        }
-
-        $fileContent = Storage::get('assets/images/default.jpg');
-
-        if (!$storage->put($clonedMedia->relative_path, $fileContent)) {
-            throw new \RuntimeException('Failed to copy default picture');
-        }
-
-        $clonedMedia->libelle = Str::limit("{$clonedMedia->libelle}_copy", 45);
-        $clonedMedia->taille  = \strlen($fileContent);
-
-        $dimensions = ToolboxHelper::getImageDimensions(Storage::path('assets/images/default.jpg'));
-
-        if ($dimensions) {
-            $clonedMedia->resolution = $dimensions['resolutionX'];
-            $clonedMedia->largeur    = $dimensions['width'];
-            $clonedMedia->hauteur    = $dimensions['height'];
-            $clonedMedia->largeur_mm = !empty($media->resolution) ? ceil($media->largeur * 10) : 0;
-            $clonedMedia->hauteur_mm = !empty($media->resolution) ? ceil($media->hauteur * 10) : 0;
-        }
-
-        $clonedMedia->isDefault = true;
-        $clonedMedia->owner()->associate($user);
-
-        $clonedMedia->typeMedia()->associate(TypeMedia::getMediaType($clonedMedia->extension));
-
-        // ---- Creation des vignettes de base
-        $clonedMedia->createThumbnail();
-        // ---- Creation des vignettes en lien avec le sujet du média
-        $clonedMedia->createSubjectThumbnails();
-
-        $clonedMedia->saveOrFail();
-
-
-        /** @throws \RuntimeException */
-        $clonedMedia->addToElasticSearch();
-
-        // * Get props inserted by DB.
-        $clonedMedia->refresh();
-
-        return \response()->json([
-            'status' => true,
-            'sujet_id' => $clonedMedia->sujet_id,
-            'datas' => $clonedMedia
-        ]);
     }
 
     /**
@@ -641,6 +660,12 @@ class MediaController extends Controller
             ]);
         }
 
+        if ($media->statut === MediaStatut::brouillon) {
+            throw ValidationException::withMessages([
+                'media' => trans('Ce média n\'est pas publié. Veuillez sauvegarder pour enregistrer le statut.')
+            ]);
+        }
+
         MediaLinkWithArcadia::dispatch($user, $media);
 
         return response()->json(true);
@@ -744,15 +769,16 @@ class MediaController extends Controller
      */
     public function getMediaOtherInfos(Media $media): JsonResponse
     {
-        if (!($user = Auth::user())) {
+        if (!auth()->check()) {
             abort(401, 'Cette action n\'est pas autorisée.');
         }
 
-        $history = Historique::whereHas('media', function ($q) use ($media) {
-            $q->whereId($media->id);
-        })->with('user')
-        ->orderBy('created_date', 'DESC')
-        ->get();
+        $history = Historique::query()
+            ->whereHas('media', fn(Builder $q) => $q->where('id', $media->id))
+            ->with('user')
+            ->orderBy('created_date', 'DESC')
+            ->get();
+
         return \response()->json([
             'history' => $history,
             'vignettes' => $this->getVignettesByMedia($media)
@@ -791,7 +817,7 @@ class MediaController extends Controller
         /** @var boolean */
         $arcadia_id = collect($filters)->reduce(function (string|null $carry, array $item) {
             $item = collect($item);
-            return $carry ?? ($carry or $item->get('type') === 'arcadia_id' ? true : false);
+            return ($carry ?? false) or ($item->get('type') === 'arcadia_id' ? true : false);
         });
 
         $esConditions = [];
@@ -825,21 +851,21 @@ class MediaController extends Controller
     /**
      * Elastic Search select appropriate Folder
      *
-     * @param array                                  $esMust
-     * @param array                                  $esMustNot
-     * @param array                                  $esShould
-     * @param array                                  $esFilters
-     * @param \App\Http\Requests\Bo\LoadMediaRequest $request
-     * @param \App\Models\Dossier|null               $dossier
-     * @param \App\Models\Sujet                      $sujet
-     * @param boolean                                $isDepot
+     * @param array                                  $esMust    ES conditions INCLURE TOUT (AND).
+     * @param array                                  $esMustNot ES conditions EXCLURE.
+     * @param array                                  $esShould  ES conditions INCLURE AU MOINS (OR), avec un score.
+     * @param \App\Http\Requests\Bo\LoadMediaRequest $request   La request Lrvl.
+     * @param \App\Models\Dossier|null               $dossier   Le dossier concerné, si les Medias
+     *                                                          doivent appartenir a celui-ci.
+     * @param \App\Models\Sujet                      $sujet     Le sujet concerné, si les Medias
+     *                                                          doivent appartenir a celui-ci.
+     * @param boolean                                $isDepot   Si les medias doivent se trouver dans le dossier dépot.
      * @return void
      */
     private function esFolderSearch(
         array &$esMust,
         array &$esMustNot,
         array &$esShould,
-        array &$esFilters,
         LoadMediaRequest $request,
         Dossier|null $dossier,
         Sujet $sujet,
@@ -848,6 +874,7 @@ class MediaController extends Controller
         /** @var \App\Models\User */
         $user = auth()->user();
 
+        // ? Doivent être dans le dossier dépot ?
         if ($isDepot) {
             // * Dossier dépôt
             $esMust = array_merge($esMust, [[
@@ -856,21 +883,26 @@ class MediaController extends Controller
             return;
         }
 
+        // ? N'est pas dans le dossier dépot ou racine ?
         if (!$dossier) {
-            if ($request->folder === -1) {
+            // ? Recherche globale ?
+            if ($request->input('folder') === -1) {
                 // * Recherche globale .
                 $esMust = array_merge($esMust, [
+                    // * AND
                     \array_undot(['bool.must.match.sujet_id' => $sujet->codeSujet])
                 ]);
             } else {
                 // * Dossier racine .
                 $esMust    = array_merge($esMust, [
+                    // * AND
                     \array_undot(['bool.should.match.sujet_id' => $sujet->codeSujet])
                 ]);
                 $esMustNot = array_merge($esMustNot, [
                     \array_undot(['exists.field' => 'dossier_id'])
                 ]);
             } //end if
+            // * OR
             $esShould = array_merge($esShould, [
                 \array_undot(['match.statut' => MediaStatut::public_etendu]),
                 \array_undot(['match.statut' => MediaStatut::public]),
@@ -881,6 +913,7 @@ class MediaController extends Controller
 
         // * Dossier classic .
         $esMust = array_merge($esMust, [[
+            // * AND
             \array_undot([
                 'bool.must' => [
                     \array_undot(['match.sujet_id' => $sujet->codeSujet]),
@@ -889,9 +922,13 @@ class MediaController extends Controller
             ])
         ]]);
 
+        // ? User n'est pas ADMIN ?
         if (!$user->hasRole(config('roles.const.ADMIN'))) {
-            $esFilters = array_merge($esFilters, [
+            // * Ajout de restrictions
+            // * Tout ce qui nous appartient et tout ce qui n'est pas brouillon
+            $esMust = array_merge($esMust, [
                 \array_undot([
+                    // * OR
                     'bool.should' => [
                         \array_undot([
                             'bool.must_not' => [[
@@ -1062,9 +1099,9 @@ class MediaController extends Controller
         ];
 
         $sys_extension = in_array($media->extension, [
-                MediaExtension::pdf,
-                MediaExtension::ai,
-                MediaExtension::psd
+            MediaExtension::pdf,
+            MediaExtension::ai,
+            MediaExtension::psd
         ]) ? MediaExtension::png : $media->extension->value;
 
         $vignettes['preview'] = [

app/Http/Controllers/PanierController.php

@@ -11,6 +11,8 @@ use Illuminate\Support\Str;
 use App\Models\Panier;
 use App\Models\Format;
 use App\Models\Media;
+use Illuminate\Contracts\View\View;
+use Illuminate\Http\JsonResponse;
 
 class PanierController extends Controller
 {
@@ -19,15 +21,16 @@ class PanierController extends Controller
     /**
      * Page principale des paniers
      *
-     * @return \Illuminate\View\View|\Illuminate\Contracts\View\Factory
+     * @return \Illuminate\Contracts\View\View
      */
-    public function index()
+    public function index(): View
     {
         /** @var \App\Models\User $user */
         $user = \auth()->user();
-
-        /** @var \Illuminate\Database\Eloquent\Collection $paniers */
+        // ! Has to flush Media cache before querying basket with media list
+        Media::flushQueryCache();
         $paniers = $user->paniersOwner;
+
         return view('panier.index')->with([
             'paniers' => $paniers,
         ]);
@@ -39,12 +42,12 @@ class PanierController extends Controller
      *
      * @return \Illuminate\Http\JsonResponse
      */
-    public function getBaskets()
+    public function getBaskets(): JsonResponse
     {
         /** @var \App\Models\User $user */
         $user = \auth()->user();
-
-        /** @var \Illuminate\Database\Eloquent\Collection $paniers */
+        // ! Has to flush Media cache before querying basket with media list
+        Media::flushQueryCache();
         $paniers = $user->paniersOwner;
 
         return response()->json($paniers);
@@ -56,18 +59,22 @@ class PanierController extends Controller
      * @param \App\Http\Requests\Bo\Ajax\AddMediasBasketRequest $request
      * @return \Illuminate\Http\JsonResponse
      */
-    public function addMediasBasket(AddMediasBasketRequest $request)
+    public function addMediasBasket(AddMediasBasketRequest $request): JsonResponse
     {
         /** @var \App\Models\Panier $panier */
-        $panier = Panier::whereId($request->panier_id)
-            ->with('mediaList')->firstOrFail();
+        $panier = Panier::query()
+            ->where('id', $request->input('panier_id'))
+            ->with('mediaList')
+            ->firstOrFail();
 
         // * Sync every media to basket
         $panier->mediaList()->sync(array_merge(
             $panier->mediaList()->pluck('id')->all(),
-            $request->mediaList
+            $request->input('mediaList')
         ));
 
+        Media::flushQueryCache();
+
         return response()->json();
     }
 
@@ -77,15 +84,18 @@ class PanierController extends Controller
      * @param \App\Http\Requests\Bo\Ajax\RemoveMediasBasketRequest $request
      * @return \Illuminate\Http\JsonResponse
      */
-    public function removeMediasBasket(RemoveMediasBasketRequest $request)
+    public function removeMediasBasket(RemoveMediasBasketRequest $request): JsonResponse
     {
-
         /** @var \App\Models\Panier $panier */
-        $panier = Panier::whereId($request->panier_id)
-            ->with('mediaList')->firstOrFail();
+        $panier = Panier::query()
+            ->where('id', $request->input('panier_id'))
+            ->with('mediaList')
+            ->firstOrFail();
 
         /** @var \App\Models\Media $media */
-        $media = Media::whereId($request->media_id)->firstOrFail();
+        $media = Media::query()
+            ->where('id', $request->input('media_id'))
+            ->firstOrFail();
 
         $panier->mediaList()->detach($media);
 
@@ -98,13 +108,13 @@ class PanierController extends Controller
      * @param \App\Http\Requests\Bo\Ajax\CreateBasketRequest $request
      * @return \Illuminate\Http\JsonResponse
      */
-    public function createBasket(CreateBasketRequest $request)
+    public function createBasket(CreateBasketRequest $request): JsonResponse
     {
         /** @var \App\Models\User $user */
         $user = auth()->user();
 
         $panier          = new Panier();
-        $panier->libelle = $request->title;
+        $panier->libelle = $request->input('title');
         $panier->uid     = Str::uuid();
         $panier->owner()->associate($user);
         $panier->saveOrFail();
@@ -118,10 +128,12 @@ class PanierController extends Controller
      * @param \App\Http\Requests\Bo\Ajax\DestroyBasketRequest $request
      * @return \Illuminate\Http\JsonResponse
      */
-    public function destroyBasket(DestroyBasketRequest $request)
+    public function destroyBasket(DestroyBasketRequest $request): JsonResponse
     {
         /** @var \App\Models\Panier $basket */
-        $basket = Panier::whereId($request->basket_id)->firstOrFail();
+        $basket = Panier::query()
+            ->where('id', $request->input('basket_id'))
+            ->firstOrFail();
 
         $basket->deleteOrFail();
 
@@ -134,9 +146,9 @@ class PanierController extends Controller
      * Page publique d'un panier
      *
      * @param \App\Models\Panier $panier
-     * @return \Illuminate\View\View|\Illuminate\Contracts\View\Factory
+     * @return \Illuminate\Contracts\View\View
      */
-    public function showBasket(Panier $panier)
+    public function showBasket(Panier $panier): View
     {
         /** @var \App\Models\User|null $user */
         $user = auth()->user();
@@ -150,9 +162,12 @@ class PanierController extends Controller
         }
 
         /** @var \Illuminate\Database\Eloquent\Collection<\App\Models\Format> $formats */
-        $formats = Format::withoutGlobalScope('App\Scopes\SystemScope')
-        ->where('system', true)->get();
-        return view('panier.show')->with([
+        $formats = Format::query()
+            ->withoutGlobalScope('App\Scopes\SystemScope')
+            ->where('system', true)
+            ->get();
+
+        return view('panier.show', [
             'panier' => $panier,
             'formats' => $formats,
         ]);
@@ -164,10 +179,12 @@ class PanierController extends Controller
      * @param \App\Http\Requests\Bo\Ajax\SaveBasketPropsRequest $request
      * @return \Illuminate\Http\JsonResponse
      */
-    public function saveBasketProperty(SaveBasketPropsRequest $request)
+    public function saveBasketProperty(SaveBasketPropsRequest $request): JsonResponse
     {
         /** @var \App\Models\Panier $panier */
-        $panier = Panier::whereId($request->basket_id)->firstOrFail();
+        $panier = Panier::query()
+            ->where('id', $request->input('basket_id'))
+            ->firstOrFail();
 
         $panier->fill($request->validated());
         $panier->saveOrFail();

app/Http/Controllers/UploadController.php

@@ -15,6 +15,7 @@ use App\Models\Sujet;
 use App\Models\TypeMedia;
 use App\Models\User;
 use App\Traits\Http\HandlesMedia;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Http\UploadedFile;
@@ -97,7 +98,7 @@ class UploadController extends Controller
                 // 400 instead of 422 is for resumablejs to handle properly.
                 return \response()->json($e->errors(), 400);
             }
-        }//end if
+        } //end if
 
         // We are in chunk mode, lets send the current progress.
         /** @var AbstractHandler $handler */
@@ -143,12 +144,11 @@ class UploadController extends Controller
                 $this->validateUploadedFile($uplodedFile);
 
                 /** @var \App\Models\Media */
-                $media = Media::whereId($request->media_id)
-                    ->whereHas('sujet', function ($q) use ($sujet) {
-                        $q->whereId($sujet->id);
-                    })->whereHas('dossier', function ($q) use ($dossier) {
-                        $q->whereId($dossier->id);
-                    })->firstOrNew();
+                $media = Media::query()
+                    ->where('id', $request->input('media_id'))
+                    ->whereHas('sujet', fn(Builder $q) => $q->where('codeSujet', $sujet->codeSujet))
+                    ->whereHas('dossier', fn(Builder $q) => $q->where('id', $dossier->id))
+                    ->firstOrNew();
 
                 // Save the file and return any response you need.
                 return $this->createOrUpdateMedia($user, $uplodedFile, $media, $dossier, $sujet);
@@ -156,7 +156,7 @@ class UploadController extends Controller
                 // 400 instead of 422 is for resumablejs to handle properly.
                 return \response()->json($e->errors(), 400);
             }
-        }//end if
+        } //end if
 
         // We are in chunk mode, lets send the current progress.
         /** @var AbstractHandler $handler */
@@ -214,7 +214,7 @@ class UploadController extends Controller
                         'File guessed extensions :guessedExts does not match file name extension :extension',
                         [
                             'guessedExt' => $guessedExts,
-                            'extension' => $mediaExtension,
+                            'extension' => $mediaExtension->value,
                         ]
                     )
                 ]);
@@ -341,6 +341,8 @@ class UploadController extends Controller
 
             $media->saveOrFail();
 
+            Media::flushQueryCache();
+
             // * Get props inserted by DB.
             return response()->json($media->refresh());
         });

app/Http/Controllers/UserController.php

@@ -190,10 +190,14 @@ class UserController extends Controller
         $marques     = Marque::orderBy('libMarq', 'asc')->get();
         $userSujets  = $user->sujets;
         $sujets      = Sujet::where('sujet_dam', true)->orderBy('libelle', 'asc')->get();
-        $users       = User::select(['id', 'email'])->whereIn('role', [
-            config('roles.const.ADMIN'), config('roles.const.CONTRIBUTEUR'),
-            config('roles.const.REDACTEUR')
-        ])->where('id', '!=', $user->id)->get();
+        $users       = User::select(['id', 'email'])
+            ->whereIn('role', [
+                config('roles.const.ADMIN'), config('roles.const.CONTRIBUTEUR'),
+                config('roles.const.REDACTEUR')
+            ])
+            ->where('id', '!=', $user->id)
+            ->orderBy('email')
+            ->get();
         return view('users.edit')->with([
             'user' => $user, 'roles' => $roles, 'users' => $users,
             'userMarques' => $userMarques, 'marques' => $marques,

app/Jobs/Arcadia/XmlArcadiaMediasIn.php

@@ -39,7 +39,9 @@ class XmlArcadiaMediasIn extends XmlJobs
      *
      * @var array
      */
-    protected $nullableFields = [];
+    protected $nullableFields = [
+        'version'
+    ];
 
     /**
      * Fields that are unique
@@ -69,7 +71,7 @@ class XmlArcadiaMediasIn extends XmlJobs
                 $media = Media::withTrashed()->where($uniqueColumnsKey)->firstOrFail();
 
                 $media->arcadia_id = $line['arcadia_id'];
-                $media->version    = $line['version'];
+                $media->version    = $line['version'] ?? 1;
                 $media->isLocked   = false;
 
                 $media->saveOrFail();

app/Lib/ArcadiaLinkUtilities.php

@@ -132,7 +132,7 @@ class ArcadiaLinkUtilities
             $storage->path($filename),
             \ZipArchive::CREATE | \ZipArchive::OVERWRITE
         );
-        $success  = $zip->addFromString($xml, 'media.xml') && $success;
+        $success  = $zip->addFromString('media.xml', $xml) && $success;
         $success  = $zip->addFile($media->full_path, $media->basename) && $success;
         $success  = $zip->close() && $success;
         unset($zip);
@@ -245,7 +245,7 @@ class ArcadiaLinkUtilities
                     ->appendChild($dom->createCDATASection($formatModel['hauteur']));
                 $format->appendChild($dom->createElement('lien'))
                     ->appendChild($dom->createCDATASection(\sprintf(
-                        "%s/{$media->folder}{$media->uid}_%s.{$media->extension->value}",
+                        "%s/{$media->folder}/{$media->uid}_%s.{$media->extension->value}",
                         config('app.url'),
                         $formatModel['libelle']
                     )));

app/Models/ArcadiaLink.php

@@ -5,6 +5,13 @@ namespace App\Models;
 use Illuminate\Database\Eloquent\Model;
 use Carbon\Carbon;
 
+/**
+ * @property integer $arcadia_id The ID on Arcadia side, Defaults to 0 (not linked).
+ * @property string  $filename
+ *
+ * @property-read \App\Models\Media $media Media BelongsTo relationship.
+ * @package App\Models
+ */
 class ArcadiaLink extends Model
 {
     // * GETTERS

app/Models/Article.php

@@ -75,6 +75,6 @@ class Article extends Model
      */
     public function mediaList()
     {
-        return $this->belongsToMany(Media::class, 'media_article', 'media_id', 'article_id');
+        return $this->belongsToMany(Media::class, 'media_article', 'article_id', 'media_id');
     }
 }

app/Models/Dossier.php

@@ -4,6 +4,7 @@ namespace App\Models;
 
 use App\Enums\MediaStatut;
 use App\Models\User;
+use Illuminate\Contracts\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\Auth;
 
@@ -73,19 +74,24 @@ class Dossier extends Model
         /** @var \App\Model\User $user */
         $user = Auth::user();
 
-        // * dossier classic
-        if ($this->parent_id != 1 && $this->id != 1) {
-            if ($user->hasRole(config('roles.const.ADMIN'))) {
-                return $this->mediaList()->count();
-            } else {
-                return $this->mediaList()
-                    ->where('statut', '<>', MediaStatut::brouillon)
-                    ->orWhere('created_by', $user->id)->count();
-            }
-        } else {
-            // * dossier dépôt
+        // ? Est un dossier dépot ou racine ?
+        if ($this->parent_id === 1 or $this->id === 1) {
+            // * Dossier dépôt
             return $this->mediaList()->count();
         }
+
+        // * Dossier classic
+        // ? User is admin ?
+        if ($user->hasRole(config('roles.const.ADMIN'))) {
+            // * Tout de tout le monde
+            return $this->mediaList()->count();
+        }
+
+        // * Tous les non brouillons ou crées par le user
+        return $this->mediaList()
+            ->where(fn (Builder $q) => $q->where('statut', '!=', MediaStatut::brouillon)
+                ->orWhere('created_by', $user->id))
+            ->count();
     }
 
     // * RELATIONSHIPS
@@ -120,7 +126,7 @@ class Dossier extends Model
      */
     public function mediaList()
     {
-        return $this->hasMany(Media::class, 'dossier_id', 'id');
+        return $this->hasMany(Media::class);
     }
 
     /**

app/Models/Historique.php

@@ -48,4 +48,24 @@ class Historique extends Model
     {
         return $this->belongsTo(Media::class);
     }
+
+    // * METHODS
+
+    /**
+     * Get the instance as an array.
+     *
+     * @return array<TKey,TValue>
+     */
+    public function toArray(): array
+    {
+        return \array_merge(
+            parent::toArray(),
+            [
+                'type' => [
+                    'value' => $this->type,
+                    'label' => $this->type->label()
+                ]
+            ]
+        );
+    }
 }

app/Models/Media.php

@@ -39,14 +39,27 @@ class Media extends Model
      */
     public $cacheDriver = 'redis';
 
+    /**
+     * Is the model a duplicate of another (only true before we save it in database)
+     *
+     * @var boolean
+     */
+    public $isDuplicate = false;
+
     /**
      * The relations to eager load on every query.
      *
      * @var array
      */
     protected $with = [
-        'owner', 'tags', 'etiquette', 'articles', 'sujet',
-        'typeMedia', 'societes', 'marques'
+        'owner',
+        'tags',
+        'etiquette',
+        'articles',
+        'sujet',
+        'typeMedia',
+        'societes',
+        'marques'
     ];
 
     /**
@@ -209,8 +222,10 @@ class Media extends Model
             $user = auth()->user();
             MediaCreated::dispatch($user, $model);
 
-            /** @throws \RuntimeException */
-            $model->addToElasticSearch();
+            if (empty($model->isDuplicate)) {
+                /** @throws \RuntimeException */
+                $model->addToElasticSearch();
+            }
         });
         static::updating(function (self $model) {
             if ($model->statut === MediaStatut::brouillon and $model->arcadia_id) {
@@ -226,8 +241,8 @@ class Media extends Model
             /** @var \App\Models\User */
             $user = auth()->user();
 
-            // * Prevent soft delete trigerring update event
-            if (!\array_key_exists('deleted_at', $model->getChanges())) {
+            // * If update is not running from console, we prevent soft delete before trigerring update event
+            if ($user and !\array_key_exists('deleted_at', $model->getChanges())) {
                 MediaUpdated::dispatch($user, $model);
             }
 
@@ -252,13 +267,21 @@ class Media extends Model
 
             /** @throws \RuntimeException */
             $model->removeFromElasticSearch();
-
-            $model->deleteFilesOnAllPath();
         });
     }
 
     // * Laravel Behaviors
 
+    /**
+     * Get the route key for the model.
+     *
+     * @return string
+     */
+    public function getRouteKeyName()
+    {
+        return 'uid';
+    }
+
     /**
      * Set the base cache tags that will be present
      * on all queries.
@@ -457,7 +480,7 @@ class Media extends Model
      */
     public function paniers()
     {
-        return $this->belongsToMany(Panier::class);
+        return $this->belongsToMany(Panier::class, 'panier_media');
     }
 
     // * METHODS
@@ -723,7 +746,7 @@ class Media extends Model
         // * create preview
         /** @var \App\Models\Format $format */
         $format = Format::withoutGlobalScope('App\Scopes\SystemScope')
-        ->where('libelle', '=', 'preview')->firstOrFail();
+            ->where('libelle', '=', 'preview')->firstOrFail();
 
         if ($this->extension == MediaExtension::gif) {
             if ($this->largeur >= $format->largeur || $this->hauteur >= $format->hauteur || $this->largeur == "") {
@@ -753,7 +776,7 @@ class Media extends Model
         // * create thumb
         /** @var \App\Models\Format $format */
         $format = Format::withoutGlobalScope('App\Scopes\SystemScope')
-        ->where('libelle', '=', 'thumb')->firstOrFail();
+            ->where('libelle', '=', 'thumb')->firstOrFail();
         if ($this->extension != MediaExtension::png) {
             $im->setImageBackgroundColor('#ffffff');
             $im->setImageAlphaChannel(\Imagick::ALPHACHANNEL_REMOVE);
@@ -782,7 +805,7 @@ class Media extends Model
         $storage = Storage::disk('media');
 
         // * format spécifique
-        if ($format->system) {
+        if (!$format->system) {
             if (in_array($this->extension, ['gif', 'jpeg', 'jpg', 'png', 'pdf', 'ai', 'psd'])) {
                 return $storage->path("/{$this->folder}/{$this->uid}_{$format->libelle}.{$format->extension->value}");
             }
@@ -797,7 +820,7 @@ class Media extends Model
             } elseif (in_array($this->extension, ['pdf', 'ai', 'psd'])) {
                 return $storage->path("/{$this->folder}/{$this->uid}_{$format->libelle}.png");
             }
-            return $storage->path("/{$this->folder}/{$this->uid}.{$this->extension}");
+            return $storage->path("/{$this->folder}/{$this->uid}.{$this->extension->value}");
         }
         throw new \RuntimeException("Unhandled Format $format->id $format->libelle");
     }

app/Models/User.php

@@ -6,6 +6,36 @@ use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Notifications\Notifiable;
 
+/**
+ * @property string                          $firstname         Prénom.
+ * @property string                          $lastname          Nom.
+ * @property string                          $email             Email.
+ * @property string                          $objectguid
+ * @property string                          $matricule         Unique LDAP.
+ * @property-read \Illuminate\Support\Carbon $email_verified_at Mail verified at date.
+ * @property string                          $password          Mot de passe.
+ * @property string                          $remember_token
+ * @property integer                         $role              Rôle in config/role; 1 => Admin.
+ * @property-read \Illuminate\Support\Carbon $created_at        Created date.
+ * @property-read \Illuminate\Support\Carbon $updated_at        Updated date.
+ *
+ * @property-read \Illuminate\Database\Eloquent\Collection<\App\Models\Marque> $marques
+ * Marques BelongsToMany relationship.
+ * @property-read \Illuminate\Database\Eloquent\Collection<\App\Models\Dossier> $dossiers
+ * Dossiers BelongsToMany relationship.
+ * @property-read \Illuminate\Database\Eloquent\Collection<\App\Models\Sujet> $sujets
+ * Sujets BelongsToMany relationship.
+ * @property-read \Illuminate\Database\Eloquent\Collection<\App\Models\Media> $mediaList
+ * Medias HasMany relationship.
+ * @property-read \Illuminate\Database\Eloquent\Collection<\App\Models\Historique> $historiques
+ * Historiques HasMany relationship.
+ * @property-read \Illuminate\Database\Eloquent\Collection<\App\Models\Recherche> $recherches
+ * Recherches HasMany relationship.
+ * @property-read \Illuminate\Database\Eloquent\Collection<\App\Models\Panier> $paniersOwner
+ * Paniers HasMany relationship that belongs to the user.
+ * @property-read \Illuminate\Database\Eloquent\Collection<\App\Models\Panier> $paniersFavoris
+ * Paniers HasMany relationship.
+ */
 class User extends Authenticatable
 {
     use HasFactory;

app/Providers/AppServiceProvider.php

@@ -2,9 +2,9 @@
 
 namespace App\Providers;
 
-use Illuminate\Pagination\Paginator;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\App;
+use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\URL;
 use Illuminate\Support\ServiceProvider;
 
@@ -17,6 +17,12 @@ class AppServiceProvider extends ServiceProvider
      */
     public function boot()
     {
+        if (
+            in_array(config('app.env'), ['local', 'testing']) && config('app.bypassldap') && !app()->runningInConsole()
+        ) {
+            Auth::loginUsingId(24);
+        }
+
         // !!! Fuc**** Lab LDC exception OMG !!!
         if (!in_array(config('app.env'), ['local', 'testing'])) {
             URL::forceRootUrl(config('app.url'));
@@ -26,11 +32,10 @@ class AppServiceProvider extends ServiceProvider
                 return $url->current();
             });
         }
-        // * LOCAL HTTPS FIX
-        if (!in_array(config('app.env'), ['local', 'testing'])) {
-            URL::forceScheme('https');
-        }
-        // * HA PROXY FIX
+        // * Force HTTPS
+        URL::forceScheme('https');
+
+        // * REVERSE PROXY FIX
         App::singleton('clientIp', function () {
             if (config('app.env') == 'local') {
                 return request()->getClientIp();
@@ -38,6 +43,7 @@ class AppServiceProvider extends ServiceProvider
                 return request()->server('HTTP_X_FORWARDED_FOR') ?? request()->getClientIp();
             }
         });
+
         // * LOCAL FORCE eg: for Carbon
         foreach ([\LC_TIME, \LC_MESSAGES, \LC_COLLATE, \LC_CTYPE, \LC_MONETARY] as $category) {
             setlocale(
@@ -47,9 +53,5 @@ class AppServiceProvider extends ServiceProvider
             );
         }
         Carbon::setLocale(config('app.locale'));
-        if (!app()->runningInConsole()) {
-            // * FORCE BOOTSTRAP PAGINATOR (or custom if in front)
-            Paginator::useBootstrap();
-        }//end if
     }
 }

app/Providers/RouteServiceProvider.php

@@ -41,12 +41,9 @@ class RouteServiceProvider extends ServiceProvider
                 ->group(base_path('routes/api.php'));
         });
 
-        Route::bind('media', function ($value) {
-            return Media::whereUid($value)->firstOrFail();
-        });
         Route::bind('basket_uuid', function ($value) {
             return Panier::where('uid', $value)
-            ->with('owner')->firstOrFail();
+                ->with('owner')->firstOrFail();
         });
 
         // * API

app/Providers/ViewServiceProvider.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace App\Providers;
+
+use Illuminate\Pagination\Paginator;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\File;
+use Illuminate\Support\Facades\View;
+use Illuminate\Support\ServiceProvider;
+
+class ViewServiceProvider extends ServiceProvider
+{
+    /**
+     * Bootstrap any application services.
+     *
+     * @return void
+     */
+    public function boot(): void
+    {
+        $appInfos = Cache::remember('composer', 360, function () {
+            return json_decode(File::get(\app_path('../composer.json')));
+        });
+        // Share composer.json infos.
+        if (isset($appInfos->name) and isset($appInfos->version)) {
+            View::share('cpsr_name', $appInfos->name);
+            View::share('cpsr_version', $appInfos->version);
+        }
+
+        if (!app()->runningInConsole()) {
+            // * FORCE BOOTSTRAP PAGINATOR (or custom if in front)
+            Paginator::useBootstrap();
+        }
+    }
+}

composer.json

@@ -23,7 +23,6 @@
         "laravel/tinker": "^2.7",
         "laravel/ui": "^3.0",
         "laravelcollective/html": "^6.3",
-        "ldc/web-status-checker-laravel": "^1.0",
         "mews/purifier": "^3.3",
         "pion/laravel-chunk-upload": "^1.5",
         "rennokki/laravel-eloquent-query-cache": "^3.3"
@@ -97,11 +96,5 @@
         }
     },
     "minimum-stability": "dev",
-    "prefer-stable": true,
-    "repositories": [
-        {
-            "type": "composer",
-            "url": "https://lab.s-web.fr/api/v4/group/23/-/packages/composer/packages.json"
-        }
-    ]
+    "prefer-stable": true
 }

config/app.php

@@ -4,6 +4,8 @@ use Illuminate\Support\Facades\Facade;
 
 return [
 
+    'bypassldap' => env('BYPASS_LDAP', false),
+
     /*
         |--------------------------------------------------------------------------
         | Application Name
@@ -169,7 +171,7 @@ return [
          * Package Service Providers...
          */
 
-         Elasticquent\ElasticquentServiceProvider::class,
+        Elasticquent\ElasticquentServiceProvider::class,
 
         /*
          * Application Service Providers...
@@ -178,7 +180,8 @@ return [
         App\Providers\AppServiceProvider::class,
         App\Providers\AuthServiceProvider::class,
         App\Providers\EventServiceProvider::class,
-        App\Providers\RouteServiceProvider::class
+        App\Providers\RouteServiceProvider::class,
+        App\Providers\ViewServiceProvider::class
 
     ],
 

config/exception-handler.php

@@ -12,6 +12,6 @@ return [
      * so you can receive email if things go mad
      */
     'contactsList' => [
-        env('MAIL_LIST_SERVICEWEB', 'equipe.web@ldc.fr')
+        env('MAIL_LIST_SERVICEWEB', 'digital@ldc.fr')
     ]
 ];

config/mail.php

@@ -117,8 +117,9 @@ return [
 
     // * Contacts List
     'contactsList' => [
-        'invalidXml' => preg_split('/(\s*,*\s*)*,+(\s*,*\s*)*/', env('MAIL_LIST_INVALID_XML', 'equipe.web@ldc.fr')),
-        'serviceweb' => preg_split('/(\s*,*\s*)*,+(\s*,*\s*)*/', env('MAIL_LIST_SERVICEWEB', 'equipe.web@ldc.fr'))
+        'invalidXml' => preg_split('/(\s*,*\s*)*,+(\s*,*\s*)*/', env('MAIL_LIST_INVALID_XML', 'digital@ldc.fr')),
+        'serviceweb' => preg_split('/(\s*,*\s*)*,+(\s*,*\s*)*/', env('MAIL_LIST_SERVICEWEB', 'digital@ldc.fr')),
+        'admin'      => explode(',', env('MAIL_ADMIN')),
     ],
 
 ];

config/roles.php

@@ -1,5 +1,6 @@
 <?php
 
+// TODO: Pass this as an enum.
 return [
     'const' => [
         'ADMIN'   => '1',

database/migrations/2023_12_15_103629_set_foreign_on_arcadia_links.php

@@ -0,0 +1,48 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        $linkedMediaIdList   = DB::table('arcadia_links')->pluck('media_id');
+        $existingMediaIdList = DB::table('media')->whereIn('id', $linkedMediaIdList)->pluck('id');
+        $linkIdListToRemove  = $linkedMediaIdList->filter(fn (int $media_id) =>
+        !$existingMediaIdList->contains($media_id));
+
+        // * Remove Orphan links
+        DB::transaction(fn () => DB::table('arcadia_links')->whereIn('media_id', $linkIdListToRemove)->delete());
+
+        // * Add foreign Key
+        Schema::table('arcadia_links', function (Blueprint $table) {
+            $table->unsignedBigInteger('media_id')->nullable(false)->default(null)->change();
+        });
+        Schema::table('arcadia_links', function (Blueprint $table) {
+            $table->foreign('media_id')->references('id')->on('media');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('arcadia_links', function (Blueprint $table) {
+            $table->dropForeign(['media_id']);
+        });
+        Schema::table('arcadia_links', function (Blueprint $table) {
+            $table->bigInteger('media_id')->default(0)->change();
+        });
+    }
+};

package.json

@@ -1,4 +1,5 @@
 {
+    "name": "srcs",
     "private": true,
     "scripts": {
         "dev": "npm run development",

resources/documents/arcadia/incoming_medias.xsd

@@ -1,12 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- < XSD deviné, basé sur la BDD et cette seule affirmation "les 3 champs sont obligatoires"  @author Jérémy Munsch jeremy.munsch@ldc.fr > -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
     <xs:element name="MEDIA_VISUEL">
         <xs:complexType>
             <xs:sequence>
                 <xs:element name="codeArcadia" type="_positive_unsigned_integer_without_leading_zeros" />
                 <xs:element name="code_DAM" type="_positive_unsigned_integer_without_leading_zeros"/>
-                <xs:element name="version" type="_positive_unsigned_integer_without_leading_zeros"/>
+                <xs:element name="version" minOccurs="1" nillable="true" >
+                    <xs:simpleType>
+                        <xs:union memberTypes="_positive_unsigned_integer_without_leading_zeros xs:string"/>
+                    </xs:simpleType>
+                </xs:element>
             </xs:sequence>
         </xs:complexType>
     </xs:element>
@@ -16,5 +18,4 @@
             <xs:pattern value="[123456789]\d*"/>
         </xs:restriction>
     </xs:simpleType>
-
-</xs:schema>
+</xs:schema>

resources/documents/arcadia/incoming_medias.xsd.ok_keep

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- < XSD deviné, basé sur la BDD et cette seule affirmation "les 3 champs sont obligatoires"  @author Jérémy Munsch jeremy.munsch@ldc.fr > -->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
+    <xs:element name="MEDIA_VISUEL">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element name="codeArcadia" type="_positive_unsigned_integer_without_leading_zeros" />
+                <xs:element name="code_DAM" type="_positive_unsigned_integer_without_leading_zeros"/>
+                <xs:element name="version" type="_positive_unsigned_integer_without_leading_zeros"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:simpleType name="_positive_unsigned_integer_without_leading_zeros">
+        <xs:restriction base="xs:positiveInteger">
+            <xs:pattern value="[123456789]\d*"/>
+        </xs:restriction>
+    </xs:simpleType>
+
+</xs:schema>

resources/js/components/media-manager/MmActionsComponent.vue

@@ -163,8 +163,8 @@
 </template>
 
 <script>
-import Resumable from "resumablejs";
 import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
+import Resumable from "resumablejs";
 
 export default {
   name: "MmActionsComponent",
@@ -224,7 +224,7 @@ export default {
       } else {
         this.$loading.show({ delay: 0 });
         axios
-          .post(`/ajax/media/${this.storeGrabbed[0].id}/duplicate`)
+          .post(`/ajax/media/${this.storeGrabbed[0].uid}/duplicate`)
           .then((response) => {
             this.$loading.hide();
             if (response.data.status === true) {

resources/js/components/media-manager/MmDisplayComponent.vue

@@ -167,6 +167,7 @@ export default {
   },
   mounted() {
     this.resetInfiniteScroll();
+    this.init();
   },
   data: function () {
     return {
@@ -221,6 +222,10 @@ export default {
         type: "updateGrabbed",
         grabbed: [],
       });
+      this.$store.commit({
+        type: "updateFolder",
+        folder: this.storeFolder,
+      });
       this.loadMediaList();
       //set dateSorted
       this.dateSorted = false;

resources/js/components/media-manager/MmFiltersComponent.vue

@@ -126,6 +126,7 @@ export default {
   components: { FontAwesomeIcon },
   mounted() {
     const data = JSON.parse(this.$parent.$options.json);
+    this.selectedFolder = data.selectedFolder;
     this.textsearch = data.textsearch ? String(data.textsearch) : "";
     this.oTypesmedia = data.typesmedia;
     this.oEtiquettes = data.etiquettes;
@@ -152,6 +153,7 @@ export default {
       sReferentiel: [],
       sTexte: "",
       initText: 0,
+      selectedFolder: {},
     };
   },
   watch: {
@@ -304,15 +306,22 @@ export default {
       }
     },
     reset() {
-      this.resetFolder();
       this.sTypevue = [];
       this.sTypemedias = [];
       this.sEtiquettes = [];
       this.sReferentiel = [];
       this.sTexte = "";
+      const filters = this.selectedFolder ? [{
+          type: "dossier_id",
+          legend: "Dossier : ",
+          value: this.selectedFolder.id,
+          libelle: this.selectedFolder.libelle,
+      }] : [];
+      this.resetFolder();
+      this.selectedFolder = null;
       this.$store.commit({
         type: "updateFilters",
-        filters: [],
+        filters: filters,
       });
       if (this.textsearch.length && this.initText === 0) {
         this.addText(this.textsearch);

resources/js/components/media-manager/MmFolderComponent.vue

@@ -182,9 +182,25 @@ export default {
       return this.$store.state.reload;
     },
   },
+  mounted() {
+    const data = JSON.parse(this.$parent.$options.json);
+    if (data.selectedFolder && data.selectedFolder != -1) {
+        this.selectedFolder = data.selectedFolder;
+        this.selectedSubject = data.selectedSubject;
+        this.$store.commit({
+            type: "updateFolder",
+            folder: data.selectedFolder.id ?? -1,
+        });
+        this.storeFolder = data.selectedFolder.id;
+        this.$nextTick(() => {
+            this.initFolders(this.selectedFolder, this.selectedSubject);
+        })
+    }
+  },
   data() {
     return {
       selectedFolder: false,
+      selectedSubject: false,
       isLoading: true,
       oFolders: [],
       racineCount: 0,
@@ -194,6 +210,7 @@ export default {
   watch: {
     storeSujet() {
       this.initFolders();
+      this.selectedFolder = null;
     },
     storeReload() {
       this.reload();
@@ -224,7 +241,7 @@ export default {
         });
       }
     },
-    initFolders(toSelectFolder = false) {
+    initFolders(toSelectFolder = false, selectedSubject = false) {
       const self = this;
       self.isLoading = true;
       self.folders = [];
@@ -232,7 +249,7 @@ export default {
       axios
         .get("/ajax/load-folders", {
           params: {
-            sujet_id: self.storeSujet,
+            sujet_id: selectedSubject ? selectedSubject : self.storeSujet,
           },
         })
         .then((response) => {

resources/js/components/media-manager/media-editor/MmEditComponent.vue

@@ -100,12 +100,12 @@
 
 <script>
 // ResumableJs
-import Resumable from "resumablejs";
-import MePreviewComponent from "./tabs/MePreviewComponent.vue";
-import MeEditComponent from "./tabs/MeEditComponent.vue";
-import MeLinksComponent from "./tabs/MeLinksComponent.vue";
-import MeHistoryComponent from "./tabs/MeHistoryComponent.vue";
 import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
+import Resumable from "resumablejs";
+import MeEditComponent from "./tabs/MeEditComponent.vue";
+import MeHistoryComponent from "./tabs/MeHistoryComponent.vue";
+import MeLinksComponent from "./tabs/MeLinksComponent.vue";
+import MePreviewComponent from "./tabs/MePreviewComponent.vue";
 
 export default {
   name: "MmEditComponent",
@@ -180,7 +180,7 @@ export default {
         var query = {
           sujet_id: this.storeMedia.sujet_id,
           dossier_id: this.storeMedia.dossier_id,
-          replaceMediaId: this.storeMedia.id,
+          media_id: this.storeMedia.id,
         };
         this.r.updateQuery(query);
       } else {
@@ -292,7 +292,7 @@ export default {
     },
     SaveMedia() {
       axios
-        .put(`/ajax/media/${this.storeMedia.id}`, {
+        .put(`/ajax/media/${this.storeMedia.uid}`, {
           media: this.storeMedia,
         })
         .then((response) => {

resources/js/components/media-manager/media-editor/tabs/MeEditComponent.vue

@@ -93,7 +93,7 @@
               <option :value="null" selected disabled>
                 Sélectionnez un type de variante
               </option>
-              <option v-for="item in storeTypesvariante" :value="item.codeVariante">
+              <option v-for="item in availableVariantes" :value="item.codeVariante">
                 {{ item.libelle }}
               </option>
             </select>
@@ -394,6 +394,9 @@ export default {
     storeRole() {
       return this.$store.state.role;
     },
+    availableVariantes() {
+        return this.storeTypesvariante.filter(e => e.typevue_id === this.oMedia.type_vue_id);
+    }
   },
   watch: {
     marques() {
@@ -423,7 +426,6 @@ export default {
       }
     },
     searchMarques() {
-      console.log("search");
       this.refreshMarques();
     },
     searchSocietes() {
@@ -545,9 +547,10 @@ export default {
             __DAM.methods.sessionTimedOut();
             return;
           }
+          const errorMessage = error.response.data.message ?? "Erreur lors de l'opération, merci d'actualiser la page.";
           $.fancyMessage({
             title: "Lier un média à Arcadia",
-            message: "Erreur lors de l'opération, merci d'actualiser la page.",
+            message: errorMessage,
             type: "error",
           });
           console.error(error);
@@ -710,10 +713,13 @@ export default {
         .then((response) => {
           const result = response.data;
           if (result.article.utilisableGroupe === 1) {
-            const index = this.oMedia.articles.find(
+            const index = this.oMedia.articles?.find(
               (e) => e.noArt === result.article.noArt
             );
             if (!index) {
+                if (!this.oMedia.articles) {
+                    this.$set(this.oMedia, 'articles', []);
+                }
               this.oMedia.articles.push(result.article);
             } else {
               $.fancyMessage({

resources/js/components/media-manager/media-editor/tabs/MeHistoryComponent.vue

@@ -20,7 +20,7 @@
                   item.user.matricule
                 }})
               </td>
-              <td>{{ item.type }}</td>
+              <td>{{ item.type.label }}</td>
               <td>{{ item.description }}</td>
             </tr>
           </tbody>

resources/scss/classes.scss

@@ -8,16 +8,37 @@
     line-height: inherit;
     padding: 0;
 }
+
 .starButton,
 .nestableFolderButton {
     @include resetButton;
     cursor: pointer;
     color: #fff;
 }
+
 .nestableFolderButton {
     min-width: 1rem;
     min-height: 1rem;
 }
+
 .d-none {
     display: none !important;
 }
+
+.media-link {
+    padding-top: 2rem;
+
+    &-btn {
+        background-color: #fff;
+        border-radius: 3px;
+        color: #374957;
+        font-size: 1rem;
+        padding: 8px;
+
+        &:hover,
+        &:focus {
+            background-color: #0a6fb7;
+            color: #fff;
+        }
+    }
+}

resources/views/arcadialinks/index.blade.php

@@ -1,36 +1,48 @@
 @extends('layouts.app')
+
 @include('layouts.header')
+
 @section('content')
     <main class="user_index template_2col">
         @include('modules.param-sideMenu')
         <div class="main_content">
             <div class="heading">
-                <h1>Anomalies du lien Arcadia</h1>
+                <h1>{{ __('Anomalies du lien Arcadia') }}</h1>
             </div>
-                <table class="datatable">
-                    <thead>
+            <table class="datatable">
+                <thead>
                     <tr>
-                        <th>ID</th>
-                        <th>Media ID (DAM ID)</th>
-                        <th>Arcadia ID</th>
-                        <th>Filename</th>
-                        <th>Date création ZIP</th>
+                        <th>{{ __('ID') }}</th>
+                        <th>{{ __('Media ID (DAM ID)') }}</th>
+                        <th>{{ __('Arcadia ID') }}</th>
+                        <th>{{ __('Filename') }}</th>
+                        <th>{{ __('Date création ZIP') }}</th>
                         <th></th>
                         <th></th>
                     </tr>
-                    </thead>
-                    @foreach ($ano as $line)
-                        <tr class="data_row">
-                            <td>{{$line->id}}</td>
-                            <td>{{$line->media_id}}</td>
-                            <td>{{$line->arcadia_id}}</td>
-                            <td>{{$line->filename}}</td>
-                            <td>{{$line->date_f}}</td>
-                            <td><a href="/media/{{$line->media_uuid}}" target="_blank">Ouvrir la fiche média</a></td>
-                            <td><a href="{{route('arcadialinks.destroy', ['id' => $line->id])}}" onclick="return confirm('Êtes-vous sûr de vouloir supprimer cette anomalie ?');"><i class="fas fa-times" style="color: red"></i></a></td>
-                        </tr>
-                    @endforeach
-                </table>
+                </thead>
+                @foreach ($arcadiaLinkList as $arcadiaLink)
+                    <tr class="data_row">
+                        <td>{{ $arcadiaLink->id }}</td>
+                        <td>{{ $arcadiaLink->media->id }}</td>
+                        <td>{{ $arcadiaLink->arcadia_id }}</td>
+                        <td>{{ $arcadiaLink->filename }}</td>
+                        <td>{{ $arcadiaLink->date_f }}</td>
+                        <td>
+                            <a href="{{ route('media.show', $arcadiaLink->media) }}"
+                                title="{{ __('Ouvrir la fiche média dans un nouvel onglet') }}" target="_blank">
+                                {{ __('Ouvrir la fiche média') }}
+                            </a>
+                        </td>
+                        <td>
+                            <a href="{{ route('arcadialinks.destroy', $arcadiaLink) }}" title="{{ __('Supprimer le lien arcadia') }}"
+                                onclick="return confirm('{{ __('Êtes-vous sûr de vouloir supprimer cette anomalie ?') }}');">
+                                <i class="fas fa-times" style="color: red"></i>
+                            </a>
+                        </td>
+                    </tr>
+                @endforeach
+            </table>
         </div>
     </main>
 @endsection

resources/views/home.blade.php

@@ -1,53 +1,59 @@
 @extends('layouts.app')
 @include('layouts.header')
 @section('content')
-<main class="home">
-    <div class="search">
-        <div class="container">
-            <h1><i class="fas fa-images"></i>{{ __('Bienvenue') }}</h1>
-            <form class="input_search" action="{{ route('media_manager') }}" method="get">
-                <div class="select_container">
-                    @if($sujets->count())
-                    <select name="s">
-                    @foreach ($sujets as $sujet)
-                        <option value="{{ $sujet->codeSujet }}" >{{ $sujet->libelle }}</option>
-                    @endforeach
-                    </select>
+    <main class="home">
+        <div class="search">
+            <div class="container">
+                <h1><i class="fas fa-images"></i>{{ __('Bienvenue') }}</h1>
+                <form class="input_search" action="{{ route('media_manager') }}" method="get">
+                    <div class="select_container">
+                        @if ($sujets->count())
+                            <select name="s">
+                                @foreach ($sujets as $sujet)
+                                    <option value="{{ $sujet->codeSujet }}">{{ $sujet->libelle }}</option>
+                                @endforeach
+                            </select>
+                        @endif
+                    </div>
+                    <input name="t" type="text" value="" autofocus placeholder="Rechercher un média...">
+                    <input name="d" type="hidden" value="-1">
+                    <button type="submit"><i class="fa fa-search"></i></button>
+                </form>
+                <div class="media-link">
+                    <a class="media-link-btn" href="{{ route('media_manager') }}">
+                        <i class="fas fa-images"></i>
+                        {{ __('Accéder aux médias') }}
+                    </a>
+                </div>
+            </div>
+        </div>
+        <div class="widget">
+            <div class="item">
+                <header>{{ __('Mes dernières recherches') }}</header>
+                <div class="content">
+                    @if ($recherches->count())
+                        @foreach ($recherches as $recherche)
+                            <a href="{{ route('media_manager', ['r' => $recherche->id]) }}"><i
+                                    class="fa fa-search"></i>{{ $recherche->sujet->libelle . ' - ' . $recherche->libelle }}</a>
+                        @endforeach
+                    @else
+                        <i class="fa-brands fa-searchengin"></i>&nbsp;<span>{{ __('Aucune recherche effectuée') }}</span>
+                    @endif
+                </div>
+            </div>
+            <div class="item">
+                <header>{{ __('Mes dossiers favoris') }}</header>
+                <div class="content">
+                    @if ($dossiers->count())
+                        @foreach ($dossiers as $dossier)
+                            <a href="{{ route('media_manager', ['d' => $dossier->id, 's' => $dossier->sujet->codeSujet]) }}"><i
+                                    class="fas fa-folder"></i> {{ $dossier->sujet->libelle . ' - ' . $dossier->libelle }}</a>
+                        @endforeach
+                    @else
+                        <i class="fa-solid fa-folder"></i>&nbsp;<span>{{ __('Pas de dossier en favoris') }}</span>
                     @endif
                 </div>
-                <input type="text" name="t" value="" autofocus placeholder="Rechercher un média...">
-                <input type="hidden" name="d" value="-1">
-                <button type="submit"><i class="fa fa-search"></i></button>
-            </form>
-        </div>
-    </div>
-    <div class="widget">
-        <div class="item">
-            <header>{{ __('Mes dernières recherches') }}</header>
-            <div class="content">
-                @if($recherches->count())
-                @foreach ($recherches as $recherche)
-                    <a href="{{ route('media_manager', ['r' => $recherche->id]) }}" ><i class="fa fa-search"></i>{{
-                        $recherche->sujet->libelle." - ".$recherche->libelle
-                    }}</a>
-                @endforeach
-                @else
-                <i class="fa-brands fa-searchengin"></i>&nbsp;<span>{{ __('Aucune recherche effectuée') }}</span>
-                @endif
             </div>
         </div>
-        <div class="item">
-            <header>{{ __('Mes dossiers favoris') }}</header>
-            <div class="content">
-                @if($dossiers->count())
-                @foreach ($dossiers as $dossier)
-                    <a href="{{ route('media_manager', ['d' => $dossier->id, 's' => $dossier->sujet->codeSujet]) }}" ><i class="fas fa-folder"></i> {{$dossier->sujet->libelle." - ".$dossier->libelle}}</a>
-                @endforeach
-                @else
-                <i class="fa-solid fa-folder"></i>&nbsp;<span>{{ __('Pas de dossier en favoris') }}</span>
-                @endif
-            </div>
-        </div>
-    </div>
-</main>
+    </main>
 @endsection

resources/views/media_manager.blade.php

@@ -2,55 +2,65 @@
 @include('layouts.header')
 @include('layouts.media_edit')
 @section('content')
-<main class="media_manager  template_2col">
-	<div class="side_menu">
-        @php
-        $dataVue = [
-            'sujets' => $sujets,
-            'current' => $currentSujet,
-        ];
-        @endphp
-        <div id="mm-side-header" data-json='@json($dataVue)'></div>
-        <div id="mm-folder" data-json='{}'></div>
-	</div>
-	<div class="main_content">
-			<header>
-                @php
+    <main class="media_manager template_2col">
+        <div class="side_menu">
+            @php
                 $dataVue = [
-                    'textsearch' => $textSearch,
-                    'typesmedia' => $typesmedia,
-                    'etiquettes' => $etiquettes,
+                    'sujets' => $sujets,
+                    'current' => $currentSujet,
                 ];
+            @endphp
+            <div id="mm-side-header" data-json='@json($dataVue)'></div>
+            @php
+                $dataVue = [
+                    'selectedFolder' => $currentFolder,
+                    'selectedSubject' => $currentSujet,
+                ];
+            @endphp
+            <div id="mm-folder" data-json='@json($dataVue)'></div>
+        </div>
+        <div class="main_content">
+            <header>
+                @php
+                    $dataVue = [
+                        'textsearch' => $textSearch,
+                        'typesmedia' => $typesmedia,
+                        'etiquettes' => $etiquettes,
+                    ];
                 @endphp
                 <div id="mm-filters" data-json='@json($dataVue)'></div>
-				<div class="action_wrapper group">
+                <div class="action_wrapper group">
                     <div id="actionsBar">
                         @php
-                        $dataVue = [
-                            'csrf' => csrf_token(),
-                            'etiquettes' => $etiquettes,
-                        ];
+                            $dataVue = [
+                                'csrf' => csrf_token(),
+                                'etiquettes' => $etiquettes,
+                            ];
                         @endphp
                         <div id="mm-actions" data-json='@json($dataVue)'></div>
                     </div>
-					<div class="display">
+                    <div class="display">
                         <button><i class="fa fa-calendar-check selected"></i></button>
-						<button><i class="fa fa-table-cells selected"></i></button>
-						<button><i class="fa fa-table-list"></i></button>
-					</div>
+                        <button><i class="fa fa-table-cells selected"></i></button>
+                        <button><i class="fa fa-table-list"></i></button>
+                    </div>
                     <div id="mm-sorter" data-json='{}'></div>
-				</div>
-			</header>
-            <div id="mm-display" data-json='{}'></div>
-		</div>
+                </div>
+            </header>
+            @php
+                $dataVue = [
+                    'selectedFolder' => $currentFolder,
+                ];
+            @endphp
+            <div id="mm-display" data-json='@json($dataVue)'></div>
+        </div>
         <div id="mm-basket" data-json='{}'></div>
-</main>
-
+    </main>
 @endsection
 @section('scripts')
     <!-- TODO : Faire le tri des js ci-dessous -->
-	<script src="{{ mix('js/jquery.nestable.min.js') }}" defer></script>
-	<script src="{{ mix('js/fabric.js') }}"></script>
-	<script src="{{ mix('js/darkroom.js') }}"></script>
-	<script src="{{ mix('js/jquery.caret.min.js') }}"></script>
+    <script src="{{ mix('js/jquery.nestable.min.js') }}" defer></script>
+    <script src="{{ mix('js/fabric.js') }}"></script>
+    <script src="{{ mix('js/darkroom.js') }}"></script>
+    <script src="{{ mix('js/jquery.caret.min.js') }}"></script>
 @endsection

routes/web.php

@@ -73,11 +73,11 @@ Route::post('/ajax/add-depot-folder', [DossierController::class, 'addDepotFolder
 
 // * Ajax pour la gestion de l'upload de média .
 Route::post('/ajax/upload-media/depot', [UploadController::class, 'uploadMediaFileIntoDepot'])
-->name('media.uploadDepot');
+    ->name('media.uploadDepot');
 Route::post('/ajax/upload-media/{sujet}/{dossier}', [UploadController::class, 'uploadMediaFile'])
-->name('media.upload');
+    ->name('media.upload');
 
 // * Les pages Front panier public.
 Route::get('/basket/{basket_uuid}', [PanierController::class, 'showBasket']);
 Route::post('/ajax/download-media-public/{format?}', [MediaController::class, 'downloadMediaPublic'])
-->name('downloadMediaPublic');
+    ->name('downloadMediaPublic');