From 5545457536d666dc31fc3ed7454d501cc256328a Mon Sep 17 00:00:00 2001
From: Ivan Nieto Vivanco <inietov@gmail.com>
Date: Thu, 1 Jul 2021 14:26:03 -0500
Subject: [PATCH 1/2] Remove an else statement that doesn't allow to continue
 the importer flow.

---
 app/Importer/UserImporter.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/Importer/UserImporter.php b/app/Importer/UserImporter.php
index be476aef9..7adaa3a08 100644
--- a/app/Importer/UserImporter.php
+++ b/app/Importer/UserImporter.php
@@ -125,8 +125,6 @@ class UserImporter extends ItemImporter
         if ($department) {
             $this->log('A matching department ' . $department_name . ' already exists');
             return $department->id;
-        } else {
-            return null;
         }
 
         $department = new department();

From 131a285e2f360fc6705b27ca64a2a6c7a53ef9d2 Mon Sep 17 00:00:00 2001
From: Ivan Nieto Vivanco <inietov@gmail.com>
Date: Tue, 6 Jul 2021 15:59:45 -0500
Subject: [PATCH 2/2] Fixes Vue issue with the import process.

---
 resources/assets/js/components/importer/importer-file.vue | 2 +-
 resources/assets/js/components/importer/importer.vue      | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/resources/assets/js/components/importer/importer-file.vue b/resources/assets/js/components/importer/importer-file.vue
index 17313aae0..f4fddcd84 100644
--- a/resources/assets/js/components/importer/importer-file.vue
+++ b/resources/assets/js/components/importer/importer-file.vue
@@ -300,7 +300,7 @@
             }
         },
         components: {
-            select2: require('../select2.vue')
+            select2: require('../select2.vue').default
         }
     }
 </script>
\ No newline at end of file
diff --git a/resources/assets/js/components/importer/importer.vue b/resources/assets/js/components/importer/importer.vue
index f15e85a55..ae98bd950 100644
--- a/resources/assets/js/components/importer/importer.vue
+++ b/resources/assets/js/components/importer/importer.vue
@@ -120,9 +120,9 @@
         },
 
         components: {
-            alert: require('../alert.vue'),
-            errors: require('./importer-errors.vue'),
-            importFile: require('./importer-file.vue'),
+            alert: require('../alert.vue').default,
+            errors: require('./importer-errors.vue').default,
+            importFile: require('./importer-file.vue').default,
         }
     }