-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #89 from FINTLabs/FKS-805-frontend-Filtrering-p-re…
…ssursmoduladmin-mot-bruker FKS-805-frontend-Filtrering-p-ressursmoduladmin-mot-bruker
- Loading branch information
Showing
13 changed files
with
192 additions
and
108 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
39 changes: 39 additions & 0 deletions
39
app/components/kontroll-admin/KontrollAccessRolesRadioGroup.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,39 @@ | ||
import {Radio, RadioGroup} from "@navikt/ds-react"; | ||
import React, {useEffect} from "react"; | ||
import {IRole} from "~/data/kontrollAdmin/types"; | ||
import {useNavigate, useParams} from "@remix-run/react"; | ||
|
||
interface AccessRolesRadioGroupProps { | ||
roles: IRole[] | ||
} | ||
|
||
export default function KontrollAccessRolesRadioGroup ({roles}: AccessRolesRadioGroupProps) { | ||
const params = useParams() | ||
|
||
const roleProp = params.id | ||
const navigate = useNavigate(); | ||
|
||
const handleChangeSelectedRole = (role: string) => { | ||
navigate(role) | ||
} | ||
|
||
useEffect(() => { | ||
!roleProp ? navigate(roles[0].accessRoleId) : "" | ||
}, []); | ||
|
||
return ( | ||
<div className={"radio-group-horizontal"}> | ||
<RadioGroup | ||
legend="Velg rolle" | ||
onChange={(val: string) => handleChangeSelectedRole(val)} | ||
value={roleProp ? roleProp : ""} | ||
> | ||
{roles.map((role, index) => | ||
<Radio key={role.accessRoleId + index} value={role.accessRoleId}> | ||
{role.name} | ||
</Radio>) | ||
} | ||
</RadioGroup> | ||
</div> | ||
) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
36 changes: 26 additions & 10 deletions
36
app/components/resource-module-admin/ResourceModuleRoleFilter.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,29 +1,45 @@ | ||
import {Radio, RadioGroup} from "@navikt/ds-react"; | ||
import {IResourceModuleAccessRole} from "~/data/resourceModuleAdmin/types"; | ||
import {IResourceModuleAccessRole, IResourceModuleUserRole} from "~/data/resourceModuleAdmin/types"; | ||
import {useSearchParams} from "@remix-run/react"; | ||
import {filterResetPageParam} from "~/components/common/CommonFunctions"; | ||
|
||
interface ResourceModuleRoleFilterProps { | ||
roles: IResourceModuleAccessRole[] | ||
roles: IResourceModuleAccessRole[] | IResourceModuleUserRole[] | ||
} | ||
|
||
const ResourceModuleRoleFilter = ({roles}: ResourceModuleRoleFilterProps) => { | ||
const [searchParams, setSearchParams] = useSearchParams(); | ||
const roleProp = searchParams.get("accessroleid") | ||
const pageParam = searchParams.get("page") | ||
|
||
const handleFilterRole = (value: string) => { | ||
setSearchParams((prev) => { | ||
prev.set("accessroleid", value) | ||
value ? prev.set("accessroleid", value) : prev.delete("accessroleid") | ||
return prev | ||
}) | ||
filterResetPageParam(pageParam, setSearchParams) | ||
} | ||
|
||
return ( | ||
<RadioGroup legend={"Filtrer på brukerns nåværende rolle"} onChange={handleFilterRole} value={roleProp ? roleProp : ""}> | ||
{ | ||
roles.map((role) => <Radio key={role.accessRoleId} value={role.accessRoleId}>{role.name}</Radio>) | ||
} | ||
</RadioGroup> | ||
) | ||
// Check which type roles is of, to allow reusability of this component. | ||
if (roles.every(role => typeof role === 'object' && 'accessRoleId' in role)) { | ||
const newRoles: any = roles | ||
return ( | ||
<RadioGroup legend={"Filtrer på brukerns rolle"} onChange={handleFilterRole} value={roleProp ? roleProp : ""}> | ||
{ | ||
newRoles.map((role: IResourceModuleAccessRole) => <Radio key={role.accessRoleId} value={role.accessRoleId}>{role.name}</Radio>) | ||
} | ||
</RadioGroup> | ||
) | ||
} else { | ||
const newRoles: any = roles | ||
return ( | ||
<RadioGroup legend={"Filtrer på brukerns rolle"} onChange={handleFilterRole} value={roleProp ? roleProp : ""}> | ||
{ | ||
newRoles.map((role: IResourceModuleUserRole) => <Radio key={role.roleId} value={role.roleId}>{role.roleName}</Radio>) | ||
} | ||
</RadioGroup> | ||
) | ||
} | ||
} | ||
|
||
export default ResourceModuleRoleFilter |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.