From 7adaf181456c693fcc57da3d5a7fd7734c8996b2 Mon Sep 17 00:00:00 2001
From: matsbyfl <mats@byfuglien.net>
Date: Thu, 12 Dec 2024 13:55:22 +0100
Subject: [PATCH] =?UTF-8?q?Sortering=20p=C3=A5=20relevant=20kolonner=20i?=
 =?UTF-8?q?=20oppgavebenk?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/src/oppgavebenk/Oppgavebenk.tsx      | 44 ++++++++++-----------
 client/src/oppgavebenk/useOppgavelisteV2.ts | 13 +++---
 2 files changed, 28 insertions(+), 29 deletions(-)

diff --git a/client/src/oppgavebenk/Oppgavebenk.tsx b/client/src/oppgavebenk/Oppgavebenk.tsx
index 4be73af5..1c2aca72 100644
--- a/client/src/oppgavebenk/Oppgavebenk.tsx
+++ b/client/src/oppgavebenk/Oppgavebenk.tsx
@@ -1,4 +1,4 @@
-import { Box, Button, HStack, Link, Table, ToggleGroup } from '@navikt/ds-react'
+import { Box, Button, HStack, Link, SortState, Table, ToggleGroup } from '@navikt/ds-react'
 import styled from 'styled-components'
 
 import { IngentingFunnet } from '../felleskomponenter/IngenOppgaver'
