@visns-studio/visns-components 4.3.1 → 4.3.3

package/components/crm/Breadcrumb.jsx

@@ -6,42 +6,45 @@ function Breadcrumb({ data, page }) {
     const getNestedData = (data, keys) =>
         keys.reduce((acc, key) => (acc && acc[key] ? acc[key] : null), data);
 
+    const nestedData =
+        data && page.parentTitleKey
+            ? getNestedData(data, page.parentTitleKey)
+            : null;
+
     return (
         <h1>
             {page?.parentTitle && page?.parentUrl && (
                 <>
-                    <Link to={page.parentUrl}>
-                        {page.parentTitle}{' '}
-                        <CircleChevronRight strokeWidth={2} size={18} />
-                    </Link>
-
-                    {data &&
-                    page.parentTitleKey &&
-                    getNestedData(data, page.parentTitleKey) ? (
-                        <Link
-                            to={`${page.parentUrl}/${getNestedData(
-                                data,
-                                page.parentUrlKey
-                            )}`}
-                        >
-                            {getNestedData(data, page.parentTitleKey)}
-                            <CircleChevronRight
-                                strokeWidth={2}
-                                size={18}
-                            />{' '}
-                        </Link>
-                    ) : null}
+                    <Link to={page.parentUrl}>{page.parentTitle}</Link>
+                    <CircleChevronRight strokeWidth={2} size={18} />
                 </>
             )}
-            <Link to={page && page.previousUrl ? page.previousUrl : null}>
-                {page && page.title ? page.title : null}
-            </Link>{' '}
-            {page?.titleKey && data && data[page.titleKey] ? (
+
+            {nestedData ? (
                 <>
-                    <CircleChevronRight strokeWidth={2} size={18} />{' '}
-                    {data[page.titleKey]}
+                    <Link
+                        to={`${page.parentUrl}/${getNestedData(
+                            data,
+                            page.parentUrlKey
+                        )}`}
+                    >
+                        {nestedData}
+                    </Link>
+                    <CircleChevronRight strokeWidth={2} size={18} />
                 </>
-            ) : null}
+            ) : (
+                page &&
+                page.title && (
+                    <>
+                        <Link to={page.previousUrl}>{page.title}</Link>
+                        <CircleChevronRight strokeWidth={2} size={18} />
+                    </>
+                )
+            )}
+
+            {page.titleKey && data && data[page.titleKey] && (
+                <>{data[page.titleKey]}</>
+            )}
         </h1>
     );
 }

package/components/crm/Form.jsx

@@ -8,8 +8,10 @@ import parse from 'html-react-parser';
 import _ from 'lodash';
 import ReactDataGrid from '@inovua/reactdatagrid-community';
 import { CircleX } from 'akar-icons';
+import { confirmAlert } from 'react-confirm-alert';
 
 import '@inovua/reactdatagrid-community/index.css';
+import 'react-confirm-alert/src/react-confirm-alert.css';
 
 import CustomFetch from './Fetch';
 import Download from './Download';
@@ -491,6 +493,56 @@ function Form({
         }
     };
 
+    const handleCustom = async (s) => {
+        const executeRequest = async () => {
+            try {
+                const url = formSettings.customButton.url;
+                const method = 'POST';
+
+                const res = await CustomFetch(url, method, {
+                    id: formData[formSettings.primaryKey],
+                });
+
+                if (res.data.error === '') {
+                    if (res.data.message) {
+                        toast.success(res.data.message);
+                    }
+
+                    fetchData();
+                } else {
+                    toast.error(res.data.error);
+                }
+            } catch (error) {
+                console.error('Request failed:', error);
+            }
+        };
+
+        try {
+            if (s.customButton.confirmation) {
+                confirmAlert({
+                    title: '',
+                    message:
+                        s.customButton.confirmation.message ||
+                        'Are you sure you want to proceed?',
+                    buttons: [
+                        {
+                            label: 'Yes',
+                            onClick: executeRequest,
+                        },
+                        {
+                            label: 'No',
+                            onClick: () => close(),
+                        },
+                    ],
+                });
+            } else {
+                await executeRequest();
+            }
+        } catch (err) {
+            console.error('An error occurred:', err);
+        }
+    };
+
     const handleSubmit = async (e) => {
         try {
             if (e) {
@@ -1274,7 +1326,14 @@ function Form({
                 <div className="polActions">
                     {formSettings.hasOwnProperty('customButton') &&
                     formSettings.customButton.url ? (
-                        <button className="btn" onClick={handleSort}>
+                        <button
+                            className="btn"
+                            onClick={(e) => {
+                                e.preventDefault();
+
+                                handleCustom(formSettings);
+                            }}
+                        >
                             {formSettings.customButton.label
                                 ? formSettings.customButton.label
                                 : 'Sort'}

package/components/crm/Navigation.jsx

@@ -325,19 +325,15 @@ function Navigation({
         return () => {
             window.removeEventListener('scroll', handleScroll);
         };
+
+        console.info(layout);
     }, []);
 
     return layout === 'simple' || layout === 'cms' ? (
         <div className="cwrap">
             <aside
                 className={
-                    layout === 'cms'
-                        ? isOpen
-                            ? 'aside--cms'
-                            : 'aside--cms aside--cms--open'
-                        : isOpen
-                        ? 'aside'
-                        : 'aside aside--open'
+                    isOpen ? 'aside--cms' : 'aside--cms aside--cms--open'
                 }
             >
                 <div className="logo">

package/components/crm/generic/GenericAuth.jsx

@@ -27,6 +27,7 @@ const ProtectedRoute = ({ user, loading, redirectPath = '/login' }) => {
 };
 
 const GenericAuth = ({
+    layout = 'full',
     logo,
     headerLogo,
     providers,
@@ -106,6 +107,7 @@ const GenericAuth = ({
                         path="/*"
                         element={
                             <GenericMain
+                                layout={layout}
                                 logo={headerLogo}
                                 navigation={navigation}
                                 routeConfig={routeConfig}

package/components/crm/generic/GenericMain.jsx

@@ -4,8 +4,10 @@ import { Routes, Route, Navigate } from 'react-router-dom';
 import Call from '../Call';
 import Loader from '../Loader';
 import Navigation from '../Navigation';
+import { FullScreen } from 'akar-icons';
 
 const GenericMain = ({
+    layout = 'full',
     logo,
     navigation,
     routeConfig,
@@ -65,6 +67,7 @@ const GenericMain = ({
         <div>
             <header className="header">
                 <Navigation
+                    layout={layout}
                     logo={logo}
                     navConfig={navigation}
                     setSystemAuth={setSystemAuth}

package/components/crm/styles/Field.module.css

@@ -17,7 +17,7 @@
     transition: all 200ms;
     opacity: 0.8;
     left: 0;
-    padding: 19px 20px;
+    padding: 19px 25px;
     transform-origin: top left;
     cursor: text;
 }

package/package.json

@@ -57,7 +57,7 @@
         "react-dom": "^17.0.1"
     },
     "name": "@visns-studio/visns-components",
-    "version": "4.3.1",
+    "version": "4.3.3",
     "description": "Various packages to assist in the development of our Custom Applications.",
     "main": "index.js",
     "scripts": {