datastake-daf 0.6.503 → 0.6.504

package/dist/layouts/index.js

@@ -5200,7 +5200,10 @@ const Sidenav = ({
   changeNotificationState,
   userHelpers = {},
   isDev = false,
-  appName = 'app'
+  appName = 'app',
+  getRedirectLink,
+  isDatastake,
+  selectedProject
 }) => {
   const hoverDiv = o.useRef();
   const hoverDivSecond = o.useRef();
@@ -5216,20 +5219,19 @@ const Sidenav = ({
     pathname
   } = location || {};
   const mod = o.useMemo(() => module, [module, user]);
-  const getRedirectLink = link => {
-    // Simple redirect link logic - can be customized
+  const _getRedirectLink = getRedirectLink || (link => {
     if (window.location.pathname.includes(`/${appName}`)) {
       return `/${appName}${link}`;
     }
     return link;
-  };
+  });
   const checkPath = i => {
     if (!matchPath || !pathname) return false;
     return matchPath({
-      path: getRedirectLink(i.path),
+      path: _getRedirectLink(i.path),
       exact: true
     }, pathname) || i.subPath && i.subPath.filter(s => matchPath({
-      path: getRedirectLink(s),
+      path: _getRedirectLink(s),
       exact: true
     }, pathname)).length ? true : false;
   };
@@ -6094,7 +6096,8 @@ const UserDropdownMenu = ({
   module,
   checkPermission = () => false,
   appName = 'app',
-  userHelpers = {}
+  userHelpers = {},
+  isDev = false
 }) => {
   const {
     windowWidth
@@ -6832,11 +6835,17 @@ function AppLayout({
   exitImpersonation,
   updateLanguage,
   getUserOptions,
+  selectedProject,
   // Navigation (injected from app)
   navigate,
   location,
   matchPath,
   Outlet,
+  getRedirectLink,
+  isDatastake,
+  // Others
+  userHelpers = {},
+  isDev = false,
   // i18n (injected from app)
   t = key => key,
   // Permissions (injected from app)
@@ -6997,7 +7006,12 @@ function AppLayout({
         t: t,
         changeNotificationState: changeNotificationState,
         checkPermission: checkPermission,
-        appName: appName
+        appName: appName,
+        getRedirectLink: getRedirectLink,
+        isDatastake: isDatastake,
+        selectedProject: selectedProject,
+        userHelpers: userHelpers,
+        isDev: isDev
       })]
     }) : null, /*#__PURE__*/jsxRuntime.jsxs("div", {
       style: {
@@ -7040,13 +7054,30 @@ function AppLayout({
             user: user,
             notificationHandlers: notificationHandlers,
             NotificationsHistoryProvider: NotificationsHistoryProvider,
+            firebaseEnabled: true,
+            useFirebaseHook: notificationHandlers.useFirebaseHook,
             children: /*#__PURE__*/jsxRuntime.jsx(NotificationsHistoryProvider, {
-              children: /*#__PURE__*/jsxRuntime.jsx(Notifications, {
-                userPreferences: userPreferences,
-                module: module,
-                t: t,
-                navigate: navigate,
-                appName: appName
+              children: /*#__PURE__*/jsxRuntime.jsx(antd.Dropdown, {
+                menu: {
+                  items: [{
+                    key: 'notifications',
+                    label: /*#__PURE__*/jsxRuntime.jsx(Notifications, {
+                      userPreferences: userPreferences,
+                      module: module,
+                      t: t,
+                      navigate: navigate,
+                      appName: appName
+                    }),
+                    disabled: true
+                  }]
+                },
+                rootClassName: formatClassname(['dark-menu min-w-300', appName]),
+                trigger: ['click'],
+                placement: "bottom",
+                children: /*#__PURE__*/jsxRuntime.jsx("div", {
+                  className: "notification-icon",
+                  children: /*#__PURE__*/jsxRuntime.jsx(icons.BellOutlined, {})
+                })
               })
             })
           }) : /*#__PURE__*/jsxRuntime.jsx("div", {
@@ -7099,7 +7130,9 @@ function AppLayout({
               t: t,
               logOut: logOut,
               checkPermission: checkPermission,
-              appName: appName
+              appName: appName,
+              userHelpers: userHelpers,
+              isDev: isDev
             })
           })]
         })]
@@ -7121,7 +7154,10 @@ function AppLayout({
         logOut: logOut,
         changeNotificationState: changeNotificationState,
         matchPath: matchPath,
-        appName: appName
+        appName: appName,
+        userHelpers: userHelpers,
+        isDev: isDev,
+        selectedProject: selectedProject
       }) : null, logOutPopupVisible ? /*#__PURE__*/jsxRuntime.jsx(LoginPopup, {
         user: user,
         t: t,

package/package.json

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

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

@@ -94,6 +94,9 @@ const Sidenav = ({
   userHelpers = {},
   isDev = false,
   appName = 'app',
+  getRedirectLink,
+  isDatastake,
+  selectedProject,
 }) => {
   const hoverDiv = useRef();
   const hoverDivSecond = useRef();
@@ -109,22 +112,21 @@ const Sidenav = ({
 
   const mod = useMemo(() => module, [module, user]);
 
-  const getRedirectLink = (link) => {
-    // Simple redirect link logic - can be customized
+  const _getRedirectLink = getRedirectLink || ((link) => {
     if (window.location.pathname.includes(`/${appName}`)) {
       return `/${appName}${link}`;
     }
     return link;
-  };
-
+  });
+  
   const checkPath = (i) => {
     if (!matchPath || !pathname) return false;
     
     return (matchPath({
-      path: getRedirectLink(i.path),
+      path: _getRedirectLink(i.path),
       exact: true,
     }, pathname) || (i.subPath && i.subPath.filter(s => matchPath({
-      path: getRedirectLink(s),
+      path: _getRedirectLink(s), 
       exact: true,
     }, pathname)).length)) ? true : false;
   };

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

@@ -20,6 +20,7 @@ export const UserDropdownMenu = ({
   checkPermission = () => false,
   appName = 'app',
   userHelpers = {},
+  isDev = false,
 }) => {
   const { windowWidth } = useResizeContext();
   const { userIsAdmin } = userHelpers;

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

@@ -3,11 +3,12 @@ import React, { useState, useEffect, useMemo } from "react";
 import { useResizeContext } from "../../core/context/Resize/index.js";
 import { useForms } from "../../core/context/Forms/index.js";
 import { formatClassname } from '../../../helpers/ClassesHelper.js';
-import { Layout, Select } from 'antd';
+import { Layout, Select, Dropdown } from 'antd';
 import {
   MenuFoldOutlined,
   MenuUnfoldOutlined,
   MenuOutlined,
+  BellOutlined
 } from '@ant-design/icons';
 import Sidenav from "./components/Sidenav/index.js";
 import { UserDropdownMenu } from "./components/UserDropdown/index.js";
@@ -60,12 +61,19 @@ function AppLayout({
   exitImpersonation,
   updateLanguage,
   getUserOptions,
+  selectedProject,
   
   // Navigation (injected from app)
   navigate,
   location,
   matchPath,
   Outlet,
+  getRedirectLink,
+  isDatastake,
+
+  // Others
+  userHelpers = {},
+  isDev = false,
   
   // i18n (injected from app)
   t = (key) => key,
@@ -238,6 +246,11 @@ function AppLayout({
             changeNotificationState={changeNotificationState}
             checkPermission={checkPermission}
             appName={appName}
+            getRedirectLink={getRedirectLink}  
+            isDatastake={isDatastake}          
+            selectedProject={selectedProject}  
+            userHelpers={userHelpers}          
+            isDev={isDev}  
           />
         </div>
       ) : null}
@@ -276,23 +289,43 @@ function AppLayout({
           </div>
           
           <div className="d-flex right-sidebar">
-            {canViewNotifications ? (
-              <NotificationsProvider
-                user={user}
-                notificationHandlers={notificationHandlers}
-                NotificationsHistoryProvider={NotificationsHistoryProvider}
-              >
-                <NotificationsHistoryProvider>
-                  <Notifications
-                    userPreferences={userPreferences}
-                    module={module}
-                    t={t}
-                    navigate={navigate}
-                    appName={appName}
-                  />
-                </NotificationsHistoryProvider>
-              </NotificationsProvider>
-            ) : <div className="notification-icon" />}
+          {canViewNotifications ? (
+            <NotificationsProvider
+              user={user}
+              notificationHandlers={notificationHandlers}
+              NotificationsHistoryProvider={NotificationsHistoryProvider}
+              firebaseEnabled={true}
+              useFirebaseHook={notificationHandlers.useFirebaseHook}
+            >
+              <NotificationsHistoryProvider>
+                <Dropdown
+                  menu={{
+                    items: [{
+                      key: 'notifications',
+                      label: (
+                        <Notifications
+                          userPreferences={userPreferences}
+                          module={module}
+                          t={t}
+                          navigate={navigate}
+                          appName={appName}
+                        />
+                      ),
+                      disabled: true,
+                    }]
+                  }}
+                  rootClassName={formatClassname(['dark-menu min-w-300', appName])}
+                  trigger={['click']}
+                  placement="bottom"
+                >
+                  <div className="notification-icon">
+                    <BellOutlined />
+                    {/* Add notification count badge if needed */}
+                  </div>
+                </Dropdown>
+              </NotificationsHistoryProvider>
+            </NotificationsProvider>
+          ) : <div className="notification-icon" />}
             
             <div className="flex flex-column">
               <Select
@@ -337,6 +370,8 @@ function AppLayout({
                 logOut={logOut}
                 checkPermission={checkPermission}
                 appName={appName}
+                userHelpers={userHelpers}
+                isDev={isDev}
               />
             </div>
           </div>
@@ -363,6 +398,9 @@ function AppLayout({
             changeNotificationState={changeNotificationState}
             matchPath={matchPath}
             appName={appName}
+            userHelpers={userHelpers}     
+            isDev={isDev}                 
+            selectedProject={selectedProject} 
           />
         ) : null}