@apptimate/core-lib 6.4.0 → 6.5.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@apptimate/core-lib",
-  "version": "6.4.0",
+  "version": "6.5.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "publishConfig": {

package/src/api-services/hr-attendance-shifts.client.ts

@@ -72,9 +72,14 @@ export const getAttendanceDays = async (employeeId: string | number, startDate:
   if (workforceId) params.workforce_id = workforceId;
   const queryParams = new URLSearchParams(params);
 
-  const url = employeeId === 'me'
-    ? `${BASE_URL}/ess/me/attendance/days?${queryParams.toString()}`
-    : `${BASE_URL}/attendance/days?${queryParams.toString()}`;
+  let url = '';
+  if (employeeId === 0 && (projectId || workforceId)) {
+    url = `${process.env.NEXT_PUBLIC_API_URL}/api/construction/workforce/attendance-days?${queryParams.toString()}`;
+  } else {
+    url = employeeId === 'me'
+      ? `${BASE_URL}/ess/me/attendance/days?${queryParams.toString()}`
+      : `${BASE_URL}/attendance/days?${queryParams.toString()}`;
+  }
 
   const response = await sendRequest({ url, method: "GET" });
   return response.responseData as IApiResponse;

package/src/utils/httpClient.ts

@@ -57,9 +57,18 @@ export function buildBrowserProxyUrl(rawUrl: string): string {
     }
 
     try {
+        // If rawUrl is undefined/api/... (due to missing process.env), fix it
+        if (rawUrl.startsWith('undefined/')) {
+            rawUrl = rawUrl.replace('undefined/', '/');
+        }
+
         const parsedUrl = new URL(rawUrl, window.location.origin);
 
         if (parsedUrl.origin === window.location.origin) {
+            if (parsedUrl.pathname.startsWith('/api/') && !parsedUrl.pathname.startsWith('/api/proxy') && !parsedUrl.pathname.startsWith('/api/session')) {
+                const proxyPath = parsedUrl.pathname.replace(/^\/+/, '');
+                return `/api/proxy/${proxyPath}${parsedUrl.search}`;
+            }
             return parsedUrl.toString();
         }