fixing csv

Leantime · Aug 24, 2024 · b365dbe · b365dbe
1 parent 103c79e
commit b365dbe
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/app/Domain/Connector/Controllers/Integration.php b/app/Domain/Connector/Controllers/Integration.php
@@ -2,6 +2,7 @@
 
 namespace Leantime\Domain\Connector\Controllers {
 
+    use http\Client\Response;
     use Leantime\Core\Controller\Controller;
     use Leantime\Core\Controller\Frontcontroller;
     use Leantime\Domain\Auth\Models\Roles;
@@ -84,7 +85,11 @@ public function run()
                 //STEP 1: Initiate connection
                 if ($params["step"] == "connect") {
                     //This should handle connection UI
-                    $provider->connect();
+                    $connection = $provider->connect();
+
+                    if($connection instanceof \Symfony\Component\HttpFoundation\Response) {
+                        return $connection;
+                    }
                 }
 
 

diff --git a/app/Domain/Connector/Services/Connector.php b/app/Domain/Connector/Services/Connector.php
@@ -597,13 +597,15 @@ private function importTickets($finalMappings, $finalValues)
             foreach ($finalValues as $row) {
                 $ticket = array();
 
+                array_change_key_case($row, CASE_LOWER);
+
                 for ($i = 0; $i < sizeof($finalMappings); $i = $i + 2) {
                     $ticket[$finalMappings[$i + 1]] = $row[$finalMappings[$i]];
                 }
-                $ticket['editorId'] = $row['editorId'];
-                $ticket['projectId'] = $row['projectId'];
+                $ticket['editorId'] = $row['editorid'];
+                $ticket['projectId'] = $row['projectid'];
                 $ticket['status'] = $row['status'];
-                $ticket['type'] = $row['type'] ?? 'task' != '' ? $row['type'] : 'task';
+                $ticket['type'] = $row['type'] ?? 'task';
 
                 if (isset($ticket["id"]) && is_numeric($ticket["id"])) {
                     $this->ticketService->updateTicket($ticket);

diff --git a/app/Domain/CsvImport/Templates/upload.tpl.php b/app/Domain/CsvImport/Templates/upload.tpl.php
@@ -14,7 +14,7 @@
     <?php echo $tpl->displayNotification() ?>
 
     <h2>Upload CSV file</h2>
-    <p>You can upload CSVs to import or update Tasks, Projects, Goals. <a href="https://support.leantime.io/importing-data-via-csv" target="_blank">Check our documentaiton</a> to learn more about the formatting and to download templates</p>
+    <p>You can upload CSVs to import or update Tasks, Projects, Goals. <a href="https://support.leantime.io/importing-data-via-csv" target="_blank">Check our documentation</a> to learn more about the formatting and to download templates</p>
     <br /><br/>
     <div class="uploadWrapper" style="width:100%">