Fix PR comments

Altinn · Aug 15, 2024 · 45a311c · 45a311c
1 parent 263a6e3
commit 45a311c
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/frontend/language/src/nb.json b/frontend/language/src/nb.json
@@ -1798,6 +1798,8 @@
   "ux_editor.properties_panel.images.cancel_image_upload": "Avbryt opplastning",
   "ux_editor.properties_panel.images.choose_from_library": "Velg fra biblioteket",
   "ux_editor.properties_panel.images.choose_from_library_modal_title": "Velg bilde fra applikasjonens bildebibliotk",
+  "ux_editor.properties_panel.images.conflicting_image_source_when_entering_url": "Du har allerede lastet opp et bilde. Skriver du inn en url, vil bildereferansen din bli slettet.",
+  "ux_editor.properties_panel.images.conflicting_image_source_when_uploading_image": "Du har allerede referert til en ekstern url. Laster du opp et bilde, vil den eksterne referansen bli slettet.",
   "ux_editor.properties_panel.images.delete_image_options_modal_button_only_ref": "Slett kun bildereferanse",
   "ux_editor.properties_panel.images.delete_image_options_modal_button_ref_and_from_library": "Slett bilde",
   "ux_editor.properties_panel.images.delete_image_options_modal_content_only_ref": "Sletter du kun bildereferansen vil bildet fortsatt eksistere i biblioteket.",
@@ -1822,6 +1824,8 @@
   "ux_editor.properties_panel.options.use_code_list_label": "Bruk kodeliste",
   "ux_editor.properties_panel.texts.loading": "Laster inn tekster",
   "ux_editor.properties_panel.texts.no_properties": "Det er ingen tekster å konfigurere for denne komponenten.",
+  "ux_editor.properties_panel.texts.sub_title_images": "Valg for bilde",
+  "ux_editor.properties_panel.texts.sub_title_texts": "Tekster",
   "ux_editor.radios_error_DuplicateValues": "Alle verdier må være unike.",
   "ux_editor.radios_error_NoOptions": "Det må være minst én radioknapp.",
   "ux_editor.radios_option": "Radioknapp {{optionNumber}}",

diff --git a/frontend/packages/ux-editor/src/components/Properties/Text.tsx b/frontend/packages/ux-editor/src/components/Properties/Text.tsx
@@ -35,8 +35,8 @@ export const Text = () => {
 
   return (
     <>
-      <Heading size='2xs' className={classes.heading}>
-        {'Tekster'}
+      <Heading level={2} size='2xs' className={classes.heading}>
+        {t('ux_editor.properties_panel.texts.sub_title_texts')}
       </Heading>
       {schema.properties.textResourceBindings?.properties && (
         <EditTextResourceBindings
@@ -72,8 +72,8 @@ export const Text = () => {
       )}
       {form.type === 'Image' && (
         <>
-          <Heading size='2xs' className={classes.heading}>
-            {'Valg for bilde'}
+          <Heading level={2} size='2xs' className={classes.heading}>
+            {t('ux_editor.properties_panel.texts.sub_title_images')}
           </Heading>
           <EditImage
             component={form}

diff --git a/...ts/config/editModal/EditImage/ConflictingImageSourceAlert/ConflictingImageSourceAlert.tsx b/...ts/config/editModal/EditImage/ConflictingImageSourceAlert/ConflictingImageSourceAlert.tsx
@@ -1,6 +1,7 @@
 import React from 'react';
 import classes from './ConflictingImageSourceAlert.module.css';
 import { Alert } from '@digdir/designsystemet-react';
+import { useTranslation } from 'react-i18next';
 
 interface ConflictingImageSourceAlertProps {
   showAlert: boolean;
@@ -11,12 +12,14 @@ export const ConflictingImageSourceAlert = ({
   showAlert,
   conflictSource,
 }: ConflictingImageSourceAlertProps) => {
+  const { t } = useTranslation();
+
   return (
     showAlert && (
       <Alert size='small' className={classes.alert}>
         {conflictSource === 'external'
-          ? 'Du har allerede lastet opp et bilde. Skriver du inn en url, vil bildereferansen din bli slettet.'
-          : 'Du har allerede referert til en ekstern url. Laster du opp et bilde, vil den eksterne referansen bli slettet.'}
+          ? t('ux_editor.properties_panel.images.conflicting_image_source_when_entering_url')
+          : t('ux_editor.properties_panel.images.conflicting_image_source_when_uploading_image')}
       </Alert>
     )
   );

diff --git a/frontend/packages/ux-editor/src/components/config/editModal/EditImage/EditImage.tsx b/frontend/packages/ux-editor/src/components/config/editModal/EditImage/EditImage.tsx
@@ -29,7 +29,7 @@ export const EditImage = ({ component, handleComponentChange }: EditImageProps)
   const { mutate: deleteImageFromLibrary } = useDeleteImageMutation(org, app);
 
   const fileName = extractFileNameFromImageSrc(component.image?.src?.nb, org, app);
-  const imageOriginsFromLibrary = !imageFileNamesArePending && imageFileNames.includes(fileName);
+  const imageOriginsFromLibrary = !imageFileNamesArePending && imageFileNames?.includes(fileName);
 
   const handleImageChange = async (imageSource: string, fromUrl: boolean = false) => {
     const updatedComponent = updateComponentWithImage(