Merge pull request #156 from don-aot/CONDITIONS-task#147

don-aot · web-flow · commit 0a392d652d4e · 2026-03-16T12:26:51.000-07:00
CR-147:Remove MP Name attribute from table, pull name from title
diff --git a/condition-api/migrations/versions/f1a2b3c4d5e6_remove_management_plan_name_attribute.py b/condition-api/migrations/versions/f1a2b3c4d5e6_remove_management_plan_name_attribute.py
@@ -0,0 +1,37 @@
+"""remove_management_plan_name_attribute
+
+Revision ID: f1a2b3c4d5e6
+Revises: 0b5a70026d28
+Create Date: 2026-03-03 00:00:00.000000
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = 'f1a2b3c4d5e6'
+down_revision = '0b5a70026d28'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # condition_attributes rows that reference this key are deleted automatically
+    # via the ON DELETE CASCADE foreign key constraint.
+    op.execute(
+        """
+        DELETE FROM condition.attribute_keys
+        WHERE key_name = 'Management plan name(s)';
+        """
+    )
+
+
+def downgrade():
+    op.execute(
+        """
+        INSERT INTO condition.attribute_keys (id, key_name, external_key, sort_order, created_date)
+        VALUES (3, 'Management plan name(s)', 'management_plan_name', 3, NOW())
+        ON CONFLICT (id) DO NOTHING;
+        """
+    )
diff --git a/condition-api/src/condition_api/services/attribute_key_service.py b/condition-api/src/condition_api/services/attribute_key_service.py
@@ -55,7 +55,6 @@ def get_all_attributes(condition_id, management_plan_id=None):
                     AttributeKeys.PARTIES_REQUIRED_TO_BE_SUBMITTED.value,
                     AttributeKeys.DELIVERABLE_NAME.value,
                     AttributeKeys.MANAGEMENT_PLAN_ACRONYM.value,
-                    AttributeKeys.MANAGEMENT_PLAN_NAME.value,
                 ]),
             )
             .order_by(attribute_keys.sort_order)
diff --git a/condition-api/src/condition_api/services/condition_attribute_service.py b/condition-api/src/condition_api/services/condition_attribute_service.py
@@ -250,12 +250,10 @@ def _handle_requires_management_plan(condition_id, management_plan_id):
             ).first()
 
             if not existing_attribute:
-                # Check if the current key is MANAGEMENT_PLAN_NAME
-                attribute_value = '{}' if key.key_name == AttributeKeys.MANAGEMENT_PLAN_NAME.value else None
                 new_attribute = ConditionAttribute(
                     condition_id=condition_id,
                     attribute_key_id=key.id,
-                    attribute_value=attribute_value,
+                    attribute_value=None,
                     management_plan_id=management_plan_id
                 )
                 db.session.add(new_attribute)
diff --git a/condition-api/src/condition_api/services/condition_service.py b/condition-api/src/condition_api/services/condition_service.py
@@ -1027,7 +1027,6 @@ def _fetch_condition_attributes_external(
             AttributeKeys.PARTIES_REQUIRED_TO_BE_CONSULTED.value,
             AttributeKeys.MILESTONES_RELATED_TO_PLAN_SUBMISSION.value,
             AttributeKeys.MILESTONES_RELATED_TO_PLAN_IMPLEMENTATION.value,
-            AttributeKeys.MANAGEMENT_PLAN_NAME.value,
         }
 
         query = db.session.query(
diff --git a/condition-api/src/condition_api/utils/enums.py b/condition-api/src/condition_api/utils/enums.py
@@ -33,7 +33,6 @@ class AttributeKeys(str, Enum):
     """Attribute Keys — values match key_name in the attribute_keys table."""
 
     REQUIRES_CONSULTATION = "Requires consultation"
-    MANAGEMENT_PLAN_NAME = "Management plan name(s)"
     MANAGEMENT_PLAN_ACRONYM = "Management plan acronym(s)"
     PARTIES_REQUIRED_TO_BE_SUBMITTED = "Parties required to be submitted"
     PARTIES_REQUIRED_TO_BE_CONSULTED = "Parties required to be consulted"
@@ -71,7 +70,6 @@ def required_attribute_keys() -> List[str]:
         """Required attribute key_names for Management Plan"""
         return [
             AttributeKeys.SUBMITTED_TO_EAO_FOR.value,
-            AttributeKeys.MANAGEMENT_PLAN_NAME.value,
             AttributeKeys.MANAGEMENT_PLAN_ACRONYM.value,
             AttributeKeys.MILESTONES_RELATED_TO_PLAN_SUBMISSION.value,
             AttributeKeys.MILESTONES_RELATED_TO_PLAN_IMPLEMENTATION.value,
diff --git a/condition-web/src/components/ConditionDetails/ConditionAttribute/Constants.ts b/condition-web/src/components/ConditionDetails/ConditionAttribute/Constants.ts
@@ -6,7 +6,6 @@ export const CONDITION_KEYS = {
   TIME_ASSOCIATED_WITH_SUBMISSION_MILESTONE: "Time associated with submission milestone",
   PARTIES_REQUIRED: "Parties required to be consulted",
   MANAGEMENT_PLAN_ACRONYM: "Management plan acronym(s)",
-  MANAGEMENT_PLAN_NAME: "Management plan name(s)",
   REQUIRES_IEM_TERMS_OF_ENGAGEMENT: "Requires IEM Terms of Engagement",
   DELIVERABLE_NAME: "Deliverable name"
 };
@@ -93,7 +92,6 @@ export const SELECT_OPTIONS = {
 
 export const managementRequiredKeys = [
   CONDITION_KEYS.SUBMITTED_TO_EAO_FOR,
-  CONDITION_KEYS.MANAGEMENT_PLAN_NAME,
   CONDITION_KEYS.MILESTONES_RELATED_TO_PLAN_SUBMISSION,
   CONDITION_KEYS.MILESTONES_RELATED_TO_PLAN_IMPLEMENTATION,
   CONDITION_KEYS.TIME_ASSOCIATED_WITH_SUBMISSION_MILESTONE,
diff --git a/condition-web/src/components/ConditionDetails/ConditionAttribute/DynamicFieldRenderer.tsx b/condition-web/src/components/ConditionDetails/ConditionAttribute/DynamicFieldRenderer.tsx
@@ -37,10 +37,6 @@ type DynamicFieldRendererProps = {
       milestones: string[];
       setMilestones: (value: string[]) => void;
     };
-    planNamesData: {
-      planNames: string[];
-      setPlanNames: (value: string[]) => void;
-    };
     otherData: {
         otherValue: string;
         setOtherValue: (value: string) => void;
@@ -55,7 +51,6 @@ const DynamicFieldRenderer: React.FC<DynamicFieldRendererProps> = ({
     chipsData,
     submissionMilestonesData,
     milestonesData,
-    planNamesData,
     otherData,
 }) => {
     const [timeUnit, setTimeUnit] = useState<string>("");
@@ -65,10 +60,8 @@ const DynamicFieldRenderer: React.FC<DynamicFieldRendererProps> = ({
     const [error, setError] = useState(false);
     const [showCustomSubmissionInput, setShowCustomSubmissionInput] = useState(false);
     const [showCustomInput, setShowCustomInput] = useState(false);
-    const [showCustomPlanNames, setShowCustomPlanNames] = useState(false);
     const [customSubmissionMilestone, setCustomSubmissionMilestone] = useState("");
     const [customMilestone, setCustomMilestone] = useState("");
-    const [additionalPlanNames, setAdditionalPlanNames] = useState("");
     const [dynamicSubmissionWidth, setDynamicSubmissionWidth] = useState<number>(100);
     const [dynamicWidth, setDynamicWidth] = useState<number>(100);
     const textRef = useRef<HTMLDivElement>(null);
@@ -580,125 +573,6 @@ const DynamicFieldRenderer: React.FC<DynamicFieldRendererProps> = ({
         );
     }
 
-    if (attributeData.key === CONDITION_KEYS.MANAGEMENT_PLAN_NAME) {
-      const handleAddAdditionalPlanNames = () => {
-          if (additionalPlanNames.trim()) {
-              planNamesData.setPlanNames([...planNamesData.planNames, additionalPlanNames]);
-              setAdditionalPlanNames(""); // Clear the input field
-              setShowCustomPlanNames(false); // Hide the custom input field
-          }
-      };
-  
-      const handleDeleteChip = (chipToDelete: string) => {
-          setShowCustomPlanNames(false);
-          planNamesData.setPlanNames(
-              planNamesData.planNames.filter((chip) => chip !== chipToDelete)
-          );
-      };
-  
-      const shouldRenderChipInput =
-      planNamesData.planNames.length === 0 ||
-      (planNamesData.planNames.length === 1 && planNamesData.planNames[0] === "");
-
-      return (
-          <>
-              {shouldRenderChipInput ? (
-                  // Render the ChipInput component if no plan names exist
-                  <ChipInput
-                      chips={planNamesData.planNames}
-                      setChips={(newChips) => planNamesData.setPlanNames(newChips)}
-                      placeholder="Add a management plan name"
-                      inputWidth={editMode ? "30%" : "100%"}
-                  />
-              ) : (
-                  // Render chips if there are plan names
-                  <div>
-                      {/* Chips displayed in a flexible row */}
-                      <div style={{ display: "flex", flexWrap: "wrap", gap: "8px", marginBottom: "8px" }}>
-                          {planNamesData.planNames
-                          .filter((chip) => chip.trim() !== "")
-                          .map((name, index) => (
-                              <Chip
-                                  key={index}
-                                  label={name}
-                                  onDelete={() => handleDeleteChip(name)}
-                                  sx={{
-                                      backgroundColor: "#e0e0e0",
-                                      color: "black",
-                                      fontSize: "14px",
-                                  }}
-                              />
-                          ))}
-                      </div>
-  
-                      {/* "+ Add name for another Management Plan" appears on the next line */}
-                      <div>
-                          <Typography
-                              variant="body2"
-                              color="primary"
-                              onClick={() => setShowCustomPlanNames(true)}
-                              sx={{
-                                  cursor: "pointer",
-                                  textDecoration: "underline",
-                              }}
-                          >
-                              + Add name for another Management Plan
-                          </Typography>
-                      </div>
-                  </div>
-              )}
-  
-              {showCustomPlanNames && (
-                  <div
-                      style={{
-                          marginTop: "8px",
-                          display: "flex",
-                          alignItems: "center",
-                          gap: "8px",
-                      }}
-                  >
-                      <TextField
-                          value={additionalPlanNames}
-                          onChange={(e) => setAdditionalPlanNames(e.target.value)}
-                          placeholder="Add a management plan name"
-                          size="small"
-                          fullWidth
-                          sx={{
-                              flex: "0 0 auto",
-                              width: editMode ? "30%" : "100%",
-                          }}
-                          InputProps={{
-                              endAdornment: additionalPlanNames ? (
-                                  <InputAdornment
-                                      position="end"
-                                      sx={{ marginRight: "-5px" }}
-                                  >
-                                      <IconButton
-                                          onClick={handleAddAdditionalPlanNames}
-                                          sx={{
-                                              padding: 0,
-                                              borderRadius: "50%",
-                                              backgroundColor: "green",
-                                              color: "white",
-                                              "&:hover": { backgroundColor: "darkgreen" },
-                                          }}
-                                      >
-                                          <AddIcon
-                                              sx={{
-                                                  fontSize: "20px",
-                                              }}
-                                          />
-                                      </IconButton>
-                                  </InputAdornment>
-                              ) : null,
-                          }}
-                      />
-                  </div>
-              )}
-          </>
-      );
-  }
-
     if (options) {
         return (
             <Stack direction="column">
diff --git a/condition-web/src/components/ConditionDetails/ConditionAttribute/Independent/ConditionAttributeRow.tsx b/condition-web/src/components/ConditionDetails/ConditionAttribute/Independent/ConditionAttributeRow.tsx
@@ -111,20 +111,6 @@ const ConditionAttributeRow: React.FC<ConditionAttributeRowProps> = ({
     : []
   );
 
-  const [planNames, setPlanNames] = useState<string[]>(
-    conditionKey === CONDITION_KEYS.MANAGEMENT_PLAN_NAME
-      ? attributeValue
-          ?.replace(/[{}]/g, "") // Remove curly braces
-          .match(/"(?:\\.|[^"\\])*"|[^,]+/g) // Match quoted strings or standalone words
-          ?.map((item) =>
-            item
-              .trim()
-              .replace(/^"(.*)"$/, "$1") // Remove surrounding quotes
-              .replace(/\\"/g, '"') // Fix escaped quotes
-          ) || []
-      : []
-  );
-
   useEffect(() => {
     setEditableValue(conditionAttributeItem.value ?? "");
     if (conditionKey === CONDITION_KEYS.PARTIES_REQUIRED) {
@@ -141,19 +127,6 @@ const ConditionAttributeRow: React.FC<ConditionAttributeRowProps> = ({
       );
     }
 
-    if (conditionKey === CONDITION_KEYS.MANAGEMENT_PLAN_NAME) {
-      setPlanNames(
-        conditionAttributeItem.value
-            ?.replace(/[{}]/g, "") // Remove curly braces
-            .match(/"(?:\\.|[^"\\])*"|[^,]+/g) // Match quoted strings or standalone words
-            ?.map((item) =>
-              item
-                .trim()
-                .replace(/^"(.*)"$/, "$1") // Remove surrounding quotes
-                .replace(/\\"/g, '"') // Fix escaped quotes
-            ) || []
-      );
-    }
   }, [conditionAttributeItem, conditionKey]);
 
   const escapeValue = (value: string) => {
@@ -173,11 +146,6 @@ const ConditionAttributeRow: React.FC<ConditionAttributeRowProps> = ({
             .filter((chip) => chip !== null && chip !== "")
             .map((chip) => escapeValue(chip)) // Add escape to all values
             .join(",")}}`
-        : conditionKey === CONDITION_KEYS.MANAGEMENT_PLAN_NAME
-        ? `{${planNames
-            .filter((planName) => planName !== null && planName !== "")
-            .map((planName) => escapeValue(planName))
-            .join(",")}}`
         : conditionKey === CONDITION_KEYS.MILESTONES_RELATED_TO_PLAN_SUBMISSION
         ? submissionMilestones.map((submissionMilestone) => `${submissionMilestone}`).join(",")
         : conditionKey === CONDITION_KEYS.MILESTONES_RELATED_TO_PLAN_IMPLEMENTATION
@@ -203,21 +171,6 @@ const ConditionAttributeRow: React.FC<ConditionAttributeRowProps> = ({
       setChips(parsedChips);
     }
 
-    if (conditionKey === CONDITION_KEYS.MANAGEMENT_PLAN_NAME) {
-      const parsedPlanNames =
-        updatedValue
-          ?.replace(/[{}]/g, "") // Remove curly braces
-          .match(/"(?:\\.|[^"\\])*"|[^,]+/g) // Match quoted strings or standalone words
-          ?.map((item) =>
-            item
-              .trim()
-              .replace(/^"(.*)"$/, "$1") // Remove surrounding quotes
-              .replace(/\\"/g, '"') // Fix escaped quotes
-          ) || []
-
-      setPlanNames(parsedPlanNames);
-    }
-
     setOtherValue("");
   };
 
@@ -234,7 +187,6 @@ const ConditionAttributeRow: React.FC<ConditionAttributeRowProps> = ({
         chipsData={{ chips, setChips }}
         submissionMilestonesData={{ submissionMilestones, setSubmissionMilestones }}
         milestonesData={{ milestones, setMilestones }}
-        planNamesData={{ planNames, setPlanNames }}
         otherData={{ otherValue, setOtherValue }}
         options={options}
       />
@@ -273,16 +225,6 @@ const ConditionAttributeRow: React.FC<ConditionAttributeRowProps> = ({
       );
     }
 
-    if (conditionKey === CONDITION_KEYS.MANAGEMENT_PLAN_NAME) {
-      return (
-        <ul style={{ margin: 0, paddingLeft: "16px" }}>
-          {planNames?.map((item, index) => (
-            <li key={index}>{item}</li>
-          ))}
-        </ul>
-      );
-    }
-
     const options = SELECT_OPTIONS[conditionKey];
     if (options) {
       const selectedOption = options.find((option) => option.value === editableValue);
diff --git a/condition-web/src/components/ConditionDetails/ConditionAttribute/Independent/ConditionAttributeTable.tsx b/condition-web/src/components/ConditionDetails/ConditionAttribute/Independent/ConditionAttributeTable.tsx
@@ -228,19 +228,6 @@ const ConditionAttributeTable = memo(({
             ) || []
         : []
     );
-    const [planNames, setPlanNames] = useState<string[]>(
-      selectedAttribute === CONDITION_KEYS.MANAGEMENT_PLAN_NAME
-        ? attributeValue
-            ?.replace(/[{}]/g, "") // Remove curly braces
-            .match(/"(?:\\.|[^"\\])*"|[^,]+/g) // Match quoted strings or standalone words
-            ?.map((item) =>
-              item
-                .trim()
-                .replace(/^"(.*)"$/, "$1") // Remove surrounding quotes
-                .replace(/\\"/g, '"') // Fix escaped quotes
-            ) || []
-        : []
-    );
     const [submissionMilestones, setSubmissionMilestones] = useState<string[]>([]);
     const [milestones, setMilestones] = useState<string[]>([]);
 
@@ -251,7 +238,6 @@ const ConditionAttributeTable = memo(({
       setOtherValue("");
       setMilestones([]);
       setSubmissionMilestones([]);
-      setPlanNames([]);
       setChips([]);
 
       queryClient.invalidateQueries({
@@ -299,7 +285,6 @@ const ConditionAttributeTable = memo(({
       setSelectedAttribute("");
       setAttributeValue("");
       setChips([]);
-      setPlanNames([]);
       setOtherValue("");
     };
 
@@ -316,7 +301,6 @@ const ConditionAttributeTable = memo(({
           chipsData={{ chips, setChips }}
           submissionMilestonesData={{ submissionMilestones, setSubmissionMilestones }}
           milestonesData={{ milestones, setMilestones }}
-          planNamesData={{ planNames, setPlanNames }}
           otherData={{ otherValue, setOtherValue }}
           options={options}
         />

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,6 @@ def get_all_attributes(condition_id, management_plan_id=None):`
`55`	`55`	`AttributeKeys.PARTIES_REQUIRED_TO_BE_SUBMITTED.value,`
`56`	`56`	`AttributeKeys.DELIVERABLE_NAME.value,`
`57`	`57`	`AttributeKeys.MANAGEMENT_PLAN_ACRONYM.value,`
`58`		`- AttributeKeys.MANAGEMENT_PLAN_NAME.value,`
`59`	`58`	`]),`
`60`	`59`	`)`
`61`	`60`	`.order_by(attribute_keys.sort_order)`
Original file line number	Diff line number	Diff line change
`@@ -1027,7 +1027,6 @@ def _fetch_condition_attributes_external(`
`1027`	`1027`	`AttributeKeys.PARTIES_REQUIRED_TO_BE_CONSULTED.value,`
`1028`	`1028`	`AttributeKeys.MILESTONES_RELATED_TO_PLAN_SUBMISSION.value,`
`1029`	`1029`	`AttributeKeys.MILESTONES_RELATED_TO_PLAN_IMPLEMENTATION.value,`
`1030`		`- AttributeKeys.MANAGEMENT_PLAN_NAME.value,`
`1031`	`1030`	`}`
`1032`	`1031`
`1033`	`1032`	`query = db.session.query(`