datastake-daf 0.6.763 → 0.6.765

package/dist/services/index.js

@@ -1532,30 +1532,10 @@ var OperatorService$1 = createLazyService(OperatorService);
 
 class PartnerService extends BaseService {
   get(tab, filters) {
-    const {
-      page,
-      pageSize,
-      search,
-      searchParams,
-      ...rest
-    } = filters;
-    const params = {
-      filters: rest,
-      pagination: {
-        skip: page,
-        take: pageSize
-      }
-    };
-    if (search && searchParams.length > 0) {
-      params.search = {
-        qs: search,
-        fields: searchParams
-      };
-    }
     return this.apiGet({
       url: "/partner",
       isApp: true,
-      params
+      params: filters
     });
   }
   create(data) {

package/dist/style/datastake/mapbox-gl.css

@@ -0,0 +1,330 @@
+/* Isolated Mapbox GL CSS - Scoped to prevent Leaflet conflicts */
+
+/* Mapbox GL Core Styles - Scoped with .mapbox-gl-scope */
+.mapbox-gl-scope .mapboxgl-map {
+  font: 12px/20px Helvetica Neue, Arial, Helvetica, sans-serif;
+  overflow: hidden;
+  position: relative;
+  -webkit-tap-highlight-color: rgb(0 0 0/0);
+}
+
+.mapbox-gl-scope .mapboxgl-canvas {
+  left: 0;
+  position: absolute;
+  top: 0;
+}
+
+.mapbox-gl-scope .mapboxgl-map:-webkit-full-screen {
+  height: 100%;
+  width: 100%;
+}
+
+.mapbox-gl-scope .mapboxgl-canary {
+  background-color: salmon;
+}
+
+.mapbox-gl-scope .mapboxgl-canvas-container.mapboxgl-interactive,
+.mapbox-gl-scope .mapboxgl-ctrl-group button.mapboxgl-ctrl-compass {
+  cursor: grab;
+  -webkit-user-select: none;
+  user-select: none;
+}
+
+.mapbox-gl-scope .mapboxgl-canvas-container.mapboxgl-interactive.mapboxgl-track-pointer {
+  cursor: pointer;
+}
+
+.mapbox-gl-scope .mapboxgl-canvas-container.mapboxgl-interactive:active,
+.mapbox-gl-scope .mapboxgl-ctrl-group button.mapboxgl-ctrl-compass:active {
+  cursor: grabbing;
+}
+
+.mapbox-gl-scope .mapboxgl-canvas-container.mapboxgl-touch-zoom-rotate,
+.mapbox-gl-scope .mapboxgl-canvas-container.mapboxgl-touch-zoom-rotate .mapboxgl-canvas {
+  touch-action: pan-x pan-y;
+}
+
+.mapbox-gl-scope .mapboxgl-canvas-container.mapboxgl-touch-drag-pan,
+.mapbox-gl-scope .mapboxgl-canvas-container.mapboxgl-touch-drag-pan .mapboxgl-canvas {
+  touch-action: pinch-zoom;
+}
+
+.mapbox-gl-scope .mapboxgl-canvas-container.mapboxgl-touch-zoom-rotate.mapboxgl-touch-drag-pan,
+.mapbox-gl-scope .mapboxgl-canvas-container.mapboxgl-touch-zoom-rotate.mapboxgl-touch-drag-pan .mapboxgl-canvas {
+  touch-action: none;
+}
+
+/* Control positioning */
+.mapbox-gl-scope .mapboxgl-ctrl-bottom,
+.mapbox-gl-scope .mapboxgl-ctrl-bottom-left,
+.mapbox-gl-scope .mapboxgl-ctrl-bottom-right,
+.mapbox-gl-scope .mapboxgl-ctrl-left,
+.mapbox-gl-scope .mapboxgl-ctrl-right,
+.mapbox-gl-scope .mapboxgl-ctrl-top,
+.mapbox-gl-scope .mapboxgl-ctrl-top-left,
+.mapbox-gl-scope .mapboxgl-ctrl-top-right {
+  pointer-events: none;
+  position: absolute;
+  z-index: 2;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-top-left {
+  left: 0;
+  top: 0;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-top {
+  left: 50%;
+  top: 0;
+  transform: translateX(-50%);
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-top-right {
+  right: 0;
+  top: 0;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-right {
+  right: 0;
+  top: 50%;
+  transform: translateY(-50%);
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-bottom-right {
+  bottom: 0;
+  right: 0;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-bottom {
+  bottom: 0;
+  left: 50%;
+  transform: translateX(-50%);
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-bottom-left {
+  bottom: 0;
+  left: 0;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-left {
+  left: 0;
+  top: 50%;
+  transform: translateY(-50%);
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl {
+  clear: both;
+  pointer-events: auto;
+  transform: translate(0);
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-top-left .mapboxgl-ctrl {
+  float: left;
+  margin: 10px 0 0 10px;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-top .mapboxgl-ctrl {
+  float: left;
+  margin: 10px 0;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-top-right .mapboxgl-ctrl {
+  float: right;
+  margin: 10px 10px 0 0;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-bottom-right .mapboxgl-ctrl,
+.mapbox-gl-scope .mapboxgl-ctrl-right .mapboxgl-ctrl {
+  float: right;
+  margin: 0 10px 10px 0;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-bottom .mapboxgl-ctrl {
+  float: left;
+  margin: 10px 0;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-bottom-left .mapboxgl-ctrl,
+.mapbox-gl-scope .mapboxgl-ctrl-left .mapboxgl-ctrl {
+  float: left;
+  margin: 0 0 10px 10px;
+}
+
+/* Control group styling */
+.mapbox-gl-scope .mapboxgl-ctrl-group {
+  background: #fff;
+  border-radius: 4px;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-group:not(:empty) {
+  box-shadow: 0 0 0 2px #0000001a;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-group button {
+  background-color: initial;
+  border: 0;
+  box-sizing: border-box;
+  cursor: pointer;
+  display: block;
+  height: 29px;
+  outline: none;
+  overflow: hidden;
+  padding: 0;
+  width: 29px;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-group button+button {
+  border-top: 1px solid #ddd;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl button .mapboxgl-ctrl-icon {
+  background-position: 50%;
+  background-repeat: no-repeat;
+  display: block;
+  height: 100%;
+  width: 100%;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-attrib-button:focus,
+.mapbox-gl-scope .mapboxgl-ctrl-group button:focus {
+  box-shadow: 0 0 2px 2px #0096ff;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl button:disabled {
+  cursor: not-allowed;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl button:disabled .mapboxgl-ctrl-icon {
+  opacity: .25;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-group button:first-child {
+  border-radius: 4px 4px 0 0;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-group button:last-child {
+  border-radius: 0 0 4px 4px;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-group button:only-child {
+  border-radius: inherit;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl button:not(:disabled):hover {
+  background-color: #0000000d;
+}
+
+/* Marker styles */
+.mapbox-gl-scope .mapboxgl-marker {
+  position: absolute;
+  z-index: 1;
+}
+
+.mapbox-gl-scope .mapboxgl-marker svg {
+  display: block;
+}
+
+/* Popup styles */
+.mapbox-gl-scope .mapboxgl-popup {
+  position: absolute;
+  text-align: center;
+  margin-bottom: 20px;
+}
+
+.mapbox-gl-scope .mapboxgl-popup-content-wrapper {
+  padding: 1px;
+  text-align: left;
+  border-radius: 12px;
+}
+
+.mapbox-gl-scope .mapboxgl-popup-content {
+  margin: 13px 24px 13px 20px;
+  line-height: 1.3;
+  font-size: 13px;
+  min-height: 1px;
+}
+
+.mapbox-gl-scope .mapboxgl-popup-content p {
+  margin: 17px 0;
+}
+
+.mapbox-gl-scope .mapboxgl-popup-tip-container {
+  width: 40px;
+  height: 20px;
+  position: absolute;
+  left: 50%;
+  margin-top: -1px;
+  margin-left: -20px;
+  overflow: hidden;
+  pointer-events: none;
+}
+
+.mapbox-gl-scope .mapboxgl-popup-tip {
+  width: 17px;
+  height: 17px;
+  padding: 1px;
+  margin: -10px auto 0;
+  pointer-events: auto;
+  -webkit-transform: rotate(45deg);
+  -moz-transform: rotate(45deg);
+  -ms-transform: rotate(45deg);
+  transform: rotate(45deg);
+}
+
+.mapbox-gl-scope .mapboxgl-popup-content-wrapper,
+.mapbox-gl-scope .mapboxgl-popup-tip {
+  background: white;
+  color: #333;
+  box-shadow: 0 3px 14px rgba(0, 0, 0, 0.4);
+}
+
+.mapbox-gl-scope .mapboxgl-popup-close-button {
+  position: absolute;
+  top: 0;
+  right: 0;
+  border: none;
+  text-align: center;
+  width: 24px;
+  height: 24px;
+  font: 16px/24px Tahoma, Verdana, sans-serif;
+  color: #757575;
+  text-decoration: none;
+  background: transparent;
+}
+
+.mapbox-gl-scope .mapboxgl-popup-close-button:hover,
+.mapbox-gl-scope .mapboxgl-popup-close-button:focus {
+  color: #585858;
+}
+
+/* Attribution */
+.mapbox-gl-scope .mapboxgl-ctrl-attribution {
+  background: #fff;
+  background: rgba(255, 255, 255, 0.8);
+  margin: 0;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-attribution,
+.mapbox-gl-scope .mapboxgl-ctrl-scale-line {
+  padding: 0 5px;
+  color: #333;
+  line-height: 1.4;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-attribution a {
+  text-decoration: none;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-attribution a:hover,
+.mapbox-gl-scope .mapboxgl-ctrl-attribution a:focus {
+  text-decoration: underline;
+}
+
+/* Hide attribution by default */
+.mapbox-gl-scope .mapboxgl-ctrl-attribution {
+  display: none !important;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-logo {
+  display: none !important;
+}

package/package.json

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

package/src/@daf/core/components/Screens/TableScreen/TablePageWithTabs/index.jsx

@@ -25,10 +25,13 @@ const TablePageWithTabs = ({
     isMobile,
     view,
     getActiveTab = () => {},
-    onDownload = () => {},
+    onDownload,
     downloadDisabled = false,
     drawerTitle = "",
     onCreateModalClose = () => {},
+    tabs = [],
+    headerTooltip,
+    drawerTooltip,
     children
 }) => {
     const params = new URLSearchParams(location?.search);
@@ -57,11 +60,12 @@ const TablePageWithTabs = ({
 						icon: "Add",
 					},
 				]}
-                onDownload={onDownload}
+                onDownload={(onDownload && typeof onDownload === 'function') ? onDownload : undefined}
                 downloadDisabled={downloadDisabled}
+                tooltip={headerTooltip}
             />
             <Tabs
-                items={[
+                items={tabs.length > 0 ? tabs : [
                     { label: t("All Data"), key: "all" },
                     { label: t("Own Data"), key: "own" },
                     { label: t("Partners"), key: "shared" },
@@ -109,13 +113,14 @@ const TablePageWithTabs = ({
                             title={t(drawerTitle)}
                         />
                     }
+                    tooltip={drawerTooltip}
                     open={openCreateModal}
                     onClose={() => setOpenCreateModal(false)}
                     width={CREATE_DRAWER_WIDTH}
                     bodyStyle={{ padding: 0 }}
                 >
                 {typeof children === 'function' 
-                    ? children({ onDrawerClose: () => setOpenCreateModal(false) })
+                    ? children({ onDrawerClose: () => setOpenCreateModal(false), open: openCreateModal })
                     : children
                 }
                 </Drawer>

package/src/@daf/core/components/Table/index.jsx

@@ -86,10 +86,10 @@ export default function DAFTable({
   }, [sourcesKey, sources, filtersConfig, t]);
 
   useEffect(() => {
-    if (data) {
+    if (data && Array.isArray(data)) {
       setSource(data);
     }
-  }, [data]);
+  }, [data, data.length]);
 
   const paginationPageSize = pagination?.pageSize;
   const dataSource = useMemo(() => {

package/src/@daf/core/components/UI/KeyIndicatorNavigateLabel/index.jsx

@@ -0,0 +1,29 @@
+import React from 'react'
+import CustomIcon from '../../Icon/CustomIcon.jsx'
+
+function KeyIndicatorNavigateLabel({
+    t,
+    getRedirectLink,
+    theme,
+    label,
+	link
+}) {
+  return (
+    <div className="flex">
+		<div className="flex-1">{t(label)}</div>
+			<div
+				className="cursor-pointer"
+				onClick={() => window.open(getRedirectLink(link), '_blank')}
+			>
+				<CustomIcon
+					name="LinkNewTab"
+					width={16}
+					height={16}
+					color={theme.colorPrimary}
+				/>
+		</div>
+	</div>
+  )
+}
+
+export default KeyIndicatorNavigateLabel

package/src/@daf/hooks/useFilters.js

@@ -232,7 +232,7 @@ export const useFilters = ({
   }, [pagination]);
 
   const canGoPrev = useMemo(() => pagination.current !== 1, [pagination]);
-  const canGoNext = useMemo(() => pagination.current !== totalPages && totalPages, [pagination, totalPages]);
+  const canGoNext = useMemo(() => pagination.current !== totalPages && totalPages > 0, [pagination, totalPages]);
 
   const goPrev = () => {
     if (!canGoPrev) {

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

@@ -28,10 +28,12 @@ export default function MobileDrawer({
   isDev = false,
   selectedProject,
   theme = {},
+  dropdownItems = [],
 }) {
   const items = useMemo(() => sidenavConfig[mod] || [], [sidenavConfig, mod]);
+  const appsWithPartners = ['tazama', 'nashiriki', 'wazi', 'hatua'];
   
-  const canViewPartners = useMemo(() => mod === 'tazama', [mod]);
+  const canViewPartners = useMemo(() => appsWithPartners.includes(mod), [mod]);
   const canViewProjects = checkPermission({ 
     permission: 'projects.canView', 
     permissions: user?.role?.permissions 
@@ -93,7 +95,7 @@ export default function MobileDrawer({
         { 
           type: 'link', 
           name: t('Partners'), 
-          path: `/app/${mod}/partners`, 
+          path: `/app/partners`, 
           isDashboard: true, 
           visible: canViewPartners 
         },

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

@@ -6,6 +6,7 @@ import { formatClassname } from '../../../../../helpers/ClassesHelper.js';
 import { useResizeContext } from '../../../../core/context/Resize/index.js';
 import { MOBILE_W } from '../../../../../constants/Style.js';
 import MobileDrawer from '../MobileDrawer/index.js';
+import { userIsAdmin } from '../../../../../helpers/user.js';
 
 export const UserDropdownMenu = ({
   user,
@@ -24,11 +25,11 @@ export const UserDropdownMenu = ({
   isDev = false,
   theme = {},
   moduleInterfaceConfig = null,
+  dropdownItems = [],
 }) => {
   const resizeContext = useResizeContext();
   const { windowWidth } = resizeContext || {};
-  const { userIsAdmin } = userHelpers;
-  const isAdmin = useMemo(() => userIsAdmin?.(user), [user, userIsAdmin]);
+  const isAdmin = useMemo(() => userIsAdmin(user), [user]);
   
   // Add fallback for windowWidth
   const actualWidth = windowWidth || (typeof window !== 'undefined' ? window.innerWidth : 1920);
@@ -87,6 +88,7 @@ export const UserDropdownMenu = ({
         appName={appName}
         theme={theme}
         moduleInterfaceConfig={moduleInterfaceConfig}
+        dropdownItems={dropdownItems}
       />
     </div>
   ) : (
@@ -104,6 +106,25 @@ export const UserDropdownMenu = ({
                   <p>{user?.firstName || ''} {user?.lastName || ''}</p>
                 </div>
                 <div className='list'>
+                  {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) => (
+                      <div
+                        key={item.key}
+                        className='list-item'
+                        onClick={() => handlegoTo(getRedirectLink(item.path))}
+                      >
+                        {item.name}
+                      </div>
+                    ))}
                   {user.company && !isDemoEnv && canViewUsers && !isAdmin ? (
                     <div 
                       className='list-item' 

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

@@ -66,6 +66,7 @@ function AppLayout({
   updateLanguage,
   getUserOptions,
   selectedProject,
+  dropdownItems = [],
   
   // Navigation (injected from app)
   goTo = () => {},
@@ -414,6 +415,7 @@ function AppLayout({
                 isDev={isDev}
                 theme={theme}
                 moduleInterfaceConfig={moduleInterfaceConfig}
+                dropdownItems={dropdownItems}
               />
             </div>
           </div>

package/src/@daf/pages/Dashboards/SupplyChain/components/ChartsContainer/components/GenderDistribution/config.js

@@ -1,9 +1,10 @@
-
-export const config = [
-	{ key: "male", label: "Male", color: "#4683DE" },
-	{ key: "female", label: "Female", color: "#A6C3EF" },
-	{ key: "other", label: "Other", color: "#B6CEF2" },
-];
+export const getConfig = (theme) => {
+    return [
+        { key: "male", label: "Male", color: theme.colorPrimary7 },
+        { key: "female", label: "Female", color: theme.colorPrimary4 },
+        { key: "other", label: "Other", color: theme.colorPrimary3 },
+    ]
+}
 
 export const getRoleColors = (theme) => {
     return [

package/src/@daf/pages/Dashboards/SupplyChain/components/ChartsContainer/components/GenderDistribution/index.js

@@ -1,5 +1,5 @@
 import React, { useMemo, useCallback } from 'react'
-import { getRoleColors, config } from './config';
+import { getRoleColors, getConfig } from './config';
 import PropTypes from 'prop-types';
 import { renderTooltipJsx } from '../../../../../../../utils/tooltip.js';
 import Widget from '../../../../../../../core/components/Dashboard/Widget/index.jsx';
@@ -15,6 +15,7 @@ function GenderDistribution({
     options = {},
 }) {
     const roleColors = getRoleColors(theme);
+	const config = getConfig(theme);
 
     const pieData = useMemo(() => {
 		const total = Object.values(data).reduce((all, val) => all + (val || 0), 0);