Skip to content

Commit ae76208

Browse files
Merge pull request #1945 from navikt/alltid-vise-aktuell-maalgruppetekst
Viser 'For arbeidsgivere' eller 'For samarbeidspartnere'
2 parents f27bf8b + c1fd6d7 commit ae76208

File tree

1 file changed

+14
-9
lines changed

1 file changed

+14
-9
lines changed

src/components/_common/alternativeAudience/AlternativeAudience.tsx

+14-9
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,8 @@ export const AlternativeAudience = () => {
7373

7474
const getAudienceLabel = translator('audience', language);
7575
const getProviderAudienceLabel = translator('providerAudience', language);
76-
77-
if (!alternativeAudience) {
78-
return null;
79-
}
76+
const getStringPart = translator('stringParts', language);
77+
const getRelatedString = translator('related', language);
8078

8179
const getProviderTypes = (audience: AudienceOptions) => {
8280
if (audience._selected !== Audience.PROVIDER) {
@@ -85,7 +83,7 @@ export const AlternativeAudience = () => {
8583
return audience[audience._selected].provider_audience;
8684
};
8785

88-
const buildAudienceAffirmation = () => {
86+
const buildAudienceAffirmation = (addPeriod: boolean) => {
8987
const { audience: currentAudience } = data;
9088
const currentAudienceKey = getAudience(currentAudience);
9189

@@ -104,11 +102,18 @@ export const AlternativeAudience = () => {
104102
'for'
105103
).slice(1)}`;
106104

107-
return `${forString} ${providerTypesString || currentAudienceLabel}. `;
105+
return `${forString} ${providerTypesString || currentAudienceLabel}${addPeriod ? '.' : ''} `;
108106
};
109107

110-
const getStringPart = translator('stringParts', language);
111-
const getRelatedString = translator('related', language);
108+
if (!alternativeAudience) {
109+
return (
110+
<div className={style.alternativeAudience}>
111+
<BodyLong size="small" className={style.text}>
112+
{buildAudienceAffirmation(false)}
113+
</BodyLong>
114+
</div>
115+
);
116+
}
112117

113118
const productName =
114119
showProductName === false ? getStringPart('this') : displayName.toLowerCase();
@@ -117,7 +122,7 @@ export const AlternativeAudience = () => {
117122
return (
118123
<div className={style.alternativeAudience}>
119124
<BodyLong size="small" className={style.text}>
120-
{buildAudienceAffirmation()}
125+
{buildAudienceAffirmation(true)}
121126
{getRelatedString('relatedAudience').replace('{name}', productName)}{' '}
122127
{audienceLinks.map((link, index) => (
123128
<Fragment key={index}>

0 commit comments

Comments
 (0)