Skip to content

Commit

Permalink
- Endret en del oppsett for PreloadableActionMenuItem og benytter den…
Browse files Browse the repository at this point in the history
… flere steder

- Endret immutable SWR kall til å heller bruke SWRImmutable
- Oppdateringer
#deploy-test-frontend
  • Loading branch information
stigus committed Jan 7, 2025
1 parent 2b93cc4 commit 772efb7
Show file tree
Hide file tree
Showing 16 changed files with 178 additions and 154 deletions.
159 changes: 75 additions & 84 deletions apps/dolly-frontend/src/main/js/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions apps/dolly-frontend/src/main/js/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "dolly",
"version": "3.1.1",
"version": "3.1.0",
"type": "module",
"description": "",
"main": "index.js",
Expand Down Expand Up @@ -70,8 +70,8 @@
"@testing-library/react": "^16.0.1",
"@types/lodash-es": "^4.17.12",
"@types/node": "^22.8.4",
"@types/react": "19.0.2",
"@types/react-dom": "19.0.2",
"@types/react": "^19.0.2",
"@types/react-dom": "^19.0.2",
"@types/react-highlight-words": "^0.20.0",
"@types/react-redux": "^7.1.34",
"@types/react-syntax-highlighter": "^15.5.13",
Expand Down
7 changes: 5 additions & 2 deletions apps/dolly-frontend/src/main/js/src/allRoutes.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,13 @@ const GruppeBreadcrumb = (props) => <span>Gruppe #{props.match?.params?.gruppeId

const allRoutes = [
{ path: '/', breadcrumb: 'Hjem', element: () => <Navigate to="/gruppe" replace /> },
{ path: '/gruppe', handle: {
{
path: '/gruppe',
handle: {
crumb: () => 'Personer',
},
element: GruppeOversikt },
element: GruppeOversikt,
},
{ path: '/gruppe/:gruppeId', breadcrumb: GruppeBreadcrumb, element: GruppeConnector },
{
path: '/gruppe/:gruppeId/bestilling/:personId',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ export const Breadcrumbs = () => {
.map((match) => match.handle.crumb(match.data))

const isActive = (match, currentLocation) => match.pathname === currentLocation.pathname
//TODO: Må fikses

return (
<nav aria-label="breadcrumb" className="breadcrumb">
Expand Down
Loading

0 comments on commit 772efb7

Please sign in to comment.