Merge branch 'integration' into LF-4601-Table-header-needs-to-be-lowe…

…red-or-KPI-higher-n-z-index
LiteFarmOrg · Jan 7, 2025 · 779e4c4 · 779e4c4
2 parents 6767b74 + 5951cec
commit 779e4c4
Show file tree

Hide file tree

Showing 10 changed files with 4,575 additions and 3,680 deletions.
diff --git a/.github/workflows/lint_translation_files.yml b/.github/workflows/lint_translation_files.yml
@@ -22,7 +22,7 @@ jobs:
       - name: Set up pnpm
         uses: pnpm/[email protected]
         with:
-          version: 6.26.1
+          version: latest
 
       - name: Install pnpm dependencies
         run: pnpm install

diff --git a/.github/workflows/webapp_unit_tests.yml b/.github/workflows/webapp_unit_tests.yml
@@ -18,7 +18,7 @@ jobs:
       - name: Setup pnpm
         uses: pnpm/[email protected]
         with:
-          version: 6.26.1
+          version: latest
       - name: Install dependencies
         run: pnpm install
       - name: Run unit tests

diff --git a/packages/api/package-lock.json b/packages/api/package-lock.json
diff --git a/packages/api/package.json b/packages/api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "litefarm-api",
-  "version": "3.7.1",
+  "version": "3.7.3",
   "description": "LiteFarm API server",
   "main": "./api/src/server.js",
   "type": "module",

diff --git a/packages/api/src/server.js b/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.7.1',
+    release: '3.7.3',
     // Set tracesSampleRate to 1.0 to capture 100%
     // of transactions for performance monitoring.
     // We recommend adjusting this value in production

diff --git a/packages/webapp/package.json b/packages/webapp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "litefarm-webapp",
-  "version": "3.7.1",
+  "version": "3.7.3",
   "description": "LiteFarm Web application",
   "type": "module",
   "scripts": {

diff --git a/packages/webapp/pnpm-lock.yaml b/packages/webapp/pnpm-lock.yaml
diff --git a/packages/webapp/src/containers/Task/saga.js b/packages/webapp/src/containers/Task/saga.js
@@ -590,7 +590,7 @@ export function* createTaskSaga({ payload }) {
   const header = getHeader(user_id, farm_id);
   const isCustomTask = !!task_farm_id;
   const isHarvest = task_translation_key === 'HARVEST_TASK';
-  const endpoint = getEndpoint(isCustomTask, task_translation_key);
+  const endpoint = getEndpoint(isCustomTask, task_translation_key, true);
   try {
     const managementPlanWithCurrentLocationEntities = yield select(
       managementPlanWithCurrentLocationEntitiesSelector,

diff --git a/packages/webapp/src/containers/Task/sagaUtils.js b/packages/webapp/src/containers/Task/sagaUtils.js
@@ -16,12 +16,12 @@
 import { parseInventoryId } from '../../util/animal';
 import { getPostTaskBody } from './saga';
 
-export const getEndpoint = (isCustomTask, taskTranslationKey) => {
+export const getEndpoint = (isCustomTask, taskTranslationKey, isCreatingTask = false) => {
   if (isCustomTask) {
     return 'custom_task';
   }
   const endpoints = {
-    HARVEST_TASK: 'harvest_tasks',
+    HARVEST_TASK: isCreatingTask ? 'harvest_tasks' : 'harvest_task',
     MOVEMENT_TASK: 'animal_movement_task',
   };
   return endpoints[taskTranslationKey] || taskTranslationKey.toLowerCase();

diff --git a/packages/webapp/src/main.jsx b/packages/webapp/src/main.jsx
@@ -87,7 +87,7 @@ if (import.meta.env.VITE_SENTRY_DSN) {
   Sentry.init({
     dsn: import.meta.env.VITE_SENTRY_DSN,
     integrations: [new Integrations.BrowserTracing()],
-    release: '3.7.1',
+    release: '3.7.3',
     // Set tracesSampleRate to 1.0 to capture 100%
     // of transactions for performance monitoring.
     // We recommend adjusting this value in production