Skip to content

[ENG-12584] 12. Radio button selections duplicate across same-page questions #1095

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
brianjgeiger merged 1 commit into from
Nov 5, 2026
Merged

[ENG-12584] 12. Radio button selections duplicate across same-page questions #1095

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
133 changes: 58 additions & 75 deletions src/app/features/registries/components/custom-step/custom-step.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,23 @@
<section class="flex flex-column bg-white flex-1 p-5 gap-4 w-full">
@if (currentPage()) {
<div class="flex align-items-baseline gap-1">
<h2>{{ currentPage().title }}</h2>
@let page = currentPage();

@let helpText = currentPage().helpText;
@if (page) {
<div class="flex align-items-baseline gap-1">
<h2>{{ page.title }}</h2>

@if (helpText) {
<osf-info-icon [tooltipText]="helpText" tooltipPosition="top"></osf-info-icon>
@if (page.helpText) {
<osf-info-icon [tooltipText]="page.helpText" tooltipPosition="top"></osf-info-icon>
}
</div>

@if (currentPage().description?.length) {
<p class="preserve-whitespace">{{ currentPage().description }}</p>
@if (page.description?.length) {
<p class="preserve-whitespace">{{ page.description }}</p>
}

@let questions = currentPage().questions || [];

<ng-container *ngTemplateOutlet="questionList; context: { $implicit: questions }"></ng-container>
<ng-container *ngTemplateOutlet="questionList; context: { $implicit: page.questions || [] }"></ng-container>

@if (currentPage().sections?.length) {
@for (section of currentPage().sections; track section.id) {
@if (page.sections?.length) {
@for (section of page.sections; track section.id) {
<p-card>
<div class="flex align-items-baseline gap-1">
<h3 class="mb-2">{{ section.title }}</h3>
Expand All @@ -39,8 +37,8 @@ <h3 class="mb-2">{{ section.title }}</h3>

<ng-template #questionList let-questions>
@for (q of questions; track q.id) {
<form class="mb-4" [formGroup]="stepForm">
<label [for]="q.groupKey">
<div class="mb-4" [formGroup]="stepForm">
<div>
<div class="flex align-items-baseline gap-1">
<h3 class="mb-2">
{{ q.displayText }}
Expand All @@ -55,7 +53,7 @@ <h3 class="mb-2">
@if (q.helpText) {
<p class="preserve-whitespace">{{ q.helpText }}</p>
}
</label>
</div>

@if (q.exampleText) {
<p-inplace #inplaceRef class="mb-4">
Expand All @@ -74,85 +72,70 @@ <h3 class="mb-2">
@switch (q.fieldType) {
@case (FieldType.TextArea) {
<textarea
id="{{ q.groupKey }}"
[id]="q.responseKey!"
[attr.aria-label]="q.displayText"
class="w-full"
rows="5"
cols="30"
pTextarea
[formControlName]="q.responseKey!"
></textarea>
@if (
stepForm.controls[q.responseKey!].errors?.['required'] &&
(stepForm.controls[q.responseKey!].touched || stepForm.controls[q.responseKey!].dirty)
) {
<p-message class="simple-variant flex mt-1" severity="error" variant="simple" size="small">
{{ INPUT_VALIDATION_MESSAGES.required | translate }}
</p-message>
}
<ng-container *ngTemplateOutlet="requiredError; context: { $implicit: q.responseKey! }"></ng-container>
}
@case (FieldType.Radio) {
<div class="flex flex-column gap-2 mt-3">
@for (option of q.options; track option) {
<div class="flex align -items-center gap-2">
<div class="flex flex-column gap-2 mt-3" role="radiogroup" [attr.aria-label]="q.displayText">
@for (option of q.options; track option.value) {
<div class="flex align-items-center gap-2">
<p-radioButton
[name]="q.responseKey!"
[formControlName]="q.responseKey!"
[inputId]="option.value"
[inputId]="q.responseKey! + '-' + option.value"
[value]="option.value"
></p-radioButton>

<label [for]="option.value" class="mb-0 cursor-pointer">{{ option.label }}</label>
<label [for]="q.responseKey! + '-' + option.value" class="mb-0 cursor-pointer">{{
option.label
}}</label>
@if (option.helpText) {
<osf-info-icon [tooltipText]="option.helpText" tooltipPosition="top"></osf-info-icon>
}
</div>
}
</div>
@if (
stepForm.controls[q.responseKey!].errors?.['required'] &&
(stepForm.controls[q.responseKey!].touched || stepForm.controls[q.responseKey!].dirty)
) {
<p-message class="simple-variant flex mt-1" severity="error" variant="simple" size="small">
{{ INPUT_VALIDATION_MESSAGES.required | translate }}
</p-message>
}
<ng-container *ngTemplateOutlet="requiredError; context: { $implicit: q.responseKey! }"></ng-container>
}
@case (FieldType.Checkbox) {
<div class="flex flex-column gap-2 mt-3">
@for (option of q.options; track option) {
<div class="flex flex-column gap-2 mt-3" role="group" [attr.aria-label]="q.displayText">
@for (option of q.options; track option.value) {
<div class="flex align-items-center gap-2">
<p-checkbox
[inputId]="option.value"
[inputId]="q.responseKey! + '-' + option.value"
[formControlName]="q.responseKey!"
[value]="option.value"
></p-checkbox>

<label [for]="option.value" class="mb-0 cursor-pointer">{{ option.label }}</label>
<label [for]="q.responseKey! + '-' + option.value" class="mb-0 cursor-pointer">
{{ option.label }}
</label>
@if (option.helpText) {
<osf-info-icon [tooltipText]="option.helpText" tooltipPosition="top"></osf-info-icon>
}
</div>
}
</div>
@if (
stepForm.controls[q.responseKey!].errors?.['required'] &&
(stepForm.controls[q.responseKey!].touched || stepForm.controls[q.responseKey!].dirty)
) {
<p-message class="simple-variant flex mt-1" severity="error" variant="simple" size="small">
{{ INPUT_VALIDATION_MESSAGES.required | translate }}
</p-message>
}
<ng-container *ngTemplateOutlet="requiredError; context: { $implicit: q.responseKey! }"></ng-container>
}

@case (FieldType.Text) {
<input [id]="q.groupKey" [formControlName]="q.responseKey!" type="text" class="w-full" pInputText />
@if (
stepForm.controls[q.responseKey!].errors?.['required'] &&
(stepForm.controls[q.responseKey!].touched || stepForm.controls[q.responseKey!].dirty)
) {
<p-message class="simple-variant flex mt-1" severity="error" variant="simple" size="small">
{{ INPUT_VALIDATION_MESSAGES.required | translate }}
</p-message>
}
<input
[id]="q.responseKey!"
[attr.aria-label]="q.displayText"
[formControlName]="q.responseKey!"
type="text"
class="w-full"
pInputText
/>
<ng-container *ngTemplateOutlet="requiredError; context: { $implicit: q.responseKey! }"></ng-container>
}
@case (FieldType.File) {
<h3 class="mb-2">{{ 'files.actions.uploadFile' | translate }}</h3>
Expand All @@ -163,7 +146,7 @@ <h3 class="mb-2">{{ 'files.actions.uploadFile' | translate }}</h3>
{{ fileUploadDescription() | translate }}
</p>
<div class="flex flex-wrap gap-2 mt-3 mb-3">
@for (file of attachedFiles[q.responseKey!] || []; track file) {
@for (file of attachedFiles[q.responseKey!] || []; track file.file_id) {
<p-chip
[label]="file.name"
severity="info"
Expand All @@ -185,25 +168,25 @@ <h3 class="mb-2">{{ 'files.actions.uploadFile' | translate }}</h3>
</div>
}
}
</form>
</div>
}
</ng-template>

<ng-template #requiredError let-controlName>
@if (
stepForm.controls[controlName].errors?.['required'] &&
(stepForm.controls[controlName].touched || stepForm.controls[controlName].dirty)
) {
<p-message class="simple-variant flex mt-1" severity="error" variant="simple" size="small">
{{ INPUT_VALIDATION_MESSAGES.required | translate }}
</p-message>
}
</ng-template>
}

<div class="flex justify-content-end">
<p-button
type="button"
[label]="'common.buttons.back' | translate"
severity="info"
class="mr-2"
(onClick)="goBack()"
></p-button>

<p-button
data-test-goto-next-page
type="button"
[label]="'common.buttons.next' | translate"
(onClick)="goNext()"
></p-button>
<p-button [label]="'common.buttons.back' | translate" severity="info" class="mr-2" (onClick)="goBack()"></p-button>

<p-button data-test-goto-next-page [label]="'common.buttons.next' | translate" (onClick)="goNext()"></p-button>
</div>
</section>
Loading
Loading