Skip to content

Commit ef4e9f2

Browse files
Merge pull request #2157 from navikt/defaulte-taxonomy-flere-steder
Implementerer bedre defauting og optional chaining
2 parents 768058e + ed27b88 commit ef4e9f2

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

src/components/_common/headers/sharedHeaderUtils.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ export const getContentTagline = (content: GetContentTaglineProps, currentLangua
2424
return (selectedAudience && situationTaglines(selectedAudience)) ?? '';
2525
}
2626

27-
if (taxonomy.length > 0 || customCategory) {
27+
if ((taxonomy && taxonomy.length > 0) || customCategory) {
2828
const taxonomyStrings = getTranslatedTaxonomies(taxonomy, language);
2929

3030
if (customCategory && taxonomyStrings.length === 0) {

src/components/_common/overview-filters/taxonomy-filter/OverviewTaxonomyFilter.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ export const OverviewTaxonomyFilter = ({ items }: Props) => {
5454
};
5555

5656
const taxonomiesPresent = orderedTaxonomies.filter((taxonomy) =>
57-
items.some((item) => item.taxonomy.some((itemTaxonomy) => itemTaxonomy === taxonomy))
57+
items.some((item) => item.taxonomy?.some((itemTaxonomy) => itemTaxonomy === taxonomy))
5858
);
5959

6060
const listHasGuidePage = items.some((product) => product.type === 'no.nav.navno:guide-page');

src/components/pages/office-page/office-details/officeInformation/OfficeInformation.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ export const OfficeInformation = ({ officeData }: OfficeInformationProps) => {
5454
<Heading level="3" size="small" spacing>
5555
{getOfficeTranslations('location')}
5656
</Heading>
57-
{beliggenhet.adresseTilleggsnavn && (
57+
{beliggenhet?.adresseTilleggsnavn && (
5858
<BodyShort>{beliggenhet.adresseTilleggsnavn}</BodyShort>
5959
)}
6060
<BodyShort>{visitingAddress}</BodyShort>

src/store/hooks/useOverviewFilters.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import type Fuse from 'fuse.js';
1616

1717
export type OverviewFilterableItem = {
1818
area: Area[];
19-
taxonomy: ProductTaxonomy[];
19+
taxonomy?: ProductTaxonomy[];
2020
type?: ContentType;
2121
};
2222

@@ -43,7 +43,7 @@ const _getFilteredList = async <ItemType extends OverviewFilterableItem>({
4343

4444
const isTaxonomyMatching = (item: ItemType) =>
4545
taxonomyFilter === ProductTaxonomy.ALL ||
46-
item.taxonomy.includes(taxonomyFilter) ||
46+
item.taxonomy?.includes(taxonomyFilter) ||
4747
(taxonomyFilter === ProductTaxonomy.OTHER && item.type === 'no.nav.navno:guide-page');
4848

4949
const itemsMatchingToggleFilters = filterableItems.filter(

0 commit comments

Comments
 (0)