datastake-daf 0.6.835 → 0.6.837

package/src/@daf/{core/components/Screens → pages/Dashboards}/ConflictManagement/components/RisksWidget/components/TerritorialDistribution/index.js

@@ -1,32 +1,38 @@
 import React, { useMemo, useCallback } from 'react'
 import PropTypes from 'prop-types';
-import { renderTooltipJsx } from '../../../../../../../../utils/tooltip.js';
-import Widget from '../../../../../../../../core/components/Dashboard/Widget/index.jsx';
-import Chart from '../../../../../../../../core/components/Charts/PieChart/chart.jsx';
-import {useWidgetFetch} from '../../../../../../../../hooks/useWidgetFetch.js';
+import { renderTooltipJsx } from '../../../../../../../utils/tooltip.js';
+import Widget from '../../../../../../../core/components/Dashboard/Widget/index.jsx';
+import Chart from '../../../../../../../core/components/Charts/PieChart/chart.jsx';
+import {useWidgetFetch} from '../../../../../../../hooks/useWidgetFetch.js';
+import DashboardService from '../../../../../../../services/DashboardService.js';
 import { getColors } from './config.js';
-import useTerritorialDistribution from './config.js';
 
 function TerritorialDistribution({ selectedPartners = {}, loading: parentLoading = false, t = (s) => s, theme = {}, category = "conflict", selectedRange ,goTo = () => {}, getRedirectLink = () => {}}) {
-    const { filters, filtersConfig } = useTerritorialDistribution({ t });
     const colors = getColors(theme);
 
     const defaultFetchConfig = useMemo(
         () => ({
             url: "/territorial-distribution",
+            basepath: "dashboard/conflict-management",
             filters: {
-                ...filters,
                 category,
                 period: selectedRange,
                 sources: selectedPartners?.partners || [],
             },
-            defaultData: [],
+            defaultData: {},
             stop: selectedPartners?.loading,
         }),
-        [filters, category, selectedRange, selectedPartners],
+        [category, selectedRange, selectedPartners],
     );
 
-    const { data, loading } = useWidgetFetch({ config: defaultFetchConfig });
+    const getData = useCallback(({ url, filters, basepath }) => {
+        return DashboardService.getWidgetConflictManagement(url, filters, basepath);
+    }, []);
+
+    const { data, loading } = useWidgetFetch({ 
+        config: defaultFetchConfig,
+        getData 
+    });
 
     const pieData = useMemo(() => {
         if (!data || Array.isArray(data)) return []; 
@@ -50,7 +56,7 @@ function TerritorialDistribution({ selectedPartners = {}, loading: parentLoading
     const isEmpty = !pieData.length;
 
     const getTooltipChildren = useCallback((items) => {
-        const item = items[0]; 
+        const item = Array.isArray(items) ? items[0] : items;
         
         return renderTooltipJsx({
             title: item?.label || t("Undetermined"),
@@ -58,7 +64,7 @@ function TerritorialDistribution({ selectedPartners = {}, loading: parentLoading
             onClickLink: () => {
                  if (item?.label) {
                      goTo(
-                         `/app/incident?administrativeLevel1=${item?.locationData?.administrativeLevel1}&administrativeLevel2=${item?.locationData?.administrativeLevel2}&country=${item?.locationData?.country}`,
+                         `/app/incidents?administrativeLevel1=${item?.locationData?.administrativeLevel1}&administrativeLevel2=${item?.locationData?.administrativeLevel2}&country=${item?.locationData?.country}`,
                      );
                  } else {
                     goTo("/app/incident");
@@ -78,7 +84,6 @@ function TerritorialDistribution({ selectedPartners = {}, loading: parentLoading
             loading={loading || parentLoading}
             title={t("Territorial Distribution")}
             className="with-border-header"
-            filtersConfig={filtersConfig}
         >
             <Chart
                 mouseXOffset={10}

package/src/@daf/{core/components/Screens → pages/Dashboards}/ConflictManagement/components/RisksWidget/index.js

@@ -1,10 +1,10 @@
 import { Select } from "antd";
 import { useState } from "react";
-import Widget from "../../../../Dashboard/Widget/index.jsx";
 import IncidentsTime from "./components/IncidentsTime/index.js";
 import TerritorialDistribution from "./components/TerritorialDistribution/index.js";
 import ProblemSolver from "./components/ProblemSolver/index.js";
 import { filterOptions } from "./config.js";
+import Widget from "../../../../../core/components/Dashboard/Widget/index.jsx";
 
 export default function RisksWidget({ 
     title = "Analytics",

package/src/@daf/{core/components/Screens → pages/Dashboards}/ConflictManagement/index.js

@@ -1,12 +1,12 @@
 import React, { useMemo, useEffect } from "react";
-import Header from "../../Header/index.jsx";
 import KeyIndicators from "./components/KeyIndicators/index.js";
-import Multiselect from "../../Select/MultiSelect/index.jsx";
 import MineSites from "./components/MineSite/index.js";
 import RisksWidget from "./components/RisksWidget/index.js";
-import { useSources } from "../../../../hooks/useSources.js";
-import { renderBreadCrumbs } from "../../../../../helpers/breadCrumbs.js";
-import CustomIcon from "../../Icon/CustomIcon.jsx";
+import { useSources } from "../../../hooks/useSources.js";
+import { renderBreadCrumbs } from "../../../../helpers/breadCrumbs.js";
+import CustomIcon from "../../../core/components/Icon/CustomIcon.jsx";
+import { Header, Multiselect } from "../../../../index.js";
+import DashboardLayout from '../../../core/components/Dashboard/DashboardLayout/index.jsx';
 
 export default function ConflictManagement({ 
     t=()=>{}, 
@@ -15,7 +15,9 @@ export default function ConflictManagement({
     goTo = () => {}, 
     getRedirectLink = (s) => s, 
     theme = {},
-    options = {}
+    options = {},
+	breadcrumbs = [],
+
 }) {
 	const { partners, selectedPartners, setSelectedPartners, informationSources } =
 		useSources({ user, t });
@@ -45,8 +47,11 @@ export default function ConflictManagement({
 	}, [partners, user, theme]);
 
 	return (
-		<div className="daf-analysis">
-			<Header
+		
+        <DashboardLayout
+		
+		header={
+		<Header
 				title={t("conflict-management")}
 				breadcrumbs={breadCrumbs}
 				supportText={
@@ -63,7 +68,6 @@ export default function ConflictManagement({
 				}
 				addedHeader={
 					<div>
-						<div className="flex-1" />
 						<Multiselect
 							options={[...sourceOptions]}
 							isAvatarGroup
@@ -82,12 +86,9 @@ export default function ConflictManagement({
 						/>
 					</div>
 				}
-			/>
+			/>}
+			>
 
-			<div className="content">
-				<div className="view-content">
-					<div className="daf-analysis-layout">
-						<div className="sections-cont w-pt">
 							<section>
 								<KeyIndicators
 									selectedPartners={selectedPartners}
@@ -126,11 +127,8 @@ export default function ConflictManagement({
                                     options={options}
 								/>
 							</section>
-						</div>
-					</div>
-				</div>
-			</div>
-		</div>
+			
+        </DashboardLayout>
 	);
 }
 

package/src/@daf/services/DashboardService.js

@@ -25,14 +25,14 @@ class DashboardService extends BaseService {
       });
     }
 
-    // getWidgetConflictManagement({ url, params = {}, filters = {} }) {
-    //   return this.apiGet({
-    //     url: `/dashboard/conflict-management${url}`,
-    //     params: { ...params, ...filters },
-    //     isApp: true,
-    //   });
-    // }
-    
+    getWidgetConflictManagement(url, params, basepath = "dashboard/conflict-management") {
+      return this.apiGet({
+        url: `/${basepath}${url}`,
+        params,
+        isApp: true,
+      });
+    }
+  
 }
 
 export default createLazyService(DashboardService);

package/src/pages.js

@@ -23,4 +23,4 @@ export { default as View } from './@daf/pages/View/index.jsx';
 export { default as Edit } from './@daf/pages/Edit/index.jsx';
 
 // Conflict Management
-export { default as ConflictManagement } from './@daf/core/components/Screens/ConflictManagement/index.js';
+export { default as ConflictManagement } from './@daf/pages/Dashboards/ConflictManagement/index.js'

package/build/manifest.json

@@ -1,25 +0,0 @@
-{
-  "short_name": "React App",
-  "name": "Create React App Sample",
-  "icons": [
-    {
-      "src": "favicon.ico",
-      "sizes": "64x64 32x32 24x24 16x16",
-      "type": "image/x-icon"
-    },
-    {
-      "src": "logo192.png",
-      "type": "image/png",
-      "sizes": "192x192"
-    },
-    {
-      "src": "logo512.png",
-      "type": "image/png",
-      "sizes": "512x512"
-    }
-  ],
-  "start_url": ".",
-  "display": "standalone",
-  "theme_color": "#000000",
-  "background_color": "#ffffff"
-}

package/build/robots.txt

@@ -1,3 +0,0 @@
-# https://www.robotstxt.org/robotstxt.html
-User-agent: *
-Disallow:

package/src/@daf/core/components/Screens/ConflictManagement/components/RisksWidget/components/IncidentsTime/hook.js

@@ -1,32 +0,0 @@
-import { useMemo, useState } from "react";
-
-export default function useIncidentsTimeline({ t=()=>{}, options = {} }) {
-	const [filters, setFilters] = useState({ severity: "all" });
-
-	const filtersConfig = useMemo(
-		() => ({
-			filtersConfig: {
-				severity: {
-					type: "select",
-					label: "",
-					placeholder: (t) => t(""),
-					style: { flex: 1 },
-					labelStyle: { flex: 1 },
-				},
-			},
-			onApply: (val) => setFilters(val),
-			options: {
-				severity: [{ value: "all", label: t("All") }, ...(options?.severityOptions || [])],
-			},
-			selectedFilters: filters,
-			type: "small",
-			t,
-		}),
-		[t, filters, options?.severityOptions],
-	);
-
-	return {
-		filters,
-		filtersConfig,
-	};
-}

package/src/@daf/core/components/Screens/ConflictManagement/components/RisksWidget/components/IncidentsTime/index.js

@@ -1,73 +0,0 @@
-import { useCallback, useMemo } from "react";
-import StackChart from "../../../../../../Charts/StackChart/index.jsx";
-import  Widget from "../../../../../../Dashboard/Widget/index.jsx";
-import PropTypes from 'prop-types';
-import useIncidentsTimeline from "./hook.js";
-
-export default function IncidentsTime({ selectedRange, selectedPartners = {} ,t=()=>{},goTo=(s)=>s,getRedirectLink=(s)=>s, theme = {}, APP , options = {}}) {
-    const { filters, filtersConfig } = useIncidentsTimeline({ t, options });
-    const { user } = useSelector((state) => state.authentication);
-
-	const getSourceParam = useCallback((sourceId) => {
-		if (user?.company?.id !== sourceId) {
-			return `?sourceId=${sourceId}`;
-		}
-
-		return "";
-	}, [user?.company?.id]);
-
-	const defaultFetchConfig = useMemo(
-		() => ({
-			url: `/incidents-timeline`,
-			filters: {
-				...filters,
-				severity: filters.severity ? filters.severity : "all",
-				period: selectedRange,
-				sources: selectedPartners?.partners || [],
-			},
-			defaultData: [],
-			stop: selectedPartners?.loading,
-		}),
-		[filters, selectedRange, selectedPartners],
-	);
-	const renderSeverity = (val) => {
-		const colors = getColors("INCIDENTS", app);
-
-		switch (val) {
-			case "major":
-				return <span style={{ color: colors.major }}>{t("Major")}</span>;
-			case "minor":
-				return <span style={{ color: colors.minor }}>{t("Minor")}</span>;
-			case "moderate":
-				return <span style={{ color: colors.moderate }}>{t("Moderate")}</span>;
-			default:
-				return null;
-		}
-	};
-
-    const chartConfig = {}; 	const { data, loading } = useWidgetFetch(defaultFetchConfig);
-
-
-    return (
-        <Widget
-            loading={loading}
-            filtersConfig={filtersConfig}
-            title={t("Incidents Timeline")}
-            className="with-border-header"
-            t={t}
-        >
-            <StackChart {...chartConfig} height="400px" t={t} />
-        </Widget>
-    );
-}
-
-IncidentsTime.propTypes = {
-    selectedRange: PropTypes.string,
-    selectedPartners: PropTypes.object,
-    t: PropTypes.func,
-    goTo: PropTypes.func,
-    getRedirectLink: PropTypes.func,
-    theme: PropTypes.object,
-    APP: PropTypes.string,
-    options: PropTypes.object,
-};

package/src/@daf/core/components/Screens/ConflictManagement/components/RisksWidget/components/ProblemSolver/hook.js

@@ -1,86 +0,0 @@
-import { useEffect, useMemo, useState } from "react";
-import DashboardService from "../../../../../../../../services/DashboardService.js";
-
-
-export default function useProblemSolvers(t = () => {}) {
-	const [filters, setFilters] = useState({
-		administrativeLevel1: "all",
-	});
-
-	const [filterOptions, setFilterOptions] = useState([]);
-
-	useEffect(() => {
-		async function fetchOptions() {
-			try {
-				const { data } = await DashboardService.getWidget({
-					url: "/problem-solvers",
-				});
-
-
-				const rawOptions = Object.keys(data)
-					.map((agentKey) => {
-						const actions = data[agentKey]?.actions || [];
-
-						return actions
-							.map((action) => {
-								const lvl1 = action?.location?.administrativeLevel1;
-								const name =
-									action?.location?.name ||
-									action?.location?.administrativeLevel1 ||
-									null;
-
-								if (!lvl1 || !name) return undefined;
-
-								return {
-									label: name,
-									value: lvl1,
-								};
-							})
-							.filter(Boolean);
-					})
-					.flat();
-
-				const unique = [
-					...new Map(rawOptions.map((item) => [item.value, item])).values(),
-				];
-
-				setFilterOptions(unique);
-			} catch (err) {
-				console.error("Problem Solvers fetch failed:", err);
-			}
-		}
-
-		fetchOptions();
-	}, []);
-
-
-	const filtersConfig = useMemo(
-		() => ({
-			filtersConfig: {
-				administrativeLevel1: {
-					type: "select",
-					label: "",
-					placeholder: t("Select"),
-					style: { flex: 1 },
-					labelStyle: { flex: 1 },
-				},
-			},
-			onApply: (val) => setFilters(val),
-			options: {
-				administrativeLevel1: [
-					{ label: t("All"), value: "all" },
-					...filterOptions,
-				],
-			},
-			selectedFilters: filters,
-			type: "small",
-			t,
-		}),
-		[t, filters, filterOptions]
-	);
-
-	return {
-		filters,
-		filtersConfig,
-	};
-}

package/src/@daf/core/components/Screens/ConflictManagement/components/RisksWidget/components/TerritorialDistribution/config.js

@@ -1,34 +0,0 @@
-
-import { useMemo, useState } from "react";
-
-export default function useTerritorialDistribution({ t = (s)=>{s}, options = {} }) {
-  const [filters, setFilters] = useState({ filter1: 'all', filter2: 'all' });
-
-  const filtersConfig = useMemo((t) => ({
-    onApply: (val) => setFilters(val),
-    options: {
-      filter1: [{ label: t('All'), value: 'all' }],
-      filter2: [{ label: t('All'), value: 'all' }],
-    },
-    selectedFilters: filters,
-    type: 'small',
-    t,
-  }), [t,  filters]);
-
-  return {
-    filters,
-    filtersConfig,
-    setFilters,
-    t,
-  };
-}
-
-export const getColors = (theme) => {
-    return [
-        theme.colorPrimary8,
-        theme.colorPrimary7,
-        theme.colorPrimary5,
-        theme.colorPrimary6,
-        theme.colorPrimary4,
-    ]
-}