ui-soxo-bootstrap-core 2.6.3 → 2.6.4

package/core/components/menu-template-api/menu-template-api.js

@@ -99,9 +99,9 @@ export default class MenuTemplateAPI extends Component {
         }
 
 
-        if (menu && menu.model_id) {
+        if (menu && menu?.model_id) {
 
-            if (menu.model_id && allModels[menu.model.name]) {
+            if (menu?.model_id && allModels[menu?.model?.name]) {
 
                 this.loadedModel = allModels[menu.model.name]
 

package/core/lib/components/sidemenu/sidemenu.js

@@ -39,18 +39,18 @@ function CollapsedIconMenu({ menu, collapsed, icon, caption }) {
   // Import t and i18n from useTranslation
   const { t, i18n } = useTranslation();
   const { state } = useContext(GlobalContext);
-    const [isMobile, setIsMobile] = useState(false);
+  const [isMobile, setIsMobile] = useState(false);
 
-    useEffect(() => {
-      const handleResize = () => {
-        setIsMobile(window.innerWidth < 768); // Common breakpoint for mobile
-      };
+  useEffect(() => {
+    const handleResize = () => {
+      setIsMobile(window.innerWidth < 768); // Common breakpoint for mobile
+    };
 
-      handleResize(); // Set initial value
-      window.addEventListener('resize', handleResize);
+    handleResize(); // Set initial value
+    window.addEventListener('resize', handleResize);
 
-      return () => window.removeEventListener('resize', handleResize);
-    }, []);
+    return () => window.removeEventListener('resize', handleResize);
+  }, []);
 
   const menuText = t(caption);
   const menuContent = (
@@ -85,8 +85,14 @@ function CollapsedIconMenu({ menu, collapsed, icon, caption }) {
     </>
   );
 
-    // On mobile, or when the menu is collapsed (based on original logic), don't show the popover tooltip.
-    return isMobile || collapsed ? menuContent : <Popover content={menuText} placement="right">{menuContent}</Popover>;
+  // On mobile, or when the menu is collapsed (based on original logic), don't show the popover tooltip.
+  return isMobile || collapsed ? (
+    menuContent
+  ) : (
+    <Popover content={menuText} placement="right">
+      {menuContent}
+    </Popover>
+  );
 }
 
 export default function SideMenu({ loading, modules = [], callback, appSettings, collapsed }) {
@@ -123,7 +129,7 @@ export default function SideMenu({ loading, modules = [], callback, appSettings,
    * Logout Function
    */
   async function handleLogout() {
-    let dbPtrValue = appSettings.headers.db_ptr;
+    // let dbPtrValue = appSettings.headers.db_ptr;
     const isEnvThemeTrue = process.env.REACT_APP_THEME === 'true';
 
     //  Only clear localStorage if theme is not 'true'
@@ -137,7 +143,7 @@ export default function SideMenu({ loading, modules = [], callback, appSettings,
       // const result = Users.logout()
       localStorage.clear();
 
-      localStorage.setItem('db_ptr', dbPtrValue);
+      // localStorage.setItem('db_ptr', dbPtrValue);
 
       let userInfo = {
         dms: {},

package/core/lib/pages/login/login.js

@@ -30,7 +30,7 @@ import { getAccessToken, getRefreshToken } from '../../utils/http/auth.helper';
 
 import { Location } from '../../utils';
 
-import { checkLicenseStatus, formatMobile, checkExpiryStatus } from '../../utils/common/common.utils';
+import { checkLicenseStatus, formatMobile, checkExpiryStatus, safeJSON } from '../../utils/common/common.utils';
 
 import { MailOutlined, MessageOutlined, WhatsAppOutlined } from '@ant-design/icons';
 
@@ -53,13 +53,17 @@ const LICENSE_EXPIRY = '2026-12-12';
 //password valdity expire
 const PASSWORD_VALIDITY_DAYS = 90;
 
+const headers = {
+  db_ptr: 'nuraho',
+};
+
 /**
  *
  * @param {*} param0
  * @returns
  */
 function LoginPhone({ history, appSettings }) {
-  const { brandLogo, heroImage, footerLogo, headers } = appSettings;
+  const { brandLogo, heroImage, footerLogo } = appSettings;
 
   //  Hook for OTP Timer
   const { expired: otpExpired, formatted, startFromExpiry } = useOtpTimer();
@@ -213,7 +217,7 @@ function LoginPhone({ history, appSettings }) {
               setUser(data);
               //  Set default communication mode automatically
               if (result.data.mode) {
-                setCommunicationMode(result.data.mode); // <--- fix
+                setCommunicationMode(result.data.mode);
               }
             } else {
               let d = user;
@@ -232,6 +236,17 @@ function LoginPhone({ history, appSettings }) {
               localStorage.setItem('userInfo', JSON.stringify(userInfo));
               if (refresh_token) localStorage.setItem('refresh_token', refresh_token);
 
+              // Setting DBPTR
+              if (user?.organization_details) {
+                const data = safeJSON(user?.organization_details);
+
+                const defaultBranch = data.branch.find((b) => b.defaultBranch === true);
+
+                const defaultDbptr = defaultBranch?.dbPtr;
+
+                localStorage.setItem('db_ptr', defaultDbptr);
+              }
+
               history.push('/');
             }
           } else {
@@ -392,6 +407,16 @@ function LoginPhone({ history, appSettings }) {
           // Setting refresh_token
           if (result.refresh_token) localStorage.setItem('refresh_token', result.refresh_token);
 
+          // Setting DBPTR
+          if (result?.user?.organization_details) {
+            const data = safeJSON(result?.user?.organization_details);
+
+            const defaultBranch = data.branch.find((b) => b.defaultBranch === 'true');
+            const defaultDbptr = defaultBranch?.dbPtr;
+
+            localStorage.setItem('db_ptr', defaultDbptr);
+          }
+
           dispatch({ type: 'user', payload: userInfo });
           // set user info into local storage
           localStorage.setItem('userInfo', JSON.stringify(userInfo));
@@ -768,7 +793,7 @@ function LoginPhone({ history, appSettings }) {
                     <h4></h4>
                   </div>
 
-                  {!process.env.REACT_APP_SHOW_BRANCH_SWITCHER && <div className="branch-switcher">{globalCustomerHeader()}</div>}
+                  {/* {!process.env.REACT_APP_SHOW_BRANCH_SWITCHER && <div className="branch-switcher">{globalCustomerHeader()}</div>} */}
 
                   {process.env.REACT_APP_ENABLE_LDAP === 'true' && (
                     <Button loading={ldaploading} type="secondary" className="SubmitBtn" onClick={loginWithLdap}>

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

@@ -1,10 +1,4 @@
-import {
-  PostData,
-  GetData,
-  PutData,
-  PatchData,
-  DeleteData,
-} from "./../http/http.utils";
+import { PostData, GetData, PutData, PatchData, DeleteData } from './../http/http.utils';
 
 let headers = {};
 
@@ -29,75 +23,103 @@ export default class ApiUtils {
     return this.user;
   };
 
-  static get = ({ url, config = { queries: [], order: {} }, ...props }) => {
-    const { headers } = settings;
-
-    return GetData({
-      url: createUrlParams(url, config),
-      settings,
-      headers,
-      ...props,
-    }).catch((result) => {
-      console.log(result);
-    });
+  static get = async ({ url, config = { queries: [], order: {} }, headers: customHeaders = {}, ...props }) => {
+    const dbPtr = localStorage.getItem('db_ptr');
+
+    try {
+      return await GetData({
+        url: createUrlParams(url, config),
+        settings,
+        headers: {
+          ...(settings.headers || {}),
+          ...(dbPtr ? { db_ptr: dbPtr } : {}),
+          ...customHeaders,
+        },
+        ...props,
+      });
+    } catch (result_1) {
+      console.log(result_1);
+    }
   };
 
-  static getRecordDetail = ({ url, config = { queries: [] }, ...props }) => {
-    const { headers } = settings;
-
-    return GetData({
-      url: createUrlParams(url, config),
-      settings,
-      headers,
-      ...props,
-    }).catch((result) => {
-      console.log(result);
-    });
+  static getRecordDetail = async ({ url, config = { queries: [] }, headers: customHeaders = {}, ...props }) => {
+    const dbPtr = localStorage.getItem('db_ptr');
+
+    try {
+      return await GetData({
+        url: createUrlParams(url, config),
+        settings,
+        headers: {
+          ...(settings.headers || {}),
+          ...(dbPtr ? { db_ptr: dbPtr } : {}),
+          ...customHeaders,
+        },
+        ...props,
+      });
+    } catch (result_1) {
+      console.log(result_1);
+    }
   };
 
-  static post = ({ url, formBody, ...props }) => {
-    const { headers } = settings;
+  static post = ({ url, formBody, headers: customHeaders = {}, ...props }) => {
+    const dbPtr = localStorage.getItem('db_ptr');
 
     return PostData({
       url,
       formBody,
       settings,
-      headers,
+      headers: {
+        ...(settings.headers || {}),
+        ...(dbPtr ? { db_ptr: dbPtr } : {}),
+        ...customHeaders,
+      },
       ...props,
     });
   };
 
-  static put = ({ url, formBody, ...props }) => {
-    const { headers } = settings;
+  static put = ({ url, formBody, headers: customHeaders = {}, ...props }) => {
+    const dbPtr = localStorage.getItem('db_ptr');
 
     return PutData({
       url,
       settings,
       formBody,
-      headers,
+      headers: {
+        ...(settings.headers || {}),
+        ...(dbPtr ? { db_ptr: dbPtr } : {}),
+        ...customHeaders,
+      },
       ...props,
     });
   };
 
-  static patch = ({ url, formBody, ...props }) => {
-    const { headers } = settings;
+  static patch = ({ url, formBody, headers: customHeaders = {}, ...props }) => {
+    const dbPtr = localStorage.getItem('db_ptr');
 
     return PatchData({
       url,
       settings,
       formBody,
-      headers,
+      headers: {
+        ...(settings.headers || {}),
+        ...(dbPtr ? { db_ptr: dbPtr } : {}),
+        ...customHeaders,
+      },
       ...props,
     });
   };
 
-  static delete = ({ url, formBody, ...props }) => {
-    const { headers } = settings;
+  static delete = ({ url, formBody, headers: customHeaders = {}, ...props }) => {
+    const dbPtr = localStorage.getItem('db_ptr');
 
     return DeleteData({
       url,
       settings,
-      headers,
+      headers: {
+        ...(settings.headers || {}),
+        ...(dbPtr ? { db_ptr: dbPtr } : {}),
+        ...customHeaders,
+      },
       ...props,
     });
   };
@@ -105,11 +127,11 @@ export default class ApiUtils {
   static upload = ({ url, data }) => {
     return fetch(process.env.REACT_APP_endpoint + url, {
       // Your POST endpoint
-      method: "POST",
+      method: 'POST',
       headers: {
         //   'App-Type': 313,
         //   'App-Version': '1.0.1',
-        Authorization: "Bearer " + localStorage.access_token,
+        Authorization: 'Bearer ' + localStorage.access_token,
         // type:'multipart/formData'
       },
       //   credentials: 'include',
@@ -136,16 +158,17 @@ export default class ApiUtils {
    * @returns
    */
   static getAuthStatus = ({ settings: config, token }) => {
-    headers = headers;
+    // headers = headers;
 
     settings = config;
 
     return GetData({
       url: `auth/profile`,
       settings,
-
-      headers,
-      token
+      headers: {
+        db_ptr: 'nuraho',
+      },
+      token,
     });
   };
 }
@@ -159,7 +182,7 @@ function createUrlParams(url, config) {
   let { queries = [], limit, order } = config;
 
   if (queries.length > 0 || limit > 0) {
-    base_url += "?";
+    base_url += '?';
   }
 
   queries.forEach((ele) => {

package/core/lib/utils/common/common.utils.js

@@ -197,3 +197,27 @@ export const formatMobile = (mobile, visibleDigits = 4) => {
   // Combine masked and visible parts without spacing the visible digits
   return `${maskedWithSpaces} ${visible}`;
 };
+
+/**
+ * Safely parse a JSON value.
+ *
+ * - Accepts JSON strings or plain objects
+ * - Returns null on any invalid or missing data
+ */
+export function safeJSON(value) {
+  if (value == null) return null;
+
+  if (typeof value === 'object' && !Array.isArray(value)) {
+    return value;
+  }
+
+  if (typeof value !== 'string' || value.trim() === '') {
+    return null;
+  }
+
+  try {
+    return JSON.parse(value);
+  } catch {
+    return null;
+  }
+}

package/core/lib/utils/index.js

@@ -1,10 +1,8 @@
-
-
-import { Location } from './location/location.utils'
+import { Location } from './location/location.utils';
 
 import Notification from './notification.utils';
 
-import DateUtils from './date/date.utils'
+import DateUtils from './date/date.utils';
 
 import ApiUtils from './api/api.utils';
 
@@ -16,31 +14,27 @@ import { GetData, PostData, PutData, DeleteData } from './http/http.utils';
 
 import { getExportData } from './generic/generic.utils';
 
-import { ConvertBytesToArray } from './common/common.utils';
+import { ConvertBytesToArray, safeJSON } from './common/common.utils';
 
 import SettingsUtil from './setting.utils';
 
-
 export {
-    // FirebaseUtils,
-
-    Notification,
-
-    Location,
-    DateUtils,
-    ApiUtils,
-    UploadUtils,
-    GetData,
-    PostData,
-    PutData,
-    DeleteData,
-
-    getExportData,
-
-
-    // Common Functions
-    ConvertBytesToArray,
-
-    SettingsUtil,
-    FormUtils
-}  
+  // FirebaseUtils,
+
+  Notification,
+  Location,
+  DateUtils,
+  ApiUtils,
+  UploadUtils,
+  GetData,
+  PostData,
+  PutData,
+  DeleteData,
+  getExportData,
+
+  // Common Functions
+  ConvertBytesToArray,
+  SettingsUtil,
+  FormUtils,
+  safeJSON,
+};

package/core/models/base/base.js

@@ -88,9 +88,13 @@ class BaseAPI {
      * Get the data from the table
      */
     get(config = {}) {
-        // Get the records from firebase
-
-        return ApiUtils.get({ url: config.url || this.endpoint, config });
+        const { url, headers, ...rest } = config;
+        return ApiUtils.get({
+            url: url || this.endpoint,
+            headers,
+            config: rest,
+            ...rest,
+        });
     }
 
     getRelations(id) {

package/core/models/menus/components/menu-lists/menu-lists.js

@@ -474,7 +474,7 @@ function panelActions(item, model, setSelectedRecord, setDrawerTitle, setDrawerV
         </Button>
       )}
 
-      {/* <Button
+      <Button
         size="small"
         type="default"
         onClick={() => {
@@ -484,7 +484,7 @@ function panelActions(item, model, setSelectedRecord, setDrawerTitle, setDrawerV
         }}
       >
         <CopyOutlined />
-      </Button> */}
+      </Button>
 
       <Popconfirm title="Are you sure?" onConfirm={() => deleteRecord(item)}>
         <Button danger size="small" type="default">

package/core/models/menus/menus.js

@@ -177,28 +177,47 @@ class MenusAPI extends Base {
    * @param {*} menu
    * @returns
    */
-  getMenus = (config) => {
+  getMenus = (config, dbPtr = null) => {
     // Use 'core-menus' endpoint if REACT_APP_USE_CORE_MENUS is true (used for Matria)
     const url =
       process.env.REACT_APP_USE_CORE_MENUS === 'true'
         ? 'core-menus/get-menus' // Matria
         : 'menus/get-menus'; // NURA
 
+    if (!dbPtr) dbPtr = localStorage.db_ptr;
+
     return this.get({
       url,
       config,
+      headers: {
+        db_ptr: dbPtr,
+      },
+    }).then((result) => result);
+  };
+
+  getMenubyUser = (user_id) => {
+    const url = `menus/get-menus?userId=${user_id}`;
+    return this.get({
+      url,
     }).then((result) => result);
   };
 
   // get core-menu list with submenu
   getCoreMenuLists = () => {
     const url = 'core-menus/core-menus?step=1&header_id=null';
-
     return this.get({
       url,
     }).then((result) => result);
   };
 
+  getCoreMenuByRoleId = async (role_id) => {
+    const url = `menus/get-menus-by-role/${role_id}`;
+    const result = await this.get({
+      url,
+    });
+    return result;
+  };
+
   getCoreMenus = () => {
     return [
       // {