@asd20/ui-next 2.30.0 → 2.31.0

package/src/helpers/publicFormDefinition.js

@@ -107,6 +107,7 @@ function normalizeField(field) {
     ),
     options: undefined,
     visibleWhen: normalizeCondition(field.visibleWhen),
+    requiredUnlessUploaded: boundedText(field.requiredUnlessUploaded, 'Upload field name', 64),
     requiredWhen:
       field.requiredWhen == null
         ? undefined
@@ -191,13 +192,13 @@ export function isPublicFormFieldVisible(field, values) {
 }
 
 export function isPublicFormFieldRequired(field, values) {
-  return (
-    field.required ||
-    field.requiredWhen?.some(condition =>
-      condition.values.includes(String(values[condition.fieldName] || '').trim())
-    ) ||
-    false
+  const required = field.required || field.requiredWhen?.some(condition =>
+    condition.values.includes(String(values[condition.fieldName] || '').trim())
   )
+  const uploaded = field.requiredUnlessUploaded &&
+    Array.isArray(values[field.requiredUnlessUploaded]) &&
+    values[field.requiredUnlessUploaded].length > 0
+  return Boolean(required && !uploaded)
 }
 
 export async function serializePublicFormValues(definition, values) {
@@ -252,6 +253,12 @@ export function normalizePublicFormDefinition(definition) {
     throw new Error('The public form contains duplicate field names.')
 
   for (const field of fields) {
+    if (field.requiredUnlessUploaded) {
+      const upload = fields.find(candidate => candidate.name === field.requiredUnlessUploaded)
+      if (!upload || upload.type !== 'file' || upload === field) {
+        throw new Error('The public form has an invalid upload requirement reference.')
+      }
+    }
     for (const condition of [
       field.visibleWhen,
       ...(field.requiredWhen || []),

package/src/helpers/publicationIntroduction.js

@@ -0,0 +1,53 @@
+import { parseFragment } from 'parse5'
+
+// Only empty paragraphs/whitespace are editorially empty. Media, placeholders,
+// links, tables, and otherwise unknown elements must remain visible to review.
+function nonemptyHtml(html) {
+  const visit = node => {
+    if (node.nodeName === '#text') return Boolean(node.value.trim())
+    if (node.tagName && node.tagName !== 'p') return true
+    return (node.childNodes || []).some(visit)
+  }
+  return (parseFragment(String(html || '')).childNodes || []).some(visit)
+}
+
+function nonemptyJson(value) {
+  if (!value) return false
+  let doc = value
+  if (typeof value === 'string') {
+    try { doc = JSON.parse(value) } catch { return true }
+  }
+  if (doc?.version === 1 && Array.isArray(doc.blocks)) return doc.blocks.length > 0
+  const visit = node => {
+    if (node?.type === 'text') return Boolean(node.text?.trim())
+    if (!['doc', 'paragraph'].includes(node?.type)) return true
+    return (node.content || []).some(visit)
+  }
+  return visit(doc)
+}
+
+export function buildPublicationIntroduction(firstMessage, metaDescription = '') {
+  const message = firstMessage || {}
+  const lead = message.shortDescription || message.summary || metaDescription || ''
+  const excludedFields = ['heading', 'title', 'bodyContent', 'bodyJson', 'longDescription', 'images', 'callsToAction', 'detailLink', 'detailLinkLabel']
+  const unmappedFields = []
+  for (const field of ['bodyContent', 'longDescription']) {
+    if (nonemptyHtml(message[field])) unmappedFields.push(field)
+  }
+  if (nonemptyJson(message.bodyJson)) unmappedFields.push('bodyJson')
+  for (const field of ['images', 'callsToAction']) {
+    if (message[field]?.length) unmappedFields.push(field)
+  }
+  // Detail links direct readers from wayfinding messages to detailed pages.
+  // The handbook already is that destination; their omission is intentional.
+  // Only explicitly typed detail links qualify. Other links still need review.
+  if (message.links?.some(item => (item?.link ?? item)?.type !== 'Detail Link')) unmappedFields.push('links')
+  if (message.shortDescription && nonemptyHtml(message.summary) && message.summary !== lead) unmappedFields.push('summary')
+  return {
+    messageId: message.id ?? null, mode: 'first-summary-lead', lead,
+    detailLinkPolicy: 'omit-wayfinding',
+    leadSource: message.shortDescription || message.summary ? 'summary' : metaDescription ? 'metaDescription' : 'none',
+    excludedFields: [...excludedFields, 'links', ...(message.shortDescription ? ['summary'] : [])],
+    diagnostics: unmappedFields.length ? [{ code: 'introduction-content-unmapped', fields: unmappedFields }] : [],
+  }
+}

package/templates.js

@@ -27,3 +27,4 @@ export { default as Asd20SearchAppTemplate } from './src/components/templates/As
 export { default as Asd20WayfindingAlternateTemplate } from './src/components/templates/Asd20WayfindingAlternateTemplate/index.vue'
 export { default as Asd20WayfindingImageTemplate } from './src/components/templates/Asd20WayfindingImageTemplate/index.vue'
 export { default as Asd20WayfindingTemplate } from './src/components/templates/Asd20WayfindingTemplate/index.vue'
+export { default as Asd20HandbookDocument } from './src/components/templates/Asd20HandbookDocument/index.vue'