Merge pull request #120 from VineetBala-AOT/main

Make management plan name mandatory

Author: VineetBala-AOT

condition-api/src/condition_api/services/management_plan.py

@@ -14,6 +14,8 @@
 
 
 """Service for condition attribute management."""
+from marshmallow import ValidationError
+
 from condition_api.models.db import db
 from condition_api.models.condition import Condition
 from condition_api.models.management_plan import ManagementPlan
@@ -31,7 +33,10 @@ def update_management_plan_name(plan_id, payload):
 
         # Update name if present
         if "name" in payload:
-            plan.name = payload["name"]
+            name = payload["name"]
+            if not isinstance(name, str) or not name.strip():
+                raise ValidationError("Management plan name cannot be blank.")
+            plan.name = name.strip()
 
         # Update is_approved if present
         if "is_approved" in payload:

condition-web/src/components/ConditionDetails/ConditionAttribute/ManagementPlan/ManagementPlanAccordion.tsx

@@ -67,6 +67,7 @@ const ManagementPlanAccordion: React.FC<Props> = ({
   const [attributeHasData, setAttributeHasData] = useState(false);
   const [isDeleteModalOpen, setIsDeleteModalOpen] = useState(false);
   const isManagementRequired = true;
+  const [planNameError, setPlanNameError] = useState(false);
 
   const {
     mutateAsync: updatePlanName,
@@ -170,8 +171,15 @@ const ManagementPlanAccordion: React.FC<Props> = ({
   const handleSavePlanName = (e: React.MouseEvent) => {
     e.stopPropagation();
     e.preventDefault();
+    const trimmedName = planName.trim();
+    if (!trimmedName) {
+      setPlanNameError(true);
+      return;
+    }
+  
+    setPlanNameError(false);
     setConditionAttributeError(false);
-    handleUpdatePlan({ name: planName }, () => setEditMode(false));
+    handleUpdatePlan({ name: trimmedName }, () => setEditMode(false));
   };
 
   useEffect(() => {
@@ -303,7 +311,8 @@ const ManagementPlanAccordion: React.FC<Props> = ({
                   <Typography>Management Plan</Typography>
 
                   {editMode && expanded ? (
-                      <Box display="flex" flexDirection="row" alignItems="stretch" gap={1}>
+                      <Box>
+                        <Box display="flex" flexDirection="row" alignItems="stretch" gap={1}>
                           <TextField
                               variant="outlined"
                               fullWidth
@@ -345,6 +354,20 @@ const ManagementPlanAccordion: React.FC<Props> = ({
                                   <Box sx={{ color: "#255A90", fontWeight: "bold" }}>Save</Box>
                               </Button>
                           )}
+                          </Box>
+                          {planNameError && (
+                            <Box
+                              sx={{
+                                display: "flex",
+                                flexDirection: "row",
+                                marginTop: "-15px",
+                                color: "#CE3E39",
+                                fontSize: "14px",
+                              }}
+                            >
+                              Please enter a Management Plan Name.
+                            </Box>
+                          )}
                       </Box>
                   ) : (
                   <Box display="flex" alignItems="center" gap={1}>