♻️ #459 - refactor: combine hooks directories

frontend/src/hooks/index.ts

@@ -1,6 +1,16 @@
 export * from "./useAuditLog";
+export * from "./useCombinedSearchParams";
+export * from "./useFields";
+export * from "./useFilter";
 export * from "./useLatestReviewResponse";
+export * from "./usePage";
 export * from "./usePoll";
 export * from "./useReviewers";
+export * from "./useSelectielijstKlasseChoices";
+export * from "./useSort";
 export * from "./useSubmitAction";
 export * from "./useWhoAmI";
+export * from "./useZaakReviewStatusBadges";
+export * from "./useZaakReviewStatuses";
+export * from "./useZaakSelection";
+export * from "./useZaaktypeChoices";

frontend/src/pages/destructionlist/hooks/useFields.test.ts → frontend/src/hooks/useFields.test.ts

@@ -1,8 +1,8 @@
 import { TypedField } from "@maykin-ui/admin-ui";
 import { act, renderHook, waitFor } from "@testing-library/react";
 
-import { selectieLijstKlasseFactory as mockSelectieLijstKlasseFactory } from "../../../fixtures/selectieLijstKlasseChoices";
-import * as fieldSelection from "../../../lib/fieldSelection/fieldSelection";
+import { selectieLijstKlasseFactory as mockSelectieLijstKlasseFactory } from "../fixtures/selectieLijstKlasseChoices";
+import * as fieldSelection from "../lib/fieldSelection/fieldSelection";
 import { useFields } from "./useFields";
 
 jest.mock("./useSelectielijstKlasseChoices", () => ({

frontend/src/pages/destructionlist/hooks/useFields.ts → frontend/src/hooks/useFields.ts

@@ -2,17 +2,17 @@ import { AttributeData, TypedField } from "@maykin-ui/admin-ui";
 import { useCallback, useEffect, useState } from "react";
 import { useSearchParams } from "react-router-dom";
 
-import { DestructionList } from "../../../lib/api/destructionLists";
-import { Review } from "../../../lib/api/review";
+import { DestructionList } from "../lib/api/destructionLists";
+import { Review } from "../lib/api/review";
 import {
   FieldSelection,
   addToFieldSelection,
   getFieldSelection,
   removeFromFieldSelection,
-} from "../../../lib/fieldSelection/fieldSelection";
-import { formatDate } from "../../../lib/format/date";
-import { ExpandZaak, Zaak } from "../../../types";
-import { FIELD_SELECTION_STORAGE_KEY } from "../../constants";
+} from "../lib/fieldSelection/fieldSelection";
+import { formatDate } from "../lib/format/date";
+import { FIELD_SELECTION_STORAGE_KEY } from "../pages/constants";
+import { ExpandZaak, Zaak } from "../types";
 import { useSelectielijstKlasseChoices } from "./useSelectielijstKlasseChoices";
 import { useZaaktypeChoices } from "./useZaaktypeChoices";
 

frontend/src/pages/destructionlist/hooks/useSelectielijstKlasseChoices.test.ts → frontend/src/hooks/useSelectielijstKlasseChoices.test.ts

@@ -1,6 +1,6 @@
 import { renderHook, waitFor } from "@testing-library/react";
 
-import { FIXTURE_SELECTIELIJSTKLASSE_CHOICES } from "../../../fixtures/selectieLijstKlasseChoices";
+import { FIXTURE_SELECTIELIJSTKLASSE_CHOICES } from "../fixtures/selectieLijstKlasseChoices";
 import { useSelectielijstKlasseChoices } from "./useSelectielijstKlasseChoices";
 
 const mockAlert = jest.fn();

frontend/src/pages/destructionlist/hooks/useSelectielijstKlasseChoices.ts → frontend/src/hooks/useSelectielijstKlasseChoices.ts

@@ -1,7 +1,7 @@
 import { Option, useAlert } from "@maykin-ui/admin-ui";
 import { useEffect, useState } from "react";
 
-import { listSelectielijstKlasseChoices } from "../../../lib/api/private";
+import { listSelectielijstKlasseChoices } from "../lib/api/private";
 
 /**
  * Hook resolving selectielijst choices

frontend/src/pages/destructionlist/hooks/useZaakReviewStatusBadges.tsx → frontend/src/hooks/useZaakReviewStatusBadges.tsx

@@ -1,7 +1,7 @@
 import { Badge, Solid } from "@maykin-ui/admin-ui";
 import React, { useMemo } from "react";
 
-import { Zaak } from "../../../types";
+import { Zaak } from "../types";
 import {
   ZAAK_REVIEW_STATUS_ENUM,
   useZaakReviewStatuses,

frontend/src/pages/destructionlist/hooks/useZaakReviewStatuses.tsx → frontend/src/hooks/useZaakReviewStatuses.tsx

@@ -1,6 +1,6 @@
 import { useMemo } from "react";
 
-import { Zaak } from "../../../types";
+import { Zaak } from "../types";
 import { useZaakSelection } from "./useZaakSelection";
 
 export type ZAAK_REVIEW_STATUS_ENUM = boolean | null;

frontend/src/pages/destructionlist/hooks/useZaakSelection.test.ts → frontend/src/hooks/useZaakSelection.test.ts

@@ -1,6 +1,6 @@
 import { act, renderHook, waitFor } from "@testing-library/react";
 
-import { Zaak } from "../../../types";
+import { Zaak } from "../types";
 import { useZaakSelection } from "./useZaakSelection";
 
 jest.mock("react-router-dom", () => ({

frontend/src/pages/destructionlist/hooks/useZaakSelection.ts → frontend/src/hooks/useZaakSelection.ts

@@ -10,8 +10,8 @@ import {
   clearZaakSelection as libClearZaakSelection,
   removeFromZaakSelection,
   setAllZakenSelected,
-} from "../../../lib/zaakSelection/zaakSelection";
-import { Zaak } from "../../../types";
+} from "../lib/zaakSelection/zaakSelection";
+import { Zaak } from "../types";
 
 export type ZaakSelectionClearer = () => Promise<void>;
 

frontend/src/pages/destructionlist/hooks/useZaaktypeChoices.ts → frontend/src/hooks/useZaaktypeChoices.ts

@@ -1,9 +1,9 @@
 import { useAlert } from "@maykin-ui/admin-ui";
 import { useEffect, useState } from "react";
 
-import { DestructionList } from "../../../lib/api/destructionLists";
-import { ZaaktypeChoice, listZaaktypeChoices } from "../../../lib/api/private";
-import { Review } from "../../../lib/api/review";
+import { DestructionList } from "../lib/api/destructionLists";
+import { ZaaktypeChoice, listZaaktypeChoices } from "../lib/api/private";
+import { Review } from "../lib/api/review";
 
 /**
  * Hook resolving zaaktype choices

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

@@ -12,19 +12,19 @@ import React, { useCallback, useMemo } from "react";
 import { useNavigation } from "react-router-dom";
 
 import { DestructionListToolbar } from "../../../components";
-import { DestructionList } from "../../../lib/api/destructionLists";
-import { Review } from "../../../lib/api/review";
-import { PaginatedZaken } from "../../../lib/api/zaken";
-import { Zaak } from "../../../types";
-import { useFields } from "../hooks/useFields";
-import { useFilter } from "../hooks/useFilter";
-import { usePage } from "../hooks/usePage";
-import { useSort } from "../hooks/useSort";
+import { useFields } from "../../../hooks/useFields";
+import { useFilter } from "../../../hooks/useFilter";
+import { usePage } from "../../../hooks/usePage";
+import { useSort } from "../../../hooks/useSort";
 import {
   ZaakSelectionDetailGetter,
   ZaakSelectionZaakFilter,
   useZaakSelection,
-} from "../hooks/useZaakSelection";
+} from "../../../hooks/useZaakSelection";
+import { DestructionList } from "../../../lib/api/destructionLists";
+import { Review } from "../../../lib/api/review";
+import { PaginatedZaken } from "../../../lib/api/zaken";
+import { Zaak } from "../../../types";
 
 /** The template used to format urls to an external application providing zaak details. */
 const REACT_APP_ZAAK_URL_TEMPLATE = process.env.REACT_APP_ZAAK_URL_TEMPLATE;

frontend/src/pages/destructionlist/create/DestructionListCreate.tsx

@@ -14,9 +14,9 @@ import {
 } from "react-router-dom";
 
 import { useSubmitAction } from "../../../hooks";
+import { useZaakSelection } from "../../../hooks/useZaakSelection";
 import { getFilteredZaakSelection } from "../../../lib/zaakSelection/zaakSelection";
 import { BaseListView } from "../abstract";
-import { useZaakSelection } from "../hooks/useZaakSelection";
 import {
   DestructionListCreateAction,
   DestructionListCreateActionResponseData,

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

@@ -10,15 +10,14 @@ import React, { useMemo } from "react";
 import { useNavigation, useRouteLoaderData } from "react-router-dom";
 
 import { ProcessingStatusBadge } from "../../../../components";
-import { useSubmitAction } from "../../../../hooks";
+import { useSubmitAction, useZaakSelection } from "../../../../hooks";
 import { ReviewItemResponse } from "../../../../lib/api/reviewResponse";
 import {
   canMarkAsReadyToReview,
   canMarkListAsFinal,
   canTriggerDestruction,
 } from "../../../../lib/auth/permissions";
 import { getFilteredZaakSelection } from "../../../../lib/zaakSelection/zaakSelection";
-import { useZaakSelection } from "../../hooks";
 import {
   UpdateDestructionListAction,
   UpdateDestructionListProcessReviewAction,

frontend/src/pages/destructionlist/detail/pages/DestructionListProcessReviewPage/DestructionListProcessReviewPage.tsx

@@ -2,6 +2,7 @@ import { Outline, Toolbar, TypedField } from "@maykin-ui/admin-ui";
 import React, { useMemo, useState } from "react";
 import { useRevalidator, useRouteLoaderData } from "react-router-dom";
 
+import { useZaakReviewStatuses } from "../../../../../hooks";
 import { PaginatedDestructionListItems } from "../../../../../lib/api/destructionListsItem";
 import { PaginatedZaken } from "../../../../../lib/api/zaken";
 import {
@@ -11,7 +12,6 @@ import {
 } from "../../../../../lib/zaakSelection/zaakSelection";
 import { Zaak } from "../../../../../types";
 import { BaseListView } from "../../../abstract";
-import { useZaakReviewStatuses } from "../../../hooks";
 import { DestructionListDetailContext } from "../../DestructionListDetail.loader";
 import { useSecondaryNavigation } from "../../hooks/useSecondaryNavigation";
 import {

frontend/src/pages/destructionlist/review/DestructionListReview.tsx

@@ -9,7 +9,7 @@ import {
 import React, { useMemo } from "react";
 import { useLoaderData, useRevalidator } from "react-router-dom";
 
-import { useSubmitAction } from "../../../hooks";
+import { useSubmitAction, useZaakReviewStatusBadges } from "../../../hooks";
 import { ZaakReview } from "../../../lib/api/review";
 import {
   ZaakSelection,
@@ -18,7 +18,6 @@ import {
 } from "../../../lib/zaakSelection/zaakSelection";
 import { Zaak } from "../../../types";
 import { BaseListView } from "../abstract";
-import { useZaakReviewStatusBadges } from "../hooks";
 import { ReviewDestructionListAction } from "./DestructionListReview.action";
 import "./DestructionListReview.css";
 import { DestructionListReviewContext } from "./DestructionListReview.loader";