chore: clean up test/checks/build errors

Author: gdalcengio

bc_obps/reporting/tests/models/program_configuration_tests/test_hydrogen_production_2024.py

@@ -99,7 +99,11 @@ def testCustomMethodologySchema(self):
                     "properties": {
                         "feedstock": {"type": "string", "title": "Feedstock"},
                         "annualFeedstockAmount": {"type": "string", "title": "Annual Feedstock Amount"},
-                        "annualHydrogenProduction": {"type": "number", "title": "Annual Hydrogen Production"},
+                        "annualHydrogenProduction": {
+                            "type": "number",
+                            "title": "Annual Hydrogen Production",
+                            "minimum": 0,
+                        },
                         "unitForAnnualFeedstockAmount": {
                             "type": "string",
                             "title": "Unit for Annual Feedstock Amount",

bc_obps/reporting/tests/models/program_configuration_tests/test_open_pit_coal_mining.py

@@ -89,7 +89,7 @@ def testCustomMethodologySchema(self):
         # Define the expected schema for the "Feedstock Material Balance" methodology
         expected_schema = {
             "coalType": {"title": "Coal type", "type": "string", "enum": ["Bituminous coal"]},
-            "quantityOfCoal": {"type": "number", "title": "Quantity of coal"},
+            "quantityOfCoal": {"type": "number", "title": "Quantity of coal", "minimum": 0},
             "quantityOfCoalUnit": {
                 "type": "string",
                 "title": "Quantity of coal unit",

bciers/apps/reporting/src/app/components/activities/ActivityForm.tsx

@@ -73,11 +73,7 @@ export default function ActivityForm({
     setSelectedSourceTypeIds(initialSelectedSourceTypeIds);
   }, [currentActivity]);
 
-  const validator = customizeValidator({});
-  const customValidate = (
-    formData: { [key: string]: any },
-    errors: { [key: string]: any },
-  ) => {
+  const customValidate = (formData: { [key: string]: any }, errors: any) => {
     const results = findPathsWithNegativeNumbers(formData);
     results.forEach((result) => {
       setNestedErrorForCustomValidate(errors, result, "must be >= 0");

bciers/libs/utils/src/findInObject.ts

@@ -1,15 +1,19 @@
-export const findPathsWithNegativeNumbers = (obj: any, parentPath: string = ''): string[] => {
-    let result: string[] = [];
+export const findPathsWithNegativeNumbers = (
+  obj: any,
+  parentPath: string = "",
+): string[] => {
+  let result: string[] = [];
 
-    //  Depth first traversal through obj paths
-    for (const key in obj) {
-      const currPath = parentPath ? `${parentPath}.${key}` : key; //  Attach key to current path
-      const value = obj[key];
-      
-      //  Add full path if number and is negative, otherwise if there's another 
-      if (typeof(value) === 'number' && value < 0) result.push(currPath);
-      else if (typeof(value) === 'object' && value) result = result.concat(findPathsWithNegativeNumbers(value, currPath)); 
-    }
+  //  Depth first traversal through obj paths
+  for (const key in obj) {
+    const currPath = parentPath ? `${parentPath}.${key}` : key; //  Attach key to current path
+    const value = obj[key];
 
-    return result;
-  }
+    //  Add full path if number and is negative, otherwise if there's another
+    if (typeof value === "number" && value < 0) result.push(currPath);
+    else if (typeof value === "object" && value)
+      result = result.concat(findPathsWithNegativeNumbers(value, currPath));
+  }
+
+  return result;
+};

bciers/libs/utils/src/setCustomValidateErrors.ts

@@ -1,14 +1,18 @@
-const setNestedErrorForCustomValidate = (errors: any, path: string, errorMessage: string) => {
-    const keys = path.split('.');
+const setNestedErrorForCustomValidate = (
+  errors: any,
+  path: string,
+  errorMessage: string,
+) => {
+  const keys = path.split(".");
 
-    let curr = errors;  // Initial object pointer
-    for(const key of keys) {
-        if (!curr[key]) return; // If doesn't exist, return
-        curr = curr[key]; // Traverse another level deeper into the nested errorSchema
-    }
+  let curr = errors; // Initial object pointer
+  for (const key of keys) {
+    if (!curr[key]) return; // If doesn't exist, return
+    curr = curr[key]; // Traverse another level deeper into the nested errorSchema
+  }
 
-    // Set error message when path is found at last object
-    curr.addError(errorMessage);
-}
+  // Set error message when path is found at last object
+  curr.addError(errorMessage);
+};
 
-export default setNestedErrorForCustomValidate;
+export default setNestedErrorForCustomValidate;