Patch/3.6.8

.github/workflows/automated_tests.yml

@@ -4,11 +4,12 @@ on:
   pull_request:
     branches:
       - integration
+      - "patch/**"
 
 jobs:
   automated_tests:
     runs-on: ubuntu-20.04
-    container: node:16.15.0
+    container: node:18.16.1
     services:
       postgres:
         image: postgres:13

packages/api/babel.config.cjs

@@ -10,6 +10,7 @@ module.exports = {
   ],
   "plugins": [
     "transform-es2015-modules-commonjs",
-    "babel-plugin-transform-import-meta"
+    "babel-plugin-transform-import-meta",
+    "@babel/plugin-syntax-import-assertions"
   ]
 }

packages/api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "litefarm-api",
-  "version": "3.6.7",
+  "version": "3.6.8",
   "description": "LiteFarm API server",
   "main": "./api/src/server.js",
   "type": "module",

packages/api/src/controllers/managementPlanController.js

@@ -58,7 +58,7 @@ const managementPlanController = {
         const managementPlanGraph = await ManagementPlanModel.query(trx)
           .where('management_plan_id', management_plan_id)
           .withGraphFetched(
-            'crop_management_plan.[planting_management_plans.[managementTasks.[task.[pest_control_task, irrigation_task, scouting_task, soil_task, soil_amendment_task, soil_amendment_task_products.[purpose_relationships], field_work_task, harvest_task, cleaning_task, locationTasks]], plant_task.[task.[locationTasks]], transplant_task.[task.[locationTasks]], bed_method, container_method, broadcast_method, row_method]]',
+            'crop_management_plan.[planting_management_plans.[managementTasks.[task.[pest_control_task, irrigation_task, scouting_task, soil_task, soil_amendment_task, soil_amendment_task_products(filterDeleted).[purpose_relationships], field_work_task, harvest_task, cleaning_task, locationTasks]], plant_task.[task.[locationTasks]], transplant_task.[task.[locationTasks]], bed_method, container_method, broadcast_method, row_method]]',
           )
           .modifyGraph(
             'crop_management_plan.[planting_management_plans.managementTasks]',

packages/api/src/controllers/sensorController.js

@@ -43,11 +43,17 @@ import knex from '../util/knex.js';
 const getSensorTranslations = async (language) => {
   // Remove country identifier from language preference
   const parsedLanguage = language.includes('-') ? language.split('-')[0] : language;
-  let translations = await import(`../../../shared/locales/${parsedLanguage}/sensorCSV.json`, {
-    assert: { type: 'json' },
-  });
-  // Default to english in case where user language not supported
-  if (!translations) {
+  let translations;
+  try {
+    translations = await import(`../../../shared/locales/${parsedLanguage}/sensorCSV.json`, {
+      assert: { type: 'json' },
+    });
+    // Default to english in case where user language not supported
+    if (!translations) {
+      throw 'Translations not found';
+    }
+  } catch (error) {
+    console.log(error);
     translations = await import(`../../../shared/locales/en/sensorCSV.json`, {
       assert: { type: 'json' },
     });

packages/api/src/jobs/locales/i18n.js

@@ -4,14 +4,7 @@ import Backend from 'i18next-fs-backend';
 i18n.use(Backend).init(
   {
     fallbackLng: 'en',
-    preload: [
-      'en',
-      'es',
-      'pt',
-      'fr',
-      'de',
-      // 'hi', 'pa', 'ml'
-    ],
+    preload: ['en', 'es', 'pt', 'fr', 'de', 'hi', 'pa', 'ml'],
     ns: ['translation', 'crop'],
     defaultNS: 'translation',
     nsSeparator: ':',

packages/api/src/jobs/locales/i18next-parser.config.js

@@ -2,12 +2,5 @@ export default {
   output: 'src/jobs/locales/$LOCALE/$NAMESPACE.json',
   sort: true,
   defaultValue: 'MISSING',
-  locales: [
-    'en',
-    'es',
-    'pt',
-    'fr',
-    'de',
-    // 'hi', 'pa', 'ml'
-  ],
+  locales: ['en', 'es', 'pt', 'fr', 'de', 'hi', 'pa', 'ml'],
 };

packages/api/src/jobs/locales/ml/translation.json

@@ -1,5 +1,5 @@
 {
-  "EXPORT_README_TITLE": "നിങ്ങളുടെ സർട്ടിഫിക്കേഷൻ എക്സ്പോർറ്റ് മനസ്സിലാക്കുന്നു",
+  "EXPORT_README_TITLE": "നിങ്ങളുടെ സർട്ടിഫിക്കേഷൻ എക്സ്‌പോർട്ട് മനസ്സിലാക്കുന്നു",
   "N": "ഇല്ല",
   "N/A": "ബാധകമല്ല",
   "NO": "ഇല്ല",

packages/api/src/server.js

@@ -39,7 +39,7 @@ if (process.env.SENTRY_DSN && environment !== 'development') {
       // Automatically instrument Node.js libraries and frameworks
       ...Sentry.autoDiscoverNodePerformanceMonitoringIntegrations(),
     ],
-    release: '3.6.7',
+    release: '3.6.8',
     // Set tracesSampleRate to 1.0 to capture 100%
     // of transactions for performance monitoring.
     // We recommend adjusting this value in production

packages/api/src/templates/locales/ml.json

@@ -91,8 +91,7 @@
     "PRIVACY": "ലൈറ്റ്ഫാമിൽ, ഞങ്ങൾ നിങ്ങളുടെ സ്വകാര്യത ഗൗരവമായി കാണുന്നു, അതിനാൽ നിങ്ങളുടെ എക്സ്പോർറ്റ് ആക്‌സസ് ചെയ്യുന്നതിന് മുമ്പ് നിങ്ങൾ ലോഗിൻ ചെയ്യേണ്ടതുണ്ട്. എന്തെങ്കിലും അസൗകര്യം ഉണ്ടായതിൽ ഖേദിക്കുന്നു. നിങ്ങളുടെ സമർപ്പണത്തിന് ആശംസകൾ, ലൈറ്റ്ഫാം ഉപയോഗിച്ചതിന് നന്ദി!",
     "SUBJECT": "ലൈറ്റ്ഫാമിൽ നിന്ന് നിങ്ങളുടെ സർട്ടിഫിക്കേഷൻ രേഖകൾ എക്സ്പോർറ്റ് ചെയ്യുന്നു",
     "HI": "നമസ്തേ",
-    "GET_YOUR_EXPORT": "രേഖകൾ നേടുക",
-    "LANGUAGE_DELAY": ""
+    "GET_YOUR_EXPORT": "രേഖകൾ നേടുക"
   },
   "COMMON": {
     "JOIN": "ചേരുക",
@@ -102,4 +101,4 @@
     "WORKER": "തൊഴിലാളി",
     "EXTENSION_OFFICER": "എക്സ്റ്റൻഷൻ ഓഫീസർ"
   }
-}
+}

packages/api/src/templates/sendEmailTemplate.js

@@ -71,14 +71,7 @@ const emailTransporter = new EmailTemplates({
     root: path.join(dir, 'emails'),
   },
   i18n: {
-    locales: [
-      'en',
-      'es',
-      'fr',
-      'pt',
-      'de',
-      // 'hi', 'pa', 'ml'
-    ],
+    locales: ['en', 'es', 'fr', 'pt', 'de', 'hi', 'pa', 'ml'],
     directory: path.join(dir, 'locales'),
     objectNotation: true,
   },

packages/shared/locales/hi/sensorCSV.json

@@ -0,0 +1,17 @@
+{
+  "CSV_HEADER_TRANSLATIONS": {
+    "name": "नाम",
+    "latitude": "अक्षांश",
+    "longitude": "देशांतर",
+    "reading_types": "पठन_प्रकार",
+    "external_id": "बाह्य_ID",
+    "depth": "गहराई_सेमी",
+    "brand": "ब्रांड",
+    "model": "मॉडल"
+  },
+  "READING_TYPE_TRANSLATIONS": {
+    "soil_water_content": "मृदा_जल_सामग्री",
+    "soil_water_potential": "मृदा_जल_क्षमता",
+    "temperature": "तापमान"
+  }
+}

packages/shared/locales/ml/sensorCSV.json

@@ -0,0 +1,17 @@
+{
+  "CSV_HEADER_TRANSLATIONS": {
+    "name": "പേര്",
+    "latitude": "അക്ഷാംശം",
+    "longitude": "രേഖാംശം",
+    "reading_types": "വായന_തരങ്ങൾ",
+    "external_id": "ബാഹ്യ_ഐഡി",
+    "depth": "ആഴം_സെ.മീ",
+    "brand": "ബ്രാൻഡ്",
+    "model": "മോഡൽ"
+  },
+  "READING_TYPE_TRANSLATIONS": {
+    "soil_water_content": "മണ്ണ്_ജലം_ഉള്ളടക്കം",
+    "soil_water_potential": "മണ്ണ്_ജലം_ ശേഷി",
+    "temperature": "താപനില"
+  }
+}

packages/shared/locales/pa/sensorCSV.json

@@ -0,0 +1,17 @@
+{
+  "CSV_HEADER_TRANSLATIONS": {
+    "name": "ਨਾਮ",
+    "latitude": "ਵਿਥਕਾਰ",
+    "longitude": "ਲੰਬਕਾਰ",
+    "reading_types": "ਪੜ੍ਹਨਾ_ਕਿਸਮਾਂ",
+    "external_id": "ਬਾਹਰੀ_ID",
+    "depth": "ਡੂੰਘਾਈ_ਸੈ.ਮੀ",
+    "brand": "ਬ੍ਰਾਂਡ",
+    "model": "ਮਾਡਲ"
+  },
+  "READING_TYPE_TRANSLATIONS": {
+    "soil_water_content": "ਮਿੱਟੀ_ਪਾਣੀ_ਸਮੱਗਰੀ",
+    "soil_water_potential": "ਮਿੱਟੀ_ਪਾਣੀ_ਸੰਭਾਵੀ",
+    "temperature": "ਤਾਪਮਾਨ"
+  }
+}

packages/shared/validation/csv.js

@@ -50,24 +50,24 @@ const parseCsv = (
   lang,
   validators,
   headerTranslations,
-  missingColumnsErrorKey = 'MISSING_COLUMNS',
+  missingColumnsErrorKey = "MISSING_COLUMNS",
   validateUniqueDataKeys = true,
   getDataKeyFromRow = (r) => r[validators[0].key],
   maxRows = null,
-  delimiter = ',',
+  delimiter = ","
 ) => {
   // regex checks for delimiters that are not contained within quotation marks
-  const regex = new RegExp(`(?!\\B"[^"]*)${delimiter}(?![^"]*"\\B)`)
+  const regex = new RegExp(`(?!\\B"[^"]*)${delimiter}(?![^"]*"\\B)`);
 
   // check if the length of the string is 0 or if the string contains no line returns
   if (csvString.length === 0 || !/\r\b|\r|\n/.test(csvString)) {
     return { data: [], errors: [] };
   }
 
-  const rows = csvString.split(/\r\n|\r|\n/).filter((elem) => elem !== '');
+  const rows = csvString.split(/\r\n|\r|\n/).filter((elem) => elem !== "");
 
   if (rows.length === 0) {
-    return { data: [], errors: []}
+    return { data: [], errors: [] };
   }
 
   const headers = rows[0].split(regex).map((h) => h.trim());
@@ -77,7 +77,11 @@ const parseCsv = (
   const headerErrors = [];
   requiredHeaders.forEach((header) => {
     if (!headers.includes(header)) {
-      headerErrors.push({ row: 1, column: header, translation_key: missingColumnsErrorKey });
+      headerErrors.push({
+        row: 1,
+        column: header,
+        translation_key: missingColumnsErrorKey,
+      });
     }
   });
   if (headerErrors.length > 0) {
@@ -96,17 +100,21 @@ const parseCsv = (
         {
           row: 1,
           column: "N/A",
-          translation_key: 'FARM_MAP.BULK_UPLOAD_SENSORS.VALIDATION.FILE_ROW_LIMIT_EXCEEDED',
-          value: ""
-        }
-      ]
-    }
+          translation_key:
+            "FARM_MAP.BULK_UPLOAD_SENSORS.VALIDATION.FILE_ROW_LIMIT_EXCEEDED",
+          value: "",
+        },
+      ],
+    };
   }
   // Set to keep track of the unique keys - used to make sure only one data entry is uploaded
   // with a particular key defined by getDataKeyFromRow if duplicates are in the file
   const uniqueDataKeys = new Set();
 
-  const headerMapping = getHeaderToValidatorMapping(validators, headerTranslations);
+  const headerMapping = getHeaderToValidatorMapping(
+    validators,
+    headerTranslations
+  );
 
   const { data, errors } = dataRows.reduce(
     (previous, row, rowIndex) => {
@@ -115,16 +123,25 @@ const parseCsv = (
         const currentValidator = validators[headerMapping[current]];
         if (allowedHeaders.includes(current)) {
           // remove any surrounding quotation marks
-          const val = values[index].replace(/^(["'])(.*)\1$/, '$2');
-          const parsedVal = currentValidator.parse(values[index].replace(/^(["'])(.*)\1$/, '$2'), lang);
+          const val = values[index].replace(/^(["'])(.*)\1$/, "$2");
+          const parsedVal = currentValidator.parse(
+            values[index].replace(/^(["'])(.*)\1$/, "$2"),
+            lang
+          );
           if (currentValidator.validate(parsedVal)) {
             previousObj[currentValidator.key] = parsedVal;
           } else {
             previous.errors.push({
               row: rowIndex + 2,
               column: current,
               translation_key: currentValidator.errorTranslationKey,
-              variables: { [currentValidator.key]: currentValidator.key.useParsedValForError ? parsedVal : val },
+              variables: {
+                [currentValidator.key]: currentValidator.key
+                  .useParsedValForError
+                  ? parsedVal
+                  : val,
+                ...(currentValidator.additionalVariables ?? {}),
+              },
             });
           }
         }
@@ -142,7 +159,7 @@ const parseCsv = (
       }
       return previous;
     },
-    { data: [], errors: [] },
+    { data: [], errors: [] }
   );
 
   return { data, errors };

packages/shared/validation/sensorCSV.js

@@ -17,20 +17,26 @@ import parseCsv from "./csv.js";
 
 // Sensor bulk upload error translation keys
 export const sensorErrors = {
-  FILE_ROW_LIMIT_EXCEEDED: "FARM_MAP.BULK_UPLOAD_SENSORS.VALIDATION.FILE_ROW_LIMIT_EXCEEDED",
+  FILE_ROW_LIMIT_EXCEEDED:
+    "FARM_MAP.BULK_UPLOAD_SENSORS.VALIDATION.FILE_ROW_LIMIT_EXCEEDED",
   MISSING_COLUMNS: "FARM_MAP.BULK_UPLOAD_SENSORS.VALIDATION.MISSING_COLUMNS",
   EXTERNAL_ID: "FARM_MAP.BULK_UPLOAD_SENSORS.VALIDATION.EXTERNAL_ID",
   SENSOR_NAME: "FARM_MAP.BULK_UPLOAD_SENSORS.VALIDATION.SENSOR_NAME",
   SENSOR_LATITUDE: "FARM_MAP.BULK_UPLOAD_SENSORS.VALIDATION.SENSOR_LATITUDE",
   SENSOR_LONGITUDE: "FARM_MAP.BULK_UPLOAD_SENSORS.VALIDATION.SENSOR_LONGITUDE",
-  SENSOR_READING_TYPES: "FARM_MAP.BULK_UPLOAD_SENSORS.VALIDATION.SENSOR_READING_TYPES",
+  SENSOR_READING_TYPES:
+    "FARM_MAP.BULK_UPLOAD_SENSORS.VALIDATION.SENSOR_READING_TYPES",
   SENSOR_DEPTH: "FARM_MAP.BULK_UPLOAD_SENSORS.VALIDATION.SENSOR_DEPTH",
   SENSOR_BRAND: "FARM_MAP.BULK_UPLOAD_SENSORS.VALIDATION.SENSOR_BRAND",
   SENSOR_MODEL: "FARM_MAP.BULK_UPLOAD_SENSORS.VALIDATION.SENSOR_MODEL",
-  SENSOR_HARDWARE_VERSION: "FARM_MAP.BULK_UPLOAD_SENSORS.VALIDATION.SENSOR_HARDWARE_VERSION",
-  SENSOR_ALREADY_OCCUPIED: "FARM_MAP.BULK_UPLOAD_SENSORS.SENSOR_CLAIM_ERROR.ALREADY_OCCUPIED",
-  SENSOR_DOES_NOT_EXIST: "FARM_MAP.BULK_UPLOAD_SENSORS.SENSOR_CLAIM_ERROR.DOES_NOT_EXIST",
-  INTERNAL_ERROR: "FARM_MAP.BULK_UPLOAD_SENSORS.SENSOR_CLAIM_ERROR.INTERNAL_ERROR",
+  SENSOR_HARDWARE_VERSION:
+    "FARM_MAP.BULK_UPLOAD_SENSORS.VALIDATION.SENSOR_HARDWARE_VERSION",
+  SENSOR_ALREADY_OCCUPIED:
+    "FARM_MAP.BULK_UPLOAD_SENSORS.SENSOR_CLAIM_ERROR.ALREADY_OCCUPIED",
+  SENSOR_DOES_NOT_EXIST:
+    "FARM_MAP.BULK_UPLOAD_SENSORS.SENSOR_CLAIM_ERROR.DOES_NOT_EXIST",
+  INTERNAL_ERROR:
+    "FARM_MAP.BULK_UPLOAD_SENSORS.SENSOR_CLAIM_ERROR.INTERNAL_ERROR",
 };
 
 const sensorCsvValidators = (translations) => {
@@ -71,18 +77,33 @@ const sensorCsvValidators = (translations) => {
       key: "reading_types",
       parse: (val, lang) => {
         const rawReadingTypes = val.replaceAll(" ", "").split(",");
-        return getReadableValuesForReadingTypes(lang, rawReadingTypes, translations);
+        return getReadableValuesForReadingTypes(
+          lang,
+          rawReadingTypes,
+          translations
+        );
       },
       validate: (val) => {
         if (!val.length || (val.length === 1 && val[0] === "")) {
           return false;
         }
-        const allowedReadingTypes = ["soil_water_potential", "soil_water_content", "temperature"];
-        return val.every((readingType) => allowedReadingTypes.includes(readingType));
+        const allowedReadingTypes = [
+          "soil_water_potential",
+          "soil_water_content",
+          "temperature",
+        ];
+        return val.every((readingType) =>
+          allowedReadingTypes.includes(readingType)
+        );
       },
       required: true,
       errorTranslationKey: sensorErrors.SENSOR_READING_TYPES,
       useParsedValForError: false,
+      additionalVariables: {
+        allowed_reading_types: Object.values(
+          translations.READING_TYPE_TRANSLATIONS
+        ).join(", "),
+      },
     },
     {
       key: "depth",
@@ -113,7 +134,9 @@ const sensorCsvValidators = (translations) => {
 
 // Returns the readable values to save in the database based on the given translated reading types
 const getReadableValuesForReadingTypes = (lang, readingTypes, translations) => {
-  const translationEntries = Object.entries(translations.READING_TYPE_TRANSLATIONS);
+  const translationEntries = Object.entries(
+    translations.READING_TYPE_TRANSLATIONS
+  );
   return readingTypes.map((rt) => {
     const entryWithReadableValue = translationEntries.find((e) => e[1] === rt);
     return entryWithReadableValue ? entryWithReadableValue[0] : null;
@@ -137,7 +160,7 @@ export const parseSensorCsv = (csvString, lang, translations) => {
     sensorErrors.MISSING_COLUMNS,
     true,
     generateSensorKey,
-    100,
+    100
   );
 };