Issue #407: Convert newlines to br when importing data dictionary c…

…olumns
bcgov · Apr 22, 2024 · 84ab7d0 · 84ab7d0
1 parent ba510a7
commit 84ab7d0
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/html/modules/custom/bc_dc/src/Form/BcDcAddColumnsForm.php b/html/modules/custom/bc_dc/src/Form/BcDcAddColumnsForm.php
@@ -691,7 +691,7 @@ public function submitForm(array &$form, FormStateInterface $form_state): void {
         }
         elseif (isset($row[$key]) && strlen($row[$key])) {
           $paragraph_fields['field_' . $field] = [
-            'value' => $row[$key],
+            'value' => nl2br($row[$key]),
             'format' => 'basic_html',
           ];
         }

diff --git a/html/modules/custom/bc_dc/tests/files/test-valid.tsv b/html/modules/custom/bc_dc/tests/files/test-valid.tsv
@@ -1,2 +1,3 @@
 column_name	column_size	column_type	column_description
-Name tsv	50	integer	<p><strong>Column description</strong></p>
+Name tsv	50	integer	"<p><strong>Column
+description</strong></p>"
diff --git a/html/modules/custom/bc_dc/tests/src/Functional/BcDcFunctionalTest.php b/html/modules/custom/bc_dc/tests/src/Functional/BcDcFunctionalTest.php
@@ -826,7 +826,7 @@ public function test(): void {
     ];
     $this->submitForm($edit, 'Publish');
     // Column description is displayed with HTML tags.
-    $this->assertSession()->elementExists('xpath', '//div[contains(@class, "field--name-field-column-description")]/div/p/strong[text() = "Column description"]');
+    $this->assertSession()->elementExists('xpath', '//div[contains(@class, "field--name-field-column-description")]/div/p/strong[text() = "Column"][br]');
 
     // Anonymous has no access to data_set build page.
     $this->drupalLogout();