From 4448f0af77ef1583e2f0b7a2ebcc929fe4ee7551 Mon Sep 17 00:00:00 2001
From: Julio Sgarbi <julio.sgarbi@hotmail.com>
Date: Wed, 22 Nov 2023 16:53:21 +0100
Subject: [PATCH 1/3] fix: LEAP-409: Update files to match with monorepo

---
 src/assets/icons/index.js | 34 +++++++++++++++++-----------------
 src/dev.js                |  4 ++--
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/assets/icons/index.js b/src/assets/icons/index.js
index 4ee373ec..bd713619 100644
--- a/src/assets/icons/index.js
+++ b/src/assets/icons/index.js
@@ -1,17 +1,17 @@
-export { default as LsAnnotation } from './annotation.svg';
-export { default as LsBanSquare } from './ban.svg';
-export { default as LsCheckAlt } from "./check_alt.svg";
-export { default as LsCrossAlt } from "./cross_alt.svg";
-export { default as LsSparkSquare } from './spark.svg';
-export { default as LsThumbsDown } from './thumbs_down.svg';
-export { default as LsThumbsUp } from './thumbs_up.svg';
-export { default as LsStarSquare } from  './star_square.svg';
-export { default as LSPlus } from './plus.svg';
-export { default as LsRefresh } from "./refresh.svg";
-export { default as LsGear } from "./gear.svg";
-export { default as LsGearNewUI } from "./gear_new_menu.svg";
-export { default as CommentCheck } from "./comment_check.svg";
-export { default as CommentRed } from "./comment_red.svg";
-export { default as LsGrid } from "./grid.svg";
-export { default as LsList } from "./list.svg";
-export { default as LsRefresh2 } from "./refresh2.svg";
\ No newline at end of file
+export { ReactComponent as LsAnnotation } from './annotation.svg';
+export { ReactComponent as LsBanSquare } from './ban.svg';
+export { ReactComponent as LsCheckAlt } from "./check_alt.svg";
+export { ReactComponent as LsCrossAlt } from "./cross_alt.svg";
+export { ReactComponent as LsSparkSquare } from './spark.svg';
+export { ReactComponent as LsThumbsDown } from './thumbs_down.svg';
+export { ReactComponent as LsThumbsUp } from './thumbs_up.svg';
+export { ReactComponent as LsStarSquare } from  './star_square.svg';
+export { ReactComponent as LSPlus } from './plus.svg';
+export { ReactComponent as LsRefresh } from "./refresh.svg";
+export { ReactComponent as LsGear } from "./gear.svg";
+export { ReactComponent as LsGearNewUI } from "./gear_new_menu.svg";
+export { ReactComponent as CommentCheck } from "./comment_check.svg";
+export { ReactComponent as CommentRed } from "./comment_red.svg";
+export { ReactComponent as LsGrid } from "./grid.svg";
+export { ReactComponent as LsList } from "./list.svg";
+export { ReactComponent as LsRefresh2 } from "./refresh2.svg";
\ No newline at end of file
diff --git a/src/dev.js b/src/dev.js
index 0e0eeb7c..65db8948 100644
--- a/src/dev.js
+++ b/src/dev.js
@@ -1,7 +1,7 @@
 import { Button } from "./components/Common/Button/Button";
 
-const API_GATEWAY = process.env.API_GATEWAY;
-const LS_ACCESS_TOKEN = process.env.LS_ACCESS_TOKEN;
+const API_GATEWAY = process.env.API_GATEWAY || process.env.NX_API_GATEWAY;
+const LS_ACCESS_TOKEN = process.env.LS_ACCESS_TOKEN || process.env.NX_LS_ACCESS_TOKEN;
 
 /**
  * @param {import("../src/sdk/dm-sdk").DataManager} DataManager

From d13d06ccbd934b640413b54c4b135e288376f3da Mon Sep 17 00:00:00 2001
From: Julio Sgarbi <julio.sgarbi@hotmail.com>
Date: Wed, 22 Nov 2023 17:34:43 +0100
Subject: [PATCH 2/3] fix the export type for datamanager

---
 webpack.config-builder.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/webpack.config-builder.js b/webpack.config-builder.js
index 3bbf9572..5db4ab7a 100644
--- a/webpack.config-builder.js
+++ b/webpack.config-builder.js
@@ -307,6 +307,7 @@ module.exports = ({ withDevServer = false } = {}) => ({
         use: [{
           loader: '@svgr/webpack',
           options: {
+            exportType: 'named',
             ref: true,
           },
         }],

From 89ca36975afcb27b6e94f1fc18bf1bea206a69ec Mon Sep 17 00:00:00 2001
From: Julio Sgarbi <julio.sgarbi@hotmail.com>
Date: Wed, 22 Nov 2023 18:09:17 +0100
Subject: [PATCH 3/3] add more validations to make monorepo works

---
 src/sdk/lsf-sdk.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/sdk/lsf-sdk.js b/src/sdk/lsf-sdk.js
index c0b7337a..1151652b 100644
--- a/src/sdk/lsf-sdk.js
+++ b/src/sdk/lsf-sdk.js
@@ -332,6 +332,8 @@ export class LSFWrapper {
   }
 
   setLSFTask(task, annotationID, fromHistory) {
+    if (!this.lsf) return;
+    
     const hasChangedTasks = this.lsf?.task?.id !== task?.id && task?.id;
 
     this.setLoading(true, hasChangedTasks);