datastake-daf 0.6.752 → 0.6.753

package/dist/pages/index.js

@@ -40813,13 +40813,6 @@ const getKeyIndicatorsRowConfig = ({
   })
 }];
 
-// ============================================================================
-// REGION: Photo/Image Extraction
-// ============================================================================
-
-/**
- * Normalize URL by removing trailing colon if present
- */
 const normalizeUrl = url => url?.endsWith(':') ? url.slice(0, -1) : url;
 
 /**
@@ -40932,6 +40925,88 @@ const getGenderTooltipChildren = (item, isEmpty, genderDistributionData, t, rend
   });
 };
 
+// ============================================================================
+// REGION: Multiselect Options
+// ============================================================================
+
+/**
+ * Get filtered options for multiselect based on activityData.origin
+ * Filters options based on whether origin contains 'kobo', 'straatos', or both
+ * 
+ * @param {Object} activityData - Activity data object containing origin array
+ * @param {React.Component} CustomIcon - CustomIcon component for rendering Monitor option avatar
+ * @returns {Array} - Filtered array of option objects
+ */
+const getFilteredOptions = (activityData, CustomIcon) => {
+  const allOptions = [{
+    label: "Own Data",
+    value: "own",
+    avatar: /*#__PURE__*/jsxRuntime.jsx("span", {
+      children: "OWN"
+    }),
+    background: "#016C6E",
+    color: "white"
+  }, {
+    label: "Monitor",
+    value: "other",
+    avatar: /*#__PURE__*/jsxRuntime.jsx(CustomIcon, {
+      name: "Search02",
+      size: 14
+    })
+  }];
+  if (!activityData?.origin || !Array.isArray(activityData.origin)) {
+    return allOptions;
+  }
+
+  // Extract origin names from the array
+  const originNames = activityData.origin.map(item => item?.name?.toLowerCase()).filter(Boolean);
+  const hasKobo = originNames.includes('kobo');
+  const hasStraatos = originNames.includes('straatos');
+
+  // If contains kobo only, show only Monitor
+  if (hasKobo && !hasStraatos) {
+    return allOptions.filter(option => option.value === 'other');
+  }
+
+  // If contains straatos only, show only Own Data
+  if (hasStraatos && !hasKobo) {
+    return allOptions.filter(option => option.value === 'own');
+  }
+
+  // If contains both or neither, show both
+  return allOptions;
+};
+
+/**
+ * Get default selected value for multiselect based on activityData.origin
+ * 
+ * @param {Object} activityData - Activity data object containing origin array
+ * @returns {Array} - Array of default selected values
+ */
+const getDefaultSelected = activityData => {
+  if (!activityData?.origin || !Array.isArray(activityData.origin)) {
+    return ['own'];
+  }
+
+  // Extract origin names from the array
+  const originNames = activityData.origin.map(item => item?.name?.toLowerCase()).filter(Boolean);
+  const hasKobo = originNames.includes('kobo');
+  const hasStraatos = originNames.includes('straatos');
+
+  // If contains kobo only, default to monitor (other)
+  if (hasKobo && !hasStraatos) {
+    return ['other'];
+  }
+
+  // If contains straatos only, default to own
+  if (hasStraatos && !hasKobo) {
+    return ['own'];
+  }
+
+  // If contains both or neither, default to own
+  return ['own'];
+};
+
 // ============================================================================
 // REGION: Activity Indicators
 // ============================================================================
