ui-soxo-bootstrap-core 2.6.1-dev.23 → 2.6.1-dev.25

package/core/components/license-management/license-alert.js

@@ -63,7 +63,7 @@ function resolveLicenseAlert(data) {
   if (status === 'ACTIVE' && isExpiringSoon) {
     let descriptionText = '';
     // customize message based on how soon the license is expiring
-    if (expiresInDays === 1) {
+    if (expiresInDays === 0) {
       descriptionText = 'Your license will expire today. Please renew immediately.';
     } else {
       descriptionText = `Your license will expire in ${expiresInDays} days. Please plan for renewal.`;

package/core/lib/utils/api/api.utils.js

@@ -1,4 +1,4 @@
-import { PostData, GetData, PutData, PatchData, DeleteData } from './../http/http.utils';
+import { PostData, GetData, PutData, PatchData, DeleteData,UploadData } from './../http/http.utils';
 
 let headers = {};
 
@@ -124,32 +124,27 @@ export default class ApiUtils {
     });
   };
 
-  static upload = ({ url, data }) => {
-    return fetch(process.env.REACT_APP_endpoint + url, {
-      // Your POST endpoint
-      method: 'POST',
+ static upload = async ({ url, data, headers: customHeaders = {}, ...props }) => {
+  const dbPtr = localStorage.getItem('db_ptr');
+
+  console.log('nura upload called with:',dbPtr);
+  try {
+    return await UploadData({
+      url,
+      formBody: data, // FormData
+      settings,
       headers: {
-        //   'App-Type': 313,
-        //   'App-Version': '1.0.1',
-        Authorization: 'Bearer ' + localStorage.access_token,
-        // type:'multipart/formData'
-      },
-      //   credentials: 'include',
-      body: data,
-    }).then(
-      (result) => {
-        return result.json();
-      },
-      (error) => {
-        console.log(error);
-        return error;
+        ...(settings.headers || {}),
+        ...(dbPtr ? { db_ptr: dbPtr } : {}),
+        ...customHeaders,
       },
-      (progress) => {
-        console.log(progress);
-        return progress;
-      }
-    );
-  };
+      ...props,
+    });
+  } catch (error) {
+    console.log('Upload Error:', error);
+    throw error;
+  }
+};
 
   /**
    * Get Auth Status

package/core/lib/utils/http/http.utils.js

@@ -76,18 +76,24 @@ export async function ApiCall({ url, formBody, method, settings, ...props }) {
   const path = window.location.pathname;
   const baseUrl = props.baseUrl || process.env.REACT_APP_endpoint;
 
+// 1. Check if we are dealing with FormData (Upload)
+  const isFormData = formBody instanceof FormData;
+
   const payload = {
     method,
     headers: {
       ...settings.headers,
-      ...headers,
       ...(props.headers || {}),
-      ...(token ? { Authorization: `Bearer ${token}` } : {}),
-      'Content-Type': 'application/json',
+      Authorization: `Bearer ${token}`,
     },
-    body: formBody ? JSON.stringify(formBody) : null,
+    // 2. If it's NOT FormData, stringify it. If it IS, pass it raw.
+    body: isFormData ? formBody : (formBody ? JSON.stringify(formBody) : null),
   };
 
+  // 3. Only add JSON Content-Type if it's NOT a FormData upload
+  if (!isFormData) {
+    payload.headers['Content-Type'] = 'application/json';
+  }
   // 🟡 Handles both normal and retried responses
   const handleResponse = async (res) => {
     if (props.responseType === 'blob') {
@@ -156,3 +162,17 @@ export async function ApiCall({ url, formBody, method, settings, ...props }) {
     throw err;
   }
 }
+
+/**
+ * Method for uploading documents
+ * @public
+ */
+export async function UploadData({ url, formBody, ...props }) {
+  return ApiCall({
+    url,
+    formBody,
+    method: 'POST',
+    returnResponse: true,
+    ...props,
+  });
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ui-soxo-bootstrap-core",
-  "version": "2.6.1-dev.23",
+  "version": "2.6.1-dev.25",
   "description": "All the Core Components for you to start",
   "keywords": [
     "all in one"