Merge branch 'master' into feature/america

client/src/pages/shop/shop.page.component.jsx

@@ -1,5 +1,7 @@
 import { Tabs } from "antd";
 import React, { useEffect } from "react";
+import { useHistory, useLocation } from "react-router-dom";
+import queryString from "query-string";
 import { useTranslation } from "react-i18next";
 import ShopEmployeesContainer from "../../components/shop-employees/shop-employees.container";
 import ShopInfoContainer from "../../components/shop-info/shop-info.container";
@@ -26,6 +28,9 @@ const mapDispatchToProps = (dispatch) => ({
 
 export function ShopPage({ bodyshop, setSelectedHeader, setBreadcrumbs }) {
   const { t } = useTranslation();
+  const history = useHistory();
+  const search = queryString.parse(useLocation().search);
+
   useEffect(() => {
     document.title = t("titles.shop");
     setSelectedHeader("shop");
@@ -39,7 +44,10 @@ export function ShopPage({ bodyshop, setSelectedHeader, setBreadcrumbs }) {
 
   return (
     <RbacWrapper action="shop:config">
-      <Tabs>
+      <Tabs
+        defaultActiveKey={search.tab}
+        onChange={(key) => history.push({ search: `?tab=${key}` })}
+      >
         <Tabs.TabPane tab={t("bodyshop.labels.shopinfo")} key="info">
           <ShopInfoContainer />
         </Tabs.TabPane>