@@ -41269,6 +41344,12 @@ const RestorationActivitySummary = ({
 
   // Activity Indicators Config - mapped from activityData
   const activityIndicatorsConfig = React.useMemo(() => getActivityIndicatorsConfig(activityData, t), [activityData, t]);
+
+  // Filter options based on activityData.origin
+  const filteredOptions = React.useMemo(() => getFilteredOptions(activityData, CustomIcon), [activityData]);
+
+  // Get default selected based on activityData.origin
+  const defaultSelected = React.useMemo(() => getDefaultSelected(activityData), [activityData]);
   return /*#__PURE__*/jsxRuntime.jsxs(DashboardLayout, {
     header: /*#__PURE__*/jsxRuntime.jsx(DAFHeader, {
       title: 'Restoration Activity Summary',
@@ -41278,7 +41359,25 @@ const RestorationActivitySummary = ({
       actionButtons: actionButtons,
       breadcrumbs: breadcrumbs,
       goBackTo: goBackTo,
-      loading: loading
+      loading: loading,
+      addedHeaderFirst: true,
+      addedHeader: /*#__PURE__*/jsxRuntime.jsx("div", {
+        style: {
+          marginRight: 0
+        },
+        children: /*#__PURE__*/jsxRuntime.jsx(Multiselect, {
+          canUnselectLast: false,
+          options: filteredOptions,
+          isAvatarGroup: true,
+          selectionType: "checkbox",
+          onChange: selected => {
+            console.log(selected);
+          },
+          dropDownWidth: 200,
+          defaultSelected: defaultSelected,
+          placeholder: "Select partners..."
+        })
+      })
     }),
     children: [/*#__PURE__*/jsxRuntime.jsx("section", {
       children: /*#__PURE__*/jsxRuntime.jsx(KeyIndicatorsWidget, {
@@ -41307,50 +41406,6 @@ const RestorationActivitySummary = ({
             app: "straatos",
             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,
-            ,
             primaryLink: true,
             renderTooltip: () => {
               return [{
@@ -41358,9 +41413,10 @@ const RestorationActivitySummary = ({
                 value: "Name"
               }];
             },
-            center: [13, -15],
             mapConfig: {
-              maxZoom: 18
+              maxZoom: 18,
+              zoom: 5,
+              center: [14, -14]
             },
             type: 'territory',
             link: true,

package/package.json

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

package/src/@daf/pages/Summary/Activities/Restoration/helper.js

@@ -1,3 +1,5 @@
+import React from 'react';
+
 // ============================================================================
 // REGION: Photo/Image Extraction
 // ============================================================================
@@ -120,6 +122,93 @@ export const getGenderTooltipChildren = (item, isEmpty, genderDistributionData,
     });
 };
 
+// ============================================================================
+// REGION: Multiselect Options
+// ============================================================================
+
+/**
+ * Get filtered options for multiselect based on activityData.origin
+ * Filters options based on whether origin contains 'kobo', 'straatos', or both
+ * 
+ * @param {Object} activityData - Activity data object containing origin array
+ * @param {React.Component} CustomIcon - CustomIcon component for rendering Monitor option avatar
+ * @returns {Array} - Filtered array of option objects
+ */
+export const getFilteredOptions = (activityData, CustomIcon) => {
+    const allOptions = [
+        {
+            label: "Own Data",
+            value: "own",
+            avatar: <span>OWN</span>,
+            background: "#016C6E",
+            color: "white",
+        },
+        {
+            label: "Monitor",
+            value: "other",
+            avatar: <CustomIcon name={"Search02"} size={14} />,
+        },
+    ];
+
+    if (!activityData?.origin || !Array.isArray(activityData.origin)) {
+        return allOptions;
+    }
+
+    // Extract origin names from the array
+    const originNames = activityData.origin
+        .map(item => item?.name?.toLowerCase())
+        .filter(Boolean);
+
+    const hasKobo = originNames.includes('kobo');
+    const hasStraatos = originNames.includes('straatos');
+
+    // If contains kobo only, show only Monitor
+    if (hasKobo && !hasStraatos) {
+        return allOptions.filter(option => option.value === 'other');
+    }
+
+    // If contains straatos only, show only Own Data
+    if (hasStraatos && !hasKobo) {
+        return allOptions.filter(option => option.value === 'own');
+    }
+
+    // If contains both or neither, show both
+    return allOptions;
+};
+
+/**
+ * Get default selected value for multiselect based on activityData.origin
+ * 
+ * @param {Object} activityData - Activity data object containing origin array
+ * @returns {Array} - Array of default selected values
+ */
+export const getDefaultSelected = (activityData) => {
+    if (!activityData?.origin || !Array.isArray(activityData.origin)) {
+        return ['own'];
+    }
+
+    // Extract origin names from the array
+    const originNames = activityData.origin
+        .map(item => item?.name?.toLowerCase())
+        .filter(Boolean);
+
+    const hasKobo = originNames.includes('kobo');
+    const hasStraatos = originNames.includes('straatos');
+
+    // If contains kobo only, default to monitor (other)
+    if (hasKobo && !hasStraatos) {
+        return ['other'];
+    }
+
+    // If contains straatos only, default to own
+    if (hasStraatos && !hasKobo) {
+        return ['own'];
+    }
+
+    // If contains both or neither, default to own
+    return ['own'];
+};
+
 // ============================================================================
 // REGION: Activity Indicators
 // ============================================================================

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

@@ -1,7 +1,7 @@
 import { useMemo, useCallback } from 'react';
-import { DashboardLayout, Header, ImageCarousel, KeyIndicators, MineSiteMap, Widget, PieChart, ActivityIndicators } from '../../../../../../src/index.js'
+import { DashboardLayout, Header, ImageCarousel, KeyIndicators, MineSiteMap, Widget, PieChart, ActivityIndicators, Multiselect, CustomIcon } from '../../../../../../src/index.js'
 import { getKeyIndicatorsRowConfig } from './config';
-import { getActivityImages, getGenderDistributionData, isGenderDistributionEmpty, calculateGenderPieData, getGenderTooltipChildren, getActivityIndicatorsConfig } from './helper';
+import { getActivityImages, getGenderDistributionData, isGenderDistributionEmpty, calculateGenderPieData, getGenderTooltipChildren, getActivityIndicatorsConfig, getFilteredOptions, getDefaultSelected } from './helper';
 import { renderTooltipJsx } from '../../../../../../src/utils';
 import { useResizeContext } from '../../../../../../src/context';
 
@@ -24,6 +24,18 @@ const RestorationActivitySummary = ({ activityData, supportText, onDownload, dow
         [activityData, t]
     );
 
+    // Filter options based on activityData.origin
+    const filteredOptions = useMemo(() => 
+        getFilteredOptions(activityData, CustomIcon),
+        [activityData]
+    );
+
+    // Get default selected based on activityData.origin
+    const defaultSelected = useMemo(() => 
+        getDefaultSelected(activityData),
+        [activityData]
+    );
+
     return (
         <DashboardLayout
             header={
@@ -36,6 +48,24 @@ const RestorationActivitySummary = ({ activityData, supportText, onDownload, dow
                     breadcrumbs={breadcrumbs}
                     goBackTo={goBackTo}
                     loading={loading}
+                    addedHeaderFirst
+                    addedHeader={
+                            <div style={{ marginRight: 0 }}>
+                                <Multiselect
+                                    canUnselectLast={false}
+                                    options={filteredOptions}
+                                    isAvatarGroup
+                                    selectionType="checkbox"
+                                    onChange={(selected) => {
+                                        console.log(selected);
+                                    }}
+                                    dropDownWidth={200}
+                                    defaultSelected={defaultSelected}
+                                    placeholder="Select partners..."
+                                />
+                            </div>
+                        
+                    }
                 />
             }
         >
@@ -57,57 +87,6 @@ const RestorationActivitySummary = ({ activityData, supportText, onDownload, dow
                             app={"straatos"}
                             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,
                             primaryLink={true}
                             renderTooltip={() => {
                                 return [
@@ -117,8 +96,8 @@ const RestorationActivitySummary = ({ activityData, supportText, onDownload, dow
                                     },
                                 ];
                             }}
-                            center={[13, -15]}
-                            mapConfig={{ maxZoom: 18 }}
+                          
+                            mapConfig={{ maxZoom: 18, zoom: 5, center: [14, -14] }}
                             type={'territory'}
                             link={true}
                             onClickLink={() => { }}