Fix loading array settings on scheduled product page

related issue: https://progress.opensuse.org/issues/166154
r-richardson · Oct 9, 2024 · 8c39e72 · 8c39e72
1 parent d621070
commit 8c39e72
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 12 deletions.
diff --git a/assets/javascripts/audit_log.js b/assets/javascripts/audit_log.js
@@ -191,6 +191,7 @@ function renderScheduledProductSettings(settings) {
     const keyTd = document.createElement('td');
     const valueTd = document.createElement('td');
     keyTd.append(key);
+    valueTd.style.whiteSpace = 'pre-wrap';
     valueTd.append(renderHttpUrlAsLink(value));
     tr.append(keyTd, valueTd);
     tbody.append(tr);

diff --git a/assets/javascripts/openqa.js b/assets/javascripts/openqa.js
@@ -577,19 +577,43 @@ function renderComments(row) {
 }
 
 function renderHttpUrlAsLink(value) {
-  const span = document.createElement('span');
-  for (let match; (match = value.match(/https?:\/\/[^\s,]*/)); ) {
-    const url = match[0];
-    const link = document.createElement('a');
-    link.href = url;
-    link.target = 'blank';
-    link.appendChild(document.createTextNode(url));
-    span.appendChild(document.createTextNode(value.substr(0, match.index)));
-    span.appendChild(link);
-    value = value.substr(match.index + url.length);
+  if (!value) {
+    return document.createTextNode('');
   }
-  span.appendChild(document.createTextNode(value));
-  return span;
+  if (Array.isArray(value)) {
+    const fragment = document.createDocumentFragment();
+    value.forEach((item, index) => {
+      fragment.appendChild(renderHttpUrlAsLink(item));
+      if (index < value.length - 1) {
+        fragment.appendChild(document.createTextNode(', ')); // rator between items
+      }
+    });
+    return fragment;
+  }
+  if (typeof value !== 'string') {
+    value = String(value);
+  }
+  const urlRegex = /https?:\/\/[^\s,]*/g;
+  let lastIndex = 0;
+  let match;
+  const fragment = document.createDocumentFragment();
+  while ((match = urlRegex.exec(value)) !== null) {
+    if (match.index > lastIndex) {
+      fragment.appendChild(document.createTextNode(value.substring(lastIndex, match.index)));
+    }
+    const a = document.createElement('a');
+    a.href = match[0];
+    a.textContent = match[0];
+    fragment.appendChild(a);
+    lastIndex = urlRegex.lastIndex;
+  }
+  if (lastIndex < value.length) {
+    fragment.appendChild(document.createTextNode(value.substring(lastIndex)));
+  }
+  if (!fragment.hasChildNodes()) {
+    return document.createTextNode(value);
+  }
+  return fragment;
 }
 
 function getXhrError(jqXHR, textStatus, errorThrown) {