Progress

client/src/components/shop-employees/shop-employees-form.component.jsx

@@ -13,11 +13,10 @@ import {
 } from "antd";
 import { useForm } from "antd/es/form/Form";
 import moment from "moment";
-import querystring from "query-string";
 import React, { useEffect } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
-import { useNavigate, useLocation } from "react-router-dom";
+import { useNavigate, useSearchParams } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
 import { logImEXEvent } from "../../firebase/firebase.utils";
 import {
@@ -36,6 +35,7 @@ import FormDatePicker from "../form-date-picker/form-date-picker.component";
 import FormListMoveArrows from "../form-list-move-arrows/form-list-move-arrows.component";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 import ShopEmployeeAddVacation from "./shop-employees-add-vacation.component";
+import queryString from "query-string";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -48,7 +48,7 @@ export function ShopEmployeesFormComponent({ bodyshop }) {
   const { t } = useTranslation();
   const [form] = useForm();
   const history = useNavigate();
-  const search = querystring.parse(useLocation().search);
+  const search = queryString.parse(useSearchParams().toString());
   const [deleteVacation] = useMutation(DELETE_VACATION);
   const { error, data } = useQuery(QUERY_EMPLOYEE_BY_ID, {
     variables: { id: search.employeeId },
@@ -103,7 +103,7 @@ export function ShopEmployeesFormComponent({ bodyshop }) {
         refetchQueries: ["QUERY_EMPLOYEES"],
       }).then((r) => {
         search.employeeId = r.data.insert_employees.returning[0].id;
-        history.push({ search: querystring.stringify(search) });
+        history({ search: queryString.stringify(search) });
         notification["success"]({
           message: t("employees.successes.save"),
         });