Vise alle dokumenter for å hindre at journalposter kuttes

navikt · Feb 6, 2025 · 2c754b7 · 2c754b7
1 parent dadb8bf
commit 2c754b7
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 49 deletions.
diff --git a/src/applications/Vedlegg/JoarkBrowser/JoarkBrowser.tsx b/src/applications/Vedlegg/JoarkBrowser/JoarkBrowser.tsx
@@ -203,30 +203,7 @@ export const JoarkBrowser: React.FC<JoarkBrowserProps> = ({
     let multiCount = 0
 
     list.forEach((post: JoarkPoster) => {
-      //let multipleDocuments: boolean = false
       journalCount++
-/*
-      if (post.dokumenter.length > 1) {
-        multipleDocuments = true
-        multiCount++
-        items.push({
-          key: 'joark-group-' + post.journalpostId,
-          type: 'joark',
-
-          journalpostId: post.journalpostId,
-          dokumentInfoId: undefined,
-          variant: undefined,
-
-          title: post.tittel,
-          tema: post.tema,
-          status: post?.journalstatus,
-          saksid: post?.sak?.arkivsaksnummer,
-          regSentDate: getMottattSendtDato(post),
-          date: new Date(Date.parse(post.datoOpprettet)),
-          disabled: false,
-          hasSubrows: true
-        } as JoarkBrowserItem)
-      }*/
 
       post.dokumenter.forEach((doc: JoarkDoc) => {
         const variant = getVariantFromJoarkDoc(doc)
@@ -263,13 +240,6 @@ export const JoarkBrowser: React.FC<JoarkBrowserProps> = ({
           disabled,
           hasSubrows: false
         }
-        /*
-        if (multipleDocuments) {
-          item.parentKey = 'joark-group-' + post.journalpostId
-        }
-
-         */
-
         selected ? items.unshift(item) : items.push(item)
         documentCount++
 
@@ -325,7 +295,7 @@ export const JoarkBrowser: React.FC<JoarkBrowserProps> = ({
     const items: JoarkBrowserItems = []
     existingItems.forEach((existingItem: JoarkBrowserItem) => {
       const match = existingItem.title.match(/^(\d+)_ARKIV\.pdf$/)
-      if (list != null && match != null) {
+      if (list && match) {
         const id = match[1] // number
         let journalpostDoc: JoarkDoc | undefined
         for (const jp of list) { // iterate joarkposts
@@ -365,12 +335,9 @@ export const JoarkBrowser: React.FC<JoarkBrowserProps> = ({
     let items: JoarkBrowserItems = []
     if (mode === 'select') {
       items = getItemsForSelectMode(list, existingItems)
-      console.log("select items " + items.length)
-
     }
     if (mode === 'view') {
       items = getItemsForViewMode(list, existingItems)
-      console.log("view items " + items.length)
     }
     setItems(items)
     setTableKey('' + md5(JSON.stringify(list) + JSON.stringify(existingItems)))

diff --git a/src/mocks/attachments/joark.ts b/src/mocks/attachments/joark.ts
@@ -14709,7 +14709,7 @@ export default {
             }
           ],
           "sak": {
-            "arkivsaksnummer": "140263372o"
+            "arkivsaksnummer": "140263372"
           },
           "dokumenter": [
             {
@@ -14755,7 +14755,7 @@ export default {
             }
           ],
           "sak": {
-            "arkivsaksnummer": "140271142n"
+            "arkivsaksnummer": "140271142"
           },
           "dokumenter": [
             {
@@ -14801,7 +14801,7 @@ export default {
             }
           ],
           "sak": {
-            "arkivsaksnummer": "140262420m"
+            "arkivsaksnummer": "140262420"
           },
           "dokumenter": [
             {
@@ -14843,7 +14843,7 @@ export default {
             }
           ],
           "sak": {
-            "arkivsaksnummer": "140262420l"
+            "arkivsaksnummer": "140262420"
           },
           "dokumenter": [
             {
@@ -14885,7 +14885,7 @@ export default {
             }
           ],
           "sak": {
-            "arkivsaksnummer": "140262683k"
+            "arkivsaksnummer": "140262683"
           },
           "dokumenter": [
             {
@@ -14927,7 +14927,7 @@ export default {
             }
           ],
           "sak": {
-            "arkivsaksnummer": "140262683j"
+            "arkivsaksnummer": "140262683"
           },
           "dokumenter": [
             {
@@ -14969,7 +14969,7 @@ export default {
             }
           ],
           "sak": {
-            "arkivsaksnummer": "140262683i"
+            "arkivsaksnummer": "140262683"
           },
           "dokumenter": [
             {
@@ -15011,7 +15011,7 @@ export default {
             }
           ],
           "sak": {
-            "arkivsaksnummer": "140262683h"
+            "arkivsaksnummer": "140262683"
           },
           "dokumenter": [
             {
@@ -15057,7 +15057,7 @@ export default {
             }
           ],
           "sak": {
-            "arkivsaksnummer": "140263372g"
+            "arkivsaksnummer": "140263372"
           },
           "dokumenter": [
             {
@@ -15099,7 +15099,7 @@ export default {
             }
           ],
           "sak": {
-            "arkivsaksnummer": "140265036f"
+            "arkivsaksnummer": "140265036"
           },
           "dokumenter": [
             {
@@ -15145,7 +15145,7 @@ export default {
             }
           ],
           "sak": {
-            "arkivsaksnummer": "140262683e"
+            "arkivsaksnummer": "140262683"
           },
           "dokumenter": [
             {
@@ -15187,7 +15187,7 @@ export default {
             }
           ],
           "sak": {
-            "arkivsaksnummer": "140262420d"
+            "arkivsaksnummer": "140262420"
           },
           "dokumenter": [
             {
@@ -15233,7 +15233,7 @@ export default {
             }
           ],
           "sak": {
-            "arkivsaksnummer": "140262420c"
+            "arkivsaksnummer": "140262420"
           },
           "dokumenter": [
             {
@@ -15279,7 +15279,7 @@ export default {
             }
           ],
           "sak": {
-            "arkivsaksnummer": "140262420b"
+            "arkivsaksnummer": "140262420"
           },
           "dokumenter": [
             {
@@ -15325,7 +15325,7 @@ export default {
             }
           ],
           "sak": {
-            "arkivsaksnummer": "140262683a"
+            "arkivsaksnummer": "140262683"
           },
           "dokumenter": [
             {