Fix: [EBE-103] Fix tables order (#92)

Co-authored-by: Emanuele Stazzi <>

Author: Emanuele-Stazzi

src/pages/initiativeStores/InitiativeStores.tsx

@@ -37,6 +37,7 @@ const InitiativeStores: React.FC = () => {
   const [stores, setStores] = useState<Array<PointOfSaleDTO>>([]);
   const [storesPagination, setStoresPagination] = useState<any>({});
   const [storesLoading, setStoresLoading] = useState(false);
+  const [currentSort, setCurrentSort] = useState<string>('asc');
   const { t } = useTranslation();
   const history = useHistory();
   const { id } = useParams<RouteParams>();
@@ -157,7 +158,12 @@ const InitiativeStores: React.FC = () => {
   });
 
   const handleFiltersApplied = (values: GetPointOfSalesFilters) => {
-    fetchStores(values).catch(error => {
+    const filtersWithSort = {
+      ...values,
+      sort: currentSort,
+      page: 0
+    };
+    fetchStores(filtersWithSort).catch(error => {
       console.error('Error fetching stores:', error);
     });
 
@@ -183,23 +189,27 @@ const InitiativeStores: React.FC = () => {
   const handleSortModelChange = async (newSortModel: GridSortModel) => {
     if (newSortModel.length > 0) {
       const { field, sort } = newSortModel[0];
+      const sortKey = field === 'referent' ? `contactName,${sort}` : `${field},${sort}`;
+      setCurrentSort(sortKey);
       await fetchStores({
         ...formik.values,
-        sort: `${field},${sort}`, 
+        sort: sortKey,
       }, true).catch(error => {
         console.error('Error fetching stores:', error);
       });
-      
+
     } else {
       console.log('Ordinamento rimosso.');
+      setCurrentSort('asc');
     }
   };
 
   const handlePaginationPageChange = (page: number) => {
     setStoresPagination(page);
     fetchStores({
       ...formik.values,
-      page
+      page,
+      sort: currentSort
     }).catch(error => {
       console.error('Error fetching stores:', error);
     });

src/pages/initiativeStores/initiativeStoreDetail.tsx

@@ -47,6 +47,7 @@ const InitiativeStoreDetail = () => {
   const { t } = useTranslation();
   const { id, store_id } = useParams<RouteParams>();
   const addError = useErrorDispatcher();
+  const [sortModel, setSortModel] = useState<GridSortModel>([]);
 
 
   useEffect(() => {
@@ -197,6 +198,7 @@ const InitiativeStoreDetail = () => {
   };
 
   const handleSortModelChange = async (newSortModel: GridSortModel) => {
+    setSortModel(newSortModel);
     if (newSortModel.length > 0) {
       const { field, sort } = newSortModel[0];
       await fetchStoreTransactions({
@@ -248,12 +250,20 @@ const InitiativeStoreDetail = () => {
   };
 
   const handlePaginationPageChange = (page: number) => {
-    setPaginationModel({
+    setPaginationModel((prev: any) => ({
+      ...prev,
       page,
-    });
+    }));
+
+    const sortParam =
+      sortModel.length > 0
+        ? `${sortModel[0].field !== 'fiscalCode' ? sortModel[0].field : 'userId'},${sortModel[0].sort}`
+        : undefined;
+
     fetchStoreTransactions({
       ...transactionsFilters,
       page,
+      ...(sortParam && { sort: sortParam }),
     }).catch(error => {
       console.error('Error fetching stores:', error);
     });