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

package/core/lib/components/global-header/global-header.js

@@ -13,7 +13,7 @@ import { GlobalContext } from './../../Store';
 
 import { Link, useLocation } from 'react-router-dom';
 
-import { Typography, Avatar, Input } from 'antd';
+import { Typography, Avatar, Input, Tooltip } from "antd";
 
 import ProgressBar from '../progress-bar/progress-bar'; // Adjust the path as needed
 
@@ -21,7 +21,7 @@ import { Button } from '../../elements';
 
 import GenericHeader from '../header/generic-header';
 
-import { MenuOutlined, UserOutlined, SettingOutlined } from '@ant-design/icons';
+import { MenuOutlined, UserOutlined, SettingOutlined, QuestionCircleOutlined } from '@ant-design/icons';
 
 import { Drawer } from 'antd';
 
@@ -70,10 +70,12 @@ export default function GlobalHeader({
 
   // const [searchModalVisible, setSearchModalVisible] = useState(false);
 
-  const { globalCustomerHeader = () => {} } = appSettings;
+  const { globalCustomerHeader = () => { } } = appSettings;
 
   const { t, i18n } = useTranslation();
 
+  const helpDeskUrl = process.env.REACT_APP_HELP_DESK_URL
+
   const spotlightRef = useRef();
 
   useEffect(() => {
@@ -133,7 +135,7 @@ export default function GlobalHeader({
     animate();
   }, []);
 
-  useEffect(() => {}, [state.theme]);
+  useEffect(() => { }, [state.theme]);
 
   return (
     <>
@@ -152,7 +154,7 @@ export default function GlobalHeader({
             //whileHover="hover"
             //whileTap="tap"
             className={`left-bar ${!isConnected && !isMobile ? '' : 'hide'}${!collapsed ? 'open' : 'close'}${kiosk && !isConnected ? 'kioskon' : ''}`}
-            // style={{ background: state.theme.colors.leftSectionBackground }}
+          // style={{ background: state.theme.colors.leftSectionBackground }}
           >
             {!isMobile && !isConnected ? (
               <motion.div
@@ -199,7 +201,7 @@ export default function GlobalHeader({
             {!isConnected && !kiosk ? (
               <div
                 className={`page-wrapper ${!collapsed ? 'open' : 'close'}`}
-                // style={{ background: state.theme.colors.headerBg }}
+              // style={{ background: state.theme.colors.headerBg }}
               >
                 {/*  */}
                 <div className="page-header-name">
@@ -280,6 +282,18 @@ export default function GlobalHeader({
 
                     {/* Reload Button Ends */}
 
+                    {/* Help-desk-btn */}
+                    {helpDeskUrl ? <Tooltip title="Application support">
+                      <span>
+                        <Button
+                          onClick={() => window.open(helpDeskUrl, '_blank')}
+                          icon={<QuestionCircleOutlined />}
+                          type="default"
+                          size="small"
+                        />
+                      </span>
+                    </Tooltip> : null}
+
                     {/** Switch Languages starts */}
                     {process.env.REACT_APP_ENABLE_LANGUAGE_SWITCHER ? <LanguageSwitcher /> : null}
                     {/** Switch Languages ends */}
@@ -328,7 +342,7 @@ export default function GlobalHeader({
 function ProfileAvatar() {
   const { user = { locations: [] } } = useContext(GlobalContext);
 
-  useEffect(() => {}, []);
+  useEffect(() => { }, []);
 
   return (
     <Link className="profile-avatar" to="/profile">

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

@@ -124,28 +124,29 @@ export default class ApiUtils {
     });
   };
 
- 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: {
-        ...(settings.headers || {}),
-        ...(dbPtr ? { db_ptr: dbPtr } : {}),
-        ...customHeaders,
-      },
-      ...props,
+  // upload document
+  static upload = async ({ url, data, headers: customHeaders = {}, ...props }) => {
+    const dbPtr = localStorage.getItem('db_ptr');
+    
+    // Ensure settings object exists to avoid undefined errors in ApiCall
+    const settings = { 
+        headers: {},
+        getToken: () => localStorage.getItem('access_token') 
+    }; 
+
+    return UploadData({
+        url,
+        formBody: data, 
+        // Your FormData goes here
+        isUpload: true, // Indicate that this is an upload request
+        settings,
+        headers: {
+            ...(dbPtr ? { db_ptr: dbPtr } : {}),
+            ...customHeaders,
+        },
+        ...props,
     });
-  } catch (error) {
-    console.log('Upload Error:', error);
-    throw error;
-  }
-};
-
+  };
   /**
    * Get Auth Status
    *

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

@@ -70,13 +70,11 @@ export async function DeleteData({ url, ...props }) {
  *
  * @param {*} param
  */
-
 export async function ApiCall({ url, formBody, method, settings, ...props }) {
   const token = props.token || (await settings.getToken());
   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 = {
@@ -86,14 +84,23 @@ export async function ApiCall({ url, formBody, method, settings, ...props }) {
       ...(props.headers || {}),
       Authorization: `Bearer ${token}`,
     },
-    // 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';
+  // ✅ Upload + normal handling
+  if (method !== 'GET' && formBody) {
+    payload.body = formBody;
+
+    if (!isFormData && !(props.isUpload)) {
+      payload.body = JSON.stringify(formBody);
+      payload.headers['Content-Type'] = 'application/json';
+    }
+
+    // ❗ VERY IMPORTANT
+    if (isFormData || (props.isUpload)) {
+      delete payload.headers['Content-Type'];
+    }
   }
+
   // 🟡 Handles both normal and retried responses
   const handleResponse = async (res) => {
     if (props.responseType === 'blob') {
@@ -171,6 +178,7 @@ export async function UploadData({ url, formBody, ...props }) {
   return ApiCall({
     url,
     formBody,
+    isUpload: true,
     method: 'POST',
     returnResponse: true,
     ...props,

package/package.json

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