Skip to content

Commit 63ce2b0

Browse files
Remove option to convert incoming document to attachment
1 parent ef49a00 commit 63ce2b0

File tree

3 files changed

+6
-25
lines changed

3 files changed

+6
-25
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ export const DocumentModalContent = ({ document, parentDocument, containsRolAtta
115115
) : null}
116116

117117
{canEditDocument && !isRolQuestions ? (
118-
<SetParentDocument document={document} parentDocument={parentDocument} hasAttachments={hasAttachments} />
118+
<SetParentDocument document={document} hasAttachments={hasAttachments} />
119119
) : null}
120120

121121
{canEditDocument && isInngående ? <MottattDato document={document} oppgaveId={oppgaveId} /> : null}

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

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import { DocumentIcon, type ModalDocumentType } from '@app/components/documents/new-documents/shared/document-icon';
2-
import { getIsIncomingDocument } from '@app/functions/is-incoming-document';
32
import { useOppgaveId } from '@app/hooks/oppgavebehandling/use-oppgave-id';
43
import { useIsRol } from '@app/hooks/use-is-rol';
54
import { useIsSaksbehandler } from '@app/hooks/use-is-saksbehandler';
@@ -20,28 +19,20 @@ const IS_PARENT_DOCUMENT = 'PARENT_DOCUMENT_VALUE';
2019

2120
interface Props {
2221
document: IMainDocument;
23-
parentDocument: IMainDocument | undefined;
2422
hasAttachments: boolean;
2523
}
2624

27-
export const SetParentDocument = ({ document, parentDocument, hasAttachments }: Props) => {
25+
export const SetParentDocument = ({ document, hasAttachments }: Props) => {
2826
const oppgaveId = useOppgaveId();
2927
const { data, isLoading: isLoadingDocuments } = useGetDocumentsQuery(oppgaveId);
3028
const [setParent, { isLoading: isSetting }] = useSetParentMutation();
3129
const isRol = useIsRol();
3230

33-
const isIncomingDocument =
34-
getIsIncomingDocument(document.dokumentTypeId) || getIsIncomingDocument(parentDocument?.dokumentTypeId);
35-
3631
const potentialParents = useMemo(() => {
3732
if (data === undefined) {
3833
return [];
3934
}
4035

41-
if (document.type === DocumentTypeEnum.UPLOADED || isIncomingDocument) {
42-
return data.filter((d) => document.id !== d.id && d.parentId === null && getIsIncomingDocument(d.dokumentTypeId));
43-
}
44-
4536
if (hasAttachments) {
4637
return [];
4738
}
@@ -53,7 +44,7 @@ export const SetParentDocument = ({ document, parentDocument, hasAttachments }:
5344
}
5445

5546
return data.filter((d) => document.id !== d.id && d.parentId === null);
56-
}, [data, document.id, document.type, hasAttachments, isIncomingDocument, isRol]);
47+
}, [data, document.id, document.type, hasAttachments, isRol]);
5748

5849
if (
5950
isLoadingDocuments ||
@@ -74,12 +65,7 @@ export const SetParentDocument = ({ document, parentDocument, hasAttachments }:
7465
Vedlegg eller hoveddokument
7566
</Heading>
7667

77-
<MainDocument
78-
document={document}
79-
isIncomingDocument={isIncomingDocument}
80-
onClick={() => setParentFn(null)}
81-
isLoading={isSetting}
82-
/>
68+
<MainDocument document={document} onClick={() => setParentFn(null)} isLoading={isSetting} />
8369

8470
<RadioGroup
8571
size="small"
@@ -100,12 +86,11 @@ export const SetParentDocument = ({ document, parentDocument, hasAttachments }:
10086

10187
interface MainDocumentProps {
10288
document: IMainDocument;
103-
isIncomingDocument: boolean;
10489
onClick: () => void;
10590
isLoading: boolean;
10691
}
10792

108-
const MainDocument = ({ document, isIncomingDocument, onClick, isLoading }: MainDocumentProps) => {
93+
const MainDocument = ({ document, onClick, isLoading }: MainDocumentProps) => {
10994
const isJournalfoert = document.type === DocumentTypeEnum.JOURNALFOERT;
11095
const isSaksbehandler = useIsSaksbehandler();
11196

@@ -125,7 +110,7 @@ const MainDocument = ({ document, isIncomingDocument, onClick, isLoading }: Main
125110
);
126111
}
127112

128-
if (!(isSaksbehandler || isIncomingDocument)) {
113+
if (!isSaksbehandler) {
129114
return (
130115
<Alert variant="info" size="small" inline>
131116
Bare tildelt saksbehandler kan gjøre dette dokumentet til et hoveddokument.

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,6 @@ export const useCanDropOnDocument = (targetDocument: IMainDocument) => {
6161
}
6262

6363
if (isTildeltSaksbehandler || hasOppgavestyringRole || (isFullfoert && hasSaksbehandlerRole)) {
64-
if (getIsIncomingDocument(targetDocument.dokumentTypeId)) {
65-
return draggedDocument.type === DocumentTypeEnum.UPLOADED;
66-
}
67-
6864
return draggedDocument.type === DocumentTypeEnum.JOURNALFOERT || getIsRolQuestions(targetDocument);
6965
}
7066

0 commit comments

Comments
 (0)