Merge pull request #58 from bartjuh4/feat/uppercase-slug-fix

Fix issues with uppercase slugs from bolt3 and some minor fixes
bobdenotter · Mar 22, 2022 · b2757ee · b2757ee
2 parents 10ea991 + e48b5bc
commit b2757ee
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/src/Import.php b/src/Import.php
@@ -4,6 +4,7 @@
 
 namespace BobdenOtter\Conimex;
 
+use Bolt\Common\Str;
 use Bolt\Configuration\Config;
 use Bolt\Configuration\Content\ContentType;
 use Bolt\Controller\Backend\ContentEditController;
@@ -144,7 +145,7 @@ private function importRecord(ContentType $contentType, Collection $record): voi
         }
 
         /** @var Content $content */
-        $content = $this->contentRepository->findOneBySlug($slug, $contentType);
+        $content = $this->contentRepository->findOneBySlug(Str::slug($slug), $contentType);
 
         if (! $content) {
             $content = new Content($contentType);

diff --git a/src/SelectFields.php b/src/SelectFields.php
@@ -93,7 +93,11 @@ private function populateSelectFieldReferencedData($selectFieldData, $selectFiel
             foreach ($selectFieldData as $selectFieldValue) {
                 $data[] = $this->querySelectFieldReferencedData($selectFieldDefinition, $selectFieldValue);
             }
-        } else {
+
+            return $data;
+        }
+
+        if (!empty($selectFieldData)) {
             $data[] = $this->querySelectFieldReferencedData($selectFieldDefinition, $selectFieldData);
         }
 
@@ -139,11 +143,19 @@ private function querySelectFieldReferencedData($selectFieldDefinition, $selectF
 
     private function fetchReferencedRecordSlug($contentType, $selectFieldValue)
     {
+        if (empty($selectFieldValue)) {
+            return;
+        }
+
         $criteria['contentType'] = $contentType;
         $criteria['id'] = $selectFieldValue;
 
         $referencedRecord = $this->contentRepository->findBy($criteria, [], 1);
 
+        if (empty($referencedRecord)) {
+            return;
+        }
+
         return $referencedRecord[0]->getFieldValues()['slug'];
     }
 }