Merge pull request #1079 from cultuurnet/feature/III-6713

III-6713 - Change logic of recent used organizers on dashboard

Author: brampauwelyn

src/pages/dashboard/index.page.tsx

@@ -4,7 +4,7 @@ import { useRouter } from 'next/router';
 import React, { ComponentType, useMemo, useState } from 'react';
 import { Cookies } from 'react-cookie';
 import { Trans, useTranslation } from 'react-i18next';
-import { useQueryClient, UseQueryResult } from 'react-query';
+import { useQueryClient } from 'react-query';
 import { dehydrate } from 'react-query/hydration';
 
 import { CalendarType } from '@/constants/CalendarType';
@@ -15,12 +15,12 @@ import {
   useDeleteEventByIdMutation,
   useGetEventsByCreatorQuery,
 } from '@/hooks/api/events';
+import { useGetOffersByCreatorQuery } from '@/hooks/api/offers';
 import {
   prefetchGetOrganizersByCreatorQuery,
   useDeleteOrganizerByIdMutation,
   useGetOrganizersByCreatorQuery,
   useGetOrganizersByQueryQuery,
-  useGetSuggestedOrganizersQuery,
 } from '@/hooks/api/organizers';
 import {
   prefetchGetPlacesByCreatorQuery,
@@ -47,7 +47,6 @@ import { Alert, AlertVariants } from '@/ui/Alert';
 import { Box } from '@/ui/Box';
 import { Button, ButtonVariants } from '@/ui/Button';
 import { Dropdown } from '@/ui/Dropdown';
-import { Icons } from '@/ui/Icon';
 import type { InlineProps } from '@/ui/Inline';
 import { getInlineProps, Inline } from '@/ui/Inline';
 import { LabelPositions } from '@/ui/Label';
@@ -224,11 +223,6 @@ const OfferRow = ({ item: offer, onDelete, ...props }: OfferRowProps) => {
     ? t(`eventTypes*${typeId}`, { keySeparator: '*' })
     : undefined;
 
-  const period =
-    offer.calendarSummary?.[i18n.language]?.text?.[
-      offer.calendarType === CalendarType.SINGLE ? 'lg' : 'sm'
-    ];
-
   const rowStatus = useMemo<RowStatus>(() => {
     if (isPlanned) {
       return 'PLANNED';
@@ -580,21 +574,42 @@ const Dashboard = (): any => {
     );
   };
 
-  const suggestedOrganizerIds = useGetSuggestedOrganizersQuery(
-    {},
+  const getOffersByCreatorQuery = useGetOffersByCreatorQuery(
+    {
+      advancedQuery: '_exists_:organizer.id',
+      creator: user,
+      paginationOptions: { start: 0, limit: 30 },
+    },
     { enabled: tab === 'organizers' },
   );
 
-  suggestedOrganizerIds.data;
+  const recentUsedOrganizers = useMemo(() => {
+    const recentOrganizers: Organizer[] = [];
+
+    getOffersByCreatorQuery.data?.member.forEach((event) => {
+      if (
+        event.organizer &&
+        !recentOrganizers.some(
+          (recentOrganizer) =>
+            recentOrganizer['@id'] === event.organizer['@id'],
+        )
+      )
+        recentOrganizers.push(event.organizer);
+    });
+
+    return recentOrganizers.slice(0, 10);
+  }, [getOffersByCreatorQuery.data?.member]);
 
   const suggestedOrganizers = useGetOrganizersByQueryQuery(
     {
-      q: suggestedOrganizerIds.data?.member
-        .map((result) => `id:${parseOfferId(result['@id'])}`)
-        .join(' OR '),
+      q:
+        recentUsedOrganizers
+          .map((organizer) => `id:${parseOfferId(organizer['@id'])}`)
+          .join(' OR ') +
+        ` NOT creator:"${user?.['https://publiq.be/uitidv1id'] ?? user?.sub}"`,
     },
     {
-      enabled: suggestedOrganizerIds.data?.member?.length > 0,
+      enabled: tab === 'organizers' && recentUsedOrganizers.length > 0,
     },
   );