@visns-studio/visns-components 3.3.1 → 3.3.3

package/components/crm/auth/Profile.jsx

@@ -26,6 +26,7 @@ const Profile = ({ userProfile, setUserProfile }) => {
     ]);
 
     useEffect(() => {
+        console.info(userProfile);
         setProfile({
             name: userProfile.name,
             email: userProfile.email,
@@ -41,28 +42,43 @@ const Profile = ({ userProfile, setUserProfile }) => {
         }));
     };
 
-    const handleSubmitProfile = (e) => {
-        e.preventDefault();
+    const handleSubmitProfile = async (e) => {
+        try {
+            if (e) {
+                e.preventDefault();
+            }
 
-        if (profile.name.trim() === '' || profile.email.trim() === '') {
-            setInputClasses({
-                name: profile.name.trim() === '' ? 'inputError' : '',
-                email: profile.email.trim() === '' ? 'inputError' : '',
-            });
+            // Validate required fields
+            if (profile.name.trim() === '' || profile.email.trim() === '') {
+                setInputClasses({
+                    name: profile.name.trim() === '' ? 'inputError' : '',
+                    email: profile.email.trim() === '' ? 'inputError' : '',
+                });
 
-            toast.error('Please fill in all the required fields.');
-        } else {
-            CustomFetch(
-                `/ajax/users/${userProfile.id}`,
-                'PUT',
-                profile,
-                function (result) {
-                    setUserProfile(result.user);
-                    toast.success(
-                        'Your profile has been successfully updated.'
-                    );
+                toast.error('Please fill in all the required fields.');
+            } else {
+                // Create a new payload object
+                let payload = {
+                    name: profile.name,
+                    email: profile.email,
+                };
+
+                // Conditionally add password to payload if it has a value
+                if (profile.password.trim() !== '') {
+                    payload.password = profile.password;
                 }
-            );
+
+                const res = await CustomFetch(
+                    `/ajax/users/${userProfile.id}`,
+                    'PUT',
+                    payload
+                );
+
+                setUserProfile(res.data.data);
+                toast.success('Your profile has been successfully updated.');
+            }
+        } catch (err) {
+            console.log(err);
         }
     };
 

package/components/crm/generic/GenericAuth.jsx

@@ -19,7 +19,7 @@ import Reset from '../auth/Reset';
 import Verify from '../auth/Verify';
 
 const ProtectedRoute = ({ user, loading, redirectPath = '/login' }) => {
-    return loading ? null : !user.id ? (
+    return loading ? null : !user || !user.id ? (
         <Navigate to={redirectPath} replace />
     ) : (
         <Outlet />

package/components/crm/generic/GenericDetail.jsx

@@ -20,7 +20,7 @@ import Table from '../DataGrid';
 import TableFilter from '../TableFilter';
 import { toast } from 'react-toastify';
 
-function GenericDetail({ setting, urlParam, userProfile }) {
+function GenericDetail({ extraUrlParam, setting, urlParam, userProfile }) {
     const routeParams = useParams();
 
     const { filters, page, stages, tabs } = setting;

package/components/crm/generic/GenericMain.jsx

@@ -15,18 +15,37 @@ const GenericMain = ({
 }) => {
     const [incomingCallData, setIncomingCallData] = useState({});
 
+    // Function to extract route parameters
+    const extractRouteParams = (path) => {
+        const params = path.match(/:\w+/g) || [];
+        return params.map((param) => param.substring(1));
+    };
+
     // Recursive function to render routes
     const renderRoutes = (routes) => {
         return routes.map((route, index) => {
-            let element;
+            let elementProps = {
+                userProfile: userProfile,
+                setUserProfile: setUserProfile,
+            };
+
+            const routeParams = extractRouteParams(route.path);
+            const extraParams = routeParams.filter(
+                (param) => param !== 'dataId'
+            );
 
-            if (route.element) {
-                element = React.cloneElement(route.element, {
-                    userProfile: userProfile,
-                    setUserProfile: setUserProfile,
-                });
+            if (routeParams.includes('dataId')) {
+                elementProps.urlParam = 'dataId';
             }
 
+            if (extraParams.length > 0) {
+                elementProps.extraUrlParam = extraParams;
+            }
+
+            let element = route.element
+                ? React.cloneElement(route.element, elementProps)
+                : null;
+
             if (route.children && route.children.length > 0) {
                 // If the route has children, render them recursively
                 return (

package/package.json

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