♻️ - refactor: clean up some code

Author: svenvandescheur

frontend/src/fixtures/destructionList.ts

@@ -1,9 +1,12 @@
-import { DestructionList } from "../lib/api/destructionLists";
+import {
+  DestructionList,
+  DestructionListRead,
+} from "../lib/api/destructionLists";
 import { createObjectFactory } from "./factory";
 import { defaultAssignees } from "./reviewers";
 import { userFactory } from "./user";
 
-const FIXTURE_DESTRUCTION_LIST: DestructionList = {
+const FIXTURE_DESTRUCTION_LIST: DestructionListRead = {
   pk: 1,
   uuid: "00000000-0000-0000-0000-000000000000",
   name: "My First Destruction List",
@@ -18,7 +21,7 @@ const FIXTURE_DESTRUCTION_LIST: DestructionList = {
   statusChanged: "2024-07-11:16:57",
 };
 
-const destructionListFactory = createObjectFactory<DestructionList>(
+const destructionListFactory = createObjectFactory<DestructionListRead>(
   FIXTURE_DESTRUCTION_LIST,
 );
 

frontend/src/fixtures/reviewers.ts

@@ -1,9 +1,10 @@
+import { DestructionListAssigneeRead } from "../lib/api/destructionLists";
 import { beoordelaarFactory, recordManagerFactory } from "./user";
 
-const defaultAssignees = [
+const defaultAssignees: DestructionListAssigneeRead[] = [
   {
     user: recordManagerFactory(),
-    role: "record_manager",
+    role: "author",
   },
   {
     user: beoordelaarFactory(),

frontend/src/lib/api/destructionLists.ts

@@ -109,7 +109,7 @@ export async function createDestructionList(
  */
 export async function getDestructionList(uuid: string) {
   const response = await request("GET", `/destruction-lists/${uuid}/`);
-  const promise: Promise<DestructionList> = response.json();
+  const promise: Promise<DestructionListRead> = response.json();
   return promise;
 }
 

frontend/src/lib/api/reviewResponse.ts

@@ -50,7 +50,7 @@ export async function getLatestReviewResponse(
     | {
         review?: Review["pk"];
       },
-) {
+): Promise<ReviewResponse | undefined> {
   const reviews = await listReviewResponses({
     ...params,
   });

frontend/src/pages/destructionlist/detail/DestructionListDetail.loader.ts

@@ -5,7 +5,7 @@ import { listArchivists } from "../../../lib/api/archivist";
 import { AuditLogItem, listAuditLog } from "../../../lib/api/auditLog";
 import { User, whoAmI } from "../../../lib/api/auth";
 import {
-  DestructionList,
+  DestructionListRead,
   getDestructionList,
 } from "../../../lib/api/destructionLists";
 import {
@@ -19,6 +19,10 @@ import {
   getLatestReview,
   listReviewItems,
 } from "../../../lib/api/review";
+import {
+  ReviewResponse,
+  getLatestReviewResponse,
+} from "../../../lib/api/reviewResponse";
 import { listReviewers } from "../../../lib/api/reviewers";
 import { PaginatedZaken, listZaken } from "../../../lib/api/zaken";
 import {
@@ -34,7 +38,7 @@ import {
 export interface DestructionListDetailContext {
   storageKey: string;
 
-  destructionList: DestructionList;
+  destructionList: DestructionListRead;
   destructionListItems: PaginatedDestructionListItems;
   logItems: AuditLogItem[];
 
@@ -47,6 +51,7 @@ export interface DestructionListDetailContext {
 
   review: Review | null;
   reviewItems: ReviewItemWithZaak[] | null;
+  reviewResponse?: ReviewResponse;
 
   selectieLijstKlasseChoicesMap: Record<string, Option[]> | null;
 }
@@ -162,6 +167,7 @@ export const destructionListDetailLoader = loginRequired(
 
       const [
         destructionListItems,
+        reviewResponse,
         logItems,
         zaakSelection,
         allZaken,
@@ -171,6 +177,10 @@ export const destructionListDetailLoader = loginRequired(
         selectieLijstKlasseChoicesMap,
       ] = await Promise.all([
         getDestructionListItems(),
+        review &&
+          getLatestReviewResponse({
+            review: review.pk,
+          }),
         listAuditLog(destructionList.uuid),
         getZaakSelection(storageKey),
         getSelectableZaken(),
@@ -203,6 +213,7 @@ export const destructionListDetailLoader = loginRequired(
 
         review: review,
         reviewItems: reviewItemsWithZaak,
+        reviewResponse,
 
         selectieLijstKlasseChoicesMap,
       };

frontend/src/pages/destructionlist/detail/components/DestructionListAuditLog/DestructionListAuditLog.tsx

@@ -4,15 +4,14 @@ import { useLoaderData } from "react-router-dom";
 import { AuditLogItem } from "../../../../../lib/api/auditLog";
 import { formatDate } from "../../../../../lib/format/date";
 import { formatUser } from "../../../../../lib/format/user";
+import { DestructionListDetailContext } from "../../DestructionListDetail.loader";
 
 /**
  * Toolbar on top of destruction list page providing meta information.
  * @constructor
  */
 export function DestructionListAuditLog() {
-  const { logItems } = useLoaderData() as {
-    logItems: AuditLogItem[];
-  };
+  const { logItems } = useLoaderData() as DestructionListDetailContext;
 
   const objectList = logItems.map((logItem) => ({
     Datum: formatDate(logItem.timestamp),

frontend/src/pages/destructionlist/detail/components/DestructionListToolbar/DestructionListToolbar.tsx

@@ -12,17 +12,13 @@ import {
 import { useLoaderData } from "react-router-dom";
 
 import { ProcessingStatusBadge } from "../../../../../components";
-import { AuditLogItem } from "../../../../../lib/api/auditLog";
-import { User } from "../../../../../lib/api/auth";
-import { DestructionListRead } from "../../../../../lib/api/destructionLists";
-import { Review } from "../../../../../lib/api/review";
-import { ReviewResponse } from "../../../../../lib/api/reviewResponse";
 import { formatDate } from "../../../../../lib/format/date";
 import { formatUser } from "../../../../../lib/format/user";
 import {
   REVIEW_DECISION_LEVEL_MAPPING,
   REVIEW_DECISION_MAPPING,
 } from "../../../../constants";
+import { DestructionListDetailContext } from "../../DestructionListDetail.loader";
 import { DestructionListAuditLog } from "../DestructionListAuditLog";
 import { DestructionListReviewer } from "../index";
 
@@ -36,13 +32,7 @@ export type DestructionListToolbarProps = {
  */
 export function DestructionListToolbar({ title }: DestructionListToolbarProps) {
   const { destructionList, logItems, review, reviewers, reviewResponse } =
-    useLoaderData() as {
-      destructionList: DestructionListRead;
-      logItems: AuditLogItem[];
-      review: Review;
-      reviewers: User[];
-      reviewResponse?: ReviewResponse;
-    };
+    useLoaderData() as DestructionListDetailContext;
 
   const properties = (
     <Grid>

frontend/src/pages/destructionlist/detail/hooks/useSecondaryNavigation.tsx

@@ -48,7 +48,6 @@ export function useSecondaryNavigation(): ToolbarItem[] {
     archivists,
     review,
     reviewItems,
-    zaakSelection, // FIXME Remove the use of full selection.
   } = useLoaderData() as DestructionListDetailContext;
 
   const confirm = useConfirm();