fix: Update hospital edit payload and edit button styles

informatici · Oct 14, 2024 · 28e1382 · 28e1382
1 parent bdd55c3
commit 28e1382
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 12 deletions.
diff --git a/src/components/accessories/admin/hospital/editHospital/EditHospital.tsx b/src/components/accessories/admin/hospital/editHospital/EditHospital.tsx
@@ -21,7 +21,7 @@ export const EditHospital = () => {
     dispatch(
       updateHospital({
         code: hospital!.code!!,
-        hospitalDTO: { ...value, code: hospital!.code },
+        hospitalDTO: { ...hospital, ...value },
       })
     );
   };

diff --git a/src/components/accessories/button/Button.tsx b/src/components/accessories/button/Button.tsx
@@ -11,18 +11,17 @@ const Button: FunctionComponent<IProps> = ({
   disabled,
   dataCy,
   onClick,
-  sx,
+  className,
 }) => {
   return (
     <MaterialComponent
-      className="button"
+      className={"button " + className ?? ""}
       type={type}
       color={color}
       variant={variant}
       disableElevation
       disabled={disabled}
       onClick={onClick}
-      sx={sx}
       data-cy={dataCy}
     >
       {children}

diff --git a/src/components/accessories/button/types.ts b/src/components/accessories/button/types.ts
@@ -1,5 +1,4 @@
-import { ButtonProps, SxProps } from "@mui/material";
-import { Theme } from "@mui/system";
+import { ButtonProps } from "@mui/material";
 import { PropsWithChildren } from "react";
 
 export interface IProps extends PropsWithChildren {
@@ -8,6 +7,6 @@ export interface IProps extends PropsWithChildren {
   color?: ButtonProps["color"] | undefined;
   disabled?: boolean;
   dataCy?: string;
-  sx?: SxProps<Theme>;
+  className?: string;
   onClick?: (event: React.MouseEvent<HTMLButtonElement, MouseEvent>) => void;
 }
diff --git a/src/components/activities/adminActivity/SideMenu/SideMenu.module.scss b/src/components/activities/adminActivity/SideMenu/SideMenu.module.scss
@@ -20,6 +20,14 @@
   gap: 8px;
 }
 
+.editButton {
+  color: black !important;
+  background-color: white !important;
+  &:hover {
+    background-color: gray !important;
+  }
+}
+
 .item {
   display: flex;
   flex-direction: column;

diff --git a/src/components/activities/adminActivity/SideMenu/SideMenu.tsx b/src/components/activities/adminActivity/SideMenu/SideMenu.tsx
@@ -109,11 +109,7 @@ const SideMenu = () => {
               type="button"
               variant="text"
               dataCy="edit-hospital"
-              sx={{
-                color: "black",
-                backgroundColor: "white",
-                "&:hover": { backgroundColor: "gray" },
-              }}
+              className={classes.editButton}
               onClick={() => {
                 navigate(PATHS.admin_hospital_edit);
               }}