Skip to content

Commit 1c38bae

Browse files
committed
fix: use summaryTitle when available for summary2 components
1 parent 9cd9bdd commit 1c38bae

File tree

24 files changed

+29
-26
lines changed

24 files changed

+29
-26
lines changed

src/layout/Checkboxes/CheckboxesSummary.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ export function CheckboxesSummary({ targetBaseComponentId }: Summary2Props) {
2121
summaryOverride?.displayType === 'list' ||
2222
(!summaryOverride?.displayType && displayData?.length >= maxStringLength);
2323
const item = useItemWhenType(targetBaseComponentId, 'Checkboxes');
24-
const title = item.textResourceBindings?.title;
24+
const title = item.textResourceBindings?.summaryTitle || item.textResourceBindings?.title;
2525
const required = item.required;
2626
const displayValues = useMultipleValuesForSummary(targetBaseComponentId);
2727

src/layout/Date/DateSummary.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export const DateSummary = ({ targetBaseComponentId }: Summary2Props) => {
1717
const validations = useUnifiedValidationsForNode(targetBaseComponentId);
1818
const errors = validationsOfSeverity(validations, 'error');
1919
const { textResourceBindings, direction } = useItemWhenType(targetBaseComponentId, 'Date');
20-
const title = textResourceBindings?.title;
20+
const title = textResourceBindings?.summaryTitle || textResourceBindings?.title;
2121

2222
const compact = (direction === 'horizontal' && isCompact == undefined) || isCompact;
2323

src/layout/Datepicker/DatepickerSummary.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export const DatepickerSummary = ({ targetBaseComponentId }: Summary2Props) => {
1717
const validations = useUnifiedValidationsForNode(targetBaseComponentId);
1818
const errors = validationsOfSeverity(validations, 'error');
1919
const item = useItemWhenType(targetBaseComponentId, 'Datepicker');
20-
const title = item.textResourceBindings?.title;
20+
const title = item.textResourceBindings?.summaryTitle || item.textResourceBindings?.title;
2121

2222
return (
2323
<SummaryFlex

src/layout/Dropdown/DropdownSummary.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export const DropdownSummary = ({ targetBaseComponentId }: Summary2Props) => {
1717
const validations = useUnifiedValidationsForNode(targetBaseComponentId);
1818
const errors = validationsOfSeverity(validations, 'error');
1919
const item = useItemWhenType(targetBaseComponentId, 'Dropdown');
20-
const title = item.textResourceBindings?.title;
20+
const title = item.textResourceBindings?.summaryTitle || item.textResourceBindings?.title;
2121

2222
return (
2323
<SummaryFlex

src/layout/Grid/GridSummary.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ import type { Summary2Props } from 'src/layout/Summary2/SummaryComponent2/types'
5454
export const GridSummary = ({ targetBaseComponentId }: Summary2Props) => {
5555
const indexedId = useIndexedId(targetBaseComponentId);
5656
const { rows, textResourceBindings } = useItemWhenType(targetBaseComponentId, 'Grid');
57-
const { title } = textResourceBindings ?? {};
57+
const title = textResourceBindings?.summaryTitle || textResourceBindings?.title;
5858

5959
const columnSettings: ITableColumnFormatting = {};
6060
const isMobile = useIsMobile();

src/layout/Group/GroupSummary.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ function ChildComponent({ id, hierarchyLevel }: ChildComponentProps) {
5858

5959
export const GroupSummary = ({ targetBaseComponentId, hierarchyLevel = 0 }: GroupComponentSummaryProps) => {
6060
const item = useItemWhenType(targetBaseComponentId, 'Group');
61-
const title = item.textResourceBindings?.title;
61+
const title = item.textResourceBindings?.summaryTitle || item.textResourceBindings?.title;
6262
const summaryTitle = item.textResourceBindings?.summaryTitle;
6363
const headingLevel = getHeadingLevel(hierarchyLevel);
6464
const isNestedGroup = hierarchyLevel > 0;

src/layout/ImageUpload/ImageUploadSummary2/ImageUploadSummary2.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ export function ImageUploadSummary2({ targetBaseComponentId }: Summary2Props) {
1616
const isCompact = useSummaryProp('isCompact');
1717
const { storedImage } = useImageFile(targetBaseComponentId);
1818
const isEmpty = attachment.length === 0;
19-
const title = textResourceBindings?.title;
19+
const title = textResourceBindings?.summaryTitle || textResourceBindings?.title;
2020
const emptyValueText = required ? SummaryContains.EmptyValueRequired : SummaryContains.EmptyValueNotRequired;
2121
const contentLogic = isEmpty ? emptyValueText : SummaryContains.SomeUserContent;
2222
const imageElement = storedImage ? <ImageToDisplay targetBaseComponentId={targetBaseComponentId} /> : undefined;

src/layout/Input/InputSummary.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export const InputSummary = ({ targetBaseComponentId }: Summary2Props) => {
1717
const validations = useUnifiedValidationsForNode(targetBaseComponentId);
1818
const errors = validationsOfSeverity(validations, 'error');
1919
const item = useItemWhenType(targetBaseComponentId, 'Input');
20-
const title = item.textResourceBindings?.title;
20+
const title = item.textResourceBindings?.summaryTitle || item.textResourceBindings?.title;
2121

2222
return (
2323
<SummaryFlex

src/layout/Likert/LikertComponent.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ export const LikertComponent = ({ baseComponentId }: PropsFromGenericComponent<'
2929
const { options: calculatedOptions, isFetching } = useOptionsFor(makeLikertChildId(baseComponentId), 'single');
3030

3131
const indexedId = useIndexedId(baseComponentId);
32-
const title = textResourceBindings?.title;
32+
const title = textResourceBindings?.summaryTitle || textResourceBindings?.title;
3333
const description = textResourceBindings?.description;
3434

3535
if (mobileView) {

src/layout/Likert/Summary2/LikertSummary.tsx

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ export function LikertSummary({ targetBaseComponentId }: Summary2Props) {
3434
const validations = useUnifiedValidationsForNode(targetBaseComponentId);
3535
const errors = validationsOfSeverity(validations, 'error');
3636
const hideEmptyFields = useSummaryProp('hideEmptyFields');
37+
const title = textResourceBindings?.summaryTitle || textResourceBindings?.title;
3738

3839
if (!rows.length || rows.length <= 0) {
3940
return (
@@ -42,7 +43,7 @@ export function LikertSummary({ targetBaseComponentId }: Summary2Props) {
4243
content={required ? SummaryContains.EmptyValueRequired : SummaryContains.EmptyValueNotRequired}
4344
>
4445
<SingleValueSummary
45-
title={<Lang id={textResourceBindings?.title} />}
46+
title={<Lang id={title} />}
4647
targetBaseComponentId={targetBaseComponentId}
4748
errors={errors}
4849
hideEditButton={readOnly}
@@ -65,7 +66,7 @@ export function LikertSummary({ targetBaseComponentId }: Summary2Props) {
6566
data-size='xs'
6667
level={4}
6768
>
68-
<Lang id={textResourceBindings?.title} />
69+
<Lang id={title} />
6970
</Heading>
7071
</div>
7172
{rows.filter(typedBoolean).map((row) => (
@@ -108,6 +109,7 @@ function LikertRowSummary({ rowBaseId, emptyFieldText, readOnly, isCompact }: Li
108109
const displayData = useDisplayData(rowBaseId);
109110
const validations = useUnifiedValidationsForNode(rowBaseId);
110111
const errors = validationsOfSeverity(validations, 'error');
112+
const title = textResourceBindings?.summaryTitle || textResourceBindings?.title;
111113

112114
useReportSummaryRender(
113115
displayData.trim() === ''
@@ -119,7 +121,7 @@ function LikertRowSummary({ rowBaseId, emptyFieldText, readOnly, isCompact }: Li
119121

120122
return (
121123
<SingleValueSummary
122-
title={<Lang id={textResourceBindings?.title} />}
124+
title={<Lang id={title} />}
123125
isCompact={isCompact}
124126
targetBaseComponentId={rowBaseId}
125127
displayData={displayData}

0 commit comments

Comments
 (0)