@@ -24,20 +24,15 @@ export function Oppgavebenk() {
   //const [områdeFilter, setOmrådeFilter] = useLocalStorageState('områdeFilter', OmrådeFilter.ALLE)
   //const [sakstypeFilter, setSakstypeFilter] = useLocalStorageState('sakstypeFilter', SakstypeFilter.ALLE)
   //const [currentPage, setCurrentPage] = useLocalStorageState('currentPage', 1)
-  //const [sort, setSort] = useLocalStorageState<SortState>('oppgavebenkSortState', { orderBy: 'MOTTATT', direction: 'ascending' })
 
-  const { oppgaver, isLoading, error } = useOppgavelisteV2(
-    1,
-    { oppgaverFilter, gjelderFilter }
-    /*
-      currentPage, sort, {
-      sakerFilter,
-      statusFilter,
-      sakstypeFilter,
-      områdeFilter,
-    }
-    */
-  )
+  const initialSortState: SortState = {
+    orderBy: 'OPPRETTET_TIDSPUNKT',
+    direction: 'descending',
+  }
+
+  const [sort, setSort] = useLocalStorageState<SortState>('oppgavebenkSortState', initialSortState)
+
+  const { oppgaver, isLoading, error } = useOppgavelisteV2(1, sort, { oppgaverFilter, gjelderFilter })
 
   const handleFilter = (handler: (...args: any[]) => any, value: OppgaveGjelderFilter | string) => {
     handler(value)
@@ -47,6 +42,7 @@ export function Oppgavebenk() {
   const clearFilters = () => {
     setGjelderFilter(OppgaveGjelderFilter.ALLE)
     setOppgaverFilter(OppgaverFilter.UFORDELTE)
+    setSort(initialSortState)
     //setCurrentPage(1)
   }
 
@@ -60,21 +56,22 @@ export function Oppgavebenk() {
       },
     },
     {
-      key: 'REGISTRERT',
-      name: 'Registrert',
+      key: 'OPPRETTET_TIDSPUNKT',
+      name: 'Opprettet',
+      sortable: true,
       width: 122,
       render: (oppgave: OppgaveApiOppgave) => <TekstCell value={formaterTidsstempel(oppgave.opprettetTidspunkt)} />,
     },
     {
-      key: 'ENDRET',
+      key: 'ENDRET_TIDSPUNKT',
       name: 'Endret',
+      sortable: true,
       width: 122,
       render: (oppgave: OppgaveApiOppgave) => <TekstCell value={formaterTidsstempel(oppgave.endretTidspunkt)} />,
     },
     {
       key: 'GJELDER',
       name: 'Gjelder',
-      sortable: true,
       width: 140,
       render: (oppgave: OppgaveApiOppgave) => <TekstCell value={oppgave.gjelder ?? ''} />,
     },
@@ -134,6 +131,7 @@ export function Oppgavebenk() {
     {
       key: 'FRIST',
       name: 'Frist',
+      sortable: true,
       width: 114,
       render: (oppgave: OppgaveApiOppgave) => <TekstCell value={formaterDato(oppgave.fristFerdigstillelse)} />,
     },
@@ -244,19 +242,19 @@ export function Oppgavebenk() {
                 <Table
                   //style={{ width: 'initial' }}
                   size="small"
-                  //sort={sort}
-                  /*onSortChange={(sortKey) => {
+                  sort={sort}
+                  onSortChange={(sortKey) => {
                     setSort({
                       orderBy: sortKey || 'MOTTATT',
                       direction: sort?.direction === 'ascending' ? 'descending' : 'ascending',
                     })
-                  }}*/
+                  }}
                 >
                   <caption className="sr-only">Oppgaveliste</caption>
                   <Table.Header>
                     <Table.Row>
-                      {kolonner.map(({ key, name, /*sortable = true,*/ width }) => (
-                        <KolonneHeader key={key} /*sortable={sortable} */ sortKey={key} width={width}>
+                      {kolonner.map(({ key, name, sortable = false, width }) => (
+                        <KolonneHeader key={key} sortable={sortable} sortKey={key} width={width}>
                           {name}
                         </KolonneHeader>
                       ))}
diff --git a/client/src/oppgavebenk/useOppgavelisteV2.ts b/client/src/oppgavebenk/useOppgavelisteV2.ts
index a8ac41ec..5a1d95ee 100644
--- a/client/src/oppgavebenk/useOppgavelisteV2.ts
+++ b/client/src/oppgavebenk/useOppgavelisteV2.ts
@@ -3,6 +3,7 @@ import useSwr from 'swr'
 import { httpGet } from '../io/http'
 import { PAGE_SIZE } from '../oppgaveliste/paging/Paging'
 import { OppgaveApiOppgave, OppgaveApiResponse, OppgaveGjelderFilter, OppgaverFilter } from '../types/experimentalTypes'
+import { SortState } from '@navikt/ds-react'
 
 interface DataResponse {
   oppgaver: OppgaveApiOppgave[]
@@ -35,10 +36,10 @@ interface Filters {
   totalElements: number
 }*/
 
-const pathConfig = (/*currentPage: number, sort: SortState, */ filters: Filters): PathConfigType => {
-  //const sortDirection = sort.direction === 'ascending' ? 'ASC' : 'DESC'
+const pathConfig = (/*currentPage: number,*/ sort: SortState, filters: Filters): PathConfigType => {
+  const sortDirection = sort.direction === 'ascending' ? 'ASC' : 'DESC'
   //const pagingParams = { limit: PAGE_SIZE, page: currentPage }
-  //const sortParams = { sort_by: `${sort.orderBy}.${sortDirection}` }
+  const sortParams = { sorteringsfelt: sort.orderBy, sorteringsrekkefølge: sortDirection }
   const { oppgaverFilter, gjelderFilter } = filters
 
   const filterParams: any = {}
@@ -53,7 +54,7 @@ const pathConfig = (/*currentPage: number, sort: SortState, */ filters: Filters)
 
   return {
     path: `${basePath}`,
-    queryParams: { /*...pagingParams, ...sortParams, */ ...filterParams },
+    queryParams: { /*...pagingParams,*/ ...sortParams, ...filterParams },
   }
 }
 
@@ -63,8 +64,8 @@ const buildQueryParamString = (queryParams: Record<string, string>) => {
     .join('&')
 }
 
-export function useOppgavelisteV2(currentPage: number, /*, sort: SortState,*/ filters: Filters): DataResponse {
-  const { path, queryParams } = pathConfig(/*currentPage, sort,*/ filters)
+export function useOppgavelisteV2(currentPage: number, sort: SortState, filters: Filters): DataResponse {
+  const { path, queryParams } = pathConfig(/*currentPage,*/ sort, filters)
   const fullPath = `${path}?${buildQueryParamString(queryParams)}`
   const { data, error, mutate } = useSwr<{ data: OppgaveApiResponse }>(fullPath, httpGet, { refreshInterval: 10000 })