fix dynamic TRB for summary2

Altinn · Oct 23, 2024 · 30f258b · 30f258b
1 parent aa0fc23
commit 30f258b
Show file tree

Hide file tree

Showing 17 changed files with 146 additions and 25 deletions.
diff --git a/src/layout/Address/AddressSummary/AddressSummary.tsx b/src/layout/Address/AddressSummary/AddressSummary.tsx
@@ -29,7 +29,12 @@ export function AddressSummary({ componentNode }: AddressSummaryProps) {
  <div className={classes.addressSummaryComponent}>
  <div>
  <SingleValueSummary
- title={<Lang id={title || 'address_component.address'} />}
+ title={
+ <Lang
+ id={title || 'address_component.address'}
+ node={componentNode}
+ />
+ }
  displayData={address}
  componentNode={componentNode}
  />
@@ -42,7 +47,12 @@ export function AddressSummary({ componentNode }: AddressSummaryProps) {
  {!simplified && (
  <div>
  <SingleValueSummary
- title={<Lang id={careOfTitle || 'address_component.care_of'} />}
+ title={
+ <Lang
+ id={careOfTitle || 'address_component.care_of'}
+ node={componentNode}
+ />
+ }
  displayData={careOf}
  componentNode={componentNode}
  hideEditButton={true}
@@ -57,7 +67,12 @@ export function AddressSummary({ componentNode }: AddressSummaryProps) {
  <div className={classes.addressSummaryComponentZipCode}>
  <div className={classes.addressComponentZipCode}>
  <SingleValueSummary
- title={<Lang id={zipCodeTitle || 'address_component.zip_code'} />}
+ title={
+ <Lang
+ id={zipCodeTitle || 'address_component.zip_code'}
+ node={componentNode}
+ />
+ }
  displayData={zipCode}
  componentNode={componentNode}
  hideEditButton={true}
@@ -70,7 +85,12 @@ export function AddressSummary({ componentNode }: AddressSummaryProps) {
 
  <div className={classes.addressSummaryComponentPostplace}>
  <SingleValueSummary
- title={<Lang id={postPlaceTitle || 'address_component.post_place'} />}
+ title={
+ <Lang
+ id={postPlaceTitle || 'address_component.post_place'}
+ node={componentNode}
+ />
+ }
  displayData={postPlace}
  componentNode={componentNode}
  hideEditButton={true}
@@ -83,7 +103,12 @@ export function AddressSummary({ componentNode }: AddressSummaryProps) {
  {!simplified && (
  <div>
  <SingleValueSummary
- title={<Lang id={houseNumberTitle || 'address_component.house_number'} />}
+ title={
+ <Lang
+ id={houseNumberTitle || 'address_component.house_number'}
+ node={componentNode}
+ />
+ }
  displayData={houseNumber}
  componentNode={componentNode}
  hideEditButton={true}

diff --git a/src/layout/Checkboxes/CheckboxesSummary.tsx b/src/layout/Checkboxes/CheckboxesSummary.tsx
@@ -26,7 +26,12 @@ export function CheckboxesSummary({
 
  return (
  <MultipleValueSummary
- title={<Lang id={title} />}
+ title={
+ <Lang
+ id={title}
+ node={componentNode}
+ />
+ }
  componentNode={componentNode}
  isCompact={isCompact}
  showAsList={showAsList}

diff --git a/src/layout/Datepicker/DatepickerSummary.tsx b/src/layout/Datepicker/DatepickerSummary.tsx
@@ -21,7 +21,14 @@ export const DatepickerSummary = ({ componentNode, isCompact, emptyFieldText }:
 
  return (
  <SingleValueSummary
- title={title && <Lang id={title} />}
+ title={
+ title && (
+ <Lang
+ id={title}
+ node={componentNode}
+ />
+ )
+ }
  displayData={displayData}
  errors={errors}
  componentNode={componentNode}

diff --git a/src/layout/Dropdown/DropdownSummary.tsx b/src/layout/Dropdown/DropdownSummary.tsx
@@ -21,7 +21,14 @@ export const DropdownSummary = ({ componentNode, isCompact, emptyFieldText }: Dr
 
  return (
  <SingleValueSummary
- title={title && <Lang id={title} />}
+ title={
+ title && (
+ <Lang
+ id={title}
+ node={componentNode}
+ />
+ )
+ }
  displayData={displayData}
  errors={errors}
  componentNode={componentNode}

diff --git a/src/layout/Grid/GridSummary.tsx b/src/layout/Grid/GridSummary.tsx
@@ -115,7 +115,10 @@ export const GridSummary = ({ componentNode }: GridSummaryProps) => {
  size='xs'
  level={4}
  >
- <Lang id={title} />
+ <Lang
+ id={title}
+ node={componentNode}
+ />
  </Heading>
  </caption>
  )}

diff --git a/src/layout/Group/GroupSummary.tsx b/src/layout/Group/GroupSummary.tsx
@@ -80,7 +80,10 @@ export const GroupSummary = ({ componentNode, hierarchyLevel = 0, summaryOverrid
  size={isNestedGroup ? 'xsmall' : 'small'}
  level={headingLevel}
  >
- <Lang id={summaryTitle ?? title} />
+ <Lang
+ id={summaryTitle ?? title}
+ node={componentNode}
+ />
  </Heading>
  <Grid
  container

diff --git a/src/layout/Header/HeaderComponent.tsx b/src/layout/Header/HeaderComponent.tsx
@@ -59,13 +59,21 @@ export const HeaderComponent = ({ node }: IHeaderProps) => {
  id={id}
  {...getHeaderProps(size)}
  >
- <Lang id={textResourceBindings?.title} />
+ <Lang
+ id={textResourceBindings?.title}
+ node={node}
+ />
  </Heading>
  </Grid>
  {textResourceBindings?.help && (
  <Grid item={true}>
  <HelpTextContainer
- helpText={<Lang id={textResourceBindings.help} />}
+ helpText={
+ <Lang
+ id={textResourceBindings.help}
+ node={node}
+ />
+ }
  title={langAsString(textResourceBindings?.title)}
  />
  </Grid>

diff --git a/src/layout/Input/InputSummary.tsx b/src/layout/Input/InputSummary.tsx
@@ -21,7 +21,14 @@ export const InputSummary = ({ componentNode, isCompact, emptyFieldText }: Input
 
  return (
  <SingleValueSummary
- title={title && <Lang id={title} />}
+ title={
+ title && (
+ <Lang
+ id={title}
+ node={componentNode}
+ />
+ )
+ }
  displayData={displayData}
  errors={errors}
  componentNode={componentNode}

diff --git a/src/layout/Likert/Summary2/LikertSummary.tsx b/src/layout/Likert/Summary2/LikertSummary.tsx
@@ -29,7 +29,12 @@ export function LikertSummary({ componentNode, emptyFieldText, isCompact }: Like
  if (!rows.length || rows.length <= 0) {
  return (
  <SingleValueSummary
- title={title}
+ title={
+ <Lang
+ id={title}
+ node={componentNode}
+ />
+ }
  componentNode={componentNode}
  errors={errors}
  hideEditButton={readOnly}
@@ -46,7 +51,10 @@ export function LikertSummary({ componentNode, emptyFieldText, isCompact }: Like
  size='xs'
  level={4}
  >
- <Lang id={title} />
+ <Lang
+ id={title}
+ node={componentNode}
+ />
  </Heading>
  </div>
  {rows.map((row) => (

diff --git a/src/layout/List/ListSummary.tsx b/src/layout/List/ListSummary.tsx
@@ -21,7 +21,14 @@ export const ListSummary = ({ componentNode, isCompact, emptyFieldText }: ListCo
 
  return (
  <SingleValueSummary
- title={title && <Lang id={title} />}
+ title={
+ title && (
+ <Lang
+ id={title}
+ node={componentNode}
+ />
+ )
+ }
  displayData={displayData}
  errors={errors}
  componentNode={componentNode}

diff --git a/src/layout/Map/Summary2/MapSummary.tsx b/src/layout/Map/Summary2/MapSummary.tsx
@@ -37,7 +37,12 @@ export function MapSummary({ componentNode, emptyFieldText, isCompact }: MapSumm
  if (markerBinding && !markerLocationIsValid) {
  return (
  <SingleValueSummary
- title={title}
+ title={
+ <Lang
+ id={title}
+ node={componentNode}
+ />
+ }
  componentNode={componentNode}
  errors={errors}
  hideEditButton={readOnly}

diff --git a/src/layout/MultipleSelect/MultipleSelectSummary.tsx b/src/layout/MultipleSelect/MultipleSelectSummary.tsx
@@ -28,7 +28,12 @@ export function MultipleSelectSummary({
 
  return (
  <MultipleValueSummary
- title={<Lang id={title} />}
+ title={
+ <Lang
+ id={title}
+ node={componentNode}
+ />
+ }
  componentNode={componentNode}
  showAsList={showAsList}
  isCompact={isCompact}

diff --git a/src/layout/Paragraph/ParagraphComponent.tsx b/src/layout/Paragraph/ParagraphComponent.tsx
@@ -31,16 +31,27 @@ export function ParagraphComponent({ node }: IParagraphProps) {
  <Paragraph asChild={!hasInlineContent}>
  {!hasInlineContent ? (
  <div>
- <Lang id={textResourceBindings?.title} />
+ <Lang
+ id={textResourceBindings?.title}
+ node={node}
+ />
  </div>
  ) : (
- <Lang id={textResourceBindings?.title} />
+ <Lang
+ id={textResourceBindings?.title}
+ node={node}
+ />
  )}
  </Paragraph>
  </div>
  {textResourceBindings?.help && (
  <HelpTextContainer
- helpText={<Lang id={textResourceBindings?.help} />}
+ helpText={
+ <Lang
+ id={textResourceBindings?.help}
+ node={node}
+ />
+ }
  title={elementAsString(text)}
  />
  )}

diff --git a/src/layout/RadioButtons/RadioButtonsSummary.tsx b/src/layout/RadioButtons/RadioButtonsSummary.tsx
@@ -20,7 +20,14 @@ export const RadioButtonsSummary = ({ componentNode, isCompact, emptyFieldText }
  const title = useNodeItem(componentNode, (i) => i.textResourceBindings?.title);
  return (
  <SingleValueSummary
- title={title && <Lang id={title} />}
+ title={
+ title && (
+ <Lang
+ id={title}
+ node={componentNode}
+ />
+ )
+ }
  displayData={displayData}
  errors={errors}
  componentNode={componentNode}

diff --git a/src/layout/RepeatingGroup/Summary2/RepeatingGroupSummary.tsx b/src/layout/RepeatingGroup/Summary2/RepeatingGroupSummary.tsx
@@ -53,7 +53,10 @@ export const RepeatingGroupSummary = ({
  size='xs'
  level={4}
  >
- <Lang id={title} />
+ <Lang
+ id={title}
+ node={componentNode}
+ />
  </Heading>
  <div className={cn(classes.contentWrapper, { [classes.nestedContentWrapper]: isNested })}>
  {rows.map((row, index) => (

diff --git a/src/layout/Tabs/TabsSummary.tsx b/src/layout/Tabs/TabsSummary.tsx
@@ -42,7 +42,10 @@ export const TabsSummary = ({ componentNode }: TabsSummaryProps) => {
  size='xs'
  level={4}
  >
- <Lang id={tab.title} />
+ <Lang
+ id={tab.title}
+ node={componentNode}
+ />
  </Heading>
  <Grid
  container

diff --git a/src/layout/TextArea/TextAreaSummary.tsx b/src/layout/TextArea/TextAreaSummary.tsx
@@ -21,7 +21,14 @@ export const TextAreaSummary = ({ componentNode, isCompact, emptyFieldText }: Te
 
  return (
  <SingleValueSummary
- title={title && <Lang id={title} />}
+ title={
+ title && (
+ <Lang
+ id={title}
+ node={componentNode}
+ />
+ )
+ }
  displayData={displayData}
  errors={errors}
  componentNode={componentNode}