-
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 #130 from FINTLabs/FKS-219-frontend-fikse-sok-i-me…
…mbers FKS-219-frontend-fikse-sok-i-members
- Loading branch information
Showing
15 changed files
with
81 additions
and
294 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
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,44 @@ | ||
import {Search as AkselSearch} from "@navikt/ds-react"; | ||
import React, {useState} from "react"; | ||
import {Form, useSearchParams} from "@remix-run/react"; | ||
import { | ||
filterResetPageParam, | ||
handleClearSearchFieldString, | ||
handleSearchFieldString | ||
} from "~/components/common/CommonFunctions"; | ||
|
||
type SearchInputProps = { | ||
label: string | ||
id: string | ||
} | ||
|
||
export const Search = ({label, id}: SearchInputProps) => { | ||
const [searchString, setSearchString] = useState("") | ||
const [searchParams, setSearchParams] = useSearchParams() | ||
|
||
const pageParam = searchParams.get("page") | ||
|
||
return ( | ||
<Form | ||
className={"searchField"} | ||
onSubmit={(event) => { | ||
handleSearchFieldString(event, setSearchParams, searchString) | ||
setSearchString("") | ||
filterResetPageParam(pageParam, setSearchParams) | ||
}} | ||
> | ||
<AkselSearch | ||
role="search" | ||
id={id} | ||
label={label} | ||
hideLabel={false} | ||
variant="secondary" | ||
value={searchString} | ||
onChange={event => setSearchString(event)} | ||
onClear={() => { | ||
handleClearSearchFieldString(setSearchParams) | ||
}} | ||
/> | ||
</Form> | ||
); | ||
}; |
This file was deleted.
Oops, something went wrong.
23 changes: 6 additions & 17 deletions
23
app/components/resource-module-admin/ResourceModuleSearch.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
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,39 +1,6 @@ | ||
import {Search} from "@navikt/ds-react"; | ||
import {useState} from "react"; | ||
import {Form, useSearchParams} from "@remix-run/react"; | ||
import { | ||
filterResetPageParam, | ||
handleClearSearchFieldString, | ||
handleSearchFieldString | ||
} from "~/components/common/CommonFunctions"; | ||
import React from "react"; | ||
import {Search} from "~/components/common/Search"; | ||
|
||
export const ResourceSearch = () => { | ||
|
||
const [searchString, setSearchString] = useState("") | ||
const [searchParams, setSearchParams] = useSearchParams() | ||
|
||
const pageParam = searchParams.get("page") | ||
|
||
return ( | ||
<Form className={"searchField"} | ||
onSubmit={event => { | ||
handleSearchFieldString(event, setSearchParams, searchString) | ||
setSearchString("") | ||
filterResetPageParam(pageParam, setSearchParams) | ||
}} | ||
> | ||
<Search | ||
id="search-resource" | ||
role="search" | ||
label="Søk etter ressurs" | ||
hideLabel={false} | ||
variant="secondary" | ||
value={searchString} | ||
onChange={event => setSearchString(event)} | ||
onClear={() => { | ||
handleClearSearchFieldString(setSearchParams) | ||
}} | ||
/> | ||
</Form> | ||
); | ||
return <Search id="search-resource" label="Søk etter ressurs" /> | ||
}; |
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,39 +1,6 @@ | ||
import {Search} from "@navikt/ds-react"; | ||
import React, {useState} from "react"; | ||
import {Form, useSearchParams} from "@remix-run/react"; | ||
import { | ||
filterResetPageParam, | ||
handleClearSearchFieldString, | ||
handleSearchFieldString | ||
} from "~/components/common/CommonFunctions"; | ||
import React from "react"; | ||
import { Search } from "~/components/common/Search"; | ||
|
||
export const RoleSearch = () => { | ||
|
||
const [searchString, setSearchString] = useState("") | ||
const [searchParams, setSearchParams] = useSearchParams() | ||
|
||
const pageParam = searchParams.get("page") | ||
|
||
return ( | ||
<Form className={"searchField"} | ||
onSubmit={(event) => { | ||
handleSearchFieldString(event, setSearchParams, searchString) | ||
setSearchString("") | ||
filterResetPageParam(pageParam, setSearchParams) | ||
}} | ||
> | ||
<Search | ||
role="search" | ||
id="search-role" | ||
label="Søk etter gruppe" | ||
hideLabel={false} | ||
variant="secondary" | ||
value={searchString} | ||
onChange={event => setSearchString(event)} | ||
onClear={() => { | ||
handleClearSearchFieldString(setSearchParams) | ||
}} | ||
/> | ||
</Form> | ||
); | ||
}; | ||
export const RoleSearch = () => ( | ||
<Search id="search-role" label="Søk etter gruppe" /> | ||
); |
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,40 +1,8 @@ | ||
import {Search} from "@navikt/ds-react"; | ||
import React, {useState} from "react"; | ||
import {Form, useSearchParams} from "@remix-run/react"; | ||
import { | ||
filterResetPageParam, | ||
handleClearSearchFieldString, | ||
handleSearchFieldString | ||
} from "~/components/common/CommonFunctions"; | ||
|
||
import React from "react"; | ||
import {Search} from "~/components/common/Search"; | ||
|
||
export const UserSearch = () => { | ||
|
||
const [searchString, setSearchString] = useState("") | ||
const [searchParams, setSearchParams] = useSearchParams() | ||
|
||
const pageParam = searchParams.get("page") | ||
|
||
return ( | ||
<Form className={"searchField"} | ||
onSubmit={event => { | ||
handleSearchFieldString(event, setSearchParams, searchString) | ||
setSearchString("") | ||
filterResetPageParam(pageParam, setSearchParams) | ||
}} | ||
> | ||
<Search | ||
role="search" | ||
label="Søk etter bruker" | ||
id="user-search" | ||
hideLabel={false} | ||
variant="secondary" | ||
value={searchString} | ||
onChange={event => setSearchString(event)} | ||
onClear={() => { | ||
handleClearSearchFieldString(setSearchParams) | ||
}} | ||
/> | ||
</Form> | ||
<Search label={"Søk etter bruker"} id={"user-search"} /> | ||
); | ||
}; |
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.