fix: try Finnish resource name if the desired language is not available

City-of-Helsinki · Mar 11, 2024 · 3cfaf7e · 3cfaf7e
1 parent 4157bd1
commit 3cfaf7e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/src/components/resource-title/ResourceTitle.tsx b/src/components/resource-title/ResourceTitle.tsx
@@ -25,6 +25,7 @@ const ResourceTitle = ({
   const title = useRef<HTMLHeadingElement>(null);
   const name =
     resource?.name[language] ||
+    resource?.name?.fi ||
     displayLangVersionNotFound({
       language,
       label: `${

diff --git a/src/pages/ResourceBatchUpdatePage.tsx b/src/pages/ResourceBatchUpdatePage.tsx
@@ -274,12 +274,12 @@ const ResourceBatchUpdatePage = ({
             .filter((r) => r.resource)
             .map((r) => ({
               id: r.id,
-              name: r?.resource?.name[language],
+              name: r?.resource?.name[language] || r?.resource?.name?.fi,
             }));
 
           const newData = {
             mainResourceId: resource.id,
-            mainResourceName: resource?.name[language],
+            mainResourceName: resource?.name[language] || resource?.name.fi,
             targetResources,
           };
 

diff --git a/src/pages/ResourcePage.tsx b/src/pages/ResourcePage.tsx
@@ -97,7 +97,7 @@ const ResourcePage = ({
         const targetResourceIDs = targetResourcesString.split(',');
         const newData = {
           mainResourceId: resource.id,
-          mainResourceName: resource?.name[language],
+          mainResourceName: resource?.name[language] || resource?.name?.fi,
           targetResources: targetResourceIDs.map((id) => ({
             id,
             name: '',
@@ -244,6 +244,7 @@ const ResourcePage = ({
                 href={`/resource/${parentResource.id}`}
                 text={
                   parentResource?.name[language] ||
+                  parentResource?.name?.fi ||
                   displayLangVersionNotFound({
                     language,
                     label: 'toimipisteen nimi',
@@ -279,6 +280,7 @@ const ResourcePage = ({
                 language={language}
                 heading={
                   childResource?.name[language] ||
+                  childResource?.name?.fi ||
                   displayLangVersionNotFound({
                     language,
                     label: 'alakohteen nimi',