Bugfix V validation

Required fields

Author: matamadio

_static/RDL_MDE.html

@@ -5270,21 +5270,37 @@ <h5 class="modal-title" id="githubConfigModalLabel">GitHub Configuration</h5>
                         const requiredVulnerabilityAttributes = [
                             { field: 'hazard_primary', name: 'primary hazard type' },
                             { field: 'hazard_analysis_type', name: 'hazard analysis type' },
-                            { field: 'intensity', name: 'hazard intensity measurement' },
+                            { field: 'intensity_measure', name: 'hazard intensity measurement' },
                             { field: 'category', name: 'exposure category' },
                             { field: 'impact_type', name: 'impact type' },
                             { field: 'impact_modelling', name: 'impact modelling' },
                             { field: 'impact_metric', name: 'impact metric' },
                             { field: 'quantity_kind', name: 'quantity kind' }
                         ];
 
-                        // Check each required attribute
-                        for (const attr of requiredVulnerabilityAttributes) {
-                            if (!vulnerability[attr.field] || vulnerability[attr.field].toString().trim() === '') {
-                                vulnerabilityValid = false;
-                                vulnerabilityError = `Vulnerability is missing required ${attr.name}`;
-                                break;
+                        // Check each function type (vulnerability, fragility, damage_to_loss, engineering_demand)
+                        for (const funcType of Object.keys(vulnerability.functions)) {
+                            const funcArray = vulnerability.functions[funcType];
+                            if (Array.isArray(funcArray) && funcArray.length > 0) {
+                                // Validate each function in the array
+                                for (let i = 0; i < funcArray.length; i++) {
+                                    const func = funcArray[i];
+                                    const funcNum = i + 1;
+
+                                    // Check each required attribute
+                                    for (const attr of requiredVulnerabilityAttributes) {
+                                        if (!func[attr.field] || func[attr.field].toString().trim() === '') {
+                                            vulnerabilityValid = false;
+                                            vulnerabilityError = `${funcType} function ${funcNum} is missing required ${attr.name}`;
+                                            break;
+                                        }
+                                    }
+
+                                    if (!vulnerabilityValid) break;
+                                }
                             }
+
+                            if (!vulnerabilityValid) break;
                         }
                     }
                 }

_static/rdls_schema_v0.3.json

@@ -600,7 +600,7 @@
       "title": "Vulnerability function",
       "type": "object",
       "description": "The vulnerability function used to calculate the impact of the hazard.",
-      "required": ["approach", "relationship"],
+      "required": ["approach", "relationship", "hazard_primary", "hazard_analysis_type", "intensity_measure", "category", "impact_type", "impact_modelling", "impact_metric", "quantity_kind"],
       "properties": {
         "approach": {
           "title": "Vulnerability function approach",
@@ -710,7 +710,7 @@
       "title": "Fragility function",
       "type": "object",
       "description": "The fragility function used to calculate the impact of the hazard.",
-      "required": ["approach", "relationship"],
+      "required": ["approach", "relationship", "hazard_primary", "hazard_analysis_type", "intensity_measure", "category", "impact_type", "impact_modelling", "impact_metric", "quantity_kind"],
       "properties": {
         "approach": {
           "title": "Fragility function approach",
@@ -846,7 +846,7 @@
       "title": "Damage-to-loss function",
       "type": "object",
       "description": "The damage-to-loss function (or damage-to-loss model) used to calculate the impact of the hazard in conjunction with a fragility function.",
-      "required": ["approach", "relationship"],
+      "required": ["approach", "relationship", "hazard_primary", "hazard_analysis_type", "intensity_measure", "category", "impact_type", "impact_modelling", "impact_metric", "quantity_kind"],
       "properties": {
         "approach": {
           "title": "Damage-to-loss function approach",
@@ -982,7 +982,7 @@
       "title": "Engineering demand function",
       "type": "object",
       "description": "The engineering demand function used to calculate the impact of the hazard.",
-      "required": ["approach", "relationship"],
+      "required": ["approach", "relationship", "hazard_primary", "hazard_analysis_type", "intensity_measure", "category", "impact_type", "impact_modelling", "impact_metric", "quantity_kind"],
       "properties": {
         "parameter": {
           "title": "Engineering demand parameter",