Merge pull request #1210 from navikt/bugfix/translate-accordion

Add translation to accordion component
navikt · Jun 12, 2024 · 4acdb79 · 4acdb79
2 parents 06749a2 + 7336c62
commit 4acdb79
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 3 deletions.
diff --git a/packages/bygger/src/translations/utils.ts b/packages/bygger/src/translations/utils.ts
@@ -7,6 +7,8 @@ import {
 } from '@navikt/skjemadigitalisering-shared-components';
 
 import {
+  AccordionSettingValue,
+  AccordionSettingValues,
   AttachmentSettingValue,
   AttachmentSettingValues,
   Component,
@@ -133,6 +135,7 @@ const getTranslatablePropertiesFromForm = (form: NavFormType) =>
         addAnother,
         removeAnother,
         attachmentValues,
+        accordionValues,
       }) => ({
         title,
         label: getLabel(label, type, !!hideLabel),
@@ -150,6 +153,7 @@ const getTranslatablePropertiesFromForm = (form: NavFormType) =>
         addAnother: getTextFromComponentProperty(addAnother),
         removeAnother: getTextFromComponentProperty(removeAnother),
         attachmentValues: getAttachmentTexts(attachmentValues),
+        accordionValues: getAccordionTexts(accordionValues),
       }),
     );
 
@@ -164,6 +168,16 @@ const textObject = (withInputType: boolean, value: string): TextObjectType => {
   };
 };
 
+const getAccordionTexts = (accordionValues?: AccordionSettingValues): undefined | string[] => {
+  if (!accordionValues) {
+    return undefined;
+  }
+
+  return accordionValues.flatMap((value: AccordionSettingValue) => {
+    return [value.title, value.content];
+  });
+};
+
 const getAttachmentTexts = (attachmentValues?: AttachmentSettingValues): undefined | string[] => {
   if (!attachmentValues) {
     return undefined;
@@ -193,7 +207,7 @@ const getFormTexts = (form?: NavFormType, withInputType = false): TextObjectType
       Object.keys(component)
         .filter((key) => component[key] !== undefined && key !== 'attachmentValues')
         .flatMap((key) => {
-          if (key === 'values' || key === 'data') {
+          if (key === 'values' || key === 'data' || key === 'accordionValues') {
             return component[key]
               .filter((value) => value !== '')
               .map((value) => textObject(withInputType, value)) as TextObjectType;

diff --git a/packages/shared-components/src/formio/components/core/accordion/Accordion.tsx b/packages/shared-components/src/formio/components/core/accordion/Accordion.tsx
@@ -10,6 +10,7 @@ class Accordion extends BaseComponent {
       label: 'Trekkspill',
       type: 'accordion',
       key: 'accordion',
+      hideLabel: true,
     });
   }
 
@@ -34,9 +35,9 @@ class Accordion extends BaseComponent {
       <NavAccordion id={this.getId()} ref={(ref) => this.setReactInstance(ref)} headingSize={this.getTitleSize()}>
         {this.getAccordionValues()?.map((item, index) => (
           <NavAccordion.Item key={index} defaultOpen={item.defaultOpen}>
-            <NavAccordion.Header>{item.title}</NavAccordion.Header>
+            <NavAccordion.Header>{this.translate(item.title)}</NavAccordion.Header>
             <NavAccordion.Content>
-              <InnerHtml content={item.content} />
+              <InnerHtml content={this.translate(item.content)} />
             </NavAccordion.Content>
           </NavAccordion.Item>
         ))}

diff --git a/packages/shared-domain/src/index.ts b/packages/shared-domain/src/index.ts
@@ -1,3 +1,4 @@
+import { AccordionSettingValue, AccordionSettingValues } from './accordion';
 import attachmentUtils, {
   AttachmentSettingValue,
   AttachmentSettingValues,
@@ -125,6 +126,8 @@ export {
   validatorUtils,
 };
 export type {
+  AccordionSettingValue,
+  AccordionSettingValues,
   AktivitetPeriode,
   AktivitetVedtaksinformasjon,
   AttachmentSettingValue,