datastake-daf 0.6.846 → 0.6.847

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/dist/utils/index.js

@@ -9386,9 +9386,6 @@ const fr = {
   "under-development": "Under development",
   "under-development-description": "Our team is actively building this feature. It will be available in an upcoming release.",
   "Confirm new subject": "Confirmer nouveau sujet",
-  "registration": "Enregistrement",
-  "scrutiny": "Contrôle",
-  "Organisation Policies": "Politiques Organisationnelles",
   affirmations: {
     "subject-created-successfully": "Sujet créé avec succès.",
     "information-saved-successfully": "Information sauvegardée avec succès.",
@@ -11160,12 +11157,7 @@ const fr = {
     "date-added": "Date de Création",
     "last-active": "Dernière Activité",
     "key-indicators": "Indicateurs Clés"
-  },
-  "Armed Groups": "Groupes Armés",
-  "Identified Armed Groups": "Groupes Armés Identifiés",
-  "Reported Incidents": "Incidents Signalés",
-  "Conflict Map": "Carte des Conflits",
-  "Conflict Management": "Gestion des Conflits"
+  }
 };
 
 const sp = {

package/package.json

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

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

@@ -62,7 +62,7 @@ export default function NewUser({
 			const localUserData = {
 				...apiPayload,
 				status: 'pending',
-				id: apiPayload.email, 
+				id: apiPayload.email, // Add a unique ID for the table key
 				// apps: {
 				// 	[module]: {
 				// 		role: val.role,

package/src/@daf/core/components/Screens/Admin/AdminTables/AccountTable/helper.js

@@ -1,5 +1,6 @@
+import React from "react";
 import moment from "moment";
-import { Tag, Tooltip } from "antd";
+import { Tag, Tooltip, Checkbox } from "antd";
 import { findOptions } from "../../../../../../../helpers/StringHelper.js";
 import CustomIcon from "../../../../Icon/CustomIcon.jsx";
 import MoreMenu from "../../../../Table/MoreMenu/index.jsx";
@@ -31,35 +32,57 @@ export const getColumns = ({
 	onResendInvitation = () => {},
 	onCanelVerification = () => {},
 	setAddAccountVisible = () => {},
-
+	setSelectedAccounts = () => {},
+	selectedAccounts = [],
 }) => {
 	const cols = [
-	
+		{
+			title: "",
+			dataIndex: "select",
+			key: "select",
+			width: 50,
+			active: true,
+			pending: true,
+			suspended: true,
+			show: true,
+			render: (v, all) => {
+				if (all.empty) {
+					return <div className="daf-default-cell" />;
+				}
+				return (
+					<Checkbox
+						onChange={() =>
+							setSelectedAccounts((prev) => {
+								const isSelected = prev.some((p) => p.userId === all.userId);
+								if (isSelected) {
+									return prev.filter((p) => p.userId !== all.userId);
+								}
+								return [...prev, all];
+							})
+						}
+						checked={selectedAccounts.some((p) => p.userId === all.userId)}
+						disabled={selectedAccounts.length >= 3 && !selectedAccounts.some((p) => p.userId === all.userId)}
+					/>
+				);
+			},
+		},
 		{
 			title: t("ID"),
+			dataIndex: "userId",
 			key: "userId",
-			ellipsis: true,
-			width: 160,
 			active: true,
 			pending: true,
 			suspended: true,
-			render: (_, all) => {
-			  if (all.empty) {
-				return <div className="daf-default-cell" />;
-			  }
-		  
-			  const id =
-				all.status === "pending"
-				  ? all.users?.[0]?.userId ??
-					all.invitedUser?.userId ??
-					all.datastakeId ??
-					"--"
-				  : all.userId ?? "--";
-		  
-			  return <div className="daf-default-cell">{id}</div>;
+			ellipsis: true,
+			width: 160,
+			render: (v, all) => {
+				if (all.empty) {
+					return <div className="daf-default-cell" />;
+				}
+
+				return <div className="daf-default-cell">{v || "--"}</div>;
 			},
-		  },
-		  
+		},
 		{
 			title: t("Name"),
 			dataIndex: "name",
@@ -71,28 +94,25 @@ export const getColumns = ({
 			suspended: true,
 		},
 		{
-			title: t("Type"),
-			key: "type",
-			render: (_, all) => {
-			  if (all.empty) {
-				return <div className="daf-default-cell" />;
-			  }
-		  
-			  const typeValue =
-				all.status === "pending"
-				  ? all.type ?? all.otherData?.interface
-				  : all.apps?.[0]?.interface;
-		  
-			  return renderTypeTag({
-				value: typeValue,
-				label: findOptions(typeValue, selectOptions.type),
-			  });
+			title: t("type"),
+			dataIndex: "apps",
+			key: "apps",
+			render: (apps, all) => {
+				if (all.empty) {
+					return <div className="daf-default-cell" />;
+				}
+
+				const sbg = all?.interface ? all : (apps || []).find((a) => a.app === module);
+
+				return renderTypeTag({
+					value: sbg?.interface,
+					label: findOptions(sbg?.interface, selectOptions.type),
+				});
 			},
 			active: true,
 			pending: true,
 			suspended: true,
-		  },
-		  
+		},
 		{
 			title: t("Email"),
 			dataIndex: "admin",
@@ -145,28 +165,26 @@ export const getColumns = ({
 			pending: true,
 			suspended: false,
 		},
-	{
-		title: t("Email Verified"),
-		dataIndex: "emailVerified",
-		key: "emailVerified",
-		render: (verified, all) => {
-			if (all.empty) {
-				return <div className="daf-default-cell" />;
-			}
-
-			const isVerified = all.users?.[0]?.emailVerified ?? verified ?? all.emailVerfied;
+		{
+			title: t("Email Verified"),
+			dataIndex: "emailVerified",
+			key: "emailVerified",
+			render: (verified, all) => {
+				if (all.empty) {
+					return <div className="daf-default-cell" />;
+				}
 
-			return isVerified ? (
-				<Tag color="green">{t("Yes")}</Tag>
-			) : (
-				<Tag color="red">{t("No")}</Tag>
-			);
+				return verified ? (
+					<Tag color="green">{t("Yes")}</Tag>
+				) : (
+					<Tag color="red">{t("No")}</Tag>
+				);
+			},
+			ellipsis: false,
+			active: false,
+			pending: true,
+			suspended: false,
 		},
-		ellipsis: false,
-		active: false,
-		pending: true,
-		suspended: false,
-	},
 		{
 			title: t("Date"),
 			dataIndex: "createdAt",

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

@@ -154,14 +154,21 @@ function AdminView({
 
 						try {
 							const { data} = await updateAccount({ id: editData.id, data: newData });
+							console.log({data})
 
-						
+							console.log('Checking for pending users...', {
+								hasPendingUsers: pendingUsers.length > 0,
+								hasInviteFunction: !!inviteCompanyAccount,
+								pendingUsers: pendingUsers
+							});
 
 							if (pendingUsers.length > 0 && inviteCompanyAccount) {
 								console.log('Inviting pending users:', pendingUsers.length);
 								for (const user of pendingUsers) {
 									try {
 										const { pendingCompanyId, status, ...userDataToInvite } = user;
+										console.log('Sending invitation for:', user.email, userDataToInvite);
+										// Use the standalone invite function, don't mix it with updateAccount
 										// await inviteCompanyAccount({
 										// 	companyId: editData.id,
 										// 	data: {

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

@@ -1,7 +1,7 @@
 import { useEffect, useState } from "react";
 import SourceService from "../services/SourceService.js";
 
-export default function useSource({ user = {}, t = () => {}, getData = () => {}, id, stop }) {
+export default function useSource({ user = {}, t = () => {}, getData = () => {}, id }) {
 	const [loading, setLoading] = useState(true);
 	const [partners, setPartners] = useState([]);
 	const [selectedPartners, setSelectedPartners] = useState({ loading: true });
@@ -59,10 +59,8 @@ export default function useSource({ user = {}, t = () => {}, getData = () => {},
 			}
 		}
 
-		if(!stop) {
-			fetchPartners();
-		}
-	}, [user.language, id, stop]);
+		fetchPartners();
+	}, [user.language, id]);
 
 	function handleSelectedPartnersChange(selected) {
 		setSelectedPartners((prev) => ({
@@ -84,6 +82,7 @@ export default function useSource({ user = {}, t = () => {}, getData = () => {},
 
 export const useSources = ({type, id, user, t = () => {}, stop}) => {
 	function getData(params) {
+		if(stop) return Promise.resolve({ data: [] });
 		if(id !== undefined && id !== null) {
 			return SourceService.getSources({type, id});
 		} else {
@@ -96,7 +95,6 @@ export const useSources = ({type, id, user, t = () => {}, stop}) => {
 		t,
 		getData: getData,
 		id,
-		stop,
 	});
 
 	const informationSources = partners?.length > 0 ? partners?.length - 1 : 0;

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

@@ -2,6 +2,7 @@ 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,
@@ -9,37 +10,42 @@ 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 fetchData = async () => {
-        setLoading(true);
-        try {
-            const { data } = await getData(rest);
-            setData(data);
-            if (isErrorResponse(data)) {
-                const errorMessage = getErrorMessage(data);
-                message.error(errorMessage);
-                return;
-            }
-            onFetch();
-        } catch (err) {
-            console.log(err);
-        }finally {
-            setLoading(false);
-        }
-    };
-    useEffect(() => {
-        if(!stop) {
-            console.log('fetching data');
-			fetchData();
-		}
-    }, [JSON.stringify(config), stop]);
-    return {
-        data,
-        loading,
-        setData,
-    }
-}
+
+export const useWidgetFetch = ({ config, getData = DashboardService.getWidget, onFetch = () => { } }) => {
+   const { stop, defaultData, ...rest } = config;
+   const [data, setData] = useState(defaultData || {});
+   const [loading, setLoading] = useState(false);
+
+   const fetchData = async () => {
+
+       setLoading(true);
+
+       try {
+           const { data } = await getData(rest);
+           setData(data || defaultData);
+           if (isErrorResponse(data)) {
+               const errorMessage = getErrorMessage(data);
+               message.error(errorMessage);
+               return;
+           }
+           onFetch();
+       } catch (err) {
+           console.log(err);
+       }
+
+       setLoading(false);
+   };
+
+
+   useEffect(() => {
+       if (!stop) {
+           fetchData();
+       }
+   }, [JSON.stringify(config), stop]);
+
+   return {
+       data,
+       loading,
+       setData,
+   }
+}

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

@@ -204,6 +204,3 @@ export function useTimelineBase({ language, selectedRange }) {
 }
 
 export default useTimelineBase;
-
-
-