fix a bug that could prevent user to selet their payment methods
All checks were successful
Deploy Amap / deploy (push) Successful in 1m52s
All checks were successful
Deploy Amap / deploy (push) Successful in 1m52s
This commit is contained in:
@@ -53,6 +53,8 @@ export default function FormModal({ opened, onClose, currentForm, handleSubmit }
|
||||
});
|
||||
|
||||
const usersSelect = useMemo(() => {
|
||||
if (!users)
|
||||
return [];
|
||||
return users?.map((user) => ({
|
||||
value: String(user.id),
|
||||
label: `${user.name}`,
|
||||
@@ -60,6 +62,8 @@ export default function FormModal({ opened, onClose, currentForm, handleSubmit }
|
||||
}, [users]);
|
||||
|
||||
const productorsSelect = useMemo(() => {
|
||||
if (!productors)
|
||||
return [];
|
||||
return productors?.map((prod) => ({
|
||||
value: String(prod.id),
|
||||
label: `${prod.name}`,
|
||||
|
||||
@@ -4,9 +4,12 @@ import "./index.css";
|
||||
import { Group, Loader } from "@mantine/core";
|
||||
import { Config } from "@/config/config";
|
||||
import { useAuth } from "@/services/auth/AuthProvider";
|
||||
import { useMediaQuery } from "@mantine/hooks";
|
||||
import { IconHome, IconLogin, IconLogout, IconSettings } from "@tabler/icons-react";
|
||||
|
||||
export function Navbar() {
|
||||
const { loggedUser: user, isLoading } = useAuth();
|
||||
const isPhone = useMediaQuery("(max-width: 760px");
|
||||
|
||||
if (!user && isLoading) {
|
||||
return (
|
||||
@@ -20,11 +23,11 @@ export function Navbar() {
|
||||
<nav>
|
||||
<Group>
|
||||
<NavLink className={"navLink"} aria-label={t("home")} to="/">
|
||||
{t("home", { capfirst: true })}
|
||||
{isPhone ? <IconHome/> : t("home", { capfirst: true })}
|
||||
</NavLink>
|
||||
{user?.logged ? (
|
||||
<NavLink className={"navLink"} aria-label={t("dashboard")} to="/dashboard/help">
|
||||
{t("dashboard", { capfirst: true })}
|
||||
{isPhone ? <IconSettings/> : t("dashboard", { capfirst: true })}
|
||||
</NavLink>
|
||||
) : null}
|
||||
</Group>
|
||||
@@ -34,7 +37,7 @@ export function Navbar() {
|
||||
className={"navLink"}
|
||||
aria-label={t("login with keycloak", { capfirst: true })}
|
||||
>
|
||||
{t("login with keycloak", { capfirst: true })}
|
||||
{isPhone ? <IconLogin/> : t("login with keycloak", { capfirst: true })}
|
||||
</a>
|
||||
) : (
|
||||
<a
|
||||
@@ -42,7 +45,7 @@ export function Navbar() {
|
||||
className={"navLink"}
|
||||
aria-label={t("logout", { capfirst: true })}
|
||||
>
|
||||
{t("logout", { capfirst: true })}
|
||||
{isPhone ? <IconLogout/> : t("logout", { capfirst: true })}
|
||||
</a>
|
||||
)}
|
||||
</nav>
|
||||
|
||||
@@ -59,6 +59,8 @@ export function ProductModal({ opened, onClose, currentProduct, handleSubmit }:
|
||||
});
|
||||
|
||||
const productorsSelect = useMemo(() => {
|
||||
if (!productors)
|
||||
return [];
|
||||
return productors?.map((productor) => ({
|
||||
value: String(productor.id),
|
||||
label: `${productor.name}`,
|
||||
|
||||
@@ -48,6 +48,8 @@ export default function ShipmentModal({
|
||||
const { data: allProductors } = useGetProductors();
|
||||
|
||||
const formsSelect = useMemo(() => {
|
||||
if (!allForms)
|
||||
return [];
|
||||
return allForms?.map((currentForm) => ({
|
||||
value: String(currentForm.id),
|
||||
label: `${currentForm.name} ${currentForm.season}`,
|
||||
@@ -55,7 +57,7 @@ export default function ShipmentModal({
|
||||
}, [allForms]);
|
||||
|
||||
const productsSelect = useMemo(() => {
|
||||
if (!allProducts || !allProductors) return;
|
||||
if (!allProducts || !allProductors) return [];
|
||||
return allProductors?.map((productor) => {
|
||||
return {
|
||||
group: productor.name,
|
||||
|
||||
@@ -36,6 +36,8 @@ export function UserModal({ opened, onClose, currentUser, handleSubmit }: UserMo
|
||||
});
|
||||
|
||||
const roleSelect = useMemo(() => {
|
||||
if (!allRoles)
|
||||
return [];
|
||||
return allRoles?.map((role) => ({ value: String(role.name), label: role.name }));
|
||||
}, [allRoles]);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user