Remove option to convert incoming document to attachment

Author: eriksson-daniel

frontend/src/components/documents/new-documents/header/header.tsx

@@ -1,19 +1,8 @@
-import { DragAndDropContext } from '@app/components/documents/drag-context';
 import { DeleteDropArea } from '@app/components/documents/new-documents/header/delete-drop-area';
-import { DropZone } from '@app/components/documents/new-documents/shared/drop-zone';
 import { useIsExpanded } from '@app/components/documents/use-is-expanded';
-import { useOppgaveId } from '@app/hooks/oppgavebehandling/use-oppgave-id';
-import { useHasRole } from '@app/hooks/use-has-role';
-import { useIsSaksbehandler } from '@app/hooks/use-is-saksbehandler';
 import { useValidationError } from '@app/hooks/use-validation-error';
-import { useSetParentMutation } from '@app/redux-api/oppgaver/mutations/documents';
-import { Role } from '@app/types/bruker';
-import { DocumentTypeEnum, type IMainDocument } from '@app/types/documents/documents';
-import { TemplateIdEnum } from '@app/types/smart-editor/template-enums';
-import { ArrowUpIcon, ExclamationmarkTriangleIcon } from '@navikt/aksel-icons';
+import { ExclamationmarkTriangleIcon } from '@navikt/aksel-icons';
 import { HStack, Heading } from '@navikt/ds-react';
-import { skipToken } from '@reduxjs/toolkit/query';
-import { useCallback, useContext } from 'react';
 
 interface Props {
   headingId: string;
@@ -22,24 +11,6 @@ interface Props {
 export const NewDocumentsHeader = ({ headingId }: Props) => {
   const errorMessage = useValidationError('underArbeid');
   const [isExpanded] = useIsExpanded();
-  const oppgaveId = useOppgaveId();
-  const [setParent] = useSetParentMutation();
-  const { draggedDocument, clearDragState } = useContext(DragAndDropContext);
-  const isSaksbehandler = useIsSaksbehandler();
-  const hasOppgavestyringRole = useHasRole(Role.KABAL_OPPGAVESTYRING_ALLE_ENHETER);
-  const isDropTarget = (isSaksbehandler || hasOppgavestyringRole) && isDroppable(draggedDocument);
-
-  const onDrop = useCallback(() => {
-    if (isDropTarget && oppgaveId !== skipToken) {
-      setParent({
-        dokumentId: draggedDocument.id,
-        oppgaveId,
-        parentId: null,
-      });
-    }
-
-    clearDragState();
-  }, [clearDragState, draggedDocument, isDropTarget, oppgaveId, setParent]);
 
   return (
     <HStack
@@ -52,27 +23,13 @@ export const NewDocumentsHeader = ({ headingId }: Props) => {
       wrap={false}
       className="border-border-divider border-b"
     >
-      <DropZone
-        onDrop={onDrop}
-        icon={<ArrowUpIcon aria-hidden />}
-        label="Hoveddokument"
-        active={isDropTarget}
-        className="grow"
-      >
-        <Heading size="xsmall" level="2" id={headingId}>
-          Dokumenter under arbeid
-        </Heading>
-        {typeof errorMessage === 'string' ? (
-          <ExclamationmarkTriangleIcon title={errorMessage} className="text-text-danger" />
-        ) : null}
-      </DropZone>
+      <Heading size="xsmall" level="2" id={headingId}>
+        Dokumenter under arbeid
+      </Heading>
+      {typeof errorMessage === 'string' ? (
+        <ExclamationmarkTriangleIcon title={errorMessage} className="text-text-danger" />
+      ) : null}
       {isExpanded ? <DeleteDropArea /> : null}
     </HStack>
   );
 };
-
-const isDroppable = (draggedDocument: IMainDocument | null): draggedDocument is IMainDocument =>
-  draggedDocument !== null &&
-  draggedDocument.parentId !== null &&
-  draggedDocument.type !== DocumentTypeEnum.JOURNALFOERT &&
-  draggedDocument.templateId !== TemplateIdEnum.ROL_ANSWERS;

frontend/src/components/documents/new-documents/modal/modal-content.tsx

@@ -3,6 +3,7 @@ import { AnnenInngaaende } from '@app/components/documents/new-documents/modal/a
 import { FinishButton } from '@app/components/documents/new-documents/modal/finish-button';
 import { Errors } from '@app/components/documents/new-documents/modal/finish-document/errors';
 import { MottattDato } from '@app/components/documents/new-documents/modal/mottatt-dato';
+import { SetParentDocument } from '@app/components/documents/new-documents/modal/set-parent';
 import { SetDocumentType } from '@app/components/documents/new-documents/new-document/set-type';
 import { DocumentDate } from '@app/components/documents/new-documents/shared/document-date';
 import { DocumentIcon } from '@app/components/documents/new-documents/shared/document-icon';
@@ -34,7 +35,6 @@ import { skipToken } from '@reduxjs/toolkit/query';
 import { useMemo } from 'react';
 import { styled } from 'styled-components';
 import { DeleteDocumentButton } from './delete-button';
-import { SetParentDocument } from './set-parent';
 
 interface Props {
   document: IMainDocument;

frontend/src/components/documents/new-documents/modal/set-parent.tsx

@@ -7,7 +7,7 @@ import { useSetParentMutation } from '@app/redux-api/oppgaver/mutations/document
 import { useGetDocumentsQuery } from '@app/redux-api/oppgaver/queries/documents';
 import {
   DISTRIBUTION_TYPE_NAMES,
-  type DistribusjonsType,
+  DistribusjonsType,
   DocumentTypeEnum,
   type IMainDocument,
 } from '@app/types/documents/documents';
@@ -39,6 +39,10 @@ export const SetParentDocument = ({ document, parentDocument, hasAttachments }:
     }
 
     if (document.type === DocumentTypeEnum.UPLOADED || isIncomingDocument) {
+      if (document.parentId === null) {
+        return [];
+      }
+
       return data.filter((d) => document.id !== d.id && d.parentId === null && getIsIncomingDocument(d.dokumentTypeId));
     }
 
@@ -52,8 +56,14 @@ export const SetParentDocument = ({ document, parentDocument, hasAttachments }:
       );
     }
 
-    return data.filter((d) => document.id !== d.id && d.parentId === null);
-  }, [data, document.id, document.type, hasAttachments, isIncomingDocument, isRol]);
+    return data.filter(
+      (d) =>
+        document.id !== d.id &&
+        d.parentId === null &&
+        d.dokumentTypeId !== DistribusjonsType.KJENNELSE_FRA_TRYGDERETTEN &&
+        d.dokumentTypeId !== DistribusjonsType.ANNEN_INNGAAENDE_POST,
+    );
+  }, [data, document.id, document.type, document.parentId, isIncomingDocument, hasAttachments, isRol]);
 
   if (
     isLoadingDocuments ||
@@ -125,14 +135,22 @@ const MainDocument = ({ document, isIncomingDocument, onClick, isLoading }: Main
     );
   }
 
