👌 [#234] PR Feedback

Author: SilviaAmAm

frontend/src/lib/api/private.ts

@@ -10,11 +10,6 @@ export type ZaaktypeChoice = Option & {
   extra: string;
 };
 
-export type ZaaktypeChoicesQueryParam = {
-  destructionList?: DestructionList["uuid"];
-  review?: Review["pk"];
-};
-
 /**
  * This takes the 'selectielijstprocestype' from the 'zaaktype', then retrieves all the 'resultaten' possible for this
  * 'procestype' from the selectielijst API.
@@ -40,9 +35,18 @@ export async function listSelectieLijstKlasseChoices(
  * an the value is the URL. The response is cached for 15 minutes.
  */
 export async function listZaaktypeChoices(
-  zaaktypeChoicesQueryParam?: ZaaktypeChoicesQueryParam,
+  destructionListUuid?: DestructionList["uuid"],
+  reviewPk?: Review["pk"],
 ) {
-  const params = zaaktypeChoicesQueryParam || undefined;
+  let params;
+  if (reviewPk) {
+    params = { review: reviewPk };
+  } else if (destructionListUuid) {
+    params = { destructionList: destructionListUuid };
+  } else {
+    params = undefined;
+  }
+
   const response = await request("GET", "/_zaaktypen-choices/", params);
   const promise: Promise<ZaaktypeChoice[]> = response.json();
   return promise;

frontend/src/pages/destructionlist/create/components/DestructionList/DestructionList.tsx

@@ -1,12 +1,13 @@
 import { DataGridProps, ListTemplate } from "@maykin-ui/admin-ui";
-import { useActionData, useNavigation } from "react-router-dom";
+import { useActionData, useLoaderData, useNavigation } from "react-router-dom";
 
 import { PaginatedZaken } from "../../../../../lib/api/zaken";
 import { Zaak } from "../../../../../types";
 import {
   DataGridAction,
   useDataGridProps,
 } from "../../../hooks/useDataGridProps";
+import { DestructionListReviewContext } from "../../../review";
 
 export type DestructionList = React.PropsWithChildren<
   {
@@ -39,11 +40,14 @@ export function DestructionList({
 }: DestructionList) {
   const { state } = useNavigation();
   const actionErrors = useActionData() || {};
+  const { uuid: destructionListUuid } =
+    useLoaderData() as DestructionListReviewContext;
   const { props: dataGridProps, error } = useDataGridProps(
     storageKey,
     zaken,
     selectedZaken,
     actions,
+    destructionListUuid,
   );
   const _errors =
     errors || [...Object.values(actionErrors), error].filter((v) => v);

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

@@ -135,7 +135,7 @@ export function DestructionListEdit() {
         : destructionListItems,
     isEditingState ? [...zakenOnPage, ...selectedUrls] : [],
     undefined,
-    { destructionList: destructionList.uuid },
+    destructionList.uuid,
   );
 
   // Update the selected zaken to session storage.

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

@@ -311,7 +311,8 @@ export function DestructionListProcessReview() {
     },
     selectedUrls,
     processZaakReviewZaakActions,
-    review ? { review: review.pk } : undefined,
+    undefined,
+    review?.pk,
   );
 
   // Update the selected zaken to session storage.

frontend/src/pages/destructionlist/hooks/useDataGridProps.tsx

@@ -10,15 +10,13 @@ import {
 import { ReactNode, useEffect, useRef, useState } from "react";
 import { useNavigation, useSearchParams } from "react-router-dom";
 
+import { DestructionList } from "../../../lib/api/destructionLists";
 import {
   DestructionListItem,
   PaginatedDestructionListItems,
 } from "../../../lib/api/destructionListsItem";
-import {
-  ZaaktypeChoice,
-  ZaaktypeChoicesQueryParam,
-  listZaaktypeChoices,
-} from "../../../lib/api/private";
+import { ZaaktypeChoice, listZaaktypeChoices } from "../../../lib/api/private";
+import { Review } from "../../../lib/api/review";
 import { PaginatedZaken } from "../../../lib/api/zaken";
 import {
   FieldSelection,
@@ -52,7 +50,8 @@ export function useDataGridProps(
   paginatedResults: PaginatedDestructionListItems | PaginatedZaken,
   selectedResults: (Zaak | { url: string })[],
   actions?: DataGridAction[],
-  zaaktypeChoicesQueryParams?: ZaaktypeChoicesQueryParam,
+  destructionListUuid?: DestructionList["uuid"],
+  reviewPk?: Review["pk"],
 ): { props: DataGridProps; error: unknown } {
   const { state } = useNavigation();
   const [searchParams, setSearchParams] = useSearchParams();
@@ -84,7 +83,7 @@ export function useDataGridProps(
     ZaaktypeChoice[]
   >([]);
   useEffect(() => {
-    listZaaktypeChoices(zaaktypeChoicesQueryParams)
+    listZaaktypeChoices(destructionListUuid, reviewPk)
       .then((z) => setZaaktypeChoicesState(z))
       .catch((e) => setErrorState(e));
   }, []);