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

---
 Admin/Install/Navigation.install.json |  8 +++----
 Controller/ApiController.php          | 30 +++++++--------------------
 2 files changed, 12 insertions(+), 26 deletions(-)

diff --git a/Admin/Install/Navigation.install.json b/Admin/Install/Navigation.install.json
index 4b03973..7258045 100755
--- a/Admin/Install/Navigation.install.json
+++ b/Admin/Install/Navigation.install.json
@@ -5,7 +5,7 @@
         "type": 2,
         "subtype": 1,
         "name": "Workflows",
-        "uri": "{/base}/workflow/instance/list?{?}",
+        "uri": "{/base}/workflow/instance/list",
         "target": "self",
         "icon": null,
         "order": 90,
@@ -19,7 +19,7 @@
                 "type": 3,
                 "subtype": 1,
                 "name": "Dashboard",
-                "uri": "{/base}/workflow/instance/list?{?}",
+                "uri": "{/base}/workflow/instance/list",
                 "target": "self",
                 "icon": null,
                 "order": 1,
@@ -34,7 +34,7 @@
                 "type": 3,
                 "subtype": 1,
                 "name": "Templates",
-                "uri": "{/base}/workflow/template/list?{?}",
+                "uri": "{/base}/workflow/template/list",
                 "target": "self",
                 "icon": null,
                 "order": 5,
@@ -49,7 +49,7 @@
                 "type": 3,
                 "subtype": 1,
                 "name": "Create",
-                "uri": "{/base}/workflow/template/create?{?}",
+                "uri": "{/base}/workflow/template/create",
                 "target": "self",
                 "icon": null,
                 "order": 10,
diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index 94f91f4..6102023 100755
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -347,8 +347,7 @@ final class ApiController extends Controller
      */
     public function apiWorkflowTemplateCreate(RequestAbstract $request, ResponseAbstract $response, array $data = []) : void
     {
-        $uploadedFiles = $request->files;
-        $files         = [];
+        $files = [];
 
         if (!empty($val = $this->validateTemplateCreate($request))) {
             $response->header->status = RequestStatusCode::R_400;
@@ -367,23 +366,23 @@ final class ApiController extends Controller
         }
 
         $collectionId = 0;
-        $uploaded     = [];
+        $uploaded     = new NullCollection();
 
         if (!empty($request->files)) {
             $path = '/Modules/Workflow/' . $request->getData('name');
 
-            /** @var \Modules\Media\Models\Media[] $uploaded */
+            /** @var \Modules\Media\Models\Collection $uploaded */
             $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' . $path,
                 virtualPath: $path,
                 pathSettings: PathSettings::FILE_PATH
             );
 
-            foreach ($uploaded as $upload) {
+            foreach ($uploaded->sources as $upload) {
                 if ($upload->id === 0) {
                     continue;
                 }
@@ -391,27 +390,14 @@ final class ApiController extends Controller
                 $files[] = $upload;
             }
 
-            /** @var \Modules\Media\Models\Collection $collection */
-            $collection = $this->app->moduleManager->get('Media')->createMediaCollectionFromMedia(
-                $request->getDataString('name') ?? '',
-                $request->getDataString('description') ?? '',
-                $files,
-                $request->header->account
-            );
-
-            $collection->setPath('/Modules/Media/Files/Modules/Workflow/' . ($request->getDataString('name') ?? ''));
-            $collection->setVirtualPath('/Modules/Workflow');
-
-            $this->createModel($request->header->account, $collection, CollectionMapper::class, 'collection', $request->getOrigin());
-
-            if ($collection->id < 1) {
+            if ($uploaded->id < 1) {
                 $response->header->status = RequestStatusCode::R_403;
-                $this->createInvalidCreateResponse($request, $response, $collection);
+                $this->createInvalidCreateResponse($request, $response, $uploaded);
 
                 return;
             }
 
-            $collectionId = $collection->id;
+            $collectionId = $uploaded->id;
         }
 
         $template = $this->createTemplateFromRequest($request, $collectionId);