diff --git a/app/controllers/rules_controller.rb b/app/controllers/rules_controller.rb
index 4c7eea6a..883e6539 100644
--- a/app/controllers/rules_controller.rb
+++ b/app/controllers/rules_controller.rb
@@ -136,9 +136,9 @@ def rule_update_params
rule_descriptions_attributes: %i[id description _destroy],
additional_answers_attributes: %i[id additional_question_id answer],
disa_rule_descriptions_attributes: %i[
- id vuln_discussion false_positives false_negatives documentable mitigations
- severity_override_guidance potential_impacts third_party_tools mitigation_control
- responsibility ia_controls _destroy
+ id vuln_discussion false_positives false_negatives documentable mitigations_available
+ mitigations poam_available poam severity_override_guidance potential_impacts
+ third_party_tools mitigation_control responsibility ia_controls _destroy
]
)
end
diff --git a/app/javascript/components/rules/forms/AdvancedRuleForm.vue b/app/javascript/components/rules/forms/AdvancedRuleForm.vue
index 20abd561..157cf0c7 100644
--- a/app/javascript/components/rules/forms/AdvancedRuleForm.vue
+++ b/app/javascript/components/rules/forms/AdvancedRuleForm.vue
@@ -261,7 +261,10 @@ export default {
"vuln_discussion",
"false_positives",
"false_negatives",
+ "mitigations_available",
"mitigations",
+ "poam_available",
+ "poam",
"severity_override_guidance",
"potential_impacts",
"third_party_tools",
diff --git a/app/javascript/components/rules/forms/BasicRuleForm.vue b/app/javascript/components/rules/forms/BasicRuleForm.vue
index ddf7e821..00fc7809 100644
--- a/app/javascript/components/rules/forms/BasicRuleForm.vue
+++ b/app/javascript/components/rules/forms/BasicRuleForm.vue
@@ -117,7 +117,10 @@ export default {
if (this.rule.status == "Applicable - Configurable") {
return { displayed: ["vuln_discussion"], disabled: [] };
} else if (this.rule.status == "Applicable - Does Not Meet") {
- return { displayed: ["mitigations"], disabled: [] };
+ return {
+ displayed: ["mitigations_available", "mitigations", "poam_available", "poam"],
+ disabled: [],
+ };
} else if (this.rule.status == "Not Yet Determined") {
return { displayed: ["vuln_discussion"], disabled: ["vuln_discussion"] };
} else {
diff --git a/app/javascript/components/rules/forms/DisaRuleDescriptionForm.vue b/app/javascript/components/rules/forms/DisaRuleDescriptionForm.vue
index 9d7e8455..11ecec73 100644
--- a/app/javascript/components/rules/forms/DisaRuleDescriptionForm.vue
+++ b/app/javascript/components/rules/forms/DisaRuleDescriptionForm.vue
@@ -149,9 +149,31 @@
+
+
+
+ Mitigations Available
+
+
+
+
+
+
+ POA&M Available
+
+
+
+
+
+
+
+
+ {{ validFeedback["poam"] }}
+
+
+ {{ invalidFeedback["poam"] }}
+
+
+