Skip to content

Commit 30cbc71

Browse files
authored
fix: move search from header as link to menu (#3798)
1 parent 9f936e8 commit 30cbc71

File tree

9 files changed

+36
-12
lines changed

9 files changed

+36
-12
lines changed

packages/frontend/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"i18n:sort": "tsx ./src/i18n/check.ts --sort"
2323
},
2424
"dependencies": {
25-
"@altinn/altinn-components": "0.56.20",
25+
"@altinn/altinn-components": "0.56.23",
2626
"@microsoft/applicationinsights-react-js": "19.3.7",
2727
"@microsoft/applicationinsights-web": "3.3.9",
2828
"@navikt/aksel-icons": "^7.37.0",

packages/frontend/src/components/PageLayout/GlobalMenu/inboxMenu.tsx

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import {
99
InboxFillIcon,
1010
InformationSquareIcon,
1111
LeaveIcon,
12+
MagnifyingGlassIcon,
1213
MenuGridIcon,
1314
PadlockLockedFillIcon,
1415
PersonCircleIcon,
@@ -19,6 +20,7 @@ import {
1920
createMessageBoxLink,
2021
getAboutNewAltinnLink,
2122
getAccessAMUILink,
23+
getFrontPageLink,
2224
getNeedHelpLink,
2325
getNewFormLink,
2426
getStartNewBusinessLink,
@@ -259,6 +261,17 @@ export function buildInboxMenu({
259261
}),
260262
selected: false,
261263
},
264+
{
265+
id: 'altinn-search',
266+
groupId: 'global',
267+
size: 'lg',
268+
icon: MagnifyingGlassIcon,
269+
title: t('global_menu.altinn_search'),
270+
as: createMenuItemComponent({
271+
to: `${getFrontPageLink(currentPartyUuid)}/sok?`,
272+
}),
273+
selected: false,
274+
},
262275
...helpItems,
263276
{
264277
groupId: 'profile-shortcut',

packages/frontend/src/components/PageLayout/GlobalMenu/profileMenu.tsx

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,15 @@ import {
88
HeartIcon,
99
InboxFillIcon,
1010
InformationSquareIcon,
11+
MagnifyingGlassIcon,
1112
MenuGridIcon,
1213
PadlockLockedFillIcon,
1314
PersonCircleIcon,
1415
} from '@navikt/aksel-icons';
1516
import {
1617
getAboutNewAltinnLink,
1718
getAccessAMUILink,
19+
getFrontPageLink,
1820
getNeedHelpLink,
1921
getNewFormLink,
2022
getStartNewBusinessLink,
@@ -209,6 +211,17 @@ export function buildProfileMenu({
209211
}),
210212
selected: false,
211213
},
214+
{
215+
id: 'altinn-search',
216+
groupId: 'global',
217+
size: 'lg',
218+
icon: MagnifyingGlassIcon,
219+
title: t('global_menu.altinn_search'),
220+
as: createMenuItemComponent({
221+
to: `${getFrontPageLink(currentPartyUuid)}/sok?`,
222+
}),
223+
selected: false,
224+
},
212225
];
213226

214227
const profileMenuItem: MenuItemProps = {

packages/frontend/src/components/PageLayout/PageLayout.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,7 @@ export const PageLayout: React.FC = () => {
175175
header: headerProps,
176176
footer,
177177
sidebar: {
178+
sticky: true,
178179
menu: sidebarMenu,
179180
hidden: isErrorState,
180181
footer: <Badge label={t('word.beta')} variant="base" color="neutral" size="sm" />,

packages/frontend/src/components/PageLayout/useHeaderConfig.tsx

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -200,12 +200,6 @@ export const useHeaderConfig = (filterState?: FilterState): UseHeaderConfigOutpu
200200
},
201201
},
202202
},
203-
globalSearch: {
204-
onSearch: (value: string) => {
205-
const encodedValue = encodeURIComponent(value);
206-
window.location.href = `${getFrontPageLink(currentPartyUuid)}/sok?q=${encodedValue}`;
207-
},
208-
},
209203
desktopMenu,
210204
accountSelector,
211205
};

packages/frontend/src/i18n/resources/en.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,7 @@
178178
"footer.nav.service_announcements": "Service announcements",
179179
"footer.nav.privacy_policy": "Privacy",
180180
"global_menu.about_altinn": "About new Altinn",
181+
"global_menu.altinn_search": "Search in Altinn",
181182
"global_menu.all_forms_services": "All forms and services",
182183
"global_menu.need_help": "Do you need help?",
183184
"global_menu.start_business": "Start and run a business",

packages/frontend/src/i18n/resources/nb.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,7 @@
179179
"footer.nav.privacy_policy": "Personvern",
180180
"global_menu.about_altinn": "Om nye Altinn",
181181
"global_menu.all_forms_services": "Alle skjema og tjenester",
182+
"global_menu.altinn_search": "Søk i Altinn",
182183
"global_menu.need_help": "Trenger du hjelp?",
183184
"global_menu.start_business": "Starte og drive bedrift",
184185
"inbox.filter.multiple.sender": "{count, plural, =0 {Velg tjenesteeier} one {# tjenesteeier} other {# tjenesteeiere}}",

packages/frontend/src/i18n/resources/nn.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,7 @@
179179
"footer.nav.privacy_policy": "Personvern",
180180
"global_menu.about_altinn": "Om nye Altinn",
181181
"global_menu.all_forms_services": "Alle skjema og tenester",
182+
"global_menu.altinn_search": "Søk i Altinn",
182183
"global_menu.need_help": "Treng du hjelp?",
183184
"global_menu.start_business": "Starte og drive bedrift",
184185
"inbox.filter.multiple.sender": "{count, plural, =0 {Vel tenesteeigar} one {# tenesteeigar} other {# tenesteeigarar}}",

pnpm-lock.yaml

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)