Merge pull request #223 from assemblee-virtuelle/FixEventsDisplay

[Minor] Fix events list display
assemblee-virtuelle · Jan 21, 2025 · b778381 · b778381
2 parents 220e2cb + f1ba201
commit b778381
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 19 deletions.
diff --git a/frontend/src/resources/Agent/Activity/Event/EventFilterSidebar.tsx b/frontend/src/resources/Agent/Activity/Event/EventFilterSidebar.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { FilterLiveSearch, useTranslate } from 'react-admin';
-import { ReferenceFilter } from '@semapps/list-components';
 import { useLayoutContext } from '../../../../layouts/LayoutContext';
+import ReferenceFilterTree from '../../../../common/ReferenceFilterTree';
 
 const EventFilterSidebar = () => {
   const Layout = useLayoutContext();
@@ -12,11 +12,13 @@ const EventFilterSidebar = () => {
       {Layout.name === 'topMenu' && (
         <FilterLiveSearch fullWidth source="q" hiddenLabel label={translate('resources.Event.searchLabel')} />
       )}
-      <ReferenceFilter
+      <ReferenceFilterTree
         reference="Theme"
+        title="Thèmes"
+        broader="pair:broader"
         source="pair:hasTopic"
-        inverseSource="pair:topicOf"
-        limit={100}
+        label="pair:label"
+        filter={{}}
         sort={{ field: 'pair:label', order: 'DESC' }}
       />
     </Layout.Aside>

diff --git a/frontend/src/resources/Agent/Activity/Event/EventList.jsx b/frontend/src/resources/Agent/Activity/Event/EventList.jsx
@@ -1,8 +1,6 @@
 import React from 'react';
-import { SimpleList } from 'react-admin';
-import { Avatar } from '@mui/material';
 import { MultiViewsList } from '@semapps/list-components';
-import { CalendarList } from '@semapps/date-components';
+import { CalendarList, DaysList } from '@semapps/date-components';
 import frLocale from '@fullcalendar/core/locales/fr';
 import ListIcon from '@mui/icons-material/List';
 import EventIcon from '@mui/icons-material/Event';
@@ -32,16 +30,14 @@ const EventList = props => (
       list: {
         label: 'Liste',
         icon: ListIcon,
-        sort: { field: 'pair:startDate', order: 'DESC' },
-        perPage: 25,
+        perPage: 1000,
+        pagination: false,
         list: (
-          <SimpleList
-            primaryText={record => record['pair:label']}
-            leftAvatar={record => (
-              <Avatar src={record['image']} width="100%">
-                <EventIcon />
-              </Avatar>
-            )}
+          <DaysList
+            locale={frLocale}
+            label="pair:label"
+            startDate="pair:startDate"
+            endDate="pair:endDate"
             linkType="show"
           />
         )

diff --git a/frontend/src/resources/Agent/Activity/Project/ProjectFilterSidebar.tsx b/frontend/src/resources/Agent/Activity/Project/ProjectFilterSidebar.tsx
@@ -2,6 +2,7 @@ import React from 'react';
 import { FilterLiveSearch, useTranslate } from 'react-admin';
 import { ReferenceFilter } from '@semapps/list-components';
 import { useLayoutContext } from '../../../../layouts/LayoutContext';
+import ReferenceFilterTree from '../../../../common/ReferenceFilterTree';
 
 const ProjectFilterSidebar = () => {
   const Layout = useLayoutContext();
@@ -19,11 +20,13 @@ const ProjectFilterSidebar = () => {
         filter={{ a: 'pair:ProjectStatus' }}
         sort={{ field: 'pair:label', order: 'DESC' }}
       />
-      <ReferenceFilter
+      <ReferenceFilterTree
         reference="Theme"
+        title="Thèmes"
+        broader="pair:broader"
         source="pair:hasTopic"
-        inverseSource="pair:topicOf"
-        limit={100}
+        label="pair:label"
+        filter={{}}
         sort={{ field: 'pair:label', order: 'DESC' }}
       />
       <ReferenceFilter