Merge pull request #564 from terrestris/sortOverPages

fix: corrects sorting over multiple pages
terrestris · Jun 28, 2024 · 18ee6d3 · 18ee6d3
2 parents 761d32c + 4bda1d5
commit 18ee6d3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/Component/GeneralEntity/GeneralEntityRoot/GeneralEntityRoot.tsx b/src/Component/GeneralEntity/GeneralEntityRoot/GeneralEntityRoot.tsx
@@ -111,6 +111,7 @@ export type GeneralEntityConfigType<T extends BaseEntity> = {
   i18n: FormTranslations;
   endpoint: string;
   entityType: string;
+  defaultSortField?: string;
   entityName?: string;
   navigationTitle?: string;
   subTitle?: string;
@@ -128,6 +129,7 @@ export function GeneralEntityRoot<T extends BaseEntity>({
   i18n,
   endpoint,
   entityType,
+  defaultSortField,
   entityName = 'Entität',
   navigationTitle = 'Entitäten',
   subTitle = '… mit denen man Dinge tun kann (aus Gründen bspw.)',
@@ -170,11 +172,11 @@ export function GeneralEntityRoot<T extends BaseEntity>({
   } = useTranslation();
 
   useEffect(() => {
-    setPageCurrent(1);
+    setSortField(defaultSortField? defaultSortField : undefined);
     setSortOrder('ascend');
-    setSortField(undefined);
+    setPageCurrent(1);
     setFiltered(false); // to always obtain pagination when changing the entity
-  }, [entityType]);
+  }, [entityType, defaultSortField]);
 
   /**
    * Validate form fields

diff --git a/src/Page/Portal/Portal.tsx b/src/Page/Portal/Portal.tsx
@@ -124,6 +124,7 @@ export const Portal: React.FC<PortalProps> = () => {
                   path={`${entityConfig?.entityType}/*`}
                   element={
                     <GeneralEntityRoot
+                      key={entityConfig.entityType}
                       {...entityConfig}
                       onEntitiesLoaded={onEntitiesLoaded}
                     />