-  if (!(isSaksbehandler || isIncomingDocument)) {
+  if (!isSaksbehandler) {
     return (
       <Alert variant="info" size="small" inline>
         Bare tildelt saksbehandler kan gjøre dette dokumentet til et hoveddokument.
       </Alert>
     );
   }
 
+  if (isIncomingDocument) {
+    return (
+      <Alert variant="info" size="small" inline>
+        Inngående dokumenter kan ikke gjøres om til hoveddokument.
+      </Alert>
+    );
+  }
+
   return (
     <Button size="small" variant="secondary-neutral" onClick={onClick} loading={isLoading}>
       Gjør til hoveddokument

frontend/src/hooks/use-can-document/use-can-drop-on-document.ts

@@ -62,7 +62,7 @@ export const useCanDropOnDocument = (targetDocument: IMainDocument) => {
 
   if (isTildeltSaksbehandler || hasOppgavestyringRole || (isFullfoert && hasSaksbehandlerRole)) {
     if (getIsIncomingDocument(targetDocument.dokumentTypeId)) {
-      return draggedDocument.type === DocumentTypeEnum.UPLOADED;
+      return draggedDocument.type === DocumentTypeEnum.UPLOADED && draggedDocument.parentId !== null;
     }
 
     return draggedDocument.type === DocumentTypeEnum.JOURNALFOERT || getIsRolQuestions(targetDocument);