Fix controlled select disable prop (#1560)

* Fix controlled select disable prop * Fix work plan staff view button
bcgov · Jan 8, 2024 · 62d1909 · 62d1909
1 parent 924cad6
commit 62d1909
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 18 deletions.
diff --git a/epictrack-web/src/components/myWorkplans/Card/CardFooter.tsx b/epictrack-web/src/components/myWorkplans/Card/CardFooter.tsx
@@ -80,26 +80,10 @@ const CardFooter = ({ workplan }: CardProps) => {
       </Grid>
       <Grid item justifyContent={"flex-end"}>
         <Button
-          variant="text"
-          sx={{
-            backgroundColor: "inherit",
-            borderColor: "transparent",
-            borderRadius: "4px",
-            width: "80px",
-            border: "2px solid var(--Primary-Main, #036)",
-            ":hover": {
-              borderRadius: "4px",
-              border: "var(--Primary-Main, #036);",
-              backgroundColor: Palette.primary.main,
-              color: Palette.white,
-            },
-            ":active": {
-              backgroundColor: Palette.primary.dark,
-            },
-          }}
+          variant="outlined"
           onClick={() => navigate(`/work-plan?work_id=${workplan.id}`)}
         >
-          <ETCaption2 bold>View</ETCaption2>
+          View
         </Button>
       </Grid>
     </Grid>

diff --git a/epictrack-web/src/components/shared/controlledInputComponents/ControlledSelectV2.tsx b/epictrack-web/src/components/shared/controlledInputComponents/ControlledSelectV2.tsx
@@ -68,6 +68,7 @@ const ControlledSelectV2: React.ForwardRefRenderFunction<
               if (onHandleChange !== undefined) onHandleChange(v);
               return onChange(v);
             }}
+            disabled={disabled}
             error={!!error}
             helperText={String(error?.message) || helperText}
           />