ui-soxo-bootstrap-core 2.6.1-dev.1 → 2.6.1-dev.11

package/core/components/extra-info/extra-info-details.js

@@ -21,7 +21,7 @@ import ExtraInfo from './extra-info';
 
 const { TabPane } = Tabs;
 
-export default function ExtraInfoDetail({ modeValue, icon, title, tabPosition = 'left', showDrawerData, dbPtr, callback, ...record }) {
+export default function ExtraInfoDetail({ modeValue, icon, title, tabPosition = 'left', showDrawerData, dbPtr, callback, drawerWidth = '35%', ...record }) {
   // State to control drawer
   const [open, setOpen] = useState(false);
 
@@ -121,7 +121,7 @@ export default function ExtraInfoDetail({ modeValue, icon, title, tabPosition =
         {/*  */}
 
         {/*  */}
-        <Drawer width={'35%'} title={title} onClose={onClose} open={open}>
+        <Drawer width={drawerWidth} title={title} onClose={onClose} open={open}>
           <div className="main-drawer-content">
             <div className="drawer-container">
               <div className="drawer-click">

package/core/lib/Store.js

@@ -50,7 +50,7 @@ const initialTheme = () => {
     //  manage theme with env
     const isEnvThemeTrue = process.env.REACT_APP_THEME;
 
-    console.log('REACT_APP_THEME:', isEnvThemeTrue);
+    // console.log('REACT_APP_THEME:', isEnvThemeTrue);
     const matchedTheme = themes.find((t) => t.name === isEnvThemeTrue);
 
     if (matchedTheme) return matchedTheme;
@@ -64,7 +64,7 @@ const initialTheme = () => {
     // Fallback to default
     return themes[0];
   } catch (e) {
-    console.error('Error loading theme:', e);
+    // console.error('Error loading theme:', e);
     return themes[0];
   }
 };
@@ -94,7 +94,7 @@ export const GlobalProvider = ({ children, CustomModels,CustomComponents, appSet
 
   const [state, dispatch] = useReducer(AppReducer, initialState);
 
-  console.log(state);
+  // console.log(state);
 
   const { isMobile } = useDeviceDetect();
 

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

@@ -49,7 +49,7 @@ import { useTranslation } from "react-i18next";
 import BorderStyle from "pdf-lib/cjs/core/annotation/BorderStyle";
 
 import SettingsUtil from "../../../utils/settings.utils";
-import { SpotlightSearch } from "..";
+import SpotlightSearch from "../spotlight-search/spotlight-search.component";
 
 
 
@@ -410,4 +410,4 @@ function ProfileAvatar() {
       {/* {user.name} */}
     </Link>
   );
-}
+}

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/elements/basic/country-phone-input/country-phone-input.js

@@ -11,7 +11,17 @@ import 'react-phone-input-2/lib/style.css';
 import PropTypes from 'prop-types';
 import './phone-input.scss';
 
-export default function CountryPhoneInput({ value, onChange, disabled, disableCountryCode, required, defaultCountryCode, onBlur,className }) {
+export default function CountryPhoneInput({
+  value,
+  onChange,
+  disabled,
+  disableCountryCode,
+  required,
+  defaultCountryCode,
+  onBlur,
+  className,
+  onKeyDown,
+}) {
   const inputRef = useRef();
   const hasInitializedRef = useRef(false); // IMPORTANT
 
@@ -21,11 +31,7 @@ export default function CountryPhoneInput({ value, onChange, disabled, disableCo
    * run ONLY ONCE when initial value has dial code
    */
   useEffect(() => {
-    if (
-      !hasInitializedRef.current &&
-      value?.code?.dialCode &&
-      value?.value
-    ) {
+    if (!hasInitializedRef.current && value?.code?.dialCode && value?.value) {
       setPhone(value.code.dialCode + value.value);
       hasInitializedRef.current = true; // 👈 mark as done
     }
@@ -54,7 +60,7 @@ export default function CountryPhoneInput({ value, onChange, disabled, disableCo
         // country={disableCountryCode ? false : 'in'}
         value={phone}
         onChange={handleInput}
-        inputProps={{ required: required }}
+        inputProps={{ required: required, onKeyDown: onKeyDown }}
         disabled={disabled}
         onBlur={onBlur}
       />
@@ -73,4 +79,4 @@ CountryPhoneInput.propTypes = {
   disableCountryCode: PropTypes.bool,
   /** A boolean indicating whether the input is required or not. This prop is optional. */
   required: PropTypes.bool,
-};
+};

package/core/lib/elements/basic/dragabble-wrapper/draggable-wrapper.js

@@ -102,7 +102,7 @@ export default function DraggableWrapper({ id, index, movePanel, item, dragEnabl
         >
           <div style={{ flex: 1 }}>
             {dragEnabled && <span style={{ marginRight: 8 }}>⋮⋮</span>}
-            <span>{item.name}</span>
+            <span>{item.caption}</span>
             {dragEnabled ? (
               <span style={{ marginLeft: 8, fontSize: 11, color: '#999' }}>(Level {level})</span>
             ) : (

package/core/lib/elements/basic/menu-tree/menu-tree.js

@@ -23,7 +23,7 @@
  */
 
 import React from 'react';
-import { Checkbox, Collapse } from 'antd';
+import { Checkbox, Collapse, Tag } from 'antd';
 
 const { Panel } = Collapse;
 
@@ -73,11 +73,15 @@ export const MenuTree = ({ menus, selectedMenus = [], toggleMenu, parentId = nul
               background: '#fff',
               display: 'flex',
               alignItems: 'center',
-              gap: 8,
+              justifyContent: 'space-between',
             }}
           >
-            {showCheckbox && <Checkbox checked={selectedMenus.includes(menu.id)} onChange={(e) => onParentChange(e.target.checked)} />}
-            <span>{menu.title || menu.caption}</span>
+            {/* Left Side */}
+            <div style={{ display: 'flex', alignItems: 'center', gap: 8 }}>
+              {showCheckbox && <Checkbox checked={selectedMenus.includes(menu.id)} onChange={(e) => onParentChange(e.target.checked)} />}
+              <span>{menu.caption}</span>
+            </div>
+            <Tag color={menu.is_visible === true ? 'green' : 'blue'}>{menu.is_visible === true ? 'VISIBLE' : 'HIDDEN'}</Tag>{' '}
           </div>
         );
       }
@@ -91,15 +95,24 @@ export const MenuTree = ({ menus, selectedMenus = [], toggleMenu, parentId = nul
           <Panel
             key={menu.id}
             header={
-              <div style={{ display: 'flex', alignItems: 'center', gap: 8 }}>
-                {showCheckbox && (
-                  <Checkbox
-                    checked={children.every((c) => selectedMenus.includes(c.id))}
-                    indeterminate={children.some((c) => selectedMenus.includes(c.id)) && !children.every((c) => selectedMenus.includes(c.id))}
-                    onChange={(e) => onParentChange(e.target.checked)}
-                  />
-                )}
-                <span>{menu.title || menu.caption}</span>
+              <div
+                style={{
+                  display: 'flex',
+                  alignItems: 'center',
+                  justifyContent: 'space-between',
+                }}
+              >
+                <div style={{ display: 'flex', alignItems: 'center', gap: 8 }}>
+                  {showCheckbox && (
+                    <Checkbox
+                      checked={children.every((c) => selectedMenus.includes(c.id))}
+                      indeterminate={children.some((c) => selectedMenus.includes(c.id)) && !children.every((c) => selectedMenus.includes(c.id))}
+                      onChange={(e) => onParentChange(e.target.checked)}
+                    />
+                  )}
+                  <span>{menu.caption}</span>
+                </div>
+                <Tag color={menu.is_visible === true ? 'green' : 'blue'}>{menu.is_visible === true ? 'VISIBLE' : 'HIDDEN'}</Tag>{' '}
               </div>
             }
           >

package/core/lib/models/forms/components/form-creator/form-creator.scss

@@ -4,14 +4,14 @@
     }
 
     .new-record {
-            gap: 10px !important;
+        gap: 10px !important;
     }
 
     .form-item-element {
         position: relative;
         padding: 8px;
         border-radius: 4px;
-        border: 1px solid #e3e3e3;
+        // border: 1px solid #e3e3e3;
         margin-bottom: 3px;
 
         .field-customizer {
@@ -22,9 +22,10 @@
                 // right: 0px;
             }
         }
-     
+
     }
-    .submit-button{
+
+    .submit-button {
         margin-top: 10px;
     }
 }