diff --git a/apps/frontend/src/components/Header.tsx b/apps/frontend/src/components/Header.tsx index c76689098..521b892d3 100644 --- a/apps/frontend/src/components/Header.tsx +++ b/apps/frontend/src/components/Header.tsx @@ -30,6 +30,7 @@ import {getMeldingByType} from '../api/MeldingApi' import {Markdown} from './common/Markdown' import {FontAwesomeIcon} from '@fortawesome/react-fontawesome' import {ampli} from '../services/Amplitude' +import { ChevronDownIcon, ChevronUpIcon } from '@navikt/aksel-icons' export const loginUrl = (location: Location, path?: string) => { const frontpage = window.location.href.substr(0, window.location.href.length - location.pathname.length) @@ -42,7 +43,7 @@ export const LoginButton = () => { const location = useLocation() return ( - @@ -54,7 +55,7 @@ const LoggedInHeader = () => { const roller = ( - diff --git a/apps/frontend/src/components/Navigation/Burger/index.tsx b/apps/frontend/src/components/Navigation/Burger/index.tsx index 190128354..71a80ef79 100644 --- a/apps/frontend/src/components/Navigation/Burger/index.tsx +++ b/apps/frontend/src/components/Navigation/Burger/index.tsx @@ -81,7 +81,7 @@ const BurgerMenu = () => { return ( {!showMenu && ( - )} @@ -110,7 +110,7 @@ const BurgerMenu = () => { > - diff --git a/apps/frontend/src/components/admin/CodeList/CodeListStyledTable.tsx b/apps/frontend/src/components/admin/CodeList/CodeListStyledTable.tsx index 6236c638e..bb5097fef 100644 --- a/apps/frontend/src/components/admin/CodeList/CodeListStyledTable.tsx +++ b/apps/frontend/src/components/admin/CodeList/CodeListStyledTable.tsx @@ -1,9 +1,6 @@ import * as React from 'react' import { useEffect, useState } from 'react' import { Block } from 'baseui/block' -import { KIND, SIZE as ButtonSize } from 'baseui/button' -import { FontAwesomeIcon } from '@fortawesome/react-fontawesome' -import { faEdit, faGhost, faTrash } from '@fortawesome/free-solid-svg-icons' import UpdateCodeListModal from './ModalUpdateCodeList' import DeleteCodeListModal from './ModalDeleteCodeList' import { Usage } from './CodeListUsage' @@ -13,6 +10,7 @@ import { deleteCodelist, getCodelistUsage, updateCodelist } from '../../../api/C import { Cell, Row, Table } from '../../common/Table' import Button from '../../common/Button' import { theme } from '../../../util' +import { DocPencilIcon, GlassesIcon, TrashIcon } from '@navikt/aksel-icons' type TableCodelistProps = { tableData: Code[] @@ -29,7 +27,7 @@ const CodeListTable = ({ tableData, refresh }: TableCodelistProps) => { useEffect(() => { if (showUsage && selectedCode) { - ;(async () => { + ; (async () => { setUsage(undefined) const usage = await getCodelistUsage(selectedCode.list, selectedCode.code) setUsage(usage) @@ -93,42 +91,33 @@ const CodeListTable = ({ tableData, refresh }: TableCodelistProps) => { - + icon={< GlassesIcon title="Vis bruk" />} + /> + + icon={} + /> + icon={} + /> diff --git a/apps/frontend/src/components/admin/audit/AuditButton.tsx b/apps/frontend/src/components/admin/audit/AuditButton.tsx index 19ffdef4a..b8c0c3091 100644 --- a/apps/frontend/src/components/admin/audit/AuditButton.tsx +++ b/apps/frontend/src/components/admin/audit/AuditButton.tsx @@ -28,7 +28,6 @@ export const AuditButton = (props: { tooltip={intl.version} marginLeft={props.marginLeft} marginRight={props.marginRight} - size={"small"} kind={props.kind || 'outline'} icon={} > diff --git a/apps/frontend/src/components/admin/audit/AuditView.tsx b/apps/frontend/src/components/admin/audit/AuditView.tsx index 74cea9900..1d187206e 100644 --- a/apps/frontend/src/components/admin/audit/AuditView.tsx +++ b/apps/frontend/src/components/admin/audit/AuditView.tsx @@ -18,6 +18,7 @@ import { AuditAction, AuditLog } from './AuditTypes' import { ObjectLink } from '../../common/RouteLink' import Button from '../../common/Button' import { ettlevColors } from '../../../util/theme' +import { ArrowRightLeftIcon, GlassesIcon, XMarkIcon } from '@navikt/aksel-icons' type AuditViewProps = { auditLog?: AuditLog @@ -54,25 +55,21 @@ export const AuditView = (props: AuditViewProps) => { - {newestAudit?.action !== AuditAction.DELETE && ( intl.view} placement={PLACEMENT.top}> - + + + diff --git a/apps/frontend/src/components/common/Table.tsx b/apps/frontend/src/components/common/Table.tsx index d86977846..02abcc6fe 100644 --- a/apps/frontend/src/components/common/Table.tsx +++ b/apps/frontend/src/components/common/Table.tsx @@ -20,6 +20,7 @@ import { KIND } from 'baseui/button' import { Pagination } from 'baseui/pagination' import CustomizedInput from '../common/CustomizedInput' import { CustomizedStatefulSelect } from './CustomizedSelect' +import { ChevronDownIcon } from '@navikt/aksel-icons' // Use this for entire app, or recreate maybe, added here as I needed it for audit @@ -148,7 +149,7 @@ export const Table = (props: TableProps) => { placement={PLACEMENT.bottom} > - + diff --git a/apps/frontend/src/components/etterlevelse/EtterlevelseSecondaryHeader.tsx b/apps/frontend/src/components/etterlevelse/EtterlevelseSecondaryHeader.tsx index cd118d2e2..bf48e1390 100644 --- a/apps/frontend/src/components/etterlevelse/EtterlevelseSecondaryHeader.tsx +++ b/apps/frontend/src/components/etterlevelse/EtterlevelseSecondaryHeader.tsx @@ -112,8 +112,6 @@ export const EtterlevelseSecondaryHeader = ({ tab, setTab, setNavigatePath, ette diff --git a/apps/frontend/src/components/etterlevelseDokumentasjon/tabs/BehandlingSok.tsx b/apps/frontend/src/components/etterlevelseDokumentasjon/tabs/BehandlingSok.tsx index a6369e9fc..faf7950f4 100644 --- a/apps/frontend/src/components/etterlevelseDokumentasjon/tabs/BehandlingSok.tsx +++ b/apps/frontend/src/components/etterlevelseDokumentasjon/tabs/BehandlingSok.tsx @@ -14,6 +14,7 @@ import CustomizedSelect from '../../common/CustomizedSelect' import { intl } from '../../../util/intl/intl' import { TYPE } from 'baseui/select' import { updateBehandlingNameWithNumber } from '../common/utils' +import { PlusIcon } from '@navikt/aksel-icons' export const BehandlingSok = () => { const pageSize = 20 @@ -115,9 +116,8 @@ export const BehandlingSok = () => { diff --git a/apps/frontend/src/components/krav/Edit/RegelverkEdit.tsx b/apps/frontend/src/components/krav/Edit/RegelverkEdit.tsx index 851e51311..6342aeead 100644 --- a/apps/frontend/src/components/krav/Edit/RegelverkEdit.tsx +++ b/apps/frontend/src/components/krav/Edit/RegelverkEdit.tsx @@ -124,7 +124,7 @@ export const RegelverkEdit = ({ forVirkemiddel }: RegelverkEditProps) => { - diff --git a/apps/frontend/src/components/krav/EditKrav.tsx b/apps/frontend/src/components/krav/EditKrav.tsx index 4f677b3b2..0c95b0386 100644 --- a/apps/frontend/src/components/krav/EditKrav.tsx +++ b/apps/frontend/src/components/krav/EditKrav.tsx @@ -469,7 +469,6 @@ export const EditKrav = ({ krav, close, formRef, isOpen, setIsOpen, newVersion, {krav.status === KravStatus.AKTIV && !newVersion && ( @@ -234,7 +234,7 @@ export const Tilbakemeldinger = ({ krav, hasKravExpired }: { krav: Krav; hasKrav )} {user.canWrite() && ( - )} @@ -397,12 +397,11 @@ const TilbakemeldingSvar = ({ tilbakemelding, setFocusNummer, close, ubesvartOgK {tilbakemelding.meldinger[0].innhold} - @@ -454,7 +453,6 @@ const TilbakemeldingSvar = ({ tilbakemelding, setFocusNummer, close, ubesvartOgK ) : ( diff --git a/apps/frontend/src/components/krav/tilbakemelding/edit/MeldingKnapper.tsx b/apps/frontend/src/components/krav/tilbakemelding/edit/MeldingKnapper.tsx index 083ec1d02..00d69a3c7 100644 --- a/apps/frontend/src/components/krav/tilbakemelding/edit/MeldingKnapper.tsx +++ b/apps/frontend/src/components/krav/tilbakemelding/edit/MeldingKnapper.tsx @@ -1,4 +1,3 @@ -import { faPencilAlt, faTrashAlt } from '@fortawesome/free-solid-svg-icons' import { Block } from 'baseui/block' import Button from '../../../common/Button' import { Modal, ModalBody, ModalFooter, ModalHeader } from 'baseui/modal' @@ -48,12 +47,11 @@ export const MeldingKnapper = (props: { {melding.innhold} - )} {adresseType === AdresseType.SLACK_USER && } {adresseType !== AdresseType.SLACK_USER && !values.varslingsadresse && ( - )} {adresseType === AdresseType.EPOST && } {adresseType !== AdresseType.EPOST && !values.varslingsadresse && ( - )} @@ -227,7 +227,7 @@ export const NyTilbakemeldingModal = ({ open, close, krav }: NyTilbakemeldingMod )} - diff --git a/apps/frontend/src/components/krav/tilbakemelding/edit/TilbakemeldingEdit.tsx b/apps/frontend/src/components/krav/tilbakemelding/edit/TilbakemeldingEdit.tsx index d299b8efc..137c5341b 100644 --- a/apps/frontend/src/components/krav/tilbakemelding/edit/TilbakemeldingEdit.tsx +++ b/apps/frontend/src/components/krav/tilbakemelding/edit/TilbakemeldingEdit.tsx @@ -36,10 +36,10 @@ export const TilbakemeldingEdit = ({ setResponse((e.target as HTMLTextAreaElement).value)} value={response} disabled={loading} /> - - diff --git a/apps/frontend/src/components/kravList/AllKrav.tsx b/apps/frontend/src/components/kravList/AllKrav.tsx index cef1b04e3..c74ec5e5f 100644 --- a/apps/frontend/src/components/kravList/AllKrav.tsx +++ b/apps/frontend/src/components/kravList/AllKrav.tsx @@ -290,7 +290,7 @@ export const AllKrav = () => { {!loading && kravene.totalElements !== 0 && ( - diff --git a/apps/frontend/src/components/kravList/TemaList.tsx b/apps/frontend/src/components/kravList/TemaList.tsx index c22404e9e..2d2f83474 100644 --- a/apps/frontend/src/components/kravList/TemaList.tsx +++ b/apps/frontend/src/components/kravList/TemaList.tsx @@ -126,7 +126,7 @@ const KravTemaList = (props: { activeKraver: Krav[]; tema: string; refresh: Func paddingRight: '16px', }} > - diff --git a/apps/frontend/src/components/kravList/edit/EditPriorityModal.tsx b/apps/frontend/src/components/kravList/edit/EditPriorityModal.tsx index 13eb3c8a9..2ee55a8dd 100644 --- a/apps/frontend/src/components/kravList/edit/EditPriorityModal.tsx +++ b/apps/frontend/src/components/kravList/edit/EditPriorityModal.tsx @@ -249,7 +249,7 @@ export const EditPriorityModal = (props: { isOpen: boolean; setIsOpen: React.Dis className="krav-list-button-container" > - diff --git a/apps/frontend/src/components/virkemiddelList/AllVirkemiddel.tsx b/apps/frontend/src/components/virkemiddelList/AllVirkemiddel.tsx index 2980c07d1..aa7bd7216 100644 --- a/apps/frontend/src/components/virkemiddelList/AllVirkemiddel.tsx +++ b/apps/frontend/src/components/virkemiddelList/AllVirkemiddel.tsx @@ -133,7 +133,7 @@ export const AllVirkemiddel = ({ isCreateModalOpen, setIsCreateModalOpen }: AllV component: (props: any) => ( + )} @@ -56,10 +56,10 @@ export const EtterlevelseListPage = () => { Side {etterlevelse.pageNumber + 1}/{etterlevelse.pages} - - diff --git a/apps/frontend/src/pages/KravListPage.tsx b/apps/frontend/src/pages/KravListPage.tsx index cfa8b7b04..54848f9b1 100644 --- a/apps/frontend/src/pages/KravListPage.tsx +++ b/apps/frontend/src/pages/KravListPage.tsx @@ -59,7 +59,7 @@ export const KravListPage = () => { {user.isKraveier() && ( - diff --git a/apps/frontend/src/pages/VirkemiddelListPage.tsx b/apps/frontend/src/pages/VirkemiddelListPage.tsx index 727c2bcba..80a78ac43 100644 --- a/apps/frontend/src/pages/VirkemiddelListPage.tsx +++ b/apps/frontend/src/pages/VirkemiddelListPage.tsx @@ -34,9 +34,9 @@ export const VirkemiddelListPage = () => {