Fixed: issues with sorting loaded from URL.

Author: MadOPcode

src/routes/WorkPeriods/components/Periods/index.jsx

@@ -10,7 +10,10 @@ import {
   getWorkPeriodsSorting,
 } from "store/selectors/workPeriods";
 import { updateStateFromQuery } from "store/actions/workPeriods";
-import { loadWorkPeriodsPage } from "store/thunks/workPeriods";
+import {
+  loadWorkPeriodsPage,
+  updateQueryFromState,
+} from "store/thunks/workPeriods";
 
 /**
  * Displays working periods' list or a "Loading..." message or an error message.
@@ -30,6 +33,7 @@ const Periods = () => {
   }, [dispatch, pagination.pageNumber, pagination.pageSize, sorting]);
 
   useEffect(() => {
+    dispatch(updateQueryFromState(true));
     return globalHistory.listen(({ action, location }) => {
       if (action === "POP") {
         dispatch(updateStateFromQuery(location.search));

src/store/reducers/workPeriods.js

@@ -759,14 +759,17 @@ function updateStateFromQuery(queryStr, state) {
     updateFilters = true;
   }
   // checking sorting criteria
-  const criteria = params.criteria?.toUpperCase();
-  if (criteria in SORT_BY && criteria !== sorting.criteria) {
+  let criteria = params.criteria?.toUpperCase();
+  criteria = criteria in SORT_BY ? criteria : SORT_BY_DEFAULT;
+  if (criteria !== sorting.criteria) {
     sorting.criteria = criteria;
     updateSorting = true;
   }
   // checking sorting order
-  const order = params.order;
-  if (order && order.toUpperCase() in SORT_ORDER && order !== sorting.order) {
+  let order = params.order;
+  order =
+    order && order.toUpperCase() in SORT_ORDER ? order : SORT_ORDER_DEFAULT;
+  if (order !== sorting.order) {
     sorting.order = order;
     updateSorting = true;
   }