ordering-ui-admin-external 1.24.2 → 1.25.0

package/src/components/Users/UsersList/index.js

@@ -4,7 +4,7 @@ import { useLanguage, useUtils } from 'ordering-components-admin-external'
 import FaUserAlt from '@meronex/icons/fa/FaUserAlt'
 
 import { Envelope, Phone, CheckSquareFill, Square } from 'react-bootstrap-icons'
-import { Switch } from '../../../styles'
+import { Switch, LinkButton } from '../../../styles'
 import { ConfirmAdmin, Pagination } from '../../Shared'
 
 import {
@@ -19,7 +19,6 @@ import {
   UserTypeWrapper,
   UserEnableWrapper,
   WrapperPagination,
-  AddNewUserButton,
   UsersBottomContainer,
   VerifiedItemsContainer,
   VerifiedItem,
@@ -270,9 +269,9 @@ export const UsersList = (props) => {
           </UsersTable>
         </UserTableWrapper>
         <UsersBottomContainer>
-          <AddNewUserButton onClick={() => handleOpenUserAddForm()}>
+          <LinkButton onClick={() => handleOpenUserAddForm()}>
             {t('ADD_NEW_USER', 'Add new user')}
-          </AddNewUserButton>
+          </LinkButton>
           {usersList?.users.length > 0 && (
             <WrapperPagination>
               <Pagination

package/src/components/Users/UsersList/styles.js

@@ -199,13 +199,6 @@ export const WrapperPagination = styled.div`
   align-items: center;
 `
 
-export const AddNewUserButton = styled.div`
-  cursor: pointer;
-  color: ${props => props.theme.colors.primary};
-  width: fit-content;
-  font-size: 14px;
-`
-
 export const UsersBottomContainer = styled.div`
   display: flex;
   flex-wrap: wrap;

package/src/index.js

@@ -367,7 +367,7 @@ import {
   CustomProject,
   OrderingWidgets
 } from './components/MyProducts'
-import { OpenCartListing, RecoveryActionListing } from './components/CartRecovery'
+import { OpenCartListing, RecoveryActionListing, RecoveryActionAdd } from './components/CartRecovery'
 import { FreeProductsList, PurchasedProductsList } from './components/Downloads'
 
 import { Layout } from './components/Layout'
@@ -776,6 +776,7 @@ export {
 
   OpenCartListing,
   RecoveryActionListing,
+  RecoveryActionAdd,
   FreeProductsList,
   PurchasedProductsList,
 

package/src/styles/Buttons/index.js

@@ -106,7 +106,7 @@ export const Button = styled.button`
       padding-left: 15%
       ${props => props.theme?.rtl && css`
         padding-right: 15%;
-        padding-left: 0
+        padding-left: 0;
     `}
     }
   `}
@@ -298,3 +298,17 @@ export const Button = styled.button`
     }
   `}
 `
+
+export const LinkButton = styled.a`
+  font-size: 14px;
+  cursor: pointer;
+  color: ${props => props.theme.colors.primary};
+  &:hover {
+    text-decoration: underline;
+  }
+
+  ${({ disabled }) => disabled && css`
+    pointer-events: none;
+    opacity: 0.5;
+  `}
+`

package/src/styles/index.js

@@ -1,4 +1,4 @@
-import { Button, IconButton } from './Buttons'
+import { Button, IconButton, LinkButton } from './Buttons'
 import { Checkbox } from './Checkbox'
 import { Input, TextArea } from './Inputs'
 import { MultiSelect } from './MultiSelect'
@@ -10,6 +10,7 @@ import { Tabs, Tab } from './Tabs'
 export {
   Button,
   IconButton,
+  LinkButton,
   Checkbox,
   Input,
   MultiSelect,

package/template/pages/Login/index.js

@@ -1,19 +1,17 @@
 import React from 'react'
-import { useHistory, useLocation } from 'react-router-dom'
+import { useLocation } from 'react-router-dom'
 import { LoginForm } from '../../../src/components/Login'
 import { HelmetTags } from '../../components/HelmetTags'
 import settings from '../../config.json'
 
 export const Login = (props) => {
   const location = useLocation()
-  const history = useHistory()
 
   const loginProps = {
     ...props,
     billingUrl: settings?.billing_url,
     useProjectDomain: settings?.use_project_domain,
-    urlToRedirect: location?.state?.from,
-    handleRedirect: (url) => history.push(url)
+    urlToRedirect: location?.state?.from
   }
   return (
     <>