datastake-daf 0.6.506 → 0.6.508

package/dist/layouts/index.js

@@ -31,28 +31,6 @@ const useResizeContext = () => {
   return values;
 };
 
-/* eslint-disable react/prop-types */
-const NOTIFICATION_MODE = {
-  EMPTY: 'EMPTY',
-  PROJECT_SOURCES: 'PROJECT_SOURCES'
-};
-const FormsContext = /*#__PURE__*/o.createContext({
-  onYesNotification: () => {},
-  onNoNotification: () => {},
-  notificationMode: NOTIFICATION_MODE.EMPTY,
-  notificationState: {},
-  setNotificationMode: () => {},
-  changeNotificationState: () => {},
-  authenticationLinks: [],
-  setAuthenticationLinks: () => {},
-  addCheck: () => {},
-  removeCheck: () => {}
-});
-const useForms = () => {
-  const value = o.useContext(FormsContext);
-  return value;
-};
-
 /*************  ✨ Codeium Command ⭐  *************/
 /**
  * Given an array of classnames (some of which may be empty), joins them all
@@ -5263,19 +5241,16 @@ const Sidenav = ({
   const checkOnClick = ({
     event
   }) => {
-    console.log("checkOnClick", changeNotificationState);
-    // If no changeNotificationState or no unsaved changes, execute immediately
-    if (!changeNotificationState) {
-      if (typeof event === 'function') {
-        event();
-      }
-      return;
+    console.log("Click 1");
+    if (changeNotificationState && typeof changeNotificationState === 'function') {
+      console.log("Change notification state", changeNotificationState);
+      changeNotificationState({
+        onYes: event
+      });
+    } else if (typeof event === 'function') {
+      console.log("Event", event);
+      event();
     }
-
-    // Otherwise, use the notification state mechanism
-    changeNotificationState({
-      onYes: event
-    });
   };
   const {
     hoverContent,
@@ -5342,11 +5317,12 @@ const Sidenav = ({
     children: [renderModule({
       module: userModule,
       isCollapsed,
-      onClick: () => checkOnClick({
-        event: () => {
-          goTo(getRedirectLink(`/app`));
-        }
-      }),
+      onClick: () => {
+        const redirectPath = getRedirectLink(`/app`);
+        checkOnClick({
+          event: () => goTo(redirectPath)
+        });
+      },
       mod,
       user,
       userHelpers
@@ -6129,13 +6105,13 @@ const UserDropdownMenu = ({
   const isDemoEnv = isDev;
 
   // Helper function to handle navigation with notification check
-  const handleNavigate = path => {
+  const handlegoTo = path => {
     if (changeNotificationState) {
       changeNotificationState({
-        onYes: () => goTo(getRedirectLink(path))
+        onYes: () => goTo?.(path)
       });
     } else {
-      goTo(getRedirectLink(path));
+      goTo?.(path);
     }
   };
 
@@ -6161,7 +6137,6 @@ const UserDropdownMenu = ({
       drawerOpened: settingsDrawerOpened,
       user: user,
       goTo: goTo,
-      getRedirectLink: getRedirectLink,
       t: t,
       checkPermission: checkPermission,
       logOut: logOut,
@@ -6173,44 +6148,35 @@ const UserDropdownMenu = ({
     placement: "bottomLeft",
     rootClassName: formatClassname(['user-dropdown-layout', appName]),
     menu: {
-      items: [
-      // Only show Users option if conditions met
-      ...(user.company && !isDemoEnv && canViewUsers && !isAdmin ? [{
-        label: t('Users'),
-        key: 'users',
-        onClick: () => handleNavigate(getRedirectLink(`/app/users`))
-      }] : []),
-      // Only show Settings option if conditions met
-      ...(canViewSettings && !isAppNavigation && !isAdmin ? [{
-        label: t('Settings'),
-        key: 'settings',
-        onClick: () => handleNavigate(getRedirectLink(`/app/view/settings`))
-      }] : []),
-      // Always show logout
-      {
-        label: t('Log out'),
-        key: 'logout',
-        onClick: handleLogout
-      }],
-      // Add the header as a separate component
-      onClick: info => {
-        // This will be called when any menu item is clicked
-        console.log('Menu item clicked:', info.key);
-      }
+      items: [{
+        label: /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
+          children: [/*#__PURE__*/jsxRuntime.jsxs("div", {
+            className: "drop-header",
+            children: [/*#__PURE__*/jsxRuntime.jsx("h4", {
+              children: user?.company?.name || ''
+            }), /*#__PURE__*/jsxRuntime.jsxs("p", {
+              children: [user?.firstName || '', " ", user?.lastName || '']
+            })]
+          }), /*#__PURE__*/jsxRuntime.jsxs("div", {
+            className: "list",
+            children: [user.company && !isDemoEnv && canViewUsers && !isAdmin ? /*#__PURE__*/jsxRuntime.jsx("div", {
+              className: "list-item",
+              onClick: () => handlegoTo(getRedirectLink(`/app/users`)),
+              children: t('Users')
+            }) : null, canViewSettings && !isAppNavigation && !isAdmin ? /*#__PURE__*/jsxRuntime.jsx("div", {
+              className: "list-item",
+              onClick: () => handlegoTo(getRedirectLink(`/app/view/settings`)),
+              children: t('Settings')
+            }) : null, /*#__PURE__*/jsxRuntime.jsx("div", {
+              className: "list-item",
+              onClick: handleLogout,
+              children: t('Log out')
+            })]
+          })]
+        }),
+        key: 'userMenu'
+      }]
     },
