Skip to content

Commit 57edd41

Browse files
authored
2039 Refetch meta-data on language change (#1834)
* lang as cach-key package meta-data * refactor: simplify skip condition for package permission query
1 parent 811e755 commit 57edd41

4 files changed

Lines changed: 10 additions & 5 deletions

File tree

src/features/amUI/common/AccessPackageList/useAreaPackageList.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { useMemo } from 'react';
2+
import { useTranslation } from 'react-i18next';
23

34
import type { Permissions } from '@/dataObjects/dtos/accessPackage';
45
import {
@@ -43,14 +44,15 @@ export const useAreaPackageList = ({
4344
showAllAreas,
4445
showAllPackages,
4546
}: useAreaPackagesProps) => {
47+
const { i18n } = useTranslation();
4648
const { fromParty, toParty, actingParty } = usePartyRepresentation();
4749

4850
const {
4951
data: allPackageAreas,
5052
isLoading: loadingPackageAreas,
5153
isFetching: fetchingSearch,
5254
error: searchError,
53-
} = useSearchQuery(searchString ?? '');
55+
} = useSearchQuery({ searchString: searchString ?? '', language: i18n.language });
5456

5557
const {
5658
data: activeDelegations,

src/features/amUI/packagePoaDetailsPage/PackagePoaDetails.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import { FilesIcon, PersonGroupIcon } from '@navikt/aksel-icons';
1717

1818
export const PackagePoaDetails = () => {
1919
const { id } = useParams<{ id: string }>();
20-
const { t } = useTranslation();
20+
const { t, i18n } = useTranslation();
2121
const { fromParty } = usePartyRepresentation();
2222
const { canDelegatePackage } = useAccessPackageDelegationCheck();
2323

@@ -30,6 +30,7 @@ export const PackagePoaDetails = () => {
3030
{
3131
from: fromParty?.partyUuid ?? '',
3232
packageId: id || '',
33+
language: i18n.language,
3334
},
3435
{ skip: !id || !fromParty?.partyUuid },
3536
);

src/features/amUI/packagePoaDetailsPage/PackagePoaDetailsPage.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,14 @@ export const PackagePoaDetailsPage = () => {
5858

5959
const BreadcrumbsWrapper = () => {
6060
const { id } = useParams<{ id: string }>();
61+
const { i18n } = useTranslation();
6162
const { fromParty } = usePartyRepresentation();
6263

6364
const { data: accessPackage } = useGetPackagePermissionDetailsQuery(
6465
{
6566
from: fromParty?.partyUuid ?? '',
6667
packageId: id || '',
68+
language: i18n.language,
6769
},
6870
{ skip: !id || !fromParty?.partyUuid },
6971
);

src/rtk/features/accessPackageApi.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@ export const accessPackageApi = createApi({
7676
}),
7777
tagTypes: ['AccessPackages'],
7878
endpoints: (builder) => ({
79-
search: builder.query<AccessArea[], string>({
80-
query: (searchString) => {
79+
search: builder.query<AccessArea[], { searchString: string; language: string }>({
80+
query: ({ searchString }) => {
8181
return `search?&searchString=${searchString}`;
8282
},
8383
}),
@@ -93,7 +93,7 @@ export const accessPackageApi = createApi({
9393
}),
9494
getPackagePermissionDetails: builder.query<
9595
AccessPackage,
96-
{ from?: string; to?: string; party?: string; packageId: string }
96+
{ from?: string; to?: string; party?: string; packageId: string; language: string }
9797
>({
9898
query: ({ from, to, party = getCookie('AltinnPartyUuid'), packageId }) => {
9999
return `permission/${packageId}?from=${from ?? ''}&to=${to ?? ''}&party=${party}`;

0 commit comments

Comments
 (0)