Merge pull request #134 from navikt/upgrade-mar

Upgrade mar

Author: talepre

common/package.json

@@ -5,6 +5,6 @@
     "type": "module",
     "dependencies": {
         "http-terminator": "3.2.0",
-        "lru-cache": "11.0.1"
+        "lru-cache": "11.0.2"
     }
 }

legacy-archive/client/components/left-section/categories/CategoriesMenu.tsx

@@ -1,7 +1,6 @@
 import React from 'react';
 import { CmsCategoryListItem } from '../../../../shared/cms-documents/category';
-import { ChevronDownIcon, ChevronRightIcon } from '@navikt/aksel-icons';
-import { TreeView } from '@mui/x-tree-view';
+import { SimpleTreeView } from '@mui/x-tree-view';
 import { RootCategory } from './root-category/RootCategory';
 import { CheckboxGroup } from '@navikt/ds-react';
 import { useSearchState } from '../../../context/search-state/useSearchState';
@@ -15,9 +14,7 @@ export const CategoriesMenu = ({ rootCategories, className }: Props) => {
     const { updateSearchParams, searchParams } = useSearchState();
 
     return (
-        <TreeView
-            defaultExpandIcon={<ChevronRightIcon />}
-            defaultCollapseIcon={<ChevronDownIcon />}
+        <SimpleTreeView
             classes={{
                 root: className,
             }}
@@ -32,6 +29,6 @@ export const CategoriesMenu = ({ rootCategories, className }: Props) => {
                     <RootCategory category={category} key={category.key} />
                 ))}
             </CheckboxGroup>
-        </TreeView>
+        </SimpleTreeView>
     );
 };

legacy-archive/client/components/left-section/categories/category/Category.tsx

@@ -36,14 +36,14 @@ export const Category = ({ category }: Props) => {
     return (
         <TreeItem
             key={key}
-            nodeId={key}
+            itemId={key}
             label={
                 <Tooltip content={`Nøkkel: ${key}`} placement={'left'} delay={1000}>
                     <div>{`${title}${isEmpty ? ' (tom)' : ''}`}</div>
                 </Tooltip>
             }
             disabled={isEmpty}
-            icon={isEmpty ? <CircleSlashIcon /> : undefined}
+            slots={{ icon: isEmpty ? CircleSlashIcon: undefined}}
             classes={classesOverride}
         >
             {isLoading ? (
@@ -57,8 +57,8 @@ export const Category = ({ category }: Props) => {
             ) : null}
             {hasContent && (
                 <TreeItem
-                    nodeId={`contents-${key}`}
-                    icon={<ArrowForwardIcon />}
+                    itemId={`contents-${key}`}
+                    slots={{ icon: ArrowForwardIcon }}
                     label={`Åpne innholdsvelger (${contentCount})`}
                     classes={classesOverride}
                     onClick={(e) => {

legacy-archive/package.json

@@ -14,15 +14,15 @@
         "dev": "cp .env.development .env && npm run dev --prefix server"
     },
     "dependencies": {
-        "@mui/material": "5.16.7",
-        "@mui/system": "5.16.7",
-        "@mui/x-tree-view": "6.17.0",
+        "@mui/material": "6.4.7",
+        "@mui/system": "6.4.7",
+        "@mui/x-tree-view": "7.26.0",
         "js-cookie": "3.0.5",
         "lodash.debounce": "4.0.8",
-        "react-xml-viewer": "2.0.2"
+        "react-xml-viewer": "2.0.5"
     },
     "devDependencies": {
         "@types/js-cookie": "3.0.6",
-        "@types/lodash": "4.17.10"
+        "@types/lodash": "4.17.16"
     }
 }

legacy-archive/server/package.json

@@ -11,19 +11,19 @@
         "dev": "npm-run-all -p build-and-watch nodemon-start"
     },
     "dependencies": {
-        "@opensearch-project/opensearch": "2.12.0",
+        "@opensearch-project/opensearch": "2.13.0",
         "archiver": "7.0.1",
-        "compression": "1.7.4",
+        "compression": "1.8.0",
         "csp-header": "5.2.1",
-        "dotenv": "16.4.5",
+        "dotenv": "16.4.7",
         "mime-types": "2.1.35",
         "node-cache": "5.1.2",
-        "puppeteer": "23.5.1"
+        "puppeteer": "23.11.1"
     },
     "devDependencies": {
-        "@types/archiver": "6.0.2",
+        "@types/archiver": "6.0.3",
         "@types/compression": "1.7.5",
-        "nodemon": "3.1.7"
+        "nodemon": "3.1.9"
     },
     "nodemonConfig": {
         "delay": 500