From 629279b262eebacb1b41ca264bd2eb0e8c5c527d Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nnes.com@googlemail.com>
Date: Fri, 12 Apr 2024 00:52:06 +0000
Subject: [PATCH] fix bugs

---
 Admin/Install/Navigation.install.json | 12 ++++----
 Admin/Install/SearchCommands.php      |  1 +
 Controller/ApiController.php          | 42 +++++++--------------------
 3 files changed, 18 insertions(+), 37 deletions(-)

diff --git a/Admin/Install/Navigation.install.json b/Admin/Install/Navigation.install.json
index 0204d78..d12eee9 100755
--- a/Admin/Install/Navigation.install.json
+++ b/Admin/Install/Navigation.install.json
@@ -5,7 +5,7 @@
         "type": 2,
         "subtype": 1,
         "name": "Clients",
-        "uri": "{/base}/sales/client/list?{?}",
+        "uri": "{/base}/sales/client/list",
         "target": "self",
         "icon": null,
         "order": 1,
@@ -19,7 +19,7 @@
                 "type": 3,
                 "subtype": 1,
                 "name": "List",
-                "uri": "{/base}/sales/client/list?{?}",
+                "uri": "{/base}/sales/client/list",
                 "target": "self",
                 "icon": null,
                 "order": 1,
@@ -34,7 +34,7 @@
                 "type": 3,
                 "subtype": 1,
                 "name": "Create",
-                "uri": "{/base}/sales/client/create?{?}",
+                "uri": "{/base}/sales/client/create",
                 "target": "self",
                 "icon": null,
                 "order": 1,
@@ -51,7 +51,7 @@
         "type": 2,
         "subtype": 1,
         "name": "Attributes",
-        "uri": "{/base}/sales/client/attribute/type/list?{?}",
+        "uri": "{/base}/sales/client/attribute/type/list",
         "target": "self",
         "icon": null,
         "order": 5,
@@ -65,7 +65,7 @@
                 "type": 3,
                 "subtype": 1,
                 "name": "Types",
-                "uri": "{/base}/sales/client/attribute/type/list?{?}",
+                "uri": "{/base}/sales/client/attribute/type/list",
                 "target": "self",
                 "icon": null,
                 "order": 15,
@@ -80,7 +80,7 @@
                 "type": 3,
                 "subtype": 1,
                 "name": "Create",
-                "uri": "{/base}/sales/client/attribute/type/create?{?}",
+                "uri": "{/base}/sales/client/attribute/type/create",
                 "target": "self",
                 "icon": null,
                 "order": 15,
diff --git a/Admin/Install/SearchCommands.php b/Admin/Install/SearchCommands.php
index c281d73..fe7ab80 100644
--- a/Admin/Install/SearchCommands.php
+++ b/Admin/Install/SearchCommands.php
@@ -22,6 +22,7 @@ return [
         [
             'dest'       => '\Modules\ClientManagement\Controller\SearchController:searchGeneral',
             'verb'       => RouteVerb::ANY,
+            'active'     => true,
             'permission' => [
                 'module' => SearchController::NAME,
                 'type'   => PermissionType::READ,
diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index 5512c53..047d1ee 100755
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -29,7 +29,6 @@ use Modules\ClientManagement\Models\PermissionCategory;
 use Modules\ClientManagement\Models\SettingsEnum;
 use Modules\Media\Models\Collection;
 use Modules\Media\Models\CollectionMapper;
-use Modules\Media\Models\MediaMapper;
 use Modules\Media\Models\PathSettings;
 use Modules\Organization\Models\UnitMapper;
 use phpOMS\Account\PermissionType;
@@ -295,7 +294,7 @@ final class ApiController extends Controller
     private function createMediaDirForClient(int $id, int $createdBy) : Collection
     {
         $collection       = new Collection();
-        $collection->name = $id;
+        $collection->name = (string) $id;
         $collection->setVirtualPath('/Modules/ClientManagement/Clients');
         $collection->setPath('/Modules/Media/Files/Modules/ClientManagement/Clients/' . $id);
         $collection->createdBy = new NullAccount($createdBy);
@@ -615,10 +614,8 @@ final class ApiController extends Controller
      */
     public function apiFileCreate(RequestAbstract $request, ResponseAbstract $response, array $data = []) : void
     {
-        $uploadedFiles = $request->files;
-
-        if (empty($uploadedFiles)) {
-            $this->fillJsonResponse($request, $response, NotificationLevel::ERROR, 'Client', 'Invalid file', $uploadedFiles);
+        if (empty($request->files)) {
+            $this->fillJsonResponse($request, $response, NotificationLevel::ERROR, 'Client', 'Invalid file', $request->files);
             $response->header->status = RequestStatusCode::R_400;
 
             return;
@@ -627,41 +624,24 @@ final class ApiController extends Controller
         $uploaded = $this->app->moduleManager->get('Media', 'Api')->uploadFiles(
             names: $request->getDataList('names'),
             fileNames: $request->getDataList('filenames'),
-            files: $uploadedFiles,
+            files: $request->files,
             account: $request->header->account,
             basePath: __DIR__ . '/../../../Modules/Media/Files/Modules/ClientManagement/Clients/' . ($request->getData('client') ?? '0'),
             virtualPath: '/Modules/ClientManagement/Clients/' . ($request->getData('client') ?? '0'),
-            pathSettings: PathSettings::FILE_PATH
+            pathSettings: PathSettings::FILE_PATH,
+            type: $request->getDataInt('type'),
+            rel: (int) $request->getData('client'),
+            mapper: ClientMapper::class,
+            field: 'files'
         );
 
-        if ($request->hasData('type')) {
-            foreach ($uploaded as $file) {
-                $this->createModelRelation(
-                    $request->header->account,
-                    $file->id,
-                    $request->getDataInt('type'),
-                    MediaMapper::class,
-                    'types',
-                    '',
-                    $request->getOrigin()
-                );
-            }
-        }
-
-        if (empty($uploaded)) {
+        if (empty($uploaded->sources)) {
             $this->createInvalidAddResponse($request, $response, []);
 
             return;
         }
 
-        $this->createModelRelation(
-            $request->header->account,
-            (int) $request->getData('client'),
-            \reset($uploaded)->id,
-            ClientMapper::class, 'files', '', $request->getOrigin()
-        );
-
-        $this->createStandardCreateResponse($request, $response, $uploaded);
+        $this->createStandardCreateResponse($request, $response, $uploaded->sources);
     }
 
     /**