🚧

Author: Xaohs

frontend/src/hooks/useBehandelendAfdelingChoices.ts

@@ -0,0 +1,24 @@
+import { Option } from "@maykin-ui/admin-ui";
+import { useEffect, useState } from "react";
+
+import { listBehandelendAfdelingChoices } from "../lib/api/private";
+import { useAlertOnError } from "./useAlertOnError";
+
+/**
+ * Hook to fetch the list of behandelend afdeling choices.
+ */
+export function useBehandelendAfdelingChoices(): Option[] {
+  const alertOnError = useAlertOnError(
+    "Er is een fout opgetreden bij het ophalen van de resultaattypen!",
+  );
+
+  const [valueState, setValueState] = useState<Option[]>([]);
+  useEffect(() => {
+    console.log("fd");
+    listBehandelendAfdelingChoices()
+      .then((s) => setValueState(s))
+      .catch(alertOnError);
+  }, []);
+
+  return valueState;
+}

frontend/src/hooks/useFields.tsx

@@ -16,7 +16,9 @@ import {
 } from "../lib/fieldSelection/fieldSelection";
 import { formatDate } from "../lib/format/date";
 import { FIELD_SELECTION_STORAGE_KEY } from "../pages/constants";
-import { ExpandZaak, Zaak } from "../types";
+import { Zaak } from "../types";
+import { useBehandelendAfdelingChoices } from "./useBehandelendAfdelingChoices";
+import { useInternalResultaatTypeChoices } from "./useListInternalResultaatTypeChoices";
 import { useSelectielijstKlasseChoices } from "./useSelectielijstKlasseChoices";
 import { useZaaktypeChoices } from "./useZaaktypeChoices";
 
@@ -66,7 +68,9 @@ export function useFields<T extends Zaak = Zaak>(
     review,
     searchParams,
   );
-
+  const behandelenAfdelingChoices = useBehandelendAfdelingChoices();
+  const resultaattypeChoices = useInternalResultaatTypeChoices();
+  console.log(resultaattypeChoices);
   // The raw, unfiltered configuration of the available base fields.
   // Both filterLookup AND filterLookups will be used for clearing filters.
   // NOTE: This get filtered by `getActiveFields()`.
@@ -133,25 +137,8 @@ export function useFields<T extends Zaak = Zaak>(
       name: "Behandelende afdeling",
       type: "string",
       filterLookup: "behandelend_afdeling__icontains",
-      valueTransform: (rowData: object) => {
-        const rollen = (rowData as ExpandZaak)._expand?.rollen || [];
-        if (!rollen.length) return "";
-        const behandelendAfdeling: string[] = [];
-        // TODO - Understand why the ExpandZaak type doesn't work
-        rollen.map((role) => {
-          if (
-            // @ts-expect-error The type of role is 'never' for some reason
-            role.betrokkeneType === "organisatorische_eenheid" &&
-            // @ts-expect-error The type of role is 'never' for some reason
-            role.betrokkeneIdentificatie?.identificatie
-          )
-            behandelendAfdeling.push(
-              // @ts-expect-error The type of role is 'never' for some reason
-              role.betrokkeneIdentificatie?.identificatie,
-            );
-        });
-        return behandelendAfdeling.join(", ");
-      },
+      valueLookup: "_expand.behandelend_afdeling",
+      options: behandelenAfdelingChoices,
       width: "150px",
     },
     {
@@ -167,11 +154,11 @@ export function useFields<T extends Zaak = Zaak>(
     },
     {
       name: "resultaat",
-      filterLookup: "resultaat__resultaattype__omschrijving__icontains",
+      filterLookup: "resultaat__resultaattype__url__icontains",
       filterValue:
-        searchParams.get("resultaat__resultaattype__omschrijving__icontains") ||
-        "",
-      valueLookup: "_expand.resultaat._expand.resultaattype.omschrijving",
+        searchParams.get("resultaat__resultaattype__url__icontains") || "",
+      valueLookup: "_expand.resultaat._expand.resultaattype.url",
+      options: resultaattypeChoices,
       type: "string",
       width: "150px",
     },

frontend/src/hooks/useListInternalResultaatTypeChoices.ts

@@ -0,0 +1,23 @@
+import { Option } from "@maykin-ui/admin-ui";
+import { useEffect, useState } from "react";
+
+import { listInternalResultaatTypeChoices } from "../lib/api/private";
+import { useAlertOnError } from "./useAlertOnError";
+
+/**
+ * Hook to fetch the internal result type choices.
+ */
+export function useInternalResultaatTypeChoices(): Option[] {
+  const alertOnError = useAlertOnError(
+    "Er is een fout opgetreden bij het ophalen van de resultaattypen!",
+  );
+
+  const [valueState, setValueState] = useState<Option[]>([]);
+  useEffect(() => {
+    listInternalResultaatTypeChoices()
+      .then((s) => setValueState(s))
+      .catch(alertOnError);
+  }, []);
+
+  return valueState;
+}

frontend/src/lib/api/private.ts

@@ -67,6 +67,47 @@ export async function listResultaatTypeChoices(zaaktypeUrl?: string) {
   );
 }
 
+/**
+ * Retrieve resultaattypen from Open Zaak and return a value and a label per
+ * resultaattype. The label is the field 'omschrijving'.
+ */
+export async function listInternalResultaatTypeChoices(zaaktypeUrl?: string) {
+  return cacheMemo(
+    "listInternalResultaatTypeChoices",
+    async () => {
+      const response = await request(
+        "GET",
+        "/_internal-resultaattype-choices/",
+        {
+          zaaktype: zaaktypeUrl,
+        },
+      );
+      const promise: Promise<Option[]> = response.json();
+
+      return promise;
+    },
+    [zaaktypeUrl],
+  );
+}
+
+export async function listBehandelendAfdelingChoices(
+  params?:
+    | URLSearchParams
+    | {
+        zaak?: Zaak["url"];
+      },
+) {
+  return cacheMemo("listBehandelendAfdelingChoices", async () => {
+    const response = await request(
+      "GET",
+      "/_retrieve-behandelend-afdeling-choices-choices/",
+      params,
+    );
+    const promise: Promise<Option[]> = response.json();
+    return promise;
+  });
+}
+
 /**
  * This takes the 'selectielijstprocestype' from the 'zaaktype', then retrieves all the 'resultaten' possible for this
  * 'procestype' from the selectielijst API.

frontend/src/pages/destructionlist/abstract/BaseListView.tsx

@@ -99,6 +99,7 @@ export function BaseListView<T extends Zaak = Zaak>({
     ...zaak,
     href: formatMessage(REACT_APP_ZAAK_URL_TEMPLATE || "", zaak),
   })) as unknown as T[];
+  console.log(paginatedZaken.results);
 
   // Fields.
   const [fields, setFields, filterTransform, activeFilters, resetFilters] =