Skip to content

Commit

Permalink
Fix bug where saksbehandler could not delete own attachments that wer…
Browse files Browse the repository at this point in the history
…e siblings with ROL answers
  • Loading branch information
eriksson-daniel committed Oct 4, 2024
1 parent 370705d commit 9838666
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 24 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { useCallback, useContext, useRef, useState } from 'react';
import { styled } from 'styled-components';
import { DragAndDropContext } from '@app/components/documents/drag-context';
import { useOppgaveId } from '@app/hooks/oppgavebehandling/use-oppgave-id';
import { useCanDeleteDocument } from '@app/hooks/use-can-document/use-can-delete-document';
import { useCanEditDocument } from '@app/hooks/use-can-document/use-can-edit-document';
import { useAttachments, useParentDocument } from '@app/hooks/use-parent-document';
import { useRemoveDocument } from '@app/hooks/use-remove-document';
import { useDeleteDocumentMutation } from '@app/redux-api/oppgaver/mutations/documents';
Expand All @@ -26,7 +26,9 @@ export const DeleteDropArea = () => {
const containsRolAttachments =
pdfOrSmartDocuments.some((d) => d.creator.creatorRole === CreatorRole.KABAL_ROL) ||
journalfoerteDocuments.some((d) => d.creator.creatorRole === CreatorRole.KABAL_ROL);
const isDropTarget = useCanDeleteDocument(draggedDocument, containsRolAttachments, parentDocument);
const canEdit = useCanEditDocument(draggedDocument, parentDocument);
const isAttachment = parentDocument !== undefined;
const isDropTarget = canEdit && (isAttachment || !containsRolAttachments);

const onDragEnter = useCallback(
(e: React.DragEvent<HTMLDivElement>) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ import { SetFilename } from '@app/components/documents/set-filename';
import { useNoFlickerReloadPdf } from '@app/components/view-pdf/no-flicker-reload';
import { getIsIncomingDocument } from '@app/functions/is-incoming-document';
import { useOppgaveId } from '@app/hooks/oppgavebehandling/use-oppgave-id';
import { useCanDeleteDocument } from '@app/hooks/use-can-document/use-can-delete-document';
import { useCanEditDocument } from '@app/hooks/use-can-document/use-can-edit-document';
import { useAttachments } from '@app/hooks/use-parent-document';
import { useSetTitleMutation } from '@app/redux-api/oppgaver/mutations/documents';
Expand All @@ -37,10 +36,10 @@ interface Props {
containsRolAttachments: boolean;
}

// eslint-disable-next-line complexity
export const DocumentModalContent = ({ document, parentDocument, containsRolAttachments }: Props) => {
const canEditDocument = useCanEditDocument(document, parentDocument);
const { pdfOrSmartDocuments, journalfoerteDocuments } = useAttachments(document.id);
const canDelete = useCanDeleteDocument(document, containsRolAttachments, parentDocument);
const [setTitle] = useSetTitleMutation();
const oppgaveId = useOppgaveId();
const [pdfLoading, setPdfLoading] = useState(false);
Expand All @@ -58,6 +57,8 @@ export const DocumentModalContent = ({ document, parentDocument, containsRolAtta

const hasAttachments = pdfOrSmartDocuments.length > 0 || journalfoerteDocuments.length > 0;

const canDelete = isMainDocument && containsRolAttachments ? false : canEditDocument;

return (
<>
<ModalBody $isMainDocument={isMainDocument}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ const NewAttachmentInternal = memo<NewDocumentInternalProps>(
containsRolAttachments,
onDragStart,
}) => {
const isDraggable = draggingEnabled && canEdit && !containsRolAttachments;
const isDraggable = draggingEnabled && canEdit;

return (
<StyledNewAttachment
Expand Down
19 changes: 0 additions & 19 deletions frontend/src/hooks/use-can-document/use-can-delete-document.ts

This file was deleted.

0 comments on commit 9838666

Please sign in to comment.