Merge pull request #12 from ITK-Leantime/Feature/3126-3.3.x-compatabi…

…lity 3126: 3.3.x compatibility
ITK-Leantime · Jan 10, 2025 · f2aae82 · f2aae82
2 parents c3fd9c7 + 3d143b6
commit f2aae82
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+* [PR-12](/~https://github.com/ITK-Leantime/leantime-estimateimport/pull/12)
+  * Added compatability for Leantime 3.3.x
+
 ## [1.0.0] - 2024-09-18
 
 * [PR-8](/~https://github.com/ITK-Leantime/leantime-estimateimport/pull/9)

diff --git a/Controllers/Import.php b/Controllers/Import.php
@@ -6,7 +6,7 @@
 use Illuminate\Http\RedirectResponse;
 use Leantime\Core\Controller\Controller;
 use Symfony\Component\HttpFoundation\Response;
-use Leantime\Core\Template;
+use Leantime\Core\UI\Template;
 use Leantime\Plugins\EstimateImport\Services\ImportHelper as ImportHelper;
 
 /**

diff --git a/Controllers/ImportMapping.php b/Controllers/ImportMapping.php
@@ -5,7 +5,7 @@
 use Exception;
 use Illuminate\Http\RedirectResponse;
 use Leantime\Core\Controller\Controller;
-use Leantime\Core\Template;
+use Leantime\Core\UI\Template;
 use Symfony\Component\HttpFoundation\Response;
 use Leantime\Plugins\EstimateImport\Services\ImportHelper as ImportHelper;
 

diff --git a/Controllers/ImportValidation.php b/Controllers/ImportValidation.php
@@ -4,7 +4,7 @@
 
 use Illuminate\Http\RedirectResponse;
 use Leantime\Core\Controller\Controller;
-use Leantime\Core\Template;
+use Leantime\Core\UI\Template;
 use Leantime\Core\Language;
 use Leantime\Domain\Projects\Services\Projects;
 use Leantime\Domain\Users\Services\Users;

diff --git a/Services/ImportHelper.php b/Services/ImportHelper.php
@@ -190,6 +190,9 @@ public function dataValidationCheck(string $tempFilePath, array $dataToValidate)
 
             // Loop data and match fields names
             foreach ($data as $data_key => &$datum) {
+                if (!isset($datum[$key])) {
+                    continue;
+                }
                 if (trim($mapping_datum) === '-1') {
                     unset($datum[$key]);
                     if (empty($datum)) {