datastake-daf 0.6.797 → 0.6.799

package/dist/services/index.js

@@ -50,7 +50,7 @@ const assignParamsToUrl = (path, params) => {
  * @returns storage objects
  * @class StorageManager
  */
-class StorageManager$1 {
+class StorageManager {
   /**
    * @description Set or update given value in localStorage
    * @static
@@ -185,11 +185,11 @@ class StorageManager$1 {
 const isProxy = () => {
   const pathname = window.location.pathname;
   if (pathname.includes('/proxy/pme') || pathname.includes('/proxy/cadd')) {
-    return window.opener || !!StorageManager$1.get('proxy_token');
+    return window.opener || !!StorageManager.get('proxy_token');
   }
   return false;
 };
-const getToken = () => isProxy() ? StorageManager$1.get('proxy_token') : StorageManager$1.get('token');
+const getToken = () => isProxy() ? StorageManager.get('proxy_token') : StorageManager.get('token');
 
 /**
  * Custom params serializer to maintain JSON format for nested objects
@@ -626,7 +626,7 @@ class ErrorService {
 class BaseService extends BaseHTTPService {
   constructor() {
     const errorHandler = createErrorHandler({
-      getStorageManager: () => StorageManager$1,
+      getStorageManager: () => StorageManager,
       handleError: ({
         status,
         statusText,
@@ -646,7 +646,7 @@ class BaseService extends BaseHTTPService {
       onUnauthorized: () => {
         console.warn('[BaseService] 401 Unauthorized - Token cleared, redirecting to /');
         console.trace('[BaseService] Unauthorized call stack:');
-        StorageManager$1.clearOne('token');
+        StorageManager.clearOne('token');
         if (typeof window !== 'undefined') {
           window.location.href = '/';
         }
@@ -663,7 +663,7 @@ class BaseService extends BaseHTTPService {
       getHeaders: () => {
         const config = getServicesConfig();
         return {
-          Language: StorageManager$1.get('datastakeLng') || 'en',
+          Language: StorageManager.get('datastakeLng') || 'en',
           'ngrok-skip-browser-warning': true,
           Application: config.application
         };
@@ -697,6 +697,15 @@ class AdminService extends BaseService {
       url: `/accounts/${id}`
     });
   }
+  inviteCompanyAccount({
+    companyId,
+    data
+  }) {
+    return this.apiPost({
+      url: `/accounts/${companyId}/invite`,
+      data
+    });
+  }
   inviteAccount(data) {
     return this.apiPost({
       url: `/accounts/inviteAccount`,
@@ -765,19 +774,113 @@ class AdminService extends BaseService {
     params
   }) {
     return this.apiGet({
-      url: `${subject}`,
+      url: `/management/subjects/${subject}`,
       params
     });
   }
+  mergeLocations({
+    ids,
+    data
+  }) {
+    const [id1, id2, ...remainingIds] = ids || [];
+    if (!id1 || !id2) {
+      throw new Error('At least two IDs are required for merging');
+    }
+    const url = `/management/merge/location/${id1}/${id2}`;
+    const payload = {
+      ...data
+    };
+    if (remainingIds.length > 0) {
+      payload.additionalIds = remainingIds;
+    }
+    return this.apiPost({
+      url,
+      data: payload
+    });
+  }
   mergeSubjects({
     subject,
-    ...data
+    ids,
+    data
   }) {
+    const [id1, id2, ...remainingIds] = ids || [];
+    if (!id1 || !id2) {
+      throw new Error('At least two IDs are required for merging');
+    }
+    const url = `/management/merge/${subject}/${id1}/${id2}`;
+    const payload = {
+      ...data
+    };
+    if (remainingIds.length > 0) {
+      payload.additionalIds = remainingIds;
+    }
     return this.apiPost({
-      url: `/merge/${subject}`,
+      url,
+      data: payload
+    });
+  }
+  getSubjectForm({
+    subject,
+    scope = 'global'
+  }) {
+    return this.apiGet({
+      url: `/forms/${subject}`,
+      params: {
+        scope
+      }
+    });
+  }
+  getSubjectData({
+    subject,
+    id
+  }) {
+    return this.apiGet({
+      url: `/management/subject/${subject}/${id}`
+    });
+  }
+  viewLocation({
+    id
+  }) {
+    return this.apiGet({
+      url: `/management/subject/location/${id}`
+    });
+  }
+  viewStakeholder({
+    id
+  }) {
+    return this.apiGet({
+      url: `/management/subject/stakeholder/${id}`
+    });
+  }
+  updateSubject({
+    subject,
+    id,
+    data
+  }) {
+    const type = subject === 'location' ? 'location' : 'stakeholder';
+    return this.apiPut({
+      url: `/management/subject/${type}/${id}`,
       data
     });
   }
+  deleteSubject({
+    subject,
+    id
+  }) {
+    const type = subject === 'location' ? 'location' : 'stakeholder';
+    return this.apiDelete({
+      url: `/management/subject/${type}/${id}`
+    });
+  }
+  getUserGrowth(activeFilter) {
+    return this.apiGet({
+      url: `/accounts/dashboard/user-growth`,
+      isUserManager: true,
+      params: {
+        activeFilter
+      }
+    });
+  }
 }
 var AdminService$1 = createLazyService(AdminService);
 

package/dist/utils/index.js

@@ -5762,7 +5762,7 @@ function filterOptions(options, filters, formsValue = {}, repeatValues = {}, fil
  * @param {Array} arr - The array to check.
  * @returns {boolean} - True if the array contains only objects, false otherwise.
  */
-const isArrayOfObjects = arr => Array.isArray(arr) && arr.map(i => typeof i === "object").every(i => i);
+const isArrayOfObjects$1 = arr => Array.isArray(arr) && arr.map(i => typeof i === "object").every(i => i);
 
 /**
  * Determines if two sets of data have not changed. Used to show Save button disabled or not.
@@ -5793,7 +5793,7 @@ const hasNotChanged = (old, newData) => {
               return old[key] === newData[key].format("YYYY-MM-DD");
             }
             return old[key] === moment__default["default"](newData[key]._d).format("YYYY-MM-DD");
-          } else if (isArrayOfObjects(newData[key])) {
+          } else if (isArrayOfObjects$1(newData[key])) {
             return newData[key].length === (old[key] || []).length && newData[key].map((oKey, i) => hasNotChanged((old[key] || [])[i] || {}, oKey || {})).every(i => i);
           }
         } catch (e) {
@@ -6052,6 +6052,54 @@ const sortForm = ({
   return _form;
 };
 
+// REQUIRED FOR EDIT FORM SUBMIT(SAVE)
+const extractFiles = (fileList = []) => {
+  const processedFiles = fileList.map(file => file.response || file).filter(file => file?.status === "done");
+
+  // Remove duplicates
+  return Array.isArray(processedFiles) ? [...new Set(processedFiles)] : processedFiles;
+};
+const hasFileList = value => {
+  return value && typeof value === "object" && value !== null && "fileList" in value;
+};
+const hasContent = obj => {
+  if (typeof obj !== "object" || obj === null) return true;
+  return Object.keys(obj).some(key => propHasValue(obj[key]));
+};
+const transformPayload = payload => {
+  if (!payload || typeof payload !== "object") return payload;
+  const transformed = {
+    ...payload
+  };
+  Object.keys(transformed).forEach(key => {
+    const value = transformed[key];
+
+    // Skip null or non-object values
+    if (!value || typeof value !== "object" || !propHasValue(value)) return;
+
+    // Handle arrays - filter out empty objects
+    if (Array.isArray(value)) {
+      transformed[key] = value.filter(hasContent);
+      return;
+    }
+
+    // Handle objects with fileLists
+    if (hasFileList(value)) {
+      transformed[key] = extractFiles(value.fileList);
+      return;
+    }
+
+    // Handle nested objects that might have fileLists
+    Object.keys(value).forEach(nestedKey => {
+      const nestedValue = value[nestedKey];
+      if (hasFileList(nestedValue)) {
+        transformed[key][nestedKey] = extractFiles(nestedValue.fileList);
+      }
+    });
+  });
+  return transformed;
+};
+
 ({
   background: PropTypes__default["default"].string,
   style: PropTypes__default["default"].any
@@ -7506,15 +7554,14 @@ const getDefaultActiveFilters = (params, selectFiltersConfig, defaultPageSize, d
   });
   return o;
 };
-const NEW_PAGINATION_APPS = ["nashiriki"];
 const filterParams = (value, module) => {
   const {
     activeFilters,
     ...rest
   } = value;
   const {
-    page,
-    pageSize,
+    page = 1,
+    pageSize = 20,
     sortDir,
     sortBy,
     search,
@@ -7523,9 +7570,10 @@ const filterParams = (value, module) => {
   } = activeFilters || {};
   const params = {};
   params.pagination = JSON.stringify({
-    [NEW_PAGINATION_APPS.includes(module) ? "skip" : "page"]: page,
-    [NEW_PAGINATION_APPS.includes(module) ? "take" : "pageSize"]: pageSize
+    page,
+    pageSize
   });
+  params.filters = JSON.stringify(filters);
   if (search && searchParams) {
     params.search = JSON.stringify({
       qs: search,
@@ -7538,16 +7586,6 @@ const filterParams = (value, module) => {
       by: sortBy
     });
   }
-  if (Object.keys(filters).length) {
-    if (value.sourceId && value.sourceId === "overview") {
-      params.filters = JSON.stringify(filters);
-    } else {
-      params.filters = JSON.stringify({
-        ...filters,
-        authorId: undefined
-      });
-    }
-  }
   return {
     ...rest,
     ...params
@@ -7753,6 +7791,13 @@ function getRedirectPath(user, fallback = '', app, isDatastake) {
 
 const en = {
   "All Data": "All Data",
+  "sbg-admin::remove-user-title": "Remove User Title",
+  "sbg-admin::remove-user-body": "Remove User Body",
+  "Administrative-level-1": "Administrative Level 1",
+  "Administrative-level-2": "Administrative Level 2",
+  "merge-output": "Merge Output",
+  "admin::current_subjects": "Current Subjects",
+  "add-account": "Add Account",
   "Site": "Site",
   "Production Sites": "Production Sites",
   "Type of account": "Type of account",
@@ -9453,7 +9498,7 @@ const fr = {
   Documentation: "Documents",
   "Edit project": "Modifier le projet",
   Name: "Nom",
-  Type: "Tapez",
+  Type: "Type",
   type: "Type",
   Province: "Province",
   Territory: "Territoire",
@@ -11265,7 +11310,7 @@ const sp = {
   "Documentation": "Documentos",
   "Edit project": "Modificar proyecto",
   "Name": "Nombre",
-  "Type": "Escribe",
+  "Type": "Tipo",
   "type": "Tipo",
   "Province": "Provincia",
   "Territory": "Territorio",
@@ -14958,6 +15003,8 @@ const copyToClipboard = id => {
   }
 };
 
+const isArrayOfObjects = arr => Array.isArray(arr) && arr.map(i => typeof i === "object").every(i => i);
+
 exports.ErrorFormat = ErrorFormat;
 exports.MessageTypes = MessageTypes;
 exports.StorageManager = StorageManager;
@@ -14988,6 +15035,7 @@ exports.defaultMapConfig = defaultMapConfig;
 exports.defaultTheme = mmtTheme;
 exports.displayMessage = displayMessage;
 exports.editErrorHandler = editErrorHandler;
+exports.extractFiles = extractFiles;
 exports.fetchImageAsBuffer = fetchImageAsBuffer;
 exports.filterCreateData = filterCreateData;
 exports.filterOptions = filterOptions;
@@ -15016,8 +15064,11 @@ exports.handleError = handleError;
 exports.handleInfo = handleInfo;
 exports.handleSuccess = handleSuccess;
 exports.handleWarning = handleWarning;
+exports.hasContent = hasContent;
+exports.hasFileList = hasFileList;
 exports.hasKeyInObject = hasKeyInObject;
 exports.hasNotChanged = hasNotChanged;
+exports.isArrayOfObjects = isArrayOfObjects;
 exports.isEmptyOrSpaces = isEmptyOrSpaces;
 exports.isModuleApproved = isModuleApproved;
 exports.isProxy = isProxy;
@@ -15050,6 +15101,7 @@ exports.splitStringInMultipleLines = splitStringInMultipleLines;
 exports.tazamaTheme = tazamaTheme;
 exports.tifTheme = tifTheme;
 exports.titleToCamelCase = titleToCamelCase;
+exports.transformPayload = transformPayload;
 exports.truncateString = truncateString;
 exports.userHasInterface = userHasInterface;
 exports.userIsAdmin = userIsAdmin;

package/package.json

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

package/src/@daf/core/components/EditForm/sections.jsx

@@ -1,6 +1,6 @@
 import { Menu } from 'antd';
 import PropTypes from 'prop-types'
-import React, { useState, useEffect } from 'react';
+import React, { useState, useEffect, useMemo } from 'react';
 import { formPaths } from '../../../../helpers/Forms';
 import { editErrorHandler, getInputLabel, showHideInput } from './helper';
 
@@ -92,9 +92,19 @@ export const Sections = ({
   const [formGroups, setFormGroups] = useState([]);
   const [selectedGroup, setSelectedGroup] = useState(null);
 
+  const formConfigToUse = useMemo(() => {
+    if(Array.isArray(formConf)) {
+      return formConf;
+    }
+    if(typeof formConf === 'object' && Object.keys(formConf)?.length) {
+      return formConf;
+    }
+    return [];
+  },[formConf])
+
   // Build form groups with highlight/disable state
   useEffect(() => {
-    const _formGroups = formConf.map((c) => {
+    const _formGroups = formConfigToUse?.map((c) => {
       const _highlighted = getHighlighted({ ...c }, { ...data });
 
       const disabled = getDisabled({
@@ -113,7 +123,7 @@ export const Sections = ({
 
     setHasMissing(!!_formGroups.find(f => f.hasMissing));
     setFormGroups(_formGroups);
-  }, [formConf, highlightMandatory]);
+  }, [formConfigToUse, highlightMandatory]);
 
   // Initial selection logic
   useEffect(() => {
@@ -121,11 +131,11 @@ export const Sections = ({
 
     if (match?.params?.formId) {
       // Special case: only group id
-      sGroup = group || (formConf.length ? formConf[0].id : null);
+      sGroup = group || (formConf?.length ? formConf?.[0]?.id : null);
     } else {
       // General case: full path
       sGroup = `${group || ''}${subsection ? `/${subsection}` : ''}${subgroup ? `/${subgroup}` : ''}${formid ? `/${formid}` : ''}`;
-      if (!group && formConf.length) {
+      if (!group && formConf?.length) {
         sGroup = formConf[0].id;
       }
     }
@@ -176,12 +186,12 @@ export const Sections = ({
       let sGroup;
       if (match?.params?.formId) {
         // Special case fallback
-        sGroup = group || (formConf.length ? formConf[0].id : null);
+        sGroup = group || (formConf?.length ? formConf?.[0]?.id : null);
       } else {
         // General fallback
         sGroup = `${group || ''}${subsection ? `/${subsection}` : ''}${subgroup ? `/${subgroup}` : ''}${formid ? `/${formid}` : ''}`;
-        if (!group && formConf.length) {
-          sGroup = formConf[0].id;
+        if (!group && formConf?.length) {
+          sGroup = formConf?.[0]?.id;
         }
       }
       setSelectedGroup(sGroup);

package/src/@daf/core/components/Screens/Admin/AdminDashboard/components/UserStatistics/TopContributors/hook.js

@@ -10,7 +10,6 @@ const { useToken } = theme;
 export default function useTopContributors({ container, data = [], t }) {
 	const [mainGraph, setMainGraph] = useState(null);
 	const { token } = useToken();
-
 	useEffect(() => {
 		if (container.current) {
 			if (mainGraph) {

package/src/@daf/core/components/Screens/Admin/AdminDashboard/components/UserStatistics/TopContributors/index.jsx

@@ -8,7 +8,7 @@ export default function TopContributors({ data, loading, t }) {
 	const container = useRef(null);
 
 	useTopContributors({ container, data, t });
-
+console.log("topcontributorshhhh", data);
 	return (
 		<Widget
 			title={t(`admin::top-contributors`)}

package/src/@daf/core/components/Screens/Admin/AdminDashboard/components/UserStatistics/UserGrowth/hook.js

@@ -12,7 +12,7 @@ export default function useUserGrowth({ container, data: mainData = {}, t, trans
 	const [mainGraph, setMainGraph] = useState(null);
 	const [data, setData] = useState([]);
 	const { token } = useToken();
-
+console.log("mainData", mainData);
 	const fetchData = () => {
 		const { dates = [] } = mainData;
 		const _data = [];

package/src/@daf/core/components/Screens/Admin/AdminDashboard/components/UserStatistics/UserGrowth/index.jsx

@@ -9,7 +9,7 @@ export default function UserGrowth({ loading, data = [], t, translationKeys, fet
 	const [selectValue, setSelectValue] = useState(selectOptions[0]?.value);
 
 	useUserGrowth({ container, data, t, translationKeys });
-
+console.log("usergrowthhhhh", data);
 
 	useEffect(() => {
 		if (typeof fetchUserGrowth === "function") {

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

@@ -24,7 +24,6 @@ export default function AddUserModal({ isOpen, defaultData = {}, userRoles = [],
 			.catch(() => {});
 	};
 
-	console.log("hellooooooooooooooooooooooooo");
 
 	return (
 		<Modal

package/src/@daf/core/components/Screens/Admin/AdminModals/CombineLocation/columns.js

@@ -0,0 +1,79 @@
+import { findOptions } from "../../../../../../../helpers/StringHelper.js";
+import { Tooltip } from "antd";
+import { getNameByLevel } from "../../AdminTables/SubjectsTable/helper.js";
+
+export const getColumns = ({ t, selectOptions, module, entity }) => {
+	return [
+		{
+			title: t("admin::organisation_id"),
+			dataIndex: "datastakeId",
+			key: "datastakeId",
+			show: true,
+			render: (value, all) => {
+				return <Tooltip title={value}>{value}</Tooltip>;
+			},
+		},
+		{
+			title: t("Name"),
+			dataIndex: "name",
+			key: "name",
+			show: true,
+			render: (value, all) => {
+				return <Tooltip title={value}>{value}</Tooltip>;
+			},
+		},
+		{
+			title: t("Category"),
+			dataIndex: "category",
+			key: "category",
+			show: true,
+			render: (value, all) => {
+				const label = findOptions(value, selectOptions?.category);
+				return <Tooltip title={label}>{label}</Tooltip>;
+			},
+		},
+		{
+			title: t("Country"),
+			dataIndex: "country",
+			key: "country",
+			show: true,
+			render: (value, all) => {
+				const label = findOptions(value, selectOptions?.country);
+				return <Tooltip title={label}>{label}</Tooltip>;
+			},
+		},
+		{
+			title: t("Province"),
+			dataIndex: "administrativeLevel1",
+			key: "administrativeLevel1",
+			ellipsis: true,
+			show: entity.includes("locations"),
+			render: (value, all) => {
+				let label;
+				if(all?.administrativeLevel1 && value === all?.administrativeLevel1) {
+					label = all?.linking?.SCL?.[value]?.name
+				} else {
+					label = getNameByLevel(all?.linking?.SCL, "level_1")?.name
+				}
+
+				return <Tooltip title={label || '-'}>{label || '-'}</Tooltip>;
+			},
+		},
+		{
+			title: t("Territory"),
+			dataIndex: "administrativeLevel2",
+			key: "administrativeLevel2",
+			show: entity.includes("locations"),
+			render: (value, all) => {
+				let label;
+				if(all?.administrativeLevel2 && value === all?.administrativeLevel2) {
+					label = all?.linking?.SCL?.[value]?.name
+				} else {
+					label = getNameByLevel(all?.linking?.SCL, "level_2")?.name
+				}
+
+				return <Tooltip title={label || '-'}>{label || '-'}</Tooltip>;
+			},
+		},
+	].filter((c) => c?.show);
+};

package/src/@daf/core/components/Screens/Admin/AdminModals/CombineLocation/helper.js

@@ -47,7 +47,7 @@ export const getColumns = ({ t, selectOptions, module, entity }) => {
 			dataIndex: "administrativeLevel1",
 			key: "administrativeLevel1",
 			ellipsis: true,
-			show: entity.includes("locations"),
+			show: entity?.includes("location"),
 			render: (value, all) => {
 				let label;
 				if(all?.administrativeLevel1 && value === all?.administrativeLevel1) {
@@ -63,7 +63,7 @@ export const getColumns = ({ t, selectOptions, module, entity }) => {
 			title: t("Territory"),
 			dataIndex: "administrativeLevel2",
 			key: "administrativeLevel2",
-			show: entity.includes("locations"),
+			show: entity?.includes("location"),
 			render: (value, all) => {
 				let label;
 				if(all?.administrativeLevel2 && value === all?.administrativeLevel2) {

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

@@ -1,11 +1,10 @@
 import Modal from "../../../../Modal/index.jsx";
 import { Form, Input, Select, theme } from "antd";
 import { Container } from "../CombineModalStyle.js";
-import { findOptions } from "../../../../../../../helpers/StringHelper.js";
 import DAFTable from "../../../../Table/index.jsx";
 import { useMemo, useState } from "react";
-import { getColumns } from "./helper.js";
 import { getNameByLevel } from "../../AdminTables/SubjectsTable/helper.js";
+import { getColumns } from "./helper.js";
 
 const { useToken } = theme;
 
@@ -35,10 +34,22 @@ export default function CombineLocationModal({
 
 	const onSubmit = () => {
 		MainForm.validateFields().then((data) => {
-			const ids = selectedLocations.map((location) => location._id);
+			const ids = selectedLocations.map((location) => location.id);	  
+			const allowedKeys = [
+				"id", 
+				"name", 
+				"country", 
+				"category", 
+				"administrativeLevel1", 
+				"administrativeLevel2"
+			];		  
+			const filteredData = Object.fromEntries(
+				Object.entries(data).filter(([key]) => allowedKeys.includes(key))
+			);
+	
 			onSuccess({
 				ids,
-				data,
+				data: filteredData,
 			});
 		});
 	};
@@ -57,8 +68,7 @@ export default function CombineLocationModal({
 				setIsDisabled(() => {
 				  const values = MainForm.getFieldsValue();
 			  
-				  const requiredFields =
-					entity === "location"
+				  const requiredFields = entity?.includes("location")
 					  ? ["id", "name", "category", "country", "administrativeLevel1", "administrativeLevel2"]
 					  : ["id", "name", "category", "country"];
 			  
@@ -114,7 +124,7 @@ export default function CombineLocationModal({
 							options={selectedLocations.map((location) => {
 								return {
 									label: location?.datastakeId || "-",
-									value: location?.datastakeId || "-",
+                value: location?.id || "-",
 								};
 							})}
 							placeholder={t("ID")}
@@ -169,7 +179,7 @@ export default function CombineLocationModal({
 						></Select>
 					</Form.Item>
 
-					{entity.includes("locations") && (
+					{entity?.includes("location") && (
 						<>
 						<Form.Item className="flex-1" name="administrativeLevel1">
 							<Select