datastake-daf 0.6.757 → 0.6.759

package/src/@daf/pages/Summary/Activities/Restoration/index.jsx

@@ -1,9 +1,11 @@
 import { useMemo, useCallback } from 'react';
 import { DashboardLayout, Header, ImageCarousel, KeyIndicators, MineSiteMap, Widget, PieChart, ActivityIndicators } from '../../../../../../src/index.js'
 import { getKeyIndicatorsRowConfig } from './config';
-import { getActivityImages, getGenderDistributionData, isGenderDistributionEmpty, calculateGenderPieData, getGenderTooltipChildren, getActivityIndicatorsConfig } from './helper';
+import { getActivityImages, getGenderDistributionData, isGenderDistributionEmpty, calculateGenderPieData, getGenderTooltipChildren, getActivityIndicatorsConfig, getMapDataFromActivity } from './helper';
 import { renderTooltipJsx } from '../../../../../../src/utils';
+import { convertDMS } from '../../../../../../src/helpers/Map';
 import { useResizeContext } from '../../../../../../src/context';
+import CustomIcon from '../../../../../../src/@daf/core/components/Icon/CustomIcon.jsx';
 
 const RestorationActivitySummary = ({ activityData, supportText, onDownload, downloadDisabled, actionButtons, breadcrumbs, goBackTo, loading, t = () => { } }) => {
     const { isCollapsed, isNestedSidebarCollapsed } = useResizeContext();
@@ -24,6 +26,9 @@ const RestorationActivitySummary = ({ activityData, supportText, onDownload, dow
         [activityData, t]
     );
 
+    // Map Data - transformed from activityData
+    const mapData = useMemo(() => getMapDataFromActivity(activityData, t), [activityData, t]);
+
     return (
         <DashboardLayout
             header={
@@ -46,7 +51,7 @@ const RestorationActivitySummary = ({ activityData, supportText, onDownload, dow
             <section>
                 <Widget
                     title={t("Activity Location")}
-                    className="no-px no-pt-body  no-p-body no-pb-body"
+                    className="no-px h-w-btn-header no-pt-body  no-p-body no-pb-body"
                     style={{ height: '100%', display: 'flex', flexDirection: 'column' }}
                 >
                     <div style={{ flex: 1, minHeight: 0 }}>
@@ -55,73 +60,65 @@ const RestorationActivitySummary = ({ activityData, supportText, onDownload, dow
                             t={t}
                             isSatellite={true}
                             app={"straatos"}
+                            type={'location-territory'}
                             showSider={false}
                             user={null}
-                            data={[
-                                {
-                                    _id: {},
-                                    id: "7f2aaed4-4b2e-406c-8e0a-6659c5c8367b",
-                                    color: "#6698E4",
-                                    parent: {
-                                        _id: {},
-                                        createdAt: "2024-06-13T14:51:55.296Z",
-                                        updatedAt: "2024-06-13T14:51:55.296Z",
-                                        id: "a5340bf1-2c7d-413f-a2a5-ccd7dc8f7a7c",
-                                        name: "New Mine",
-                                        authorId: "4e6066e9-00d8-423a-94ec-c7c9d3432fec",
-                                        collectId: "f8a2b6a9cc935ef3e5844427f49aade34e152eca",
-                                        country: "AL",
-                                        category: "mineSite",
-                                        datastakeId: "LOC-00000000141",
-                                        __v: 0,
-                                    },
-                                    administrativeLevel1: "6839cb26-5af4-44a3-b136-a0f0a0bcecc6",
-                                    administrativeLevel2: "f849835d-5640-4bee-ae98-9f1c810c1abe",
-                                    // "name": "New Mine",
-                                    country: "AL",
-                                    category: "mineSite",
-                                    authorId: "4e6066e9-00d8-423a-94ec-c7c9d3432fec",
-                                    gps: {
-                                        latitude: 7,
-                                        longitude: 1,
-                                    },
-                                    area: [
-                                        [6, 5],
-                                        [7, 1],
-                                        [9, 2],
-                                    ],
-                                    associatedSubjects: [
-                                        {
-                                            entity: "Event",
-                                            _id: {},
-                                            nature: "",
-                                        },
-                                    ],
-                                    published: false,
-                                    version: 1,
-                                    createdAt: "2024-06-13T14:51:55.296Z",
-                                    updatedAt: "2024-06-13T14:51:55.296Z",
-                                    name: "Name",
-                                    type: "Loc Type",
-                                    __v: 0,
-                                    datastakeId: "LOC-00000000141",
-                                },
-                            ]}
-                            // tooltipAsText: true,
+                            data={mapData}
+                            maxZoom={18}
                             primaryLink={true}
-                            renderTooltip={() => {
+                            style={{ height: '100%', width: '100%' }}
+                            renderTooltipForLocation={(data) => {
+                                const coordinates = data.gps?.latitude && data.gps?.longitude
+                                    ? convertDMS(data.gps.latitude, data.gps.longitude)
+                                    : null;
+
+                                if (!coordinates) {
+                                    return [];
+                                }
+
+                                const isActivityEnd = data.name === t("Activity End") || data.id?.includes('-departure');
+                                const iconColor = isActivityEnd ? "#FF7A45" : "#016C6E";
+
+                                return [
+                                    {
+                                        label: t("Coordinates"),
+                                      
+                                        value: (
+                                            <div style={{ display: 'flex', alignItems: 'center', gap: '6px', flexWrap: 'nowrap' }}>
+                                                {/* Latitude icon (vertical) */}
+                                                <div style={{ display: 'flex', alignItems: 'center' }}>
+                                                    <CustomIcon 
+                                                        name="SpacingHeight" 
+                                                        width={14} 
+                                                        height={14} 
+                                                        color={iconColor}
+                                                    />
+                                                    <span style={{ fontWeight: 600, marginLeft: '4px' }}>{coordinates[0]}</span>
+                                                </div>
+                                                {/* Longitude icon (horizontal) */}
+                                                <div style={{ display: 'flex', alignItems: 'center' }}>
+                                                    <CustomIcon 
+                                                        name="SpacingWidth" 
+                                                        width={14} 
+                                                        height={14} 
+                                                        color={iconColor}
+                                                    />
+                                                    <span style={{ fontWeight: 600, marginLeft: '4px' }}>{coordinates[1]}</span>
+                                                </div>
+                                            </div>
+                                        ),
+                                    },
+                                ];
+                            }}
+                            renderTooltipForTerritory={(data) => {
                                 return [
                                     {
-                                        label: "Name",
-                                        value: "Name",
+                                        label: t("Plot Name"),
+                                        value: data.plotName || data.name || "--",
                                     },
                                 ];
                             }}
-                            center={[13, -15]}
-                            mapConfig={{ maxZoom: 18 }}
-                            type={'territory'}
                             link={true}
-                            onClickLink={() => { }}
                         />
                     </div>
                 </Widget>

package/src/@daf/pages/Summary/Minesite/index.jsx

@@ -29,7 +29,6 @@ const MineSummary = ({
     getRedirectLink = () => {},
     goBack = () => {},
     onIdChange = () => {},
-    breadcrumbs = [],
 }) => {
     const { 
         selectedItem, 
@@ -71,7 +70,6 @@ const MineSummary = ({
                     className="with-border-header h-w-btn-header no-px-body"
                     goBackTo={!hasSelect && goBack}
                     loading={loading}
-                    breadcrumbs={breadcrumbs}
                     addedHeaderFirst
 					actionButtons={[
                         {

package/src/@daf/pages/Summary/Operator/index.jsx

@@ -29,8 +29,7 @@ const OperatorSummary = ({
     goTo = () => {},
     getRedirectLink = () => {},
     goBack = () => {},
-    onIdChange = () => {},
-    breadcrumbs = [],
+    onIdChange = () => {}
 }) => {
     const { 
         selectedItem, 
@@ -71,7 +70,6 @@ const OperatorSummary = ({
                     title={hasSelect ? t("Operator Review") : (singleItemData?.name || "") + " " + t("Summary")}
                     className="with-border-header h-w-btn-header no-px-body"
                     goBackTo={!hasSelect && goBack}
-                    breadcrumbs={breadcrumbs}
                     addedHeaderFirst
 					actionButtons={[
                         {

package/src/@daf/utils/tooltip.js

@@ -158,20 +158,23 @@ export const renderTooltipJsx = ({
                   <span className="daf-tooltip-name">{item.label}</span>
                 </Tooltip>
 
-                <Tooltip title={item.tooltipValue || item.value}>
+                <Tooltip title={item.tooltipValue || (typeof item.value === 'string' ? item.value : '')}>
                   <div
                     style={{
                       height: "20px",
                       display: "flex",
                       alignItems: "center",
+                      gap: "4px",
                     }}
                   >
                     {item.tag ? (
                       <Tag color={item.tag} className="mr-none">
                         {item.value}
                       </Tag>
-                    ) : (
+                    ) : typeof item.value === 'string' || typeof item.value === 'number' ? (
                       <span className="daf-tooltip-value">{item.value}</span>
+                    ) : (
+                      item.value
                     )}
                   </div>
                 </Tooltip>

package/src/utils.js

@@ -58,6 +58,4 @@ export {
 	buildActionWidgetsConfig, 
 	buildKeyIndicatorsConfig, 
 	buildBreadcrumbs
-} from './@daf/utils/adminConfigBuilders.js'
-
-export { renderBreadCrumbs, buildBreadCrumbs as buildBreadCrumbsHelper } from './helpers/breadCrumbs.js'
+} from './@daf/utils/adminConfigBuilders.js'

package/dist/constants/index.js

@@ -1,26 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-const defaultBreadCrumbsLabels = {
-  events: "Events",
-  accounts: "Accounts",
-  modules: "Modules",
-  settings: "Settings",
-  user: "Users",
-  analysis: "Analysis",
-  'data-store': "Data Store",
-  data: "Data",
-  partners: "Partners",
-  locations: "Locations",
-  'information-channels': 'Channels',
-  'find-information': 'Query',
-  stakeholders: "Stakeholders",
-  documents: "Documents",
-  mines: "Mines",
-  summary: "Summary",
-  edit: "Edit",
-  details: "Details"
-};
-
-exports.defaultBreadCrumbsLabels = defaultBreadCrumbsLabels;

package/src/constants/breadCrumbs.js

@@ -1,20 +0,0 @@
-export const defaultBreadCrumbsLabels = {
-    events: "Events",
-    accounts: "Accounts",
-    modules: "Modules",
-    settings: "Settings",
-    user: "Users",
-    analysis: "Analysis",
-    'data-store': "Data Store",
-    data: "Data",
-    partners: "Partners",
-    locations: "Locations",
-    'information-channels': 'Channels',
-	'find-information': 'Query',
-    stakeholders: "Stakeholders",
-    documents: "Documents",
-    mines: "Mines",
-    summary: "Summary",
-    edit: "Edit",
-    details: "Details",
-}

package/src/constants.js

@@ -1 +0,0 @@
-export { defaultBreadCrumbsLabels } from './constants/breadCrumbs.js';

package/src/helpers/breadCrumbs.js

@@ -1,347 +0,0 @@
-
-export const  buildBreadCrumbs = ({
-    config,
-    items,
-    t,
-    breadCrumbsLabels,
-    id,
-    getRedirectLink,
-    createOnClick,
-    goTo,
-    view,
-    skipInteractions = false,
-}) => {
-    const pathConfig = config.path || [];
-
-    pathConfig.forEach((pathItem) => {
-        if (typeof pathItem === 'string') {
-            items.push({
-                label: t(breadCrumbsLabels[pathItem]),
-                onClick: () => {},
-            });
-        } else if (typeof pathItem === 'object') {
-            const { key, link, useRedirect } = pathItem;
-
-            if (key === 'id' && id) {
-                const resolvedLink = typeof link === 'function' ? link(id) : link;
-                const finalLink = useRedirect ? getRedirectLink(resolvedLink) : resolvedLink;
-
-                items.push({
-                    label: id,
-                    onClick: skipInteractions ? () => {} : (finalLink ? createOnClick(() => goTo(finalLink)) : () => {}),
-                });
-            } else {
-                const resolvedLink = typeof link === 'function' ? link(view, id) : link;
-                const finalLink = resolvedLink && useRedirect ? getRedirectLink(resolvedLink) : resolvedLink;
-
-                items.push({
-                    label: t(breadCrumbsLabels[key]),
-                    onClick: skipInteractions ? () => {} : (finalLink ? createOnClick(() => goTo(finalLink)) : () => {}),
-                });
-            }
-        }
-    });
-
-    if (config.includeId && id && id !== 'user') {
-        items.push({ label: id, onClick: () => {} });
-    }
-
-    if (config.suffix) {
-        config.suffix.forEach((suffixItem) => {
-            items.push({
-                label: t(breadCrumbsLabels[suffixItem]),
-                onClick: () => {},
-            });
-        });
-    }
-}
-
-export const renderBreadCrumbs = ({ 
-    t = () => {},
-    goTo = () => {},
-    view,
-    isAnalysis = false,
-    isEdit = false,
-    isView = false,
-    isDataStore = false,
-    id,
-    addedItems = [],
-    changeNotificationState,
-    breadCrumbConfig = {},
-    breadCrumbsLabels = {},
-    getRedirectLink = () => {},
-    condition,
-    conditionFallback = 'show-non-interactive', // 'show-non-interactive' | 'hide' | 'show-simplified'
-}) => {
-    const items = [];
-
-    const createOnClick = (callback) => {
-        if (!callback) return () => {};
-        
-        return () => {
-            if (changeNotificationState) {
-                changeNotificationState({ onYes: callback });
-            } else {
-                callback();
-            }
-        };
-    };
-
-    const evaluateCondition = (cond, context) => {
-        if (cond === undefined) return true; // No condition = always pass
-        if (typeof cond === 'function') return cond(context); // Function condition
-        return Boolean(cond); // Boolean condition
-    };
-
-    const config = breadCrumbConfig[view];
-
-    console.log({config, breadCrumbConfig, breadCrumbsLabels, condition})
-
-    if (config) {
-        const conditionContext = {
-            isDataStore,
-            isAnalysis,
-            isEdit,
-            isView,
-            id,
-            view,
-            t,
-            goTo,
-            getRedirectLink,
-            changeNotificationState,
-            addedItems,
-        };
-
-        const externalConditionPassed = evaluateCondition(condition, conditionContext);
-        const configConditionPassed = evaluateCondition(config.condition, conditionContext);
-        
-        const shouldShowBreadcrumbs = externalConditionPassed && configConditionPassed;
-
-        if (!configConditionPassed) {
-            if (config.fallback) {
-                buildBreadCrumbs({
-                    config: config.fallback,
-                    items,
-                    t,
-                    breadCrumbsLabels,
-                    id,
-                    getRedirectLink,
-                    createOnClick,
-                    goTo,
-                    view,
-                });
-            }
-        } else if (!externalConditionPassed) {
-            if (config.fallback) {
-                // Use config fallback when prop condition fails
-                buildBreadCrumbs({
-                    config: config.fallback,
-                    items,
-                    t,
-                    breadCrumbsLabels,
-                    id,
-                    getRedirectLink,
-                    createOnClick,
-                    goTo,
-                    view,
-                });
-            }
-            else {                
-                switch (conditionFallback) {
-                    case 'hide':
-                        break;
-                    case 'show-simplified':{
-                        const simplifiedConfig = {
-                            ...config,
-                            path: config.path.slice(0, 2), 
-                            includeId: false,
-                            suffix: undefined,
-                        };
-    
-                        buildBreadCrumbs({
-                            config: simplifiedConfig,
-                            items,
-                            t,
-                            breadCrumbsLabels,
-                            id,
-                            getRedirectLink,
-                            createOnClick,
-                            goTo,
-                            view,
-                        });
-                        break;
-                    }
-                    case 'show-non-interactive':
-                    default:
-                        buildBreadCrumbs({
-                            config,
-                            items,
-                            t,
-                            breadCrumbsLabels,
-                            id,
-                            getRedirectLink,
-                            createOnClick,
-                            goTo,
-                            view,
-                            skipInteractions: true,
-                        });
-                        break;
-                }
-            }
-        } else {
-            buildBreadCrumbs({
-                config,
-                items,
-                t,
-                breadCrumbsLabels,
-                id,
-                getRedirectLink,
-                createOnClick,
-                goTo,
-                view,
-            });
-        }
-    }
-
-
-	if (isView) {
-		items.push({ label: t(breadCrumbsLabels.details) });
-	} else if (isEdit) {
-		items.push({ label: t(breadCrumbsLabels.edit) });
-	} else if (isAnalysis) {
-		items.push({ label: t(breadCrumbsLabels.summary) });
-	}
-
-	items.push(...addedItems);
-
-	return items.filter((v) => !!v.label);
-
-}
-
-// Breadcrumbs Config Helper
-
-// 1.Simple static path
-// 'country-overview': {
-//     path: ['analysis', 'country-overview'],
-// }
-// Result: Analysis > Country Overview
-// Neither is clickable
-
-// 2.Clickable Parents with Links
-// 'mines': {
-//     path: [
-//         'modules',  // Not clickable
-//         { key: 'mines', link: '/app/mines' }  // Clickable, navigates to /app/mines
-//     ],
-// }
-// Result: Modules > Mines (clickable)
-
-// 3.Include ID at the end
-// 'partners': {
-//     path: ['modules', { key: 'partners', link: '/app/partners', useRedirect: true }],
-//     includeId: true,  // ← ID will be added at the end
-// }
-// With id='ABC123':
-// Result: Modules > Partners (clickable) > ABC123 (not clickable)
-
-// 4.Dynamic Id in the middle
-// 'mine-evaluation': {
-//     path: [
-//         'modules',
-//         { key: 'mines', link: '/app/mines' },
-//         { key: 'id', link: (id) => `/app/mines/${id}` },  // ← ID here
-//         'evaluation',
-//     ],
-// }
-// With id='MINE-456':
-// Result: Modules > Mines > MINE-456 (clickable to /app/mines/MINE-456) > Evaluation
-
-// 5. Dynamic Links using functions
-// 'producers': {
-//     path: [
-//         'modules',
-//         { 
-//             key: 'producers', 
-//             link: (view) => `/app/${view}`,  // ← Uses 'view' parameter
-//             useRedirect: true 
-//         }
-//     ],
-//     includeId: true,
-// }
-// With view='producers':
-// Result: Modules > Producers (navigates to /app/producers)
-
-// 6.use Redirect link
-// 'settings': {
-//     path: [
-//         { 
-//             key: 'settings', 
-//             link: '/app/view/settings', 
-//             useRedirect: true  // ← Wraps with getRedirectLink()
-//         }
-//     ],
-// }
-// Navigation will use getRedirectLink('/app/view/settings')
-
-// 7.Conditional Rendering
-// 'entities': {
-//     condition: (opts) => opts.isDataStore,  // ← Only shows if isDataStore=true
-//     path: [
-//         'data',
-//         { key: 'data-store', link: '/app/data-store', useRedirect: true },
-//         { key: 'entities', link: '/app/data-store/entities', useRedirect: true },
-//     ],
-// }
-// With isDataStore=false: No breadcrumbs shown
-// With isDataStore=true: Data > Store > Entities
-
-// 8.Conditional Fallback
-// 'locations': {
-//     condition: (opts) => opts.isDataStore,
-//     path: [
-//         'data',
-//         { key: 'data-store', link: '/app/data-store', useRedirect: true },
-//         { key: 'locations', link: '/app/data-store/locations', useRedirect: true },
-//     ],
-//     fallback: {  // ← Alternative when condition is false
-//         path: [
-//             'modules',
-//             'linkedSubjects',
-//             { key: 'locations', link: '/app/locations', useRedirect: true },
-//         ],
-//         includeId: true,
-//     },
-// }
-// isDataStore=true: Data > Store > Locations
-// isDataStore=false: Modules > Associated Information > Locations > {id}
-
-// 9. Suffix items
-// 'mine-monitoring': {
-//     path: [
-//         'modules',
-//         { key: 'mines', link: '/app/mines' }
-//     ],
-//     includeId: true,
-//     suffix: ['visits'],  // ← Added at the end
-// }
-// With id='MINE-789':
-// Result: Modules > Mines > MINE-789 > Visits
-
-// 10. Complex multi level path
-// 'monitoringReport': {
-//     path: [
-//         'modules',  // Static label
-//         { key: 'mines', link: '/app/mines' },  // Clickable parent
-//         { key: 'id', link: (id) => `/app/mines/${id}` },  // Dynamic ID with link
-//         'monitoringReport',  // Static label at end
-//     ],
-// }
-// With id='MINE-999':
-// Result: Modules > Mines (→/app/mines) > MINE-999 (→/app/mines/MINE-999) > Executive Monitoring Report
-
-// 11. Access multiple options in condition
-// 'custom-view': {
-//     condition: (opts) => opts.isDataStore && opts.isEdit && opts.id,
-//     path: ['data', 'custom'],
-// }
-// Available in opts: { isDataStore, isAnalysis, isEdit, isView, id, view }