datastake-daf 0.6.824 → 0.6.826

package/dist/pages/index.js

@@ -42258,7 +42258,7 @@ const getFilterOptions$a = (options, t) => {
 const formConfig$8 = {
   namespace: 'armed-groups',
   view: ['scoping', 'new'],
-  scope: 'global',
+  scope: 'createArmedGroup',
   formType: 'armed-group'
 };
 const viewConfig$8 = {
@@ -44012,7 +44012,7 @@ const getFilterOptions$6 = (options, t) => {
 const formConfig$4 = {
   namespace: 'testimonials',
   view: 'testimonials',
-  scope: 'create',
+  scope: 'createTestimonial',
   formType: 'testimonial'
 };
 const viewConfig$4 = {
@@ -44979,7 +44979,7 @@ const getFilterOptions$3 = (options, t) => {
 const formConfig$1 = {
   namespace: 'conflict-areas',
   view: ['scoping', 'new'],
-  scope: 'conflictAreaCreate',
+  scope: 'createConflictArea',
   formType: 'conflict-area'
 };
 const viewConfig$1 = {
@@ -52898,9 +52898,8 @@ class AdminService extends BaseService {
     subject,
     id
   }) {
-    const type = subject === 'location' ? 'location' : 'stakeholder';
     return this.apiDelete({
-      url: `/management/subject/${type}/${id}`
+      url: `/management/subject/${subject}/${id}`
     });
   }
   async getUserGrowth(activeFilter) {
@@ -61316,6 +61315,22 @@ const usePrepareForm$1 = ({
   };
 };
 
+const evaluateRule = (rule, data) => {
+  if (typeof rule === "boolean") return rule;
+  if (typeof rule === "function") return rule();
+  if (typeof rule === "string") {
+    const parts = rule.split(" ");
+
+    // Expecting: "<field> <is|not> <value>"
+    if (parts.length === 3) {
+      const [field, condition, value] = parts;
+      if (condition === "is") return data?.[field] === value;
+      if (condition === "not") return data?.[field] !== value;
+    }
+  }
+  console.warn("Invalid rule:", rule);
+  return false;
+};
 const useViewPermissions = ({
   data,
   id,
@@ -61333,9 +61348,6 @@ const useViewPermissions = ({
   viewConfig
 }) => {
   const baseNamespaceKeys = Object.keys(namespaceConfig || {});
-  console.log({
-    namespaceConfig
-  });
   const baseSupportedNamespaces = baseNamespaceKeys?.reduce((acc, key) => {
     acc[key] = () => true;
     return acc;
@@ -61357,7 +61369,8 @@ const useViewPermissions = ({
       ...baseCanEditAction,
       ...namespaceOverrides.canEdit
     };
-    return canEditAction[namespace] ? canEditAction[namespace]() : false;
+    const rule = canEditAction[namespace] ? canEditAction[namespace]() : false;
+    return evaluateRule(rule, data);
   }, [namespace, data, user]);
   const canDelete = React.useMemo(() => {
     baseNamespaceKeys.reduce((acc, key) => {
@@ -61367,7 +61380,8 @@ const useViewPermissions = ({
     const canDeleteAction = {
       ...namespaceOverrides.canDelete
     };
-    return canDeleteAction[namespace] ? canDeleteAction[namespace]() : false;
+    const rule = canDeleteAction[namespace] ? canDeleteAction[namespace]() : false;
+    return evaluateRule(rule, data);
   }, [namespace, data, user, namespaceOverrides]);
   React.useEffect(() => {
     if (data) {
@@ -61621,7 +61635,12 @@ const namespaceMap = {
   "production-sites": "location",
   operators: "stakeholder",
   workers: "stakeholder",
-  activities: "event"
+  activities: "event",
+  "conflict-areas": "location",
+  "armed-groups": "stakeholder",
+  scl: "location",
+  testimonials: 'event',
+  'corrective-actions': 'event'
 };
 
 const getColumns = ({
@@ -62008,15 +62027,9 @@ const View = ({
   options,
   getSubjectsDetails,
   namespaceOverrides
-  // ADD CALLBACK TO GET THE CURRENT NAMESPACE CONFIG
 }) => {
   const getNamespaceConfig = namespace => namespaceConfiguration?.[namespace] || {};
   const [openRecordsModal, setOpenRecordsModal] = React.useState(false);
-  console.log({
-    partners
-  });
-
-  // HANDLES THE URL PARAMS FOR THE VIEW PAGE
   const {
     namespace,
     id,
@@ -62041,8 +62054,6 @@ const View = ({
     getRedirectLink
   });
   const namespaceConfig = React.useMemo(() => getNamespaceConfig(namespace), [namespace]);
-
-  // PREPARES THE FORM FOR THE VIEW PAGE
   const {
     form,
     data,
@@ -62099,7 +62110,9 @@ const View = ({
   });
   const subjects = {
     "management-location": "location",
-    "management-stakeholder": "stakeholder"
+    "management-stakeholder": "stakeholder",
+    "management-event": "event",
+    "management-incident": "incident"
   };
   const handleDeleteSubject = React.useCallback(async () => {
     try {
@@ -62108,7 +62121,7 @@ const View = ({
         id: id
       });
       antd.message.success(t("Subject deleted successfully"));
-      push(getRedirectLink(`/app/management/subject/${subjects[namespace]}`));
+      //   push(getRedirectLink(`/app/management/subject/${subjects[namespace]}`));
     } catch (error) {
       handleError(error);
       antd.message.error(t("Failed to delete subject"));

package/dist/services/index.js

@@ -1016,9 +1016,8 @@ class AdminService extends BaseService {
     subject,
     id
   }) {
-    const type = subject === 'location' ? 'location' : 'stakeholder';
     return this.apiDelete({
-      url: `/management/subject/${type}/${id}`
+      url: `/management/subject/${subject}/${id}`
     });
   }
   async getUserGrowth(activeFilter) {

package/dist/utils/index.js

@@ -11601,7 +11601,7 @@ const sp = {
   "unlinkData": "¿Está seguro de que desea eliminar este enlace?",
   "Link": "Enlace",
   "riskMitigationMeasures": "Medidas de mitigación del riesgo",
-  "other": "Otros",
+  "other": "Otro",
   "Reset": "Restablecer",
   "Lir Details": "Detalles LIR",
   "Locations": "Ubicaciones",

package/package.json

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

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

@@ -37,12 +37,6 @@ export default function DocumentsTable({
 	const [selectedDocuments, setSelectedDocuments] = useState([]);
 	const { token } = useToken();
 
-	const transformedParams = useGetParams({location});
-
-	const getDataWithStringPagination = async () => {						
-		return getData({ params: transformedParams });
-	};
-
 	const {
 		filter,
 		activeTab,
@@ -62,17 +56,13 @@ export default function DocumentsTable({
 		defaultPageSize,
 		filtersConfig,
 		getRedirectLink,
-		getData: getDataWithStringPagination,
+		getData: getData,
 		refetchTrigger,
 	});
 
 	const selectOptions = useMemo(() => {
-		return {
-			category: config.options?.category,
-			country: config.options?.countries,
-			sources: [],
-		};
-	}, [config.options]);
+		return options;
+	}, [options]);
 
 	const columns = useMemo(() => {
 		return getColumns({

package/src/@daf/core/components/Screens/Admin/AdminTables/EventsTable/column.js

@@ -57,7 +57,7 @@ export const getColumns = ({
 					label: typeof item.label === 'object' ? Object.values(item.label)[1] : item.label,
 				}))
 
-				const type = findOptions(value, options?.eventsType || []) || "-";
+				const type = (value === 'other' ? t(value) : findOptions(value, options?.eventsType || [])) || "-";
 
 				return <Tooltip title={type}>{type}</Tooltip>;
 			},

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

@@ -37,12 +37,6 @@ export default function EventsTable({
 	const [selectedEvents, setSelectedEvents] = useState([]);
 	const { token } = useToken();
 
-	const transformedParams = useGetParams({location});
-
-	const getDataWithStringPagination = async () => {						
-		return getData({ params: transformedParams });
-	};
-
 	const {
 		filter,
 		activeTab,
@@ -62,7 +56,7 @@ export default function EventsTable({
 		defaultPageSize,
 		filtersConfig,
 		getRedirectLink,
-		getData: getDataWithStringPagination,
+		getData: getData,
 		refetchTrigger,
 	});
 

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

@@ -42,12 +42,6 @@ export default function LocationTable({
     const { token } = useToken();
 	const [isCombineModalOpen, setIsModalOpen] = useState(false);
 
-	const transformedParams = useGetParams({location});
-
-	const getDataWithStringPagination = async () => {
-		return getData({ params: transformedParams });
-	};
-
 	const {
 		filter,
 		activeTab,
@@ -67,7 +61,7 @@ export default function LocationTable({
 		defaultPageSize,
 		filtersConfig,
 		getRedirectLink,
-		getData: getDataWithStringPagination,
+		getData: getData,
 		refetchTrigger,
 	});
 

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

@@ -39,12 +39,6 @@ export default function SubjectsTable({
 	const [selectedSubjects, setSelectedSubjects] = useState([]);
 	const { token } = useToken();
 	const [isCombineModalOpen, setIsModalOpen] = useState(false);
-	const transformedParams = useGetParams({location});
-
-	const getDataWithStringPagination = async () => {
-		return getData({ params: transformedParams });
-	};
-
 
 	const {
 		filter,
@@ -65,7 +59,7 @@ export default function SubjectsTable({
 		defaultPageSize,
 		filtersConfig,
 		getRedirectLink,
-		getData: getDataWithStringPagination,
+		getData: getData,
 		refetchTrigger,
 	});
 

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

@@ -105,13 +105,21 @@ export const useGetParams = ({location}) => {
 		Object.entries(searchParams).filter(([_, value]) => value != null && value !== '')
 	);
 
-	const hasPagination = paginationQuery.skip != null || paginationQuery.take != null;
+	const hasPagination = paginationQuery?.skip != null || paginationQuery?.take != null;
 
 	const { activeTab, ...rest } = otherParams;
 
+	console.log({hasPagination})
+
 	const params = useMemo(() => {
 		if (!hasPagination) {
-			return undefined;
+			return {
+				pagination: {
+					skip: 1,
+					take: 20,
+				},
+				tab: 'active'
+			};
 		}
 		
 		return {
@@ -120,7 +128,7 @@ export const useGetParams = ({location}) => {
 			...(Object.keys(cleanSearchParams)?.length > 0 && { search: cleanSearchParams }),
 			tab: activeTab,
 		}
-	}, [location.search, hasPagination, paginationQuery, rest, cleanSearchParams, activeTab]);
+	}, [location.search]);
 
 	return params;
 }
@@ -141,7 +149,8 @@ export function useSubjectsAdminTable({
 	const [initFetchDone, setInitFetchDone] = useState(false);
 	const [loading, setLoading] = useState(false);
 	const [data, setData] = useState([]);
-
+	const params = useGetParams({location});
+	
 	const filter = useFilters({
 		goTo,
 		location,
@@ -163,7 +172,7 @@ export function useSubjectsAdminTable({
 	const fetchData = useCallback(async () => {
 		try {
 			setLoading(true);
-			const { data } = await getData();
+			const { data } = await getData({ params });
 			setData(data.data || data || []);
 			filter.setPagination((prev) => ({ ...prev, total: data?.meta?.total || data?.length || 0 }));
 			if (!initFetchDone) {
@@ -173,11 +182,11 @@ export function useSubjectsAdminTable({
 		} catch (err) {
 			console.log(err);
 		}
-	}, [filter.activeFilters, refetchTrigger, location.search]);
+	}, [params]);
 
 	useEffect(() => {
 		fetchData();
-	}, [fetchData, refetchTrigger]);
+	}, [params, refetchTrigger]);
 
 	return {
 		filter,

package/src/@daf/pages/Events/Testimonials/config.js

@@ -165,7 +165,7 @@ export const getFilterOptions = (options, t) => {
 export const formConfig = {
 	namespace: 'testimonials',
 	view: 'testimonials',
-	scope: 'create',
+	scope: 'createTestimonial',
 	formType: 'testimonial',
 }
 

package/src/@daf/pages/Locations/ConflictAreas/config.js

@@ -31,7 +31,7 @@ export const getFilterOptions = (options, t) => {
 export const formConfig = {
 	namespace: 'conflict-areas',
 	view: ['scoping', 'new'],
-	scope: 'conflictAreaCreate',
+	scope: 'createConflictArea',
 	formType: 'conflict-area',
 }
 

package/src/@daf/pages/Stakeholders/ArmedGroups/config.js

@@ -60,7 +60,7 @@ export const getFilterOptions = (options, t) => {
 export const formConfig = {
 	namespace: 'armed-groups',
 	view: ['scoping', 'new'],
-	scope: 'global',
+	scope: 'createArmedGroup',
 	formType: 'armed-group',
 }
 

package/src/@daf/pages/Template/components/LinkingTemplate/config.js

@@ -85,4 +85,9 @@ export const namespaceMap = {
 	operators: "stakeholder",
 	workers: "stakeholder",
 	activities: "event",
+	"conflict-areas": "location",
+	"armed-groups": "stakeholder",
+	scl: "location",
+	testimonials: 'event',
+	'corrective-actions': 'event',
 }

package/src/@daf/pages/View/hooks/useViewPermissions.js

@@ -1,5 +1,26 @@
 import { useMemo, useEffect } from "react";
 
+const evaluateRule = (rule, data) => {
+    if (typeof rule === "boolean") return rule;
+    if (typeof rule === "function") return rule();
+  
+    if (typeof rule === "string") {
+      const parts = rule.split(" ");
+  
+      // Expecting: "<field> <is|not> <value>"
+      if (parts.length === 3) {
+        const [field, condition, value] = parts;
+  
+        if (condition === "is") return data?.[field] === value;
+        if (condition === "not") return data?.[field] !== value;
+      }
+    }
+  
+    console.warn("Invalid rule:", rule);
+    return false;
+  };
+  
+
 export const useViewPermissions = ({
     data,
     id,
@@ -17,7 +38,6 @@ export const useViewPermissions = ({
     viewConfig,
 }) => {
     const baseNamespaceKeys = Object.keys(namespaceConfig || {});
-    console.log({namespaceConfig})
 
     const baseSupportedNamespaces = baseNamespaceKeys?.reduce((acc, key) => {
       acc[key] = () => true;
@@ -54,7 +74,8 @@ export const useViewPermissions = ({
         ...namespaceOverrides.canEdit,
         };
         
-        return canEditAction[namespace] ? canEditAction[namespace]() : false;
+        const rule = canEditAction[namespace] ? canEditAction[namespace]() : false;
+        return evaluateRule(rule, data);
     }, [namespace, data, user]);
 
     const canDelete = useMemo(() => {
@@ -67,7 +88,8 @@ export const useViewPermissions = ({
             ...namespaceOverrides.canDelete,
             };
             
-        return canDeleteAction[namespace] ? canDeleteAction[namespace]() : false;
+        const rule = canDeleteAction[namespace] ? canDeleteAction[namespace]() : false;
+        return evaluateRule(rule, data);
     }, [namespace, data, user, namespaceOverrides])
 
     useEffect(() => {

package/src/@daf/pages/View/index.jsx

@@ -51,14 +51,10 @@ const View = ({
     options,
     getSubjectsDetails,
     namespaceOverrides,
-    // ADD CALLBACK TO GET THE CURRENT NAMESPACE CONFIG
 }) => {
     const getNamespaceConfig = (namespace) => namespaceConfiguration?.[namespace] || {};
     const [openRecordsModal, setOpenRecordsModal] = useState(false);
-
-    console.log({partners})
     
-    // HANDLES THE URL PARAMS FOR THE VIEW PAGE
     const {
 		namespace, 
 		id, 
@@ -85,7 +81,6 @@ const View = ({
 
     const namespaceConfig = useMemo(() => getNamespaceConfig(namespace), [namespace]);
 
-    // PREPARES THE FORM FOR THE VIEW PAGE
     const { 
 		form, 
 		data, 
@@ -139,6 +134,8 @@ const View = ({
     const subjects = {
         "management-location": "location",
         "management-stakeholder": "stakeholder",
+        "management-event": "event",
+        "management-incident": "incident",
     }
 
 
@@ -149,7 +146,7 @@ const View = ({
             id: id,
           });
           message.success(t("Subject deleted successfully"));
-          push(getRedirectLink(`/app/management/subject/${subjects[namespace]}`));
+        //   push(getRedirectLink(`/app/management/subject/${subjects[namespace]}`));
         } catch (error) {
           handleError(error);
           message.error(t("Failed to delete subject"));

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

@@ -234,9 +234,8 @@ class AdminService extends BaseService {
     }
 
     deleteSubject({ subject, id }) {
-      const type = subject === 'location' ? 'location' : 'stakeholder';
       return this.apiDelete({
-        url: `/management/subject/${type}/${id}`,
+        url: `/management/subject/${subject}/${id}`,
       });
     }
 

package/src/constants/locales/sp/translation.js

@@ -467,7 +467,7 @@ const sp = {
   "unlinkData": "¿Está seguro de que desea eliminar este enlace?",
   "Link": "Enlace",
   "riskMitigationMeasures": "Medidas de mitigación del riesgo",
-  "other": "Otros",
+  "other": "Otro",
   "Reset": "Restablecer",
   "Lir Details": "Detalles LIR",
   "Locations": "Ubicaciones",