From bd43eafa83f8b78627434a3968851ff2560eeaef Mon Sep 17 00:00:00 2001
From: tejaskh3 <tejaskh3@gmail.com>
Date: Fri, 11 Jul 2025 01:58:33 +0530
Subject: [PATCH] refactor: update API base URL and enhance request handling

---
 components/request-card/script.js |  2 +-
 constants.js                      |  5 +++--
 requests/script.js                | 32 +++++++++++++++++++++++++------
 requests/util.js                  | 15 ++++-----------
 4 files changed, 34 insertions(+), 20 deletions(-)

diff --git a/components/request-card/script.js b/components/request-card/script.js
index b4ac99f0..c6975c7f 100644
--- a/components/request-card/script.js
+++ b/components/request-card/script.js
@@ -367,7 +367,7 @@ async function createRequestCardComponent({
   }
 
   const userImage = requestUser?.picture?.url ?? ICONS.DEFAULT_USER_AVATAR;
-  let userFirstName = requestUser?.first_name ?? data.assignee;
+  let userFirstName = requestUser?.first_name ?? data.assignee ?? data.requestedBy;
   const userId = requestUser?.id;
   const userStatus = userStatusMap?.get(userId);
   const committedHours = userStatus?.monthlyHours?.committed;
diff --git a/constants.js b/constants.js
index 2095f752..54e83d01 100644
--- a/constants.js
+++ b/constants.js
@@ -1,5 +1,6 @@
-const API_BASE_URL = window.API_BASE_URL || 'https://api.realdevsquad.com';
-const REPO_SYNC_API_URL =
+const API_BASE_URL = 'http://localhost:3000';
+// const API_BASE_URL = window.API_BASE_URL || 'https://api.realdevsquad.com';
+const REPO_SYNC_API_URL =``
   'https://staging-sync.staging-realdevsquad-com.workers.dev';
 const USER_MANAGEMENT_LINK = 'user-management-link';
 const EXTENSION_REQUESTS_LINK = 'extension-requests-link';
diff --git a/requests/script.js b/requests/script.js
index 9d8373f5..f01b6f3c 100644
--- a/requests/script.js
+++ b/requests/script.js
@@ -1,4 +1,5 @@
-const API_BASE_URL = window.API_BASE_URL;
+const API_BASE_URL = 'http://localhost:3000';
+// const API_BASE_URL = window.API_BASE_URL;
 const requestContainer = document.getElementById(REQUEST_CONTAINER_ID);
 const lastElementContainer = document.querySelector(LAST_ELEMENT_CONTAINER);
 const params = new URLSearchParams(window.location.search);
@@ -142,17 +143,31 @@ onboardingExtensionTabLink.addEventListener('click', async function (event) {
 function updateUrlWithQuery(type) {
   const url = new URL(window.location);
   url.searchParams.set('type', type.toLowerCase());
+  if (isDev) {
+    url.searchParams.set('dev', 'true');
+  }
+  
   window.history.pushState({ path: url.toString() }, '', url.toString());
 }
 
 async function getRequests(requestType, query = {}) {
   let finalUrl =
     API_BASE_URL +
-    (nextLink || `/requests${getQueryParamsString(requestType, query)}`);
+    (nextLink ||
+      `/requests${getQueryParamsString(
+        requestType,
+        query,
+        requestType === 'OOO' ? isDev : true,
+      )}`);
 
   if (query?.state?.[0] || query?.requestedBy) {
     finalUrl =
-      API_BASE_URL + `/requests${getQueryParamsString(requestType, query)}`;
+      API_BASE_URL +
+      `/requests${getQueryParamsString(
+        requestType,
+        query,
+        requestType === 'OOO' ? isDev : true,
+      )}`;
   }
   const notFoundErrorMessage =
     requestType === ONBOARDING_EXTENSION_REQUEST_TYPE
@@ -617,13 +632,18 @@ async function performAcceptRejectAction(isAccepted, e) {
   let remark = document.getElementById(`remark-text-${requestId}`).value;
   let body = JSON.stringify({
     type: currentReqType,
-    message: remark,
-    state: isAccepted ? 'APPROVED' : 'REJECTED',
+    [currentReqType === 'OOO' ? 'comment' : 'message']: remark,
+    [currentReqType === 'OOO' ? 'status' : 'state']: isAccepted
+      ? 'APPROVED'
+      : 'REJECTED',
   });
   if (remark === '' || remark === undefined || remark === null) {
     body = JSON.stringify({
       type: currentReqType,
-      state: isAccepted ? 'APPROVED' : 'REJECTED',
+      [currentReqType === 'OOO' ? 'comment' : 'message']: remark,
+      [currentReqType === 'OOO' ? 'status' : 'state']: isAccepted
+        ? 'APPROVED'
+        : 'REJECTED',
     });
   }
 
diff --git a/requests/util.js b/requests/util.js
index 9738b621..ce200c6a 100644
--- a/requests/util.js
+++ b/requests/util.js
@@ -34,9 +34,9 @@ function createElementFromMap(domObjectMap) {
   return el;
 }
 
-function getQueryParamsString(requestType, query) {
+function getQueryParamsString(requestType, query, dev = true) {
   const params = new URLSearchParams({
-    dev: 'true',
+    dev,
     type: requestType,
     size: '12',
   });
@@ -71,18 +71,11 @@ function convertDateToReadableStringDate(date, format) {
 }
 
 function getFullNameOfUser(user) {
+  console.log('user', user);
   if (!user || typeof user !== 'object') {
     return 'N/A';
   }
-  const firstName = user.first_name || 'N/A';
-  const lastName = user.last_name || '';
-  return (
-    firstName.charAt(0).toUpperCase() +
-    firstName.slice(1).toLowerCase() +
-    ' ' +
-    lastName.charAt(0).toUpperCase() +
-    lastName.slice(1).toLowerCase()
-  );
+  return user.username;
 }
 
 function extractQueryParameters(url) {