datastake-daf 0.6.762 → 0.6.764

package/dist/hooks/index.js

@@ -418,11 +418,7 @@ const useFilters = ({
     return Math.ceil(pagination.total / pagination.pageSize);
   }, [pagination]);
   const canGoPrev = React.useMemo(() => pagination.current !== 1, [pagination]);
-  const canGoNext = React.useMemo(() => pagination.current !== totalPages && totalPages, [pagination, totalPages]);
-  console.log({
-    totalPages,
-    pagination
-  });
+  const canGoNext = React.useMemo(() => pagination.current !== totalPages && totalPages > 0, [pagination, totalPages]);
   const goPrev = () => {
     if (!canGoPrev) {
       return;

package/dist/layouts/index.js

@@ -4583,6 +4583,10 @@ CustomIcon.propTypes = {
   size: PropTypes__default["default"].number
 };
 
+const userIsAdmin = user => {
+  return user?.role?.id === 'APP_ADMIN';
+};
+
 /* eslint-disable no-unused-vars */
 const featureIsNotAvailable = (t, isDemo) => {
   antd.Modal.error({
@@ -5800,10 +5804,12 @@ function MobileDrawer({
   userHelpers = {},
   isDev = false,
   selectedProject,
-  theme = {}
+  theme = {},
+  dropdownItems = []
 }) {
   const items = React.useMemo(() => sidenavConfig[mod] || [], [sidenavConfig, mod]);
-  const canViewPartners = React.useMemo(() => mod === 'tazama', [mod]);
+  const appsWithPartners = ['tazama', 'nashiriki', 'wazi', 'hatua'];
+  const canViewPartners = React.useMemo(() => appsWithPartners.includes(mod), [mod]);
   const canViewProjects = checkPermission({
     permission: 'projects.canView',
     permissions: user?.role?.permissions
@@ -5856,7 +5862,7 @@ function MobileDrawer({
       }, {
         type: 'link',
         name: t('Partners'),
-        path: `/app/${mod}/partners`,
+        path: `/app/partners`,
         isDashboard: true,
         visible: canViewPartners
       }, {
@@ -5962,16 +5968,14 @@ const UserDropdownMenu = ({
   userHelpers = {},
   isDev = false,
   theme = {},
-  moduleInterfaceConfig = null
+  moduleInterfaceConfig = null,
+  dropdownItems = []
 }) => {
   const resizeContext = useResizeContext();
   const {
     windowWidth
   } = resizeContext || {};
-  const {
-    userIsAdmin
-  } = userHelpers;
-  const isAdmin = React.useMemo(() => userIsAdmin?.(user), [user, userIsAdmin]);
+  const isAdmin = React.useMemo(() => userIsAdmin(user), [user]);
 
   // Add fallback for windowWidth
   const actualWidth = windowWidth || (typeof window !== 'undefined' ? window.innerWidth : 1920);
@@ -6029,7 +6033,8 @@ const UserDropdownMenu = ({
       changeNotificationState: changeNotificationState,
       appName: appName,
       theme: theme,
-      moduleInterfaceConfig: moduleInterfaceConfig
+      moduleInterfaceConfig: moduleInterfaceConfig,
+      dropdownItems: dropdownItems
     })]
   }) : /*#__PURE__*/jsxRuntime.jsx(antd.Dropdown, {
     trigger: "click",
@@ -6047,7 +6052,25 @@ const UserDropdownMenu = ({
             })]
           }), /*#__PURE__*/jsxRuntime.jsxs("div", {
             className: "list",
-            children: [user.company && !isDemoEnv && canViewUsers && !isAdmin ? /*#__PURE__*/jsxRuntime.jsx("div", {
+            children: [dropdownItems && dropdownItems.filter(item => {
+              if (typeof item.condition === 'function') {
+                return item.condition({
+                  user,
+                  isAdmin,
+                  module,
+                  checkPermission,
+                  appName
+                });
+              }
+              if ('condition' in item) {
+                return !!item.condition;
+              }
+              return true;
+            }).map(item => /*#__PURE__*/jsxRuntime.jsx("div", {
+              className: "list-item",
+              onClick: () => handlegoTo(getRedirectLink(item.path)),
+              children: item.name
+            }, item.key)), user.company && !isDemoEnv && canViewUsers && !isAdmin ? /*#__PURE__*/jsxRuntime.jsx("div", {
               className: "list-item",
               onClick: () => handlegoTo(getRedirectLink(`/app/users`)),
               children: t('Users')
@@ -7905,6 +7928,7 @@ function AppLayout({
   updateLanguage,
   getUserOptions,
   selectedProject,
+  dropdownItems = [],
   // Navigation (injected from app)
   goTo = () => {},
   location,
@@ -8233,7 +8257,8 @@ function AppLayout({
               userHelpers: userHelpers,
               isDev: isDev,
               theme: theme,
-              moduleInterfaceConfig: moduleInterfaceConfig
+              moduleInterfaceConfig: moduleInterfaceConfig,
+              dropdownItems: dropdownItems
             })
           })]
         })]