From 389d6a543d815dc8148f88ab1d83d3152d396219 Mon Sep 17 00:00:00 2001
From: "fabio.d.mota" <fabio.d.mota@cgi.com>
Date: Tue, 14 May 2024 00:50:28 +0100
Subject: [PATCH] feat(frontend): Add new Field on negotiation catalog

---
 frontend/.env                                 |  2 ++
 frontend/public/index.html                    |  2 +-
 .../NavigationBar/UserInformation/UserInfo.js | 18 ++++++++++++++----
 .../NegotiationPage/NegotiationPage.js        | 19 +++++++++++++++++--
 4 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/frontend/.env b/frontend/.env
index 06c2b5e1..3e887b7d 100644
--- a/frontend/.env
+++ b/frontend/.env
@@ -18,3 +18,5 @@ REACT_APP_DELETE_REPORTS=/api/dashboard/deleteReport
 REACT_APP_GET_USER_BPDM_GATES=/api/dashboard/getAllUserBPDMGates?
 REACT_APP_DELETE_RATINGS=/api/dashboard/deleteRating
 REACT_APP_GET_COMPANY_USERS=/api/dashboard/getUserFromCompany?
+REACT_APP_GET_QUERY_CATALOG=/api/negotiation/queryCatalog?
+REACT_APP_POST_TRIGGER_NEGOTIATION=/api/negotiation/triggerNegotiation?
\ No newline at end of file
diff --git a/frontend/public/index.html b/frontend/public/index.html
index 3c864d33..8e1f9510 100644
--- a/frontend/public/index.html
+++ b/frontend/public/index.html
@@ -6,7 +6,7 @@
     <script>
       window.ENV = {
         REACT_APP_COUNTRY_RISK_API: "http://localhost:8080",
-        REACT_APP_AUTH_URL: "https://localhost:8081/auth",
+        REACT_APP_AUTH_URL: "http://localhost:8080/auth",
         REACT_APP_PORTAL_FRONTEND: "http://localhost:3000",
         REACT_APP_PORTAL_BACKEND: "http://localhost:8080",
         REACT_APP_COUNTRY_RISK_CLIENT: "country_risk_client",
diff --git a/frontend/src/components/dashboard/NavigationBar/UserInformation/UserInfo.js b/frontend/src/components/dashboard/NavigationBar/UserInformation/UserInfo.js
index 9d546042..8d2ed765 100644
--- a/frontend/src/components/dashboard/NavigationBar/UserInformation/UserInfo.js
+++ b/frontend/src/components/dashboard/NavigationBar/UserInformation/UserInfo.js
@@ -18,7 +18,7 @@
  * SPDX-License-Identifier: Apache-2.0
  ********************************************************************************/
 
-import { useState, useRef, useContext } from "react";
+import { useState, useRef, useContext, useEffect } from "react";
 import {
   UserAvatar,
   UserMenu,
@@ -36,7 +36,16 @@ import { CompanyUserContext } from "../../../../contexts/companyuser";
 export const UserInfo = () => {
   const [menuOpen, setMenuOpen] = useState(false);
   const wrapperRef = useRef(null);
-  const { companyUser } = useContext(CompanyUserContext);
+  const { companyUser, setCompanyUser } = useContext(CompanyUserContext);
+  const [cleanedRoles, setCleanedRoles] = useState([]);
+
+  useEffect(() => {
+    // Clean up roles by trimming whitespace
+    if (companyUser && companyUser.roles) {
+      const cleanedRoles = companyUser.roles.map((role) => role.trim());
+      setCleanedRoles(cleanedRoles);
+    }
+  }, [companyUser]);
 
   const openCloseMenu = () => setMenuOpen((prevVal) => !prevVal);
 
@@ -58,8 +67,9 @@ export const UserInfo = () => {
 
   // Add negotiation link for users with Negotiator or Admin roles
   if (
-    companyUser.roles.includes("Negotiator") ||
-    companyUser.roles.includes("Admin")
+    cleanedRoles.includes("Negotiator") ||
+    cleanedRoles.includes("Admin") ||
+    cleanedRoles.includes("Company Admin")
   ) {
     menuItems = [
       {
diff --git a/frontend/src/components/dashboard/NegotiationPage/NegotiationPage.js b/frontend/src/components/dashboard/NegotiationPage/NegotiationPage.js
index 37caf010..6c0b6496 100644
--- a/frontend/src/components/dashboard/NegotiationPage/NegotiationPage.js
+++ b/frontend/src/components/dashboard/NegotiationPage/NegotiationPage.js
@@ -37,6 +37,15 @@ const NegotiationPage = () => {
   const navigate = useNavigate();
   const [catalogItems, setCatalogItems] = useState([]);
   const [selectedItems, setSelectedItems] = useState([]);
+  const [cleanedRoles, setCleanedRoles] = useState([]);
+
+  useEffect(() => {
+    // Clean up roles by trimming whitespace
+    if (companyUser && companyUser.roles) {
+      const cleanedRoles = companyUser.roles.map((role) => role.trim());
+      setCleanedRoles(cleanedRoles);
+    }
+  }, [companyUser]);
 
   useEffect(() => {
     // Fetch catalog items from the API
@@ -111,6 +120,7 @@ const NegotiationPage = () => {
     const negotiationRequest = selectedItems.map((item) => ({
       id: item.id,
       offerId: item.offerId,
+      usagePurpose: item.usagePurpose,
     }));
 
     try {
@@ -146,8 +156,13 @@ const NegotiationPage = () => {
 
   // Check if the user has permission to initiate negotiations
   const userCanNegotiate =
-    companyUser.roles.includes("Negotiator") ||
-    companyUser.roles.includes("Admin"); // Adjust the role check as necessary
+    cleanedRoles.includes("Negotiator") ||
+    cleanedRoles.includes("Admin") ||
+    cleanedRoles.includes("Company Admin"); // Adjust the role check as necessary
+
+  console.log("cleanedRoles", cleanedRoles);
+  console.log("companyUser", companyUser);
+  console.log("userCanNegotiate", userCanNegotiate);
 
   return (
     <div className="negotiation-page">