Kodeforbedring og forenkling av typer etter PR-review

Author: terjeofnorway

src/components/_common/alert-in-context/AlertInContext.tsx

@@ -1,11 +1,11 @@
 import React from 'react';
-import { AlertInContextPageProps } from 'types/content-props/alerts';
+import { AlertData } from 'types/content-props/alerts';
 import { AlertBox } from '../alert-box/AlertBox';
 
 import style from './AlertInContext.module.scss';
 
 type Props = {
-    alert: AlertInContextPageProps;
+    alert: AlertData;
 };
 
 export const AlertInContext = ({ alert }: Props) => {
@@ -16,11 +16,7 @@ export const AlertInContext = ({ alert }: Props) => {
     const variant = alert.data.type === 'critical' ? 'warning' : 'info';
 
     return (
-        <AlertBox
-            className={style.alertInContext}
-            variant={variant}
-            key={alert._id}
-        >
+        <AlertBox className={style.alertInContext} variant={variant}>
             {alert.data.text}
         </AlertBox>
     );

src/components/_common/form-details/FormDetails.tsx

@@ -5,7 +5,6 @@ import { ParsedHtml } from '../parsed-html/ParsedHtml';
 import { FormDetailsData, Variation } from 'types/content-props/form-details';
 import { FormDetailsButton } from './FormDetailsButton';
 import { InfoBox } from '../info-box/InfoBox';
-import { AlertInContextPageProps } from 'types/content-props/alerts';
 import { AlertInContext } from '../alert-in-context/AlertInContext';
 
 import style from './FormDetails.module.scss';
@@ -120,8 +119,8 @@ export const FormDetails = ({
             )}
             {languageDisclaimer && <InfoBox>{languageDisclaimer}</InfoBox>}
             {alerts &&
-                alerts.map((alert) => (
-                    <AlertInContext key={alert._id} alert={alert} />
+                alerts.map((alert, index) => (
+                    <AlertInContext key={index} alert={alert} />
                 ))}
             {variations.length > 0 && (
                 <div className={style.variation}>

src/components/pages/alert-in-context-page/AlertInContextPage.tsx

@@ -1,13 +1,11 @@
 import React from 'react';
-import { ComponentMapper } from '../../ComponentMapper';
 
-import { AlertInContextPageProps } from 'types/content-props/alerts';
-import { ThemedPageHeader } from '../../_common/headers/themed-page-header/ThemedPageHeader';
+import { AlertInContext } from 'components/_common/alert-in-context/AlertInContext';
+import { AlertData } from 'types/content-props/alerts';
 
 import style from './AlertInContextPage.module.scss';
-import { AlertInContext } from 'components/_common/alert-in-context/AlertInContext';
 
-export const AlertInContextPage = (props: AlertInContextPageProps) => {
+export const AlertInContextPage = (props: AlertData) => {
     return (
         <div className={style.alertInContextPage}>
             <AlertInContext alert={props} />

src/types/content-props/alerts.ts

@@ -2,17 +2,14 @@ import { ContentCommonProps, ContentType } from './_content-common';
 import { OptionSetSingle } from 'types/util-types';
 
 export interface AlertData {
-    type: 'information' | 'critical';
-    text: string;
-    target: {
-        _selected: string;
-        formDetails: OptionSetSingle<{
-            targetContent: string;
-        }>;
+    data: {
+        type: 'information' | 'critical';
+        text: string;
+        target: {
+            _selected: string;
+            formDetails: OptionSetSingle<{
+                targetContent: string;
+            }>;
+        };
     };
 }
-
-export type AlertInContextPageProps = ContentCommonProps & {
-    type: ContentType.AlertInContext;
-    data: AlertData;
-} & Omit<ContentCommonProps, 'alerts'>; // Avoid circular reference

src/types/content-props/form-details.ts

@@ -2,7 +2,7 @@ import { OptionSetSingle } from 'types/util-types';
 import { ContentCommonProps, ContentType } from './_content-common';
 import { ProcessedHtmlProps } from 'types/processed-html-props';
 import { LinkSelectable } from 'types/component-props/_mixins';
-import { AlertInContextPageProps } from './alerts';
+import { AlertData } from './alerts';
 
 export type FormComplaintTypes = 'complaint' | 'appeal';
 
@@ -17,7 +17,7 @@ export interface FormDetailsData {
     title?: string;
     ingress?: ProcessedHtmlProps;
     languageDisclaimer?: string;
-    alerts: AlertInContextPageProps[];
+    alerts: AlertData[];
     formType: OptionSetSingle<{
         application: {
             variations: Variation[];