-    dropdownRender: menu => /*#__PURE__*/jsxRuntime.jsxs("div", {
-      children: [/*#__PURE__*/jsxRuntime.jsxs("div", {
-        className: "drop-header",
-        children: [/*#__PURE__*/jsxRuntime.jsx("h4", {
-          children: user?.company?.name || ''
-        }), /*#__PURE__*/jsxRuntime.jsxs("p", {
-          children: [user?.firstName || '', " ", user?.lastName || '']
-        })]
-      }), /*#__PURE__*/jsxRuntime.jsx("div", {
-        className: "list",
-        children: /*#__PURE__*/o__default["default"].cloneElement(menu)
-      })]
-    }),
     children: /*#__PURE__*/jsxRuntime.jsx("div", {
       className: "d-flex flex-column justify-content-center",
       children: /*#__PURE__*/jsxRuntime.jsx(UserIcon, {
@@ -7023,6 +6989,8 @@ function AppLayout({
   // Notifications (injected from app)
   notificationHandlers = {},
   NotificationsHistoryProvider,
+  changeNotificationState,
+  notificationMode,
   // Config
   sidenavConfig = {},
   appName = 'app',
@@ -7050,10 +7018,6 @@ function AppLayout({
   // Children
   children
 }) {
-  const {
-    notificationMode,
-    changeNotificationState
-  } = useForms();
   const [userPreferences, setUserPreferences] = o.useState(null);
   const isAppNavigation = module === 'app';
   const [drawerOpened, setDrawerOpened] = o.useState(false);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "datastake-daf",
-	"version": "0.6.506",
+	"version": "0.6.508",
 	"dependencies": {
 		"@ant-design/icons": "^5.2.5",
 		"@antv/g2": "^5.1.1",

package/src/@daf/layouts/AppLayout/components/Sidenav/index.js

@@ -163,17 +163,14 @@ const Sidenav = ({
   };
 
   const checkOnClick = ({ event }) => {
-    console.log("checkOnClick", changeNotificationState);
-    // If no changeNotificationState or no unsaved changes, execute immediately
-    if (!changeNotificationState) {
-      if (typeof event === 'function') {
-        event();
-      }
-      return;
+    console.log("Click 1")
+    if (changeNotificationState && typeof changeNotificationState === 'function') {
+      console.log("Change notification state", changeNotificationState);
+      changeNotificationState({ onYes: event });
+    } else if (typeof event === 'function') {
+      console.log("Event", event);
+      event();
     }
-    
-    // Otherwise, use the notification state mechanism
-    changeNotificationState({ onYes: event });
   };
 
   const { hoverContent, hoverContentSecond } = useMenu({
@@ -250,11 +247,12 @@ const Sidenav = ({
       {renderModule({
         module: userModule,
         isCollapsed,
-        onClick: () => checkOnClick({
-          event: () => {
-            goTo(getRedirectLink(`/app`));
-          }
-        }),
+        onClick: () => {
+          const redirectPath = getRedirectLink(`/app`);
+          checkOnClick({
+            event: () => goTo(redirectPath)
+          });
+        },
         mod,
         user,
         userHelpers

package/src/@daf/layouts/AppLayout/components/UserDropdown/index.js

@@ -51,11 +51,11 @@ export const UserDropdownMenu = ({
   const isDemoEnv = isDev;
 
   // Helper function to handle navigation with notification check
-  const handleNavigate = (path) => {
+  const handlegoTo = (path) => {
     if (changeNotificationState) {
-      changeNotificationState({ onYes: () => goTo(getRedirectLink(path)) });
+      changeNotificationState({ onYes: () => goTo?.(path) });
     } else {
-      goTo(getRedirectLink(path));
+      goTo?.(path);
     }
   };
 
@@ -78,7 +78,6 @@ export const UserDropdownMenu = ({
         drawerOpened={settingsDrawerOpened}
         user={user}
         goTo={goTo}
-        getRedirectLink={getRedirectLink}
         t={t}
         checkPermission={checkPermission}
         logOut={logOut}
@@ -93,42 +92,45 @@ export const UserDropdownMenu = ({
       rootClassName={formatClassname(['user-dropdown-layout', appName])}
       menu={{
         items: [
-          // Only show Users option if conditions met
-          ...(user.company && !isDemoEnv && canViewUsers && !isAdmin ? [{
-            label: t('Users'),
-            key: 'users',
-            onClick: () => handleNavigate(getRedirectLink(`/app/users`))
-          }] : []),
-          // Only show Settings option if conditions met
-          ...(canViewSettings && !isAppNavigation && !isAdmin ? [{
-            label: t('Settings'),
-            key: 'settings',
-            onClick: () => handleNavigate(getRedirectLink(`/app/view/settings`))
-          }] : []),
-          // Always show logout
           {
-            label: t('Log out'),
-            key: 'logout',
-            onClick: handleLogout
+            label: (
+              <>
+                <div className="drop-header">
+                  <h4>{user?.company?.name || ''}</h4>
+                  <p>{user?.firstName || ''} {user?.lastName || ''}</p>
+                </div>
+                <div className='list'>
+                  {user.company && !isDemoEnv && canViewUsers && !isAdmin ? (
+                    <div 
+                      className='list-item' 
+                      onClick={() => handlegoTo(getRedirectLink(`/app/users`))}
+                    >
+                      {t('Users')}
+                    </div>
+                  ) : null}
+
+                  {canViewSettings && !isAppNavigation && !isAdmin ? (
+                    <div 
+                      className='list-item' 
+                      onClick={() => handlegoTo(getRedirectLink(`/app/view/settings`))}
+                    >
+                      {t('Settings')}
+                    </div>
+                  ) : null}
+
+                  <div 
+                    className='list-item' 
+                    onClick={handleLogout}
+                  >
+                    {t('Log out')}
+                  </div>
+                </div>
+              </>
+            ),
+            key: 'userMenu'
           }
-        ],
-        // Add the header as a separate component
-        onClick: (info) => {
-          // This will be called when any menu item is clicked
-          console.log('Menu item clicked:', info.key);
-        }
+        ]
       }}
-      dropdownRender={(menu) => (
-        <div>
-          <div className="drop-header">
-            <h4>{user?.company?.name || ''}</h4>
-            <p>{user?.firstName || ''} {user?.lastName || ''}</p>
-          </div>
-          <div className='list'>
-            {React.cloneElement(menu)}
-          </div>
-        </div>
-      )}
     >
       <div className="d-flex flex-column justify-content-center">
         <UserIcon companyLogo={companyLogo} />

package/src/@daf/layouts/AppLayout/index.jsx

@@ -92,6 +92,8 @@ function AppLayout({
   // Notifications (injected from app)
   notificationHandlers = {},
   NotificationsHistoryProvider,
+  changeNotificationState,
+  notificationMode,
   
   // Config
   sidenavConfig = {},
@@ -115,7 +117,6 @@ function AppLayout({
   // Children
   children,
 }) {
-  const { notificationMode, changeNotificationState } = useForms();
   const [userPreferences, setUserPreferences] = useState(null);
   const isAppNavigation = module === 'app';
   const [drawerOpened, setDrawerOpened] = useState(false);