@asd20/ui-next 2.26.0 → 2.27.0

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+# [2.27.0](https://github.com/academydistrict20/asd20-ui-next/compare/ui-next-v2.26.1...ui-next-v2.27.0) (2026-09-30)
+
+
+### Features
+
+* support inline public form introduction links ([bea4683](https://github.com/academydistrict20/asd20-ui-next/commit/bea4683f849623abe527ad9b70f6d85db145aa25))
+
+## [2.26.1](https://github.com/academydistrict20/asd20-ui-next/compare/ui-next-v2.26.0...ui-next-v2.26.1) (2026-09-30)
+
+
+### Bug Fixes
+
+* show public form fallback only after submission failure ([7f17021](https://github.com/academydistrict20/asd20-ui-next/commit/7f17021d2e1f4e04fd193fb0e16d80125efe3ae7))
+
 # [2.26.0](https://github.com/academydistrict20/asd20-ui-next/compare/ui-next-v2.25.3...ui-next-v2.26.0) (2026-09-30)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@asd20/ui-next",
-  "version": "2.26.0",
+  "version": "2.27.0",
   "private": false,
   "description": "ASD20 UI component library for Vue 3.",
   "license": "MIT",

package/src/components/organisms/Asd20PublicFormModal/index.vue

@@ -53,9 +53,14 @@
           v-if="formDefinition.introduction"
           class="asd20-public-form-modal__introduction"
         >
-          {{ formDefinition.introduction }}
+          <template v-if="inlineIntroductionParts">
+            {{ inlineIntroductionParts.before }}<a :href="formDefinition.introductionLink.href">{{ formDefinition.introductionLink.label }}</a>{{ inlineIntroductionParts.after }}
+          </template>
+          <template v-else>
+            {{ formDefinition.introduction }}
+          </template>
         </p>
-        <p v-if="formDefinition.introductionLink">
+        <p v-if="formDefinition.introductionLink && !formDefinition.introductionLink.inline">
           <a :href="formDefinition.introductionLink.href">
             {{ formDefinition.introductionLink.label }}
           </a>
@@ -114,26 +119,6 @@
           />
         </div>
 
-        <div
-          v-if="hasFallbackContact"
-          class="asd20-public-form-modal__fallback"
-        >
-          <p>
-            {{
-              formDefinition.fallbackContact.instructions ||
-                'If you cannot submit this form, use one of these contact options:'
-            }}
-          </p>
-          <a
-            v-if="formDefinition.fallbackContact.email"
-            :href="`mailto:${formDefinition.fallbackContact.email}`"
-          >{{ formDefinition.fallbackContact.email }}</a>
-          <a
-            v-if="formDefinition.fallbackContact.phone"
-            :href="fallbackPhoneHref"
-          >{{ formDefinition.fallbackContact.phone }}</a>
-        </div>
-
         <div
           class="asd20-public-form-modal__submit"
           aria-live="polite"
@@ -180,6 +165,26 @@
         >
           {{ feedbackMessage }}
         </div>
+
+        <div
+          v-if="showFallbackContact"
+          class="asd20-public-form-modal__fallback"
+        >
+          <p>
+            {{
+              formDefinition.fallbackContact.instructions ||
+                'If you cannot submit this form, use one of these contact options:'
+            }}
+          </p>
+          <a
+            v-if="formDefinition.fallbackContact.email"
+            :href="`mailto:${formDefinition.fallbackContact.email}`"
+          >{{ formDefinition.fallbackContact.email }}</a>
+          <a
+            v-if="formDefinition.fallbackContact.phone"
+            :href="fallbackPhoneHref"
+          >{{ formDefinition.fallbackContact.phone }}</a>
+        </div>
       </form>
     </asd20-viewport>
   </asd20-modal>
@@ -245,6 +250,7 @@ export default {
       feedbackRole: 'alert',
       sending: false,
       submissionSuccess: false,
+      submissionFailed: false,
       loadSequence: 0,
     }
   },
@@ -252,6 +258,16 @@ export default {
     modalTitle() {
       return this.formDefinition?.title || 'Public Form'
     },
+    inlineIntroductionParts() {
+      const introduction = this.formDefinition?.introduction || ''
+      const link = this.formDefinition?.introductionLink
+      if (!link?.inline) return null
+      const index = introduction.indexOf(link.label)
+      return {
+        before: introduction.slice(0, index),
+        after: introduction.slice(index + link.label.length),
+      }
+    },
     usesRecordsFormSpacing() {
       return [
         'student-records-request',
@@ -272,7 +288,10 @@ export default {
     },
     hasFallbackContact() {
       const fallback = this.formDefinition?.fallbackContact
-      return Boolean(fallback?.email || fallback?.phone)
+      return Boolean(fallback?.instructions || fallback?.email || fallback?.phone)
+    },
+    showFallbackContact() {
+      return this.submissionFailed && this.hasFallbackContact
     },
     fallbackPhoneHref() {
       const phone = this.formDefinition?.fallbackContact?.phone || ''
@@ -318,6 +337,7 @@ export default {
       this.definitionError = ''
       this.feedbackMessage = ''
       this.submissionSuccess = false
+      this.submissionFailed = false
       this.validationErrors = {}
       this.validationAttempted = false
       this.honeypot = ''
@@ -386,7 +406,7 @@ export default {
     },
     captchaFailed() {
       this.showFeedback(
-        'The verification service could not start. Please try again or use the contact options listed.'
+        'The verification service could not start. Please try again or use another contact option on this page.'
       )
     },
     captchaExpired() {
@@ -426,6 +446,7 @@ export default {
 
       this.sending = true
       this.feedbackMessage = ''
+      this.submissionFailed = false
       try {
         const payload = {
           ...this.values,
@@ -443,6 +464,7 @@ export default {
           definitionVersion: this.formDefinition.version,
         })
       } catch (error) {
+        this.submissionFailed = true
         this.showFeedback(this.failureMessage(error))
       } finally {
         this.sending = false

package/src/helpers/publicFormDefinition.js

@@ -171,6 +171,12 @@ export function normalizePublicFormDefinition(definition) {
   const id = boundedText(definition.id, 'Form ID', 100, true)
   if (!FORM_ID_PATTERN.test(id)) throw new Error('The public form ID is invalid.')
 
+  const introduction = boundedText(
+    definition.introduction,
+    'Form introduction',
+    2000
+  )
+
   let introductionLink
   if (definition.introductionLink != null) {
     const label = boundedText(
@@ -187,18 +193,25 @@ export function normalizePublicFormDefinition(definition) {
     )
     if (!/^\/[a-z0-9/-]+\/?$/.test(href) || href.startsWith('//'))
       throw new Error('The introduction link must be a local page path.')
-    introductionLink = { label, href }
+    const inline = optionalBoolean(
+      definition.introductionLink.inline,
+      'Inline introduction link'
+    )
+    if (
+      inline &&
+      (!introduction.includes(label) ||
+        introduction.indexOf(label) !== introduction.lastIndexOf(label))
+    ) {
+      throw new Error('The inline introduction link label must appear once in the introduction.')
+    }
+    introductionLink = inline ? { label, href, inline: true } : { label, href }
   }
 
   return {
     id,
     version,
     title: boundedText(definition.title, 'Form title', 200, true),
-    introduction: boundedText(
-      definition.introduction,
-      'Form introduction',
-      2000
-    ),
+    introduction,
     introductionLink,
     submitLabel: boundedText(definition.submitLabel, 'Submit label', 100, true),
     successMessage: boundedText(