datastake-daf 0.6.842 → 0.6.844

package/src/@daf/core/components/Filters/selectFilters/index.jsx

@@ -1,6 +1,6 @@
 import PropTypes from 'prop-types'
 import { Button, Input, Tooltip } from 'antd';
-import React, { useMemo, useState } from 'react';
+import React, { useMemo, useState, useEffect } from 'react';
 import { CustomSelect } from './Select.jsx';
 import { Timeframe } from './Timeframe.jsx';
 import { AjaxSelect } from "./AjaxSelect.jsx";
@@ -26,6 +26,12 @@ const SelectFilters = ({
   const [filters, setFilters] = useState(selectedFilters || {});
   const [initFilters, setInitFilters] = useState(selectedFilters || {})
 
+  // Sync internal state with selectedFilters prop when it changes
+  useEffect(() => {
+    setFilters(selectedFilters || {});
+    setInitFilters(selectedFilters || {});
+  }, [selectedFilters]);
+
   const getClearLabel = () => {
     switch (type) {
       case 'small':

package/src/@daf/core/components/Graphs/TradeRelationship/index.jsx

@@ -21,7 +21,6 @@ function TradeRelationship({
   onFilterChange = () => {},
   renderTooltipItems = () => [],
   getTotal = () => 0,
-  onRenderComplete = () => {},
 }) {
   const reactFlowWrapper = useRef(null);
   const [nodes, setNodes] = useNodesState([]);
@@ -31,31 +30,6 @@ function TradeRelationship({
   // const [initCenter, setInitCenter] = useState(true);
   const [associatedNodes, setAssociatedNodes] = useState(null);
 
-  const isFullyRenderedRef = useRef(false);
-  const [isFullyRendered, setIsFullyRendered] = useState(false);
-
-  useEffect(() => {
-    isFullyRenderedRef.current = false;
-    setIsFullyRendered(false);
-    setActiveNode(null);
-  }, [data]);
-
-  useEffect(() => {
-    if (nodes.length > 0 && edges.length > 0 && !isFullyRenderedRef.current) {
-      const timeoutId = setTimeout(() => {
-        isFullyRenderedRef.current = true;
-        setIsFullyRendered(true);
-        onRenderComplete(true);
-      }, 200);
-      
-      return () => clearTimeout(timeoutId);
-    } 
-    if(nodes.length === 0 || edges.length === 0) {
-      setIsFullyRendered(true);
-      onRenderComplete(true);
-    }
-  }, [nodes.length, edges.length, associatedNodes]);
-  
   useEffect(() => {
     setActiveNode(null);
   }, [data]);
@@ -274,7 +248,7 @@ function TradeRelationship({
     
     // Cleanup to prevent memory leaks if component unmounts quickly
     return () => clearTimeout(timeoutId);
-  }, [data, activeNode]);
+  }, [data]);
 
   useEffect(() => {
     if (activeNode) {

package/src/@daf/core/components/Graphs/components/BaseGraph.jsx

@@ -2,7 +2,7 @@ import { ReactFlow, Controls, ControlButton, useReactFlow } from "@xyflow/react"
 import { UpOutlined, DownOutlined, AimOutlined } from "@ant-design/icons";
 
 import ComponentWithFocus from "../../Dashboard/ComponentWithFocus/index.jsx";
-import { forwardRef } from "react";
+import { forwardRef, useRef } from "react";
 import { PrimaryNode, IconNode, NameNode, ExpandedNode } from "./Nodes/index.jsx";
 import { ToolTipEdge, VerticalPathEdge, DefaultEdge } from "./Edges/index.jsx";
 import Filters from "../../Filters/FloatingFilters/index.js";
@@ -38,6 +38,7 @@ const BaseGraph = forwardRef(function BaseGraph(
 	ref,
 ) {
 	const { setViewport, getViewport, fitView } = useReactFlow();
+	const hasInitialFitRef = useRef(false);
 
 	const nodesToFit = useMemo(() => {
 		let result;
@@ -49,31 +50,34 @@ const BaseGraph = forwardRef(function BaseGraph(
 		return result;
 	}, [nodes.length, mandatoryNodesToFit?.length, mandatoryNodesToFit]);
 
-	// In BaseGraph.jsx, replace the useEffect with:
+	// Only auto-fit on initial render or when node count changes, not on property changes
 	useEffect(() => {
 		if (nodesToFit.length === 0) return;
 
-		// Use setTimeout instead of requestAnimationFrame to ensure nodes are rendered
-		const timer = setTimeout(() => {
-			fitView({
-				padding: 0.4,
-				nodes: [...nodesToFit],
-				// duration: withDuration ? 300 : undefined,
-				maxZoom: 0.9,
-			});
-		}, 100); // Small delay to ensure nodes are rendered
+		// Only auto-fit on initial render or when node count changes
+		if (!hasInitialFitRef.current) {
+			hasInitialFitRef.current = true;
+			
+			const timer = setTimeout(() => {
+				fitView({
+					padding: 0.4,
+					nodes: [...nodesToFit],
+					maxZoom: 0.9,
+				});
+			}, 100);
 
-		return () => clearTimeout(timer);
-	}, [nodesToFit.length, nodesToFit.map(n => `${n.id}-${n.width}-${n.height}`).join(','), withDuration]);
+			return () => clearTimeout(timer);
+		}
+	}, [nodesToFit.length, withDuration]);
 
 	return (
 		<ComponentWithFocus>
-			<div style={{ height: "100%", width: "100%" }} ref={ref}>
-				{filtersConfig ? (
-					<Filters t={t} filtersConfig={filtersConfig} onFilterChange={onFilterChange} />
-				) : null}
+			<div style={{ height: "100%", width: "100%", position: "relative" }} ref={ref}>
+			{filtersConfig ? (
+				<Filters t={t} filtersConfig={filtersConfig} onFilterChange={onFilterChange} />
+			) : null}
 
-				<ReactFlow
+			<ReactFlow
 					nodes={nodes}
 					edges={edges}
 					zoomOnDoubleClick={false}

package/src/@daf/core/components/Screens/Admin/AdminModals/NewAccount/index.jsx

@@ -1,7 +1,7 @@
 import Modal from "../../../../Modal/index.jsx";
-import { Form, Select, Input, Alert } from "antd";
+import { Form, Select, Input, Alert, message } from "antd";
 import { useState, useEffect, useMemo } from "react";
-
+import { findOptions } from "../../../../../../../helpers/StringHelper.js";
 export default function NewAccount({
 	t,
 	isOpen,
@@ -12,26 +12,32 @@ export default function NewAccount({
 	inviteAccount,
 	isPending=false,
 	accountToEdit,
+	countries
 }) {
 	const [MainForm] = Form.useForm();
 	const [loading, setLoading] = useState(false);
 	const [accountUsed, setAccountUsed] = useState(false);
 
 
-
 	const isEdit = useMemo(() => accountToEdit && typeof accountToEdit === "object", [accountToEdit]);
 
+	const selectedCountry = useMemo(
+		() => findOptions(accountToEdit?.otherData?.country, countries),
+		[accountToEdit?.otherData?.country, countries]
+	);	
+	console.log(selectedCountry, "selectedCountry");
 	useEffect(() => {
 		if (accountToEdit && typeof accountToEdit === "object") {
 			MainForm.setFieldsValue({
 				name: accountToEdit.name,
 				email: accountToEdit.email,
 				type: accountToEdit?.otherData?.interface,
+				country: selectedCountry,
 			});
 		} else {
 			MainForm.resetFields();
 		}
-		}, [accountToEdit, MainForm]);
+	}, [accountToEdit, MainForm, selectedCountry]);
 
 	const onSubmit = async () => {
 		try {
@@ -45,6 +51,7 @@ export default function NewAccount({
 					data: val, 
 					isPending: accountToEdit.status === 'pending' || isPending 
 				});
+				message.success(t("Account successfully updated"));
 			} else {
 				if (!inviteAccount) {
 					throw new Error("inviteAccount function is required for creating new accounts");
@@ -80,7 +87,7 @@ export default function NewAccount({
 					<Input placeholder={t("Type")} />
 				</Form.Item>
 				
-			
+			{!isEdit && (
 					<Form.Item
 						name="email"
 						label={t("Email")}
@@ -88,7 +95,13 @@ export default function NewAccount({
 					>
 						<Input placeholder={t("Type")} />
 					</Form.Item>
-			
+				)}
+			{isEdit && (
+				<Form.Item name="country" label={t("Country")} rules={[{ required: true }]}>
+				<Select placeholder={t("Select")} options={countries} />
+			</Form.Item>
+				
+				)}
 				<Form.Item name="type" label={t("Type")} rules={[{ required: true }]}>
 					<Select placeholder={t("Select")} options={accountTypes || []} />
 				</Form.Item>

package/src/@daf/core/components/Screens/Admin/AdminScreens/Accounts.jsx

@@ -49,6 +49,7 @@ export default function AdminAccountsScreen({ config }) {
 	const query = useQuery ? useQuery() : { get: () => null };
 	const [addAccountVisible, setAddAccountVisible] = useState(!!query.get("create"));
 	const [accountToEdit, setAccountToEdit] = useState(null);
+	const [refetchTrigger, setRefetchTrigger] = useState(0);
 
 
 
@@ -102,6 +103,7 @@ function handleCopyInvitation(account) {
 				headerTitle="accounts"
 				actionButton={actionButtons}
 				getData={handleGetData}
+				refetchTrigger={refetchTrigger}
 				config={{
 					accountTypes,
 					addAccountVisible,
@@ -125,8 +127,9 @@ function handleCopyInvitation(account) {
 				setAccountToEdit(null);
 			}}
 			accountTypes={accountTypes}
-			countriesOptions={options?.countries}
+			countries={options?.countries}
 			fetchData={() => {
+				setRefetchTrigger((prev) => prev + 1);
 			}}
 			inviteAccount={(data) => AdminService.inviteAccount(data)}
 			updateAccount={({ data, id, isPending }) => AdminService.updateAccount({ data, id, isPending })}

package/src/@daf/core/components/Screens/Admin/AdminTables/AccountTable/index.jsx

@@ -33,6 +33,7 @@ export default function AccountTable({
 	defaultPageSize = 20,
 	actionButton,
 	inviteAccount,
+	refetchTrigger,
 }) {
 	const accountTypes = config?.accountTypes;
 	const [showFilters, setShowFilters] = useState(false);
@@ -61,6 +62,7 @@ export default function AccountTable({
 		getRedirectLink,
 		getData,
 		fetchPendingOnMount: true,
+		refetchTrigger,
 	});
 
 	const selectOptions = useMemo(() => {

package/src/@daf/core/components/Select/MultiSelect/style.js

@@ -5,7 +5,7 @@ const MultiSelectStyled = styled(Select)`
   &.ant-select-single {
     .ant-select-selector {
         padding-inline-end: 24px !important;
-        padding: 0 !important;
+        padding: 3px !important;
         max-width: 56px !important;
         width: 56px !important;
     }

package/src/@daf/core/components/ViewForm/components/DataLink/flat.js

@@ -177,9 +177,13 @@ export default function DataLinkFlat({
   }, [entity, values.linking])
 
   const dataLinkFormData = useMemo(() => {
-    const _formData = isSingle ? formData && !Array.isArray(formData)
-      ? [{ ...form?.meta?.prefilledValues, ...formData }] : []
-      : (Array.isArray(formData) ? formData : []).map((f) => ({ ...form?.meta?.prefilledValues, ...f }));
+    const filteredPrefilledValues = Object.entries(form?.meta?.prefilledValues || {})
+    .filter(([_, value]) => !(value && typeof value === 'object' && 'combine' in value))
+    .reduce((acc, [key, value]) => ({ ...acc, [key]: value }), {});
+
+  const _formData = isSingle ? formData && !Array.isArray(formData)
+    ? [{ ...filteredPrefilledValues, ...formData }] : []
+    : (Array.isArray(formData) ? formData : []).map((f) => ({ ...filteredPrefilledValues, ...f }));
 
     return (_formData || []).map((f, i) => {
       if (isAjaxModal && typeof f === 'string' && linkingData[f]) {

package/src/@daf/core/components/ViewForm/components/DataLink/index.js

@@ -111,9 +111,13 @@ export default function DataLink({
   })
 
   const data = useMemo(() => {
+    const filteredPrefilledValues = Object.entries(form?.meta?.prefilledValues || {})
+    .filter(([_, value]) => !(value && typeof value === 'object' && 'combine' in value))
+    .reduce((acc, [key, value]) => ({ ...acc, [key]: value }), {});
+
     const _formData = isSingle ? formData && !Array.isArray(formData)
-      ? [{ ...form?.meta?.prefilledValues, ...formData }] : []
-      : (Array.isArray(formData) ? formData : []).map((f) => ({ ...form?.meta?.prefilledValues, ...f }));
+      ? [{ ...filteredPrefilledValues, ...formData }] : []
+      : (Array.isArray(formData) ? formData : []).map((f) => ({ ...filteredPrefilledValues, ...f }));
 
     return (_formData || []).map((f, i) => {
       if (isAjaxModal && typeof f === 'string' && linkingData[f]) {

package/src/@daf/core/components/ViewForm/components/input.js

@@ -361,13 +361,13 @@ export const BasicInput = ({
       case 'phoneNumber':
       case 'textarea':
         return item
-          ? (propHasValue(item[inputName]) ? item[inputName] : placeholder(item, inputName, withPlaceholder))
-          : (propHasValue(data[inputName]) ? data[inputName] : placeholder(data, inputName, withPlaceholder));
+          ? (propHasValue(item[inputName]) && item[inputName] !== '' ? item[inputName] : placeholder(item, inputName, withPlaceholder))
+          : (propHasValue(data[inputName]) && data[inputName] !== '' ? data[inputName] : placeholder(data, inputName, withPlaceholder));
       case 'website':
       case 'link':
         const v = item
-          ? (propHasValue(item[inputName]) ? item[inputName] : placeholder(item, inputName, withPlaceholder))
-          : (propHasValue(data[inputName]) ? data[inputName] : placeholder(data, inputName, withPlaceholder))
+          ? (propHasValue(item[inputName]) && item[inputName] !== '' ? item[inputName] : placeholder(item, inputName, withPlaceholder))
+          : (propHasValue(data[inputName]) && data[inputName] !== '' ? data[inputName] : placeholder(data, inputName, withPlaceholder))
 
         if (isModal) {
           return (
@@ -1023,7 +1023,7 @@ const Input = ({
           >
           </BasicInput>
         })}
-        {isRepeatable && Array.isArray(modalData) && !modalData.length ? (
+        {isRepeatable && Array.isArray(modalData) && !modalData.length || modalData === "" ? (
           <span className="text-muted">{t('Not answered')}</span>
         ) : null}
       </React.Fragment>
@@ -1068,7 +1068,7 @@ const Input = ({
           })
         }
         {
-          (!modalData || (Array.isArray(modalData) && !modalData.length)) ? (
+          (!modalData || (Array.isArray(modalData) && !modalData.length) || modalData === "") ? (
             <span className="text-muted">{t('Not answered')}</span>
           ) : (
             (Array.isArray(modalData) ? modalData : [modalData]).map((item, itemId) => (
@@ -1174,7 +1174,7 @@ const Input = ({
         >
         </BasicInput>
       })}
-      {(!formData || (Array.isArray(formData) && !formData.length)) ? (
+      {(!formData || (Array.isArray(formData) && !formData.length) || formData === "") ? (
         <span className="text-muted">{t('Not answered')}</span>
       ) : (
         (Array.isArray(formData) ? formData : [formData])?.map((item, itemId) => (

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

@@ -2,7 +2,6 @@ import { useState, useEffect, useRef } from "react";
 import DashboardService from "../services/DashboardService.js";
 import { isErrorResponse, getErrorMessage } from "../../helpers/errorHandling.js";
 import { message } from "antd";
-
 // config: {
 //     stop: boolean,
 //     defaultData: object,
@@ -10,56 +9,48 @@ import { message } from "antd";
 //     url: string
 //     basePath: string,
 // }
-
 export const useWidgetFetch = ({config, getData = DashboardService.getWidget, onFetch = () => {}}) => {
     const { stop, defaultData, ...rest} = config;
     const [ data, setData ] = useState(defaultData || {});
     const [ loading, setLoading ] = useState(false);
     const [ initFetchDone, setInitFetchDone ] = useState(false);
     const isMounted = useRef(true);
-
-	const fetchData = async () => {
-		if (stop) {
-			return;
-		}
-
-		setLoading(true);
-
-		try {
-			const { data } = await getData(rest);
-			if (!isMounted.current) return;
-			setData(data || defaultData);
-			if (isErrorResponse(data)) {
-				const errorMessage = getErrorMessage(data);
-				message.error(errorMessage);
-				return;
-			}
+	
+    const fetchData = async () => {
+        setLoading(true);
+        try {
+            const { data } = await getData(rest);
+            if (!isMounted.current) return;
+            setData(data || defaultData);
+            if (isErrorResponse(data)) {
+                const errorMessage = getErrorMessage(data);
+                message.error(errorMessage);
+                return;
+            }
             onFetch();
             setInitFetchDone(true);
-		} catch (err) {
-			console.log(err);
-		}
-
-		if (isMounted.current) {
-			setLoading(false);
-		}
-	};
-
+        } catch (err) {
+            console.log(err);
+        }
+        if (isMounted.current) {
+            setLoading(false);
+        }
+    };
     useEffect(() => {
         isMounted.current = true;
         return () => {
             isMounted.current = false;
         };
     }, []);
-
-	useEffect(() => {
-		fetchData();
-	}, [JSON.stringify(config)]);
-
+    useEffect(() => {
+        if(!stop) {
+			fetchData();
+		}
+    }, [JSON.stringify(config), stop]);
     return {
         data,
         loading,
-		setData,
+        setData,
         initFetchDone
     }
-} 
+}

package/src/@daf/pages/Dashboards/ConflictManagement/components/RisksWidget/components/IncidentsTime/index.js

@@ -92,6 +92,7 @@ export default function IncidentsTimeline({
     if (selectedRange === "12") return baseMonths.map((m) => m.label);
     return baseWeeks.map((w) => w.label);
   }, [selectedRange, baseMonths, baseWeeks]);
+  console.log({filtersConfig})
 
   const getTooltipContent = useCallback(
     ({ item }) => {